diff --git a/package.json b/package.json
index 58fe560021..5e2d9226f4 100644
--- a/package.json
+++ b/package.json
@@ -211,7 +211,7 @@
         "jsqr": "^1.4.0",
         "mailhog": "^4.16.0",
         "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^1.4.0",
+        "matrix-web-i18n": "^2.0.0",
         "mocha-junit-reporter": "^2.2.0",
         "node-fetch": "2",
         "postcss-scss": "^4.0.4",
diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
deleted file mode 100755
index fa11bc5292..0000000000
--- a/scripts/check-i18n.pl
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use Cwd 'abs_path';
-
-# script which checks how out of sync the i18ns are drifting
-
-# example i18n format:
-#   "%(oneUser)sleft": "%(oneUser)sleft",
-
-$|=1;
-
-$0 =~ /^(.*\/)/;
-my $i18ndir = abs_path($1."/../src/i18n/strings");
-my $srcdir = abs_path($1."/../src");
-
-my $en = read_i18n($i18ndir."/en_EN.json");
-
-my $src_strings = read_src_strings($srcdir);
-my $src = {};
-
-print "Checking strings in src\n";
-foreach my $tuple (@$src_strings) {
-    my ($s, $file) = (@$tuple);
-    $src->{$s} = $file;
-    if (!$en->{$s}) {
-        if ($en->{$s . '.'}) {
-            printf ("%50s %24s\t%s\n", $file, "en_EN has fullstop!", $s);
-        }
-        else {
-            $s =~ /^(.*)\.?$/;
-            if ($en->{$1}) {
-                printf ("%50s %24s\t%s\n", $file, "en_EN lacks fullstop!", $s);
-            }
-            else {
-                printf ("%50s %24s\t%s\n", $file, "Translation missing!", $s);
-            }
-        }
-    }
-}
-
-print "\nChecking en_EN\n";
-my $count = 0;
-my $remaining_src = {};
-foreach (keys %$src) { $remaining_src->{$_}++ };
-
-foreach my $k (sort keys %$en) {
-    # crappy heuristic to ignore country codes for now...
-    next if ($k =~ /^(..|..-..)$/);
-
-    if ($en->{$k} ne $k) {
-        printf ("%50s %24s\t%s\n", "en_EN", "en_EN is not symmetrical", $k);
-    }
-
-    if (!$src->{$k}) {
-        if ($src->{$k. '.'}) {
-            printf ("%50s %24s\t%s\n", $src->{$k. '.'}, "src has fullstop!", $k);
-        }
-        else {
-            $k =~ /^(.*)\.?$/;
-            if ($src->{$1}) {
-                printf ("%50s %24s\t%s\n", $src->{$1}, "src lacks fullstop!", $k);                
-            }
-            else {
-                printf ("%50s %24s\t%s\n", '???', "Not present in src?", $k);
-            }
-        }
-    }
-    else {
-        $count++;
-        delete $remaining_src->{$k};
-    }
-}
-printf ("$count/" . (scalar keys %$src) . " strings found in src are present in en_EN\n");
-foreach (keys %$remaining_src) {
-    print "missing: $_\n";
-}
-
-opendir(DIR, $i18ndir) || die $!;
-my @files = readdir(DIR);
-closedir(DIR);
-foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files) {
-    print "\nChecking $lang\n";
-
-    my $map = read_i18n($i18ndir."/".$lang);
-    my $count = 0;
-
-    my $remaining_en = {};
-    foreach (keys %$en) { $remaining_en->{$_}++ };
-
-    foreach my $k (sort keys %$map) {
-        {
-            no warnings 'uninitialized';
-            my $vars = {};
-            while ($k =~ /%\((.*?)\)s/g) {
-                $vars->{$1}++;
-            }
-            while ($map->{$k} =~ /%\((.*?)\)s/g) {
-                $vars->{$1}--;
-            }
-            foreach my $var (keys %$vars) {
-                if ($vars->{$var} != 0) {
-                    printf ("%10s %24s\t%s\n", $lang, "Broken var ($var)s", $k);
-                }
-            }
-        }
-
-        if ($en->{$k}) {
-            if ($map->{$k} eq $k) {
-                printf ("%10s %24s\t%s\n", $lang, "Untranslated string?", $k);
-            }
-            $count++;
-            delete $remaining_en->{$k};
-        }
-        else {
-            if ($en->{$k . "."}) {
-                printf ("%10s %24s\t%s\n", $lang, "en_EN has fullstop!", $k);
-                next;
-            }
-
-            $k =~ /^(.*)\.?$/;
-            if ($en->{$1}) {
-                printf ("%10s %24s\t%s\n", $lang, "en_EN lacks fullstop!", $k);
-                next;
-            }
-
-            printf ("%10s %24s\t%s\n", $lang, "Not present in en_EN", $k);
-        }
-    }
-
-    if (scalar keys %$remaining_en < 100) {
-        foreach (keys %$remaining_en) {
-            printf ("%10s %24s\t%s\n", $lang, "Not yet translated", $_);
-        }
-    }
-
-    printf ("$count/" . (scalar keys %$en) . " strings translated\n");
-}
-
-sub read_i18n {
-    my $path = shift;
-    my $map = {};
-    $path =~ /.*\/(.*)$/;
-    my $lang = $1;
-
-    open(FILE, "<", $path) || die $!;
-    while(<FILE>) {
-        if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
-            my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
-            $src =~ s/\\"/"/g;
-            $dst =~ s/\\"/"/g;
-
-            if ($map->{$src}) {
-                printf ("%10s %24s\t%s\n", $lang, "Duplicate translation!", $src);
-            }
-            $map->{$src} = $dst;
-        }
-    }
-    close(FILE);
-
-    return $map;
-}
-
-sub read_src_strings {
-    my $path = shift;
-
-    use File::Find;
-    use File::Slurp;
-
-    my $strings = [];
-
-    my @files;
-    find( sub { push @files, $File::Find::name if (-f $_ && /\.jsx?$/) }, $path );
-    foreach my $file (@files) {
-        my $src = read_file($file);
-        $src =~ s/'\s*\+\s*'//g;
-        $src =~ s/"\s*\+\s*"//g;
-
-        $file =~ s/^.*\/src/src/;
-        while ($src =~ /_t(?:Jsx)?\(\s*'(.*?[^\\])'/sg) {
-            my $s = $1;
-            $s =~ s/\\'/'/g;
-            push @$strings, [$s, $file];
-        }
-        while ($src =~ /_t(?:Jsx)?\(\s*"(.*?[^\\])"/sg) {
-            push @$strings, [$1, $file];
-        }
-    }
-
-    return $strings;
-}
\ No newline at end of file
diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
deleted file mode 100755
index def352463d..0000000000
--- a/scripts/fix-i18n.pl
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/perl -ni
-
-use strict;
-use warnings;
-
-# script which synchronises i18n strings to include punctuation.
-# i've cherry-picked ones which seem to have diverged between the different translations
-# from TextForEvent, causing missing events all over the place
-
-BEGIN {
-$::fixups = [split(/\n/, <<EOT
-%(targetName)s accepted the invitation for %(displayName)s.
-%(targetName)s accepted an invitation.
-%(senderName)s requested a VoIP conference.
-%(senderName)s invited %(targetName)s.
-%(senderName)s banned %(targetName)s.
-%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.
-%(senderName)s set their display name to %(displayName)s.
-%(senderName)s removed their display name (%(oldDisplayName)s).
-%(senderName)s removed their profile picture.
-%(senderName)s changed their profile picture.
-%(senderName)s set a profile picture.
-VoIP conference started.
-%(targetName)s joined the room.
-VoIP conference finished.
-%(targetName)s rejected the invitation.
-%(targetName)s left the room.
-%(senderName)s unbanned %(targetName)s.
-%(senderName)s kicked %(targetName)s.
-%(senderName)s withdrew %(targetName)s's inivitation.
-%(targetName)s left the room.
-%(senderDisplayName)s changed the topic to "%(topic)s".
-%(senderDisplayName)s changed the room name to %(roomName)s.
-%(senderDisplayName)s sent an image.
-%(senderName)s answered the call.
-%(senderName)s ended the call.
-%(senderName)s placed a %(callType)s call.
-%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.
-%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).
-%(senderName)s changed the power level of %(powerLevelDiffText)s.
-For security, this session has been signed out. Please sign in again.
-You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.
-A new password must be entered.
-Guests can't set avatars. Please register.
-Failed to set avatar.
-Unable to verify email address.
-Guests can't use labs features. Please register.
-A new password must be entered.
-Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.
-Guests cannot join this room even if explicitly invited.
-Guest users can't invite users. Please register to invite.
-This room is inaccessible to guests. You may be able to join if you register.
-delete the alias.
-remove %(name)s from the directory.
-Conference call failed.
-Conference calling is in development and may not be reliable.
-Guest users can't create new rooms. Please register to create room and start a chat.
-Server may be unavailable, overloaded, or you hit a bug.
-Server unavailable, overloaded, or something else went wrong.
-You are already in a call.
-You cannot place VoIP calls in this browser.
-You cannot place a call with yourself.
-Your email address does not appear to be associated with a Matrix ID on this Homeserver.
-Guest users can't upload files. Please register to upload.
-Some of your messages have not been sent.
-This room is private or inaccessible to guests. You may be able to join if you register.
-Tried to load a specific point in this room's timeline, but was unable to find it.
-Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.
-This action cannot be performed by a guest user. Please register to be able to do this.
-Tried to load a specific point in this room's timeline, but was unable to find it.
-Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.
-You are trying to access %(roomName)s.
-You will not be able to undo this change as you are promoting the user to have the same power level as yourself.
-EOT
-)];
-}
-
-# example i18n format:
-#   "%(oneUser)sleft": "%(oneUser)sleft",
-
-# script called with the line of the file to be checked
-my $sub = 0;
-if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
-    my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
-    $src =~ s/\\"/"/g;
-    $dst =~ s/\\"/"/g;
-
-    foreach my $fixup (@{$::fixups}) {
-        my $dotless_fixup = substr($fixup, 0, -1);
-
-        if ($src eq $dotless_fixup) {
-            print STDERR "fixing up src: $src\n";
-            $src .= '.';
-            $sub = 1;
-        }
-
-        if ($ARGV !~ /(zh_Hans|zh_Hant|th)\.json$/ && $src eq $fixup && $dst !~ /\.$/) {
-            print STDERR "fixing up dst: $dst\n";
-            $dst .= '.';
-            $sub = 1;            
-        }
-
-        if ($sub) {
-            $src =~ s/"/\\"/g;
-            $dst =~ s/"/\\"/g;
-            print qq($indent"$src"$colon"$dst"$comma\n);
-            last;
-        }        
-    }
-}
-
-if (!$sub) {
-    print $_;
-}
diff --git a/scripts/fixup-imports.pl b/scripts/fixup-imports.pl
deleted file mode 100755
index 3929ab88c9..0000000000
--- a/scripts/fixup-imports.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/perl -pi
-
-# pass in a list of filenames whose imports should be fixed up to be relative
-# to matrix-react-sdk rather than vector-web.
-# filenames must be relative to src/ - e.g. ./components/moo/Moo.js
-
-# run with something like:
-# sierra:src matthew$ grep -ril 'require(.matrix-react-sdk' . | xargs ../scripts/fixup-imports.pl 
-# sierra:src matthew$ grep -ril 'import.*matrix-react-sdk' . | xargs ../scripts/fixup-imports.pl 
-
-# e.g. turning:
-# var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
-#
-# into:
-# const rate_limited_func = require('../../ratelimitedfunc'); 
-#
-# ...if the current file is two levels deep inside lib.
-
-$depth = () = $ARGV =~ m#/#g;
-$depth--;
-$prefix = $depth > 0 ? ('../' x $depth) : './';
-
-s/= require\(['"]matrix-react-sdk\/lib\/(.*?)['"]\)/= require('$prefix$1')/;
-s/= require\(['"]matrix-react-sdk['"]\)/= require('${prefix}index')/;
-
-s/^(import .* from )['"]matrix-react-sdk\/lib\/(.*?)['"]/$1'$prefix$2'/;
-s/^(import .* from )['"]matrix-react-sdk['"]/$1'${prefix}index'/;
diff --git a/sonar-project.properties b/sonar-project.properties
index a8d8f0cf86..e0bfadc4ad 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -8,6 +8,7 @@ sonar.sources=src,res
 sonar.tests=test,cypress
 sonar.exclusions=__mocks__,docs
 
+sonar.cpd.exclusions=src/i18n/strings/*.json
 sonar.typescript.tsconfigPath=./tsconfig.json
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.coverage.exclusions=test/**/*,cypress/**/*,src/components/views/dialogs/devtools/**/*
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index ff64ec9b4c..c2eb403231 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -191,10 +191,14 @@
     "%(senderDisplayName)s sent an image.": "قام %(senderDisplayName)s بإرسال صورة.",
     "%(senderName)s set the main address for this room to %(address)s.": "قام %(senderName)s بتعديل العنوان الرئيسي لهذه الغرفة الى %(address)s.",
     "%(senderName)s removed the main address for this room.": "قام %(senderName)s بإزالة العنوان الرئيسي لهذه الغرفة.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "قام %(senderName)s بإضافة العناوين البديلة %(addresses)s لهذه الغرفة.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "قام %(senderName)s بإضافة العنوان البديل %(addresses)s لهذه الغرفة.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "قام %(senderName)s بإزالة العناوين البديلة %(addresses)s لهذه الغرفة.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "قام %(senderName)s بإزالة العنوان البديل %(addresses)s لهذه الغرفة.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "قام %(senderName)s بإضافة العناوين البديلة %(addresses)s لهذه الغرفة.",
+        "one": "قام %(senderName)s بإضافة العنوان البديل %(addresses)s لهذه الغرفة."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "قام %(senderName)s بإزالة العناوين البديلة %(addresses)s لهذه الغرفة.",
+        "one": "قام %(senderName)s بإزالة العنوان البديل %(addresses)s لهذه الغرفة."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "قام %(senderName)s بتعديل العناوين البديلة لهذه الغرفة.",
     "%(senderName)s changed the main and alternative addresses for this room.": "قام %(senderName)s بتعديل العناوين الرئيسية و البديلة لهذه الغرفة.",
     "%(senderName)s changed the addresses for this room.": "قام %(senderName)s بتعديل عناوين هذه الغرفة.",
@@ -240,8 +244,10 @@
     "Not Trusted": "غير موثوقة",
     "Done": "تم",
     "%(displayName)s is typing …": "%(displayName)s يكتب…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s و %(count)s آخرون يكتبون…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s وآخر يكتبون…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s و %(count)s آخرون يكتبون…",
+        "one": "%(names)s وآخر يكتبون…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s و %(lastPerson)s يكتبون…",
     "Cannot reach homeserver": "لا يمكن الوصول إلى السيرفر",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "تأكد من أنك تملك اتصال بالانترنت مستقر أو تواصل مع مدير السيرفر",
@@ -402,10 +408,14 @@
     "This room has already been upgraded.": "سبق وأن تمت ترقية هذه الغرفة.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "ستؤدي ترقية هذه الغرفة إلى إغلاق النسخة الحالية للغرفة وإنشاء غرفة تمت ترقيتها بنفس الاسم.",
     "Unread messages.": "رسائل غير المقروءة.",
-    "%(count)s unread messages.|one": "رسالة واحدة غير مقروءة.",
-    "%(count)s unread messages.|other": "%(count)s من الرسائل غير مقروءة.",
-    "%(count)s unread messages including mentions.|one": "إشارة واحدة غير مقروءة.",
-    "%(count)s unread messages including mentions.|other": "%(count)s من الرسائل والإشارات غير المقروءة.",
+    "%(count)s unread messages.": {
+        "one": "رسالة واحدة غير مقروءة.",
+        "other": "%(count)s من الرسائل غير مقروءة."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "إشارة واحدة غير مقروءة.",
+        "other": "%(count)s من الرسائل والإشارات غير المقروءة."
+    },
     "Room options": "خيارات الغرفة",
     "Settings": "الإعدادات",
     "Low Priority": "أولوية منخفضة",
@@ -413,8 +423,10 @@
     "Favourited": "فُضلت",
     "Forget Room": "انسَ الغرفة",
     "Notification options": "خيارات الإشعارات",
-    "Show %(count)s more|one": "أظهر %(count)s زيادة",
-    "Show %(count)s more|other": "أظهر %(count)s زيادة",
+    "Show %(count)s more": {
+        "one": "أظهر %(count)s زيادة",
+        "other": "أظهر %(count)s زيادة"
+    },
     "Jump to first invite.": "الانتقال لأول دعوة.",
     "Jump to first unread room.": "الانتقال لأول غرفة لم تقرأ.",
     "List options": "خيارات القائمة",
@@ -466,8 +478,10 @@
     "Hide Widgets": "إخفاء عناصر الواجهة",
     "Forget room": "انسَ الغرفة",
     "Join Room": "انضم للغرفة",
-    "(~%(count)s results)|one": "(~%(count)s نتيجة)",
-    "(~%(count)s results)|other": "(~%(count)s نتائج)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s نتيجة)",
+        "other": "(~%(count)s نتائج)"
+    },
     "Unnamed room": "غرفة بلا اسم",
     "No recently visited rooms": "لا توجد غرف تمت زيارتها مؤخرًا",
     "Room %(name)s": "الغرفة %(name)s",
@@ -512,8 +526,10 @@
     "Filter room members": "تصفية أعضاء الغرفة",
     "Invited": "مدعو",
     "Invite to this room": "ادع لهذه الغرفة",
-    "and %(count)s others...|one": "وواحدة أخرى...",
-    "and %(count)s others...|other": "و %(count)s أخر...",
+    "and %(count)s others...": {
+        "one": "وواحدة أخرى...",
+        "other": "و %(count)s أخر..."
+    },
     "Close preview": "إغلاق المعاينة",
     "Scroll to most recent messages": "انتقل إلى أحدث الرسائل",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "لا يمكن ضمان موثوقية هذه الرسالة المشفرة على هذا الجهاز.",
@@ -670,8 +686,10 @@
     "Failed to mute user": "تعذر كتم المستخدم",
     "Failed to ban user": "تعذر حذف المستخدم",
     "Remove recent messages": "احذف الرسائل الحديثة",
-    "Remove %(count)s messages|one": "احذف رسالة واحدة",
-    "Remove %(count)s messages|other": "احذف %(count)s رسائل",
+    "Remove %(count)s messages": {
+        "one": "احذف رسالة واحدة",
+        "other": "احذف %(count)s رسائل"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "قد يستغرق هذا وقتًا بحسب عدد الرسائل. من فضلك لا تحدث عمليك أثناء ذلك.",
     "Remove recent messages by %(user)s": "قم بإزالة رسائل %(user)s الأخيرة",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "حاول الصعود في المخطط الزمني لمعرفة ما إذا كانت هناك سابقات.",
@@ -684,11 +702,15 @@
     "Invite": "دعوة",
     "Jump to read receipt": "انتقل لإيصال قراءة",
     "Hide sessions": "اخف الاتصالات",
-    "%(count)s sessions|one": "%(count)s اتصال",
-    "%(count)s sessions|other": "%(count)s اتصالات",
+    "%(count)s sessions": {
+        "one": "%(count)s اتصال",
+        "other": "%(count)s اتصالات"
+    },
     "Hide verified sessions": "اخف الاتصالات المحققة",
-    "%(count)s verified sessions|one": "اتصال واحد محقق",
-    "%(count)s verified sessions|other": "%(count)s اتصالات محققة",
+    "%(count)s verified sessions": {
+        "one": "اتصال واحد محقق",
+        "other": "%(count)s اتصالات محققة"
+    },
     "Not trusted": "غير موثوق",
     "Trusted": "موثوق",
     "Room settings": "إعدادات الغرفة",
@@ -700,7 +722,9 @@
     "Widgets": "عناصر الواجهة",
     "Options": "الخيارات",
     "Unpin": "فك التثبيت",
-    "You can only pin up to %(count)s widgets|other": "تثبيت عناصر واجهة المستخدم ممكن إلى %(count)s بحدٍ أعلى",
+    "You can only pin up to %(count)s widgets": {
+        "other": "تثبيت عناصر واجهة المستخدم ممكن إلى %(count)s بحدٍ أعلى"
+    },
     "Your homeserver": "خادمك الوسيط",
     "One of the following may be compromised:": "قد يتم اختراق أي مما يلي:",
     "Your messages are not secure": "رسائلك ليست آمنة",
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 30c701601e..f965e5d9fc 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -149,8 +149,10 @@
     "Invite": "Покани",
     "Unmute": "Премахни заглушаването",
     "Admin Tools": "Инструменти на администратора",
-    "and %(count)s others...|other": "и %(count)s други...",
-    "and %(count)s others...|one": "и още един...",
+    "and %(count)s others...": {
+        "other": "и %(count)s други...",
+        "one": "и още един..."
+    },
     "Invited": "Поканен",
     "Filter room members": "Филтриране на членовете",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (ниво на достъп %(powerLevelNumber)s)",
@@ -177,8 +179,10 @@
     "Unknown": "Неизвестен",
     "Replying": "Отговаря",
     "Save": "Запази",
-    "(~%(count)s results)|other": "(~%(count)s резултати)",
-    "(~%(count)s results)|one": "(~%(count)s резултат)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s резултати)",
+        "one": "(~%(count)s резултат)"
+    },
     "Join Room": "Присъединяване към стаята",
     "Upload avatar": "Качи профилна снимка",
     "Settings": "Настройки",
@@ -241,55 +245,99 @@
     "No results": "Няма резултати",
     "Home": "Начална страница",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sсе присъединиха %(count)s пъти",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sсе присъединиха",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sсе присъедини %(count)s пъти",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sсе присъедини",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sнапуснаха %(count)s пъти",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sнапуснаха",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sнапусна %(count)s пъти",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sнапусна",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sсе присъединиха и напуснаха %(count)s пъти",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sсе присъединиха и напуснаха",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sсе присъедини и напусна %(count)s пъти",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sсе присъедини и напусна",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sнапуснаха и се присъединиха отново %(count)s пъти",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sнапуснаха и се присъединиха отново",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sнапусна и се присъедини отново %(count)s пъти",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sнапусна и се присъедини отново",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sотхвърлиха своите покани %(count)s пъти",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sотхвърлиха своите покани",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотхвърли своята покана %(count)s пъти",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sотхвърли своята покана",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sоттеглиха своите покани %(count)s пъти",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sоттеглиха своите покани",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sоттегли своята покана %(count)s пъти",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sоттегли своята покана",
-    "were invited %(count)s times|other": "бяха поканени %(count)s пъти",
-    "were invited %(count)s times|one": "бяха поканени",
-    "was invited %(count)s times|other": "беше поканен %(count)s пъти",
-    "was invited %(count)s times|one": "беше поканен",
-    "were banned %(count)s times|other": "бяха блокирани %(count)s пъти",
-    "were banned %(count)s times|one": "бяха блокирани",
-    "was banned %(count)s times|other": "беше блокиран %(count)s пъти",
-    "was banned %(count)s times|one": "беше блокиран",
-    "were unbanned %(count)s times|other": "бяха отблокирани %(count)s пъти",
-    "were unbanned %(count)s times|one": "бяха отблокирани",
-    "was unbanned %(count)s times|other": "беше отблокиран %(count)s пъти",
-    "was unbanned %(count)s times|one": "беше отблокиран",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sсмениха своето име %(count)s пъти",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sсмениха своето име",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sсмени своето име %(count)s пъти",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sсмени своето име",
-    "%(items)s and %(count)s others|other": "%(items)s и %(count)s други",
-    "%(items)s and %(count)s others|one": "%(items)s и още един",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)sсе присъединиха %(count)s пъти",
+        "one": "%(severalUsers)sсе присъединиха"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)sсе присъедини %(count)s пъти",
+        "one": "%(oneUser)sсе присъедини"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)sнапуснаха %(count)s пъти",
+        "one": "%(severalUsers)sнапуснаха"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)sнапусна %(count)s пъти",
+        "one": "%(oneUser)sнапусна"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)sсе присъединиха и напуснаха %(count)s пъти",
+        "one": "%(severalUsers)sсе присъединиха и напуснаха"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)sсе присъедини и напусна %(count)s пъти",
+        "one": "%(oneUser)sсе присъедини и напусна"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)sнапуснаха и се присъединиха отново %(count)s пъти",
+        "one": "%(severalUsers)sнапуснаха и се присъединиха отново"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)sнапусна и се присъедини отново %(count)s пъти",
+        "one": "%(oneUser)sнапусна и се присъедини отново"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)sотхвърлиха своите покани %(count)s пъти",
+        "one": "%(severalUsers)sотхвърлиха своите покани"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)sотхвърли своята покана %(count)s пъти",
+        "one": "%(oneUser)sотхвърли своята покана"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)sоттеглиха своите покани %(count)s пъти",
+        "one": "%(severalUsers)sоттеглиха своите покани"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)sоттегли своята покана %(count)s пъти",
+        "one": "%(oneUser)sоттегли своята покана"
+    },
+    "were invited %(count)s times": {
+        "other": "бяха поканени %(count)s пъти",
+        "one": "бяха поканени"
+    },
+    "was invited %(count)s times": {
+        "other": "беше поканен %(count)s пъти",
+        "one": "беше поканен"
+    },
+    "were banned %(count)s times": {
+        "other": "бяха блокирани %(count)s пъти",
+        "one": "бяха блокирани"
+    },
+    "was banned %(count)s times": {
+        "other": "беше блокиран %(count)s пъти",
+        "one": "беше блокиран"
+    },
+    "were unbanned %(count)s times": {
+        "other": "бяха отблокирани %(count)s пъти",
+        "one": "бяха отблокирани"
+    },
+    "was unbanned %(count)s times": {
+        "other": "беше отблокиран %(count)s пъти",
+        "one": "беше отблокиран"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)sсмениха своето име %(count)s пъти",
+        "one": "%(severalUsers)sсмениха своето име"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sсмени своето име %(count)s пъти",
+        "one": "%(oneUser)sсмени своето име"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s и %(count)s други",
+        "one": "%(items)s и още един"
+    },
     "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
     "collapse": "свий",
     "expand": "разшири",
     "Custom level": "Персонализирано ниво",
     "<a>In reply to</a> <pill>": "<a>В отговор на</a> <pill>",
     "Start chat": "Започни чат",
-    "And %(count)s more...|other": "И %(count)s други...",
+    "And %(count)s more...": {
+        "other": "И %(count)s други..."
+    },
     "Confirm Removal": "Потвърдете премахването",
     "Create": "Създай",
     "Unknown error": "Неизвестна грешка",
@@ -333,9 +381,11 @@
     "Reject all %(invitedRooms)s invites": "Отхвърли всички %(invitedRooms)s покани",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Беше направен опит да се зареди конкретна точка в хронологията на тази стая, но нямате разрешение да разгледате въпросното съобщение.",
     "Failed to load timeline position": "Неуспешно зареждане на позицията в хронологията",
-    "Uploading %(filename)s and %(count)s others|other": "Качване на %(filename)s и %(count)s други",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Качване на %(filename)s и %(count)s други",
+        "one": "Качване на %(filename)s и %(count)s друг"
+    },
     "Uploading %(filename)s": "Качване на %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
     "Success": "Успешно",
     "<not supported>": "<не се поддържа>",
     "Import E2E room keys": "Импортирай E2E ключове",
@@ -590,8 +640,10 @@
     "Sets the room name": "Настройва име на стаята",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s обнови тази стая.",
     "%(displayName)s is typing …": "%(displayName)s пише …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s и %(count)s други пишат …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s и още един пишат …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s и %(count)s други пишат …",
+        "one": "%(names)s и още един пишат …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s и %(lastPerson)s пишат …",
     "Render simple counters in room header": "Визуализирай прости броячи в заглавието на стаята",
     "Enable Emoji suggestions while typing": "Включи емоджи предложенията по време на писане",
@@ -814,13 +866,17 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Файлът е <b>прекалено голям</b> за да се качи. Максималният допустим размер е %(limit)s, докато този файл е %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Тези файлове са <b>прекалено големи</b> за да се качат. Максималният допустим размер е %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Някои файлове са <b>прекалено големи</b> за да се качат. Максималният допустим размер е %(limit)s.",
-    "Upload %(count)s other files|other": "Качи %(count)s други файла",
-    "Upload %(count)s other files|one": "Качи %(count)s друг файл",
+    "Upload %(count)s other files": {
+        "other": "Качи %(count)s други файла",
+        "one": "Качи %(count)s друг файл"
+    },
     "Cancel All": "Откажи всички",
     "Upload Error": "Грешка при качване",
     "Remember my selection for this widget": "Запомни избора ми за това приспособление",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Имате %(count)s непрочетени известия в предишна версия на тази стая.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Имате %(count)s непрочетено известие в предишна версия на тази стая.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Имате %(count)s непрочетени известия в предишна версия на тази стая.",
+        "one": "Имате %(count)s непрочетено известие в предишна версия на тази стая."
+    },
     "The server does not support the room version specified.": "Сървърът не поддържа указаната версия на стая.",
     "Unbans user with given ID": "Премахва блокирането на потребител с даден идентификатор",
     "Sends the given message coloured as a rainbow": "Изпраща текущото съобщение оцветено като дъга",
@@ -895,10 +951,14 @@
     "Message edits": "Редакции на съобщение",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Обновяването на тази стая изисква затварянето на текущата и създаване на нова на нейно място. За да е най-удобно за членовете на стаята, ще:",
     "Show all": "Покажи всички",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sне направиха промени %(count)s пъти",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sне направиха промени",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sне направи промени %(count)s пъти",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sне направи промени",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)sне направиха промени %(count)s пъти",
+        "one": "%(severalUsers)sне направиха промени"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)sне направи промени %(count)s пъти",
+        "one": "%(oneUser)sне направи промени"
+    },
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Моля, кажете ни какво се обърка, или още по-добре - създайте проблем в GitHub обясняващ ситуацията.",
     "Removing…": "Премахване…",
     "Clear all data": "Изчисти всички данни",
@@ -987,7 +1047,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Опитайте се да проверите по-нагоре в историята за по-ранни.",
     "Remove recent messages by %(user)s": "Премахване на скорошни съобщения от %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Може да отнеме известно време за голям брой съобщения. Моля, не презареждайте страницата междувременно.",
-    "Remove %(count)s messages|other": "Премахни %(count)s съобщения",
+    "Remove %(count)s messages": {
+        "other": "Премахни %(count)s съобщения",
+        "one": "Премахни 1 съобщение"
+    },
     "Remove recent messages": "Премахни скорошни съобщения",
     "Bold": "Удебелено",
     "Italics": "Наклонено",
@@ -1026,12 +1089,15 @@
     "Clear cache and reload": "Изчисти кеша и презареди",
     "Your email address hasn't been verified yet": "Имейл адресът ви все още не е потвърден",
     "Click the link in the email you received to verify and then click continue again.": "Кликнете на връзката получена по имейл за да потвърдите, а след това натиснете продължи отново.",
-    "Remove %(count)s messages|one": "Премахни 1 съобщение",
     "Room %(name)s": "Стая %(name)s",
-    "%(count)s unread messages including mentions.|other": "%(count)s непрочетени съобщения, включително споменавания.",
-    "%(count)s unread messages including mentions.|one": "1 непрочетено споменаване.",
-    "%(count)s unread messages.|other": "%(count)s непрочетени съобщения.",
-    "%(count)s unread messages.|one": "1 непрочетено съобщение.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s непрочетени съобщения, включително споменавания.",
+        "one": "1 непрочетено споменаване."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s непрочетени съобщения.",
+        "one": "1 непрочетено съобщение."
+    },
     "Unread messages.": "Непрочетени съобщения.",
     "Failed to deactivate user": "Неуспешно деактивиране на потребител",
     "This client does not support end-to-end encryption.": "Този клиент не поддържа шифроване от край до край.",
@@ -1145,8 +1211,10 @@
     "Trusted": "Доверени",
     "Not trusted": "Недоверени",
     "Hide verified sessions": "Скрий потвърдените сесии",
-    "%(count)s verified sessions|other": "%(count)s потвърдени сесии",
-    "%(count)s verified sessions|one": "1 потвърдена сесия",
+    "%(count)s verified sessions": {
+        "other": "%(count)s потвърдени сесии",
+        "one": "1 потвърдена сесия"
+    },
     "Messages in this room are end-to-end encrypted.": "Съобщенията в тази стая са шифровани от край-до-край.",
     "Verify": "Потвърди",
     "Security": "Сигурност",
@@ -1208,10 +1276,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Предоставения от вас ключ за подписване съвпада с ключа за подписване получен от сесия %(deviceId)s на %(userId)s. Сесията е маркирана като потвърдена.",
     "Displays information about a user": "Показва информация за потребителя",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s промени името на стаята от %(oldRoomName)s на %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s добави алтернативните адреси %(addresses)s към стаята.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s добави алтернативният адрес %(addresses)s към стаята.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s премахна алтернативните адреси %(addresses)s от стаята.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s премахна алтернативният адрес %(addresses)s от стаята.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s добави алтернативните адреси %(addresses)s към стаята.",
+        "one": "%(senderName)s добави алтернативният адрес %(addresses)s към стаята."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s премахна алтернативните адреси %(addresses)s от стаята.",
+        "one": "%(senderName)s премахна алтернативният адрес %(addresses)s от стаята."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s промени алтернативните адреси на стаята.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s промени основният и алтернативните адреси на стаята.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s промени адресите на стаята.",
@@ -1332,8 +1404,10 @@
     "Your messages are not secure": "Съобщенията ви не са защитени",
     "One of the following may be compromised:": "Едно от следните неща може да е било компрометирано:",
     "Your homeserver": "Сървърът ви",
-    "%(count)s sessions|other": "%(count)s сесии",
-    "%(count)s sessions|one": "%(count)s сесия",
+    "%(count)s sessions": {
+        "other": "%(count)s сесии",
+        "one": "%(count)s сесия"
+    },
     "Hide sessions": "Скрий сесиите",
     "Verify by scanning": "Верифицирай чрез сканиране",
     "Ask %(displayName)s to scan your code:": "Попитайте %(displayName)s да сканира вашия код:",
@@ -1516,8 +1590,10 @@
     "Sort by": "Подреди по",
     "Activity": "Активност",
     "A-Z": "Азбучен ред",
-    "Show %(count)s more|other": "Покажи още %(count)s",
-    "Show %(count)s more|one": "Покажи още %(count)s",
+    "Show %(count)s more": {
+        "other": "Покажи още %(count)s",
+        "one": "Покажи още %(count)s"
+    },
     "Light": "Светла",
     "Dark": "Тъмна",
     "Use custom size": "Използвай собствен размер",
@@ -1624,7 +1700,9 @@
     "Edit widgets, bridges & bots": "Промени приспособления, мостове и ботове",
     "Widgets": "Приспособления",
     "Unpin": "Разкачи",
-    "You can only pin up to %(count)s widgets|other": "Може да закачите максимум %(count)s приспособления",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Може да закачите максимум %(count)s приспособления"
+    },
     "Favourited": "В любими",
     "Forget Room": "Забрави стаята",
     "Notification options": "Настройки за уведомление",
@@ -2031,11 +2109,15 @@
     "Some invites couldn't be sent": "Някои покани не можаха да бъдат изпратени",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Изпратихме останалите покани, но следните хора не можаха да бъдат поканени в <RoomName/>",
     "Empty room (was %(oldName)s)": "Празна стая (беше %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Канене на %(user)s и още 1 друг",
-    "Inviting %(user)s and %(count)s others|other": "Канене на %(user)s и %(count)s други",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Канене на %(user)s и още 1 друг",
+        "other": "Канене на %(user)s и %(count)s други"
+    },
     "Inviting %(user1)s and %(user2)s": "Канене на %(user1)s и %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s и още 1",
-    "%(user)s and %(count)s others|other": "%(user)s и %(count)s други",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s и още 1",
+        "other": "%(user)s и %(count)s други"
+    },
     "%(user1)s and %(user2)s": "%(user1)s и %(user2)s",
     "Empty room": "Празна стая"
 }
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index b0cdde5be9..4fb8d69346 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -153,8 +153,10 @@
     "Invite": "Convida",
     "Unmute": "No silenciïs",
     "Admin Tools": "Eines d'administració",
-    "and %(count)s others...|other": "i %(count)s altres...",
-    "and %(count)s others...|one": "i un altre...",
+    "and %(count)s others...": {
+        "other": "i %(count)s altres...",
+        "one": "i un altre..."
+    },
     "Invited": "Convidat",
     "Filter room members": "Filtra els membres de la sala",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (autoritat %(powerLevelNumber)s)",
@@ -184,8 +186,10 @@
     "Replying": "S'està contestant",
     "Unnamed room": "Sala sense nom",
     "Save": "Desa",
-    "(~%(count)s results)|other": "(~%(count)s resultats)",
-    "(~%(count)s results)|one": "(~%(count)s resultat)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s resultats)",
+        "one": "(~%(count)s resultat)"
+    },
     "Join Room": "Entra a la sala",
     "Upload avatar": "Puja l'avatar",
     "Forget room": "Oblida la sala",
@@ -244,54 +248,98 @@
     "No results": "Sense resultats",
     "Home": "Inici",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s s'hi han unit",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)ss'ha unit",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sha sortit",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s s'hi han unit i han sortit %(count)s vegades",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s s'hi han unit i han sortit",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sha entrat i ha sortit %(count)s vegades",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sha entrat i ha sortit",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s han sortit i han tornat a entrar %(count)s vegades",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s han sortit i han tornat a entrar",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sha sortit i ha tornat a entrar %(count)s vegades",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sha sortit i ha tornat a entrar",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s han rebutjat les seves invitacions %(count)s vegades",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s han rebutjat les seves invitacions",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sha rebutjat la seva invitació %(count)s vegades",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sha rebutjat la seva invitació",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "S'han retirat les invitacions de %(severalUsers)s %(count)s vegades",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "S'han retirat les invitacions de %(severalUsers)s",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "S'ha retirat la invitació de %(oneUser)s %(count)s vegades",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "S'ha retirat la invitació de %(oneUser)s",
-    "were invited %(count)s times|other": "a sigut invitat %(count)s vegades",
-    "were invited %(count)s times|one": "han sigut convidats",
-    "was invited %(count)s times|other": "ha sigut convidat %(count)s vegades",
-    "was invited %(count)s times|one": "ha sigut convidat",
-    "were banned %(count)s times|other": "han sigut expulsats %(count)s vegades",
-    "were banned %(count)s times|one": "ha sigut expulsat",
-    "was banned %(count)s times|other": "ha sigut expulsat %(count)s vegades",
-    "was banned %(count)s times|one": "ha sigut expulsat",
-    "were unbanned %(count)s times|other": "han sigut readmesos %(count)s vegades",
-    "were unbanned %(count)s times|one": "han sigut readmesos",
-    "was unbanned %(count)s times|other": "ha sigut readmès %(count)s vegades",
-    "was unbanned %(count)s times|one": "ha sigut readmès",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s han canviat el seu nom %(count)s vegades",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s han canviat el seu nom",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sha canviat el seu nom %(count)s vegades",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s ha canviat el seu nom",
-    "%(items)s and %(count)s others|other": "%(items)s i %(count)s altres",
-    "%(items)s and %(count)s others|one": "%(items)s i un altre",
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)s s'hi han unit",
+        "other": "%(severalUsers)s han entrat %(count)s vegades"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)ss'ha unit",
+        "other": "%(oneUser)sha entrat %(count)s vegades"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)s han sortit",
+        "other": "%(severalUsers)s han sortit %(count)s vegades"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)sha sortit",
+        "other": "%(oneUser)sha sortit %(count)s vegades"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s s'hi han unit i han sortit %(count)s vegades",
+        "one": "%(severalUsers)s s'hi han unit i han sortit"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)sha entrat i ha sortit %(count)s vegades",
+        "one": "%(oneUser)sha entrat i ha sortit"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s han sortit i han tornat a entrar %(count)s vegades",
+        "one": "%(severalUsers)s han sortit i han tornat a entrar"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)sha sortit i ha tornat a entrar %(count)s vegades",
+        "one": "%(oneUser)sha sortit i ha tornat a entrar"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s han rebutjat les seves invitacions %(count)s vegades",
+        "one": "%(severalUsers)s han rebutjat les seves invitacions"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)sha rebutjat la seva invitació %(count)s vegades",
+        "one": "%(oneUser)sha rebutjat la seva invitació"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "S'han retirat les invitacions de %(severalUsers)s %(count)s vegades",
+        "one": "S'han retirat les invitacions de %(severalUsers)s"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "S'ha retirat la invitació de %(oneUser)s %(count)s vegades",
+        "one": "S'ha retirat la invitació de %(oneUser)s"
+    },
+    "were invited %(count)s times": {
+        "other": "a sigut invitat %(count)s vegades",
+        "one": "han sigut convidats"
+    },
+    "was invited %(count)s times": {
+        "other": "ha sigut convidat %(count)s vegades",
+        "one": "ha sigut convidat"
+    },
+    "were banned %(count)s times": {
+        "other": "han sigut expulsats %(count)s vegades",
+        "one": "ha sigut expulsat"
+    },
+    "was banned %(count)s times": {
+        "other": "ha sigut expulsat %(count)s vegades",
+        "one": "ha sigut expulsat"
+    },
+    "were unbanned %(count)s times": {
+        "other": "han sigut readmesos %(count)s vegades",
+        "one": "han sigut readmesos"
+    },
+    "was unbanned %(count)s times": {
+        "other": "ha sigut readmès %(count)s vegades",
+        "one": "ha sigut readmès"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s han canviat el seu nom %(count)s vegades",
+        "one": "%(severalUsers)s han canviat el seu nom"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sha canviat el seu nom %(count)s vegades",
+        "one": "%(oneUser)s ha canviat el seu nom"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s i %(count)s altres",
+        "one": "%(items)s i un altre"
+    },
     "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
     "collapse": "col·lapsa",
     "expand": "expandeix",
     "Custom level": "Nivell personalitzat",
-    "And %(count)s more...|other": "I %(count)s més...",
+    "And %(count)s more...": {
+        "other": "I %(count)s més..."
+    },
     "Confirm Removal": "Confirmeu l'eliminació",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s han entrat %(count)s vegades",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sha entrat %(count)s vegades",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s han sortit %(count)s vegades",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sha sortit %(count)s vegades",
     "Create": "Crea",
     "Unknown error": "Error desconegut",
     "Incorrect password": "Contrasenya incorrecta",
@@ -335,7 +383,9 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "S'ha intentat carregar un punt específic de la línia de temps d'aquesta sala, però no s'ha pogut trobar.",
     "Failed to load timeline position": "No s'ha pogut carregar aquesta posició de la línia de temps",
     "Signed Out": "Sessió tancada",
-    "Uploading %(filename)s and %(count)s others|other": "Pujant %(filename)s i %(count)s més",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Pujant %(filename)s i %(count)s més"
+    },
     "Uploading %(filename)s": "Pujant %(filename)s",
     "Sign out": "Tanca la sessió",
     "Import E2E room keys": "Importar claus E2E de sala",
@@ -438,8 +488,10 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ha canviat l'adreça principal d'aquesta sala a %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s ha retirat l'adreça principal d'aquesta sala.",
     "%(displayName)s is typing …": "%(displayName)s està escrivint…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s i %(count)s més estan escrivint…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s i una altra persona estan escrivint…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s i %(count)s més estan escrivint…",
+        "one": "%(names)s i una altra persona estan escrivint…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s i %(lastPerson)s estan escrivint…",
     "You do not have permission to invite people to this room.": "No teniu permís per convidar gent a aquesta sala.",
     "Use a few words, avoid common phrases": "Feu servir unes quantes paraules, eviteu frases comunes",
@@ -594,8 +646,10 @@
     "Unable to access webcam / microphone": "No s'ha pogut accedir a la càmera web / micròfon",
     "Unable to access microphone": "No s'ha pogut accedir al micròfon",
     "Explore rooms": "Explora sales",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sno ha fet canvis",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sno ha fet canvis %(count)s cops",
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)sno ha fet canvis",
+        "other": "%(oneUser)sno ha fet canvis %(count)s cops"
+    },
     "Integration manager": "Gestor d'integracions",
     "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Els gestors d'integracions reben dades de configuració i poden modificar ginys, enviar invitacions a sales i establir nivells d'autoritat en nom teu.",
     "Identity server": "Servidor d'identitat",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index f58d93abf0..a3f16a0aa8 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -107,7 +107,10 @@
     "Failure to create room": "Vytvoření místnosti se nezdařilo",
     "Forget room": "Zapomenout místnost",
     "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
-    "and %(count)s others...|other": "a %(count)s další...",
+    "and %(count)s others...": {
+        "other": "a %(count)s další...",
+        "one": "a někdo další..."
+    },
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s upravil(a) widget %(widgetName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s odstranil(a) widget %(widgetName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s přidal(a) widget %(widgetName)s",
@@ -194,9 +197,11 @@
     "Unable to enable Notifications": "Nepodařilo se povolit oznámení",
     "Unmute": "Povolit",
     "Unnamed Room": "Nepojmenovaná místnost",
-    "Uploading %(filename)s and %(count)s others|zero": "Nahrávání souboru %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Nahrávání souboru %(filename)s a %(count)s dalších",
-    "Uploading %(filename)s and %(count)s others|other": "Nahrávání souboru %(filename)s a %(count)s dalších",
+    "Uploading %(filename)s and %(count)s others": {
+        "zero": "Nahrávání souboru %(filename)s",
+        "one": "Nahrávání souboru %(filename)s a %(count)s dalších",
+        "other": "Nahrávání souboru %(filename)s a %(count)s dalších"
+    },
     "Upload Failed": "Nahrávání selhalo",
     "Usage": "Použití",
     "Users": "Uživatelé",
@@ -238,15 +243,16 @@
     "Create": "Vytvořit",
     "Jump to read receipt": "Přejít na poslední potvrzení o přečtení",
     "Invite": "Pozvat",
-    "and %(count)s others...|one": "a někdo další...",
     "Hangup": "Zavěsit",
     "You seem to be uploading files, are you sure you want to quit?": "Zřejmě právě nahráváte soubory. Chcete přesto odejít?",
     "You seem to be in a call, are you sure you want to quit?": "Zřejmě máte probíhající hovor. Chcete přesto odejít?",
     "Idle": "Nečinný/á",
     "Unknown": "Neznámý",
     "Unnamed room": "Nepojmenovaná místnost",
-    "(~%(count)s results)|other": "(~%(count)s výsledků)",
-    "(~%(count)s results)|one": "(~%(count)s výsledek)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s výsledků)",
+        "one": "(~%(count)s výsledek)"
+    },
     "Upload avatar": "Nahrát avatar",
     "Mention": "Zmínit",
     "Invited": "Pozvaní",
@@ -298,49 +304,94 @@
     "Sign in with": "Přihlásit se pomocí",
     "Something went wrong!": "Něco se nepodařilo!",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstoupili",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)svstoupili",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)svstoupil(a)",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s %(count)s krát opustili",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sopustili",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s krát opustil(a)",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sopustil(a)",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s %(count)s krát vstoupili a opustili",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)svstoupili a opustili",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil(a) a opustil(a)",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)svstoupil(a) a opustil(a)",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s %(count)s krát opustili a znovu vstoupili",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sopustili a znovu vstoupili",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s krát opustil(a) a znovu vstoupil(a)",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sopustil(a) a znovu vstoupil(a)",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s %(count)s krát odmítli pozvání",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sodmítli pozvání",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s %(count)s krát odmítl pozvání",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sodmítl pozvání",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)směli %(count)s krát stažené pozvání",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)smeli stažené pozvání",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)směl %(count)s krát stažené pozvání",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)směl stažené pozvání",
-    "were invited %(count)s times|other": "byli %(count)s krát pozváni",
-    "were invited %(count)s times|one": "byli pozváni",
-    "was invited %(count)s times|other": "byl %(count)s krát pozván",
-    "was invited %(count)s times|one": "byl(a) pozván(a)",
-    "were banned %(count)s times|other": "byli %(count)s krát vykázáni",
-    "were banned %(count)s times|one": "byl(a) vykázán(a)",
-    "was banned %(count)s times|other": "byli %(count)s krát vykázáni",
-    "was banned %(count)s times|one": "byl(a) vykázán(a)",
-    "were unbanned %(count)s times|other": "měli %(count)s krát zrušeno vykázání",
-    "were unbanned %(count)s times|one": "měli zrušeno vykázání",
-    "was unbanned %(count)s times|other": "měl(a) %(count)s krát zrušeno vykázání",
-    "was unbanned %(count)s times|one": "má zrušeno vykázání",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s si %(count)s krát změnili jméno",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s si změnili jméno",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s si %(count)s krát změnil(a) jméno",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s si změnil(a) jméno",
-    "%(items)s and %(count)s others|other": "%(items)s a %(count)s další",
-    "%(items)s and %(count)s others|one": "%(items)s a jeden další",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s%(count)s krát vstoupili",
+        "one": "%(severalUsers)svstoupili"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)svstoupil(a)",
+        "other": "%(oneUser)s %(count)s krát vstoupil(a)"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s %(count)s krát opustili",
+        "one": "%(severalUsers)sopustili"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s %(count)s krát opustil(a)",
+        "one": "%(oneUser)sopustil(a)"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s %(count)s krát vstoupili a opustili",
+        "one": "%(severalUsers)svstoupili a opustili"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s %(count)s krát vstoupil(a) a opustil(a)",
+        "one": "%(oneUser)svstoupil(a) a opustil(a)"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s %(count)s krát opustili a znovu vstoupili",
+        "one": "%(severalUsers)sopustili a znovu vstoupili"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s %(count)s krát opustil(a) a znovu vstoupil(a)",
+        "one": "%(oneUser)sopustil(a) a znovu vstoupil(a)"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s %(count)s krát odmítli pozvání",
+        "one": "%(severalUsers)sodmítli pozvání"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s %(count)s krát odmítl pozvání",
+        "one": "%(oneUser)sodmítl pozvání"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)směli %(count)s krát stažené pozvání",
+        "one": "%(severalUsers)smeli stažené pozvání"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)směl %(count)s krát stažené pozvání",
+        "one": "%(oneUser)směl stažené pozvání"
+    },
+    "were invited %(count)s times": {
+        "other": "byli %(count)s krát pozváni",
+        "one": "byli pozváni"
+    },
+    "was invited %(count)s times": {
+        "other": "byl %(count)s krát pozván",
+        "one": "byl(a) pozván(a)"
+    },
+    "were banned %(count)s times": {
+        "other": "byli %(count)s krát vykázáni",
+        "one": "byl(a) vykázán(a)"
+    },
+    "was banned %(count)s times": {
+        "other": "byli %(count)s krát vykázáni",
+        "one": "byl(a) vykázán(a)"
+    },
+    "were unbanned %(count)s times": {
+        "other": "měli %(count)s krát zrušeno vykázání",
+        "one": "měli zrušeno vykázání"
+    },
+    "was unbanned %(count)s times": {
+        "other": "měl(a) %(count)s krát zrušeno vykázání",
+        "one": "má zrušeno vykázání"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s si %(count)s krát změnili jméno",
+        "one": "%(severalUsers)s si změnili jméno"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s si %(count)s krát změnil(a) jméno",
+        "one": "%(oneUser)s si změnil(a) jméno"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s a %(count)s další",
+        "one": "%(items)s a jeden další"
+    },
     "%(items)s and %(lastItem)s": "%(items)s a také %(lastItem)s",
-    "And %(count)s more...|other": "A %(count)s dalších...",
+    "And %(count)s more...": {
+        "other": "A %(count)s dalších..."
+    },
     "Confirm Removal": "Potvrdit odstranění",
     "Unknown error": "Neznámá chyba",
     "Incorrect password": "Nesprávné heslo",
@@ -349,7 +400,6 @@
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Zkontrolujte svou e-mailovou schránku a klepněte na odkaz ve zprávě, kterou jsme vám poslali. V případě, že jste to už udělali, klepněte na tlačítko Pokračovat.",
     "This will allow you to reset your password and receive notifications.": "Toto vám umožní obnovit si heslo a přijímat oznámení e-mailem.",
     "Skip": "Přeskočit",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil(a)",
     "You must <a>register</a> to use this functionality": "Pro využívání této funkce se <a>zaregistrujte</a>",
     "You must join the room to see its files": "Pro zobrazení souborů musíte do místnosti vstoupit",
     "Description": "Popis",
@@ -585,8 +635,10 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s nastavil(a) hlavní adresu této místnosti na %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s zrušil hlavní adresu této místnosti.",
     "%(displayName)s is typing …": "%(displayName)s píše …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s a %(count)s dalších píše …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s a jeden další píše …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s a %(count)s dalších píše …",
+        "one": "%(names)s a jeden další píše …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s a %(lastPerson)s píšou …",
     "Unrecognised address": "Neznámá adresa",
     "You do not have permission to invite people to this room.": "Nemáte oprávnění zvát lidi do této místnosti.",
@@ -844,8 +896,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Tento soubor je <b>příliš velký</b>. Limit na velikost je %(limit)s, ale soubor má %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Tyto soubory jsou <b>příliš velké</b>. Limit je %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Některé soubory <b>jsou příliš velké</b>. Limit je %(limit)s.",
-    "Upload %(count)s other files|other": "Nahrát %(count)s ostatních souborů",
-    "Upload %(count)s other files|one": "Nahrát %(count)s další soubor",
+    "Upload %(count)s other files": {
+        "other": "Nahrát %(count)s ostatních souborů",
+        "one": "Nahrát %(count)s další soubor"
+    },
     "Cancel All": "Zrušit vše",
     "Upload Error": "Chyba při nahrávání",
     "Remember my selection for this widget": "Zapamatovat si volbu pro tento widget",
@@ -861,8 +915,10 @@
     "Enter username": "Zadejte uživatelské jméno",
     "Some characters not allowed": "Nějaké znaky jsou zakázané",
     "Add room": "Přidat místnost",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
+        "one": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti."
+    },
     "Failed to get autodiscovery configuration from server": "Nepovedlo se načíst nastavení automatického objevování ze serveru",
     "Invalid base_url for m.homeserver": "Neplatná base_url pro m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Na URL domovského serveru asi není funkční Matrix server",
@@ -982,8 +1038,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Zkuste posunout časovou osu nahoru, jestli tam nejsou nějaké dřívější.",
     "Remove recent messages by %(user)s": "Odstranit nedávné zprávy od uživatele %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Pro větší množství zpráv to může nějakou dobu trvat. V průběhu prosím neobnovujte klienta.",
-    "Remove %(count)s messages|other": "Odstranit %(count)s zpráv",
-    "Remove %(count)s messages|one": "Odstranit zprávu",
+    "Remove %(count)s messages": {
+        "other": "Odstranit %(count)s zpráv",
+        "one": "Odstranit zprávu"
+    },
     "Deactivate user?": "Deaktivovat uživatele?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deaktivování uživatele ho odhlásí a zabrání mu v opětovném přihlášení. Navíc bude odstraněn ze všech místností. Akci nelze vzít zpět. Opravdu chcete uživatele deaktivovat?",
     "Deactivate user": "Deaktivovat uživatele",
@@ -998,10 +1056,14 @@
     "This invite to %(roomName)s was sent to %(email)s": "Pozvánka do %(roomName)s byla odeslána na adresu %(email)s",
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Používat server identit z nastavení k přijímání pozvánek přímo v %(brand)su.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Sdílet tento e-mail v nastavení, abyste mohli dostávat pozvánky přímo v %(brand)su.",
-    "%(count)s unread messages including mentions.|other": "%(count)s nepřečtených zpráv a zmínek.",
-    "%(count)s unread messages including mentions.|one": "Nepřečtená zmínka.",
-    "%(count)s unread messages.|other": "%(count)s nepřečtených zpráv.",
-    "%(count)s unread messages.|one": "Nepřečtená zpráva.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s nepřečtených zpráv a zmínek.",
+        "one": "Nepřečtená zmínka."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s nepřečtených zpráv.",
+        "one": "Nepřečtená zpráva."
+    },
     "Unread messages.": "Nepřečtené zprávy.",
     "Failed to deactivate user": "Deaktivace uživatele se nezdařila",
     "This client does not support end-to-end encryption.": "Tento klient nepodporuje koncové šifrování.",
@@ -1032,10 +1094,14 @@
     "Quick Reactions": "Rychlé reakce",
     "Cancel search": "Zrušit hledání",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Vytvořte prosím <newIssueLink>novou issue</newIssueLink> na GitHubu abychom mohli chybu opravit.",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s neudělali %(count)s krát žádnou změnu",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s neudělali žádnou změnu",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s neudělal(a) %(count)s krát žádnou změnu",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s neudělal(a) žádnou změnu",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s neudělali %(count)s krát žádnou změnu",
+        "one": "%(severalUsers)s neudělali žádnou změnu"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s neudělal(a) %(count)s krát žádnou změnu",
+        "one": "%(oneUser)s neudělal(a) žádnou změnu"
+    },
     "e.g. my-room": "např. moje-mistnost",
     "Use bots, bridges, widgets and sticker packs": "Použít boty, propojení, widgety a balíky nálepek",
     "Terms of Service": "Podmínky použití",
@@ -1161,8 +1227,10 @@
     "not found": "nenalezeno",
     "Close preview": "Zavřít náhled",
     "Hide verified sessions": "Skrýt ověřené relace",
-    "%(count)s verified sessions|other": "%(count)s ověřených relací",
-    "%(count)s verified sessions|one": "1 ověřená relace",
+    "%(count)s verified sessions": {
+        "other": "%(count)s ověřených relací",
+        "one": "1 ověřená relace"
+    },
     "Language Dropdown": "Menu jazyků",
     "Country Dropdown": "Menu států",
     "Verify this session": "Ověřit tuto relaci",
@@ -1252,8 +1320,10 @@
     "Your messages are not secure": "Vaše zprávy nejsou zabezpečené",
     "One of the following may be compromised:": "Něco z následujích věcí může být kompromitováno:",
     "Your homeserver": "Váš domovský server",
-    "%(count)s sessions|other": "%(count)s relací",
-    "%(count)s sessions|one": "%(count)s relace",
+    "%(count)s sessions": {
+        "other": "%(count)s relací",
+        "one": "%(count)s relace"
+    },
     "Hide sessions": "Skrýt relace",
     "Verify by emoji": "Ověřit pomocí emoji",
     "Verify by comparing unique emoji.": "Ověření porovnáním několika emoji.",
@@ -1333,10 +1403,14 @@
     "Not currently indexing messages for any room.": "Aktuálně neindexujeme žádné zprávy.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s z %(totalRooms)s",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s změnil(a) jméno místnosti z %(oldRoomName)s na %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s přidal(a) této místnosti alternativní adresy %(addresses)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s přidal(a) této místnosti alternativní adresu %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odebral(a) této místnosti alternativní adresy %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odebral(a) této místnosti alternativní adresu %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s přidal(a) této místnosti alternativní adresy %(addresses)s.",
+        "one": "%(senderName)s přidal(a) této místnosti alternativní adresu %(addresses)s."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s odebral(a) této místnosti alternativní adresy %(addresses)s.",
+        "one": "%(senderName)s odebral(a) této místnosti alternativní adresu %(addresses)s."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s změnil(a) alternativní adresy této místnosti.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s změnil(a) hlavní a alternativní adresy této místnosti.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s změnil(a) adresy této místnosti.",
@@ -1435,8 +1509,10 @@
     "Activity": "Aktivity",
     "A-Z": "A–Z",
     "List options": "Možnosti seznamu",
-    "Show %(count)s more|other": "Zobrazit %(count)s dalších",
-    "Show %(count)s more|one": "Zobrazit %(count)s další",
+    "Show %(count)s more": {
+        "other": "Zobrazit %(count)s dalších",
+        "one": "Zobrazit %(count)s další"
+    },
     "Notification options": "Možnosti oznámení",
     "Favourited": "Oblíbená",
     "Forget Room": "Zapomenout místnost",
@@ -1984,7 +2060,9 @@
     "Failed to save your profile": "Váš profil se nepodařilo uložit",
     "%(peerName)s held the call": "%(peerName)s podržel hovor",
     "You held the call <a>Resume</a>": "Podrželi jste hovor <a>Pokračovat</a>",
-    "You can only pin up to %(count)s widgets|other": "Můžete připnout až %(count)s widgetů",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Můžete připnout až %(count)s widgetů"
+    },
     "Edit widgets, bridges & bots": "Upravujte widgety, propojení a boty",
     "a device cross-signing signature": "zařízení používající křížový podpis",
     "This widget would like to:": "Tento widget by chtěl:",
@@ -1992,8 +2070,10 @@
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Toto můžete deaktivovat, pokud bude místnost použita pro spolupráci s externími týmy, které mají svůj vlastní domovský server. Toto nelze později změnit.",
     "Join the conference from the room information card on the right": "Připojte se ke konferenci z informační karty místnosti napravo",
     "Join the conference at the top of this room": "Připojte se ke konferenci v horní části této místnosti",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místnosti.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místností.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místnosti.",
+        "other": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místností."
+    },
     "well formed": "ve správném tvaru",
     "See <b>%(eventType)s</b> events posted to this room": "Zobrazit události <b>%(eventType)s</b> zveřejněné v této místnosti",
     "Send stickers to your active room as you": "Poslat nálepky do vaší aktivní místnosti jako vy",
@@ -2133,8 +2213,10 @@
     "Skip for now": "Prozatím přeskočit",
     "Failed to create initial space rooms": "Vytvoření počátečních místností v prostoru se nezdařilo",
     "Random": "Náhodný",
-    "%(count)s members|one": "%(count)s člen",
-    "%(count)s members|other": "%(count)s členů",
+    "%(count)s members": {
+        "one": "%(count)s člen",
+        "other": "%(count)s členů"
+    },
     "Your server does not support showing space hierarchies.": "Váš server nepodporuje zobrazování hierarchií prostorů.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Opravdu chcete opustit prostor '%(spaceName)s'?",
     "This space is not public. You will not be able to rejoin without an invite.": "Tento prostor není veřejný. Bez pozvánky se nebudete moci znovu připojit.",
@@ -2201,8 +2283,10 @@
     "Failed to remove some rooms. Try again later": "Odebrání některých místností se nezdařilo. Zkuste to později znovu",
     "This room is suggested as a good one to join": "Tato místnost je doporučena jako dobrá pro připojení",
     "Suggested": "Doporučeno",
-    "%(count)s rooms|one": "%(count)s místnost",
-    "%(count)s rooms|other": "%(count)s místností",
+    "%(count)s rooms": {
+        "one": "%(count)s místnost",
+        "other": "%(count)s místností"
+    },
     "You don't have permission": "Nemáte povolení",
     "Invite to %(roomName)s": "Pozvat do %(roomName)s",
     "Invite with email or username": "Pozvěte e-mailem nebo uživatelským jménem",
@@ -2211,7 +2295,10 @@
     "Just me": "Jen já",
     "Edit devices": "Upravit zařízení",
     "Manage & explore rooms": "Spravovat a prozkoumat místnosti",
-    "%(count)s people you know have already joined|one": "%(count)s osoba, kterou znáte, se již připojila",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s osoba, kterou znáte, se již připojila",
+        "other": "%(count)s lidí, které znáte, se již připojili"
+    },
     "Invited people will be able to read old messages.": "Pozvaní lidé budou moci číst staré zprávy.",
     "You can add more later too, including already existing ones.": "Později můžete přidat i další, včetně již existujících.",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Ověřte svou identitu, abyste získali přístup k šifrovaným zprávám a prokázali svou identitu ostatním.",
@@ -2222,7 +2309,6 @@
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Konzultace s %(transferTarget)s. <a>Převod na %(transferee)s</a>",
     "Warn before quitting": "Varovat před ukončením",
     "Invite to just this room": "Pozvat jen do této místnosti",
-    "%(count)s people you know have already joined|other": "%(count)s lidí, které znáte, se již připojili",
     "Add existing rooms": "Přidat stávající místnosti",
     "We couldn't create your DM.": "Nemohli jsme vytvořit vaši přímou zprávu.",
     "Consult first": "Nejprve se poraďte",
@@ -2250,8 +2336,10 @@
     "Delete all": "Smazat všechny",
     "Some of your messages have not been sent": "Některé z vašich zpráv nebyly odeslány",
     "Including %(commaSeparatedMembers)s": "Včetně %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Zobrazit jednoho člena",
-    "View all %(count)s members|other": "Zobrazit všech %(count)s členů",
+    "View all %(count)s members": {
+        "one": "Zobrazit jednoho člena",
+        "other": "Zobrazit všech %(count)s členů"
+    },
     "Failed to send": "Odeslání se nezdařilo",
     "What do you want to organise?": "Co si přejete organizovat?",
     "Play": "Přehrát",
@@ -2264,8 +2352,10 @@
     "Leave the beta": "Opustit beta verzi",
     "Beta": "Beta",
     "Want to add a new room instead?": "Chcete místo toho přidat novou místnost?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Přidávání místnosti...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Přidávání místností... (%(progress)s z %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Přidávání místnosti...",
+        "other": "Přidávání místností... (%(progress)s z %(count)s)"
+    },
     "Not all selected were added": "Ne všechny vybrané byly přidány",
     "You are not allowed to view this server's rooms list": "Namáte oprávnění zobrazit seznam místností tohoto serveru",
     "Error processing voice message": "Chyba při zpracování hlasové zprávy",
@@ -2289,8 +2379,10 @@
     "Sends the given message with a space themed effect": "Odešle zadanou zprávu s efektem vesmíru",
     "See when people join, leave, or are invited to your active room": "Zjistěte, kdy se lidé připojí, odejdou nebo jsou pozváni do vaší aktivní místnosti",
     "See when people join, leave, or are invited to this room": "Zjistěte, kdy se lidé připojí, odejdou nebo jsou pozváni do této místnosti",
-    "Currently joining %(count)s rooms|one": "Momentálně se připojuje %(count)s místnost",
-    "Currently joining %(count)s rooms|other": "Momentálně se připojuje %(count)s místností",
+    "Currently joining %(count)s rooms": {
+        "one": "Momentálně se připojuje %(count)s místnost",
+        "other": "Momentálně se připojuje %(count)s místností"
+    },
     "The user you called is busy.": "Volaný uživatel je zaneprázdněn.",
     "User Busy": "Uživatel zaneprázdněn",
     "Or send invite link": "Nebo pošlete pozvánku",
@@ -2325,10 +2417,14 @@
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Tento uživatel se chová nezákonně, například zveřejňuje osobní údaje o cizích lidech nebo vyhrožuje násilím.\nTato skutečnost bude nahlášena moderátorům místnosti, kteří to mohou předat právním orgánům.",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "To, co tento uživatel píše, je špatné.\nTato skutečnost bude nahlášena moderátorům místnosti.",
     "Please provide an address": "Uveďte prosím adresu",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)szměnil(a) ACL serveru",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)szměnil(a) %(count)s krát ACL serveru",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)szměnili ACL serveru",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)szměnili %(count)s krát ACL serveru",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)szměnil(a) ACL serveru",
+        "other": "%(oneUser)szměnil(a) %(count)s krát ACL serveru"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)szměnili ACL serveru",
+        "other": "%(severalUsers)szměnili %(count)s krát ACL serveru"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Inicializace vyhledávání zpráv se nezdařila, zkontrolujte <a>svá nastavení</a>",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Nastavte adresy pro tento prostor, aby jej uživatelé mohli najít prostřednictvím domovského serveru (%(localDomain)s)",
     "To publish an address, it needs to be set as a local address first.": "Chcete-li adresu zveřejnit, je třeba ji nejprve nastavit jako místní adresu.",
@@ -2405,7 +2501,10 @@
     "Select spaces": "Vybrané prostory",
     "You're removing all spaces. Access will default to invite only": "Odstraňujete všechny prostory. Přístup bude ve výchozím nastavení pouze na pozvánky",
     "User Directory": "Adresář uživatelů",
-    "& %(count)s more|other": "a %(count)s dalších",
+    "& %(count)s more": {
+        "other": "a %(count)s dalších",
+        "one": "a %(count)s další"
+    },
     "Only invited people can join.": "Připojit se mohou pouze pozvané osoby.",
     "Private (invite only)": "Soukromý (pouze pro pozvané)",
     "This upgrade will allow members of selected spaces access to this room without an invite.": "Tato změna umožní členům vybraných prostorů přístup do této místnosti bez pozvánky.",
@@ -2437,8 +2536,10 @@
     "Sticker": "Nálepka",
     "The call is in an unknown state!": "Hovor je v neznámém stavu!",
     "Call back": "Zavolat zpět",
-    "Show %(count)s other previews|one": "Zobrazit %(count)s další náhled",
-    "Show %(count)s other previews|other": "Zobrazit %(count)s dalších náhledů",
+    "Show %(count)s other previews": {
+        "one": "Zobrazit %(count)s další náhled",
+        "other": "Zobrazit %(count)s dalších náhledů"
+    },
     "Access": "Přístup",
     "People with supported clients will be able to join the room without having a registered account.": "Lidé s podporovanými klienty se budou moci do místnosti připojit, aniž by měli registrovaný účet.",
     "Decide who can join %(roomName)s.": "Rozhodněte, kdo se může připojit k místnosti %(roomName)s.",
@@ -2446,7 +2547,10 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Každý, kdo se nachází v prostoru, ho může najít a připojit se k němu. Můžete vybrat více prostorů.",
     "Spaces with access": "Prostory s přístupem",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Každý, kdo se nachází v prostoru, ho může najít a připojit se k němu. <a>Zde upravte, ke kterým prostorům lze přistupovat.</a>",
-    "Currently, %(count)s spaces have access|other": "V současné době má %(count)s prostorů přístup k",
+    "Currently, %(count)s spaces have access": {
+        "other": "V současné době má %(count)s prostorů přístup k",
+        "one": "V současné době má prostor přístup"
+    },
     "Upgrade required": "Vyžadována aktualizace",
     "Mentions & keywords": "Zmínky a klíčová slova",
     "Message bubbles": "Bubliny zpráv",
@@ -2521,8 +2625,6 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s odepnul(a) <a>zprávu</a> z této místnosti. Zobrazit všechny <b>připnuté zprávy</b>.",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s připnul(a) zprávu k této místnosti. Zobrazit všechny připnuté zprávy.",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s připnul(a) <a>zprávu</a> k této místnosti. Zobrazit všechny <b>připnuté zprávy</b>.",
-    "Currently, %(count)s spaces have access|one": "V současné době má prostor přístup",
-    "& %(count)s more|one": "a %(count)s další",
     "Some encryption parameters have been changed.": "Byly změněny některé parametry šifrování.",
     "Role in <RoomName/>": "Role v <RoomName/>",
     "Send a sticker": "Odeslat nálepku",
@@ -2603,15 +2705,21 @@
     "Disinvite from %(roomName)s": "Zrušit pozvánku do %(roomName)s",
     "Threads": "Vlákna",
     "Create poll": "Vytvořit hlasování",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Aktualizace prostoru...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Aktualizace prostorů... (%(progress)s z %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Odeslání pozvánky...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Odesílání pozvánek... (%(progress)s z %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Aktualizace prostoru...",
+        "other": "Aktualizace prostorů... (%(progress)s z %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Odeslání pozvánky...",
+        "other": "Odesílání pozvánek... (%(progress)s z %(count)s)"
+    },
     "Loading new room": "Načítání nové místnosti",
     "Upgrading room": "Aktualizace místnosti",
     "Downloading": "Stahování",
-    "%(count)s reply|one": "%(count)s odpověď",
-    "%(count)s reply|other": "%(count)s odpovědí",
+    "%(count)s reply": {
+        "one": "%(count)s odpověď",
+        "other": "%(count)s odpovědí"
+    },
     "View in room": "Zobrazit v místnosti",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Zadejte bezpečnostní frázi nebo <button>použijte bezpečnostní klíč</button> pro pokračování.",
     "What projects are your team working on?": "Na jakých projektech váš tým pracuje?",
@@ -2643,12 +2751,18 @@
     "Rename": "Přejmenovat",
     "Select all": "Vybrat všechny",
     "Deselect all": "Zrušit výběr všech",
-    "Sign out devices|one": "Odhlášení zařízení",
-    "Sign out devices|other": "Odhlášení zařízení",
-    "Click the button below to confirm signing out these devices.|other": "Kliknutím na tlačítko níže potvrdíte odhlášení těchto zařízení.",
-    "Click the button below to confirm signing out these devices.|one": "Kliknutím na tlačítko níže potvrdíte odhlášení tohoto zařízení.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Potvrďte odhlášení tohoto zařízení pomocí Jednotného přihlášení, abyste prokázali svou totožnost.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Potvrďte odhlášení těchto zařízení pomocí Jednotného přihlášení, abyste prokázali svou totožnost.",
+    "Sign out devices": {
+        "one": "Odhlášení zařízení",
+        "other": "Odhlášení zařízení"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "other": "Kliknutím na tlačítko níže potvrdíte odhlášení těchto zařízení.",
+        "one": "Kliknutím na tlačítko níže potvrdíte odhlášení tohoto zařízení."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Potvrďte odhlášení tohoto zařízení pomocí Jednotného přihlášení, abyste prokázali svou totožnost.",
+        "other": "Potvrďte odhlášení těchto zařízení pomocí Jednotného přihlášení, abyste prokázali svou totožnost."
+    },
     "Automatically send debug logs on any error": "Automaticky odesílat ladící protokoly při jakékoli chybě",
     "Use a more compact 'Modern' layout": "Použít kompaktnější \"moderní\" rozložení",
     "Light high contrast": "Světlý vysoký kontrast",
@@ -2692,12 +2806,18 @@
     "Large": "Velký",
     "Image size in the timeline": "Velikost obrázku na časové ose",
     "%(senderName)s has updated the room layout": "%(senderName)s aktualizoval rozvržení místnosti",
-    "Based on %(count)s votes|one": "Na základě %(count)s hlasu",
-    "Based on %(count)s votes|other": "Na základě %(count)s hlasů",
-    "%(count)s votes|one": "%(count)s hlas",
-    "%(count)s votes|other": "%(count)s hlasů",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s a %(count)s další",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s dalších",
+    "Based on %(count)s votes": {
+        "one": "Na základě %(count)s hlasu",
+        "other": "Na základě %(count)s hlasů"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s hlas",
+        "other": "%(count)s hlasů"
+    },
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s a %(count)s další",
+        "other": "%(spaceName)s and %(count)s dalších"
+    },
     "Sorry, the poll you tried to create was not posted.": "Omlouváme se, ale hlasování, které jste se pokusili vytvořit, nebylo zveřejněno.",
     "Failed to post poll": "Nepodařilo se zveřejnit hlasování",
     "Sorry, your vote was not registered. Please try again.": "Je nám líto, váš hlas nebyl zaregistrován. Zkuste to prosím znovu.",
@@ -2722,9 +2842,11 @@
     "Start new chat": "Zahájit nový chat",
     "Recently viewed": "Nedávno zobrazené",
     "To view all keyboard shortcuts, <a>click here</a>.": "Pro zobrazení všech klávesových zkratek, <a>klikněte zde</a>.",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s hlasů. Hlasujte a podívejte se na výsledky",
+    "%(count)s votes cast. Vote to see the results": {
+        "other": "%(count)s hlasů. Hlasujte a podívejte se na výsledky",
+        "one": "%(count)s hlas. Hlasujte a podívejte se na výsledky"
+    },
     "No votes cast": "Nikdo nehlasoval",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s hlas. Hlasujte a podívejte se na výsledky",
     "You can turn this off anytime in settings": "Tuto funkci můžete kdykoli vypnout v nastavení",
     "We <Bold>don't</Bold> share information with third parties": "<Bold>Nesdílíme</Bold> informace s třetími stranami",
     "We <Bold>don't</Bold> record or profile any account data": "<Bold>Nezaznamenáváme ani neprofilujeme</Bold> žádné údaje o účtu",
@@ -2747,8 +2869,10 @@
     "Failed to end poll": "Nepodařilo se ukončit hlasování",
     "The poll has ended. Top answer: %(topAnswer)s": "Hlasování skončilo. Nejčastější odpověď: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "Hlasování skončilo. Nikdo nehlasoval.",
-    "Final result based on %(count)s votes|one": "Konečný výsledek na základě %(count)s hlasu",
-    "Final result based on %(count)s votes|other": "Konečný výsledek na základě %(count)s hlasů",
+    "Final result based on %(count)s votes": {
+        "one": "Konečný výsledek na základě %(count)s hlasu",
+        "other": "Konečný výsledek na základě %(count)s hlasů"
+    },
     "Link to room": "Odkaz na místnost",
     "Recent searches": "Nedávná vyhledávání",
     "To search messages, look for this icon at the top of a room <icon/>": "Pro vyhledávání zpráv hledejte tuto ikonu v horní části místnosti <icon/>",
@@ -2760,16 +2884,24 @@
     "Including you, %(commaSeparatedMembers)s": "Včetně vás, %(commaSeparatedMembers)s",
     "Copy room link": "Kopírovat odkaz",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Nebyli jsme schopni porozumět zadanému datu (%(inputDate)s). Zkuste použít formát RRRR-MM-DD.",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Exportována %(count)s událost za %(seconds)s sekund",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Exportováno %(count)s událostí za %(seconds)s sekund",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Exportována %(count)s událost za %(seconds)s sekund",
+        "other": "Exportováno %(count)s událostí za %(seconds)s sekund"
+    },
     "Export successful!": "Export byl úspěšný!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Načtena %(count)s událost za %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "Načteno %(count)s událostí za %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Načtena %(count)s událost za %(seconds)ss",
+        "other": "Načteno %(count)s událostí za %(seconds)ss"
+    },
     "Processing event %(number)s out of %(total)s": "Zpracování události %(number)s z %(total)s",
-    "Fetched %(count)s events so far|one": "Načtena %(count)s událost",
-    "Fetched %(count)s events so far|other": "Načteno %(count)s událostí",
-    "Fetched %(count)s events out of %(total)s|one": "Načtena %(count)s událost z %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Načteno %(count)s událostí z %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Načtena %(count)s událost",
+        "other": "Načteno %(count)s událostí"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Načtena %(count)s událost z %(total)s",
+        "other": "Načteno %(count)s událostí z %(total)s"
+    },
     "Generating a ZIP": "Vytvoření souboru ZIP",
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Vaše konverzace s členy tohoto prostoru se seskupí. Vypnutím této funkce se tyto chaty skryjí z vašeho pohledu na %(spaceName)s.",
     "Sections to show": "Sekce pro zobrazení",
@@ -2817,10 +2949,14 @@
     "Failed to fetch your location. Please try again later.": "Nepodařilo se zjistit vaši polohu. Zkuste to prosím později.",
     "Could not fetch location": "Nepodařilo se zjistit polohu",
     "Automatically send debug logs on decryption errors": "Automaticky odesílat ladící protokoly při chybách dešifrování",
-    "was removed %(count)s times|one": "byl(a) odebrán(a)",
-    "was removed %(count)s times|other": "byli odebráni %(count)s krát",
-    "were removed %(count)s times|one": "byli odebráni",
-    "were removed %(count)s times|other": "byli odebráni %(count)s krát",
+    "was removed %(count)s times": {
+        "one": "byl(a) odebrán(a)",
+        "other": "byli odebráni %(count)s krát"
+    },
+    "were removed %(count)s times": {
+        "one": "byli odebráni",
+        "other": "byli odebráni %(count)s krát"
+    },
     "Remove from room": "Odebrat z místnosti",
     "Failed to remove user": "Nepodařilo se odebrat uživatele",
     "Remove them from specific things I'm able to": "Odebrat je z konkrétních míst, kam mohu",
@@ -2899,19 +3035,29 @@
     "Feedback sent! Thanks, we appreciate it!": "Zpětná vazba odeslána! Děkujeme, vážíme si toho!",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Děkujeme za vyzkoušení beta verze a prosíme o co nejpodrobnější informace, abychom ji mohli vylepšit.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s a %(space2Name)s",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sodeslal(a) skrytou zprávu",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s odeslal(a) %(count)s skrytých zpráv",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sodeslali skrytou zprávu",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sodeslali %(count)s skrytých zpráv",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)ssmazal(a) %(count)s zpráv",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)ssmazal(a) zprávu",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)ssmazali zprávu",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)ssmazali %(count)s zpráv",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sodeslal(a) skrytou zprávu",
+        "other": "%(oneUser)s odeslal(a) %(count)s skrytých zpráv"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sodeslali skrytou zprávu",
+        "other": "%(severalUsers)sodeslali %(count)s skrytých zpráv"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)ssmazal(a) %(count)s zpráv",
+        "one": "%(oneUser)ssmazal(a) zprávu"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)ssmazali zprávu",
+        "other": "%(severalUsers)ssmazali %(count)s zpráv"
+    },
     "Maximise": "Maximalizovat",
     "Automatically send debug logs when key backup is not functioning": "Automaticky odeslat ladící protokoly, když zálohování klíčů nefunguje",
     "<empty string>": "<prázdný řetězec>",
-    "<%(count)s spaces>|one": "<mezera>",
-    "<%(count)s spaces>|other": "<%(count)s mezer>",
+    "<%(count)s spaces>": {
+        "one": "<mezera>",
+        "other": "<%(count)s mezer>"
+    },
     "Join %(roomAddress)s": "Vstoupit do %(roomAddress)s",
     "Edit poll": "Upravit hlasování",
     "Sorry, you can't edit a poll after votes have been cast.": "Je nám líto, ale po odevzdání hlasů nelze hlasování upravovat.",
@@ -2941,10 +3087,14 @@
     "Match system": "Podle systému",
     "Insert a trailing colon after user mentions at the start of a message": "Vložit dvojtečku za zmínku o uživateli na začátku zprávy",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Odpovědět na probíhající vlákno nebo použít \"%(replyInThread)s\", když najedete na zprávu a začnete novou.",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)szměnil(a) <a>připnuté zprávy</a> místnosti",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s%(count)s krát změnil(a) <a>připnuté zprávy</a> místnosti",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)szměnili <a>připnuté zprávy</a> místnosti",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s%(count)s krát změnili <a>připnuté zprávy</a> v místnosti",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)szměnil(a) <a>připnuté zprávy</a> místnosti",
+        "other": "%(oneUser)s%(count)s krát změnil(a) <a>připnuté zprávy</a> místnosti"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)szměnili <a>připnuté zprávy</a> místnosti",
+        "other": "%(severalUsers)s%(count)s krát změnili <a>připnuté zprávy</a> v místnosti"
+    },
     "Show polls button": "Zobrazit tlačítko hlasování",
     "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Prostory představují nový způsob seskupování místností a osob. Jaký prostor chcete vytvořit? To můžete později změnit.",
     "Click": "Kliknutí",
@@ -2967,10 +3117,14 @@
     "%(displayName)s's live location": "Poloha %(displayName)s živě",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Zrušte zaškrtnutí, pokud chcete odstranit i systémové zprávy tohoto uživatele (např. změna členství, změna profilu...)",
     "Preserve system messages": "Zachovat systémové zprávy",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Chystáte se odstranit %(count)s zprávu od %(user)s. Tím ji trvale odstraníte pro všechny účastníky konverzace. Přejete si pokračovat?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Chystáte se odstranit %(count)s zpráv od %(user)s. Tím je trvale odstraníte pro všechny účastníky konverzace. Přejete si pokračovat?",
-    "Currently removing messages in %(count)s rooms|one": "Momentálně se odstraňují zprávy v %(count)s místnosti",
-    "Currently removing messages in %(count)s rooms|other": "Momentálně se odstraňují zprávy v %(count)s místnostech",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Chystáte se odstranit %(count)s zprávu od %(user)s. Tím ji trvale odstraníte pro všechny účastníky konverzace. Přejete si pokračovat?",
+        "other": "Chystáte se odstranit %(count)s zpráv od %(user)s. Tím je trvale odstraníte pro všechny účastníky konverzace. Přejete si pokračovat?"
+    },
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Momentálně se odstraňují zprávy v %(count)s místnosti",
+        "other": "Momentálně se odstraňují zprávy v %(count)s místnostech"
+    },
     "%(value)ss": "%(value)ss",
     "%(value)sm": "%(value)sm",
     "%(value)sh": "%(value)sh",
@@ -3056,16 +3210,20 @@
     "Create room": "Vytvořit místnost",
     "Create video room": "Vytvořit video místnost",
     "Create a video room": "Vytvořit video místnost",
-    "%(count)s participants|one": "1 účastník",
-    "%(count)s participants|other": "%(count)s účastníků",
+    "%(count)s participants": {
+        "one": "1 účastník",
+        "other": "%(count)s účastníků"
+    },
     "New video room": "Nová video místnost",
     "New room": "Nová místnost",
     "%(featureName)s Beta feedback": "Zpětná vazba beta funkce %(featureName)s",
     "Threads help keep your conversations on-topic and easy to track.": "Vlákna pomáhají udržovat konverzace k tématu a snadno je sledovat.",
     "sends hearts": "posílá srdíčka",
     "Sends the given message with hearts": "Odešle danou zprávu se srdíčky",
-    "Confirm signing out these devices|one": "Potvrďte odhlášení z tohoto zařízení",
-    "Confirm signing out these devices|other": "Potvrďte odhlášení z těchto zařízení",
+    "Confirm signing out these devices": {
+        "one": "Potvrďte odhlášení z tohoto zařízení",
+        "other": "Potvrďte odhlášení z těchto zařízení"
+    },
     "Live location ended": "Sdílení polohy živě skončilo",
     "View live location": "Zobrazit polohu živě",
     "Live location enabled": "Poloha živě povolena",
@@ -3104,8 +3262,10 @@
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Byli jste odhlášeni ze všech zařízení a již nebudete dostávat push oznámení. Chcete-li oznámení znovu povolit, znovu se přihlaste na každém zařízení.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Pokud si chcete zachovat přístup k historii chatu v zašifrovaných místnostech, nastavte si zálohování klíčů nebo exportujte klíče zpráv z některého z dalších zařízení, než budete pokračovat.",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Odhlášením zařízení odstraníte šifrovací klíče zpráv, které jsou v nich uloženy, a historie zašifrovaných chatů tak nebude čitelná.",
-    "Seen by %(count)s people|one": "Viděl %(count)s člověk",
-    "Seen by %(count)s people|other": "Vidělo %(count)s lidí",
+    "Seen by %(count)s people": {
+        "one": "Viděl %(count)s člověk",
+        "other": "Vidělo %(count)s lidí"
+    },
     "Your password was successfully changed.": "Vaše heslo bylo úspěšně změněno.",
     "An error occurred while stopping your live location": "Při ukončování sdílení polohy živě došlo k chybě",
     "Enable live location sharing": "Povolit sdílení polohy živě",
@@ -3129,8 +3289,10 @@
     "Click to read topic": "Klikněte pro přečtení tématu",
     "Edit topic": "Upravit téma",
     "Joining…": "Připojování…",
-    "%(count)s people joined|one": "%(count)s osoba se připojila",
-    "%(count)s people joined|other": "%(count)s osob se připojilo",
+    "%(count)s people joined": {
+        "one": "%(count)s osoba se připojila",
+        "other": "%(count)s osob se připojilo"
+    },
     "Resent!": "Přeposláno!",
     "Did not receive it? <a>Resend it</a>": "Nedostali jste ho? <a>Poslat znovu</a>",
     "To create your account, open the link in the email we just sent to %(emailAddress)s.": "Pro vytvoření účtu, otevřete odkaz v e-mailu, který jsme právě zaslali na adresu %(emailAddress)s.",
@@ -3163,8 +3325,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Pokud nevidíte, koho hledáte, pošlete mu odkaz na pozvánku.",
     "Some results may be hidden for privacy": "Některé výsledky mohou být z důvodu ochrany soukromí skryté",
     "Search for": "Hledat",
-    "%(count)s Members|one": "%(count)s člen",
-    "%(count)s Members|other": "%(count)s členů",
+    "%(count)s Members": {
+        "one": "%(count)s člen",
+        "other": "%(count)s členů"
+    },
     "Show: Matrix rooms": "Zobrazit: Matrix místnosti",
     "Show: %(instance)s rooms (%(server)s)": "Zobrazit: %(instance)s místností (%(server)s)",
     "Add new server…": "Přidat nový server…",
@@ -3189,9 +3353,11 @@
     "Enter fullscreen": "Vstup do režimu celé obrazovky",
     "Map feedback": "Zpětná vazba k mapě",
     "Toggle attribution": "Přepnout atribut",
-    "In %(spaceName)s and %(count)s other spaces.|one": "V %(spaceName)s a %(count)s dalším prostoru.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "V %(spaceName)s a %(count)s dalším prostoru.",
+        "other": "V %(spaceName)s a %(count)s ostatních prostorech."
+    },
     "In %(spaceName)s.": "V prostoru %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "V %(spaceName)s a %(count)s ostatních prostorech.",
     "In spaces %(space1Name)s and %(space2Name)s.": "V prostorech %(space1Name)s a %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Příkaz pro vývojáře: Zruší aktuální odchozí relaci skupiny a nastaví nové relace Olm",
     "Stop and close": "Zastavit a zavřít",
@@ -3210,8 +3376,10 @@
     "Spell check": "Kontrola pravopisu",
     "Complete these to get the most out of %(brand)s": "Dokončete následující, abyste z %(brand)s získali co nejvíce",
     "You did it!": "Dokázali jste to!",
-    "Only %(count)s steps to go|one": "Zbývá už jen %(count)s krok",
-    "Only %(count)s steps to go|other": "Zbývá už jen %(count)s kroků",
+    "Only %(count)s steps to go": {
+        "one": "Zbývá už jen %(count)s krok",
+        "other": "Zbývá už jen %(count)s kroků"
+    },
     "Welcome to %(brand)s": "Vítejte v aplikaci %(brand)s",
     "Find your people": "Najděte své lidi",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Zachovejte si vlastnictví a kontrolu nad komunitní diskusí.\nPodpora milionů uživatelů s účinným moderováním a interoperabilitou.",
@@ -3290,11 +3458,15 @@
     "Don’t miss a thing by taking %(brand)s with you": "Vezměte si %(brand)s s sebou a nic vám neunikne",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nedoporučuje se šifrovat veřejné místnosti.</b>Veřejné místnosti může najít a připojit se k nim kdokoli, takže si v nich může číst zprávy kdokoli. Nezískáte tak žádnou z výhod šifrování a nebudete ho moci později vypnout. Šifrování zpráv ve veřejné místnosti zpomalí příjem a odesílání zpráv.",
     "Empty room (was %(oldName)s)": "Prázdná místnost (dříve %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Pozvání %(user)s a 1 dalšího",
-    "Inviting %(user)s and %(count)s others|other": "Pozvání %(user)s a %(count)s dalších",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Pozvání %(user)s a 1 dalšího",
+        "other": "Pozvání %(user)s a %(count)s dalších"
+    },
     "Inviting %(user1)s and %(user2)s": "Pozvání %(user1)s a %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s a 1 další",
-    "%(user)s and %(count)s others|other": "%(user)s a %(count)s další",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s a 1 další",
+        "other": "%(user)s a %(count)s další"
+    },
     "%(user1)s and %(user2)s": "%(user1)s a %(user2)s",
     "Show": "Zobrazit",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s nebo %(copyButton)s",
@@ -3392,8 +3564,10 @@
     "Sign in with QR code": "Přihlásit se pomocí QR kódu",
     "Browser": "Prohlížeč",
     "play voice broadcast": "přehrát hlasové vysílání",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Opravdu se chcete odhlásit z %(count)s relací?",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Opravdu se chcete odhlásit z %(count)s relace?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "other": "Opravdu se chcete odhlásit z %(count)s relací?",
+        "one": "Opravdu se chcete odhlásit z %(count)s relace?"
+    },
     "Renaming sessions": "Přejmenování relací",
     "Show formatting": "Zobrazit formátování",
     "Consider signing out from old sessions (%(inactiveAgeDays)s days or older) you don't use anymore.": "Zvažte odhlášení ze starých relací (%(inactiveAgeDays)s dní nebo starších), které již nepoužíváte.",
@@ -3487,8 +3661,10 @@
     "You ended a voice broadcast": "Ukončili jste hlasové vysílání",
     "Rust cryptography implementation": "Implementace kryptografie v jazyce Rust",
     "Improve your account security by following these recommendations.": "Zlepšete zabezpečení svého účtu dodržováním těchto doporučení.",
-    "%(count)s sessions selected|one": "%(count)s vybraná relace",
-    "%(count)s sessions selected|other": "%(count)s vybraných relací",
+    "%(count)s sessions selected": {
+        "one": "%(count)s vybraná relace",
+        "other": "%(count)s vybraných relací"
+    },
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Nemůžete zahájit hovor, protože právě nahráváte živé vysílání. Ukončete prosím živé vysílání, abyste mohli zahájit hovor.",
     "Can’t start a call": "Nelze zahájit hovor",
     "Failed to read events": "Nepodařilo se načíst události",
@@ -3501,8 +3677,10 @@
     "Create a link": "Vytvořit odkaz",
     "Link": "Odkaz",
     "Force 15s voice broadcast chunk length": "Vynutit 15s délku bloku hlasového vysílání",
-    "Sign out of %(count)s sessions|one": "Odhlásit se z %(count)s relace",
-    "Sign out of %(count)s sessions|other": "Odhlásit se z %(count)s relací",
+    "Sign out of %(count)s sessions": {
+        "one": "Odhlásit se z %(count)s relace",
+        "other": "Odhlásit se z %(count)s relací"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Odhlásit se ze všech ostatních relací (%(otherSessionsCount)s)",
     "Yes, end my recording": "Ano, ukončit nahrávání",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "Jakmile začnete poslouchat toto živé vysílání, aktuální záznam živého vysílání bude ukončen.",
@@ -3608,7 +3786,9 @@
     "Room is <strong>encrypted ✅</strong>": "Místnost je <strong>šifrovaná ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Stav oznámení je <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Stav nepřečtení místnosti: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Stav nepřečtení místnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Stav nepřečtení místnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>"
+    },
     "Due to decryption errors, some votes may not be counted": "Kvůli chybám v dešifrování nemusí být některé hlasy započítány",
     "Identity server is <code>%(identityServerUrl)s</code>": "Server identit je <code>%(identityServerUrl)s</code>",
     "Homeserver is <code>%(homeserverUrl)s</code>": "Domovský server je <code>%(homeserverUrl)s</code>",
@@ -3619,10 +3799,14 @@
     "If you know a room address, try joining through that instead.": "Pokud znáte adresu místnosti, zkuste se pomocí ní připojit.",
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "Pokusili jste se připojit pomocí ID místnosti, aniž byste zadali seznam serverů, přes které se chcete připojit. ID místnosti jsou interní identifikátory a nelze je použít k připojení k místnosti bez dalších informací.",
     "View poll": "Zobrazit hlasování",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Za uplynulý den nejsou k dispozici žádná hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Za poslední den nejsou k dispozici žádná aktivní hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Za posledních %(count)s dní nejsou k dispozici žádná minulá hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Za posledních %(count)s dní nejsou žádná aktivní hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Za uplynulý den nejsou k dispozici žádná hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
+        "other": "Za posledních %(count)s dní nejsou k dispozici žádná minulá hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Za poslední den nejsou k dispozici žádná aktivní hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
+        "other": "Za posledních %(count)s dní nejsou žádná aktivní hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Nejsou k dispozici žádná minulá hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
     "There are no active polls. Load more polls to view polls for previous months": "Nejsou zde žádná aktivní hlasování. Pro zobrazení hlasování z předchozích měsíců načtěte další hlasování",
     "Load more polls": "Načíst další hlasování",
@@ -3744,9 +3928,15 @@
     "<strong>Update:</strong>We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active. If you proceed, some of your settings may change. <a>Learn more</a>": "<strong>Aktualizace:</strong>Zjednodušili jsme Nastavení oznámení, aby bylo možné snadněji najít možnosti nastavení. Některá vlastní nastavení, která jste zvolili v minulosti, se zde nezobrazují, ale jsou stále aktivní. Pokud budete pokračovat, některá vaše nastavení se mohou změnit. <a>Zjistit více</a>",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Zprávy v této místnosti jsou koncově šifrovány. Když lidé vstoupí, můžete je ověřit v jejich profilu, stačí klepnout na jejich profilový obrázek.",
     "Your server requires encryption to be disabled.": "Váš server vyžaduje vypnuté šifrování.",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)ssi %(count)skrát změnili svůj profilový obrázek",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)ssi %(count)skrát změnili svůj profilový obrázek",
+        "one": "%(severalUsers)szměnilo svůj profilový obrázek"
+    },
     "Receive an email summary of missed notifications": "Přijímat e-mailový souhrn zmeškaných oznámení",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)szměnil(a) %(count)s krát svůj profilový obrázek",
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)szměnil(a) %(count)s krát svůj profilový obrázek",
+        "one": "%(oneUser)szměnil(a) svůj profilový obrázek"
+    },
     "Are you sure you wish to remove (delete) this event?": "Opravdu chcete tuto událost odstranit (smazat)?",
     "Anyone can request to join, but admins or moderators need to grant access. You can change this later.": "O vstup může požádat kdokoliv, ale administrátoři nebo moderátoři musí přístup povolit. To můžete později změnit.",
     "Thread Root ID: %(threadRootId)s": "ID kořenového vlákna: %(threadRootId)s",
@@ -3767,8 +3957,6 @@
     "Under active development, new room header & details interface": "V aktivním vývoji, nové rozhraní pro záhlaví a detaily místnosti",
     "Other spaces you know": "Další prostory, které znáte",
     "You need to be granted access to this room in order to view or participate in the conversation. You can send a request to join below.": "Abyste si mohli konverzaci prohlédnout nebo se jí zúčastnit, musíte mít do této místnosti povolen přístup. Žádost o vstup můžete zaslat níže.",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)szměnilo svůj profilový obrázek",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)szměnil(a) svůj profilový obrázek",
     "Message (optional)": "Zpráva (nepovinné)",
     "Request access": "Žádost o přístup",
     "Request to join sent": "Žádost o vstup odeslána",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 21d8d6175f..47b2a214a9 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -237,8 +237,10 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget tilføjet af %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s fjernet af %(senderName)s",
     "%(displayName)s is typing …": "%(displayName)s skriver …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s andre skriver …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s og en anden skriver …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s og %(count)s andre skriver …",
+        "one": "%(names)s og en anden skriver …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s skriver …",
     "Cannot reach homeserver": "Homeserveren kan ikke kontaktes",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Vær sikker at du har en stabil internetforbindelse, eller kontakt serveradministratoren",
@@ -253,8 +255,10 @@
     "Unexpected error resolving identity server configuration": "Uventet fejl ved indlæsning af identitetsserver-konfigurationen",
     "This homeserver has hit its Monthly Active User limit.": "Denne homeserver har nået sin begrænsning for antallet af aktive brugere per måned.",
     "This homeserver has exceeded one of its resource limits.": "Denne homeserver har overskredet en af dens ressourcegrænser.",
-    "%(items)s and %(count)s others|other": "%(items)s og %(count)s andre",
-    "%(items)s and %(count)s others|one": "%(items)s og en anden",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s og %(count)s andre",
+        "one": "%(items)s og en anden"
+    },
     "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
     "Your browser does not support the required cryptography extensions": "Din browser understøtter ikke de påkrævede kryptografiske udvidelser",
     "Not a valid %(brand)s keyfile": "Ikke en gyldig %(brand)s nøglefil",
@@ -333,10 +337,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Underskriftsnøglen du supplerede matcher den underskriftsnøgle du modtog fra %(userId)s's session %(deviceId)s. Sessionen er markeret som verificeret.",
     "Displays information about a user": "Viser information om en bruger",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ændrede rumnavnet fra %(oldRoomName)s til %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tilføjede de alternative adresser %(addresses)s til dette rum.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tilføjede alternative adresser %(addresses)s til dette rum.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s fjernede de alternative adresser %(addresses)s til dette rum.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s fjernede alternative adresser %(addresses)s til dette rum.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s tilføjede de alternative adresser %(addresses)s til dette rum.",
+        "one": "%(senderName)s tilføjede alternative adresser %(addresses)s til dette rum."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s fjernede de alternative adresser %(addresses)s til dette rum.",
+        "one": "%(senderName)s fjernede alternative adresser %(addresses)s til dette rum."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ændrede de alternative adresser til dette rum.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ændrede hoved- og alternative adresser til dette rum.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s ændrede adresserne til dette rum.",
@@ -476,8 +484,10 @@
     "Effects": "Effekter",
     "Go Back": "Gå tilbage",
     "Are you sure you want to cancel entering passphrase?": "Er du sikker på, at du vil annullere indtastning af adgangssætning?",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s og %(count)s andre",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s og %(count)s andre",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s og %(count)s andre",
+        "other": "%(spaceName)s og %(count)s andre"
+    },
     "Some invites couldn't be sent": "Nogle invitationer kunne ikke blive sendt",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Vi har sendt til de andre, men nedenstående mennesker kunne ikke blive inviteret til <RoomName/>",
     "Zimbabwe": "Zimbabwe",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index de1f4b9715..b411c790e1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -133,8 +133,10 @@
     "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
     "Sent messages will be stored until your connection has returned.": "Nachrichten werden gespeichert und gesendet, wenn die Internetverbindung wiederhergestellt ist.",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
-    "and %(count)s others...|other": "und %(count)s weitere …",
-    "and %(count)s others...|one": "und ein weiterer …",
+    "and %(count)s others...": {
+        "other": "und %(count)s weitere …",
+        "one": "und ein weiterer …"
+    },
     "Are you sure?": "Bist du sicher?",
     "Attachment": "Anhang",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Es kann keine Verbindung zum Heim-Server via HTTP aufgebaut werden, wenn die Adresszeile des Browsers eine HTTPS-URL enthält. Entweder HTTPS verwenden oder alternativ <a>unsichere Skripte erlauben</a>.",
@@ -246,8 +248,10 @@
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raumbild von %(roomName)s geändert",
     "Add": "Hinzufügen",
     "Uploading %(filename)s": "%(filename)s wird hochgeladen",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
+        "other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen"
+    },
     "You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
     "Create new room": "Neuer Raum",
     "Start chat": "Unterhaltung beginnen",
@@ -265,8 +269,10 @@
     "Start authentication": "Authentifizierung beginnen",
     "Unnamed Room": "Unbenannter Raum",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)",
-    "(~%(count)s results)|one": "(~%(count)s Ergebnis)",
-    "(~%(count)s results)|other": "(~%(count)s Ergebnisse)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s Ergebnis)",
+        "other": "(~%(count)s Ergebnisse)"
+    },
     "Your browser does not support the required cryptography extensions": "Dein Browser unterstützt die benötigten Verschlüsselungserweiterungen nicht",
     "Not a valid %(brand)s keyfile": "Keine gültige %(brand)s-Schlüsseldatei",
     "Authentication check failed: incorrect password?": "Authentifizierung fehlgeschlagen: Falsches Passwort?",
@@ -306,59 +312,103 @@
     "Jump to read receipt": "Zur Lesebestätigung springen",
     "Message Pinning": "Nachrichten anheften",
     "Unnamed room": "Unbenannter Raum",
-    "And %(count)s more...|other": "Und %(count)s weitere …",
+    "And %(count)s more...": {
+        "other": "Und %(count)s weitere …"
+    },
     "Delete Widget": "Widget löschen",
     "Mention": "Erwähnen",
     "Invite": "Einladen",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen des Widgets entfernt es für alle in diesem Raum. Wirklich löschen?",
     "Mirror local video feed": "Lokalen Video-Feed spiegeln",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)shaben den Raum %(count)s-mal betreten",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)shaben den Raum betreten",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)shat den Raum %(count)s-mal betreten",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)shat den Raum betreten",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)shaben den Raum %(count)s-mal verlassen",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)shaben den Raum verlassen",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)shat den Raum %(count)s-mal verlassen",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)shat den Raum verlassen",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)shaben %(count)s-mal den Raum betreten und verlassen",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)shaben den Raum betreten und wieder verlassen",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)shat den Raum %(count)s-mal betreten und wieder verlassen",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)shat den Raum betreten und wieder verlassen",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)shaben den Raum %(count)s-mal verlassen und wieder betreten",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)shaben den Raum verlassen und wieder betreten",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)shat den Raum %(count)s-mal verlassen und wieder betreten",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)shat den Raum verlassen und wieder betreten",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)shaben ihre Einladungen abgelehnt",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)swurde die Einladung %(count)s-mal wieder entzogen",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)swurde die Einladung wieder entzogen",
-    "were invited %(count)s times|other": "wurden %(count)s-mal eingeladen",
-    "were invited %(count)s times|one": "wurden eingeladen",
-    "was invited %(count)s times|other": "wurde %(count)s-mal eingeladen",
-    "was invited %(count)s times|one": "wurde eingeladen",
-    "were banned %(count)s times|other": "wurden %(count)s-mal verbannt",
-    "were banned %(count)s times|one": "wurden verbannt",
-    "was banned %(count)s times|other": "wurde %(count)s-mal verbannt",
-    "was banned %(count)s times|one": "wurde verbannt",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s haben %(count)s-mal ihren Namen geändert",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)shaben ihren Namen geändert",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)shat %(count)s-mal den Namen geändert",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)shaben den Raum %(count)s-mal betreten",
+        "one": "%(severalUsers)shaben den Raum betreten"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)shat den Raum %(count)s-mal betreten",
+        "one": "%(oneUser)shat den Raum betreten"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)shaben den Raum %(count)s-mal verlassen",
+        "one": "%(severalUsers)shaben den Raum verlassen"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)shat den Raum %(count)s-mal verlassen",
+        "one": "%(oneUser)shat den Raum verlassen"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)shaben %(count)s-mal den Raum betreten und verlassen",
+        "one": "%(severalUsers)shaben den Raum betreten und wieder verlassen"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)shat den Raum %(count)s-mal betreten und wieder verlassen",
+        "one": "%(oneUser)shat den Raum betreten und wieder verlassen"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)shaben den Raum %(count)s-mal verlassen und wieder betreten",
+        "one": "%(severalUsers)shaben den Raum verlassen und wieder betreten"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)shat den Raum %(count)s-mal verlassen und wieder betreten",
+        "one": "%(oneUser)shat den Raum verlassen und wieder betreten"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)shaben ihre Einladungen abgelehnt",
+        "other": "%(severalUsers)shaben ihre Einladungen %(count)s-mal abgelehnt"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)swurde die Einladung %(count)s-mal wieder entzogen",
+        "one": "%(severalUsers)swurde die Einladung wieder entzogen"
+    },
+    "were invited %(count)s times": {
+        "other": "wurden %(count)s-mal eingeladen",
+        "one": "wurden eingeladen"
+    },
+    "was invited %(count)s times": {
+        "other": "wurde %(count)s-mal eingeladen",
+        "one": "wurde eingeladen"
+    },
+    "were banned %(count)s times": {
+        "other": "wurden %(count)s-mal verbannt",
+        "one": "wurden verbannt"
+    },
+    "was banned %(count)s times": {
+        "other": "wurde %(count)s-mal verbannt",
+        "one": "wurde verbannt"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s haben %(count)s-mal ihren Namen geändert",
+        "one": "%(severalUsers)shaben ihren Namen geändert"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)shat %(count)s-mal den Namen geändert",
+        "one": "%(oneUser)shat den Namen geändert"
+    },
     "Members only (since the point in time of selecting this option)": "Mitglieder",
     "Members only (since they were invited)": "Mitglieder (ab Einladung)",
     "Members only (since they joined)": "Mitglieder (ab Betreten)",
     "A text message has been sent to %(msisdn)s": "Eine Textnachricht wurde an %(msisdn)s gesendet",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shaben ihre Einladungen %(count)s-mal abgelehnt",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)shat die Einladung %(count)s-mal abgelehnt",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)shat die Einladung abgelehnt",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)swurde die Einladung %(count)s-mal wieder entzogen",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)swurde die Einladung wieder entzogen",
-    "were unbanned %(count)s times|other": "wurden %(count)s-mal entbannt",
-    "were unbanned %(count)s times|one": "wurden entbannt",
-    "was unbanned %(count)s times|other": "wurde %(count)s-mal entbannt",
-    "was unbanned %(count)s times|one": "wurde entbannt",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)shat den Namen geändert",
-    "%(items)s and %(count)s others|other": "%(items)s und %(count)s andere",
-    "%(items)s and %(count)s others|one": "%(items)s und ein weiteres Raummitglied",
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)shat die Einladung %(count)s-mal abgelehnt",
+        "one": "%(oneUser)shat die Einladung abgelehnt"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)swurde die Einladung %(count)s-mal wieder entzogen",
+        "one": "%(oneUser)swurde die Einladung wieder entzogen"
+    },
+    "were unbanned %(count)s times": {
+        "other": "wurden %(count)s-mal entbannt",
+        "one": "wurden entbannt"
+    },
+    "was unbanned %(count)s times": {
+        "other": "wurde %(count)s-mal entbannt",
+        "one": "wurde entbannt"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s und %(count)s andere",
+        "one": "%(items)s und ein weiteres Raummitglied"
+    },
     "Notify the whole room": "Alle im Raum benachrichtigen",
     "Room Notification": "Raum-Benachrichtigung",
     "Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren",
@@ -590,8 +640,10 @@
     "Sets the room name": "Setze einen Raumnamen",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s hat diesen Raum aktualisiert.",
     "%(displayName)s is typing …": "%(displayName)s tippt …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s und %(count)s andere tippen …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s und eine weitere Person tippen …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s und %(count)s andere tippen …",
+        "one": "%(names)s und eine weitere Person tippen …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s und %(lastPerson)s tippen …",
     "Render simple counters in room header": "Einfache Zähler in Raumkopfzeile anzeigen",
     "Enable Emoji suggestions while typing": "Emoji-Vorschläge während Eingabe",
@@ -950,7 +1002,10 @@
     "Go": "Los",
     "Command Help": "Befehl Hilfe",
     "To help us prevent this in future, please <a>send us logs</a>.": "Um uns zu helfen, dies in Zukunft zu vermeiden, <a>sende uns bitte die Protokolldateien</a>.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
+        "other": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raums."
+    },
     "Go Back": "Zurück",
     "Notification Autocomplete": "Benachrichtigung Autovervollständigen",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
@@ -959,9 +1014,15 @@
     "Room %(name)s": "Raum %(name)s",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Die Aktualisierung dieses Raums deaktiviert die aktuelle Instanz des Raums und erstellt einen aktualisierten Raum mit demselben Namen.",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) hat sich zu einer neuen Sitzung angemeldet, ohne sie zu verifizieren:",
-    "%(count)s verified sessions|other": "%(count)s verifizierte Sitzungen",
+    "%(count)s verified sessions": {
+        "other": "%(count)s verifizierte Sitzungen",
+        "one": "Eine verifizierte Sitzung"
+    },
     "Hide verified sessions": "Verifizierte Sitzungen ausblenden",
-    "%(count)s sessions|other": "%(count)s Sitzungen",
+    "%(count)s sessions": {
+        "other": "%(count)s Sitzungen",
+        "one": "%(count)s Sitzung"
+    },
     "Hide sessions": "Sitzungen ausblenden",
     "Encryption enabled": "Verschlüsselung aktiviert",
     "Encryption not enabled": "Verschlüsselung nicht aktiviert",
@@ -996,8 +1057,6 @@
     "Done": "Fertig",
     "Trusted": "Vertrauenswürdig",
     "Not trusted": "Nicht vertrauenswürdig",
-    "%(count)s verified sessions|one": "Eine verifizierte Sitzung",
-    "%(count)s sessions|one": "%(count)s Sitzung",
     "Messages in this room are not end-to-end encrypted.": "Nachrichten in diesem Raum sind nicht Ende-zu-Ende verschlüsselt.",
     "Security": "Sicherheit",
     "Ask %(displayName)s to scan your code:": "Bitte %(displayName)s, deinen Code zu scannen:",
@@ -1025,17 +1084,23 @@
     "Remove %(email)s?": "%(email)s entfernen?",
     "Remove %(phone)s?": "%(phone)s entfernen?",
     "Remove recent messages by %(user)s": "Kürzlich gesendete Nachrichten von %(user)s entfernen",
-    "Remove %(count)s messages|other": "%(count)s Nachrichten entfernen",
-    "Remove %(count)s messages|one": "Eine Nachricht entfernen",
+    "Remove %(count)s messages": {
+        "other": "%(count)s Nachrichten entfernen",
+        "one": "Eine Nachricht entfernen"
+    },
     "Remove recent messages": "Kürzlich gesendete Nachrichten entfernen",
     "You're previewing %(roomName)s. Want to join it?": "Du erkundest den Raum %(roomName)s. Willst du ihn betreten?",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
+        "other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt."
+    },
     "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.",
     "Displays information about a user": "Zeigt Informationen über Benutzer",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.",
+        "one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadressen für diesen Raum geändert.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschlussregel für Benutzer, die %(glob)s entsprechen",
@@ -1217,10 +1282,14 @@
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Verknüpfe einen Identitäts-Server in den Einstellungen, um die Einladungen direkt in %(brand)s zu erhalten.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen, um Einladungen direkt in %(brand)s zu erhalten.",
     "%(roomName)s can't be previewed. Do you want to join it?": "Vorschau von %(roomName)s kann nicht angezeigt werden. Möchtest du den Raum betreten?",
-    "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.",
-    "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.",
-    "%(count)s unread messages.|other": "%(count)s ungelesene Nachrichten.",
-    "%(count)s unread messages.|one": "1 ungelesene Nachricht.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.",
+        "one": "1 ungelesene Erwähnung."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s ungelesene Nachrichten.",
+        "one": "1 ungelesene Nachricht."
+    },
     "Unread messages.": "Ungelesene Nachrichten.",
     "This room has already been upgraded.": "Dieser Raum wurde bereits aktualisiert.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dieser Raum läuft mit der Raumversion <roomVersion />, welche dieser Heim-Server als <i>instabil</i> markiert hat.",
@@ -1298,9 +1367,14 @@
     "Rotate Left": "Nach links drehen",
     "Rotate Right": "Nach rechts drehen",
     "Language Dropdown": "Sprachauswahl",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)shaben keine Änderung vorgenommen",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)shat %(count)s mal keine Änderung vorgenommen",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)shat keine Änderung vorgenommen",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)shaben keine Änderung vorgenommen",
+        "other": "%(severalUsers)s haben %(count)s mal nichts geändert"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)shat %(count)s mal keine Änderung vorgenommen",
+        "one": "%(oneUser)shat keine Änderung vorgenommen"
+    },
     "Some characters not allowed": "Einige Zeichen sind nicht erlaubt",
     "Enter a server name": "Gib einen Server-Namen ein",
     "Looks good": "Das sieht gut aus",
@@ -1359,8 +1433,10 @@
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Einige Dateien sind <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
     "Verification Request": "Verifizierungsanfrage",
-    "Upload %(count)s other files|other": "%(count)s andere Dateien hochladen",
-    "Upload %(count)s other files|one": "%(count)s andere Datei hochladen",
+    "Upload %(count)s other files": {
+        "other": "%(count)s andere Dateien hochladen",
+        "one": "%(count)s andere Datei hochladen"
+    },
     "Remember my selection for this widget": "Speichere meine Auswahl für dieses Widget",
     "Restoring keys from backup": "Schlüssel aus der Sicherung wiederherstellen",
     "%(completed)s of %(total)s keys restored": "%(completed)s von %(total)s Schlüsseln wiederhergestellt",
@@ -1380,7 +1456,6 @@
     "Use lowercase letters, numbers, dashes and underscores only": "Verwende nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche",
     "Jump to first unread room.": "Zum ersten ungelesenen Raum springen.",
     "Jump to first invite.": "Zur ersten Einladung springen.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raums.",
     "Failed to get autodiscovery configuration from server": "Abrufen der Autodiscovery-Konfiguration vom Server fehlgeschlagen",
     "Invalid base_url for m.homeserver": "Ungültige base_url für m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Die Heim-Server-URL scheint kein gültiger Matrix-Heim-Server zu sein",
@@ -1400,7 +1475,6 @@
     "Click the link in the email you received to verify and then click continue again.": "Klicke auf den Link in der Bestätigungs-E-Mail, und dann auf Weiter.",
     "Unable to revoke sharing for phone number": "Widerrufen der geteilten Telefonnummer nicht möglich",
     "Unable to share phone number": "Teilen der Telefonnummer nicht möglich",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s haben %(count)s mal nichts geändert",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Quersignierungsschlüsseln ist dauerhaft. Alle, mit dem du dich verifiziert hast, werden Sicherheitswarnungen angezeigt bekommen. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du quersignieren kannst.",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
@@ -1515,8 +1589,10 @@
     "Sort by": "Sortieren nach",
     "Message preview": "Nachrichtenvorschau",
     "List options": "Optionen anzeigen",
-    "Show %(count)s more|other": "%(count)s weitere anzeigen",
-    "Show %(count)s more|one": "%(count)s weitere anzeigen",
+    "Show %(count)s more": {
+        "other": "%(count)s weitere anzeigen",
+        "one": "%(count)s weitere anzeigen"
+    },
     "Room options": "Raumoptionen",
     "Activity": "Aktivität",
     "A-Z": "A–Z",
@@ -1645,7 +1721,9 @@
     "Move right": "Nach rechts schieben",
     "Move left": "Nach links schieben",
     "Revoke permissions": "Berechtigungen widerrufen",
-    "You can only pin up to %(count)s widgets|other": "Du kannst nur %(count)s Widgets anheften",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Du kannst nur %(count)s Widgets anheften"
+    },
     "Show Widgets": "Widgets anzeigen",
     "Hide Widgets": "Widgets verstecken",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alle Server sind von der Teilnahme ausgeschlossen! Dieser Raum kann nicht mehr genutzt werden.",
@@ -1725,8 +1803,10 @@
     "%(senderName)s ended the call": "%(senderName)s hat den Anruf beendet",
     "Use Command + Enter to send a message": "Benutze Betriebssystemtaste + Eingabe um eine Nachricht zu senden",
     "Use Ctrl + Enter to send a message": "Nutze Strg + Enter, um Nachrichten zu senden",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Räumen zu speichern.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Räumen zu speichern.",
+        "one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern."
+    },
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr beide nehmt an dieser Konversation teil, es sei denn, ihr ladet jemanden ein.",
     "This is the beginning of your direct message history with <displayName/>.": "Dies ist der Beginn deiner Direktnachrichten mit <displayName/>.",
     "Topic: %(topic)s (<a>edit</a>)": "Thema: %(topic)s (<a>ändern</a>)",
@@ -2124,7 +2204,10 @@
     "Values at explicit levels": "Werte für explizite Stufen",
     "Settable at room": "Für den Raum einstellbar",
     "Room name": "Raumname",
-    "%(count)s members|other": "%(count)s Mitglieder",
+    "%(count)s members": {
+        "other": "%(count)s Mitglieder",
+        "one": "%(count)s Mitglied"
+    },
     "Save Changes": "Speichern",
     "Create a new room": "Neuen Raum erstellen",
     "Suggested Rooms": "Vorgeschlagene Räume",
@@ -2162,9 +2245,10 @@
     "No results found": "Keine Ergebnisse",
     "Failed to remove some rooms. Try again later": "Einige Räume konnten nicht entfernt werden. Versuche es bitte später nocheinmal",
     "Suggested": "Vorgeschlagen",
-    "%(count)s rooms|one": "%(count)s Raum",
-    "%(count)s rooms|other": "%(count)s Räume",
-    "%(count)s members|one": "%(count)s Mitglied",
+    "%(count)s rooms": {
+        "one": "%(count)s Raum",
+        "other": "%(count)s Räume"
+    },
     "Are you sure you want to leave the space '%(spaceName)s'?": "Bist du sicher, dass du den Space „%(spaceName)s“ verlassen möchtest?",
     "Start audio stream": "Audiostream starten",
     "Failed to start livestream": "Livestream konnte nicht gestartet werden",
@@ -2204,8 +2288,10 @@
     "We couldn't create your DM.": "Wir konnten deine Direktnachricht nicht erstellen.",
     "Add existing rooms": "Bestehende Räume hinzufügen",
     "Space selection": "Space-Auswahl",
-    "%(count)s people you know have already joined|one": "%(count)s Person, die du kennst, ist schon beigetreten",
-    "%(count)s people you know have already joined|other": "%(count)s Leute, die du kennst, sind bereits beigetreten",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s Person, die du kennst, ist schon beigetreten",
+        "other": "%(count)s Leute, die du kennst, sind bereits beigetreten"
+    },
     "Warn before quitting": "Vor Beenden warnen",
     "Space options": "Space-Optionen",
     "Manage & explore rooms": "Räume erkunden und verwalten",
@@ -2242,8 +2328,10 @@
     "%(seconds)ss left": "%(seconds)s verbleibend",
     "Change server ACLs": "Server-ACLs bearbeiten",
     "Failed to send": "Fehler beim Senden",
-    "View all %(count)s members|other": "Alle %(count)s Mitglieder anzeigen",
-    "View all %(count)s members|one": "Mitglied anzeigen",
+    "View all %(count)s members": {
+        "other": "Alle %(count)s Mitglieder anzeigen",
+        "one": "Mitglied anzeigen"
+    },
     "Some of your messages have not been sent": "Einige Nachrichten konnten nicht gesendet werden",
     "Original event source": "Ursprüngliche Rohdaten",
     "Decrypted event source": "Entschlüsselte Rohdaten",
@@ -2267,8 +2355,10 @@
     "Leave the beta": "Beta verlassen",
     "Beta": "Beta",
     "Want to add a new room instead?": "Willst du einen neuen Raum hinzufügen?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Raum hinzufügen …",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Räume hinzufügen … (%(progress)s von %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Raum hinzufügen …",
+        "other": "Räume hinzufügen … (%(progress)s von %(count)s)"
+    },
     "You are not allowed to view this server's rooms list": "Du darfst diese Raumliste nicht sehen",
     "We didn't find a microphone on your device. Please check your settings and try again.": "Es konnte kein Mikrofon gefunden werden. Überprüfe deine Einstellungen und versuche es erneut.",
     "No microphone found": "Kein Mikrofon gefunden",
@@ -2288,8 +2378,10 @@
     "sends space invaders": "sendet Space Invaders",
     "Sends the given message with a space themed effect": "Sendet die Nachricht mit Raumschiffen",
     "Space Autocomplete": "Spaces automatisch vervollständigen",
-    "Currently joining %(count)s rooms|one": "Betrete %(count)s Raum",
-    "Currently joining %(count)s rooms|other": "Betrete %(count)s Räume",
+    "Currently joining %(count)s rooms": {
+        "one": "Betrete %(count)s Raum",
+        "other": "Betrete %(count)s Räume"
+    },
     "Go to my space": "Zu meinem Space",
     "See when people join, leave, or are invited to this room": "Anzeigen, wenn Leute eingeladen werden, den Raum betreten oder verlassen",
     "The user you called is busy.": "Die angerufene Person ist momentan beschäftigt.",
@@ -2324,10 +2416,14 @@
     "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Anderer Grund. Bitte beschreibe das Problem.\nDies wird an die Raummoderation gemeldet.",
     "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Dieser Benutzer spammt den Raum mit Werbung, Links zu Werbung oder Propaganda.\nDies wird an die Raummoderation gemeldet.",
     "Please provide an address": "Bitte gib eine Adresse an",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s hat die Server-ACLs geändert",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s hat die Server-ACLs %(count)s Mal geändert",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s haben die Server-ACLs geändert",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s haben die Server-ACLs %(count)s Mal geändert",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s hat die Server-ACLs geändert",
+        "other": "%(oneUser)s hat die Server-ACLs %(count)s Mal geändert"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s haben die Server-ACLs geändert",
+        "other": "%(severalUsers)s haben die Server-ACLs %(count)s Mal geändert"
+    },
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Füge Adressen für diesen Space hinzu, damit andere Leute ihn über deinen Heim-Server (%(localDomain)s) finden können",
     "To publish an address, it needs to be set as a local address first.": "Damit du die Adresse veröffentlichen kannst, musst du sie zuerst als lokale Adresse hinzufügen.",
     "Published addresses can be used by anyone on any server to join your room.": "Veröffentlichte Adressen erlauben jedem, den Raum zu betreten.",
@@ -2376,8 +2472,10 @@
     "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Der Raum beinhaltet illegale oder toxische Nachrichten und die Raummoderation verhindert es nicht.\nDies wird an die Betreiber von %(homeserver)s gemeldet werden. Diese können jedoch die verschlüsselten Nachrichten nicht lesen.",
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Diese Person verhält sich illegal, beispielsweise durch das Veröffentlichen persönlicher Daten oder Gewaltdrohungen.\nDies wird an die Raummoderation gemeldet, welche dies an die Behörden weitergeben kann.",
     "Unnamed audio": "Unbenannte Audiodatei",
-    "Show %(count)s other previews|one": "%(count)s andere Vorschau zeigen",
-    "Show %(count)s other previews|other": "%(count)s weitere Vorschauen zeigen",
+    "Show %(count)s other previews": {
+        "one": "%(count)s andere Vorschau zeigen",
+        "other": "%(count)s weitere Vorschauen zeigen"
+    },
     "Images, GIFs and videos": "Mediendateien",
     "Keyboard shortcuts": "Tastenkombinationen",
     "Unable to copy a link to the room to the clipboard.": "Der Link zum Raum konnte nicht kopiert werden.",
@@ -2450,8 +2548,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Das Betreten ist allen in den gewählten Spaces möglich.",
     "Spaces with access": "Spaces mit Zutritt",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Das Betreten ist allen in diesen Spaces möglich. <a>Ändere, welche Spaces Zutritt haben.</a>",
-    "Currently, %(count)s spaces have access|other": "%(count)s Spaces haben Zutritt",
-    "& %(count)s more|other": "und %(count)s weitere",
+    "Currently, %(count)s spaces have access": {
+        "other": "%(count)s Spaces haben Zutritt",
+        "one": "Derzeit hat ein Space Zutritt"
+    },
+    "& %(count)s more": {
+        "other": "und %(count)s weitere",
+        "one": "und %(count)s weitere"
+    },
     "Upgrade required": "Aktualisierung erforderlich",
     "Only invited people can join.": "Nur Eingeladene können betreten.",
     "Private (invite only)": "Privat (Betreten mit Einladung)",
@@ -2517,8 +2621,6 @@
     "Change space name": "Name des Space ändern",
     "Change space avatar": "Space-Icon ändern",
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Finden und betreten ist Mitgliedern von <spaceName/> erlaubt. Du kannst auch weitere Spaces wählen.",
-    "Currently, %(count)s spaces have access|one": "Derzeit hat ein Space Zutritt",
-    "& %(count)s more|one": "und %(count)s weitere",
     "Autoplay videos": "Videos automatisch abspielen",
     "Autoplay GIFs": "GIFs automatisch abspielen",
     "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s hat eine Nachricht losgelöst. Alle angepinnten Nachrichten anzeigen.",
@@ -2537,8 +2639,10 @@
     "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "<a>Erstelle einen neuen Raum für deine Konversation</a>, um diese Probleme zu umgehen.",
     "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Es ist nicht sinnvoll, verschlüsselte Räume öffentlich zu machen.</b> Das würde bedeuten, dass alle den Raum finden und betreten, also auch Nachrichten lesen könnten. Du erhältst also keinen Vorteil der Verschlüsselung, während sie das Senden und Empfangen von Nachrichten langsamer macht.",
     "Select the roles required to change various parts of the space": "Wähle, von wem folgende Aktionen ausgeführt werden können",
-    "%(count)s reply|one": "%(count)s Antwort",
-    "%(count)s reply|other": "%(count)s Antworten",
+    "%(count)s reply": {
+        "one": "%(count)s Antwort",
+        "other": "%(count)s Antworten"
+    },
     "I'll verify later": "Später verifizieren",
     "The email address doesn't appear to be valid.": "E-Mail-Adresse scheint ungültig zu sein.",
     "Skip verification for now": "Verifizierung vorläufig überspringen",
@@ -2577,10 +2681,14 @@
     "Threads": "Threads",
     "Insert link": "Link einfügen",
     "Create poll": "Umfrage erstellen",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Space aktualisieren …",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Spaces aktualisieren … (%(progress)s von %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Einladung senden …",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Einladungen senden … (%(progress)s von %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Space aktualisieren …",
+        "other": "Spaces aktualisieren … (%(progress)s von %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Einladung senden …",
+        "other": "Einladungen senden … (%(progress)s von %(count)s)"
+    },
     "Loading new room": "Neuer Raum wird geladen",
     "Upgrading room": "Raum wird aktualisiert",
     "Developer mode": "Entwicklungsmodus",
@@ -2640,12 +2748,18 @@
     "Rename": "Umbenennen",
     "Deselect all": "Alle abwählen",
     "Select all": "Alle auswählen",
-    "Sign out devices|one": "Gerät abmelden",
-    "Sign out devices|other": "Geräte abmelden",
-    "Click the button below to confirm signing out these devices.|one": "Klicke unten auf den Knopf, um dieses Gerät abzumelden.",
-    "Click the button below to confirm signing out these devices.|other": "Klicke unten auf den Knopf, um diese Geräte abzumelden.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Abmelden dieses Geräts durch Beweisen deiner Identität mit Single Sign-On bestätigen.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Bestätige das Abmelden dieser Geräte, indem du dich erneut anmeldest.",
+    "Sign out devices": {
+        "one": "Gerät abmelden",
+        "other": "Geräte abmelden"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Klicke unten auf den Knopf, um dieses Gerät abzumelden.",
+        "other": "Klicke unten auf den Knopf, um diese Geräte abzumelden."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Abmelden dieses Geräts durch Beweisen deiner Identität mit Single Sign-On bestätigen.",
+        "other": "Bestätige das Abmelden dieser Geräte, indem du dich erneut anmeldest."
+    },
     "Automatically send debug logs on any error": "Sende bei Fehlern automatisch Protokolle zur Fehlerkorrektur",
     "Use a more compact 'Modern' layout": "Modernes kompaktes Layout verwenden",
     "%(senderDisplayName)s changed who can join this room.": "%(senderDisplayName)s hat geändert, wer diesen Raum betreten darf.",
@@ -2685,8 +2799,10 @@
     "Rooms outside of a space": "Räume außerhalb von Spaces",
     "Manage rooms in this space": "Räume in diesem Space verwalten",
     "Clear": "Löschen",
-    "%(count)s votes|one": "%(count)s Stimme",
-    "%(count)s votes|other": "%(count)s Stimmen",
+    "%(count)s votes": {
+        "one": "%(count)s Stimme",
+        "other": "%(count)s Stimmen"
+    },
     "Chat": "Unterhaltung",
     "%(spaceName)s menu": "%(spaceName)s-Menü",
     "Join public room": "Öffentlichen Raum betreten",
@@ -2702,8 +2818,10 @@
     "Experimental": "Experimentell",
     "Themes": "Themen",
     "Moderation": "Moderation",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s und %(count)s anderer",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s und %(count)s andere",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s und %(count)s anderer",
+        "other": "%(spaceName)s und %(count)s andere"
+    },
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "Teile Daten anonymisiert um uns zu helfen Probleme zu identifizieren. Nichts persönliches. Keine Dritten. <LearnMoreLink>Mehr dazu hier</LearnMoreLink>",
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "Sie haben zuvor zugestimmt, anonymisierte Nutzungsdaten mit uns zu teilen. Wir aktualisieren, wie das funktioniert.",
     "Help improve %(analyticsOwner)s": "Hilf mit, %(analyticsOwner)s zu verbessern",
@@ -2739,13 +2857,19 @@
     "Sorry, the poll you tried to create was not posted.": "Leider wurde die Umfrage nicht gesendet.",
     "Failed to post poll": "Absenden der Umfrage fehlgeschlagen",
     "Share location": "Standort teilen",
-    "Based on %(count)s votes|one": "%(count)s Stimme abgegeben",
-    "Based on %(count)s votes|other": "%(count)s Stimmen abgegeben",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s Stimme abgegeben. Stimme ab, um die Ergebnisse zu sehen",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s Stimmen abgegeben. Stimme ab, um die Ergebnisse zu sehen",
+    "Based on %(count)s votes": {
+        "one": "%(count)s Stimme abgegeben",
+        "other": "%(count)s Stimmen abgegeben"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s Stimme abgegeben. Stimme ab, um die Ergebnisse zu sehen",
+        "other": "%(count)s Stimmen abgegeben. Stimme ab, um die Ergebnisse zu sehen"
+    },
     "No votes cast": "Es wurden noch keine Stimmen abgegeben",
-    "Final result based on %(count)s votes|one": "Es wurde %(count)s Stimme abgegeben",
-    "Final result based on %(count)s votes|other": "Es wurden %(count)s Stimmen abgegeben",
+    "Final result based on %(count)s votes": {
+        "one": "Es wurde %(count)s Stimme abgegeben",
+        "other": "Es wurden %(count)s Stimmen abgegeben"
+    },
     "Sorry, your vote was not registered. Please try again.": "Wir konnten deine Stimme leider nicht erfassen. Versuche es bitte erneut.",
     "Vote not registered": "Stimme nicht erfasst",
     "Ban them from specific things I'm able to": "In ausgewählten Räumen und Spaces bannen",
@@ -2755,16 +2879,24 @@
     "Copy room link": "Raumlink kopieren",
     "Manage pinned events": "Angeheftete Ereignisse verwalten",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Teile anonyme Nutzungsdaten mit uns, damit wir Probleme in Element finden können. Nichts Persönliches. Keine Drittparteien.",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s Ereignis in %(seconds)s Sekunden exportiert",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s Ereignisse in %(seconds)s Sekunden exportiert",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s Ereignis in %(seconds)s Sekunden exportiert",
+        "other": "%(count)s Ereignisse in %(seconds)s Sekunden exportiert"
+    },
     "Export successful!": "Die Daten wurden erfolgreich exportiert!",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s Ereignis in %(seconds)s s abgerufen",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s Ereignisse in %(seconds)s s abgerufen",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "%(count)s Ereignis in %(seconds)s s abgerufen",
+        "other": "%(count)s Ereignisse in %(seconds)s s abgerufen"
+    },
     "Processing event %(number)s out of %(total)s": "Verarbeite Event %(number)s von %(total)s",
-    "Fetched %(count)s events so far|one": "Bisher wurde %(count)s Ereignis abgerufen",
-    "Fetched %(count)s events so far|other": "Bisher wurden %(count)s Ereignisse abgerufen",
-    "Fetched %(count)s events out of %(total)s|one": "%(count)s von %(total)s Ereignis abgerufen",
-    "Fetched %(count)s events out of %(total)s|other": "%(count)s von %(total)s Ereignisse abgerufen",
+    "Fetched %(count)s events so far": {
+        "one": "Bisher wurde %(count)s Ereignis abgerufen",
+        "other": "Bisher wurden %(count)s Ereignisse abgerufen"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "%(count)s von %(total)s Ereignis abgerufen",
+        "other": "%(count)s von %(total)s Ereignisse abgerufen"
+    },
     "Generating a ZIP": "ZIP-Archiv wird generiert",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Ups! Leider können wir das Datum \"%(inputDate)s\" nicht verstehen. Bitte gib es im Format JJJJ-MM-TT (Jahr-Monat-Tag) ein.",
     "Messaging": "Kommunikation",
@@ -2833,10 +2965,14 @@
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "<PrivacyPolicyUrl>Du kannst unsere Datenschutzbedingungen hier lesen</PrivacyPolicyUrl>",
     "Missing room name or separator e.g. (my-room:domain.org)": "Fehlender Raumname oder Doppelpunkt (z. B. dein-raum:domain.org)",
     "Missing domain separator e.g. (:domain.org)": "Fehlender Doppelpunkt vor Server (z. B. :domain.org)",
-    "was removed %(count)s times|other": "wurde %(count)s mal entfernt",
-    "was removed %(count)s times|one": "wurde entfernt",
-    "were removed %(count)s times|one": "wurden entfernt",
-    "were removed %(count)s times|other": "wurden %(count)s mal entfernt",
+    "was removed %(count)s times": {
+        "other": "wurde %(count)s mal entfernt",
+        "one": "wurde entfernt"
+    },
+    "were removed %(count)s times": {
+        "one": "wurden entfernt",
+        "other": "wurden %(count)s mal entfernt"
+    },
     "Let moderators hide messages pending moderation.": "Erlaube Moderatoren, noch nicht moderierte Nachrichten auszublenden.",
     "Message pending moderation: %(reason)s": "Nachricht erwartet Moderation: %(reason)s",
     "Message pending moderation": "Nachricht erwartet Moderation",
@@ -2908,22 +3044,32 @@
     "Search Dialog": "Suchdialog",
     "Join %(roomAddress)s": "%(roomAddress)s betreten",
     "<empty string>": "<Leere Zeichenkette>",
-    "<%(count)s spaces>|one": "<Leerzeichen>",
-    "<%(count)s spaces>|other": "<%(count)s Leerzeichen>",
+    "<%(count)s spaces>": {
+        "one": "<Leerzeichen>",
+        "other": "<%(count)s Leerzeichen>"
+    },
     "Results are only revealed when you end the poll": "Die Ergebnisse werden erst sichtbar, sobald du die Umfrage beendest",
     "Voters see results as soon as they have voted": "Abstimmende können die Ergebnisse nach Stimmabgabe sehen",
     "Open poll": "Offene Umfrage",
     "Closed poll": "Versteckte Umfrage",
     "Poll type": "Abstimmungsart",
     "Edit poll": "Umfrage bearbeiten",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s hat eine versteckte Nachricht gesendet",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s hat %(count)s versteckte Nachrichten gesendet",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s hat eine versteckte Nachricht gesendet",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s haben %(count)s versteckte Nachrichten gesendet",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s hat eine Nachricht gelöscht",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s hat %(count)s Nachrichten gelöscht",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s hat eine Nachricht gelöscht",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s haben %(count)s Nachrichten gelöscht",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)s hat eine versteckte Nachricht gesendet",
+        "other": "%(oneUser)s hat %(count)s versteckte Nachrichten gesendet"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s hat eine versteckte Nachricht gesendet",
+        "other": "%(severalUsers)s haben %(count)s versteckte Nachrichten gesendet"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s hat eine Nachricht gelöscht",
+        "other": "%(oneUser)s hat %(count)s Nachrichten gelöscht"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s hat eine Nachricht gelöscht",
+        "other": "%(severalUsers)s haben %(count)s Nachrichten gelöscht"
+    },
     "Results will be visible when the poll is ended": "Ergebnisse werden nach Abschluss der Umfrage sichtbar",
     "Sorry, you can't edit a poll after votes have been cast.": "Du kannst Umfragen nicht bearbeiten, sobald Stimmen abgegeben wurden.",
     "Can't edit poll": "Umfrage kann nicht bearbeitet werden",
@@ -2948,10 +3094,14 @@
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Antworte auf einen Thread oder klicke bei einer Nachricht auf „%(replyInThread)s“, um einen Thread zu starten.",
     "We'll create rooms for each of them.": "Wir werden für jedes einen Raum erstellen.",
     "Export Cancelled": "Exportieren abgebrochen",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s haben die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
+        "other": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
+        "other": "%(severalUsers)s haben die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet"
+    },
     "What location type do you want to share?": "Wie willst du deinen Standort teilen?",
     "Drop a Pin": "Standort setzen",
     "My live location": "Mein Echtzeit-Standort",
@@ -2966,11 +3116,15 @@
     "You are sharing your live location": "Du teilst deinen Echtzeit-Standort",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Deaktivieren, wenn du auch Systemnachrichten bzgl. des Nutzers löschen willst (z. B. Mitglieds- und Profiländerungen …)",
     "Preserve system messages": "Systemnachrichten behalten",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Du bist gerade dabei, %(count)s Nachricht von %(user)s Benutzern zu löschen. Die Nachrichten werden für niemanden mehr sichtbar sein. Willst du fortfahren?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Du bist gerade dabei, %(count)s Nachrichten von %(user)s Benutzern zu löschen. Die Nachrichten werden für niemanden mehr sichtbar sein. Willst du fortfahren?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Du bist gerade dabei, %(count)s Nachricht von %(user)s Benutzern zu löschen. Die Nachrichten werden für niemanden mehr sichtbar sein. Willst du fortfahren?",
+        "other": "Du bist gerade dabei, %(count)s Nachrichten von %(user)s Benutzern zu löschen. Die Nachrichten werden für niemanden mehr sichtbar sein. Willst du fortfahren?"
+    },
     "%(displayName)s's live location": "Echtzeit-Standort von %(displayName)s",
-    "Currently removing messages in %(count)s rooms|one": "Entferne Nachrichten in %(count)s Raum",
-    "Currently removing messages in %(count)s rooms|other": "Entferne Nachrichten in %(count)s Räumen",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Entferne Nachrichten in %(count)s Raum",
+        "other": "Entferne Nachrichten in %(count)s Räumen"
+    },
     "%(timeRemaining)s left": "%(timeRemaining)s übrig",
     "Share for %(duration)s": "Geteilt für %(duration)s",
     "%(value)ss": "%(value)ss",
@@ -3003,8 +3157,10 @@
     "Disinvite from room": "Einladung zurückziehen",
     "Remove from space": "Aus Space entfernen",
     "Disinvite from space": "Einladung zurückziehen",
-    "%(count)s participants|one": "1 Teilnehmer",
-    "%(count)s participants|other": "%(count)s Teilnehmer",
+    "%(count)s participants": {
+        "one": "1 Teilnehmer",
+        "other": "%(count)s Teilnehmer"
+    },
     "Video": "Video",
     "Try again later, or ask a room or space admin to check if you have access.": "Versuche es später erneut oder bitte einen Raum- oder Space-Admin um eine Zutrittserlaubnis.",
     "This room or space is not accessible at this time.": "Dieser Raum oder Space ist im Moment nicht zugänglich.",
@@ -3022,15 +3178,19 @@
     "Loading preview": "Lade Vorschau",
     "New video room": "Neuer Videoraum",
     "New room": "Neuer Raum",
-    "Seen by %(count)s people|one": "Von %(count)s Person gesehen",
-    "Seen by %(count)s people|other": "Von %(count)s Personen gesehen",
+    "Seen by %(count)s people": {
+        "one": "Von %(count)s Person gesehen",
+        "other": "Von %(count)s Personen gesehen"
+    },
     "%(members)s and %(last)s": "%(members)s und %(last)s",
     "%(members)s and more": "%(members)s und weitere",
     "View older version of %(spaceName)s.": "Alte Version von %(spaceName)s anzeigen.",
     "Upgrade this space to the recommended room version": "Space auf die empfohlene Version aktualisieren",
     "Your password was successfully changed.": "Dein Passwort wurde erfolgreich geändert.",
-    "Confirm signing out these devices|one": "Abmelden des Geräts bestätigen",
-    "Confirm signing out these devices|other": "Abmelden dieser Geräte bestätigen",
+    "Confirm signing out these devices": {
+        "one": "Abmelden des Geräts bestätigen",
+        "other": "Abmelden dieser Geräte bestätigen"
+    },
     "Developer tools": "Entwicklungswerkzeuge",
     "Turn on camera": "Kamera aktivieren",
     "Turn off camera": "Kamera deaktivieren",
@@ -3099,8 +3259,10 @@
     "Can I use text chat alongside the video call?": "Kann ich während Videoanrufen auch Textnachrichten verschicken?",
     "How can I create a video room?": "Wie kann ich einen Videoraum erstellen?",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "Hardwarebeschleunigung aktivieren (Neustart von %(appName)s erforderlich)",
-    "%(count)s people joined|one": "%(count)s Person beigetreten",
-    "%(count)s people joined|other": "%(count)s Personen beigetreten",
+    "%(count)s people joined": {
+        "one": "%(count)s Person beigetreten",
+        "other": "%(count)s Personen beigetreten"
+    },
     "Enable hardware acceleration": "Aktiviere die Hardwarebeschleunigung",
     "Please note: this is a labs feature using a temporary implementation. This means you will not be able to delete your location history, and advanced users will be able to see your location history even after you stop sharing your live location with this room.": "Bitte beachte: Dies ist eine experimentelle Funktion, die eine temporäre Implementierung nutzt. Das bedeutet, dass du deinen Standortverlauf nicht löschen kannst und erfahrene Nutzer ihn sehen können, selbst wenn du deinen Echtzeit-Standort nicht mehr mit diesem Raum teilst.",
     "Video room": "Videoraum",
@@ -3118,8 +3280,10 @@
     "Ignore user": "Nutzer ignorieren",
     "Show rooms": "Räume zeigen",
     "Search for": "Suche nach",
-    "%(count)s Members|one": "%(count)s Mitglied",
-    "%(count)s Members|other": "%(count)s Mitglieder",
+    "%(count)s Members": {
+        "one": "%(count)s Mitglied",
+        "other": "%(count)s Mitglieder"
+    },
     "Check if you want to hide all current and future messages from this user.": "Prüfe, ob du alle aktuellen und zukünftigen Nachrichten dieses Nutzers verstecken willst.",
     "Show spaces": "Spaces zeigen",
     "You cannot search for rooms that are neither a room nor a space": "Du kannst nicht nach Räumen suchen, die kein Raum oder Space sind",
@@ -3210,8 +3374,10 @@
     "Spell check": "Rechtschreibprüfung",
     "Complete these to get the most out of %(brand)s": "Vervollständige sie für die beste %(brand)s-Erfahrung",
     "You did it!": "Geschafft!",
-    "Only %(count)s steps to go|one": "Nur noch %(count)s Schritt",
-    "Only %(count)s steps to go|other": "Nur noch %(count)s Schritte",
+    "Only %(count)s steps to go": {
+        "one": "Nur noch %(count)s Schritt",
+        "other": "Nur noch %(count)s Schritte"
+    },
     "Welcome to %(brand)s": "Willkommen bei %(brand)s",
     "Find your co-workers": "Finde deine Kollegen",
     "Secure messaging for work": "Sichere Kommunikation für die Arbeit",
@@ -3227,9 +3393,11 @@
     "Find friends": "Freunde finden",
     "Find and invite your friends": "Finde deine Freunde und lade sie ein",
     "You made it!": "Geschafft!",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Im Space %(spaceName)s und %(count)s weiteren Spaces.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Im Space %(spaceName)s und %(count)s weiteren Spaces.",
+        "other": "In %(spaceName)s und %(count)s weiteren Spaces."
+    },
     "In %(spaceName)s.": "Im Space %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s und %(count)s weiteren Spaces.",
     "Download %(brand)s": "%(brand)s herunterladen",
     "Find and invite your community members": "Finde deine Community-Mitglieder und lade sie ein",
     "Get stuff done by finding your teammates": "Finde dein Team und werdet produktiv",
@@ -3290,12 +3458,16 @@
     "It’s what you’re here for, so lets get to it": "Dafür bist du hier, also dann mal los",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Verschlüsselung ist für öffentliche Räume nicht empfohlen.</b> Jeder kann öffentliche Räume finden und betreten, also kann auch jeder die Nachrichten lesen. Du wirst keine der Vorteile von Verschlüsselung erhalten und kannst sie später auch nicht mehr deaktivieren. Nachrichten in öffentlichen Räumen zu verschlüsseln, wird das empfangen und senden verlangsamen.",
     "Empty room (was %(oldName)s)": "Leerer Raum (war %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|other": "Lade %(user)s und %(count)s weitere Person ein",
+    "Inviting %(user)s and %(count)s others": {
+        "other": "Lade %(user)s und %(count)s weitere Person ein",
+        "one": "Lade %(user)s und eine weitere Person ein"
+    },
     "Inviting %(user1)s and %(user2)s": "Lade %(user1)s und %(user2)s ein",
-    "%(user)s and %(count)s others|one": "%(user)s und 1 anderer",
-    "%(user)s and %(count)s others|other": "%(user)s und %(count)s andere",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s und 1 anderer",
+        "other": "%(user)s und %(count)s andere"
+    },
     "%(user1)s and %(user2)s": "%(user1)s und %(user2)s",
-    "Inviting %(user)s and %(count)s others|one": "Lade %(user)s und eine weitere Person ein",
     "Sliding Sync configuration": "Sliding-Sync-Konfiguration",
     "Your server has native support": "Dein Server unterstützt dies nativ",
     "%(qrCode)s or %(appLinks)s": "%(qrCode)s oder %(appLinks)s",
@@ -3392,8 +3564,10 @@
     "Can't start a new voice broadcast": "Sprachübertragung kann nicht gestartet werden",
     "You can use this device to sign in a new device with a QR code. You will need to scan the QR code shown on this device with your device that's signed out.": "Du kannst dieses Gerät verwenden, um ein neues Gerät per QR-Code anzumelden. Dazu musst du den auf diesem Gerät angezeigten QR-Code mit deinem nicht angemeldeten Gerät einlesen.",
     "play voice broadcast": "Sprachübertragung wiedergeben",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Bist du sicher, dass du dich von %(count)s Sitzung abmelden möchtest?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Bist du sicher, dass du dich von %(count)s Sitzungen abmelden möchtest?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Bist du sicher, dass du dich von %(count)s Sitzung abmelden möchtest?",
+        "other": "Bist du sicher, dass du dich von %(count)s Sitzungen abmelden möchtest?"
+    },
     "Inactive sessions are sessions you have not used in some time, but they continue to receive encryption keys.": "Inaktive Sitzungen sind jene, die du schon seit geraumer Zeit nicht mehr verwendet hast, aber nach wie vor Verschlüsselungs-Schlüssel erhalten.",
     "You should make especially certain that you recognise these sessions as they could represent an unauthorised use of your account.": "Du solltest besonders sicher gehen, dass du diese Sitzungen kennst, da sie die unbefugte Nutzung deines Kontos durch Dritte bedeuten könnten.",
     "Unverified sessions are sessions that have logged in with your credentials but have not been cross-verified.": "Nicht verifizierte Sitzungen sind jene, die mit deinen Daten angemeldet, aber nicht quer signiert wurden.",
@@ -3489,8 +3663,10 @@
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Du kannst keinen Anruf beginnen, da du im Moment eine Sprachübertragung aufzeichnest. Bitte beende deine Sprachübertragung, um ein Gespräch zu beginnen.",
     "Can’t start a call": "Kann keinen Anruf beginnen",
     "Improve your account security by following these recommendations.": "Verbessere deine Kontosicherheit, indem du diese Empfehlungen beherzigst.",
-    "%(count)s sessions selected|one": "%(count)s Sitzung ausgewählt",
-    "%(count)s sessions selected|other": "%(count)s Sitzungen ausgewählt",
+    "%(count)s sessions selected": {
+        "one": "%(count)s Sitzung ausgewählt",
+        "other": "%(count)s Sitzungen ausgewählt"
+    },
     "Failed to read events": "Lesen der Ereignisse fehlgeschlagen",
     "Failed to send event": "Übertragung des Ereignisses fehlgeschlagen",
     " in <strong>%(room)s</strong>": " in <strong>%(room)s</strong>",
@@ -3501,8 +3677,10 @@
     "Create a link": "Link erstellen",
     "Link": "Link",
     "Force 15s voice broadcast chunk length": "Die Chunk-Länge der Sprachübertragungen auf 15 Sekunden erzwingen",
-    "Sign out of %(count)s sessions|one": "Von %(count)s Sitzung abmelden",
-    "Sign out of %(count)s sessions|other": "Von %(count)s Sitzungen abmelden",
+    "Sign out of %(count)s sessions": {
+        "one": "Von %(count)s Sitzung abmelden",
+        "other": "Von %(count)s Sitzungen abmelden"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Von allen anderen Sitzungen abmelden (%(otherSessionsCount)s)",
     "Listen to live broadcast?": "Echtzeitübertragung anhören?",
     "Yes, end my recording": "Ja, beende meine Aufzeichnung",
@@ -3611,7 +3789,9 @@
     "Room is <strong>encrypted ✅</strong>": "Raum ist <strong>verschlüsselt ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Benachrichtigungsstand ist <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Ungelesen-Status im Raum: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Ungelesen-Status im Raum: <strong>%(status)s</strong>, Anzahl: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Ungelesen-Status im Raum: <strong>%(status)s</strong>, Anzahl: <strong>%(count)s</strong>"
+    },
     "Identity server is <code>%(identityServerUrl)s</code>": "Identitäts-Server ist <code>%(identityServerUrl)s</code>",
     "Homeserver is <code>%(homeserverUrl)s</code>": "Heim-Server ist <code>%(homeserverUrl)s</code>",
     "Yes, it was me": "Ja, das war ich",
@@ -3619,10 +3799,14 @@
     "If you know a room address, try joining through that instead.": "Falls du eine Adresse kennst, versuche den Raum mit dieser zu betreten.",
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "Du hast versucht einen Raum via Raum-ID, aber ohne Angabe von Servern zu betreten. Raum-IDs sind interne Kennungen und können nicht ohne weitere Informationen zum Betreten von Räumen genutzt werden.",
     "View poll": "Umfrage ansehen",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Für den vergangenen Tag sind keine beendeten Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Für die vergangenen %(count)s Tage sind keine beendeten Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Für den vergangenen Tag sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Für die vergangenen %(count)s Tage sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Für den vergangenen Tag sind keine beendeten Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
+        "other": "Für die vergangenen %(count)s Tage sind keine beendeten Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Für den vergangenen Tag sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
+        "other": "Für die vergangenen %(count)s Tage sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Es sind keine vergangenen Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
     "There are no active polls. Load more polls to view polls for previous months": "Es sind keine aktiven Umfragen verfügbar. Lade weitere Umfragen, um die der vorherigen Monate zu sehen",
     "Load more polls": "Weitere Umfragen laden",
@@ -3752,8 +3936,14 @@
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their profile picture.": "Nachrichten hier sind Ende-zu-Ende-verschlüsselt. Verifiziere %(displayName)s in deren Profil – klicke auf deren Profilbild.",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, indem du auf deren Profilbild klickst.",
     "Your profile picture URL": "Deine Profilbild-URL",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)s haben das Profilbild %(count)s-mal geändert",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)s hat das Profilbild %(count)s-mal geändert",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)s haben das Profilbild %(count)s-mal geändert",
+        "one": "%(severalUsers)shaben ihr Profilbild geändert"
+    },
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)s hat das Profilbild %(count)s-mal geändert",
+        "one": "%(oneUser)shat das Profilbild geändert"
+    },
     "Ask to join": "Beitrittsanfragen",
     "Thread Root ID: %(threadRootId)s": "Thread-Ursprungs-ID: %(threadRootId)s",
     "See history": "Verlauf anzeigen",
@@ -3776,8 +3966,6 @@
     "Request to join sent": "Beitrittsanfrage gestellt",
     "Your request to join is pending.": "Deine Beitrittsanfrage wurde noch nicht bearbeitet.",
     "Cancel request": "Anfrage abbrechen",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)shaben ihr Profilbild geändert",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)shat das Profilbild geändert",
     "Failed to query public rooms": "Abfrage öffentlicher Räume fehlgeschlagen",
     "Your server is unsupported": "Dein Server wird nicht unterstützt",
     "This server is using an older version of Matrix. Upgrade to Matrix %(version)s to use %(brand)s without errors.": "Dieser Server nutzt eine ältere Matrix-Version. Aktualisiere auf Matrix %(version)s, um %(brand)s fehlerfrei nutzen zu können.",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 5725e9cd20..0b04d3c6f7 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -26,8 +26,10 @@
     "Attachment": "Επισύναψη",
     "%(items)s and %(lastItem)s": "%(items)s και %(lastItem)s",
     "Always show message timestamps": "Εμφάνιση πάντα της ένδειξης ώρας στα μηνύματα",
-    "and %(count)s others...|one": "και ένας ακόμα...",
-    "and %(count)s others...|other": "και %(count)s άλλοι...",
+    "and %(count)s others...": {
+        "one": "και ένας ακόμα...",
+        "other": "και %(count)s άλλοι..."
+    },
     "Change Password": "Αλλαγή κωδικού πρόσβασης",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "Ο %(senderDisplayName)s άλλαξε το όνομα του δωματίου σε %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Ο %(senderDisplayName)s άλλαξε το θέμα σε \"%(topic)s\".",
@@ -174,8 +176,10 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "This server does not support authentication with a phone number.": "Αυτός ο διακομιστής δεν υποστηρίζει πιστοποίηση με αριθμό τηλεφώνου.",
     "Room": "Δωμάτιο",
-    "(~%(count)s results)|one": "(~%(count)s αποτέλεσμα)",
-    "(~%(count)s results)|other": "(~%(count)s αποτελέσματα)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s αποτέλεσμα)",
+        "other": "(~%(count)s αποτελέσματα)"
+    },
     "New Password": "Νέος κωδικός πρόσβασης",
     "Start automatically after system login": "Αυτόματη έναρξη μετά τη σύνδεση",
     "Options": "Επιλογές",
@@ -226,7 +230,10 @@
     "Server unavailable, overloaded, or something else went wrong.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή κάτι άλλο να πήγε στραβά.",
     "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
     "Uploading %(filename)s": "Γίνεται αποστολή του %(filename)s",
-    "Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
+        "one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα"
+    },
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
     "Verification Pending": "Εκκρεμεί επιβεβαίωση",
     "Verified key": "Επιβεβαιωμένο κλειδί",
@@ -246,7 +253,6 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Ο %(senderName)s έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
     "The email address linked to your account must be entered.": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
     "This room is not accessible by remote Matrix servers": "Αυτό το δωμάτιο δεν είναι προσβάσιμο από απομακρυσμένους διακομιστές Matrix",
-    "Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
     "You have <a>disabled</a> URL previews by default.": "Έχετε <a>απενεργοποιημένη</a> από προεπιλογή την προεπισκόπηση συνδέσμων.",
     "You have <a>enabled</a> URL previews by default.": "Έχετε <a>ενεργοποιημένη</a> από προεπιλογή την προεπισκόπηση συνδέσμων.",
     "You need to be able to invite users to do that.": "Για να το κάνετε αυτό πρέπει να έχετε τη δυνατότητα να προσκαλέσετε χρήστες.",
@@ -413,11 +419,15 @@
     "%(num)s minutes ago": "%(num)s λεπτά πριν",
     "about a minute ago": "σχεδόν ένα λεπτό πριν",
     "a few seconds ago": "λίγα δευτερόλεπτα πριν",
-    "%(items)s and %(count)s others|one": "%(items)s και ένα ακόμα",
-    "%(items)s and %(count)s others|other": "%(items)s και %(count)s άλλα",
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s και ένα ακόμα",
+        "other": "%(items)s και %(count)s άλλα"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s και %(lastPerson)s πληκτρολογούν …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s και ένας ακόμα πληκτρολογούν …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s και %(count)s άλλοι πληκτρολογούν …",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s και ένας ακόμα πληκτρολογούν …",
+        "other": "%(names)s και %(count)s άλλοι πληκτρολογούν …"
+    },
     "%(displayName)s is typing …": "%(displayName)s πληκτρολογεί …",
     "Ask this user to verify their session, or manually verify it below.": "Ζητήστε από αυτόν τον χρήστη να επιβεβαιώσει την συνεδρία του, ή επιβεβαιώστε την χειροκίνητα παρακάτω.",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "Ο %(name)s (%(userId)s) συνδέθηκε σε μία νέα συνεδρία χωρίς να την επιβεβαιώσει:",
@@ -431,10 +441,14 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "Ο %(senderName)s έκανε μια ηχητική κλήση. (δεν υποστηρίζεται από το πρόγραμμα περιήγησης)",
     "%(senderName)s placed a voice call.": "Ο %(senderName)s έκανε μία ηχητική κλήση.",
     "%(senderName)s changed the alternative addresses for this room.": "Ο %(senderName)s άλλαξε την εναλλακτική διεύθυνση για αυτό το δωμάτιο.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "Ο %(senderName)s αφαίρεσε την εναλλακτική διεύθυνση %(addresses)s για αυτό το δωμάτιο.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "Ο %(senderName)s αφαίρεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "Ο %(senderName)s πρόσθεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "Ο %(senderName)s πρόσθεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "Ο %(senderName)s αφαίρεσε την εναλλακτική διεύθυνση %(addresses)s για αυτό το δωμάτιο.",
+        "other": "Ο %(senderName)s αφαίρεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο."
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "Ο %(senderName)s πρόσθεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο.",
+        "other": "Ο %(senderName)s πρόσθεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο."
+    },
     "%(senderName)s removed the main address for this room.": "Ο %(senderName)s αφαίρεσε την κύρια διεύθυνση για αυτό το δωμάτιο.",
     "%(senderName)s set the main address for this room to %(address)s.": "Ο %(senderName)s έθεσε την κύρια διεύθυνση αυτού του δωματίου σε %(address)s.",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Όλοι οι διακομιστές αποκλείστηκαν από την συμμετοχή! Αυτό το δωμάτιο δεν μπορεί να χρησιμοποιηθεί πλέον.",
@@ -683,13 +697,22 @@
     "Already in call": "Ήδη σε κλήση",
     "Verifies a user, session, and pubkey tuple": "Επιβεβαιώνει έναν χρήστη, συνεδρία, και pubkey tuple",
     "The user you called is busy.": "Ο χρήστης που καλέσατε είναι απασχολημένος.",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s απέρριψε τις προσκλήσεις",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s απέρριψε τις προσκλήσεις %(count)s φορές",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s απέρριψαν τις προσκλήσεις τους",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s απέρριψαν τις προσκλήσεις τους %(count)s φορές",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s έφυγε και επανασυνδέθηκε",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s έφυγε και επανασυνδέθηκε %(count)s φορές",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s έφυγαν και επανασυνδέθηκαν",
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)s απέρριψε τις προσκλήσεις",
+        "other": "%(oneUser)s απέρριψε τις προσκλήσεις %(count)s φορές"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)s απέρριψαν τις προσκλήσεις τους",
+        "other": "%(severalUsers)s απέρριψαν τις προσκλήσεις τους %(count)s φορές"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)s έφυγε και επανασυνδέθηκε",
+        "other": "%(oneUser)s έφυγε και επανασυνδέθηκε %(count)s φορές"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)s έφυγαν και επανασυνδέθηκαν",
+        "other": "%(severalUsers)sέφυγε και επανασυνδέθηκε %(count)s φορές"
+    },
     "Ignored user": "Αγνοημένος χρήστης",
     "Ignores a user, hiding their messages from you": "Αγνοεί ένα χρήστη, αποκρύπτοντας τα μηνύματα του σε εσάς",
     "Unbans user with given ID": "Άρση αποκλεισμού χρήστη με το συγκεκριμένο αναγνωριστικό",
@@ -823,7 +846,10 @@
     "Failed to get room topic: Unable to find room (%(roomId)s": "Αποτυχία λήψης θέματος δωματίου: Αδυναμία εύρεσης δωματίου (%(roomId)s",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s kai %(space2Name)s",
     "Unrecognised room address: %(roomAlias)s": "Μη αναγνωρισμένη διεύθυνση δωματίου: %(roomAlias)s",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s και άλλα %(count)s",
+    "%(spaceName)s and %(count)s others": {
+        "other": "%(spaceName)s και άλλα %(count)s",
+        "one": "%(spaceName)s και %(count)s άλλο"
+    },
     "Message didn't send. Click for info.": "Το μήνυμα δεν στάλθηκε. Κάντε κλικ για πληροφορίες.",
     "End-to-end encryption isn't enabled": "Η κρυπτογράφηση από άκρο σε άκρο δεν είναι ενεργοποιημένη",
     "Enable encryption in settings.": "Ενεργοποιήστε την κρυπτογράφηση στις ρυθμίσεις.",
@@ -897,10 +923,14 @@
     "Message bubbles": "Συννεφάκια μηνυμάτων",
     "Modern": "Μοντέρνο",
     "Message layout": "Διάταξη μηνύματος",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Ενημέρωση χώρου...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Ενημέρωση χώρων... (%(progress)s out of %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Αποστολή πρόσκλησης...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Αποστολή προσκλήσεων... (%(progress)s από %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Ενημέρωση χώρου...",
+        "other": "Ενημέρωση χώρων... (%(progress)s out of %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Αποστολή πρόσκλησης...",
+        "other": "Αποστολή προσκλήσεων... (%(progress)s από %(count)s)"
+    },
     "Loading new room": "Φόρτωση νέου δωματίου",
     "Upgrading room": "Αναβάθμιση δωματίου",
     "Space members": "Μέλη χώρου",
@@ -1097,10 +1127,14 @@
     "Plain Text": "Απλό κείμενο",
     "JSON": "JSON",
     "HTML": "HTML",
-    "Fetched %(count)s events so far|one": "Ανακτήθηκαν %(count)s συμβάντα μέχρι τώρα",
-    "Fetched %(count)s events so far|other": "Ανακτήθηκαν %(count)s συμβάντα μέχρι τώρα",
-    "Fetched %(count)s events out of %(total)s|one": "Ανακτήθηκαν %(count)s συμβάντα από %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Ανακτήθηκαν %(count)s συμβάντα από %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Ανακτήθηκαν %(count)s συμβάντα μέχρι τώρα",
+        "other": "Ανακτήθηκαν %(count)s συμβάντα μέχρι τώρα"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Ανακτήθηκαν %(count)s συμβάντα από %(total)s",
+        "other": "Ανακτήθηκαν %(count)s συμβάντα από %(total)s"
+    },
     "This homeserver has been blocked by its administrator.": "Αυτός ο κεντρικός διακομιστής έχει αποκλειστεί από τον διαχειριστή του.",
     "This homeserver has hit its Monthly Active User limit.": "Αυτός ο κεντρικός διακομιστής έχει φτάσει το μηνιαίο όριο ενεργού χρήστη.",
     "Unexpected error resolving homeserver configuration": "Μη αναμενόμενο σφάλμα κατά την επίλυση της διαμόρφωσης του κεντρικού διακομιστή",
@@ -1120,12 +1154,15 @@
     "Send stickers to your active room as you": "Στείλτε αυτοκόλλητα στο ενεργό δωμάτιό σας",
     "Send stickers to this room as you": "Στείλτε αυτοκόλλητα σε αυτό το δωμάτιο",
     "Command error: Unable to handle slash command.": "Σφάλμα εντολής: Δεν είναι δυνατή η χρήση της εντολής slash.",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s και %(count)s άλλο",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Έγινε εξαγωγή %(count)s συμβάντος σε %(seconds)s δευτερόλεπτα",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Έγινε εξαγωγή %(count)s συμβάντων σε %(seconds)s δευτερόλεπτα",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Έγινε εξαγωγή %(count)s συμβάντος σε %(seconds)s δευτερόλεπτα",
+        "other": "Έγινε εξαγωγή %(count)s συμβάντων σε %(seconds)s δευτερόλεπτα"
+    },
     "Export successful!": "Επιτυχής εξαγωγή!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Λήφθηκε %(count)s συμβάν σε %(seconds)s''",
-    "Fetched %(count)s events in %(seconds)ss|other": "Λήφθηκαν %(count)s συμβάντα σε %(seconds)s''",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Λήφθηκε %(count)s συμβάν σε %(seconds)s''",
+        "other": "Λήφθηκαν %(count)s συμβάντα σε %(seconds)s''"
+    },
     "Processing event %(number)s out of %(total)s": "Επεξεργασία συμβάντος %(number)s από %(total)s",
     "Error fetching file": "Σφάλμα κατά την ανάκτηση του αρχείου",
     "Topic: %(topic)s": "Θέμα: %(topic)s",
@@ -1424,9 +1461,14 @@
     "Back up your keys before signing out to avoid losing them.": "Δημιουργήστε αντίγραφα ασφαλείας των κλειδιών σας πριν αποσυνδεθείτε για να μην τα χάσετε.",
     "Your keys are <b>not being backed up from this session</b>.": "<b>Δεν δημιουργούνται αντίγραφα ασφαλείας των κλειδιών σας από αυτήν την συνεδρία</b>.",
     "This backup is trusted because it has been restored on this session": "Αυτό το αντίγραφο ασφαλείας είναι αξιόπιστο επειδή έχει αποκατασταθεί σε αυτήν τη συνεδρία",
-    "Click the button below to confirm signing out these devices.|other": "Κάντε κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε αποσύνδεση αυτών των συσκευών.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Επιβεβαιώστε ότι αποσυνδέεστε από αυτήν τη συσκευή χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Επιβεβαιώστε την αποσύνδεση από αυτές τις συσκευές χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας.",
+    "Click the button below to confirm signing out these devices.": {
+        "other": "Κάντε κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε αποσύνδεση αυτών των συσκευών.",
+        "one": "Κάντε κλικ στο κουμπί παρακάτω για επιβεβαίωση αποσύνδεση αυτής της συσκευής."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Επιβεβαιώστε ότι αποσυνδέεστε από αυτήν τη συσκευή χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας.",
+        "other": "Επιβεβαιώστε την αποσύνδεση από αυτές τις συσκευές χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας."
+    },
     "Session key:": "Κλειδί συνεδρίας:",
     "Session ID:": "Αναγνωριστικό συνεδρίας:",
     "exists": "υπάρχει",
@@ -1439,16 +1481,19 @@
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "Λείπουν ορισμένα στοιχεία από το %(brand)s που απαιτούνται για την ασφαλή αποθήκευση κρυπτογραφημένων μηνυμάτων τοπικά. Εάν θέλετε να πειραματιστείτε με αυτό το χαρακτηριστικό, δημιουργήστε μια προσαρμοσμένη %(brand)s επιφάνεια εργασίαςμε <nativeLink>προσθήκη στοιχείων αναζήτησης</nativeLink>.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης.",
     "Manage": "Διαχειριστείτε",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης, χρησιμοποιώντας %(size)s για αποθήκευση μηνυμάτων από το %(rooms)sδωμάτιο .",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης, χρησιμοποιώντας %(size)s για αποθήκευση μηνυμάτων από τα %(rooms)sδωμάτια .",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης, χρησιμοποιώντας %(size)s για αποθήκευση μηνυμάτων από το %(rooms)sδωμάτιο .",
+        "other": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης, χρησιμοποιώντας %(size)s για αποθήκευση μηνυμάτων από τα %(rooms)sδωμάτια ."
+    },
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Επαληθεύστε μεμονωμένα κάθε συνεδρία που χρησιμοποιείται από έναν χρήστη για να την επισημάνετε ως αξιόπιστη, χωρίς να εμπιστεύεστε συσκευές με διασταυρούμενη υπογραφή.",
     "Rename": "Μετονομασία",
     "Display Name": "Εμφανιζόμενο όνομα",
     "Select all": "Επιλογή όλων",
     "Deselect all": "Αποεπιλογή όλων",
-    "Sign out devices|one": "Αποσύνδεση συσκευής",
-    "Sign out devices|other": "Αποσύνδεση συσκευών",
-    "Click the button below to confirm signing out these devices.|one": "Κάντε κλικ στο κουμπί παρακάτω για επιβεβαίωση αποσύνδεση αυτής της συσκευής.",
+    "Sign out devices": {
+        "one": "Αποσύνδεση συσκευής",
+        "other": "Αποσύνδεση συσκευών"
+    },
     "Account management": "Διαχείριση λογαριασμών",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Αποδεχτείτε τους Όρους χρήσης του διακομιστή ταυτότητας (%(serverName)s), ώστε να μπορείτε να είστε ανιχνεύσιμοι μέσω της διεύθυνσης ηλεκτρονικού ταχυδρομείου ή του αριθμού τηλεφώνου.",
     "Language and region": "Γλώσσα και περιοχή",
@@ -1501,10 +1546,14 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Οποιοσδήποτε στο <spaceName/> μπορεί να το βρει και να εγγραφεί. Μπορείτε να επιλέξετε και άλλους χώρους.",
     "Spaces with access": "Χώροι με πρόσβαση",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Οποιοσδήποτε σε ένα χώρο μπορεί να το βρει και να εγγραφεί. <a>Επεξεργαστείτε τους χώρους που έχουν πρόσβαση εδώ.</a>",
-    "Currently, %(count)s spaces have access|one": "Αυτήν τη στιγμή, ένας χώρος έχει πρόσβαση",
-    "Currently, %(count)s spaces have access|other": "Αυτήν τη στιγμή, %(count)s χώροι έχουν πρόσβαση",
-    "& %(count)s more|one": "& %(count)s περισσότερα",
-    "& %(count)s more|other": "& %(count)s περισσότερα",
+    "Currently, %(count)s spaces have access": {
+        "one": "Αυτήν τη στιγμή, ένας χώρος έχει πρόσβαση",
+        "other": "Αυτήν τη στιγμή, %(count)s χώροι έχουν πρόσβαση"
+    },
+    "& %(count)s more": {
+        "one": "& %(count)s περισσότερα",
+        "other": "& %(count)s περισσότερα"
+    },
     "Upgrade required": "Απαιτείται αναβάθμιση",
     "Anyone can find and join.": "Οποιοσδήποτε μπορεί να το βρει και να εγγραφεί.",
     "Private (invite only)": "Ιδιωτικό (μόνο με πρόσκληση)",
@@ -1567,8 +1616,10 @@
     "Space": "Χώρος",
     "Clear all data in this session?": "Εκκαθάριση όλων των δεδομένων σε αυτήν την περίοδο σύνδεσης;",
     "Clear all data": "Εκκαθάριση όλων των δεδομένων",
-    "Remove %(count)s messages|other": "Αφαίρεση %(count)s μηνυμάτων",
-    "Remove %(count)s messages|one": "Αφαίρεση 1 μηνύματος",
+    "Remove %(count)s messages": {
+        "other": "Αφαίρεση %(count)s μηνυμάτων",
+        "one": "Αφαίρεση 1 μηνύματος"
+    },
     "Backspace": "Backspace",
     "Share content": "Κοινή χρήση περιεχομένου",
     "Application window": "Παράθυρο εφαρμογής",
@@ -1735,10 +1786,14 @@
     "Session key": "Κλειδί συνεδρίας",
     "Session name": "Όνομα συνεδρίας",
     "Select spaces": "Επιλέξτε χώρους",
-    "%(count)s rooms|one": "%(count)s δωμάτιο",
-    "%(count)s rooms|other": "%(count)s δωμάτια",
-    "%(count)s members|one": "%(count)s μέλος",
-    "%(count)s members|other": "%(count)s μέλη",
+    "%(count)s rooms": {
+        "one": "%(count)s δωμάτιο",
+        "other": "%(count)s δωμάτια"
+    },
+    "%(count)s members": {
+        "one": "%(count)s μέλος",
+        "other": "%(count)s μέλη"
+    },
     "Are you sure you want to sign out?": "Είσαστε σίγουροι ότι θέλετε να αποσυνδεθείτε;",
     "You'll lose access to your encrypted messages": "Θα χάσετε την πρόσβαση στα κρυπτογραφημένα μηνύματά σας",
     "Manually export keys": "Μη αυτόματη εξαγωγή κλειδιών",
@@ -1758,7 +1813,10 @@
     "Enter Security Phrase": "Εισαγάγετε τη Φράση Ασφαλείας",
     "Moderation": "Συντονισμός",
     "Light high contrast": "Ελαφριά υψηλή αντίθεση",
-    "Show %(count)s other previews|other": "Εμφάνιση %(count)s άλλων προεπισκοπήσεων",
+    "Show %(count)s other previews": {
+        "other": "Εμφάνιση %(count)s άλλων προεπισκοπήσεων",
+        "one": "Εμφάνιση%(count)s άλλων προεπισκοπήσεων"
+    },
     "Encrypted by an unverified session": "Κρυπτογραφήθηκε από μια μη επαληθευμένη συνεδρία",
     "Copy link to thread": "Αντιγραφή συνδέσμου στο νήμα εκτέλεσης",
     "View in room": "Δείτε στο δωμάτιο",
@@ -1783,10 +1841,14 @@
     "Re-join": "Επανασύνδεση",
     "You were removed from %(roomName)s by %(memberName)s": "Αφαιρεθήκατε από το %(roomName)s από τον %(memberName)s",
     "%(spaceName)s menu": "%(spaceName)s μενού",
-    "Currently removing messages in %(count)s rooms|one": "Αυτήν τη στιγμή γίνεται κατάργηση μηνυμάτων σε %(count)s δωμάτιο",
-    "Currently removing messages in %(count)s rooms|other": "Αυτήν τη στιγμή γίνεται κατάργηση μηνυμάτων σε %(count)s δωμάτια",
-    "Currently joining %(count)s rooms|one": "Αυτήν τη στιγμή συμμετέχετε σε%(count)sδωμάτιο",
-    "Currently joining %(count)s rooms|other": "Αυτήν τη στιγμή συμμετέχετε σε %(count)s δωμάτια",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Αυτήν τη στιγμή γίνεται κατάργηση μηνυμάτων σε %(count)s δωμάτιο",
+        "other": "Αυτήν τη στιγμή γίνεται κατάργηση μηνυμάτων σε %(count)s δωμάτια"
+    },
+    "Currently joining %(count)s rooms": {
+        "one": "Αυτήν τη στιγμή συμμετέχετε σε%(count)sδωμάτιο",
+        "other": "Αυτήν τη στιγμή συμμετέχετε σε %(count)s δωμάτια"
+    },
     "Join public room": "Εγγραφείτε στο δημόσιο δωμάτιο",
     "Show Widgets": "Εμφάνιση μικροεφαρμογών",
     "Hide Widgets": "Απόκρυψη μικροεφαρμογών",
@@ -1795,7 +1857,6 @@
     "Unknown for %(duration)s": "Άγνωστο για %(duration)s",
     "This is the start of <roomName/>.": "Αυτή είναι η αρχή του <roomName/>.",
     "Topic: %(topic)s (<a>edit</a>)": "Θέμα: %(topic)s (<a>επεξεργασία</a>)",
-    "Show %(count)s other previews|one": "Εμφάνιση%(count)s άλλων προεπισκοπήσεων",
     "A connection error occurred while trying to contact the server.": "Παρουσιάστηκε σφάλμα σύνδεσης κατά την προσπάθεια επικοινωνίας με τον διακομιστή.",
     "Your area is experiencing difficulties connecting to the internet.": "Η περιοχή σας αντιμετωπίζει δυσκολίες σύνδεσης στο διαδίκτυο.",
     "The server has denied your request.": "Ο διακομιστής απέρριψε το αίτημά σας.",
@@ -1916,8 +1977,10 @@
     "Verify other device": "Επαλήθευση άλλης συσκευής",
     "Upload Error": "Σφάλμα μεταφόρτωσης",
     "Cancel All": "Ακύρωση Όλων",
-    "Upload %(count)s other files|one": "Μεταφόρτωση %(count)s άλλου αρχείου",
-    "Upload %(count)s other files|other": "Μεταφόρτωση %(count)s άλλων αρχείων",
+    "Upload %(count)s other files": {
+        "one": "Μεταφόρτωση %(count)s άλλου αρχείου",
+        "other": "Μεταφόρτωση %(count)s άλλων αρχείων"
+    },
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Ορισμένα αρχεία είναι <b>πολύ μεγάλα</b> για να μεταφορτωθούν. Το όριο μεγέθους αρχείου είναι %(limit)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Αυτά τα αρχεία είναι <b>πολύ μεγάλα</b> για μεταφόρτωση. Το όριο μεγέθους αρχείου είναι %(limit)s.",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Αυτό το αρχείο είναι <b>πολύ μεγάλο</b> για μεταφόρτωση. Το όριο μεγέθους αρχείου είναι %(limit)s αλλά αυτό το αρχείο είναι %(sizeOfThisFile)s.",
@@ -1960,17 +2023,23 @@
     "Specify a homeserver": "Καθορίστε τον κεντρικό διακομιστή σας",
     "Invalid URL": "Μη έγκυρο URL",
     "Unread messages.": "Μη αναγνωσμένα μηνύματα.",
-    "%(count)s unread messages.|one": "1 μη αναγνωσμένο μήνυμα.",
-    "%(count)s unread messages.|other": "%(count)s μη αναγνωσμένα μηνύματα.",
-    "%(count)s unread messages including mentions.|one": "1 μη αναγνωσμένη αναφορά.",
-    "%(count)s unread messages including mentions.|other": "%(count)s μη αναγνωσμένα μηνύματα συμπεριλαμβανομένων των αναφορών.",
+    "%(count)s unread messages.": {
+        "one": "1 μη αναγνωσμένο μήνυμα.",
+        "other": "%(count)s μη αναγνωσμένα μηνύματα."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "1 μη αναγνωσμένη αναφορά.",
+        "other": "%(count)s μη αναγνωσμένα μηνύματα συμπεριλαμβανομένων των αναφορών."
+    },
     "Join": "Συμμετοχή",
     "Copy room link": "Αντιγραφή συνδέσμου δωματίου",
     "Forget Room": "Ξεχάστε το δωμάτιο",
     "Notification options": "Επιλογές ειδοποίησης",
     "Show less": "Εμφάνιση λιγότερων",
-    "Show %(count)s more|one": "Εμφάνιση %(count)s περισσότερων",
-    "Show %(count)s more|other": "Εμφάνιση %(count)s περισσότερων",
+    "Show %(count)s more": {
+        "one": "Εμφάνιση %(count)s περισσότερων",
+        "other": "Εμφάνιση %(count)s περισσότερων"
+    },
     "List options": "Επιλογές λίστας",
     "A-Z": "Α-Ω",
     "Activity": "Δραστηριότητα",
@@ -2076,8 +2145,10 @@
     "Unable to access your microphone": "Αδυναμία πρόσβασης μικροφώνου",
     "Mark all as read": "Επισήμανση όλων ως αναγνωσμένων",
     "Open thread": "Άνοιγμα νήματος",
-    "%(count)s reply|one": "%(count)s απάντηση",
-    "%(count)s reply|other": "%(count)s απαντήσεις",
+    "%(count)s reply": {
+        "one": "%(count)s απάντηση",
+        "other": "%(count)s απαντήσεις"
+    },
     "No microphone found": "Δε βρέθηκε μικρόφωνο",
     "We were unable to access your microphone. Please check your browser settings and try again.": "Δεν ήταν δυνατή η πρόσβαση στο μικρόφωνο σας. Ελέγξτε τις ρυθμίσεις του προγράμματος περιήγησης σας και δοκιμάστε ξανά.",
     "Your export was successful. Find it in your Downloads folder.": "Η εξαγωγή σας ήταν επιτυχής. Βρείτε τη στο φάκελο Λήψεις.",
@@ -2122,17 +2193,25 @@
     "Show all": "Εμφάνιση όλων",
     "Add reaction": "Προσθέστε αντίδραση",
     "Error processing voice message": "Σφάλμα επεξεργασίας του φωνητικού μηνύματος",
-    "%(count)s votes|one": "%(count)s ψήφος",
-    "%(count)s votes|other": "%(count)s ψήφοι",
+    "%(count)s votes": {
+        "one": "%(count)s ψήφος",
+        "other": "%(count)s ψήφοι"
+    },
     "edited": "επεξεργάστηκε",
-    "Based on %(count)s votes|one": "Με βάση %(count)s ψήφο",
-    "Based on %(count)s votes|other": "Με βάση %(count)s ψήφους",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s ψήφος. Ψηφίστε για να δείτε τα αποτελέσματα",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s ψήφοι. Ψηφίστε για να δείτε τα αποτελέσματα",
+    "Based on %(count)s votes": {
+        "one": "Με βάση %(count)s ψήφο",
+        "other": "Με βάση %(count)s ψήφους"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s ψήφος. Ψηφίστε για να δείτε τα αποτελέσματα",
+        "other": "%(count)s ψήφοι. Ψηφίστε για να δείτε τα αποτελέσματα"
+    },
     "No votes cast": "Καμία ψήφος",
     "Results will be visible when the poll is ended": "Τα αποτελέσματα θα είναι ορατά όταν τελειώσει η δημοσκόπηση",
-    "Final result based on %(count)s votes|one": "Τελικό αποτέλεσμα με βάση %(count)s ψήφο",
-    "Final result based on %(count)s votes|other": "Τελικό αποτέλεσμα με βάση %(count)s ψήφους",
+    "Final result based on %(count)s votes": {
+        "one": "Τελικό αποτέλεσμα με βάση %(count)s ψήφο",
+        "other": "Τελικό αποτέλεσμα με βάση %(count)s ψήφους"
+    },
     "Sorry, your vote was not registered. Please try again.": "Λυπούμαστε, η ψήφος σας δεν καταχωρήθηκε. Παρακαλώ προσπαθήστε ξανά.",
     "Vote not registered": "Η ψήφος δεν έχει καταχωρηθεί",
     "Download": "Λήψη",
@@ -2197,11 +2276,15 @@
     "Jump to read receipt": "Μετάβαση στο αποδεικτικό ανάγνωσης",
     "Message": "Μήνυμα",
     "Hide sessions": "Απόκρυψη συνεδριών",
-    "%(count)s sessions|one": "%(count)s συνεδρία",
-    "%(count)s sessions|other": "%(count)s συνεδρίες",
+    "%(count)s sessions": {
+        "one": "%(count)s συνεδρία",
+        "other": "%(count)s συνεδρίες"
+    },
     "Hide verified sessions": "Απόκρυψη επαληθευμένων συνεδριών",
-    "%(count)s verified sessions|one": "1 επαληθευμένη συνεδρία",
-    "%(count)s verified sessions|other": "%(count)s επαληθευμένες συνεδρίες",
+    "%(count)s verified sessions": {
+        "one": "1 επαληθευμένη συνεδρία",
+        "other": "%(count)s επαληθευμένες συνεδρίες"
+    },
     "Trusted": "Έμπιστο",
     "Room settings": "Ρυθμίσεις δωματίου",
     "Share room": "Κοινή χρήση δωματίου",
@@ -2216,7 +2299,9 @@
     "Close this widget to view it in this panel": "Κλείστε αυτήν τη μικροεφαρμογή για να την προβάλετε σε αυτόν τον πίνακα",
     "Unpin this widget to view it in this panel": "Ξεκαρφιτσώστε αυτήν τη μικροεφαρμογή για να την προβάλετε σε αυτόν τον πίνακα",
     "Maximise": "Μεγιστοποίηση",
-    "You can only pin up to %(count)s widgets|other": "Μπορείτε να καρφιτσώσετε μόνο έως %(count)s μικρεοεφαρμογές",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Μπορείτε να καρφιτσώσετε μόνο έως %(count)s μικρεοεφαρμογές"
+    },
     "Chat": "Συνομιλία",
     "Pinned messages": "Καρφιτσωμένα μηνύματα",
     "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Εάν έχετε δικαιώματα, ανοίξτε το μενού σε οποιοδήποτε μήνυμα και επιλέξτε <b>Καρφίτσωμα</b> για να τα κολλήσετε εδώ.",
@@ -2295,8 +2380,10 @@
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Καταργήστε την επιλογή εάν θέλετε επίσης να καταργήσετε τα μηνύματα συστήματος σε αυτόν τον χρήστη (π.χ. αλλαγή μέλους, αλλαγή προφίλ…)",
     "Preserve system messages": "Διατήρηση μηνυμάτων συστήματος",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Για μεγάλο αριθμό μηνυμάτων, αυτό μπορεί να πάρει κάποιο χρόνο. Μην ανανεώνετε το προγράμμα-πελάτη σας στο μεταξύ.",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Πρόκειται να αφαιρέσετε %(count)s μηνύματα του χρήστη %(user)s. Αυτό θα τα καταργήσει οριστικά για όλους στη συνομιλία. Θέλετε να συνεχίσετε;",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Πρόκειται να αφαιρέσετε %(count)s μήνυμα του χρήστη %(user)s. Αυτό θα το καταργήσει οριστικά για όλους στη συνομιλία. Θέλετε να συνεχίσετε;",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "other": "Πρόκειται να αφαιρέσετε %(count)s μηνύματα του χρήστη %(user)s. Αυτό θα τα καταργήσει οριστικά για όλους στη συνομιλία. Θέλετε να συνεχίσετε;",
+        "one": "Πρόκειται να αφαιρέσετε %(count)s μήνυμα του χρήστη %(user)s. Αυτό θα το καταργήσει οριστικά για όλους στη συνομιλία. Θέλετε να συνεχίσετε;"
+    },
     "Remove recent messages by %(user)s": "Καταργήστε πρόσφατα μηνύματα από %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Δοκιμάστε να κάνετε κύλιση στη γραμμή χρόνου για να δείτε αν υπάρχουν παλαιότερα.",
     "No recent messages by %(user)s found": "Δε βρέθηκαν πρόσφατα μηνύματα από %(user)s",
@@ -2324,8 +2411,10 @@
     "Want to add a new room instead?": "Θέλετε να προσθέσετε ένα νέο δωμάτιο αντί αυτού;",
     "Add existing rooms": "Προσθέστε υπάρχοντα δωμάτια",
     "Direct Messages": "Άμεσα Μηνύματα",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Προσθήκη δωματίου...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Προσθήκη δωματίων... (%(progress)s από %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Προσθήκη δωματίου...",
+        "other": "Προσθήκη δωματίων... (%(progress)s από %(count)s)"
+    },
     "Not all selected were added": "Δεν προστέθηκαν όλοι οι επιλεγμένοι",
     "Search for spaces": "Αναζητήστε χώρους",
     "Create a new space": "Δημιουργήστε ένα νέο χώρο",
@@ -2364,7 +2453,10 @@
     "Information": "Πληροφορίες",
     "Rotate Right": "Περιστροφή δεξιά",
     "Rotate Left": "Περιστροφή αριστερά",
-    "View all %(count)s members|one": "Προβολή 1 μέλους",
+    "View all %(count)s members": {
+        "one": "Προβολή 1 μέλους",
+        "other": "Προβολή όλων των %(count)s μελών"
+    },
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Παρακαλούμε <newIssueLink>δημιουργήστε ένα νέο issue</newIssueLink> στο GitHub ώστε να μπορέσουμε να διερευνήσουμε αυτό το σφάλμα.",
     "This version of %(brand)s does not support searching encrypted messages": "Αυτή η έκδοση του %(brand)s δεν υποστηρίζει την αναζήτηση κρυπτογραφημένων μηνυμάτων",
     "This version of %(brand)s does not support viewing some encrypted files": "Αυτή η έκδοση του %(brand)s δεν υποστηρίζει την προβολή ορισμένων κρυπτογραφημένων αρχείων",
@@ -2621,8 +2713,10 @@
     "Suggested": "Προτεινόμενα",
     "This room is suggested as a good one to join": "Αυτό το δωμάτιο προτείνεται ως ένα καλό δωμάτιο για συμμετοχή",
     "You don't have permission": "Δεν έχετε άδεια",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Έχετε %(count)s μη αναγνωσμένη ειδοποιήση σε προηγούμενη έκδοση αυτού του δωματίου.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Έχετε %(count)s μη αναγνωσμένες ειδοποιήσεις σε προηγούμενη έκδοση αυτού του δωματίου.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "Έχετε %(count)s μη αναγνωσμένη ειδοποιήση σε προηγούμενη έκδοση αυτού του δωματίου.",
+        "other": "Έχετε %(count)s μη αναγνωσμένες ειδοποιήσεις σε προηγούμενη έκδοση αυτού του δωματίου."
+    },
     "You can select all or individual messages to retry or delete": "Μπορείτε να επιλέξετε όλα ή μεμονωμένα μηνύματα για επανάληψη ή διαγραφή",
     "Retry all": "Επανάληψη όλων",
     "Delete all": "Διαγραφή όλων",
@@ -2657,60 +2751,108 @@
     "Sign in with single sign-on": "Συνδεθείτε με απλή σύνδεση",
     "Continue with %(provider)s": "Συνεχίστε με %(provider)s",
     "Join millions for free on the largest public server": "Συμμετέχετε δωρεάν στον μεγαλύτερο δημόσιο διακομιστή",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sάλλαξε το όνομα τους",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sάλλαξε το όνομα τους %(count)s φορές",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sάλλαξαν το όνομα τους",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sάλλαξαν το όνομα τους %(count)s φορές",
-    "was removed %(count)s times|one": "αφαιρέθηκε",
-    "was removed %(count)s times|other": "αφαιρέθηκε %(count)s φορές",
-    "were removed %(count)s times|one": "αφαιρέθηκαν",
-    "were removed %(count)s times|other": "αφαιρέθηκαν %(count)s φορές",
-    "was banned %(count)s times|one": "αποκλείστηκε",
-    "was banned %(count)s times|other": "αποκλείστηκε %(count)s φορές",
-    "were banned %(count)s times|one": "αποκλείστηκαν",
-    "were banned %(count)s times|other": "αποκλείστηκαν %(count)s φορές",
-    "was invited %(count)s times|one": "προσκλήθηκε",
-    "was invited %(count)s times|other": "προσκλήθηκε %(count)s φορές",
-    "were invited %(count)s times|one": "προσκλήθηκαν",
-    "were invited %(count)s times|other": "προσκλήθηκαν %(count)s φορές",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sαπέσυρε την πρόσκληση του",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sαπέσυρε την πρόσκληση του %(count)s φορές",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sαπέσυραν τις προσκλήσεις τους",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sαπέσυραν τις προσκλήσεις τους%(count)s φορές",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sέφυγε και επανασυνδέθηκε %(count)s φορές",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sjσυνδέθηκε και έφυγε",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sσυνδέθηκε και έφυγε%(count)s φορές",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sσυνδέθηκαν και έφυγαν",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sσυνδέθηκαν και έφυγαν %(count)s φορές",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sέφυγε",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sέφυγαν %(count)s φορές",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sέφυγαν",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sέφυγαν %(count)s φορές",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sσυνδέθηκαν",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sσυνδέθηκαν %(count)s φορές",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sσυνδέθηκαν",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sσυνδέθηκαν %(count)s φορές",
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)sάλλαξε το όνομα τους",
+        "other": "%(oneUser)sάλλαξε το όνομα τους %(count)s φορές"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)sάλλαξαν το όνομα τους",
+        "other": "%(severalUsers)sάλλαξαν το όνομα τους %(count)s φορές"
+    },
+    "was removed %(count)s times": {
+        "one": "αφαιρέθηκε",
+        "other": "αφαιρέθηκε %(count)s φορές"
+    },
+    "were removed %(count)s times": {
+        "one": "αφαιρέθηκαν",
+        "other": "αφαιρέθηκαν %(count)s φορές"
+    },
+    "was banned %(count)s times": {
+        "one": "αποκλείστηκε",
+        "other": "αποκλείστηκε %(count)s φορές"
+    },
+    "were banned %(count)s times": {
+        "one": "αποκλείστηκαν",
+        "other": "αποκλείστηκαν %(count)s φορές"
+    },
+    "was invited %(count)s times": {
+        "one": "προσκλήθηκε",
+        "other": "προσκλήθηκε %(count)s φορές"
+    },
+    "were invited %(count)s times": {
+        "one": "προσκλήθηκαν",
+        "other": "προσκλήθηκαν %(count)s φορές"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "%(oneUser)sαπέσυρε την πρόσκληση του",
+        "other": "%(oneUser)sαπέσυρε την πρόσκληση του %(count)s φορές"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)sαπέσυραν τις προσκλήσεις τους",
+        "other": "%(severalUsers)sαπέσυραν τις προσκλήσεις τους%(count)s φορές"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)sjσυνδέθηκε και έφυγε",
+        "other": "%(oneUser)sσυνδέθηκε και έφυγε%(count)s φορές"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)sσυνδέθηκαν και έφυγαν",
+        "other": "%(severalUsers)sσυνδέθηκαν και έφυγαν %(count)s φορές"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)sέφυγε",
+        "other": "%(oneUser)sέφυγαν %(count)s φορές"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)sέφυγαν",
+        "other": "%(severalUsers)sέφυγαν %(count)s φορές"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)sσυνδέθηκαν",
+        "other": "%(oneUser)sσυνδέθηκαν %(count)s φορές"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)sσυνδέθηκαν",
+        "other": "%(severalUsers)sσυνδέθηκαν %(count)s φορές"
+    },
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "Popout widget": "Αναδυόμενη μικροεφαρμογή",
     "Widget ID": "Ταυτότητα μικροεφαρμογής",
     "toggle event": "μεταβολή συμβάντος",
     "Could not connect media": "Δεν ήταν δυνατή η σύνδεση πολυμέσων",
     "Secure Backup": "Ασφαλές αντίγραφο ασφαλείας",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sάλλαξε %(count)s μηνύματα",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sάλλαξαν ένα μήνυμα",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sάλλαξαν %(count)s μηνύματα",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "Οι %(severalUsers)sάλλαξαν τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο %(count)s φορές",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "Οι %(severalUsers)s άλλαξαν τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "Ο/η %(oneUser)s άλλαξε τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "Ο/η %(oneUser)s άλλαξε τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο %(count)s φορές",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sάλλαξε τα ACLs του διακομιστή",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sάλλαξαν τα ACLs του διακομιστή %(count)s φορές",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sάλλαξαν τα ACLs του διακομιστή",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sάλλαξε τα ACLs του διακομιστή %(count)s φορές",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sδεν έκανε αλλαγές",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sδεν έκανε αλλαγές %(count)s φορές",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sδεν έκαναν αλλαγές",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sδεν έκαναν αλλαγές %(count)s φορές",
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)sάλλαξε %(count)s μηνύματα",
+        "one": "%(oneUser)sαφαίρεσε ένα μήνυμα"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sάλλαξαν ένα μήνυμα",
+        "other": "%(severalUsers)sάλλαξαν %(count)s μηνύματα"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "Οι %(severalUsers)sάλλαξαν τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο %(count)s φορές",
+        "one": "Οι %(severalUsers)s άλλαξαν τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "Ο/η %(oneUser)s άλλαξε τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο",
+        "other": "Ο/η %(oneUser)s άλλαξε τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο %(count)s φορές"
+    },
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sάλλαξε τα ACLs του διακομιστή",
+        "other": "%(oneUser)sάλλαξε τα ACLs του διακομιστή %(count)s φορές"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "other": "%(severalUsers)sάλλαξαν τα ACLs του διακομιστή %(count)s φορές",
+        "one": "%(severalUsers)sάλλαξαν τα ACLs του διακομιστή"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)sδεν έκανε αλλαγές",
+        "other": "%(oneUser)sδεν έκανε αλλαγές %(count)s φορές"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)sδεν έκαναν αλλαγές",
+        "other": "%(severalUsers)sδεν έκαναν αλλαγές %(count)s φορές"
+    },
     "Home is useful for getting an overview of everything.": "Ο Αρχικός χώρος είναι χρήσιμος για να έχετε μια επισκόπηση των πάντων.",
     "Exporting your data": "Εξαγωγή των δεδομένων σας",
     "Are you sure you want to stop exporting your data? If you do, you'll need to start over.": "Είστε βέβαιοι ότι θέλετε να διακόψετε την εξαγωγή των δεδομένων σας; Εάν το κάνετε, θα πρέπει να ξεκινήσετε από την αρχή.",
@@ -2718,23 +2860,31 @@
     "Offline encrypted messaging using dehydrated devices": "Κρυπτογραφημένα μηνύματα εκτός σύνδεσης με χρήση αφυδατωμένων συσκευών",
     "Adding spaces has moved.": "Η προσθήκη χώρων μετακινήθηκε.",
     "Matrix": "Matrix",
-    "And %(count)s more...|other": "Και %(count)s ακόμα...",
+    "And %(count)s more...": {
+        "other": "Και %(count)s ακόμα..."
+    },
     "Homeserver": "Κεντρικός διακομιστής",
     "In reply to <a>this message</a>": "Ως απαντηση σε<a>αυτό το μήνυμα</a>",
     "<a>In reply to</a> <pill>": "<a>Ως απαντηση σε</a> <pill>",
     "Power level": "Επίπεδο ισχύος",
-    "%(count)s people you know have already joined|one": "%(count)s άτομο που γνωρίζετε έχει ήδη εγγραφεί",
-    "%(count)s people you know have already joined|other": "%(count)s άτομα που γνωρίζετε έχουν ήδη εγγραφεί",
-    "View all %(count)s members|other": "Προβολή όλων των %(count)s μελών",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s άτομο που γνωρίζετε έχει ήδη εγγραφεί",
+        "other": "%(count)s άτομα που γνωρίζετε έχουν ήδη εγγραφεί"
+    },
     "Including %(commaSeparatedMembers)s": "Συμπεριλαμβανομένου %(commaSeparatedMembers)s",
     "Including you, %(commaSeparatedMembers)s": "Συμπεριλαμβανομένου σας, %(commaSeparatedMembers)s",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sέστειλε ένα κρυφό μήνυμα",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sέστειλε %(count)s κρυφά μηνύματα",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sέστειλαν ένα κρυφό μήνυμα",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sέστειλαν %(count)s κρυφά μηνύματα",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sαφαίρεσε ένα μήνυμα",
-    "were unbanned %(count)s times|one": "αφαιρέθηκε η απόκλιση σας",
-    "were unbanned %(count)s times|other": "αφαιρέθηκε η απόκλιση σας %(count)s φορές",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sέστειλε ένα κρυφό μήνυμα",
+        "other": "%(oneUser)sέστειλε %(count)s κρυφά μηνύματα"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sέστειλαν ένα κρυφό μήνυμα",
+        "other": "%(severalUsers)sέστειλαν %(count)s κρυφά μηνύματα"
+    },
+    "were unbanned %(count)s times": {
+        "one": "αφαιρέθηκε η απόκλιση σας",
+        "other": "αφαιρέθηκε η απόκλιση σας %(count)s φορές"
+    },
     "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Έχετε χρησιμοποιήσει στο παρελθόν μια νεότερη έκδοση του %(brand)s με αυτήν την συνεδρία. Για να χρησιμοποιήσετε ξανά αυτήν την έκδοση με κρυπτογράφηση από άκρο σε άκρο, θα πρέπει να αποσυνδεθείτε και να συνδεθείτε ξανά.",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Για να αποφύγετε να χάσετε το ιστορικό των συνομιλιών σας, πρέπει να εξαγάγετε τα κλειδιά του δωματίου σας πριν αποσυνδεθείτε. Για να το κάνετε αυτό, θα χρειαστεί να επιστρέψετε στη νεότερη έκδοση του %(brand)s",
     "Add a space to a space you manage.": "Προσθέστε έναν χώρο σε ένα χώρο που διαχειρίζεστε.",
@@ -2822,8 +2972,10 @@
     "Server": "Διακομιστής",
     "Failed to load.": "Αποτυχία φόρτωσης.",
     "Capabilities": "Δυνατότητες",
-    "<%(count)s spaces>|one": "<χώρος>",
-    "<%(count)s spaces>|other": "<%(count)s χώροι>",
+    "<%(count)s spaces>": {
+        "one": "<χώρος>",
+        "other": "<%(count)s χώροι>"
+    },
     "No results found": "Δε βρέθηκαν αποτελέσματα",
     "Filter results": "Φιλτράρισμα αποτελεσμάτων",
     "Doesn't look like valid JSON.": "Δε μοιάζει με έγκυρο JSON.",
@@ -2917,8 +3069,10 @@
     "a new master key signature": "μια νέα υπογραφή κύριου κλειδιού",
     "We couldn't create your DM.": "Δεν μπορέσαμε να δημιουργήσουμε το DM σας.",
     "Send custom timeline event": "Αποστολή προσαρμοσμένου συμβάντος χρονολογίου",
-    "was unbanned %(count)s times|one": "αφαιρέθηκε η απόκλιση του",
-    "was unbanned %(count)s times|other": "αφαιρέθηκε η απόκλιση του %(count)s φορές",
+    "was unbanned %(count)s times": {
+        "one": "αφαιρέθηκε η απόκλιση του",
+        "other": "αφαιρέθηκε η απόκλιση του %(count)s φορές"
+    },
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Το %(errcode)s επιστράφηκε κατά την προσπάθεια πρόσβασης στο δωμάτιο ή στο χώρο. Εάν πιστεύετε ότι βλέπετε αυτό το μήνυμα κατά λάθος, <issueLink>υποβάλετε μια αναφορά σφάλματος</issueLink>.",
     "Try again later, or ask a room or space admin to check if you have access.": "Δοκιμάστε ξανά αργότερα ή ζητήστε από έναν διαχειριστή δωματίου ή χώρου να ελέγξει εάν έχετε πρόσβαση.",
     "This room or space is not accessible at this time.": "Αυτό το δωμάτιο ή ο χώρος δεν είναι προσβάσιμος αυτήν τη στιγμή.",
@@ -3066,8 +3220,10 @@
     "New room": "Νέο δωμάτιο",
     "Private room": "Ιδιωτικό δωμάτιο",
     "Your password was successfully changed.": "Ο κωδικός πρόσβασης σας άλλαξε με επιτυχία.",
-    "Confirm signing out these devices|one": "Επιβεβαιώστε την αποσύνδεση αυτής της συσκευής",
-    "Confirm signing out these devices|other": "Επιβεβαιώστε την αποσύνδεση αυτών των συσκευών",
+    "Confirm signing out these devices": {
+        "one": "Επιβεβαιώστε την αποσύνδεση αυτής της συσκευής",
+        "other": "Επιβεβαιώστε την αποσύνδεση αυτών των συσκευών"
+    },
     "Turn on camera": "Ενεργοποίηση κάμερας",
     "Turn off camera": "Απενεργοποίηση κάμερας",
     "Video devices": "Συσκευές βίντεο",
@@ -3085,8 +3241,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Εάν δεν εμφανίζεται το άτομο που αναζητάτε, στείλτε τους τον σύνδεσμο πρόσκλησης.",
     "Some results may be hidden for privacy": "Ορισμένα αποτελέσματα ενδέχεται να είναι κρυφά για λόγους απορρήτου",
     "Search for": "Αναζήτηση για",
-    "%(count)s Members|one": "%(count)s Μέλος",
-    "%(count)s Members|other": "%(count)s Μέλη",
+    "%(count)s Members": {
+        "one": "%(count)s Μέλος",
+        "other": "%(count)s Μέλη"
+    },
     "You will leave all rooms and DMs that you are in": "Θα αποχωρήσετε από όλα τα δωμάτια και τις συνομιλίες σας",
     "No one will be able to reuse your username (MXID), including you: this username will remain unavailable": "Κανείς δε θα μπορεί να επαναχρησιμοποιήσει το όνομα χρήστη σας (MXID), συμπεριλαμβανομένου εσάς: αυτό το όνομα χρήστη θα παραμείνει μη διαθέσιμο",
     "You will not be able to reactivate your account": "Δεν θα μπορείτε να ενεργοποιήσετε ξανά τον λογαριασμό σας",
@@ -3100,8 +3258,10 @@
     "Disinvite from room": "Ακύρωση πρόσκλησης από το δωμάτιο",
     "Remove from space": "Αφαίρεση από τον χώρο",
     "Disinvite from space": "Ακύρωση πρόσκλησης από τον χώρο",
-    "%(count)s participants|one": "1 συμμετέχων",
-    "%(count)s participants|other": "%(count)s συμμετέχοντες",
+    "%(count)s participants": {
+        "one": "1 συμμετέχων",
+        "other": "%(count)s συμμετέχοντες"
+    },
     "Joining…": "Συμμετοχή…",
     "Show Labs settings": "Εμφάνιση ρυθμίσεων Labs",
     "To join, please enable video rooms in Labs first": "Για να συμμετέχετε, ενεργοποιήστε πρώτα τις αίθουσες βίντεο στο Labs",
@@ -3110,8 +3270,10 @@
     "New video room": "Νέο δωμάτιο βίντεο",
     "Video room": "Δωμάτια βίντεο",
     "Video rooms are a beta feature": "Οι αίθουσες βίντεο είναι μια λειτουργία beta",
-    "Seen by %(count)s people|one": "Αναγνώστηκε από %(count)s άτομο",
-    "Seen by %(count)s people|other": "Αναγνώστηκε από %(count)s άτομα",
+    "Seen by %(count)s people": {
+        "one": "Αναγνώστηκε από %(count)s άτομο",
+        "other": "Αναγνώστηκε από %(count)s άτομα"
+    },
     "Enable hardware acceleration (restart %(appName)s to take effect)": "Ενεργοποίηση επιτάχυνσης υλικού (κάντε επανεκκίνηση του %(appName)s για να τεθεί σε ισχύ)",
     "Deactivating your account is a permanent action — be careful!": "Η απενεργοποίηση του λογαριασμού σας είναι μια μόνιμη ενέργεια — να είστε προσεκτικοί!",
     "Enable hardware acceleration": "Ενεργοποίηση επιτάχυνσης υλικού",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b20519ec89..7ce2a44ec6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -113,11 +113,15 @@
     "Reload": "Reload",
     "Empty room": "Empty room",
     "%(user1)s and %(user2)s": "%(user1)s and %(user2)s",
-    "%(user)s and %(count)s others|other": "%(user)s and %(count)s others",
-    "%(user)s and %(count)s others|one": "%(user)s and 1 other",
+    "%(user)s and %(count)s others": {
+        "other": "%(user)s and %(count)s others",
+        "one": "%(user)s and 1 other"
+    },
     "Inviting %(user1)s and %(user2)s": "Inviting %(user1)s and %(user2)s",
-    "Inviting %(user)s and %(count)s others|other": "Inviting %(user)s and %(count)s others",
-    "Inviting %(user)s and %(count)s others|one": "Inviting %(user)s and 1 other",
+    "Inviting %(user)s and %(count)s others": {
+        "other": "Inviting %(user)s and %(count)s others",
+        "one": "Inviting %(user)s and 1 other"
+    },
     "Empty room (was %(oldName)s)": "Empty room (was %(oldName)s)",
     "Default Device": "Default Device",
     "%(name)s is requesting verification": "%(name)s is requesting verification",
@@ -531,10 +535,14 @@
     "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s sent a sticker.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s added the alternative addresses %(addresses)s for this room.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s added alternative address %(addresses)s for this room.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s removed the alternative addresses %(addresses)s for this room.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s removed alternative address %(addresses)s for this room.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s added the alternative addresses %(addresses)s for this room.",
+        "one": "%(senderName)s added alternative address %(addresses)s for this room."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s removed the alternative addresses %(addresses)s for this room.",
+        "one": "%(senderName)s removed alternative address %(addresses)s for this room."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s changed the alternative addresses for this room.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s changed the main and alternative addresses for this room.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s changed the addresses for this room.",
@@ -583,8 +591,10 @@
     "Light high contrast": "Light high contrast",
     "Dark": "Dark",
     "%(displayName)s is typing …": "%(displayName)s is typing …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s and one other is typing …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s and %(count)s others are typing …",
+        "one": "%(names)s and one other is typing …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s and %(lastPerson)s are typing …",
     "Remain on your screen when viewing another room, when running": "Remain on your screen when viewing another room, when running",
     "Remain on your screen while running": "Remain on your screen while running",
@@ -704,8 +714,10 @@
     "There was a problem communicating with the homeserver, please try again later.": "There was a problem communicating with the homeserver, please try again later.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
-    "%(items)s and %(count)s others|other": "%(items)s and %(count)s others",
-    "%(items)s and %(count)s others|one": "%(items)s and one other",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s and %(count)s others",
+        "one": "%(items)s and one other"
+    },
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
     "a few seconds ago": "a few seconds ago",
     "about a minute ago": "about a minute ago",
@@ -723,10 +735,14 @@
     "%(num)s days from now": "%(num)s days from now",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s and %(space2Name)s",
     "In spaces %(space1Name)s and %(space2Name)s.": "In spaces %(space1Name)s and %(space2Name)s.",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s others",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s and %(count)s other",
-    "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s and %(count)s other spaces.",
-    "In %(spaceName)s and %(count)s other spaces.|one": "In %(spaceName)s and %(count)s other space.",
+    "%(spaceName)s and %(count)s others": {
+        "other": "%(spaceName)s and %(count)s others",
+        "one": "%(spaceName)s and %(count)s other"
+    },
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "other": "In %(spaceName)s and %(count)s other spaces.",
+        "one": "In %(spaceName)s and %(count)s other space."
+    },
     "In %(spaceName)s.": "In %(spaceName)s.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Unexpected server error trying to leave the room": "Unexpected server error trying to leave the room",
@@ -805,10 +821,14 @@
     "Are you sure you want to exit during this export?": "Are you sure you want to exit during this export?",
     "Unnamed Room": "Unnamed Room",
     "Generating a ZIP": "Generating a ZIP",
-    "Fetched %(count)s events out of %(total)s|other": "Fetched %(count)s events out of %(total)s",
-    "Fetched %(count)s events out of %(total)s|one": "Fetched %(count)s event out of %(total)s",
-    "Fetched %(count)s events so far|other": "Fetched %(count)s events so far",
-    "Fetched %(count)s events so far|one": "Fetched %(count)s event so far",
+    "Fetched %(count)s events out of %(total)s": {
+        "other": "Fetched %(count)s events out of %(total)s",
+        "one": "Fetched %(count)s event out of %(total)s"
+    },
+    "Fetched %(count)s events so far": {
+        "other": "Fetched %(count)s events so far",
+        "one": "Fetched %(count)s event so far"
+    },
     "HTML": "HTML",
     "JSON": "JSON",
     "Plain Text": "Plain Text",
@@ -826,12 +846,16 @@
     "Error fetching file": "Error fetching file",
     "Processing event %(number)s out of %(total)s": "Processing event %(number)s out of %(total)s",
     "Starting export…": "Starting export…",
-    "Fetched %(count)s events in %(seconds)ss|other": "Fetched %(count)s events in %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|one": "Fetched %(count)s event in %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "other": "Fetched %(count)s events in %(seconds)ss",
+        "one": "Fetched %(count)s event in %(seconds)ss"
+    },
     "Creating HTML…": "Creating HTML…",
     "Export successful!": "Export successful!",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Exported %(count)s events in %(seconds)s seconds",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Exported %(count)s event in %(seconds)s seconds",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "other": "Exported %(count)s events in %(seconds)s seconds",
+        "one": "Exported %(count)s event in %(seconds)s seconds"
+    },
     "File Attached": "File Attached",
     "Starting export process…": "Starting export process…",
     "Fetching events…": "Fetching events…",
@@ -1150,8 +1174,10 @@
     "Video devices": "Video devices",
     "Turn off camera": "Turn off camera",
     "Turn on camera": "Turn on camera",
-    "%(count)s people joined|other": "%(count)s people joined",
-    "%(count)s people joined|one": "%(count)s person joined",
+    "%(count)s people joined": {
+        "other": "%(count)s people joined",
+        "one": "%(count)s person joined"
+    },
     "Dial": "Dial",
     "You are presenting": "You are presenting",
     "%(sharerName)s is presenting": "%(sharerName)s is presenting",
@@ -1268,8 +1294,10 @@
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.",
     "Find your people": "Find your people",
     "Welcome to %(brand)s": "Welcome to %(brand)s",
-    "Only %(count)s steps to go|other": "Only %(count)s steps to go",
-    "Only %(count)s steps to go|one": "Only %(count)s step to go",
+    "Only %(count)s steps to go": {
+        "other": "Only %(count)s steps to go",
+        "one": "Only %(count)s step to go"
+    },
     "You did it!": "You did it!",
     "Complete these to get the most out of %(brand)s": "Complete these to get the most out of %(brand)s",
     "Your server isn't responding to some <a>requests</a>.": "Your server isn't responding to some <a>requests</a>.",
@@ -1391,8 +1419,10 @@
     "Session ID:": "Session ID:",
     "Session key:": "Session key:",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.",
+        "one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room."
+    },
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",
@@ -1411,18 +1441,26 @@
     "Integration manager": "Integration manager",
     "Upgrading room": "Upgrading room",
     "Loading new room": "Loading new room",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Sending invites... (%(progress)s out of %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Sending invite...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Updating spaces... (%(progress)s out of %(count)s)",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Updating space...",
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "other": "Sending invites... (%(progress)s out of %(count)s)",
+        "one": "Sending invite..."
+    },
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "other": "Updating spaces... (%(progress)s out of %(count)s)",
+        "one": "Updating space..."
+    },
     "Upgrade required": "Upgrade required",
     "Private (invite only)": "Private (invite only)",
     "Only invited people can join.": "Only invited people can join.",
     "Anyone can find and join.": "Anyone can find and join.",
-    "& %(count)s more|other": "& %(count)s more",
-    "& %(count)s more|one": "& %(count)s more",
-    "Currently, %(count)s spaces have access|other": "Currently, %(count)s spaces have access",
-    "Currently, %(count)s spaces have access|one": "Currently, a space has access",
+    "& %(count)s more": {
+        "other": "& %(count)s more",
+        "one": "& %(count)s more"
+    },
+    "Currently, %(count)s spaces have access": {
+        "other": "Currently, %(count)s spaces have access",
+        "one": "Currently, a space has access"
+    },
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>",
     "Spaces with access": "Spaces with access",
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Anyone in <spaceName/> can find and join. You can select other spaces too.",
@@ -1645,8 +1683,10 @@
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Share anonymous data to help us identify issues. Nothing personal. No third parties.",
     "Sessions": "Sessions",
     "Sign out": "Sign out",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Are you sure you want to sign out of %(count)s sessions?",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Are you sure you want to sign out of %(count)s session?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "other": "Are you sure you want to sign out of %(count)s sessions?",
+        "one": "Are you sure you want to sign out of %(count)s session?"
+    },
     "For best security, verify your sessions and sign out from any session that you don't recognize or use anymore.": "For best security, verify your sessions and sign out from any session that you don't recognize or use anymore.",
     "Sidebar": "Sidebar",
     "Spaces to show": "Spaces to show",
@@ -1821,14 +1861,22 @@
     "Discovery options will appear once you have added a phone number above.": "Discovery options will appear once you have added a phone number above.",
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Sign out of all other sessions (%(otherSessionsCount)s)",
     "Current session": "Current session",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Confirm logging out these devices by using Single Sign On to prove your identity.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Confirm logging out this device by using Single Sign On to prove your identity.",
-    "Confirm signing out these devices|other": "Confirm signing out these devices",
-    "Confirm signing out these devices|one": "Confirm signing out this device",
-    "Click the button below to confirm signing out these devices.|other": "Click the button below to confirm signing out these devices.",
-    "Click the button below to confirm signing out these devices.|one": "Click the button below to confirm signing out this device.",
-    "Sign out devices|other": "Sign out devices",
-    "Sign out devices|one": "Sign out device",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "other": "Confirm logging out these devices by using Single Sign On to prove your identity.",
+        "one": "Confirm logging out this device by using Single Sign On to prove your identity."
+    },
+    "Confirm signing out these devices": {
+        "other": "Confirm signing out these devices",
+        "one": "Confirm signing out this device"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "other": "Click the button below to confirm signing out these devices.",
+        "one": "Click the button below to confirm signing out this device."
+    },
+    "Sign out devices": {
+        "other": "Sign out devices",
+        "one": "Sign out device"
+    },
     "Authentication": "Authentication",
     "Failed to set display name": "Failed to set display name",
     "Rename session": "Rename session",
@@ -1897,13 +1945,17 @@
     "Show": "Show",
     "Deselect all": "Deselect all",
     "Select all": "Select all",
-    "%(count)s sessions selected|other": "%(count)s sessions selected",
-    "%(count)s sessions selected|one": "%(count)s session selected",
+    "%(count)s sessions selected": {
+        "other": "%(count)s sessions selected",
+        "one": "%(count)s session selected"
+    },
     "Sign in with QR code": "Sign in with QR code",
     "You can use this device to sign in a new device with a QR code. You will need to scan the QR code shown on this device with your device that's signed out.": "You can use this device to sign in a new device with a QR code. You will need to scan the QR code shown on this device with your device that's signed out.",
     "Show QR code": "Show QR code",
-    "Sign out of %(count)s sessions|other": "Sign out of %(count)s sessions",
-    "Sign out of %(count)s sessions|one": "Sign out of %(count)s session",
+    "Sign out of %(count)s sessions": {
+        "other": "Sign out of %(count)s sessions",
+        "one": "Sign out of %(count)s session"
+    },
     "Other sessions": "Other sessions",
     "Security recommendations": "Security recommendations",
     "Improve your account security by following these recommendations.": "Improve your account security by following these recommendations.",
@@ -1962,16 +2014,24 @@
     "Close call": "Close call",
     "View chat timeline": "View chat timeline",
     "Room options": "Room options",
-    "(~%(count)s results)|other": "(~%(count)s results)",
-    "(~%(count)s results)|one": "(~%(count)s result)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s results)",
+        "one": "(~%(count)s result)"
+    },
     "Video rooms are a beta feature": "Video rooms are a beta feature",
-    "Show %(count)s other previews|other": "Show %(count)s other previews",
-    "Show %(count)s other previews|one": "Show %(count)s other preview",
+    "Show %(count)s other previews": {
+        "other": "Show %(count)s other previews",
+        "one": "Show %(count)s other preview"
+    },
     "Close preview": "Close preview",
-    "%(count)s participants|other": "%(count)s participants",
-    "%(count)s participants|one": "1 participant",
-    "and %(count)s others...|other": "and %(count)s others...",
-    "and %(count)s others...|one": "and one other...",
+    "%(count)s participants": {
+        "other": "%(count)s participants",
+        "one": "1 participant"
+    },
+    "and %(count)s others...": {
+        "other": "and %(count)s others...",
+        "one": "and one other..."
+    },
     "Invite to this room": "Invite to this room",
     "Invite to this space": "Invite to this space",
     "You do not have permission to invite users": "You do not have permission to invite users",
@@ -2035,8 +2095,10 @@
     "Unknown": "Unknown",
     "%(members)s and more": "%(members)s and more",
     "%(members)s and %(last)s": "%(members)s and %(last)s",
-    "Seen by %(count)s people|other": "Seen by %(count)s people",
-    "Seen by %(count)s people|one": "Seen by %(count)s person",
+    "Seen by %(count)s people": {
+        "other": "Seen by %(count)s people",
+        "one": "Seen by %(count)s person"
+    },
     "Read receipts": "Read receipts",
     "Replying": "Replying",
     "Room %(name)s": "Room %(name)s",
@@ -2047,8 +2109,10 @@
     "Public room": "Public room",
     "Private space": "Private space",
     "Private room": "Private room",
-    "%(count)s members|other": "%(count)s members",
-    "%(count)s members|one": "%(count)s member",
+    "%(count)s members": {
+        "other": "%(count)s members",
+        "one": "%(count)s member"
+    },
     "Start new chat": "Start new chat",
     "Invite to space": "Invite to space",
     "You do not have permissions to invite people to this space": "You do not have permissions to invite people to this space",
@@ -2071,10 +2135,14 @@
     "Add space": "Add space",
     "You do not have permissions to add spaces to this space": "You do not have permissions to add spaces to this space",
     "Join public room": "Join public room",
-    "Currently joining %(count)s rooms|other": "Currently joining %(count)s rooms",
-    "Currently joining %(count)s rooms|one": "Currently joining %(count)s room",
-    "Currently removing messages in %(count)s rooms|other": "Currently removing messages in %(count)s rooms",
-    "Currently removing messages in %(count)s rooms|one": "Currently removing messages in %(count)s room",
+    "Currently joining %(count)s rooms": {
+        "other": "Currently joining %(count)s rooms",
+        "one": "Currently joining %(count)s room"
+    },
+    "Currently removing messages in %(count)s rooms": {
+        "other": "Currently removing messages in %(count)s rooms",
+        "one": "Currently removing messages in %(count)s room"
+    },
     "%(spaceName)s menu": "%(spaceName)s menu",
     "Home options": "Home options",
     "Unable to find user by email": "Unable to find user by email",
@@ -2148,14 +2216,20 @@
     "Activity": "Activity",
     "A-Z": "A-Z",
     "List options": "List options",
-    "Show %(count)s more|other": "Show %(count)s more",
-    "Show %(count)s more|one": "Show %(count)s more",
+    "Show %(count)s more": {
+        "other": "Show %(count)s more",
+        "one": "Show %(count)s more"
+    },
     "Show less": "Show less",
     "Notification options": "Notification options",
-    "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
-    "%(count)s unread messages including mentions.|one": "1 unread mention.",
-    "%(count)s unread messages.|other": "%(count)s unread messages.",
-    "%(count)s unread messages.|one": "1 unread message.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s unread messages including mentions.",
+        "one": "1 unread mention."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s unread messages.",
+        "one": "1 unread message."
+    },
     "Unread messages.": "Unread messages.",
     "Joined": "Joined",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
@@ -2176,8 +2250,10 @@
     "Admin Tools": "Admin Tools",
     "Revoke invite": "Revoke invite",
     "Invited by %(sender)s": "Invited by %(sender)s",
-    "%(count)s reply|other": "%(count)s replies",
-    "%(count)s reply|one": "%(count)s reply",
+    "%(count)s reply": {
+        "other": "%(count)s replies",
+        "one": "%(count)s reply"
+    },
     "Open thread": "Open thread",
     "Unable to decrypt message": "Unable to decrypt message",
     "Jump to first unread message.": "Jump to first unread message.",
@@ -2259,7 +2335,9 @@
     "Room info": "Room info",
     "Nothing pinned, yet": "Nothing pinned, yet",
     "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.",
-    "You can only pin up to %(count)s widgets|other": "You can only pin up to %(count)s widgets",
+    "You can only pin up to %(count)s widgets": {
+        "other": "You can only pin up to %(count)s widgets"
+    },
     "Maximise": "Maximise",
     "Unpin this widget to view it in this panel": "Unpin this widget to view it in this panel",
     "Close this widget to view it in this panel": "Close this widget to view it in this panel",
@@ -2276,11 +2354,15 @@
     "Room settings": "Room settings",
     "Trusted": "Trusted",
     "Not trusted": "Not trusted",
-    "%(count)s verified sessions|other": "%(count)s verified sessions",
-    "%(count)s verified sessions|one": "1 verified session",
+    "%(count)s verified sessions": {
+        "other": "%(count)s verified sessions",
+        "one": "1 verified session"
+    },
     "Hide verified sessions": "Hide verified sessions",
-    "%(count)s sessions|other": "%(count)s sessions",
-    "%(count)s sessions|one": "%(count)s session",
+    "%(count)s sessions": {
+        "other": "%(count)s sessions",
+        "one": "%(count)s session"
+    },
     "Hide sessions": "Hide sessions",
     "Message": "Message",
     "Ignore %(user)s": "Ignore %(user)s",
@@ -2356,8 +2438,10 @@
     "%(displayName)s cancelled verification.": "%(displayName)s cancelled verification.",
     "You cancelled verification.": "You cancelled verification.",
     "Verification cancelled": "Verification cancelled",
-    "%(count)s votes|other": "%(count)s votes",
-    "%(count)s votes|one": "%(count)s vote",
+    "%(count)s votes": {
+        "other": "%(count)s votes",
+        "one": "%(count)s vote"
+    },
     "View poll in timeline": "View poll in timeline",
     "Active polls": "Active polls",
     "Past polls": "Past polls",
@@ -2367,13 +2451,19 @@
     "There are no past polls in this room": "There are no past polls in this room",
     "There are no active polls. Load more polls to view polls for previous months": "There are no active polls. Load more polls to view polls for previous months",
     "There are no past polls. Load more polls to view polls for previous months": "There are no past polls. Load more polls to view polls for previous months",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "There are no active polls for the past day. Load more polls to view polls for previous months",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "There are no past polls for the past day. Load more polls to view polls for previous months",
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "other": "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months",
+        "one": "There are no active polls for the past day. Load more polls to view polls for previous months"
+    },
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "other": "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months",
+        "one": "There are no past polls for the past day. Load more polls to view polls for previous months"
+    },
     "View poll": "View poll",
-    "Final result based on %(count)s votes|other": "Final result based on %(count)s votes",
-    "Final result based on %(count)s votes|one": "Final result based on %(count)s vote",
+    "Final result based on %(count)s votes": {
+        "other": "Final result based on %(count)s votes",
+        "one": "Final result based on %(count)s vote"
+    },
     "%(name)s started a video call": "%(name)s started a video call",
     "Video call ended": "Video call ended",
     "Sunday": "Sunday",
@@ -2475,10 +2565,14 @@
     "Due to decryption errors, some votes may not be counted": "Due to decryption errors, some votes may not be counted",
     "Results will be visible when the poll is ended": "Results will be visible when the poll is ended",
     "No votes cast": "No votes cast",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s votes cast. Vote to see the results",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s vote cast. Vote to see the results",
-    "Based on %(count)s votes|other": "Based on %(count)s votes",
-    "Based on %(count)s votes|one": "Based on %(count)s vote",
+    "%(count)s votes cast. Vote to see the results": {
+        "other": "%(count)s votes cast. Vote to see the results",
+        "one": "%(count)s vote cast. Vote to see the results"
+    },
+    "Based on %(count)s votes": {
+        "other": "Based on %(count)s votes",
+        "one": "Based on %(count)s vote"
+    },
     "edited": "edited",
     "Ended a poll": "Ended a poll",
     "Error decrypting video": "Error decrypting video",
@@ -2561,74 +2655,142 @@
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
     "Something went wrong!": "Something went wrong!",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sjoined",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sjoined %(count)s times",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sjoined",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sleft %(count)s times",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sleft",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sleft %(count)s times",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sleft",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sjoined and left %(count)s times",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sjoined and left",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sjoined and left %(count)s times",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sjoined and left",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sleft and rejoined %(count)s times",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sleft and rejoined",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sleft and rejoined %(count)s times",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sleft and rejoined",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)srejected their invitations %(count)s times",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)srejected their invitations",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)srejected their invitation %(count)s times",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)srejected their invitation",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)shad their invitations withdrawn %(count)s times",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)shad their invitations withdrawn",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)shad their invitation withdrawn %(count)s times",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)shad their invitation withdrawn",
-    "were invited %(count)s times|other": "were invited %(count)s times",
-    "were invited %(count)s times|one": "were invited",
-    "was invited %(count)s times|other": "was invited %(count)s times",
-    "was invited %(count)s times|one": "was invited",
-    "were banned %(count)s times|other": "were banned %(count)s times",
-    "were banned %(count)s times|one": "were banned",
-    "was banned %(count)s times|other": "was banned %(count)s times",
-    "was banned %(count)s times|one": "was banned",
-    "were unbanned %(count)s times|other": "were unbanned %(count)s times",
-    "were unbanned %(count)s times|one": "were unbanned",
-    "was unbanned %(count)s times|other": "was unbanned %(count)s times",
-    "was unbanned %(count)s times|one": "was unbanned",
-    "were removed %(count)s times|other": "were removed %(count)s times",
-    "were removed %(count)s times|one": "were removed",
-    "was removed %(count)s times|other": "was removed %(count)s times",
-    "was removed %(count)s times|one": "was removed",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)schanged their name %(count)s times",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)schanged their name",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)schanged their name %(count)s times",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)schanged their name",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)schanged their profile picture %(count)s times",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)schanged their profile picture",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)schanged their profile picture %(count)s times",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)schanged their profile picture",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)smade no changes %(count)s times",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)smade no changes",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)smade no changes %(count)s times",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)schanged the server ACLs %(count)s times",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)schanged the server ACLs",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)schanged the server ACLs %(count)s times",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)schanged the server ACLs",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)schanged the <a>pinned messages</a> for the room",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)schanged the <a>pinned messages</a> for the room",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sremoved %(count)s messages",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sremoved a message",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sremoved %(count)s messages",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sremoved a message",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)ssent %(count)s hidden messages",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)ssent a hidden message",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)ssent %(count)s hidden messages",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)ssent a hidden message",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)sjoined %(count)s times",
+        "one": "%(severalUsers)sjoined"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)sjoined %(count)s times",
+        "one": "%(oneUser)sjoined"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)sleft %(count)s times",
+        "one": "%(severalUsers)sleft"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)sleft %(count)s times",
+        "one": "%(oneUser)sleft"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)sjoined and left %(count)s times",
+        "one": "%(severalUsers)sjoined and left"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)sjoined and left %(count)s times",
+        "one": "%(oneUser)sjoined and left"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)sleft and rejoined %(count)s times",
+        "one": "%(severalUsers)sleft and rejoined"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)sleft and rejoined %(count)s times",
+        "one": "%(oneUser)sleft and rejoined"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)srejected their invitations %(count)s times",
+        "one": "%(severalUsers)srejected their invitations"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)srejected their invitation %(count)s times",
+        "one": "%(oneUser)srejected their invitation"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)shad their invitations withdrawn %(count)s times",
+        "one": "%(severalUsers)shad their invitations withdrawn"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)shad their invitation withdrawn %(count)s times",
+        "one": "%(oneUser)shad their invitation withdrawn"
+    },
+    "were invited %(count)s times": {
+        "other": "were invited %(count)s times",
+        "one": "were invited"
+    },
+    "was invited %(count)s times": {
+        "other": "was invited %(count)s times",
+        "one": "was invited"
+    },
+    "were banned %(count)s times": {
+        "other": "were banned %(count)s times",
+        "one": "were banned"
+    },
+    "was banned %(count)s times": {
+        "other": "was banned %(count)s times",
+        "one": "was banned"
+    },
+    "were unbanned %(count)s times": {
+        "other": "were unbanned %(count)s times",
+        "one": "were unbanned"
+    },
+    "was unbanned %(count)s times": {
+        "other": "was unbanned %(count)s times",
+        "one": "was unbanned"
+    },
+    "were removed %(count)s times": {
+        "other": "were removed %(count)s times",
+        "one": "were removed"
+    },
+    "was removed %(count)s times": {
+        "other": "was removed %(count)s times",
+        "one": "was removed"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)schanged their name %(count)s times",
+        "one": "%(severalUsers)schanged their name"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)schanged their name %(count)s times",
+        "one": "%(oneUser)schanged their name"
+    },
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)schanged their profile picture %(count)s times",
+        "one": "%(severalUsers)schanged their profile picture"
+    },
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)schanged their profile picture %(count)s times",
+        "one": "%(oneUser)schanged their profile picture"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)smade no changes %(count)s times",
+        "one": "%(severalUsers)smade no changes"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)smade no changes %(count)s times",
+        "one": "%(oneUser)smade no changes"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "other": "%(severalUsers)schanged the server ACLs %(count)s times",
+        "one": "%(severalUsers)schanged the server ACLs"
+    },
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "other": "%(oneUser)schanged the server ACLs %(count)s times",
+        "one": "%(oneUser)schanged the server ACLs"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times",
+        "one": "%(severalUsers)schanged the <a>pinned messages</a> for the room"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times",
+        "one": "%(oneUser)schanged the <a>pinned messages</a> for the room"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "other": "%(severalUsers)sremoved %(count)s messages",
+        "one": "%(severalUsers)sremoved a message"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)sremoved %(count)s messages",
+        "one": "%(oneUser)sremoved a message"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "other": "%(severalUsers)ssent %(count)s hidden messages",
+        "one": "%(severalUsers)ssent a hidden message"
+    },
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "other": "%(oneUser)ssent %(count)s hidden messages",
+        "one": "%(oneUser)ssent a hidden message"
+    },
     "collapse": "collapse",
     "expand": "expand",
     "Image view": "Image view",
@@ -2672,12 +2834,16 @@
     "This address is available to use": "This address is available to use",
     "This address is already in use": "This address is already in use",
     "This address had invalid server or is already in use": "This address had invalid server or is already in use",
-    "View all %(count)s members|other": "View all %(count)s members",
-    "View all %(count)s members|one": "View 1 member",
+    "View all %(count)s members": {
+        "other": "View all %(count)s members",
+        "one": "View 1 member"
+    },
     "Including you, %(commaSeparatedMembers)s": "Including you, %(commaSeparatedMembers)s",
     "Including %(commaSeparatedMembers)s": "Including %(commaSeparatedMembers)s",
-    "%(count)s people you know have already joined|other": "%(count)s people you know have already joined",
-    "%(count)s people you know have already joined|one": "%(count)s person you know has already joined",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s people you know have already joined",
+        "one": "%(count)s person you know has already joined"
+    },
     "Edit topic": "Edit topic",
     "Click to read topic": "Click to read topic",
     "Message search initialisation failed, check <a>your settings</a> for more information": "Message search initialisation failed, check <a>your settings</a> for more information",
@@ -2695,7 +2861,9 @@
     "Choose a locale": "Choose a locale",
     "Continue with %(provider)s": "Continue with %(provider)s",
     "Sign in with single sign-on": "Sign in with single sign-on",
-    "And %(count)s more...|other": "And %(count)s more...",
+    "And %(count)s more...": {
+        "other": "And %(count)s more..."
+    },
     "You're in": "You're in",
     "Who will you chat to the most?": "Who will you chat to the most?",
     "We'll help you get connected.": "We'll help you get connected.",
@@ -2721,8 +2889,10 @@
     "Create a new space": "Create a new space",
     "Search for spaces": "Search for spaces",
     "Not all selected were added": "Not all selected were added",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Adding rooms... (%(progress)s out of %(count)s)",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Adding room...",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "other": "Adding rooms... (%(progress)s out of %(count)s)",
+        "one": "Adding room..."
+    },
     "Direct Messages": "Direct Messages",
     "Add existing rooms": "Add existing rooms",
     "Want to add a new room instead?": "Want to add a new room instead?",
@@ -2766,13 +2936,17 @@
     "No recent messages by %(user)s found": "No recent messages by %(user)s found",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
     "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "You are about to remove %(count)s message by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "other": "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?",
+        "one": "You are about to remove %(count)s message by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
     "Preserve system messages": "Preserve system messages",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)",
-    "Remove %(count)s messages|other": "Remove %(count)s messages",
-    "Remove %(count)s messages|one": "Remove 1 message",
+    "Remove %(count)s messages": {
+        "other": "Remove %(count)s messages",
+        "one": "Remove 1 message"
+    },
     "Can't start voice message": "Can't start voice message",
     "You can't start a voice message as you are currently recording a live broadcast. Please end your live broadcast in order to start recording a voice message.": "You can't start a voice message as you are currently recording a live broadcast. Please end your live broadcast in order to start recording a voice message.",
     "Unable to load commit detail: %(msg)s": "Unable to load commit detail: %(msg)s",
@@ -2974,8 +3148,10 @@
     "Manually export keys": "Manually export keys",
     "You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
     "Are you sure you want to sign out?": "Are you sure you want to sign out?",
-    "%(count)s rooms|other": "%(count)s rooms",
-    "%(count)s rooms|one": "%(count)s room",
+    "%(count)s rooms": {
+        "other": "%(count)s rooms",
+        "one": "%(count)s room"
+    },
     "You're removing all spaces. Access will default to invite only": "You're removing all spaces. Access will default to invite only",
     "Select spaces": "Select spaces",
     "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.",
@@ -3119,8 +3295,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "These files are <b>too large</b> to upload. The file size limit is %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.",
-    "Upload %(count)s other files|other": "Upload %(count)s other files",
-    "Upload %(count)s other files|one": "Upload %(count)s other file",
+    "Upload %(count)s other files": {
+        "other": "Upload %(count)s other files",
+        "one": "Upload %(count)s other file"
+    },
     "Cancel All": "Cancel All",
     "Upload Error": "Upload Error",
     "Labs": "Labs",
@@ -3134,8 +3312,10 @@
     "The widget will verify your user ID, but won't be able to perform actions for you:": "The widget will verify your user ID, but won't be able to perform actions for you:",
     "Remember this": "Remember this",
     "Unnamed room": "Unnamed room",
-    "%(count)s Members|other": "%(count)s Members",
-    "%(count)s Members|one": "%(count)s Member",
+    "%(count)s Members": {
+        "other": "%(count)s Members",
+        "one": "%(count)s Member"
+    },
     "Public rooms": "Public rooms",
     "Use \"%(query)s\" to search": "Use \"%(query)s\" to search",
     "Search for": "Search for",
@@ -3221,7 +3401,9 @@
     "User read up to (m.read.private): ": "User read up to (m.read.private): ",
     "User read up to (m.read.private;ignoreSynthetic): ": "User read up to (m.read.private;ignoreSynthetic): ",
     "Room status": "Room status",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>"
+    },
     "Room unread status: <strong>%(status)s</strong>": "Room unread status: <strong>%(status)s</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Notification state is <strong>%(notificationState)s</strong>",
     "Room is <strong>encrypted ✅</strong>": "Room is <strong>encrypted ✅</strong>",
@@ -3236,8 +3418,10 @@
     "Sender: ": "Sender: ",
     "Threads timeline": "Threads timeline",
     "Thread Id: ": "Thread Id: ",
-    "<%(count)s spaces>|other": "<%(count)s spaces>",
-    "<%(count)s spaces>|one": "<space>",
+    "<%(count)s spaces>": {
+        "other": "<%(count)s spaces>",
+        "one": "<space>"
+    },
     "<empty string>": "<empty string>",
     "See history": "See history",
     "Send custom state event": "Send custom state event",
@@ -3481,8 +3665,10 @@
     "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
     "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
     "Failed to reject invite": "Failed to reject invite",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "You have %(count)s unread notifications in a prior version of this room.",
+        "one": "You have %(count)s unread notification in a prior version of this room."
+    },
     "Joining": "Joining",
     "You don't have permission": "You don't have permission",
     "This room is suggested as a good one to join": "This room is suggested as a good one to join",
@@ -3540,8 +3726,10 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",
-    "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
-    "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Uploading %(filename)s and %(count)s others",
+        "one": "Uploading %(filename)s and %(count)s other"
+    },
     "Uploading %(filename)s": "Uploading %(filename)s",
     "Got an account? <a>Sign in</a>": "Got an account? <a>Sign in</a>",
     "New here? <a>Create an account</a>": "New here? <a>Create an account</a>",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 065ab00122..a6d1120a1d 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -14,8 +14,10 @@
     "Always show message timestamps": "Always show message timestamps",
     "Authentication": "Authentication",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
-    "and %(count)s others...|other": "and %(count)s others...",
-    "and %(count)s others...|one": "and one other...",
+    "and %(count)s others...": {
+        "other": "and %(count)s others...",
+        "one": "and one other..."
+    },
     "A new password must be entered.": "A new password must be entered.",
     "An error has occurred.": "An error has occurred.",
     "Anyone": "Anyone",
@@ -273,12 +275,16 @@
     "Start authentication": "Start authentication",
     "Unnamed Room": "Unnamed Room",
     "Uploading %(filename)s": "Uploading %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
-    "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Uploading %(filename)s and %(count)s other",
+        "other": "Uploading %(filename)s and %(count)s others"
+    },
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
-    "(~%(count)s results)|one": "(~%(count)s result)",
-    "(~%(count)s results)|other": "(~%(count)s results)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s result)",
+        "other": "(~%(count)s results)"
+    },
     "New Password": "New Password",
     "Something went wrong!": "Something went wrong!",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
@@ -385,7 +391,9 @@
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
     "%(displayName)s is typing …": "%(displayName)s is typing …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s and %(count)s others are typing …"
+    },
     "Your %(brand)s is misconfigured": "Your %(brand)s is misconfigured",
     "Call failed due to misconfigured server": "Call failed due to misconfigured server",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 321b335c83..e861a147fd 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -132,8 +132,10 @@
     "Unmute": "Malsilentigi",
     "Mute": "Silentigi",
     "Admin Tools": "Estriloj",
-    "and %(count)s others...|other": "kaj %(count)s aliaj…",
-    "and %(count)s others...|one": "kaj unu alia…",
+    "and %(count)s others...": {
+        "other": "kaj %(count)s aliaj…",
+        "one": "kaj unu alia…"
+    },
     "Invited": "Invititaj",
     "Filter room members": "Filtri ĉambranojn",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (povnivelo je %(powerLevelNumber)s)",
@@ -159,8 +161,10 @@
     "Unknown": "Nekonata",
     "Unnamed room": "Sennoma ĉambro",
     "Save": "Konservi",
-    "(~%(count)s results)|other": "(~%(count)s rezultoj)",
-    "(~%(count)s results)|one": "(~%(count)s rezulto)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s rezultoj)",
+        "one": "(~%(count)s rezulto)"
+    },
     "Join Room": "Aliĝi al ĉambro",
     "Upload avatar": "Alŝuti profilbildon",
     "Settings": "Agordoj",
@@ -232,55 +236,99 @@
     "No results": "Neniuj rezultoj",
     "Home": "Hejmo",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)saliĝis",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s%(count)s-foje aliĝis",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)saliĝis",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s-foje foriris",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sforiris",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s%(count)s-foje foriris",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s foriris",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis kaj foriris",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)saliĝis kaj foriris",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s%(count)s-foje aliĝis kaj foriris",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)saliĝis kaj foriris",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s%(count)s-foje foriris kaj re-aliĝis",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s foriris kaj re-aliĝis",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s-foje foriris kaj re-aliĝis",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s foriris kaj re-aliĝis",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s%(count)s-foje rifuzis inviton",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)srifuzis inviton",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s%(count)s-foje rifuzis inviton",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)srifuzis inviton",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s%(count)s-foje malinvitiĝis",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)smalinvitiĝis",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s%(count)s-foje malinvitiĝis",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)smalinvitiĝis",
-    "were invited %(count)s times|other": "estis invititaj %(count)s foje",
-    "were invited %(count)s times|one": "estis invititaj",
-    "was invited %(count)s times|other": "estis invitita %(count)s foje",
-    "was invited %(count)s times|one": "estis invitita",
-    "were banned %(count)s times|other": "%(count)s-foje forbariĝis",
-    "were banned %(count)s times|one": "forbariĝis",
-    "was banned %(count)s times|other": "%(count)s-foje forbariĝis",
-    "was banned %(count)s times|one": "forbariĝis",
-    "were unbanned %(count)s times|other": "%(count)s-foje malforbariĝis",
-    "were unbanned %(count)s times|one": "malforbariĝis",
-    "was unbanned %(count)s times|other": "%(count)s-foje malforbariĝis",
-    "was unbanned %(count)s times|one": "malforbariĝis",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s%(count)s-foje sanĝis sian nomon",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sŝanĝis sian nomon",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s%(count)s-foje ŝanĝis sian nomon",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sŝanĝis sian nomon",
-    "%(items)s and %(count)s others|other": "%(items)s kaj %(count)s aliaj",
-    "%(items)s and %(count)s others|one": "%(items)s kaj unu alia",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s%(count)s-foje aliĝis",
+        "one": "%(severalUsers)saliĝis"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s%(count)s-foje aliĝis",
+        "one": "%(oneUser)saliĝis"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s%(count)s-foje foriris",
+        "one": "%(severalUsers)sforiris"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s%(count)s-foje foriris",
+        "one": "%(oneUser)s foriris"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s%(count)s-foje aliĝis kaj foriris",
+        "one": "%(severalUsers)saliĝis kaj foriris"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s%(count)s-foje aliĝis kaj foriris",
+        "one": "%(oneUser)saliĝis kaj foriris"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s%(count)s-foje foriris kaj re-aliĝis",
+        "one": "%(severalUsers)s foriris kaj re-aliĝis"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s %(count)s-foje foriris kaj re-aliĝis",
+        "one": "%(oneUser)s foriris kaj re-aliĝis"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s%(count)s-foje rifuzis inviton",
+        "one": "%(severalUsers)srifuzis inviton"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s%(count)s-foje rifuzis inviton",
+        "one": "%(oneUser)srifuzis inviton"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s%(count)s-foje malinvitiĝis",
+        "one": "%(severalUsers)smalinvitiĝis"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s%(count)s-foje malinvitiĝis",
+        "one": "%(oneUser)smalinvitiĝis"
+    },
+    "were invited %(count)s times": {
+        "other": "estis invititaj %(count)s foje",
+        "one": "estis invititaj"
+    },
+    "was invited %(count)s times": {
+        "other": "estis invitita %(count)s foje",
+        "one": "estis invitita"
+    },
+    "were banned %(count)s times": {
+        "other": "%(count)s-foje forbariĝis",
+        "one": "forbariĝis"
+    },
+    "was banned %(count)s times": {
+        "other": "%(count)s-foje forbariĝis",
+        "one": "forbariĝis"
+    },
+    "were unbanned %(count)s times": {
+        "other": "%(count)s-foje malforbariĝis",
+        "one": "malforbariĝis"
+    },
+    "was unbanned %(count)s times": {
+        "other": "%(count)s-foje malforbariĝis",
+        "one": "malforbariĝis"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s%(count)s-foje sanĝis sian nomon",
+        "one": "%(severalUsers)sŝanĝis sian nomon"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s%(count)s-foje ŝanĝis sian nomon",
+        "one": "%(oneUser)sŝanĝis sian nomon"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s kaj %(count)s aliaj",
+        "one": "%(items)s kaj unu alia"
+    },
     "%(items)s and %(lastItem)s": "%(items)s kaj %(lastItem)s",
     "collapse": "maletendi",
     "expand": "etendi",
     "Custom level": "Propra nivelo",
     "Incorrect username and/or password.": "Malĝusta uzantnomo kaj/aŭ pasvorto.",
     "Start chat": "Komenci babilon",
-    "And %(count)s more...|other": "Kaj %(count)s pliaj…",
+    "And %(count)s more...": {
+        "other": "Kaj %(count)s pliaj…"
+    },
     "Confirm Removal": "Konfirmi forigon",
     "Create": "Krei",
     "Unknown error": "Nekonata eraro",
@@ -322,9 +370,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Provis enlegi certan parton de ĉi tiu historio, sed vi ne havas permeson vidi ĝin.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Provis enlegi certan parton de ĉi tiu historio, sed malsukcesis ĝin trovi.",
     "Failed to load timeline position": "Malsukcesis enlegi lokon en historio",
-    "Uploading %(filename)s and %(count)s others|other": "Alŝutante dosieron %(filename)s kaj %(count)s aliajn",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Alŝutante dosieron %(filename)s kaj %(count)s aliajn",
+        "one": "Alŝutante dosieron %(filename)s kaj %(count)s alian"
+    },
     "Uploading %(filename)s": "Alŝutante dosieron %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Alŝutante dosieron %(filename)s kaj %(count)s alian",
     "Sign out": "Adiaŭi",
     "Success": "Sukceso",
     "Unable to remove contact information": "Ne povas forigi kontaktajn informojn",
@@ -652,8 +702,10 @@
     "Please supply a https:// or http:// widget URL": "Bonvolu doni URL-on de fenestraĵo kun https:// aŭ http://",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ŝanĝis aliron de gastoj al %(rule)s",
     "%(displayName)s is typing …": "%(displayName)s tajpas…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s kaj %(count)s aliaj tajpas…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s kaj unu alia tajpas…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s kaj %(count)s aliaj tajpas…",
+        "one": "%(names)s kaj unu alia tajpas…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s kaj %(lastPerson)s tajpas…",
     "Unrecognised address": "Nerekonita adreso",
     "The user must be unbanned before they can be invited.": "Necesas malforbari ĉi tiun uzanton antaŭ ol ĝin inviti.",
@@ -758,8 +810,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Ĉi tiu dosiero <b>tro grandas</b> por alŝuto. La grandolimo estas %(limit)s sed la dosiero grandas %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Ĉi tiuj dosieroj <b>tro grandas</b> por alŝuto. La grandolimo estas %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Iuj dosieroj <b>tro grandas</b> por alŝuto. La grandolimo estas %(limit)s.",
-    "Upload %(count)s other files|other": "Alŝuti %(count)s aliajn dosierojn",
-    "Upload %(count)s other files|one": "Alŝuti %(count)s alian dosieron",
+    "Upload %(count)s other files": {
+        "other": "Alŝuti %(count)s aliajn dosierojn",
+        "one": "Alŝuti %(count)s alian dosieron"
+    },
     "Cancel All": "Nuligi ĉion",
     "Upload Error": "Alŝuto eraris",
     "Remember my selection for this widget": "Memoru mian elekton por tiu ĉi fenestraĵo",
@@ -776,8 +830,10 @@
     "Join millions for free on the largest public server": "Senpage aliĝu al milionoj sur la plej granda publika servilo",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ĉi tiu ĉambro uziĝas por gravaj mesaĝoj de la hejmservilo, kaj tial vi ne povas foriri.",
     "Add room": "Aldoni ĉambron",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Vi havas %(count)s nelegitajn sciigojn en antaŭa versio de ĉi tiu ĉambro.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Vi havas %(count)s nelegitan sciigon en antaŭa versio de ĉi tiu ĉambro.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Vi havas %(count)s nelegitajn sciigojn en antaŭa versio de ĉi tiu ĉambro.",
+        "one": "Vi havas %(count)s nelegitan sciigon en antaŭa versio de ĉi tiu ĉambro."
+    },
     "This homeserver does not support login using email address.": "Ĉi tiu hejmservilo ne subtenas saluton per retpoŝtadreso.",
     "Registration has been disabled on this homeserver.": "Registriĝoj malŝaltiĝis sur ĉi tiu hejmservilo.",
     "Unable to query for supported registration methods.": "Ne povas peti subtenatajn registrajn metodojn.",
@@ -840,10 +896,14 @@
     "The conversation continues here.": "La interparolo daŭras ĉi tie.",
     "This room has been replaced and is no longer active.": "Ĉi tiu ĉambro estas anstataŭita, kaj ne plu aktivas.",
     "Only room administrators will see this warning": "Nur administrantoj de ĉambro vidos ĉi tiun averton",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)snenion ŝanĝis je %(count)s fojoj",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)snenion ŝanĝis",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)snenion ŝanĝis je %(count)s fojoj",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snenion ŝanĝis",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)snenion ŝanĝis je %(count)s fojoj",
+        "one": "%(severalUsers)snenion ŝanĝis"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)snenion ŝanĝis je %(count)s fojoj",
+        "one": "%(oneUser)snenion ŝanĝis"
+    },
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ne povas enlegi la responditan okazon; aŭ ĝi ne ekzistas, aŭ vi ne rajtas vidi ĝin.",
     "Clear all data": "Vakigi ĉiujn datumojn",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Por eviti perdon de via babila historio, vi devas elporti la ŝlosilojn de viaj ĉambroj antaŭ adiaŭo. Por tio vi bezonos reveni al la pli nova versio de %(brand)s",
@@ -966,7 +1026,10 @@
     "No recent messages by %(user)s found": "Neniuj freŝaj mesaĝoj de %(user)s troviĝis",
     "Remove recent messages by %(user)s": "Forigi freŝajn mesaĝojn de %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Je granda nombro da mesaĝoj, tio povas daŭri iomon da tempo. Bonvolu ne aktualigi vian klienton dume.",
-    "Remove %(count)s messages|other": "Forigi %(count)s mesaĝojn",
+    "Remove %(count)s messages": {
+        "other": "Forigi %(count)s mesaĝojn",
+        "one": "Forigi 1 mesaĝon"
+    },
     "Deactivate user?": "Ĉu malaktivigi uzanton?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Malaktivigo de ĉi tiu uzanto adiaŭigos ĝin, kaj malebligos, ke ĝi resalutu. Plie, ĝi foriros de ĉiuj enataj ĉambroj. Tiu ago ne povas malfariĝi. Ĉu vi certe volas malaktivigi ĉi tiun uzanton?",
     "Deactivate user": "Malaktivigi uzanton",
@@ -1006,17 +1069,20 @@
     "Discovery options will appear once you have added a phone number above.": "Eltrovaj agordoj aperos kiam vi aldonos telefonnumeron supre.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Tekstmesaĝo sendiĝis al +%(msisdn)s. Bonvolu enigi la kontrolan kodon enhavitan.",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Provu rulumi supren tra la historio por kontroli, ĉu ne estas iuj pli fruaj.",
-    "Remove %(count)s messages|one": "Forigi 1 mesaĝon",
     "Room %(name)s": "Ĉambro %(name)s",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Ĉi tiu invito al %(roomName)s sendiĝis al %(email)s, kiu ne estas ligita al via konto",
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Ligu ĉi tiun retpoŝtadreson al via konto en Agordoj por ricevadi invitojn rekte per %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "La invito al %(roomName)s sendiĝis al %(email)s",
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Uzu identigan servilon en Agordoj por ricevadi invitojn rekte per %(brand)s.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Havigu ĉi tiun retpoŝtadreson per Agordoj por ricevadi invitojn rekte per %(brand)s.",
-    "%(count)s unread messages including mentions.|other": "%(count)s nelegitaj mesaĝoj, inkluzive menciojn.",
-    "%(count)s unread messages including mentions.|one": "1 nelegita mencio.",
-    "%(count)s unread messages.|other": "%(count)s nelegitaj mesaĝoj.",
-    "%(count)s unread messages.|one": "1 nelegita mesaĝo.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s nelegitaj mesaĝoj, inkluzive menciojn.",
+        "one": "1 nelegita mencio."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s nelegitaj mesaĝoj.",
+        "one": "1 nelegita mesaĝo."
+    },
     "Unread messages.": "Nelegitaj mesaĝoj.",
     "Failed to deactivate user": "Malsukcesis malaktivigi uzanton",
     "This client does not support end-to-end encryption.": "Ĉi tiu kliento ne subtenas tutvojan ĉifradon.",
@@ -1182,10 +1248,14 @@
     "Show more": "Montri pli",
     "Copy": "Kopii",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro de %(oldRoomName)s al %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s aldonis la alternativajn adresojn %(addresses)s por ĉi tiu ĉambro.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s aldonis alternativan adreson %(addresses)s por ĉi tiu ĉambro.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s forigis la alternativajn adresojn %(addresses)s por ĉi tiu ĉambro.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s forigis alternativan adreson %(addresses)s por ĉi tiu ĉambro.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s aldonis la alternativajn adresojn %(addresses)s por ĉi tiu ĉambro.",
+        "one": "%(senderName)s aldonis alternativan adreson %(addresses)s por ĉi tiu ĉambro."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s forigis la alternativajn adresojn %(addresses)s por ĉi tiu ĉambro.",
+        "one": "%(senderName)s forigis alternativan adreson %(addresses)s por ĉi tiu ĉambro."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ŝanĝis la alternativan adreson de ĉi tiu ĉambro.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ŝanĝis la ĉefan kaj alternativan adresojn de ĉi tiu ĉambro.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s ŝanĝis la adresojn de ĉi tiu ĉambro.",
@@ -1282,11 +1352,15 @@
     "Your messages are not secure": "Viaj mesaĝoj ne estas sekuraj",
     "One of the following may be compromised:": "Unu el la jenaj eble estas malkonfidencigita:",
     "Your homeserver": "Via hejmservilo",
-    "%(count)s verified sessions|other": "%(count)s kontrolitaj salutaĵoj",
-    "%(count)s verified sessions|one": "1 kontrolita salutaĵo",
+    "%(count)s verified sessions": {
+        "other": "%(count)s kontrolitaj salutaĵoj",
+        "one": "1 kontrolita salutaĵo"
+    },
     "Hide verified sessions": "Kaŝi kontrolitajn salutaĵojn",
-    "%(count)s sessions|other": "%(count)s salutaĵoj",
-    "%(count)s sessions|one": "%(count)s salutaĵo",
+    "%(count)s sessions": {
+        "other": "%(count)s salutaĵoj",
+        "one": "%(count)s salutaĵo"
+    },
     "Hide sessions": "Kaŝi salutaĵojn",
     "Verify by scanning": "Kontroli per skanado",
     "Ask %(displayName)s to scan your code:": "Petu de %(displayName)s skani vian kodon:",
@@ -1538,8 +1612,10 @@
     "Activity": "Aktiveco",
     "A-Z": "A–Z",
     "List options": "Elektebloj pri listo",
-    "Show %(count)s more|other": "Montri %(count)s pliajn",
-    "Show %(count)s more|one": "Montri %(count)s plian",
+    "Show %(count)s more": {
+        "other": "Montri %(count)s pliajn",
+        "one": "Montri %(count)s plian"
+    },
     "Notification options": "Elektebloj pri sciigoj",
     "Favourited": "Elstarigita",
     "Forget Room": "Forgesi ĉambron",
@@ -1620,7 +1696,9 @@
     "Edit widgets, bridges & bots": "Redakti fenestraĵojn, pontojn, kaj robotojn",
     "Widgets": "Fenestraĵoj",
     "Unpin": "Malfiksi",
-    "You can only pin up to %(count)s widgets|other": "Vi povas fiksi maksimume %(count)s fenestraĵojn",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Vi povas fiksi maksimume %(count)s fenestraĵojn"
+    },
     "Explore public rooms": "Esplori publikajn ĉambrojn",
     "Show Widgets": "Montri fenestraĵojn",
     "Hide Widgets": "Kaŝi fenestraĵojn",
@@ -1984,8 +2062,10 @@
     "Continue with %(provider)s": "Daŭrigi per %(provider)s",
     "Homeserver": "Hejmservilo",
     "Server Options": "Elektebloj de servilo",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj.",
+        "other": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj."
+    },
     "Channel: <channelLink/>": "Kanalo: <channelLink/>",
     "Remain on your screen while running": "Resti sur via ekrano rulante",
     "Remain on your screen when viewing another room, when running": "Resti sur via ekrano rulante, dum rigardo al alia ĉambro",
@@ -2138,10 +2218,14 @@
     "<inviter/> invites you": "<inviter/> invitas vin",
     "No results found": "Neniuj rezultoj troviĝis",
     "Failed to remove some rooms. Try again later": "Malsukcesis forigi iujn arojn. Reprovu poste",
-    "%(count)s rooms|one": "%(count)s ĉambro",
-    "%(count)s rooms|other": "%(count)s ĉambroj",
-    "%(count)s members|one": "%(count)s ano",
-    "%(count)s members|other": "%(count)s anoj",
+    "%(count)s rooms": {
+        "one": "%(count)s ĉambro",
+        "other": "%(count)s ĉambroj"
+    },
+    "%(count)s members": {
+        "one": "%(count)s ano",
+        "other": "%(count)s anoj"
+    },
     "Are you sure you want to leave the space '%(spaceName)s'?": "Ĉu vi certe volas forlasi la aron «%(spaceName)s»?",
     "This space is not public. You will not be able to rejoin without an invite.": "Ĉi tiu aro ne estas publika. Vi ne povos re-aliĝi sen invito.",
     "Start audio stream": "Komenci sonelsendon",
@@ -2212,11 +2296,15 @@
     "View message": "Montri mesaĝon",
     "Zoom in": "Zomi",
     "Zoom out": "Malzomi",
-    "%(count)s people you know have already joined|one": "%(count)s persono, kiun vi konas, jam aliĝis",
-    "%(count)s people you know have already joined|other": "%(count)s personoj, kiujn vi konas, jam aliĝis",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s persono, kiun vi konas, jam aliĝis",
+        "other": "%(count)s personoj, kiujn vi konas, jam aliĝis"
+    },
     "Including %(commaSeparatedMembers)s": "Inkluzive je %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Montri 1 anon",
-    "View all %(count)s members|other": "Montri ĉiujn %(count)s anojn",
+    "View all %(count)s members": {
+        "one": "Montri 1 anon",
+        "other": "Montri ĉiujn %(count)s anojn"
+    },
     "Invite to just this room": "Inviti nur al ĉi tiu ĉambro",
     "%(seconds)ss left": "%(seconds)s sekundoj restas",
     "Failed to send": "Malsukcesis sendi",
@@ -2234,8 +2322,10 @@
     "To leave the beta, visit your settings.": "Por foriri de la prova versio, iru al viaj agordoj.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Via platformo kaj uzantonomo helpos al ni pli bone uzi viajn prikomentojn.",
     "Want to add a new room instead?": "Ĉu vi volas anstataŭe aldoni novan ĉambron?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Aldonante ĉambron…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Aldonante ĉambrojn… (%(progress)s el %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Aldonante ĉambron…",
+        "other": "Aldonante ĉambrojn… (%(progress)s el %(count)s)"
+    },
     "Not all selected were added": "Ne ĉiuj elektitoj aldoniĝis",
     "You are not allowed to view this server's rooms list": "Vi ne rajtas vidi liston de ĉambroj de tu ĉi servilo",
     "Add reaction": "Aldoni reagon",
@@ -2290,8 +2380,10 @@
     "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Se vi tamen tion faras, sciu ke neniu el viaj mesaĝoj foriĝos, sed via sperto pri serĉado povas malboniĝi momente, dum la indekso estas refarata",
     "You most likely do not want to reset your event index store": "Plej verŝajne, vi ne volas restarigi vian deponejon de indeksoj de okazoj",
     "Reset event store?": "Ĉu restarigi deponejon de okazoj?",
-    "Currently joining %(count)s rooms|one": "Nun aliĝante al %(count)s ĉambro",
-    "Currently joining %(count)s rooms|other": "Nun aliĝante al %(count)s ĉambroj",
+    "Currently joining %(count)s rooms": {
+        "one": "Nun aliĝante al %(count)s ĉambro",
+        "other": "Nun aliĝante al %(count)s ĉambroj"
+    },
     "The user you called is busy.": "La uzanto, kiun vi vokis, estas okupata.",
     "User Busy": "Uzanto estas okupata",
     "Integration manager": "Kunigilo",
@@ -2359,8 +2451,10 @@
     "Stop recording": "Malŝalti registradon",
     "End-to-end encryption isn't enabled": "Tutvoja ĉifrado ne estas ŝaltita",
     "Send voice message": "Sendi voĉmesaĝon",
-    "Show %(count)s other previews|one": "Montri %(count)s alian antaŭrigardon",
-    "Show %(count)s other previews|other": "Montri %(count)s aliajn antaŭrigardojn",
+    "Show %(count)s other previews": {
+        "one": "Montri %(count)s alian antaŭrigardon",
+        "other": "Montri %(count)s aliajn antaŭrigardojn"
+    },
     "Access": "Aliro",
     "People with supported clients will be able to join the room without having a registered account.": "Personoj kun subtenataj klientoj povos aliĝi al la ĉambro sen registrita konto.",
     "Decide who can join %(roomName)s.": "Decidu, kiu povas aliĝi al %(roomName)s.",
@@ -2368,8 +2462,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Ĉiu en aro povas trovi kaj aliĝi. Vi povas elekti plurajn arojn.",
     "Spaces with access": "Aroj kun aliro",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Ĉiu en aro povas trovi kaj aliĝi. <a>Redaktu, kiuj aroj povas aliri, tie ĉi.</a>",
-    "Currently, %(count)s spaces have access|other": "Nun, %(count)s aroj rajtas aliri",
-    "& %(count)s more|other": "kaj %(count)s pli",
+    "Currently, %(count)s spaces have access": {
+        "other": "Nun, %(count)s aroj rajtas aliri",
+        "one": "Nun, aro povas aliri"
+    },
+    "& %(count)s more": {
+        "other": "kaj %(count)s pli",
+        "one": "kaj %(count)s pli"
+    },
     "Upgrade required": "Necesas gradaltigo",
     "Anyone can find and join.": "Ĉiu povas trovi kaj aliĝi.",
     "Only invited people can join.": "Nur invititoj povas aliĝi.",
@@ -2463,10 +2563,14 @@
     "Want to add a new space instead?": "Ĉu vi volas aldoni novan aron anstataŭe?",
     "Add existing space": "Aldoni jaman aron",
     "Please provide an address": "Bonvolu doni adreson",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s ŝanĝis la servilblokajn listojn",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s ŝanĝis la servilblokajn listojn %(count)s-foje",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s ŝanĝis la servilblokajn listojn",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s ŝanĝis la servilblokajn listojn %(count)s-foje",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s ŝanĝis la servilblokajn listojn",
+        "other": "%(oneUser)s ŝanĝis la servilblokajn listojn %(count)s-foje"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s ŝanĝis la servilblokajn listojn",
+        "other": "%(severalUsers)s ŝanĝis la servilblokajn listojn %(count)s-foje"
+    },
     "Share content": "Havigi enhavon",
     "Application window": "Fenestro de aplikaĵo",
     "Share entire screen": "Vidigi tutan ekranon",
@@ -2509,8 +2613,6 @@
     "Change space name": "Ŝanĝi nomon de aro",
     "Change space avatar": "Ŝanĝi bildon de aro",
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Ĉiu en <spaceName/> povas trovi kaj aliĝi. Vi povas elekti ankaŭ aliajn arojn.",
-    "Currently, %(count)s spaces have access|one": "Nun, aro povas aliri",
-    "& %(count)s more|one": "kaj %(count)s pli",
     "To join a space you'll need an invite.": "Por aliĝi al aro, vi bezonas inviton.",
     "Autoplay videos": "Memage ludi filmojn",
     "Autoplay GIFs": "Memage ludi GIF-ojn",
@@ -2599,18 +2701,26 @@
     "Failed to send event": "Malsukcesis sendi okazon",
     "You need to be able to kick users to do that.": "Vi devas povi piedbati uzantojn por fari tion.",
     "Empty room (was %(oldName)s)": "Malplena ĉambro (estis %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Invitante %(user)s kaj 1 alian",
-    "Inviting %(user)s and %(count)s others|other": "Invitante %(user)s kaj %(count)s aliajn",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Invitante %(user)s kaj 1 alian",
+        "other": "Invitante %(user)s kaj %(count)s aliajn"
+    },
     "Inviting %(user1)s and %(user2)s": "Invitante %(user1)s kaj %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s and 1 alia",
-    "%(user)s and %(count)s others|other": "%(user)s kaj %(count)s aliaj",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s and 1 alia",
+        "other": "%(user)s kaj %(count)s aliaj"
+    },
     "%(user1)s and %(user2)s": "%(user1)s kaj %(user2)s",
     "Connectivity to the server has been lost": "Konektebleco al la servilo estas perdita",
     "Enable notifications for this account": "Ŝalti sciigojn por ĉi tiu konto",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Ĝisdatigante aro...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Ĝisdatigante arojn... (%(progress)s el %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Sendante inviton...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Sendante invitojn... (%(progress)s el %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Ĝisdatigante aro...",
+        "other": "Ĝisdatigante arojn... (%(progress)s el %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Sendante inviton...",
+        "other": "Sendante invitojn... (%(progress)s el %(count)s)"
+    },
     "Loading new room": "Ŝarĝante novan ĉambron",
     "Upgrading room": "Altgradiga ĉambro",
     "Stop live broadcasting?": "Ĉu ĉesi rekta elsendo?",
@@ -2661,11 +2771,15 @@
     "User is already invited to the room": "Uzanto jam estas invitita al la ĉambro",
     "User is already invited to the space": "Uzanto jam estas invitita al la aro",
     "You do not have permission to invite people to this space.": "Vi ne havas permeson inviti personojn al ĉi tiu aro.",
-    "In %(spaceName)s and %(count)s other spaces.|one": "En %(spaceName)s kaj %(count)s alia aro.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "En %(spaceName)s kaj %(count)s alia aro.",
+        "other": "En %(spaceName)s kaj %(count)s aliaj aroj."
+    },
     "In %(spaceName)s.": "En aro %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "En %(spaceName)s kaj %(count)s aliaj aroj.",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s kaj %(count)s alia",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s kaj %(count)s aliaj",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s kaj %(count)s alia",
+        "other": "%(spaceName)s kaj %(count)s aliaj"
+    },
     "In spaces %(space1Name)s and %(space2Name)s.": "En aroj %(space1Name)s kaj %(space2Name)s.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s kaj %(space2Name)s",
     "30s forward": "30s. antaŭen",
@@ -2743,10 +2857,14 @@
     "Sessions": "Salutaĵoj",
     "Close sidebar": "Fermu la flanka kolumno",
     "Sidebar": "Flanka kolumno",
-    "Sign out of %(count)s sessions|one": "Elsaluti el %(count)s salutaĵo",
-    "Sign out of %(count)s sessions|other": "Elsaluti el %(count)s salutaĵoj",
-    "%(count)s sessions selected|one": "%(count)s salutaĵo elektita",
-    "%(count)s sessions selected|other": "%(count)s salutaĵoj elektitaj",
+    "Sign out of %(count)s sessions": {
+        "one": "Elsaluti el %(count)s salutaĵo",
+        "other": "Elsaluti el %(count)s salutaĵoj"
+    },
+    "%(count)s sessions selected": {
+        "one": "%(count)s salutaĵo elektita",
+        "other": "%(count)s salutaĵoj elektitaj"
+    },
     "No sessions found.": "Neniuj salutaĵoj trovitaj.",
     "No inactive sessions found.": "Neniuj neaktivaj salutaĵoj trovitaj.",
     "No unverified sessions found.": "Neniuj nekontrolitaj salutaĵoj trovitaj.",
@@ -2793,10 +2911,14 @@
     "Topic: %(topic)s": "Temo: %(topic)s",
     "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "Ĉi tio estas la komenco de eksporto de <roomName/>. Eksportite de <exporterDetails/> ĉe %(exportDate)s.",
     "%(creatorName)s created this room.": "%(creatorName)s kreis ĉi tiun ĉambron.",
-    "Fetched %(count)s events so far|one": "Ĝis nun akiris %(count)s okazon",
-    "Fetched %(count)s events so far|other": "Ĝis nun akiris %(count)s okazojn",
-    "Fetched %(count)s events out of %(total)s|one": "Elportis %(count)s okazon el %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Elportis %(count)s okazojn el %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Ĝis nun akiris %(count)s okazon",
+        "other": "Ĝis nun akiris %(count)s okazojn"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Elportis %(count)s okazon el %(total)s",
+        "other": "Elportis %(count)s okazojn el %(total)s"
+    },
     "Generating a ZIP": "ZIP-arkivo estas generita",
     "Are you sure you want to exit during this export?": "Ĉu vi vere volas nuligi la eksportadon?",
     "Map feedback": "Sugestoj pri la mapo",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 3c27c8a02d..51f783f0d8 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -5,8 +5,10 @@
     "Always show message timestamps": "Mostrar siempre la fecha y hora de envío junto a los mensajes",
     "Authentication": "Autenticación",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
-    "and %(count)s others...|other": "y %(count)s más…",
-    "and %(count)s others...|one": "y otro más…",
+    "and %(count)s others...": {
+        "other": "y %(count)s más…",
+        "one": "y otro más…"
+    },
     "A new password must be entered.": "Debes ingresar una contraseña nueva.",
     "An error has occurred.": "Un error ha ocurrido.",
     "Are you sure?": "¿Estás seguro?",
@@ -203,8 +205,10 @@
     "Unable to enable Notifications": "No se han podido activar las notificaciones",
     "Unnamed Room": "Sala sin nombre",
     "Uploading %(filename)s": "Subiendo %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y otros %(count)s",
-    "Uploading %(filename)s and %(count)s others|other": "Subiendo %(filename)s y otros %(count)s",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Subiendo %(filename)s y otros %(count)s",
+        "other": "Subiendo %(filename)s y otros %(count)s"
+    },
     "Upload avatar": "Adjuntar avatar",
     "Upload Failed": "Subida fallida",
     "Usage": "Uso",
@@ -370,8 +374,10 @@
     "Offline": "Desconectado",
     "Unknown": "Desconocido",
     "Replying": "Respondiendo",
-    "(~%(count)s results)|other": "(~%(count)s resultados)",
-    "(~%(count)s results)|one": "(~%(count)s resultado)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s resultados)",
+        "one": "(~%(count)s resultado)"
+    },
     "Share room": "Compartir la sala",
     "Banned by %(displayName)s": "Vetado por %(displayName)s",
     "Muted Users": "Usuarios silenciados",
@@ -402,53 +408,97 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Al borrar un accesorio, este se elimina para todos usuarios de la sala. ¿Estás seguro?",
     "Popout widget": "Abrir accesorio en una ventana emergente",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s se unieron %(count)s veces",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s se unieron",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s se unió %(count)s veces",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s se unió",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s se fueron %(count)s veces",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s se fueron",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s se fue %(count)s veces",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s salió",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s se unieron y fueron %(count)s veces",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s se unieron y fueron",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s se unió y se fue %(count)s veces",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s se unió y se fue",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s se fueron y volvieron a unirse %(count)s veces",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s se fueron y volvieron a unirse",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s se fue y volvió a unirse %(count)s veces",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s se fue y volvió a unirse",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rechazó sus invitaciones %(count)s veces",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rechazó sus invitaciones",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rechazó su invitación %(count)s veces",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rechazó su invitación",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s se les retiraron sus invitaciones %(count)s veces",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s se les retiraron sus invitaciones",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s se le retiró su invitación %(count)s veces",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s se les retiraron sus invitaciones",
-    "were invited %(count)s times|other": "fueron invitados %(count)s veces",
-    "were invited %(count)s times|one": "fueron invitados",
-    "was invited %(count)s times|other": "fue invitado %(count)s veces",
-    "was invited %(count)s times|one": "fue invitado",
-    "were banned %(count)s times|other": "fueron vetados %(count)s veces",
-    "were banned %(count)s times|one": "fueron vetados",
-    "was banned %(count)s times|other": "fue vetado %(count)s veces",
-    "was banned %(count)s times|one": "fue vetado",
-    "were unbanned %(count)s times|other": "les quitaron el veto %(count)s veces",
-    "were unbanned %(count)s times|one": "les quitaron el veto",
-    "was unbanned %(count)s times|other": "se le quitó el veto %(count)s veces",
-    "was unbanned %(count)s times|one": "se le quitó el veto",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s cambiaron su nombre %(count)s veces",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s cambiaron su nombre",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s cambió su nombre %(count)s veces",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s cambió su nombre",
-    "%(items)s and %(count)s others|other": "%(items)s y otros %(count)s",
-    "%(items)s and %(count)s others|one": "%(items)s y otro más",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s se unieron %(count)s veces",
+        "one": "%(severalUsers)s se unieron"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s se unió %(count)s veces",
+        "one": "%(oneUser)s se unió"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s se fueron %(count)s veces",
+        "one": "%(severalUsers)s se fueron"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s se fue %(count)s veces",
+        "one": "%(oneUser)s salió"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s se unieron y fueron %(count)s veces",
+        "one": "%(severalUsers)s se unieron y fueron"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s se unió y se fue %(count)s veces",
+        "one": "%(oneUser)s se unió y se fue"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s se fueron y volvieron a unirse %(count)s veces",
+        "one": "%(severalUsers)s se fueron y volvieron a unirse"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s se fue y volvió a unirse %(count)s veces",
+        "one": "%(oneUser)s se fue y volvió a unirse"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s rechazó sus invitaciones %(count)s veces",
+        "one": "%(severalUsers)s rechazó sus invitaciones"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s rechazó su invitación %(count)s veces",
+        "one": "%(oneUser)s rechazó su invitación"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s se les retiraron sus invitaciones %(count)s veces",
+        "one": "%(severalUsers)s se les retiraron sus invitaciones"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s se le retiró su invitación %(count)s veces",
+        "one": "%(oneUser)s se les retiraron sus invitaciones"
+    },
+    "were invited %(count)s times": {
+        "other": "fueron invitados %(count)s veces",
+        "one": "fueron invitados"
+    },
+    "was invited %(count)s times": {
+        "other": "fue invitado %(count)s veces",
+        "one": "fue invitado"
+    },
+    "were banned %(count)s times": {
+        "other": "fueron vetados %(count)s veces",
+        "one": "fueron vetados"
+    },
+    "was banned %(count)s times": {
+        "other": "fue vetado %(count)s veces",
+        "one": "fue vetado"
+    },
+    "were unbanned %(count)s times": {
+        "other": "les quitaron el veto %(count)s veces",
+        "one": "les quitaron el veto"
+    },
+    "was unbanned %(count)s times": {
+        "other": "se le quitó el veto %(count)s veces",
+        "one": "se le quitó el veto"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s cambiaron su nombre %(count)s veces",
+        "one": "%(severalUsers)s cambiaron su nombre"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s cambió su nombre %(count)s veces",
+        "one": "%(oneUser)s cambió su nombre"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s y otros %(count)s",
+        "one": "%(items)s y otro más"
+    },
     "collapse": "encoger",
     "expand": "desplegar",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "No se pudo cargar el evento al que se respondió, bien porque no existe o no tiene permiso para verlo.",
     "<a>In reply to</a> <pill>": "<a>Respondiendo a </a> <pill>",
-    "And %(count)s more...|other": "Y %(count)s más…",
+    "And %(count)s more...": {
+        "other": "Y %(count)s más…"
+    },
     "Confirm Removal": "Confirmar eliminación",
     "Create": "Crear",
     "Clear Storage and Sign Out": "Borrar almacenamiento y cerrar sesión",
@@ -533,8 +583,10 @@
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s autorizó a unirse a la sala a personas todavía sin cuenta.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ha prohibido que los invitados se unan a la sala.",
     "%(displayName)s is typing …": "%(displayName)s está escribiendo…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s y otros %(count)s están escribiendo…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s y otra persona están escribiendo…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s y otros %(count)s están escribiendo…",
+        "one": "%(names)s y otra persona están escribiendo…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s y %(lastPerson)s están escribiendo…",
     "Unrecognised address": "Dirección desconocida",
     "You do not have permission to invite people to this room.": "No tienes permisos para inviitar gente a esta sala.",
@@ -767,14 +819,20 @@
     "Accept <policyLink /> to continue:": "<policyLink />, acepta para continuar:",
     "Cannot connect to integration manager": "No se puede conectar al gestor de integraciones",
     "The integration manager is offline or it cannot reach your homeserver.": "El gestor de integraciones está desconectado o no puede conectar con su servidor.",
-    "%(count)s unread messages including mentions.|other": "%(count)s mensajes sin leer incluyendo menciones.",
-    "%(count)s unread messages including mentions.|one": "1 mención sin leer.",
-    "%(count)s unread messages.|other": "%(count)s mensajes sin leer.",
-    "%(count)s unread messages.|one": "1 mensaje sin leer.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s mensajes sin leer incluyendo menciones.",
+        "one": "1 mención sin leer."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s mensajes sin leer.",
+        "one": "1 mensaje sin leer."
+    },
     "Unread messages.": "Mensajes sin leer.",
     "Jump to first unread room.": "Saltar a la primera sala sin leer.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
+        "one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala."
+    },
     "Setting up keys": "Configurando claves",
     "Verify this session": "Verifica esta sesión",
     "Encryption upgrade available": "Mejora de cifrado disponible",
@@ -857,8 +915,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Este archivo es <b>demasiado grande</b> para enviarse. El tamaño máximo es %(limit)s pero el archivo pesa %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Estos archivos son <b> demasiado grandes</b> para ser subidos. El límite de tamaño de archivos es %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Algunos archivos son <b> demasiado grandes</b> para ser subidos. El límite de tamaño de archivos es %(limit)s.",
-    "Upload %(count)s other files|other": "Enviar otros %(count)s archivos",
-    "Upload %(count)s other files|one": "Enviar %(count)s archivo más",
+    "Upload %(count)s other files": {
+        "other": "Enviar otros %(count)s archivos",
+        "one": "Enviar %(count)s archivo más"
+    },
     "Cancel All": "Cancelar todo",
     "Upload Error": "Error de subida",
     "Remember my selection for this widget": "Recordar mi selección para este accesorio",
@@ -995,10 +1055,14 @@
     "Displays information about a user": "Muestra información sobre un usuario",
     "Send a bug report with logs": "Enviar un informe de errores con los registros",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambió el nombre de la sala %(oldRoomName)s a %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s añadió las direcciones alternativas %(addresses)s para esta sala.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s añadió la dirección alternativa %(addresses)s para esta sala.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s añadió las direcciones alternativas %(addresses)s para esta sala.",
+        "one": "%(senderName)s añadió la dirección alternativa %(addresses)s para esta sala."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala.",
+        "one": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s cambió las direcciones alternativas de esta sala.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s cambió la dirección principal y las alternativas de esta sala.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s cambió las direcciones de esta sala.",
@@ -1091,10 +1155,14 @@
     "Mod": "Mod",
     "Rotate Right": "Girar a la derecha",
     "Language Dropdown": "Lista selección de idiomas",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s veces no efectuarion cambios",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s no efectuaron cambios",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s veces no efectuó cambios",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s no efectuó cambios",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s %(count)s veces no efectuarion cambios",
+        "one": "%(severalUsers)s no efectuaron cambios"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s %(count)s veces no efectuó cambios",
+        "one": "%(oneUser)s no efectuó cambios"
+    },
     "Power level": "Nivel de poder",
     "e.g. my-room": "p.ej. mi-sala",
     "Some characters not allowed": "Algunos caracteres no están permitidos",
@@ -1175,8 +1243,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Intente desplazarse hacia arriba en la línea de tiempo para ver si hay alguna anterior.",
     "Remove recent messages by %(user)s": "Eliminar mensajes recientes de %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Para una gran cantidad de mensajes, esto podría llevar algún tiempo. Por favor, no recargues tu aplicación mientras tanto.",
-    "Remove %(count)s messages|other": "Eliminar %(count)s mensajes",
-    "Remove %(count)s messages|one": "Eliminar 1 mensaje",
+    "Remove %(count)s messages": {
+        "other": "Eliminar %(count)s mensajes",
+        "one": "Eliminar 1 mensaje"
+    },
     "Deactivate user?": "¿Desactivar usuario?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Desactivar este usuario le cerrará la sesión y desconectará. No podrá volver a iniciar sesión. Además, saldrá de todas las salas a que se había unido. Esta acción no puede deshacerse. ¿Desactivar este usuario?",
     "Deactivate user": "Desactivar usuario",
@@ -1236,11 +1306,15 @@
     "Your homeserver": "Tu servidor base",
     "Trusted": "De confianza",
     "Not trusted": "No de confianza",
-    "%(count)s verified sessions|other": "%(count)s sesiones verificadas",
-    "%(count)s verified sessions|one": "1 sesión verificada",
+    "%(count)s verified sessions": {
+        "other": "%(count)s sesiones verificadas",
+        "one": "1 sesión verificada"
+    },
     "Hide verified sessions": "Ocultar sesiones verificadas",
-    "%(count)s sessions|other": "%(count)s sesiones",
-    "%(count)s sessions|one": "%(count)s sesión",
+    "%(count)s sessions": {
+        "other": "%(count)s sesiones",
+        "one": "%(count)s sesión"
+    },
     "Hide sessions": "Ocultar sesiones",
     "This client does not support end-to-end encryption.": "Este cliente no es compatible con el cifrado de extremo a extremo.",
     "Security": "Seguridad",
@@ -1456,8 +1530,10 @@
     "Activity": "Actividad",
     "A-Z": "A-Z",
     "List options": "Opciones de la lista",
-    "Show %(count)s more|other": "Ver %(count)s más",
-    "Show %(count)s more|one": "Ver %(count)s más",
+    "Show %(count)s more": {
+        "other": "Ver %(count)s más",
+        "one": "Ver %(count)s más"
+    },
     "Notification options": "Ajustes de notificaciones",
     "Forget Room": "Olvidar sala",
     "Favourited": "Favorecido",
@@ -1628,7 +1704,9 @@
     "Edit widgets, bridges & bots": "Editar accesorios, puentes y bots",
     "Widgets": "Accesorios",
     "Set my room layout for everyone": "Hacer que todo el mundo use mi disposición de sala",
-    "You can only pin up to %(count)s widgets|other": "Solo puedes anclar hasta %(count)s accesorios",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Solo puedes anclar hasta %(count)s accesorios"
+    },
     "Hide Widgets": "Ocultar accesorios",
     "Show Widgets": "Mostrar accesorios",
     "Send general files as you in this room": "Enviar archivos en tu nombre a esta sala",
@@ -2080,8 +2158,10 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "No se ha podido acceder al almacenamiento seguro. Por favor, comprueba que la frase de seguridad es correcta.",
     "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Ten en cuenta que, si no añades un correo electrónico y olvidas tu contraseña, podrías <b>perder accceso para siempre a tu cuenta</b>.",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitar a alguien usando su nombre, dirección de correo, nombre de usuario (ej.: <userId/>) o <a>compartiendo la sala</a>.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Guardar mensajes cifrados de forma segura y local para que aparezcan en los resultados de búsqueda, usando %(size)s para almacenar mensajes de %(rooms)s sala.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Guardar mensajes cifrados de forma segura y local para que aparezcan en los resultados de búsqueda, usando %(size)s para almacenar mensajes de %(rooms)s salas.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Guardar mensajes cifrados de forma segura y local para que aparezcan en los resultados de búsqueda, usando %(size)s para almacenar mensajes de %(rooms)s sala.",
+        "other": "Guardar mensajes cifrados de forma segura y local para que aparezcan en los resultados de búsqueda, usando %(size)s para almacenar mensajes de %(rooms)s salas."
+    },
     "Offline encrypted messaging using dehydrated devices": "Mensajería cifrada y offline usando dispositivos deshidratados",
     "Send <b>%(msgtype)s</b> messages as you in your active room": "Enviar mensajes de tipo <b>%(msgtype)s</b> en tu nombre a tu sala activa",
     "Send <b>%(msgtype)s</b> messages as you in this room": "Enviar mensajes de tipo <b>%(msgtype)s</b> en tu nombre a esta sala",
@@ -2141,8 +2221,10 @@
     "Room name": "Nombre de la sala",
     "Support": "Ayuda",
     "Random": "Al azar",
-    "%(count)s members|one": "%(count)s miembro",
-    "%(count)s members|other": "%(count)s miembros",
+    "%(count)s members": {
+        "one": "%(count)s miembro",
+        "other": "%(count)s miembros"
+    },
     "Your server does not support showing space hierarchies.": "Este servidor no es compatible con la función de las jerarquías de espacios.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "¿Salir del espacio «%(spaceName)s»?",
     "This space is not public. You will not be able to rejoin without an invite.": "Este espacio es privado. No podrás volverte a unir sin una invitación.",
@@ -2202,8 +2284,10 @@
     "Mark as not suggested": "No sugerir",
     "Failed to remove some rooms. Try again later": "No se han podido quitar algunas salas. Prueba de nuevo más tarde",
     "Suggested": "Sugerencias",
-    "%(count)s rooms|one": "%(count)s sala",
-    "%(count)s rooms|other": "%(count)s salas",
+    "%(count)s rooms": {
+        "one": "%(count)s sala",
+        "other": "%(count)s salas"
+    },
     "You don't have permission": "No tienes permisos",
     "Invite to %(roomName)s": "Invitar a %(roomName)s",
     "Edit devices": "Gestionar dispositivos",
@@ -2216,8 +2300,10 @@
     "Invited people will be able to read old messages.": "Las personas que invites podrán leer los mensajes antiguos.",
     "We couldn't create your DM.": "No hemos podido crear tu mensaje directo.",
     "Add existing rooms": "Añadir salas que ya existan",
-    "%(count)s people you know have already joined|one": "%(count)s persona que ya conoces se ha unido",
-    "%(count)s people you know have already joined|other": "%(count)s personas que ya conoces se han unido",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s persona que ya conoces se ha unido",
+        "other": "%(count)s personas que ya conoces se han unido"
+    },
     "Invite to just this room": "Invitar solo a esta sala",
     "Warn before quitting": "Pedir confirmación antes de salir",
     "Manage & explore rooms": "Gestionar y explorar salas",
@@ -2248,8 +2334,10 @@
     "Zoom in": "Acercar",
     "Zoom out": "Alejar",
     "Including %(commaSeparatedMembers)s": "Incluyendo %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Ver 1 miembro",
-    "View all %(count)s members|other": "Ver los %(count)s miembros",
+    "View all %(count)s members": {
+        "one": "Ver 1 miembro",
+        "other": "Ver los %(count)s miembros"
+    },
     "%(seconds)ss left": "%(seconds)ss restantes",
     "Failed to send": "No se ha podido mandar",
     "Change server ACLs": "Cambiar los ACLs del servidor",
@@ -2264,8 +2352,10 @@
     "Leave the beta": "Salir de la beta",
     "Beta": "Beta",
     "Want to add a new room instead?": "¿Quieres añadir una sala nueva en su lugar?",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Añadiendo salas… (%(progress)s de %(count)s)",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Añadiendo sala…",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "other": "Añadiendo salas… (%(progress)s de %(count)s)",
+        "one": "Añadiendo sala…"
+    },
     "Not all selected were added": "No se han añadido todas las seleccionadas",
     "You are not allowed to view this server's rooms list": "No tienes permiso para ver la lista de salas de este servidor",
     "Error processing voice message": "Ha ocurrido un error al procesar el mensaje de voz",
@@ -2289,8 +2379,10 @@
     "Sends the given message with a space themed effect": "Envía un mensaje con efectos espaciales",
     "See when people join, leave, or are invited to your active room": "Ver cuando alguien se una, salga o se le invite a tu sala activa",
     "See when people join, leave, or are invited to this room": "Ver cuando alguien se une, sale o se le invita a la sala",
-    "Currently joining %(count)s rooms|one": "Entrando en %(count)s sala",
-    "Currently joining %(count)s rooms|other": "Entrando en %(count)s salas",
+    "Currently joining %(count)s rooms": {
+        "one": "Entrando en %(count)s sala",
+        "other": "Entrando en %(count)s salas"
+    },
     "The user you called is busy.": "La persona a la que has llamado está ocupada.",
     "User Busy": "Persona ocupada",
     "End-to-end encryption isn't enabled": "El cifrado de extremo a extremo no está activado",
@@ -2328,10 +2420,14 @@
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Esta persona está comportándose de manera posiblemente ilegal. Por ejemplo, amenazando con violencia física o con revelar datos personales.\nSe avisará a los moderadores de la sala, que podrían denunciar los hechos.",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Lo que esta persona está escribiendo no está bien.\nSe avisará a los moderadores de la sala.",
     "Please provide an address": "Por favor, elige una dirección",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s cambió los permisos del servidor",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s cambió los permisos del servidor %(count)s veces",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s cambió los permisos del servidor",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s cambió los permisos del servidor %(count)s veces",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s cambió los permisos del servidor",
+        "other": "%(oneUser)s cambió los permisos del servidor %(count)s veces"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s cambió los permisos del servidor",
+        "other": "%(severalUsers)s cambió los permisos del servidor %(count)s veces"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Ha fallado el sistema de búsqueda de mensajes. Comprueba <a>tus ajustes</a> para más información",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Elige una dirección para este espacio y los usuarios de tu servidor base (%(localDomain)s) podrán encontrarlo a través del buscador",
     "To publish an address, it needs to be set as a local address first.": "Para publicar una dirección, primero debe ser añadida como dirección local.",
@@ -2389,8 +2485,10 @@
     "Unnamed audio": "Audio sin título",
     "User Directory": "Lista de usuarios",
     "Error processing audio message": "Error al procesar el mensaje de audio",
-    "Show %(count)s other previews|one": "Ver otras %(count)s vistas previas",
-    "Show %(count)s other previews|other": "Ver %(count)s otra vista previa",
+    "Show %(count)s other previews": {
+        "one": "Ver otras %(count)s vistas previas",
+        "other": "Ver %(count)s otra vista previa"
+    },
     "Images, GIFs and videos": "Imágenes, GIFs y vídeos",
     "Code blocks": "Bloques de código",
     "Keyboard shortcuts": "Atajos de teclado",
@@ -2434,8 +2532,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Cualquiera en un espacio puede encontrar y unirse. Puedes seleccionar varios espacios.",
     "Spaces with access": "Espacios con acceso",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Cualquiera en un espacio puede encontrar y unirse. <a>Ajusta qué espacios pueden acceder desde aquí.</a>",
-    "Currently, %(count)s spaces have access|other": "Ahora mismo, %(count)s espacios tienen acceso",
-    "& %(count)s more|other": "y %(count)s más",
+    "Currently, %(count)s spaces have access": {
+        "other": "Ahora mismo, %(count)s espacios tienen acceso",
+        "one": "Ahora mismo, un espacio tiene acceso"
+    },
+    "& %(count)s more": {
+        "other": "y %(count)s más",
+        "one": "y %(count)s más"
+    },
     "Upgrade required": "Actualización necesaria",
     "Anyone can find and join.": "Cualquiera puede encontrar y unirse.",
     "Only invited people can join.": "Solo las personas invitadas pueden unirse.",
@@ -2521,8 +2625,6 @@
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s ha fijado <a>un mensaje</a> en esta sala. Mira todos los <b>mensajes fijados</b>.",
     "Some encryption parameters have been changed.": "Algunos parámetros del cifrado han cambiado.",
     "Role in <RoomName/>": "Rol en <RoomName/>",
-    "Currently, %(count)s spaces have access|one": "Ahora mismo, un espacio tiene acceso",
-    "& %(count)s more|one": "y %(count)s más",
     "Select the roles required to change various parts of the space": "Elige los roles que los usuarios deben tener para poder cambiar los distintos ajustes del espacio",
     "Failed to update the join rules": "Fallo al actualizar las reglas para unirse",
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Cualquiera en <spaceName/> puede encontrar y unirse. También puedes seleccionar otros espacios.",
@@ -2604,12 +2706,18 @@
     "Disinvite from %(roomName)s": "Anular la invitación a %(roomName)s",
     "Threads": "Hilos",
     "Create poll": "Crear una encuesta",
-    "%(count)s reply|one": "%(count)s respuesta",
-    "%(count)s reply|other": "%(count)s respuestas",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Actualizando espacio…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Actualizando espacios… (%(progress)s de %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Enviando invitación…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Enviando invitaciones… (%(progress)s de %(count)s)",
+    "%(count)s reply": {
+        "one": "%(count)s respuesta",
+        "other": "%(count)s respuestas"
+    },
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Actualizando espacio…",
+        "other": "Actualizando espacios… (%(progress)s de %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Enviando invitación…",
+        "other": "Enviando invitaciones… (%(progress)s de %(count)s)"
+    },
     "Loading new room": "Cargando la nueva sala",
     "Upgrading room": "Actualizar sala",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Escribe tu frase de seguridad o <button>usa tu clave de seguridad</button> para continuar.",
@@ -2630,9 +2738,14 @@
     "Rename": "Cambiar nombre",
     "Select all": "Seleccionar todo",
     "Deselect all": "Deseleccionar todo",
-    "Sign out devices|one": "Cerrar sesión en el dispositivo",
-    "Sign out devices|other": "Cerrar sesión en los dispositivos",
-    "Click the button below to confirm signing out these devices.|other": "Haz clic en el botón de abajo para confirmar y cerrar sesión en estos dispositivos.",
+    "Sign out devices": {
+        "one": "Cerrar sesión en el dispositivo",
+        "other": "Cerrar sesión en los dispositivos"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "other": "Haz clic en el botón de abajo para confirmar y cerrar sesión en estos dispositivos.",
+        "one": "Haz clic en el botón de abajo para confirmar que quieres cerrar la sesión de este dispositivo."
+    },
     "Use a more compact 'Modern' layout": "Usar una disposición más compacta y «moderna»",
     "Light high contrast": "Claro con contraste alto",
     "Own your conversations.": "Toma el control de tus conversaciones.",
@@ -2642,7 +2755,6 @@
     "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)s cambió quién puede unirse a esta sala. <a>Ver ajustes</a>.",
     "%(senderDisplayName)s changed who can join this room.": "%(senderDisplayName)s cambió quién puede unirse a esta sala.",
     "Use high contrast": "Usar un modo con contraste alto",
-    "Click the button below to confirm signing out these devices.|one": "Haz clic en el botón de abajo para confirmar que quieres cerrar la sesión de este dispositivo.",
     "Automatically send debug logs on any error": "Mandar automáticamente los registros de depuración cuando ocurra cualquier error",
     "Someone already has that username, please try another.": "Ya hay alguien con ese nombre de usuario. Prueba con otro, por favor.",
     "Joined": "Te has unido",
@@ -2681,16 +2793,20 @@
     "%(senderName)s has updated the room layout": "%(senderName)s actualizó la disposición de la sala",
     "Sends the given message with rainfall": "Envía el mensaje junto a un efecto de lluvia",
     "sends rainfall": "envía un efecto de lluvia",
-    "%(count)s votes|one": "%(count)s voto",
-    "%(count)s votes|other": "%(count)s votos",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s y %(count)s más",
+    "%(count)s votes": {
+        "one": "%(count)s voto",
+        "other": "%(count)s votos"
+    },
+    "%(spaceName)s and %(count)s others": {
+        "other": "%(spaceName)s y %(count)s más",
+        "one": "%(spaceName)s y %(count)s más"
+    },
     "Messaging": "Mensajería",
     "Quick settings": "Ajustes rápidos",
     "Developer": "Desarrollo",
     "Experimental": "Experimentos",
     "Themes": "Temas",
     "Moderation": "Moderación",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s y %(count)s más",
     "Files": "Archivos",
     "Pin to sidebar": "Fijar a la barra lateral",
     "Without verifying, you won't have access to all your messages and may appear as untrusted to others.": "Si decides no verificar, no tendrás acceso a todos tus mensajes y puede que le aparezcas a los demás como «no confiado».",
@@ -2719,11 +2835,15 @@
     "Sorry, the poll you tried to create was not posted.": "Lo sentimos, la encuesta que has intentado empezar no ha sido publicada.",
     "Failed to post poll": "No se ha podido enviar la encuesta",
     "Including you, %(commaSeparatedMembers)s": "Además de ti, %(commaSeparatedMembers)s",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s voto. Vota para ver los resultados",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s votos. Vota para ver los resultados",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s voto. Vota para ver los resultados",
+        "other": "%(count)s votos. Vota para ver los resultados"
+    },
     "No votes cast": "Ningún voto",
-    "Final result based on %(count)s votes|one": "Resultados finales (%(count)s voto)",
-    "Final result based on %(count)s votes|other": "Resultados finales (%(count)s votos)",
+    "Final result based on %(count)s votes": {
+        "one": "Resultados finales (%(count)s voto)",
+        "other": "Resultados finales (%(count)s votos)"
+    },
     "Sorry, your vote was not registered. Please try again.": "Lo sentimos, no se ha podido registrar el voto. Inténtalo otra vez.",
     "Vote not registered": "Voto no emitido",
     "Chat": "Conversación",
@@ -2743,25 +2863,35 @@
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "En su momento, aceptaste compartir información anónima de uso con nosotros. Estamos cambiando cómo funciona el sistema.",
     "Help improve %(analyticsOwner)s": "Ayúdanos a mejorar %(analyticsOwner)s",
     "That's fine": "Vale",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s evento exportado en %(seconds)s segundos",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s eventos exportados en %(seconds)s segundos",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s evento exportado en %(seconds)s segundos",
+        "other": "%(count)s eventos exportados en %(seconds)s segundos"
+    },
     "Export successful!": "¡Exportación completada!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Recibido %(count)s evento en %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "Recibidos %(count)s eventos en %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Recibido %(count)s evento en %(seconds)ss",
+        "other": "Recibidos %(count)s eventos en %(seconds)ss"
+    },
     "Processing event %(number)s out of %(total)s": "Procesando evento %(number)s de %(total)s",
-    "Fetched %(count)s events so far|one": "Recibido %(count)s evento por ahora",
-    "Fetched %(count)s events so far|other": "Recibidos %(count)s eventos por ahora",
-    "Fetched %(count)s events out of %(total)s|one": "Recibido %(count)s evento de %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Recibidos %(count)s eventos de %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Recibido %(count)s evento por ahora",
+        "other": "Recibidos %(count)s eventos por ahora"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Recibido %(count)s evento de %(total)s",
+        "other": "Recibidos %(count)s eventos de %(total)s"
+    },
     "Generating a ZIP": "Generar un archivo ZIP",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "El formato de la fecha no es el que esperábamos (%(inputDate)s). Prueba con AAAA-MM-DD, año-mes-día.",
     "You cannot place calls without a connection to the server.": "No puedes llamar porque no hay conexión con el servidor.",
     "Connectivity to the server has been lost": "Se ha perdido la conexión con el servidor",
     "You cannot place calls in this browser.": "No puedes llamar usando este navegador de internet.",
     "Calls are unsupported": "Las llamadas no son compatibles",
-    "Based on %(count)s votes|other": "%(count)s votos",
+    "Based on %(count)s votes": {
+        "other": "%(count)s votos",
+        "one": "%(count)s voto"
+    },
     "Failed to load list of rooms.": "No se ha podido cargar la lista de salas.",
-    "Based on %(count)s votes|one": "%(count)s voto",
     "Recently viewed": "Visto recientemente",
     "Device verified": "Dispositivo verificado",
     "Verify this device": "Verificar este dispositivo",
@@ -2801,10 +2931,14 @@
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Aquí encontrarás tus conversaciones con los miembros del espacio. Si lo desactivas, estas no aparecerán mientras veas el espacio %(spaceName)s.",
     "This address had invalid server or is already in use": "Esta dirección tiene un servidor no válido o ya está siendo usada",
     "Sections to show": "Secciones que mostrar",
-    "was removed %(count)s times|one": "fue sacado",
-    "was removed %(count)s times|other": "fue sacado %(count)s veces",
-    "were removed %(count)s times|other": "fueron sacados %(count)s veces",
-    "were removed %(count)s times|one": "fueron sacados",
+    "was removed %(count)s times": {
+        "one": "fue sacado",
+        "other": "fue sacado %(count)s veces"
+    },
+    "were removed %(count)s times": {
+        "other": "fueron sacados %(count)s veces",
+        "one": "fueron sacados"
+    },
     "Backspace": "Tecta de retroceso",
     "Unknown error fetching location. Please try again later.": "Error desconocido al conseguir tu ubicación. Por favor, inténtalo de nuevo más tarde.",
     "Failed to fetch your location. Please try again later.": "No se ha podido conseguir tu ubicación. Por favor, inténtalo de nuevo más tarde.",
@@ -2866,14 +3000,22 @@
     "Call": "Llamar",
     "This is a beta feature": "Esta funcionalidad está en beta",
     "Feedback sent! Thanks, we appreciate it!": "¡Opinión enviada! Gracias, te lo agradecemos.",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)senvió un mensaje oculto",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s enviaron %(count)s mensajes ocultos",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s envió un mensaje oculto",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)senviaron %(count)s mensajes ocultos",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)seliminó %(count)s mensajes",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)seliminó un mensaje",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)seliminaron %(count)s mensajes",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)seliminó un mensaje",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)senvió un mensaje oculto",
+        "other": "%(oneUser)s enviaron %(count)s mensajes ocultos"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s envió un mensaje oculto",
+        "other": "%(severalUsers)senviaron %(count)s mensajes ocultos"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)seliminó %(count)s mensajes",
+        "one": "%(oneUser)seliminó un mensaje"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "other": "%(severalUsers)seliminaron %(count)s mensajes",
+        "one": "%(severalUsers)seliminó un mensaje"
+    },
     "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!": "Si alguien te ha dicho que copies o pegues algo aquí, ¡lo más seguro es que te estén intentando timar!",
     "Wait!": "¡Espera!",
     "Use <arrows/> to scroll": "Usa <arrows/> para desplazarte",
@@ -2904,8 +3046,10 @@
     "Join %(roomAddress)s": "Unirte a %(roomAddress)s",
     "Export Cancelled": "Exportación cancelada",
     "<empty string>": "<texto vacío>",
-    "<%(count)s spaces>|one": "<espacio>",
-    "<%(count)s spaces>|other": "<%(count)s espacios>",
+    "<%(count)s spaces>": {
+        "one": "<espacio>",
+        "other": "<%(count)s espacios>"
+    },
     "Results are only revealed when you end the poll": "Los resultados se mostrarán cuando cierres la encuesta",
     "Voters see results as soon as they have voted": "Quienes voten podrán ver los resultados",
     "Closed poll": "Encuesta cerrada",
@@ -2927,8 +3071,10 @@
     "Group all your people in one place.": "Agrupa a toda tu gente en un mismo sitio.",
     "Group all your favourite rooms and people in one place.": "Agrupa en un mismo sitio todas tus salas y personas favoritas.",
     "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.": "Los espacios permiten agrupar salas y personas. Además de los espacios de los que ya formes parte, puedes usar algunos que vienen incluidos.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Confirma que quieres cerrar sesión en este dispositivo usando Single Sign On para probar tu identidad.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Confirma que quieres cerrar sesión de estos dispositivos usando Single Sign On para probar tu identidad.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Confirma que quieres cerrar sesión en este dispositivo usando Single Sign On para probar tu identidad.",
+        "other": "Confirma que quieres cerrar sesión de estos dispositivos usando Single Sign On para probar tu identidad."
+    },
     "Automatically send debug logs when key backup is not functioning": "Enviar automáticamente los registros de depuración cuando la clave de respaldo no funcione",
     "Insert a trailing colon after user mentions at the start of a message": "Inserta automáticamente dos puntos después de las menciones que hagas al principio de los mensajes",
     "Jump to date (adds /jumptodate and jump to date headers)": "Saltar a una fecha (añade el comando /jumptodate y enlaces para saltar en los encabezados de fecha)",
@@ -2941,10 +3087,14 @@
     "Navigate up in the room list": "Subir en la lista de salas",
     "Navigate down in the room list": "Navegar hacia abajo en la lista de salas",
     "Scroll down in the timeline": "Bajar en la línea de tiempo",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s cambió los <a>mensajes fijados</a> de la sala %(count)s veces",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s cambió los <a>mensajes fijados</a> de la sala",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s cambiaron los <a>mensajes fijados</a> de la sala",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s cambiaron los <a>mensajes fijados</a> de la sala %(count)s veces",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(oneUser)s cambió los <a>mensajes fijados</a> de la sala %(count)s veces",
+        "one": "%(oneUser)s cambió los <a>mensajes fijados</a> de la sala"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s cambiaron los <a>mensajes fijados</a> de la sala",
+        "other": "%(severalUsers)s cambiaron los <a>mensajes fijados</a> de la sala %(count)s veces"
+    },
     "Show polls button": "Mostrar botón de encuestas",
     "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Los espacios son una nueva manera de agrupar salas y personas. ¿Qué tipo de espacio quieres crear? Lo puedes cambiar más tarde.",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Si ya has informado de un fallo a través de GitHub, los registros de depuración nos pueden ayudar a investigar mejor el problema. ",
@@ -2964,14 +3114,18 @@
     "Collapse quotes": "Plegar citas",
     "Busy": "Ocupado",
     "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Este servidor base no está configurado apropiadamente para mostrar mapas, o el servidor de mapas no responde.",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Estás a punto de borrar %(count)s mensajes de %(user)s. También se borrarán permanentemente de los dispositivos de todos en la conversación. ¿Quieres continuar?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Estás a punto de borrar %(count)s mensajes de %(user)s. También se borrarán permanentemente de los dispositivos de todos en la conversación. ¿Quieres continuar?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "other": "Estás a punto de borrar %(count)s mensajes de %(user)s. También se borrarán permanentemente de los dispositivos de todos en la conversación. ¿Quieres continuar?",
+        "one": "Estás a punto de borrar %(count)s mensajes de %(user)s. También se borrarán permanentemente de los dispositivos de todos en la conversación. ¿Quieres continuar?"
+    },
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "No marques esta casilla si quieres borrar también los mensajes del sistema sobre el usuario (ej.: entradas y salidas, cambios en su perfil…)",
     "Preserve system messages": "Mantener mensajes del sistema",
     "%(displayName)s's live location": "Ubicación en tiempo real de %(displayName)s",
     "Share for %(duration)s": "Compartir durante %(duration)s",
-    "Currently removing messages in %(count)s rooms|one": "Borrando mensajes en %(count)s sala",
-    "Currently removing messages in %(count)s rooms|other": "Borrando mensajes en %(count)s salas",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Borrando mensajes en %(count)s sala",
+        "other": "Borrando mensajes en %(count)s salas"
+    },
     "%(value)ss": "%(value)s s",
     "%(value)sm": "%(value)s min",
     "%(value)sh": "%(value)s h",
@@ -3025,8 +3179,10 @@
     "Create a video room": "Crear una sala de vídeo",
     "Create video room": "Crear sala de vídeo",
     "%(featureName)s Beta feedback": "Danos tu opinión sobre la beta de %(featureName)s",
-    "%(count)s participants|one": "1 participante",
-    "%(count)s participants|other": "%(count)s participantes",
+    "%(count)s participants": {
+        "one": "1 participante",
+        "other": "%(count)s participantes"
+    },
     "Try again later, or ask a room or space admin to check if you have access.": "Inténtalo más tarde, o pídele a alguien con permisos de administrador dentro de la sala o espacio que compruebe si tienes acceso.",
     "This room or space is not accessible at this time.": "Esta sala o espacio no es accesible en este momento.",
     "Are you sure you're at the right place?": "¿Seguro que estás en el sitio correcto?",
@@ -3064,7 +3220,10 @@
     "Disinvite from room": "Retirar la invitación a la sala",
     "Remove from space": "Quitar del espacio",
     "Disinvite from space": "Retirar la invitación al espacio",
-    "Confirm signing out these devices|other": "Confirma el cierre de sesión en estos dispositivos",
+    "Confirm signing out these devices": {
+        "other": "Confirma el cierre de sesión en estos dispositivos",
+        "one": "Confirmar cerrar sesión de este dispositivo"
+    },
     "Sends the given message with hearts": "Envía corazones junto al mensaje",
     "sends hearts": "envía corazones",
     "Failed to join": "No ha sido posible unirse",
@@ -3092,10 +3251,11 @@
     "This invite was sent to %(email)s": "Esta invitación se envió a %(email)s",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Ha ocurrido un error (%(errcode)s) al validar tu invitación. Puedes intentar a pasarle esta información a la persona que te ha invitado.",
     "Something went wrong with your invite.": "Ha ocurrido un error al procesar tu invitación.",
-    "Seen by %(count)s people|one": "%(count)s persona lo ha visto",
-    "Seen by %(count)s people|other": "%(count)s personas lo han visto",
+    "Seen by %(count)s people": {
+        "one": "%(count)s persona lo ha visto",
+        "other": "%(count)s personas lo han visto"
+    },
     "Your password was successfully changed.": "Has cambiado tu contraseña.",
-    "Confirm signing out these devices|one": "Confirmar cerrar sesión de este dispositivo",
     "Turn on camera": "Encender cámara",
     "Turn off camera": "Apagar cámara",
     "Video devices": "Dispositivos de vídeo",
@@ -3134,8 +3294,10 @@
     "Edit topic": "Editar asunto",
     "Joining…": "Uniéndose…",
     "To join, please enable video rooms in Labs first": "Para unirse, por favor activa las salas de vídeo en Labs primero",
-    "%(count)s people joined|one": "%(count)s persona unida",
-    "%(count)s people joined|other": "%(count)s personas unidas",
+    "%(count)s people joined": {
+        "one": "%(count)s persona unida",
+        "other": "%(count)s personas unidas"
+    },
     "Check if you want to hide all current and future messages from this user.": "Comprueba que realmente quieres ocultar todos los mensajes actuales y futuros de este usuario.",
     "View related event": "Ver evento relacionado",
     "Ignore user": "Ignorar usuario",
@@ -3160,8 +3322,10 @@
     "Video rooms are always-on VoIP channels embedded within a room in %(brand)s.": "Las salas de vídeo son canales de VoIP siempre abiertos, disponibles dentro de una sala en %(brand)s.",
     "A new way to chat over voice and video in %(brand)s.": "Una nueva forma de hablar por voz y vídeo en %(brand)s.",
     "Video rooms": "Salas de vídeo",
-    "%(count)s Members|one": "%(count)s miembro",
-    "%(count)s Members|other": "%(count)s miembros",
+    "%(count)s Members": {
+        "one": "%(count)s miembro",
+        "other": "%(count)s miembros"
+    },
     "Some results may be hidden": "Algunos resultados pueden estar ocultos",
     "Other options": "Otras opciones",
     "Copy invite link": "Copiar enlace de invitación",
@@ -3198,9 +3362,11 @@
     "Exit fullscreen": "Salir de pantalla completa",
     "Enter fullscreen": "Pantalla completa",
     "Map feedback": "Danos tu opinión sobre el mapa",
-    "In %(spaceName)s and %(count)s other spaces.|one": "En %(spaceName)s y %(count)s espacio más.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "En %(spaceName)s y %(count)s espacio más.",
+        "other": "En %(spaceName)s y otros %(count)s espacios"
+    },
     "In %(spaceName)s.": "En el espacio %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "En %(spaceName)s y otros %(count)s espacios",
     "In spaces %(space1Name)s and %(space2Name)s.": "En los espacios %(space1Name)s y %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Comando para desarrolladores: descarta la sesión de grupo actual saliente y crea nuevas sesiones de Olm",
     "Send your first message to invite <displayName/> to chat": "Envía tu primer mensaje para invitar a <displayName/> a la conversación",
@@ -3236,8 +3402,10 @@
     "Spell check": "Corrector ortográfico",
     "Complete these to get the most out of %(brand)s": "Complétalos para sacar el máximo partido a %(brand)s",
     "You did it!": "¡Ya está!",
-    "Only %(count)s steps to go|one": "Solo queda %(count)s paso",
-    "Only %(count)s steps to go|other": "Quedan solo %(count)s pasos",
+    "Only %(count)s steps to go": {
+        "one": "Solo queda %(count)s paso",
+        "other": "Quedan solo %(count)s pasos"
+    },
     "Welcome to %(brand)s": "Te damos la bienvenida a %(brand)s",
     "Secure messaging for friends and family": "Mensajería segura para amigos y familia",
     "Enable notifications": "Activar notificaciones",
@@ -3285,8 +3453,10 @@
     "Make sure people know it’s really you": "Asegúrate de que la gente sepa que eres tú de verdad",
     "Find and invite your community members": "Encuentra e invita a las personas de tu comunidad",
     "Get stuff done by finding your teammates": "Empieza a trabajar añadiendo a tus compañeros",
-    "Inviting %(user)s and %(count)s others|one": "Invitando a %(user)s y 1 más",
-    "Inviting %(user)s and %(count)s others|other": "Invitando a %(user)s y %(count)s más",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Invitando a %(user)s y 1 más",
+        "other": "Invitando a %(user)s y %(count)s más"
+    },
     "Inviting %(user1)s and %(user2)s": "Invitando a %(user1)s y %(user2)s",
     "We're creating a room with %(names)s": "Estamos creando una sala con %(names)s",
     "Show": "Mostrar",
@@ -3294,8 +3464,10 @@
     "Don’t miss a thing by taking %(brand)s with you": "No te pierdas nada llevándote %(brand)s contigo",
     "It’s what you’re here for, so lets get to it": "Es para lo que estás aquí, así que vamos a ello",
     "Empty room (was %(oldName)s)": "Sala vacía (antes era %(oldName)s)",
-    "%(user)s and %(count)s others|one": "%(user)s y 1 más",
-    "%(user)s and %(count)s others|other": "%(user)s y %(count)s más",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s y 1 más",
+        "other": "%(user)s y %(count)s más"
+    },
     "%(user1)s and %(user2)s": "%(user1)s y %(user2)s",
     "Spotlight": "Spotlight",
     "Your server lacks native support, you must specify a proxy": "Tu servidor no es compatible, debes configurar un intermediario (proxy)",
@@ -3386,8 +3558,10 @@
     "Sign in with QR code": "Iniciar sesión con código QR",
     "Automatically adjust the microphone volume": "Ajustar el volumen del micrófono automáticamente",
     "Voice settings": "Ajustes de voz",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "¿Seguro que quieres cerrar %(count)s sesión?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "¿Seguro que quieres cerrar %(count)s sesiones?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "¿Seguro que quieres cerrar %(count)s sesión?",
+        "other": "¿Seguro que quieres cerrar %(count)s sesiones?"
+    },
     "Only applies if your homeserver does not offer one. Your IP address would be shared during a call.": "Solo se activará si tu servidor base no ofrece uno. Tu dirección IP se compartirá durante la llamada.",
     "Automatic gain control": "Control automático de volumen",
     "Allow Peer-to-Peer for 1:1 calls": "Permitir llamadas directas 1-a-1 (peer-to-peer)",
@@ -3438,10 +3612,14 @@
     "This message could not be decrypted": "No se ha podido descifrar este mensaje",
     " in <strong>%(room)s</strong>": " en <strong>%(room)s</strong>",
     "Improve your account security by following these recommendations.": "Mejora la seguridad de tu cuenta siguiendo estas recomendaciones.",
-    "Sign out of %(count)s sessions|one": "Cerrar %(count)s sesión",
-    "Sign out of %(count)s sessions|other": "Cerrar %(count)s sesiones",
-    "%(count)s sessions selected|one": "%(count)s sesión seleccionada",
-    "%(count)s sessions selected|other": "%(count)s sesiones seleccionadas",
+    "Sign out of %(count)s sessions": {
+        "one": "Cerrar %(count)s sesión",
+        "other": "Cerrar %(count)s sesiones"
+    },
+    "%(count)s sessions selected": {
+        "one": "%(count)s sesión seleccionada",
+        "other": "%(count)s sesiones seleccionadas"
+    },
     "Show details": "Mostrar detalles",
     "Hide details": "Ocultar detalles",
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Cerrar el resto de sesiones (%(otherSessionsCount)s)",
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 53be63677b..375eb12dc7 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -94,8 +94,10 @@
     "Members only (since the point in time of selecting this option)": "Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)",
     "Members only (since they were invited)": "Ainult liikmetele (alates nende kutsumise ajast)",
     "Members only (since they joined)": "Ainult liikmetele (alates liitumisest)",
-    "Remove %(count)s messages|other": "Eemalda %(count)s sõnumit",
-    "Remove %(count)s messages|one": "Eemalda 1 sõnum",
+    "Remove %(count)s messages": {
+        "other": "Eemalda %(count)s sõnumit",
+        "one": "Eemalda 1 sõnum"
+    },
     "Remove recent messages": "Eemalda hiljutised sõnumid",
     "Filter room members": "Filtreeri jututoa liikmeid",
     "Sign out and remove encryption keys?": "Logi välja ja eemalda krüptimisvõtmed?",
@@ -103,7 +105,10 @@
     "Upload files": "Laadi failid üles",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Need failid on üleslaadimiseks <b>liiga suured</b>. Failisuuruse piir on %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Mõned failid on üleslaadimiseks <b>liiga suured</b>. Failisuuruse piir on %(limit)s.",
-    "Upload %(count)s other files|other": "Laadi üles %(count)s muud faili",
+    "Upload %(count)s other files": {
+        "other": "Laadi üles %(count)s muud faili",
+        "one": "Laadi üles %(count)s muu fail"
+    },
     "Resend": "Saada uuesti",
     "Resend %(unsentCount)s reaction(s)": "Saada uuesti %(unsentCount)s reaktsioon(i)",
     "Source URL": "Lähteaadress",
@@ -145,7 +150,10 @@
     "Admin Tools": "Haldustoimingud",
     "Online": "Võrgus",
     "Reject & Ignore user": "Hülga ja eira kasutaja",
-    "%(count)s unread messages including mentions.|one": "1 lugemata mainimine.",
+    "%(count)s unread messages including mentions.": {
+        "one": "1 lugemata mainimine.",
+        "other": "%(count)s lugemata sõnumit kaasa arvatud mainimised."
+    },
     "Filter results": "Filtreeri tulemusi",
     "Report Content to Your Homeserver Administrator": "Teata sisust Sinu koduserveri haldurile",
     "Send report": "Saada veateade",
@@ -248,8 +256,10 @@
     "Replying": "Vastan",
     "Room %(name)s": "Jututuba %(name)s",
     "Unnamed room": "Nimeta jututuba",
-    "(~%(count)s results)|other": "(~%(count)s tulemust)",
-    "(~%(count)s results)|one": "(~%(count)s tulemus)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s tulemust)",
+        "one": "(~%(count)s tulemus)"
+    },
     "Join Room": "Liitu jututoaga",
     "Forget room": "Unusta jututuba",
     "Search": "Otsing",
@@ -338,10 +348,14 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s saatis pildi.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s muutis selle jututoa põhiaadressiks %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s eemaldas põhiaadressi sellest jututoast.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s eemaldas täiendavad aadressid %(addresses)s sellelt jututoalt.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s eemaldas täiendava aadressi %(addresses)s sellelt jututoalt.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s.",
+        "one": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s eemaldas täiendavad aadressid %(addresses)s sellelt jututoalt.",
+        "one": "%(senderName)s eemaldas täiendava aadressi %(addresses)s sellelt jututoalt."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s muutis selle jututoa täiendavat aadressi.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutis selle jututoa põhiaadressi ja täiendavat aadressi.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s muutis selle jututoa aadresse.",
@@ -641,9 +655,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid sul ei ole õigusi selle sõnumi nägemiseks.",
     "Failed to load timeline position": "Asukoha laadimine ajajoonel ei õnnestunud",
     "Guest": "Külaline",
-    "Uploading %(filename)s and %(count)s others|other": "Laadin üles %(filename)s ning %(count)s muud faili",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Laadin üles %(filename)s ning %(count)s muud faili",
+        "one": "Laadin üles %(filename)s ning veel %(count)s faili"
+    },
     "Uploading %(filename)s": "Laadin üles %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Laadin üles %(filename)s ning veel %(count)s faili",
     "The email address linked to your account must be entered.": "Sa pead sisestama oma kontoga seotud e-posti aadressi.",
     "A new password must be entered.": "Palun sisesta uus salasõna.",
     "New passwords must match each other.": "Uued salasõnad peavad omavahel klappima.",
@@ -731,9 +747,10 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "Jututoal %(roomName)s puudub eelvaate võimalus. Kas sa soovid sellega liituda?",
     "%(roomName)s does not exist.": "Jututuba %(roomName)s ei ole olemas.",
     "%(roomName)s is not accessible at this time.": "Jututuba %(roomName)s ei ole parasjagu kättesaadav.",
-    "%(count)s unread messages including mentions.|other": "%(count)s lugemata sõnumit kaasa arvatud mainimised.",
-    "%(count)s unread messages.|other": "%(count)s lugemata teadet.",
-    "%(count)s unread messages.|one": "1 lugemata teade.",
+    "%(count)s unread messages.": {
+        "other": "%(count)s lugemata teadet.",
+        "one": "1 lugemata teade."
+    },
     "Unread messages.": "Lugemata sõnumid.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Selle jututoa versiooni uuendamine sulgeb tema praeguse instantsi ja loob sama nimega uuendatud jututoa.",
     "This room has already been upgraded.": "See jututuba on juba uuendatud.",
@@ -798,7 +815,10 @@
     "Verify session": "Verifitseeri sessioon",
     "Skip": "Jäta vahele",
     "Token incorrect": "Vigane tunnusluba",
-    "%(oneUser)schanged their name %(count)s times|one": "Kasutaja %(oneUser)s muutis oma nime",
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "Kasutaja %(oneUser)s muutis oma nime",
+        "other": "Kasutaja %(oneUser)s muutis oma nime %(count)s korda"
+    },
     "Are you sure you want to deactivate your account? This is irreversible.": "Kas sa oled kindel, et soovid oma konto sulgeda? Seda tegevust ei saa hiljem tagasi pöörata.",
     "Confirm account deactivation": "Kinnita konto sulgemine",
     "There was a problem communicating with the server. Please try again.": "Serveriühenduses tekkis viga. Palun proovi uuesti.",
@@ -816,7 +836,6 @@
     "Manually export keys": "Ekspordi võtmed käsitsi",
     "You'll lose access to your encrypted messages": "Sa kaotad ligipääsu oma krüptitud sõnumitele",
     "Are you sure you want to sign out?": "Kas sa oled kindel, et soovid välja logida?",
-    "Upload %(count)s other files|one": "Laadi üles %(count)s muu fail",
     "Cancel All": "Tühista kõik",
     "Upload Error": "Üleslaadimise viga",
     "Verification Request": "Verifitseerimispäring",
@@ -857,8 +876,10 @@
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Sinu sõnumit ei saadetud, kuna see koduserver on ületanud on ületanud ressursipiirangu. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
     "Connectivity to the server has been lost.": "Ühendus sinu serveriga on katkenud.",
     "Sent messages will be stored until your connection has returned.": "Saadetud sõnumid salvestatakse seniks, kuni võrguühendus on taastunud.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitust.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitus.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitust.",
+        "one": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitus."
+    },
     "Your password has been reset.": "Sinu salasõna on muudetud.",
     "Dismiss read marker and jump to bottom": "Ära arvesta loetud sõnumite järjehoidjat ning mine kõige lõppu",
     "Jump to oldest unread message": "Mine vanima lugemata sõnumi juurde",
@@ -879,13 +900,18 @@
     "Notification sound": "Teavitusheli",
     "Reset": "Taasta algolek",
     "Set a new custom sound": "Seadista uus kohandatud heli",
-    "were invited %(count)s times|other": "said kutse %(count)s korda",
-    "were invited %(count)s times|one": "said kutse",
-    "was invited %(count)s times|other": "sai kutse %(count)s korda",
-    "was invited %(count)s times|one": "sai kutse",
-    "%(severalUsers)schanged their name %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma nime %(count)s korda",
-    "%(severalUsers)schanged their name %(count)s times|one": "Mitu kasutajat %(severalUsers)s muutsid oma nime",
-    "%(oneUser)schanged their name %(count)s times|other": "Kasutaja %(oneUser)s muutis oma nime %(count)s korda",
+    "were invited %(count)s times": {
+        "other": "said kutse %(count)s korda",
+        "one": "said kutse"
+    },
+    "was invited %(count)s times": {
+        "other": "sai kutse %(count)s korda",
+        "one": "sai kutse"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "Mitu kasutajat %(severalUsers)s muutsid oma nime %(count)s korda",
+        "one": "Mitu kasutajat %(severalUsers)s muutsid oma nime"
+    },
     "You cannot place a call with yourself.": "Sa ei saa iseendale helistada.",
     "You do not have permission to start a conference call in this room": "Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Palu oma koduserveri haldajat (<code>%(homeserverDomain)s</code>), et ta seadistaks kõnede kindlamaks toimimiseks TURN serveri.",
@@ -925,8 +951,10 @@
     "Not Trusted": "Ei ole usaldusväärne",
     "Done": "Valmis",
     "%(displayName)s is typing …": "%(displayName)s kirjutab midagi…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s ja %(count)s muud kasutajat kirjutavad midagi…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ja üks teine kasutaja kirjutavad midagi…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s ja %(count)s muud kasutajat kirjutavad midagi…",
+        "one": "%(names)s ja üks teine kasutaja kirjutavad midagi…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ja %(lastPerson)s kirjutavad midagi…",
     "Cannot reach homeserver": "Koduserver ei ole hetkel leitav",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Palun kontrolli, kas sul on toimiv internetiühendus ning kui on, siis küsi abi koduserveri haldajalt",
@@ -951,8 +979,10 @@
     "Unexpected error resolving homeserver configuration": "Koduserveri seadistustest selguse saamisel tekkis ootamatu viga",
     "Unexpected error resolving identity server configuration": "Isikutuvastusserveri seadistustest selguse saamisel tekkis ootamatu viga",
     "This homeserver has exceeded one of its resource limits.": "See koduserver ületanud ühe oma ressursipiirangutest.",
-    "%(items)s and %(count)s others|other": "%(items)s ja %(count)s muud",
-    "%(items)s and %(count)s others|one": "%(items)s ja üks muu",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s ja %(count)s muud",
+        "one": "%(items)s ja üks muu"
+    },
     "%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
     "a few seconds ago": "mõni sekund tagasi",
     "%(num)s minutes ago": "%(num)s minutit tagasi",
@@ -1009,8 +1039,10 @@
     "Code block": "Koodiplokk",
     "Message preview": "Sõnumi eelvaade",
     "List options": "Loendi valikud",
-    "Show %(count)s more|other": "Näita veel %(count)s sõnumit",
-    "Show %(count)s more|one": "Näita veel %(count)s sõnumit",
+    "Show %(count)s more": {
+        "other": "Näita veel %(count)s sõnumit",
+        "one": "Näita veel %(count)s sõnumit"
+    },
     "Upgrade this room to version %(version)s": "Uuenda jututuba versioonini %(version)s",
     "Upgrade Room Version": "Uuenda jututoa versioon",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Selle jututoa uuendamine eeldab tema praeguse ilmingu tegevuse lõpetamist ja uue jututoa loomist selle asemele. Selleks, et kõik kulgeks jututoas osalejate jaoks ladusalt, toimime nüüd nii:",
@@ -1157,22 +1189,38 @@
     "More options": "Täiendavad seadistused",
     "Language Dropdown": "Keelevalik",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s liitusid %(count)s korda",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s liitusid",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s liitus %(count)s korda",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s liitus",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s lahkusid %(count)s korda",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s lahkusid",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s lahkus %(count)s korda",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s lahkus",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s liitusid ja lahkusid %(count)s korda",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s liitusid ja lahkusid",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s liitus ja lahkus %(count)s korda",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s liitus ja lahkus",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s lahkusid ja liitusid uuesti %(count)s korda",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s lahkusid ja liitusid uuesti",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s lahkus ja liitus uuesti %(count)s korda",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s lahkus ja liitus uuesti",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s liitusid %(count)s korda",
+        "one": "%(severalUsers)s liitusid"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s liitus %(count)s korda",
+        "one": "%(oneUser)s liitus"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s lahkusid %(count)s korda",
+        "one": "%(severalUsers)s lahkusid"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s lahkus %(count)s korda",
+        "one": "%(oneUser)s lahkus"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s liitusid ja lahkusid %(count)s korda",
+        "one": "%(severalUsers)s liitusid ja lahkusid"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s liitus ja lahkus %(count)s korda",
+        "one": "%(oneUser)s liitus ja lahkus"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s lahkusid ja liitusid uuesti %(count)s korda",
+        "one": "%(severalUsers)s lahkusid ja liitusid uuesti"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s lahkus ja liitus uuesti %(count)s korda",
+        "one": "%(oneUser)s lahkus ja liitus uuesti"
+    },
     "Bans user with given id": "Keela ligipääs antud tunnusega kasutajale",
     "Unbans user with given ID": "Taasta ligipääs antud tunnusega kasutajale",
     "Ignores a user, hiding their messages from you": "Eirab kasutajat peites kõik tema sõnumid sinu eest",
@@ -1280,8 +1328,10 @@
     "Discovery options will appear once you have added a phone number above.": "Otsinguvõimaluste loend kuvatakse, kui oled ülale sisestanud telefoninumbri.",
     "Mod": "Moderaator",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "Selle krüptitud sõnumi autentsus pole selles seadmes tagatud.",
-    "and %(count)s others...|other": "ja %(count)s muud...",
-    "and %(count)s others...|one": "ja üks muu...",
+    "and %(count)s others...": {
+        "other": "ja %(count)s muud...",
+        "one": "ja üks muu..."
+    },
     "Invited": "Kutsutud",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (õigused %(powerLevelNumber)s)",
     "No recently visited rooms": "Hiljuti külastatud jututubasid ei leidu",
@@ -1316,26 +1366,46 @@
     "Add an Integration": "Lisa lõiming",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Sind juhatatakse kolmanda osapoole veebisaiti, kus sa saad autentida oma kontoga %(integrationsUrl)s kasutamiseks. Kas sa soovid jätkata?",
     "Categories": "Kategooriad",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s lükkasid tagasi oma kutse %(count)s korda",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s lükkasid tagasi oma kutse",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s lükkas tagasi oma kutse %(count)s korda",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s lükkas taagasi oma kutse",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s kutse võeti tagasi %(count)s korda",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "Kasutajate %(severalUsers)s kutse võeti tagasi",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s kutse võeti tagasi %(count)s korda",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "Kasutaja %(oneUser)s kutse võeti tagasi",
-    "were banned %(count)s times|other": "said ligipääsukeelu %(count)s korda",
-    "were banned %(count)s times|one": "said ligipääsukeelu",
-    "was banned %(count)s times|other": "sai ligipääsukeelu %(count)s korda",
-    "was banned %(count)s times|one": "sai ligipääsukeelu",
-    "were unbanned %(count)s times|other": "taastati ligipääs %(count)s korda",
-    "were unbanned %(count)s times|one": "taastati ligipääs",
-    "was unbanned %(count)s times|other": "taastati ligipääs %(count)s korda",
-    "was unbanned %(count)s times|one": "taastati ligipääs",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s ei teinud muudatusi %(count)s korda",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s ei teinud muudatusi",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s ei teinud muutusi %(count)s korda",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s ei teinud muudatusi",
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s lükkasid tagasi oma kutse %(count)s korda",
+        "one": "%(severalUsers)s lükkasid tagasi oma kutse"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s lükkas tagasi oma kutse %(count)s korda",
+        "one": "%(oneUser)s lükkas taagasi oma kutse"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s kutse võeti tagasi %(count)s korda",
+        "one": "Kasutajate %(severalUsers)s kutse võeti tagasi"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s kutse võeti tagasi %(count)s korda",
+        "one": "Kasutaja %(oneUser)s kutse võeti tagasi"
+    },
+    "were banned %(count)s times": {
+        "other": "said ligipääsukeelu %(count)s korda",
+        "one": "said ligipääsukeelu"
+    },
+    "was banned %(count)s times": {
+        "other": "sai ligipääsukeelu %(count)s korda",
+        "one": "sai ligipääsukeelu"
+    },
+    "were unbanned %(count)s times": {
+        "other": "taastati ligipääs %(count)s korda",
+        "one": "taastati ligipääs"
+    },
+    "was unbanned %(count)s times": {
+        "other": "taastati ligipääs %(count)s korda",
+        "one": "taastati ligipääs"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s ei teinud muudatusi %(count)s korda",
+        "one": "%(severalUsers)s ei teinud muudatusi"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s ei teinud muutusi %(count)s korda",
+        "one": "%(oneUser)s ei teinud muudatusi"
+    },
     "Power level": "Õiguste tase",
     "Custom level": "Kohandatud õigused",
     "QR Code": "QR kood",
@@ -1345,7 +1415,9 @@
     "This address is available to use": "See aadress on kasutatav",
     "This address is already in use": "See aadress on juba kasutusel",
     "Sign in with single sign-on": "Logi sisse ühekordse sisselogimise abil",
-    "And %(count)s more...|other": "Ja %(count)s muud...",
+    "And %(count)s more...": {
+        "other": "Ja %(count)s muud..."
+    },
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Kui sul leidub lisateavet, mis võis selle vea analüüsimisel abiks olla, siis palun lisa need ka siia - näiteks mida sa vea tekkimise hetkel tegid, jututoa tunnus, kasutajate tunnused, jne.",
     "Send logs": "Saada logikirjed",
     "Unable to load commit detail: %(msg)s": "Ei õnnestu laadida sõnumi lisateavet: %(msg)s",
@@ -1498,11 +1570,15 @@
     "Your homeserver": "Sinu koduserver",
     "Trusted": "Usaldusväärne",
     "Not trusted": "Ei ole usaldusväärne",
-    "%(count)s verified sessions|other": "%(count)s verifitseeritud sessiooni",
-    "%(count)s verified sessions|one": "1 verifitseeritud sessioon",
+    "%(count)s verified sessions": {
+        "other": "%(count)s verifitseeritud sessiooni",
+        "one": "1 verifitseeritud sessioon"
+    },
     "Hide verified sessions": "Peida verifitseeritud sessioonid",
-    "%(count)s sessions|other": "%(count)s sessiooni",
-    "%(count)s sessions|one": "%(count)s sessioon",
+    "%(count)s sessions": {
+        "other": "%(count)s sessiooni",
+        "one": "%(count)s sessioon"
+    },
     "Hide sessions": "Peida sessioonid",
     "Verify by scanning": "Verifitseeri skaneerides",
     "Ask %(displayName)s to scan your code:": "Palu, et %(displayName)s skaneeriks sinu koodi:",
@@ -1650,7 +1726,9 @@
     "Move right": "Liigu paremale",
     "Move left": "Liigu vasakule",
     "Revoke permissions": "Tühista õigused",
-    "You can only pin up to %(count)s widgets|other": "Sa saad kinnitada kuni %(count)s vidinat",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Sa saad kinnitada kuni %(count)s vidinat"
+    },
     "Show Widgets": "Näita vidinaid",
     "Hide Widgets": "Peida vidinad",
     "The call was answered on another device.": "Kõnele vastati teises seadmes.",
@@ -1938,8 +2016,10 @@
     "Takes the call in the current room off hold": "Võtab selles jututoas ootel oleva kõne",
     "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele",
     "Go to Home View": "Avalehele",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(rooms)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(rooms)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(rooms)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
+        "other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(rooms)s jututoa andmete salvestamiseks kulub hetkel %(size)s."
+    },
     "This widget would like to:": "See vidin sooviks:",
     "Approve widget permissions": "Anna vidinale õigused",
     "Use Ctrl + Enter to send a message": "Sõnumi saatmiseks vajuta Ctrl + Enter",
@@ -2169,8 +2249,10 @@
     "Create a space": "Loo kogukonnakeskus",
     "Delete": "Kustuta",
     "Jump to the bottom of the timeline when you send a message": "Sõnumi saatmiseks hüppa ajajoone lõppu",
-    "%(count)s members|other": "%(count)s liiget",
-    "%(count)s members|one": "%(count)s liige",
+    "%(count)s members": {
+        "other": "%(count)s liiget",
+        "one": "%(count)s liige"
+    },
     "Add some details to help people recognise it.": "Tegemaks teiste jaoks äratundmise lihtsamaks, palun lisa natuke teavet.",
     "You can change these anytime.": "Sa võid neid alati muuta.",
     "Invite with email or username": "Kutsu e-posti aadressi või kasutajanime alusel",
@@ -2178,8 +2260,10 @@
     "Invite to %(roomName)s": "Kutsu jututuppa %(roomName)s",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "See tavaliselt mõjutab vaid viisi, kuidas server jututuba teenindab. Kui sul tekib %(brand)s kasutamisel vigu, siis palun anna sellest meile teada.",
     "You don't have permission": "Sul puuduvad selleks õigused",
-    "%(count)s rooms|other": "%(count)s jututuba",
-    "%(count)s rooms|one": "%(count)s jututuba",
+    "%(count)s rooms": {
+        "other": "%(count)s jututuba",
+        "one": "%(count)s jututuba"
+    },
     "This room is suggested as a good one to join": "Teised kasutajad soovitavad liitumist selle jututoaga",
     "Suggested": "Soovitatud",
     "Your server does not support showing space hierarchies.": "Sinu koduserver ei võimalda kuvada kogukonnakeskuste hierarhiat.",
@@ -2220,7 +2304,10 @@
     "%(deviceId)s from %(ip)s": "%(deviceId)s ip-aadressil %(ip)s",
     "Review to ensure your account is safe": "Tagamaks, et su konto on sinu kontrolli all, vaata andmed üle",
     "Add existing rooms": "Lisa olemasolevaid jututubasid",
-    "%(count)s people you know have already joined|other": "%(count)s sulle tuttavat kasutajat on juba liitunud",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s sulle tuttavat kasutajat on juba liitunud",
+        "one": "%(count)s sulle tuttav kasutaja on juba liitunud"
+    },
     "We couldn't create your DM.": "Otsesuhtluse loomine ei õnnestunud.",
     "Invited people will be able to read old messages.": "Kutse saanud kasutajad saavad lugeda vanu sõnumeid.",
     "Consult first": "Pea esmalt nõu",
@@ -2229,7 +2316,6 @@
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Suhtlen teise osapoolega %(transferTarget)s. <a>Saadan andmeid kasutajale %(transferee)s</a>",
     "Avatar": "Tunnuspilt",
     "Verification requested": "Verifitseerimistaotlus on saadetud",
-    "%(count)s people you know have already joined|one": "%(count)s sulle tuttav kasutaja on juba liitunud",
     "You most likely do not want to reset your event index store": "Pigem sa siiski ei taha lähtestada sündmuste andmekogu ja selle indeksit",
     "You can add more later too, including already existing ones.": "Sa võid ka hiljem siia luua uusi jututubasid või lisada olemasolevaid.",
     "What are some things you want to discuss in %(spaceName)s?": "Mida sa sooviksid arutada %(spaceName)s kogukonnakeskuses?",
@@ -2252,8 +2338,10 @@
     "Delete all": "Kustuta kõik",
     "Some of your messages have not been sent": "Mõned sinu sõnumid on saatmata",
     "Including %(commaSeparatedMembers)s": "Sealhulgas %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Vaata üht liiget",
-    "View all %(count)s members|other": "Vaata kõiki %(count)s liiget",
+    "View all %(count)s members": {
+        "one": "Vaata üht liiget",
+        "other": "Vaata kõiki %(count)s liiget"
+    },
     "Failed to send": "Saatmine ei õnnestunud",
     "Enter your Security Phrase a second time to confirm it.": "Kinnitamiseks palun sisesta turvafraas teist korda.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Lisamiseks vali vestlusi ja jututubasid. Hetkel on see kogukonnakeskus vaid sinu jaoks ja esialgu keegi ei saa sellest teada. Teisi saad liituma kutsuda hiljem.",
@@ -2266,8 +2354,10 @@
     "Leave the beta": "Lõpeta beetaversiooni kasutamine",
     "Beta": "Beetaversioon",
     "Want to add a new room instead?": "Kas sa selle asemel soovid lisada jututuba?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Lisan jututuba...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Lisan jututubasid... (%(progress)s/%(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Lisan jututuba...",
+        "other": "Lisan jututubasid... (%(progress)s/%(count)s)"
+    },
     "Not all selected were added": "Kõiki valituid me ei lisanud",
     "You are not allowed to view this server's rooms list": "Sul puuduvad õigused selle serveri jututubade loendi vaatamiseks",
     "Error processing voice message": "Viga häälsõnumi töötlemisel",
@@ -2290,8 +2380,10 @@
     "Go to my space": "Palun vaata minu kogukonnakeskust",
     "User Busy": "Kasutaja on hõivatud",
     "The user you called is busy.": "Kasutaja, kellele sa helistasid, on hõivatud.",
-    "Currently joining %(count)s rooms|other": "Parasjagu liitun %(count)s jututoaga",
-    "Currently joining %(count)s rooms|one": "Parasjagu liitun %(count)s jututoaga",
+    "Currently joining %(count)s rooms": {
+        "other": "Parasjagu liitun %(count)s jututoaga",
+        "one": "Parasjagu liitun %(count)s jututoaga"
+    },
     "Or send invite link": "Või saada kutse link",
     "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Kui sul on vastavad õigused olemas, siis ava sõnumi juuresolev menüü ning püsisõnumi tekitamiseks vali <b>Klammerda</b>.",
     "Pinned messages": "Klammerdatud sõnumid",
@@ -2348,10 +2440,14 @@
     "Decide who can view and join %(spaceName)s.": "Otsusta kes saada näha ja liituda %(spaceName)s kogukonnaga.",
     "Show all rooms in Home": "Näita kõiki jututubasid avalehel",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Selleks et teised kasutajad saaks seda kogukonda leida oma koduserveri kaudu (%(localDomain)s) seadista talle aadressid",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s kasutaja muutis serveri pääsuloendit",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s kasutaja muutis serveri pääsuloendit %(count)s korda",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s kasutajat muutsid serveri pääsuloendit %(count)s korda",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s kasutajat muutsid serveri pääsuloendit",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s kasutaja muutis serveri pääsuloendit",
+        "other": "%(oneUser)s kasutaja muutis serveri pääsuloendit %(count)s korda"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "other": "%(severalUsers)s kasutajat muutsid serveri pääsuloendit %(count)s korda",
+        "one": "%(severalUsers)s kasutajat muutsid serveri pääsuloendit"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Sõnumite otsingu ettevalmistamine ei õnnestunud, lisateavet leiad <a>rakenduse seadistustest</a>",
     "Report": "Teata sisust",
     "Collapse reply thread": "Ahenda vastuste jutulõnga",
@@ -2374,8 +2470,10 @@
     "Unnamed audio": "Nimetu helifail",
     "Code blocks": "Lähtekoodi lõigud",
     "Images, GIFs and videos": "Pildid, gif'id ja videod",
-    "Show %(count)s other previews|other": "Näita %(count)s muud eelvaadet",
-    "Show %(count)s other previews|one": "Näita veel %(count)s eelvaadet",
+    "Show %(count)s other previews": {
+        "other": "Näita %(count)s muud eelvaadet",
+        "one": "Näita veel %(count)s eelvaadet"
+    },
     "Error processing audio message": "Viga häälsõnumi töötlemisel",
     "Integration manager": "Lõiminguhaldur",
     "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Sinu %(brand)s ei võimalda selle tegevuse jaoks kasutada lõiminguhaldurit. Palun küsi lisateavet serveri haldajalt.",
@@ -2487,7 +2585,10 @@
     "Results": "Tulemused",
     "Error downloading audio": "Helifaili allalaadimine ei õnnestunud",
     "These are likely ones other room admins are a part of.": "Ilmselt on tegemist nendega, mille liikmed on teiste jututubade haldajad.",
-    "& %(count)s more|other": "ja veel %(count)s",
+    "& %(count)s more": {
+        "other": "ja veel %(count)s",
+        "one": "ja veel %(count)s"
+    },
     "Add existing space": "Lisa olemasolev kogukonnakeskus",
     "Image": "Pilt",
     "Sticker": "Kleeps",
@@ -2496,7 +2597,10 @@
     "Connection failed": "Ühendus ebaõnnestus",
     "Could not connect media": "Meediaseadme ühendamine ei õnnestunud",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Kõik kogukonnakeskuse liikmed saavad jututuba leida ja sellega liituda. <a>Muuda lubatud kogukonnakeskuste loendit.</a>",
-    "Currently, %(count)s spaces have access|other": "Hetkel on ligipääs %(count)s'l kogukonnakeskusel",
+    "Currently, %(count)s spaces have access": {
+        "other": "Hetkel on ligipääs %(count)s'l kogukonnakeskusel",
+        "one": "Hetkel sellel kogukonnal on ligipääs"
+    },
     "Upgrade required": "Vajalik on uuendus",
     "Anyone can find and join.": "Kõik saavad jututuba leida ja sellega liituda.",
     "Only invited people can join.": "Liitumine toimub vaid kutse alusel.",
@@ -2514,8 +2618,6 @@
     "Autoplay GIFs": "Esita automaatselt liikuvaid pilte",
     "The above, but in any room you are joined or invited to as well": "Ülaltoodu, aga samuti igas jututoas, millega oled liitunud või kuhu oled kutsutud",
     "The above, but in <Room /> as well": "Ülaltoodu, aga samuti <Room /> jututoas",
-    "Currently, %(count)s spaces have access|one": "Hetkel sellel kogukonnal on ligipääs",
-    "& %(count)s more|one": "ja veel %(count)s",
     "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s eemaldas siin jututoas klammerduse ühelt sõnumilt. Vaata kõiki klammerdatud sõnumeid.",
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s eemaldas siin jututoas klammerduse <a>ühelt sõnumilt</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>.",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s klammerdas siin jututoas <a>ühe sõnumi</a>. Vaata kõiki <b>klammerdatud sõnumeid</b>.",
@@ -2589,10 +2691,14 @@
     "Really reset verification keys?": "Kas tõesti kustutame kõik verifitseerimisvõtmed?",
     "Create poll": "Loo selline küsitlus",
     "Space Autocomplete": "Kogukonnakeskuste dünaamiline otsing",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Uuendan kogukonnakeskust...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Uuendan kogukonnakeskuseid... (%(progress)s / %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Saadan kutset...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Saadan kutseid... (%(progress)s / %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Uuendan kogukonnakeskust...",
+        "other": "Uuendan kogukonnakeskuseid... (%(progress)s / %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Saadan kutset...",
+        "other": "Saadan kutseid... (%(progress)s / %(count)s)"
+    },
     "Loading new room": "Laadin uut jututuba",
     "Upgrading room": "Uuendan jututoa versiooni",
     "Show:": "Näita:",
@@ -2610,8 +2716,10 @@
     "Disinvite from %(roomName)s": "Võta tagasi %(roomName)s jututoa kutse",
     "Threads": "Jutulõngad",
     "Downloading": "Laadin alla",
-    "%(count)s reply|one": "%(count)s vastus",
-    "%(count)s reply|other": "%(count)s vastust",
+    "%(count)s reply": {
+        "one": "%(count)s vastus",
+        "other": "%(count)s vastust"
+    },
     "View in room": "Vaata jututoas",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Jätkamiseks sisesta oma turvafraas või <button>kasuta oma turvavõtit</button>.",
     "What projects are your team working on?": "Missuguste projektidega sinu tiim tegeleb?",
@@ -2644,12 +2752,18 @@
     "Rename": "Muuda nime",
     "Select all": "Vali kõik",
     "Deselect all": "Eemalda kõik valikud",
-    "Sign out devices|other": "Logi seadmed võrgust välja",
-    "Sign out devices|one": "Logi seade võrgust välja",
-    "Click the button below to confirm signing out these devices.|one": "Kinnitamaks selle seadme väljalogimine klõpsi järgnevat nuppu.",
-    "Click the button below to confirm signing out these devices.|other": "Kinnitamaks nende seadmete väljalogimine klõpsi järgnevat nuppu.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Kasutades ühekordse sisselogimisega oma isiku tõestamist kinnita selle seadme väljalogimine.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Kasutades ühekordse sisselogimisega oma isiku tõestamist kinnita nende seadmete väljalogimine.",
+    "Sign out devices": {
+        "other": "Logi seadmed võrgust välja",
+        "one": "Logi seade võrgust välja"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Kinnitamaks selle seadme väljalogimine klõpsi järgnevat nuppu.",
+        "other": "Kinnitamaks nende seadmete väljalogimine klõpsi järgnevat nuppu."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Kasutades ühekordse sisselogimisega oma isiku tõestamist kinnita selle seadme väljalogimine.",
+        "other": "Kasutades ühekordse sisselogimisega oma isiku tõestamist kinnita nende seadmete väljalogimine."
+    },
     "Automatically send debug logs on any error": "Iga vea puhul saada silumislogid automaatselt arendajatele",
     "Use a more compact 'Modern' layout": "Kasuta kompaktsemat moodsat kasutajaliidest",
     "Add option": "Lisa valik",
@@ -2692,12 +2806,18 @@
     "Large": "Suur",
     "Image size in the timeline": "Ajajoone piltide suurus",
     "%(senderName)s has updated the room layout": "%(senderName)s on uuendanud jututoa välimust",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s ja veel %(count)s kogukond",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s ja muud %(count)s kogukonda",
-    "Based on %(count)s votes|one": "Aluseks on %(count)s hääl",
-    "Based on %(count)s votes|other": "Aluseks on %(count)s häält",
-    "%(count)s votes|one": "%(count)s hääl",
-    "%(count)s votes|other": "%(count)s häält",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s ja veel %(count)s kogukond",
+        "other": "%(spaceName)s ja muud %(count)s kogukonda"
+    },
+    "Based on %(count)s votes": {
+        "one": "Aluseks on %(count)s hääl",
+        "other": "Aluseks on %(count)s häält"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s hääl",
+        "other": "%(count)s häält"
+    },
     "Sorry, the poll you tried to create was not posted.": "Vabandust, aga sinu loodud küsitlus jäi üleslaadimata.",
     "Failed to post poll": "Küsitluse üleslaadimine ei õnnestunud",
     "Sorry, your vote was not registered. Please try again.": "Vabandust, aga sinu valik jäi salvestamata. Palun proovi uuesti.",
@@ -2733,8 +2853,10 @@
     "We <Bold>don't</Bold> share information with third parties": "Meie <Bold>ei</Bold> jaga teavet kolmandate osapooltega",
     "We <Bold>don't</Bold> record or profile any account data": "Meie <Bold>ei</Bold> salvesta ega profileeri sinu kasutajakonto andmeid",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "Meie kasutustingimused leiad <PrivacyPolicyUrl>siit</PrivacyPolicyUrl>",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s hääl antud. Tulemuste nägemiseks tee oma valik",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s häält antud. Tulemuste nägemiseks tee oma valik",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s hääl antud. Tulemuste nägemiseks tee oma valik",
+        "other": "%(count)s häält antud. Tulemuste nägemiseks tee oma valik"
+    },
     "No votes cast": "Hääletanuid ei ole",
     "Chat": "Vestle",
     "Share location": "Jaga asukohta",
@@ -2747,8 +2869,10 @@
     "Failed to end poll": "Küsitluse lõpetamine ei õnnestunud",
     "The poll has ended. Top answer: %(topAnswer)s": "Küsitlus on läbi. Populaarseim vastus: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "Küsitlus on läbi. Ühtegi osalejate ei ole.",
-    "Final result based on %(count)s votes|one": "%(count)s'l häälel põhinev lõpptulemus",
-    "Final result based on %(count)s votes|other": "%(count)s'l häälel põhinev lõpptulemus",
+    "Final result based on %(count)s votes": {
+        "one": "%(count)s'l häälel põhinev lõpptulemus",
+        "other": "%(count)s'l häälel põhinev lõpptulemus"
+    },
     "Recent searches": "Hiljutised otsingud",
     "To search messages, look for this icon at the top of a room <icon/>": "Sõnumite otsimiseks klõpsi <icon/> ikooni jututoa ülaosas",
     "Other searches": "Muud otsingud",
@@ -2760,17 +2884,25 @@
     "Including you, %(commaSeparatedMembers)s": "Seahulgas Sina, %(commaSeparatedMembers)s",
     "Copy room link": "Kopeeri jututoa link",
     "Processing event %(number)s out of %(total)s": "Sündmuste töötlemine %(number)s / %(total)s",
-    "Fetched %(count)s events so far|one": "%(count)s sündmust laaditud",
-    "Fetched %(count)s events so far|other": "%(count)s sündmust laaditud",
-    "Fetched %(count)s events out of %(total)s|one": "Laadisin %(count)s / %(total)s sündmust",
-    "Fetched %(count)s events out of %(total)s|other": "Laadisin %(count)s / %(total)s sündmust",
+    "Fetched %(count)s events so far": {
+        "one": "%(count)s sündmust laaditud",
+        "other": "%(count)s sündmust laaditud"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Laadisin %(count)s / %(total)s sündmust",
+        "other": "Laadisin %(count)s / %(total)s sündmust"
+    },
     "Generating a ZIP": "Pakin ZIP faili",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Me ei suutnud sellist kuupäeva mõista (%(inputDate)s). Pigem kasuta aaaa-kk-pp vormingut.",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Eksporditud %(count)s sündmus %(seconds)s sekundiga",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Eksporditud %(count)s sündmust %(seconds)s sekundiga",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Eksporditud %(count)s sündmus %(seconds)s sekundiga",
+        "other": "Eksporditud %(count)s sündmust %(seconds)s sekundiga"
+    },
     "Export successful!": "Eksport õnnestus!",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s sündmus laaditud %(seconds)s sekundiga",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s sündmust laaditud %(seconds)s sekundiga",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "%(count)s sündmus laaditud %(seconds)s sekundiga",
+        "other": "%(count)s sündmust laaditud %(seconds)s sekundiga"
+    },
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Sellega rühmitad selle kogukonna liikmetega peetavaid vestlusi. Kui seadistus pole kasutusel, siis on neid vestlusi %(spaceName)s kogukonna vaates ei kuvata.",
     "Sections to show": "Näidatavad valikud",
     "Failed to load list of rooms.": "Jututubade loendi laadimine ei õnnestunud.",
@@ -2817,10 +2949,14 @@
     "Failed to fetch your location. Please try again later.": "Asukoha tuvastamine ei õnnestunud. Palun proovi hiljem uuesti.",
     "Could not fetch location": "Asukoha tuvastamine ei õnnestunud",
     "Automatically send debug logs on decryption errors": "Dekrüptimisvigade puhul saada silumislogid automaatselt arendajatele",
-    "was removed %(count)s times|one": "eemaldati",
-    "was removed %(count)s times|other": "eemaldati %(count)s korda",
-    "were removed %(count)s times|one": "eemaldati",
-    "were removed %(count)s times|other": "eemaldati %(count)s korda",
+    "was removed %(count)s times": {
+        "one": "eemaldati",
+        "other": "eemaldati %(count)s korda"
+    },
+    "were removed %(count)s times": {
+        "one": "eemaldati",
+        "other": "eemaldati %(count)s korda"
+    },
     "Remove from room": "Eemalda jututoast",
     "Failed to remove user": "Kasutaja eemaldamine ebaõnnestus",
     "Remove them from specific things I'm able to": "Eemalda kasutaja valitud kohtadest, kust ma saan",
@@ -2897,18 +3033,28 @@
     "Feedback sent! Thanks, we appreciate it!": "Tagasiside on saadetud. Täname, sellest on loodetavasti kasu!",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Täname, et liitusid testprogrammiga. Et me saaksime võimalikult asjakohaseid täiendusi teha, palun jaga nii detailset teavet kui võimalik.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s ja %(space2Name)s",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s saatis ühe peidetud sõnumi",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s saatis %(count)s peidetud sõnumit",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s saatsid ühe peidetud sõnumi",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s saatsid %(count)s peidetud sõnumit",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s kustutas sõnumi",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s kustutas %(count)s sõnumit",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s kustutas sõnumi",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s kustutasid %(count)s sõnumit",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)s saatis ühe peidetud sõnumi",
+        "other": "%(oneUser)s saatis %(count)s peidetud sõnumit"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s saatsid ühe peidetud sõnumi",
+        "other": "%(severalUsers)s saatsid %(count)s peidetud sõnumit"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s kustutas sõnumi",
+        "other": "%(oneUser)s kustutas %(count)s sõnumit"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s kustutas sõnumi",
+        "other": "%(severalUsers)s kustutasid %(count)s sõnumit"
+    },
     "Maximise": "Suurenda maksimaalseks",
     "Automatically send debug logs when key backup is not functioning": "Kui krüptovõtmete varundus ei toimi, siis automaatselt saada silumislogid arendajatele",
-    "<%(count)s spaces>|other": "<%(count)s kogukonda>",
-    "<%(count)s spaces>|one": "<kogukond>",
+    "<%(count)s spaces>": {
+        "other": "<%(count)s kogukonda>",
+        "one": "<kogukond>"
+    },
     "Can't edit poll": "Küsimustikku ei saa muuta",
     "Sorry, you can't edit a poll after votes have been cast.": "Vabandust, aga küsimustikku ei saa enam peale hääletamise lõppu muuta.",
     "Edit poll": "Muuda küsitlust",
@@ -2927,10 +3073,14 @@
     "Switch to space by number": "Vaata kogukonnakeskust tema numbri alusel",
     "Accessibility": "Ligipääsetavus",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Vasta jätkuvas jutulõngas või uue jutulõnga loomiseks kasuta „%(replyInThread)s“ valikut, mida kuvatakse hiire liigutamisel sõnumi kohal.",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s muutis selle jututoa <a>klammerdatud sõnumeid</a>",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s muutis jututoa <a>klammerdatud sõnumeid</a> %(count)s korda",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s muutsid selle jututoa <a>klammerdatud sõnumeid</a>",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s muutsid jututoa <a>klammerdatud sõnumeid</a> %(count)s korda",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s muutis selle jututoa <a>klammerdatud sõnumeid</a>",
+        "other": "%(oneUser)s muutis jututoa <a>klammerdatud sõnumeid</a> %(count)s korda"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s muutsid selle jututoa <a>klammerdatud sõnumeid</a>",
+        "other": "%(severalUsers)s muutsid jututoa <a>klammerdatud sõnumeid</a> %(count)s korda"
+    },
     "What location type do you want to share?": "Missugust asukohta sa soovid jagada?",
     "Drop a Pin": "Märgi nööpnõelaga",
     "My live location": "Minu asukoht reaalajas",
@@ -2962,10 +3112,14 @@
     "Toggle Link": "Lülita link sisse/välja",
     "You are sharing your live location": "Sa jagad oma asukohta reaalajas",
     "%(displayName)s's live location": "%(displayName)s asukoht reaalajas",
-    "Currently removing messages in %(count)s rooms|other": "Kustutame sõnumeid %(count)s jututoas",
-    "Currently removing messages in %(count)s rooms|one": "Kustutame sõnumeid %(count)s jututoas",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Sa oled kustutamas %(count)s sõnumit kasutajalt %(user)s. Sellega kustutatakse nad püsivalt ka kõikidelt vestluses osalejatelt. Kas sa soovid jätkata?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Sa oled kustutamas %(count)s sõnumi kasutajalt %(user)s. Sellega kustutatakse ta püsivalt ka kõikidelt vestluses osalejatelt. Kas sa soovid jätkata?",
+    "Currently removing messages in %(count)s rooms": {
+        "other": "Kustutame sõnumeid %(count)s jututoas",
+        "one": "Kustutame sõnumeid %(count)s jututoas"
+    },
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "other": "Sa oled kustutamas %(count)s sõnumit kasutajalt %(user)s. Sellega kustutatakse nad püsivalt ka kõikidelt vestluses osalejatelt. Kas sa soovid jätkata?",
+        "one": "Sa oled kustutamas %(count)s sõnumi kasutajalt %(user)s. Sellega kustutatakse ta püsivalt ka kõikidelt vestluses osalejatelt. Kas sa soovid jätkata?"
+    },
     "Preserve system messages": "Näita süsteemseid teateid",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Kui sa samuti soovid mitte kuvada selle kasutajaga seotud süsteemseid teateid (näiteks liikmelisuse muutused, profiili muutused, jne), siis eemalda see valik",
     "Share for %(duration)s": "Jaga nii kaua - %(duration)s",
@@ -3056,8 +3210,10 @@
     "Create room": "Loo jututuba",
     "Create video room": "Loo videotuba",
     "Create a video room": "Loo uus videotuba",
-    "%(count)s participants|one": "1 osaleja",
-    "%(count)s participants|other": "%(count)s oselejat",
+    "%(count)s participants": {
+        "one": "1 osaleja",
+        "other": "%(count)s oselejat"
+    },
     "New video room": "Uus videotuba",
     "New room": "Uus jututuba",
     "Threads help keep your conversations on-topic and easy to track.": "Jutulõngad aitavad hoida vestlused teemakohastena ning mugavalt loetavatena.",
@@ -3066,8 +3222,10 @@
     "Sends the given message with hearts": "Lisab sellele sõnumile südamed",
     "Live location ended": "Reaalajas asukoha jagamine on lõppenud",
     "View live location": "Vaata asukohta reaalajas",
-    "Confirm signing out these devices|one": "Kinnita selle seadme väljalogimine",
-    "Confirm signing out these devices|other": "Kinnita nende seadmete väljalogimine",
+    "Confirm signing out these devices": {
+        "one": "Kinnita selle seadme väljalogimine",
+        "other": "Kinnita nende seadmete väljalogimine"
+    },
     "Live location enabled": "Reaalajas asukoha jagamine on kasutusel",
     "Live location error": "Viga asukoha jagamisel reaalajas",
     "Live until %(expiryTime)s": "Kuvamine toimib kuni %(expiryTime)s",
@@ -3102,8 +3260,10 @@
     "Hide my messages from new joiners": "Peida minu sõnumid uute liitujate eest",
     "Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?": "Nii nagu e-posti puhul, on sinu vanad sõnumid on jätkuvalt loetavad nendele kasutajate, kes nad saanud on. Kas sa soovid peita oma sõnumid nende kasutaja eest, kes jututubadega hiljem liituvad?",
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Sa oled kõikidest seadmetest välja logitud ning enam ei saa tõuketeavitusi. Nende taaskuvamiseks logi sisse igas oma soovitud seadmetes.",
-    "Seen by %(count)s people|one": "Seda nägi %(count)s lugeja",
-    "Seen by %(count)s people|other": "Seda nägid %(count)s lugejat",
+    "Seen by %(count)s people": {
+        "one": "Seda nägi %(count)s lugeja",
+        "other": "Seda nägid %(count)s lugejat"
+    },
     "Your password was successfully changed.": "Sinu salasõna muutmine õnnestus.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Kui sa soovid ligipääsu varasematele krüptitud vestlustele, palun seadista võtmete varundus või enne jätkamist ekspordi mõnest seadmest krüptovõtmed.",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Kõikide sinu seadmete võrgust välja logimine kustutab ka nendes salvestatud krüptovõtmed ja sellega muutuvad ka krüptitud vestlused loetamatuteks.",
@@ -3134,8 +3294,10 @@
     "Click to read topic": "Teema lugemiseks klõpsi",
     "Edit topic": "Muuda teemat",
     "Joining…": "Liitun…",
-    "%(count)s people joined|other": "%(count)s osalejat liitus",
-    "%(count)s people joined|one": "%(count)s osaleja liitus",
+    "%(count)s people joined": {
+        "other": "%(count)s osalejat liitus",
+        "one": "%(count)s osaleja liitus"
+    },
     "Check if you want to hide all current and future messages from this user.": "Selle valikuga peidad kõik antud kasutaja praegused ja tulevased sõnumid.",
     "Ignore user": "Eira kasutajat",
     "View related event": "Vaata seotud sündmust",
@@ -3169,8 +3331,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Kui sa ei leia otsitavaid, siis saada neile kutse.",
     "Some results may be hidden for privacy": "Mõned tulemused võivad privaatsusseadistuste tõttu olla peidetud",
     "Search for": "Otsingusõna",
-    "%(count)s Members|one": "%(count)s liige",
-    "%(count)s Members|other": "%(count)s liiget",
+    "%(count)s Members": {
+        "one": "%(count)s liige",
+        "other": "%(count)s liiget"
+    },
     "Show: Matrix rooms": "Näita: Matrix'i jututoad",
     "Show: %(instance)s rooms (%(server)s)": "Näita: %(instance)s jututuba %(server)s serveris",
     "Add new server…": "Lisa uus server…",
@@ -3187,9 +3351,11 @@
     "Find my location": "Leia minu asukoht",
     "Exit fullscreen": "Lülita täisekraanivaade välja",
     "Enter fullscreen": "Lülita täisekraanivaade sisse",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Kogukonnas %(spaceName)s ja veel %(count)s's kogukonnas.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Kogukonnas %(spaceName)s ja veel %(count)s's kogukonnas.",
+        "other": "Kogukonnas %(spaceName)s ja %(count)s's muus kogukonnas."
+    },
     "In %(spaceName)s.": "Kogukonnas %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Kogukonnas %(spaceName)s ja %(count)s's muus kogukonnas.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Kogukondades %(space1Name)s ja %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Arendaja toiming: Lõpetab kehtiva väljuva rühmasessiooni ja seadistab uue Olm sessiooni",
     "Stop and close": "Peata ja sulge",
@@ -3218,8 +3384,10 @@
     "Complete these to get the most out of %(brand)s": "Kasutamaks kõiki %(brand)s'i võimalusi tee läbi alljärgnev",
     "You're in": "Kõik on tehtud",
     "You did it!": "Valmis!",
-    "Only %(count)s steps to go|one": "Ainult %(count)s samm veel",
-    "Only %(count)s steps to go|other": "Ainult %(count)s sammu veel",
+    "Only %(count)s steps to go": {
+        "one": "Ainult %(count)s samm veel",
+        "other": "Ainult %(count)s sammu veel"
+    },
     "Enable notifications": "Võta teavitused kasutusele",
     "Don’t miss a reply or important message": "Ära jäta vahele vastuseid ega olulisi sõnumeid",
     "Turn on notifications": "Lülita seadistused välja",
@@ -3285,11 +3453,15 @@
     "For best security, sign out from any session that you don't recognize or use anymore.": "Parima turvalisuse nimel logi välja neist sessioonidest, mida sa enam ei kasuta või ei tunne ära.",
     "Verified sessions": "Verifitseeritud sessioonid",
     "Empty room (was %(oldName)s)": "Tühi jututuba (varasema nimega %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Saadame kutset kasutajale %(user)s ning veel ühele muule kasutajale",
-    "Inviting %(user)s and %(count)s others|other": "Saadame kutset kasutajale %(user)s ja veel %(count)s'le muule kasutajale",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Saadame kutset kasutajale %(user)s ning veel ühele muule kasutajale",
+        "other": "Saadame kutset kasutajale %(user)s ja veel %(count)s'le muule kasutajale"
+    },
     "Inviting %(user1)s and %(user2)s": "Saadame kutset kasutajatele %(user1)s ja %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s ja veel 1 kasutaja",
-    "%(user)s and %(count)s others|other": "%(user)s ja veel %(count)s kasutajat",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s ja veel 1 kasutaja",
+        "other": "%(user)s ja veel %(count)s kasutajat"
+    },
     "%(user1)s and %(user2)s": "%(user1)s ja %(user2)s",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Me ei soovita avalikes jututubades krüptimise kasutamist.</b> Kuna kõik huvilised saavad vabalt leida avalikke jututube ning nendega liituda, siis saavad nad niikuinii ka neis leiduvaid sõnumeid lugeda. Olemuselt puuduvad sellises olukorras krüptimise eelised ning sa ei saa hiljem krüptimist välja lülitada. Avalike jututubade sõnumite krüptimine teeb ka sõnumite saatmise ja vastuvõtmise aeglasemaks.",
     "Toggle attribution": "Lülita omistamine sisse või välja",
@@ -3392,8 +3564,10 @@
     "You are already recording a voice broadcast. Please end your current voice broadcast to start a new one.": "Sa juba salvestad ringhäälingukõnet. Uue alustamiseks palun lõpeta eelmine salvestus.",
     "Can't start a new voice broadcast": "Uue ringhäälingukõne alustamine pole võimalik",
     "play voice broadcast": "esita ringhäälingukõnet",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Kas sa oled kindel et soovid %(count)s sessiooni võrgust välja logida?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Kas sa oled kindel et soovid %(count)s sessiooni võrgust välja logida?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Kas sa oled kindel et soovid %(count)s sessiooni võrgust välja logida?",
+        "other": "Kas sa oled kindel et soovid %(count)s sessiooni võrgust välja logida?"
+    },
     "This provides them with confidence that they are really speaking to you, but it also means they can see the session name you enter here.": "Muu hulgas selle alusel saavad nad olla kindlad, et nad tõesti suhtlevad sinuga, kuid samas nad näevad nimesid, mida sa siia sisestad.",
     "Other users in direct messages and rooms that you join are able to view a full list of your sessions.": "Nii otsesuhtluse osapooled kui jututubades osalejad näevad sinu kõikide sessioonide loendit.",
     "Renaming sessions": "Sessioonide nimede muutmine",
@@ -3489,8 +3663,10 @@
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Kuna sa hetkel salvestad ringhäälingukõnet, siis tavakõne algatamine ei õnnestu. Kõne alustamiseks palun lõpeta ringhäälingukõne.",
     "Can’t start a call": "Kõne algatamine ei õnnestu",
     "Improve your account security by following these recommendations.": "Kui järgid neid soovitusi, siis sa parandad oma kasutajakonto turvalisust.",
-    "%(count)s sessions selected|one": "%(count)s sessioon valitud",
-    "%(count)s sessions selected|other": "%(count)s sessiooni valitud",
+    "%(count)s sessions selected": {
+        "one": "%(count)s sessioon valitud",
+        "other": "%(count)s sessiooni valitud"
+    },
     "Failed to read events": "Päringu või sündmuse lugemine ei õnnestunud",
     "Failed to send event": "Päringu või sündmuse saatmine ei õnnestunud",
     " in <strong>%(room)s</strong>": " <strong>%(room)s</strong> jututoas",
@@ -3501,8 +3677,10 @@
     "Create a link": "Tee link",
     "Force 15s voice broadcast chunk length": "Kasuta ringhäälingusõnumi puhul 15-sekundilist blokipikkust",
     "Link": "Link",
-    "Sign out of %(count)s sessions|one": "Logi %(count)s'st sessioonist välja",
-    "Sign out of %(count)s sessions|other": "Logi %(count)s'st sessioonist välja",
+    "Sign out of %(count)s sessions": {
+        "one": "Logi %(count)s'st sessioonist välja",
+        "other": "Logi %(count)s'st sessioonist välja"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Logi kõikidest ülejäänud sessioonidest välja: %(otherSessionsCount)s sessioon(i)",
     "Yes, end my recording": "Jah, lõpeta salvestamine",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "Kui hakkad kuulama seda ringhäälingukõnet, siis hetkel toimuv ringhäälingukõne salvestamine lõppeb.",
@@ -3608,7 +3786,9 @@
     "Show NSFW content": "Näita töökeskkonnas mittesobilikku sisu",
     "Notification state is <strong>%(notificationState)s</strong>": "Teavituste olek: <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Lugemata sõnumite olek jututoas: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Lugemata sõnumite olek jututoas: <strong>%(status)s</strong>, kokku: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Lugemata sõnumite olek jututoas: <strong>%(status)s</strong>, kokku: <strong>%(count)s</strong>"
+    },
     "Ended a poll": "Lõpetas küsitluse",
     "Identity server is <code>%(identityServerUrl)s</code>": "Isikutuvastusserveri aadress <code>%(identityServerUrl)s</code>",
     "Homeserver is <code>%(homeserverUrl)s</code>": "Koduserveri aadress <code>%(homeserverUrl)s</code>",
@@ -3623,10 +3803,14 @@
     "Active polls": "Käimasolevad küsitlused",
     "View poll in timeline": "Näita küsitlust ajajoonel",
     "View poll": "Vaata küsitlust",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Tänasest ja eilsest pole ühtegi toimunud küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Möödunud %(count)s päeva jooksul polnud ühtegi toimumas olnud küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Tänasest ja eilsest pole ühtegi käimas küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Möödunud %(count)s päeva jooksul polnud ühtegi küsitlust. Varasemate päevade vaatamiseks laadi veel küsitlusi",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Tänasest ja eilsest pole ühtegi toimunud küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi",
+        "other": "Möödunud %(count)s päeva jooksul polnud ühtegi toimumas olnud küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Tänasest ja eilsest pole ühtegi käimas küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi",
+        "other": "Möödunud %(count)s päeva jooksul polnud ühtegi küsitlust. Varasemate päevade vaatamiseks laadi veel küsitlusi"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Pole ühtegi hiljutist küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi",
     "There are no active polls. Load more polls to view polls for previous months": "Pole ühtegi käimas küsitlust. Varasemate kuude vaatamiseks laadi veel küsitlusi",
     "Verify Session": "Verifitseeri sessioon",
@@ -3748,7 +3932,10 @@
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their profile picture.": "Sõnumid siin vestluses on läbivalt krüptitud. Klõpsides tunnuspilti saad verifitseerida kasutaja %(displayName)s.",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Sõnumid siin jututoas on läbivalt krüptitud. Kui uued kasutajad liituvad, siis klõpsides nende tunnuspilti saad neid verifitseerida.",
     "Your profile picture URL": "Sinu tunnuspildi URL",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti %(count)s korda",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti %(count)s korda",
+        "one": "%(severalUsers)s kasutajat muutsid oma profiilipilti"
+    },
     "Anyone can request to join, but admins or moderators need to grant access. You can change this later.": "Kõik võivad liituda, kuid jututoa haldur või moderaator peab eelnevalt ligipääsu kinnitama. Sa saad seda hiljem muuta.",
     "Thread Root ID: %(threadRootId)s": "Jutulõnga esimese kirje tunnus: %(threadRootId)s",
     "Upgrade room": "Uuenda jututoa versiooni",
@@ -3759,7 +3946,10 @@
     "Quick Actions": "Kiirtoimingud",
     "Mark all messages as read": "Märgi kõik sõnumid loetuks",
     "Reset to default settings": "Lähtesta kõik seadistused",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "Kasutaja %(oneUser)s muutis oma tunnuspilti %(count)s korda",
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "Kasutaja %(oneUser)s muutis oma tunnuspilti %(count)s korda",
+        "one": "%(oneUser)s muutis oma profiilipilti"
+    },
     "User read up to (m.read.private): ": "Kasutaja luges kuni sõnumini (m.read.private): ",
     "See history": "Vaata ajalugu",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a unique passphrase below, which will only be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Kes iganes saab kätte selle ekspordifaili, saab ka lugeda sinu krüptitud sõnumeid, seega ole hoolikas selle faili talletamisel. Andmaks lisakihi turvalisust, peaksid sa alljärgnevalt sisestama unikaalse paroolifraasi, millega krüptitakse eksporditavad andmed. Faili hilisem importimine õnnestub vaid sama paroolifraasi sisestamisel.",
@@ -3776,8 +3966,6 @@
     "Cancel request": "Tühista liitumissoov",
     "Your request to join is pending.": "Sinu liitumissoov on ootel.",
     "Request to join sent": "Ligipääsu päring on saadetud",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)s kasutajat muutsid oma profiilipilti",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)s muutis oma profiilipilti",
     "Failed to query public rooms": "Avalike jututubade tuvastamise päring ei õnnestunud",
     "This server is using an older version of Matrix. Upgrade to Matrix %(version)s to use %(brand)s without errors.": "See server kasutab Matrixi vanemat versiooni. Selleks, et %(brand)s'i kasutamisel vigu ei tekiks palun uuenda serverit nii, et kasutusel oleks Matrixi %(version)s.",
     "Your server is unsupported": "Sinu server ei ole toetatud",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1909600fb6..8dc925e446 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -189,8 +189,10 @@
     "Unmute": "Audioa aktibatu",
     "Unnamed Room": "Izen gabeko gela",
     "Uploading %(filename)s": "%(filename)s igotzen",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s eta beste %(count)s igotzen",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s eta beste %(count)s igotzen",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "%(filename)s eta beste %(count)s igotzen",
+        "other": "%(filename)s eta beste %(count)s igotzen"
+    },
     "Upload avatar": "Igo abatarra",
     "Upload Failed": "Igoerak huts egin du",
     "Usage": "Erabilera",
@@ -232,8 +234,10 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "This server does not support authentication with a phone number.": "Zerbitzari honek ez du telefono zenbakia erabiliz autentifikatzea onartzen.",
     "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
-    "(~%(count)s results)|one": "(~%(count)s emaitza)",
-    "(~%(count)s results)|other": "(~%(count)s emaitza)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s emaitza)",
+        "other": "(~%(count)s emaitza)"
+    },
     "New Password": "Pasahitz berria",
     "Start automatically after system login": "Hasi automatikoki sisteman saioa hasi eta gero",
     "Analytics": "Estatistikak",
@@ -270,8 +274,10 @@
     "Do you want to set an email address?": "E-mail helbidea ezarri nahi duzu?",
     "This will allow you to reset your password and receive notifications.": "Honek zure pasahitza berrezarri eta jakinarazpenak jasotzea ahalbidetuko dizu.",
     "Deops user with given id": "Emandako ID-a duen erabiltzailea mailaz jaisten du",
-    "and %(count)s others...|other": "eta beste %(count)s…",
-    "and %(count)s others...|one": "eta beste bat…",
+    "and %(count)s others...": {
+        "other": "eta beste %(count)s…",
+        "one": "eta beste bat…"
+    },
     "Delete widget": "Ezabatu trepeta",
     "Define the power level of a user": "Zehaztu erabiltzaile baten botere maila",
     "Edit": "Editatu",
@@ -333,55 +339,99 @@
     "URL previews are disabled by default for participants in this room.": "URLen aurrebistak desgaituta daude gela honetako partaideentzat.",
     "A text message has been sent to %(msisdn)s": "Testu mezu bat bidali da hona: %(msisdn)s",
     "Jump to read receipt": "Saltatu irakurragirira",
-    "was banned %(count)s times|one": "debekatua izan da",
-    "were invited %(count)s times|other": "%(count)s aldiz gonbidatuak izan dira",
-    "were invited %(count)s times|one": "gonbidatuak izan dira",
-    "was invited %(count)s times|other": "%(count)s aldiz gonbidatua izan da",
-    "was invited %(count)s times|one": "gonbidatua izan da",
-    "were banned %(count)s times|other": "%(count)s aldiz debekatuak izan dira",
-    "were banned %(count)s times|one": "debekatuak izan dira",
-    "was banned %(count)s times|other": "%(count)s aldiz debekatuak izan dira",
-    "were unbanned %(count)s times|other": "%(count)s aldiz kendu zaie debekua",
-    "were unbanned %(count)s times|one": "debekua kendu zaie",
-    "was unbanned %(count)s times|other": "%(count)s aldiz kendu zaio debekua",
-    "was unbanned %(count)s times|one": "debekua kendu zaio",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s erabiltzaileek bere izena aldatu dute %(count)s aldiz",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s erabiltzaileek bere izena aldatu dute",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s erabiltzaileak bere izena aldatu du %(count)s aldiz",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s erabiltzaileak bere izena aldatu du",
+    "was banned %(count)s times": {
+        "one": "debekatua izan da",
+        "other": "%(count)s aldiz debekatuak izan dira"
+    },
+    "were invited %(count)s times": {
+        "other": "%(count)s aldiz gonbidatuak izan dira",
+        "one": "gonbidatuak izan dira"
+    },
+    "was invited %(count)s times": {
+        "other": "%(count)s aldiz gonbidatua izan da",
+        "one": "gonbidatua izan da"
+    },
+    "were banned %(count)s times": {
+        "other": "%(count)s aldiz debekatuak izan dira",
+        "one": "debekatuak izan dira"
+    },
+    "were unbanned %(count)s times": {
+        "other": "%(count)s aldiz kendu zaie debekua",
+        "one": "debekua kendu zaie"
+    },
+    "was unbanned %(count)s times": {
+        "other": "%(count)s aldiz kendu zaio debekua",
+        "one": "debekua kendu zaio"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s erabiltzaileek bere izena aldatu dute %(count)s aldiz",
+        "one": "%(severalUsers)s erabiltzaileek bere izena aldatu dute"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s erabiltzaileak bere izena aldatu du %(count)s aldiz",
+        "one": "%(oneUser)s erabiltzaileak bere izena aldatu du"
+    },
     "collapse": "tolestu",
     "expand": "hedatu",
-    "And %(count)s more...|other": "Eta %(count)s gehiago…",
+    "And %(count)s more...": {
+        "other": "Eta %(count)s gehiago…"
+    },
     "Idle for %(duration)s": "Inaktibo %(duration)s",
     "Delete Widget": "Ezabatu trepeta",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Trepeta ezabatzean gelako kide guztientzat kentzen da. Ziur trepeta ezabatu nahi duzula?",
     "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s aldiz elkartu dira",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s elkartu dira",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s%(count)s aldiz elkartu da",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s elkartu da",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s aldiz atera dira",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s atera dira",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s%(count)s aldiz atera da",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s atera da",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s elkartu eta atera dira %(count)s aldiz",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s elkartu eta atera dira",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s elkartu eta atera da %(count)s aldiz",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s elkartu eta atera da",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s atera eta berriz elkartu dira %(count)s aldiz",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s atera eta berriz elkartu da",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s atera eta berriz elkartu da %(count)s aldiz",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s atera eta berriz elkartu da",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s erabiltzaileek bere gonbidapenak ukatu dituzte %(count)s aldiz",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s erabiltzaileek bere gonbidapenak ukatu dituzte",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s erabiltzaileak bere gonbidapena ukatu du %(count)s aldiz",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s erabiltzaileak bere gonbidapena ukatu du",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s erabiltzaileei gonbidapena indargabetu zaie %(count)s aldiz",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s erabiltzaileei gonbidapena indargabetu zaie",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s erabiltzaileari gonbidapena indargabetu zaio %(count)s aldiz",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s erabiltzaileari gonbidapena indargabetu zaio",
-    "%(items)s and %(count)s others|other": "%(items)s eta beste %(count)s",
-    "%(items)s and %(count)s others|one": "%(items)s eta beste bat",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s %(count)s aldiz elkartu dira",
+        "one": "%(severalUsers)s elkartu dira"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s%(count)s aldiz elkartu da",
+        "one": "%(oneUser)s elkartu da"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s%(count)s aldiz atera dira",
+        "one": "%(severalUsers)s atera dira"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s%(count)s aldiz atera da",
+        "one": "%(oneUser)s atera da"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s elkartu eta atera dira %(count)s aldiz",
+        "one": "%(severalUsers)s elkartu eta atera dira"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s elkartu eta atera da %(count)s aldiz",
+        "one": "%(oneUser)s elkartu eta atera da"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s atera eta berriz elkartu dira %(count)s aldiz",
+        "one": "%(severalUsers)s atera eta berriz elkartu da"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s atera eta berriz elkartu da %(count)s aldiz",
+        "one": "%(oneUser)s atera eta berriz elkartu da"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s erabiltzaileek bere gonbidapenak ukatu dituzte %(count)s aldiz",
+        "one": "%(severalUsers)s erabiltzaileek bere gonbidapenak ukatu dituzte"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s erabiltzaileak bere gonbidapena ukatu du %(count)s aldiz",
+        "one": "%(oneUser)s erabiltzaileak bere gonbidapena ukatu du"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s erabiltzaileei gonbidapena indargabetu zaie %(count)s aldiz",
+        "one": "%(severalUsers)s erabiltzaileei gonbidapena indargabetu zaie"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s erabiltzaileari gonbidapena indargabetu zaio %(count)s aldiz",
+        "one": "%(oneUser)s erabiltzaileari gonbidapena indargabetu zaio"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s eta beste %(count)s",
+        "one": "%(items)s eta beste bat"
+    },
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "%(brand)s bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu.",
     "Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
@@ -594,8 +644,10 @@
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s erabiltzaileak gela publikoa bihurtu du esteka dakien edonorentzat.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s erabiltzaileak gela soilik gonbidatuentzat bihurtu du.",
     "%(displayName)s is typing …": "%(displayName)s idazten ari da …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s eta beste %(count)s idatzen ari dira …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s eta beste bat idazten ari dira …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s eta beste %(count)s idatzen ari dira …",
+        "one": "%(names)s eta beste bat idazten ari dira …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s eta %(lastPerson)s idazten ari dira …",
     "Render simple counters in room header": "Jarri kontagailu sinpleak gelaren goiburuan",
     "Enable Emoji suggestions while typing": "Proposatu emojiak  idatzi bitartean",
@@ -795,8 +847,10 @@
     "Revoke invite": "Indargabetu gonbidapena",
     "Invited by %(sender)s": "%(sender)s erabiltzaileak gonbidatuta",
     "Remember my selection for this widget": "Gogoratu nire hautua trepeta honentzat",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Irakurri gabeko %(count)s jakinarazpen dituzu gela honen aurreko bertsio batean.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Irakurri gabeko %(count)s jakinarazpen duzu gela honen aurreko bertsio batean.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Irakurri gabeko %(count)s jakinarazpen dituzu gela honen aurreko bertsio batean.",
+        "one": "Irakurri gabeko %(count)s jakinarazpen duzu gela honen aurreko bertsio batean."
+    },
     "The file '%(fileName)s' failed to upload.": "Huts egin du '%(fileName)s' fitxategia igotzean.",
     "The server does not support the room version specified.": "Zerbitzariak ez du emandako gela-bertsioa onartzen.",
     "Unbans user with given ID": "ID zehatz bat duen erabiltzaileari debekua altxatzen dio",
@@ -850,8 +904,10 @@
     "Upload files (%(current)s of %(total)s)": "Igo fitxategiak (%(current)s / %(total)s)",
     "Upload files": "Igo fitxategiak",
     "Upload": "Igo",
-    "Upload %(count)s other files|other": "Igo beste %(count)s fitxategiak",
-    "Upload %(count)s other files|one": "Igo beste fitxategi %(count)s",
+    "Upload %(count)s other files": {
+        "other": "Igo beste %(count)s fitxategiak",
+        "one": "Igo beste fitxategi %(count)s"
+    },
     "Cancel All": "Ezeztatu dena",
     "Upload Error": "Igoera errorea",
     "Use an email address to recover your account": "Erabili e-mail helbidea zure kontua berreskuratzeko",
@@ -893,10 +949,14 @@
     "Edited at %(date)s. Click to view edits.": "Edizio data: %(date)s. Sakatu edizioak ikusteko.",
     "Message edits": "Mezuaren edizioak",
     "Show all": "Erakutsi denak",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s erabiltzaileek ez dute aldaketarik egin %(count)s aldiz",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s erabiltzaileek ez dute aldaketarik egin",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s erabiltzaileak ez du aldaketarik egin %(count)s aldiz",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s erabiltzaileak ez du aldaketarik egin",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s erabiltzaileek ez dute aldaketarik egin %(count)s aldiz",
+        "one": "%(severalUsers)s erabiltzaileek ez dute aldaketarik egin"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s erabiltzaileak ez du aldaketarik egin %(count)s aldiz",
+        "one": "%(oneUser)s erabiltzaileak ez du aldaketarik egin"
+    },
     "Removing…": "Kentzen…",
     "Clear all data": "Garbitu datu guztiak",
     "Your homeserver doesn't seem to support this feature.": "Antza zure hasiera-zerbitzariak ez du ezaugarri hau onartzen.",
@@ -990,8 +1050,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Saiatu denbora-lerroa gora korritzen aurreko besterik dagoen ikusteko.",
     "Remove recent messages by %(user)s": "Kendu %(user)s erabiltzailearen azken mezuak",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Mezu kopuru handientzako, honek denbora behar lezake. Ez freskatu zure bezeroa bitartean.",
-    "Remove %(count)s messages|other": "Kendu %(count)s mezu",
-    "Remove %(count)s messages|one": "Kendu mezu 1",
+    "Remove %(count)s messages": {
+        "other": "Kendu %(count)s mezu",
+        "one": "Kendu mezu 1"
+    },
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Erabiltzailea desaktibatzean saioa itxiko zaio eta ezin izango du berriro hasi. Gainera, dauden gela guztietatik aterako da. Ekintza hau ezin da aurreko egoera batera ekarri. Ziur erabiltzaile hau desaktibatu nahi duzula?",
     "Remove recent messages": "Kendu azken mezuak",
     "Bold": "Lodia",
@@ -1001,8 +1063,14 @@
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "%(roomName)s gelarako gonbidapena zure kontuarekin lotuta ez dagoen %(email)s helbidera bidali da",
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Erabili identitate zerbitzari bat ezarpenetan gonbidapenak zuzenean %(brand)s-en jasotzeko.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Partekatu e-mail hau ezarpenetan gonbidapenak zuzenean %(brand)s-en jasotzeko.",
-    "%(count)s unread messages including mentions.|other": "irakurri gabeko %(count)s mezu aipamenak barne.",
-    "%(count)s unread messages.|other": "irakurri gabeko %(count)s mezu.",
+    "%(count)s unread messages including mentions.": {
+        "other": "irakurri gabeko %(count)s mezu aipamenak barne.",
+        "one": "Irakurri gabeko aipamen 1."
+    },
+    "%(count)s unread messages.": {
+        "other": "irakurri gabeko %(count)s mezu.",
+        "one": "Irakurri gabeko mezu 1."
+    },
     "Show image": "Erakutsi irudia",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Sortu txosten berri bat</newIssueLink> GitHub zerbitzarian arazo hau ikertu dezagun.",
     "e.g. my-room": "adib. nire-gela",
@@ -1036,8 +1104,6 @@
     "contact the administrators of identity server <idserver />": "<idserver /> identitate-zerbitzariko administratzaileekin kontaktuak jarri",
     "wait and try again later": "itxaron eta berriro saiatu",
     "Room %(name)s": "%(name)s gela",
-    "%(count)s unread messages including mentions.|one": "Irakurri gabeko aipamen 1.",
-    "%(count)s unread messages.|one": "Irakurri gabeko mezu 1.",
     "Unread messages.": "Irakurri gabeko mezuak.",
     "Failed to deactivate user": "Huts egin du erabiltzailea desaktibatzeak",
     "This client does not support end-to-end encryption.": "Bezero honek ez du muturretik muturrerako zifratzea onartzen.",
@@ -1162,8 +1228,10 @@
     "<userName/> wants to chat": "<userName/> erabiltzaileak txateatu nahi du",
     "Start chatting": "Hasi txateatzen",
     "Hide verified sessions": "Ezkutatu egiaztatutako saioak",
-    "%(count)s verified sessions|other": "%(count)s egiaztatutako saio",
-    "%(count)s verified sessions|one": "Egiaztatutako saio 1",
+    "%(count)s verified sessions": {
+        "other": "%(count)s egiaztatutako saio",
+        "one": "Egiaztatutako saio 1"
+    },
     "Reactions": "Erreakzioak",
     "Upgrade private room": "Eguneratu gela pribatua",
     "Upgrade public room": "Eguneratu gela publikoa",
@@ -1263,8 +1331,10 @@
     "Encrypted by a deleted session": "Ezabatutako saio batek zifratua",
     "Your messages are not secure": "Zure mezuak ez daude babestuta",
     "Your homeserver": "Zure hasiera-zerbitzaria",
-    "%(count)s sessions|other": "%(count)s saio",
-    "%(count)s sessions|one": "saio %(count)s",
+    "%(count)s sessions": {
+        "other": "%(count)s saio",
+        "one": "saio %(count)s"
+    },
     "Hide sessions": "Ezkutatu saioak",
     "Verify by emoji": "Egiaztatu emoji bidez",
     "Verify by comparing unique emoji.": "Egiaztatu emoji bakanak konparatuz.",
@@ -1333,10 +1403,14 @@
     "Not currently indexing messages for any room.": "Orain ez da inolako gelako mezurik indexatzen.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du%(oldRoomName)s izatetik %(newRoomName)s izatera.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s erabiltzaileak %(addresses)s ordezko helbideak gehitu dizkio gela honi.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s erabiltzaileak %(addresses)s helbideak gehitu dizkio gela honi.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s erabiltzaileak %(addresses)s helbideak kendu dizkio gela honi.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s erabiltzaileak %(addresses)s ordezko helbideak kendu dizkio gela honi.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s erabiltzaileak %(addresses)s ordezko helbideak gehitu dizkio gela honi.",
+        "one": "%(senderName)s erabiltzaileak %(addresses)s helbideak gehitu dizkio gela honi."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s erabiltzaileak %(addresses)s helbideak kendu dizkio gela honi.",
+        "one": "%(senderName)s erabiltzaileak %(addresses)s ordezko helbideak kendu dizkio gela honi."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s erabiltzaileak gela honen ordezko helbideak aldatu ditu.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s erabiltzaileak gela honen helbide nagusia eta ordezko helbideak aldatu ditu.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s erabiltzaileak gela honen helbideak aldatu ditu.",
@@ -1498,8 +1572,10 @@
     "A-Z": "A-Z",
     "Message preview": "Mezu-aurrebista",
     "List options": "Zerrenda-aukerak",
-    "Show %(count)s more|other": "Erakutsi %(count)s gehiago",
-    "Show %(count)s more|one": "Erakutsi %(count)s gehiago",
+    "Show %(count)s more": {
+        "other": "Erakutsi %(count)s gehiago",
+        "one": "Erakutsi %(count)s gehiago"
+    },
     "Room options": "Gelaren aukerak",
     "Error creating address": "Errorea helbidea sortzean",
     "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Errorea gertatu da helbidea sortzean. Agian ez du zerbitzariak onartzen edo behin behineko arazo bat egon da.",
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index fcefb1b070..c32ed76e26 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -572,10 +572,14 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s آدرس های این اتاق را تغییر داد.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s آدرس اصلی و جایگزین این اتاق را تغییر داد.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s آدرس های جایگزین این اتاق را تغییر داد.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s آدرس جایگزین %(addresses)s این اتاق را حذف کرد.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s آدرس های جایگزین %(addresses)s این اتاق را حذف کرد.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s آدرس جایگزین %(addresses)s را برای این اتاق اضافه کرد.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s آدرس های جایگزین %(addresses)s را برای این اتاق اضافه کرد.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s آدرس جایگزین %(addresses)s این اتاق را حذف کرد.",
+        "other": "%(senderName)s آدرس های جایگزین %(addresses)s این اتاق را حذف کرد."
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s آدرس جایگزین %(addresses)s را برای این اتاق اضافه کرد.",
+        "other": "%(senderName)s آدرس های جایگزین %(addresses)s را برای این اتاق اضافه کرد."
+    },
     "%(senderName)s removed the main address for this room.": "%(senderName)s آدرس اصلی این اتاق را حذف کرد.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s آدرس اصلی این اتاق را روی %(address)s تنظیم کرد.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s تصویری ارسال کرد.",
@@ -634,8 +638,10 @@
     "Send stickers into your active room": "در اتاق‌های فعال خود استیکر ارسال کنید",
     "Send stickers into this room": "در این اتاق استیکر ارسال کنید",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s و %(lastPerson)s در حال نوشتن…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s و یک نفر دیگر در حال نوشتن…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s و %(count)s نفر دیگر در حال نوشتن…",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s و یک نفر دیگر در حال نوشتن…",
+        "other": "%(names)s و %(count)s نفر دیگر در حال نوشتن…"
+    },
     "%(displayName)s is typing …": "%(displayName)s در حال نوشتن…",
     "Dark": "تاریک",
     "Light": "روشن",
@@ -693,8 +699,10 @@
     "Successfully restored %(sessionCount)s keys": "کلیدهای %(sessionCount)s با موفقیت بازیابی شدند",
     "Restoring keys from backup": "بازیابی کلیدها از نسخه پشتیبان",
     "a device cross-signing signature": "کلید امضای متقابل یک دستگاه",
-    "Upload %(count)s other files|one": "بارگذاری %(count)s فایل دیگر",
-    "Upload %(count)s other files|other": "بارگذاری %(count)s فایل دیگر",
+    "Upload %(count)s other files": {
+        "one": "بارگذاری %(count)s فایل دیگر",
+        "other": "بارگذاری %(count)s فایل دیگر"
+    },
     "Room Settings - %(roomName)s": "تنظیمات اتاق - %(roomName)s",
     "Start using Key Backup": "شروع استفاده از نسخه‌ی پشتیبان کلید",
     "Unable to restore backup": "بازیابی نسخه پشتیبان امکان پذیر نیست",
@@ -855,9 +863,11 @@
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "قبل از ارسال گزارش‌ها، برای توصیف مشکل خود باید <a>یک مسئله در GitHub ایجاد کنید</a>.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "سعی شد یک نقطه‌ی زمانی خاص در پیام‌های این اتاق بارگیری و نمایش داده شود، اما پیداکردن آن میسر نیست.",
     "Failed to load timeline position": "بارگیری و نمایش پیام‌ها با مشکل مواجه شد",
-    "Uploading %(filename)s and %(count)s others|other": "در حال بارگذاری %(filename)s و %(count)s مورد دیگر",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "در حال بارگذاری %(filename)s و %(count)s مورد دیگر",
+        "one": "در حال بارگذاری %(filename)s و %(count)s مورد دیگر"
+    },
     "Uploading %(filename)s": "در حال بارگذاری %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "در حال بارگذاری %(filename)s و %(count)s مورد دیگر",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "یادآوری: مرورگر شما پشتیبانی نمی شود ، بنابراین ممکن است تجربه شما غیرقابل پیش بینی باشد.",
     "Preparing to download logs": "در حال آماده سازی برای بارگیری گزارش ها",
     "Got an account? <a>Sign in</a>": "حساب کاربری دارید؟ <a>وارد شوید</a>",
@@ -900,9 +910,11 @@
     "Add existing rooms": "افزودن اتاق‌های موجود",
     "Space selection": "انتخاب فضای کاری",
     "There was a problem communicating with the homeserver, please try again later.": "در برقراری ارتباط با سرور مشکلی پیش آمده، لطفاً چند لحظه‌ی دیگر مجددا امتحان کنید.",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "در حال افزودن اتاق‌ها...",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "در حال افزودن اتاق‌ها...",
+        "other": "در حال افزودن اتاق‌ها... (%(progress)s از %(count)s)"
+    },
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "امکان اتصال به سرور از طریق پروتکل‌های HTTP و HTTPS در مروگر شما میسر نیست. یا از HTTPS استفاده کرده و یا <a>حالت اجرای غیرامن اسکریپت‌ها</a> را فعال کنید.",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "در حال افزودن اتاق‌ها... (%(progress)s از %(count)s)",
     "Not all selected were added": "همه‌ی موارد انتخاب شده، اضافه نشدند",
     "Server name": "نام سرور",
     "Enter the name of a new server you want to explore.": "نام سرور جدیدی که می خواهید در آن کاوش کنید را وارد کنید.",
@@ -915,7 +927,9 @@
     "Looks good": "به نظر خوب میاد",
     "Unable to query for supported registration methods.": "درخواست از روش‌های پشتیبانی‌شده‌ی ثبت‌نام میسر نیست.",
     "Enter a server name": "نام سرور را وارد کنید",
-    "And %(count)s more...|other": "و %(count)s مورد بیشتر ...",
+    "And %(count)s more...": {
+        "other": "و %(count)s مورد بیشتر ..."
+    },
     "Sign in with single sign-on": "با احراز هویت یکپارچه وارد شوید",
     "This server does not support authentication with a phone number.": "این سرور از قابلیت احراز با شماره تلفن پشتیبانی نمی کند.",
     "Continue with %(provider)s": "با %(provider)s ادامه دهید",
@@ -949,30 +963,42 @@
     "QR Code": "کد QR",
     "Custom level": "سطح دلخواه",
     "Power level": "سطح قدرت",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s هیچ تغییری ایجاد نکرد",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s مرتبه هیچ تغییری ایجاد نکرد",
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)s هیچ تغییری ایجاد نکرد",
+        "other": "%(oneUser)s %(count)s مرتبه هیچ تغییری ایجاد نکرد"
+    },
     "That matches!": "مطابقت دارد!",
     "Use a different passphrase?": "از عبارت امنیتی دیگری استفاده شود؟",
     "That doesn't match.": "مطابقت ندارد.",
     "Go back to set it again.": "برای تنظیم مجدد آن به عقب برگردید.",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s هیچ تغییری ایجاد نکردند",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s تغییری ایجاد نکردند",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)s هیچ تغییری ایجاد نکردند",
+        "other": "%(severalUsers)s %(count)s تغییری ایجاد نکردند"
+    },
     "Enter your Security Phrase a second time to confirm it.": "عبارت امنیتی خود را برای تائید مجددا وارد کنید.",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s نام خود را تغییر داد",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s نام خود را %(count)s مرتبه تغییر داد",
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)s نام خود را تغییر داد",
+        "other": "%(oneUser)s نام خود را %(count)s مرتبه تغییر داد"
+    },
     "Your keys are being backed up (the first backup could take a few minutes).": "در حال پیشتیبان‌گیری از کلیدهای شما (اولین نسخه پشتیبان ممکن است چند دقیقه طول بکشد).",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s نام خود را تغییر دادند",
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)s نام خود را تغییر دادند",
+        "other": "%(severalUsers)s نام خود را %(count)s بار تغییر دادند"
+    },
     "Confirm your Security Phrase": "عبارت امنیتی خود را تأیید کنیدعبارت امنیتی خود را تائید نمائید",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s نام خود را %(count)s بار تغییر دادند",
     "Success!": "موفقیت‌آمیز بود!",
     "Create key backup": "ساختن نسخه‌ی پشتیبان کلید",
     "Unable to create key backup": "ایجاد کلید پشتیبان‌گیری امکان‌پذیر نیست",
     "Generate a Security Key": "یک کلید امنیتی ایجاد کنید",
     "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "از یک عبارت محرمانه که فقط خودتان می‌دانید استفاده کنید، و محض احتیاط کلید امینی خود را برای استفاده هنگام پشتیبان‌گیری ذخیره نمائید.",
-    "was unbanned %(count)s times|one": "رفع تحریم شد",
-    "was unbanned %(count)s times|other": "%(count)s بار رفع تحریم شد",
-    "were unbanned %(count)s times|one": "رفع تحریم شد",
-    "were unbanned %(count)s times|other": "%(count)s بار رفع تحریم شد",
+    "was unbanned %(count)s times": {
+        "one": "رفع تحریم شد",
+        "other": "%(count)s بار رفع تحریم شد"
+    },
+    "were unbanned %(count)s times": {
+        "one": "رفع تحریم شد",
+        "other": "%(count)s بار رفع تحریم شد"
+    },
     "Filter results": "پالایش نتایج",
     "Event Content": "محتوای رخداد",
     "State Key": "کلید حالت",
@@ -1001,12 +1027,18 @@
     "You can select all or individual messages to retry or delete": "شما می‌توانید یک یا همه‌ی پیام‌ها را برای تلاش مجدد یا حذف انتخاب کنید",
     "Sent messages will be stored until your connection has returned.": "پیام‌های ارسالی تا زمان بازگشت اتصال شما ذخیره خواهند ماند.",
     "Server may be unavailable, overloaded, or search timed out :(": "سرور ممکن است در دسترس نباشد ، بار زیادی روی آن قرار گرفته یا زمان جستجو به پایان رسیده‌باشد :(",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "شما %(count)s اعلان خوانده‌نشده در نسخه‌ی قبلی این اتاق دارید.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "شما %(count)s اعلان خوانده‌نشده در نسخه‌ی قبلی این اتاق دارید.",
-    "%(count)s members|other": "%(count)s عضو",
-    "%(count)s members|one": "%(count)s عضو",
-    "%(count)s rooms|other": "%(count)s اتاق",
-    "%(count)s rooms|one": "%(count)s اتاق",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "شما %(count)s اعلان خوانده‌نشده در نسخه‌ی قبلی این اتاق دارید.",
+        "one": "شما %(count)s اعلان خوانده‌نشده در نسخه‌ی قبلی این اتاق دارید."
+    },
+    "%(count)s members": {
+        "other": "%(count)s عضو",
+        "one": "%(count)s عضو"
+    },
+    "%(count)s rooms": {
+        "other": "%(count)s اتاق",
+        "one": "%(count)s اتاق"
+    },
     "This room is suggested as a good one to join": "این اتاق به عنوان یک گزینه‌ی خوب برای عضویت پیشنهاد می شود",
     "Suggested": "پیشنهادی",
     "Your server does not support showing space hierarchies.": "سرور شما از نمایش سلسله مراتبی فضاهای کاری پشتیبانی نمی کند.",
@@ -1015,21 +1047,34 @@
     "Mark as not suggested": "علامت‌گذاری به عنوان پیشنهاد‌نشده",
     "Mark as suggested": "علامت‌گذاری به عنوان پیشنهاد‌شده",
     "You may want to try a different search or check for typos.": "ممکن است بخواهید یک جستجوی دیگر انجام دهید یا غلط‌های املایی را بررسی کنید.",
-    "was banned %(count)s times|one": "تحریم شد",
-    "was banned %(count)s times|other": "%(count)s بار تحریم شد",
+    "was banned %(count)s times": {
+        "one": "تحریم شد",
+        "other": "%(count)s بار تحریم شد"
+    },
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "برای در امان ماندن در برابر از دست‌دادن پیام‌ها و داده‌های رمزشده‌ی خود، از کلید‌های رمزنگاری خود یک نسخه‌ی پشتیبان بر روی سرور قرار دهید.",
-    "were banned %(count)s times|one": "تحریم شد",
-    "were banned %(count)s times|other": "%(count)s بار تحریم شد",
-    "was invited %(count)s times|one": "دعوت شد",
-    "was invited %(count)s times|other": "%(count)s بار دعوت شده است",
+    "were banned %(count)s times": {
+        "one": "تحریم شد",
+        "other": "%(count)s بار تحریم شد"
+    },
+    "was invited %(count)s times": {
+        "one": "دعوت شد",
+        "other": "%(count)s بار دعوت شده است"
+    },
     "Enter your account password to confirm the upgrade:": "گذرواژه‌ی خود را جهت تائيد عملیات ارتقاء وارد کنید:",
-    "were invited %(count)s times|one": "دعوت شدند",
-    "were invited %(count)s times|other": "%(count)s بار دعوت شده‌اند",
+    "were invited %(count)s times": {
+        "one": "دعوت شدند",
+        "other": "%(count)s بار دعوت شده‌اند"
+    },
     "Restore your key backup to upgrade your encryption": "برای ارتقاء رمزنگاری، ابتدا نسخه‌ی پشتیبان خود را بازیابی کنید",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s دعوت خود را پس گرفته است",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s دعوت خود را %(count)s مرتبه پس‌گرفته‌است",
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "%(oneUser)s دعوت خود را پس گرفته است",
+        "other": "%(oneUser)s دعوت خود را %(count)s مرتبه پس‌گرفته‌است"
+    },
     "Restore": "بازیابی",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s دعوت‌های خود را پس‌گرفتند",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)s دعوت‌های خود را پس‌گرفتند",
+        "other": "%(severalUsers)s دعوت خود را %(count)s مرتبه پس‌گرفتند"
+    },
     "%(name)s cancelled verifying": "%(name)s تأیید هویت را لغو کرد",
     "You cancelled verifying %(name)s": "شما تأیید هویت %(name)s را لغو کردید",
     "You verified %(name)s": "شما هویت %(name)s را تأیید کردید",
@@ -1080,8 +1125,10 @@
     "Unmute": "صدادار",
     "Failed to mute user": "کاربر بی صدا نشد",
     "Remove recent messages": "حذف پیام‌های اخیر",
-    "Remove %(count)s messages|one": "حذف ۱ پیام",
-    "Remove %(count)s messages|other": "حذف %(count)s پیام",
+    "Remove %(count)s messages": {
+        "one": "حذف ۱ پیام",
+        "other": "حذف %(count)s پیام"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "برای مقدار زیادی پیام ممکن است مدتی طول بکشد. لطفا در این بین مرورگر خود را refresh نکنید.",
     "Remove recent messages by %(user)s": "حذف پیام‌های اخیر %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "در پیام‌ها بالا بروید تا ببینید آیا موارد قدیمی وجود دارد یا خیر.",
@@ -1095,11 +1142,15 @@
     "Mention": "اشاره",
     "Jump to read receipt": "پرش به آخرین پیام خوانده شده",
     "Hide sessions": "مخفی کردن نشست‌ها",
-    "%(count)s sessions|one": "%(count)s نشست",
-    "%(count)s sessions|other": "%(count)s نشست",
+    "%(count)s sessions": {
+        "one": "%(count)s نشست",
+        "other": "%(count)s نشست"
+    },
     "Hide verified sessions": "مخفی کردن نشست‌های تأیید شده",
-    "%(count)s verified sessions|one": "1 نشست تأیید شده",
-    "%(count)s verified sessions|other": "%(count)s نشست تایید شده",
+    "%(count)s verified sessions": {
+        "one": "1 نشست تأیید شده",
+        "other": "%(count)s نشست تایید شده"
+    },
     "Not trusted": "غیرقابل اعتماد",
     "Trusted": "قابل اعتماد",
     "Room settings": "تنظیمات اتاق",
@@ -1112,7 +1163,9 @@
     "Set my room layout for everyone": "چیدمان اتاق من را برای همه تنظیم کن",
     "Options": "گزینه ها",
     "Unpin": "برداشتن پین",
-    "You can only pin up to %(count)s widgets|other": "فقط می توانید تا %(count)s ابزارک را پین کنید",
+    "You can only pin up to %(count)s widgets": {
+        "other": "فقط می توانید تا %(count)s ابزارک را پین کنید"
+    },
     "One of the following may be compromised:": "ممکن است یکی از موارد زیر به در معرض خطر باشد:",
     "Your homeserver": "سرور شما",
     "Your messages are not secure": "پیام های شما ایمن نیستند",
@@ -1138,8 +1191,10 @@
     "Room avatar": "آواتار اتاق",
     "Room Topic": "موضوع اتاق",
     "Room Name": "نام اتاق",
-    "Show %(count)s more|other": "نمایش %(count)s مورد بیشتر",
-    "Show %(count)s more|one": "نمایش %(count)s مورد بیشتر",
+    "Show %(count)s more": {
+        "other": "نمایش %(count)s مورد بیشتر",
+        "one": "نمایش %(count)s مورد بیشتر"
+    },
     "Jump to first invite.": "به اولین دعوت بروید.",
     "Jump to first unread room.": "به اولین اتاق خوانده نشده بروید.",
     "List options": "لیست گزینه‌ها",
@@ -1193,8 +1248,10 @@
     "Show Widgets": "نمایش ابزارک‌ها",
     "Hide Widgets": "پنهان‌کردن ابزارک‌ها",
     "Join Room": "به اتاق بپیوندید",
-    "(~%(count)s results)|one": "(~%(count)s نتیجه)",
-    "(~%(count)s results)|other": "(~%(count)s نتیجه)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s نتیجه)",
+        "other": "(~%(count)s نتیجه)"
+    },
     "No recently visited rooms": "اخیراً از اتاقی بازدید نشده است",
     "Recently visited rooms": "اتاق‌هایی که به تازگی بازدید کرده‌اید",
     "Room %(name)s": "اتاق %(name)s",
@@ -1237,8 +1294,10 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (سطح قدرت %(powerLevelNumber)s)",
     "Invited": "دعوت شد",
     "Invite to this space": "به این فضای کاری دعوت کنید",
-    "and %(count)s others...|one": "و یکی دیگر ...",
-    "and %(count)s others...|other": "و %(count)s مورد دیگر ...",
+    "and %(count)s others...": {
+        "one": "و یکی دیگر ...",
+        "other": "و %(count)s مورد دیگر ..."
+    },
     "Close preview": "بستن پیش نمایش",
     "Scroll to most recent messages": "به جدیدترین پیام‌ها بروید",
     "Failed to send": "ارسال با خطا مواجه شد",
@@ -1258,11 +1317,15 @@
     "Rotate Left": "چرخش به چپ",
     "Zoom in": "بزرگنمایی",
     "Zoom out": "کوچک نمایی",
-    "%(count)s people you know have already joined|one": "%(count)s نفر از افرادی که می شناسید قبلاً پیوسته‌اند",
-    "%(count)s people you know have already joined|other": "%(count)s نفر از افرادی که می شناسید قبلاً به آن پیوسته‌اند",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s نفر از افرادی که می شناسید قبلاً پیوسته‌اند",
+        "other": "%(count)s نفر از افرادی که می شناسید قبلاً به آن پیوسته‌اند"
+    },
     "Including %(commaSeparatedMembers)s": "شامل %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "نمایش ۱ عضو",
-    "View all %(count)s members|other": "نمایش همه %(count)s عضو",
+    "View all %(count)s members": {
+        "one": "نمایش ۱ عضو",
+        "other": "نمایش همه %(count)s عضو"
+    },
     "expand": "گشودن",
     "collapse": "بستن",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "لطفا در GitHub <newIssueLink>یک مسئله جدید ایجاد کنید</newIssueLink> تا بتوانیم این اشکال را بررسی کنیم.",
@@ -1314,7 +1377,10 @@
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "اگر متد بازیابی را حذف نکرده‌اید، ممکن است حمله‌کننده‌ای سعی در دسترسی به حساب‌کاربری شما داشته باشد. گذرواژه حساب کاربری خود را تغییر داده و فورا یک روش بازیابی را از بخش تنظیمات خود تنظیم کنید.",
     "Message downloading sleep time(ms)": "زمان خواب بارگیری پیام (ms)",
     "Something went wrong!": "مشکلی پیش آمد!",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s عضو شدند",
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)s عضو شدند",
+        "other": "%(severalUsers)s%(count)s مرتبه عضو شده‌اند"
+    },
     "Skip": "بیخیال",
     "Import": "واردکردن (Import)",
     "Export": "استخراج (Export)",
@@ -1496,44 +1562,62 @@
     "Message search initialisation failed": "آغاز فرآیند جستجوی پیام‌ها با شکست همراه بود",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s نمی‌تواند پیام‌های رمزشده را به شکل امن و به صورت محلی در هنگامی که مرورگر در حال فعالیت است ذخیره کند. از <desktopLink>%(brand)s نسخه‌ی دسکتاپ</desktopLink> برای نمایش پیام‌های رمزشده در نتایج جستجو استفاده نمائید.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s بعضی از مولفه‌های مورد نیاز برای ذخیره امن پیام‌های رمزشده به صورت محلی را ندارد. اگر تمایل به استفاده از این قابلیت دارید، یک نسخه‌ی دلخواه از %(brand)s با <nativeLink> مولفه‌های مورد نظر</nativeLink> بسازید.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "پیام‌های رمزشده را به صورتی محلی و امن ذخیره کرده تا در نتایج جستجو ظاهر شوند، با استفاده از %(size)s برای ذخیره‌ی پیام‌ها از اتاق‌های %(rooms)s.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "پیام‌های رمزشده را به صورتی محلی و امن ذخیره کرده تا در نتایج جستجو ظاهر شوند، با استفاده از %(size)s برای ذخیره‌ی پیام‌ها از اتاق %(rooms)s.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "other": "پیام‌های رمزشده را به صورتی محلی و امن ذخیره کرده تا در نتایج جستجو ظاهر شوند، با استفاده از %(size)s برای ذخیره‌ی پیام‌ها از اتاق‌های %(rooms)s.",
+        "one": "پیام‌های رمزشده را به صورتی محلی و امن ذخیره کرده تا در نتایج جستجو ظاهر شوند، با استفاده از %(size)s برای ذخیره‌ی پیام‌ها از اتاق %(rooms)s."
+    },
     "Securely cache encrypted messages locally for them to appear in search results.": "پیام‌های رمزشده را به صورتی محلی و امن ذخیره کرده تا در نتایج جستجو ظاهر شوند.",
     "Manage": "مدیریت",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "به صورت جداگانه هر نشستی که با بقیه‌ی کاربران دارید را تائید کنید تا به عنوان نشست قابل اعتماد نشانه‌گذاری شود، با این کار می‌توانید به دستگاه‌های امضاء متقابل اعتماد نکنید.",
     "Encryption": "رمزنگاری",
     "You'll need to authenticate with the server to confirm the upgrade.": "برای تائید ارتقاء، نیاز به احراز هویت نزد سرور خواهید داشت.",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s دعوت خود را %(count)s مرتبه پس‌گرفتند",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "برای اینکه بتوانید بقیه‌ی نشست‌ها را تائید کرده و به آن‌ها امکان مشاهده‌ی پیام‌های رمزشده را بدهید، ابتدا باید این نشست را ارتقاء دهید. بعد از تائیدشدن، به عنوان نشست‌ّای تائید‌شده به سایر کاربران نمایش داده خواهند شد.",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s دعوت خود را رد کرد",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s دعوت خود را %(count)s مرتبه رد کرد",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s دعوت‌های خود را رد کردند",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s دعوت خود را %(count)s مرتبه رد کردند",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s خارج شد و مجددا عضو شد",
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)s دعوت خود را رد کرد",
+        "other": "%(oneUser)s دعوت خود را %(count)s مرتبه رد کرد"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)s دعوت‌های خود را رد کردند",
+        "other": "%(severalUsers)s دعوت خود را %(count)s مرتبه رد کردند"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)s خارج شد و مجددا عضو شد",
+        "other": "%(oneUser)s %(count)s مرتبه خارج شد و مجددا عضو شد"
+    },
     "Unable to query secret storage status": "امکان جستجو و کنکاش وضعیت حافظه‌ی مخفی میسر نیست",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s مرتبه خارج شد و مجددا عضو شد",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s خارج شدند و مجددا عضو شدند",
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)s خارج شدند و مجددا عضو شدند",
+        "other": "%(severalUsers)s %(count)s مرتبه خارج شدند و مجددا عضو شدند"
+    },
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "اگر الان لغو کنید، ممکن است پیام‌ها و داده‌های رمزشده‌ی خود را در صورت خارج‌شدن از حساب‌های کاربریتان، از دست دهید.",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s %(count)s مرتبه خارج شدند و مجددا عضو شدند",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s پیوست و خارج شد",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s مرتبه عضو شده و خارج شدند",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s عضو شدند و خارج شدند",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s %(count)s مرتبه عضو شده و خارج شدند",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s خارج شد",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s مرتبه خارج شده‌است",
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)s پیوست و خارج شد",
+        "other": "%(oneUser)s %(count)s مرتبه عضو شده و خارج شدند"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)s عضو شدند و خارج شدند",
+        "other": "%(severalUsers)s %(count)s مرتبه عضو شده و خارج شدند"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)s خارج شد",
+        "other": "%(oneUser)s %(count)s مرتبه خارج شده‌است"
+    },
     "You can also set up Secure Backup & manage your keys in Settings.": "همچنین می‌توانید پشتیبان‌گیری امن را برپا کرده و کلید‌های خود را در تنظیمات مدیریت کنید.",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s خارج شدند",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s %(count)s مرتبه خارج شدند",
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)s خارج شدند",
+        "other": "%(severalUsers)s %(count)s مرتبه خارج شدند"
+    },
     "Upgrade your encryption": "رمزنگاری خود را ارتقا دهید",
     "Set a Security Phrase": "یک عبارت امنیتی تنظیم کنید",
     "Confirm Security Phrase": "عبارت امنیتی را تأیید کنید",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s پیوست",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s مرتبه عضو شدند",
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)s پیوست",
+        "other": "%(oneUser)s %(count)s مرتبه عضو شدند"
+    },
     "Save your Security Key": "کلید امنیتی خود را ذخیره کنید",
     "Unable to set up secret storage": "تنظیم حافظه‌ی پنهان امکان پذیر نیست",
     "Passphrases must match": "عبارات‌های امنیتی باید مطابقت داشته باشند",
     "Passphrase must not be empty": "عبارت امنیتی نمی‌تواند خالی باشد",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s مرتبه عضو شده‌اند",
     "Unknown error": "خطای ناشناخته",
     "Show more": "نمایش بیشتر",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "آدرس‌های این اتاق را تنظیم کنید تا کاربران بتوانند این اتاق را از طریق سرور شما پیدا کنند (%(localDomain)s)",
@@ -1574,10 +1658,14 @@
     "This room has already been upgraded.": "این اتاق قبلاً ارتقا یافته است.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "با ارتقا این اتاق نسخه فعلی اتاق خاموش شده و یک اتاق ارتقا یافته به همین نام ایجاد می شود.",
     "Unread messages.": "پیام های خوانده نشده.",
-    "%(count)s unread messages.|one": "۱ پیام خوانده نشده.",
-    "%(count)s unread messages.|other": "%(count)s پیام خوانده نشده.",
-    "%(count)s unread messages including mentions.|one": "۱ اشاره خوانده نشده.",
-    "%(count)s unread messages including mentions.|other": "%(count)s پیام‌های خوانده نشده از جمله اشاره‌ها.",
+    "%(count)s unread messages.": {
+        "one": "۱ پیام خوانده نشده.",
+        "other": "%(count)s پیام خوانده نشده."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "۱ اشاره خوانده نشده.",
+        "other": "%(count)s پیام‌های خوانده نشده از جمله اشاره‌ها."
+    },
     "Room options": "تنظیمات اتاق",
     "Favourited": "مورد علاقه",
     "Forget Room": "اتاق را فراموش کن",
@@ -1839,8 +1927,10 @@
     "%(num)s minutes ago": "%(num)s دقیقه قبل",
     "a few seconds ago": "چند ثانیه قبل",
     "%(items)s and %(lastItem)s": "%(items)s و %(lastItem)s",
-    "%(items)s and %(count)s others|one": "%(items)s و یکی دیگر",
-    "%(items)s and %(count)s others|other": "%(items)s و %(count)s دیگر",
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s و یکی دیگر",
+        "other": "%(items)s و %(count)s دیگر"
+    },
     "This homeserver has exceeded one of its resource limits.": "این سرور از یکی از محدودیت های منابع خود فراتر رفته است.",
     "This homeserver has been blocked by its administrator.": "این سرور توسط مدیر آن مسدود شده‌است.",
     "This homeserver has hit its Monthly Active User limit.": "این سرور به محدودیت بیشینه‌ی تعداد کاربران فعال ماهانه رسیده‌است.",
@@ -2308,8 +2398,10 @@
     "%(targetName)s accepted an invitation": "%(targetName)s یک دعوت نامه را پذیرفت",
     "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s دعوت %(displayName)s را پذیرفت",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "ما قادر به درک تاریخ داده شده %(inputDate)s نبودیم. از قالب YYYY-MM-DD استفاده کنید.",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s و %(count)s دیگر",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s و %(count)s دیگران",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s و %(count)s دیگر",
+        "other": "%(spaceName)s و %(count)s دیگران"
+    },
     "Some invites couldn't be sent": "بعضی از دعوت ها ارسال نشد",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "ما برای باقی ارسال کردیم، ولی افراد زیر نمی توانند به <RoomName/> دعوت شوند",
     "%(date)s at %(time)s": "%(date)s ساعت %(time)s",
@@ -2345,14 +2437,20 @@
     "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)": "دوتایی (کاربر و نشست) ناشناخته : ( %(userId)sو%(deviceId)s )",
     "Jump to the given date in the timeline": "پرش به تاریخ تعیین شده در جدول زمانی",
     "Failed to invite users to %(roomName)s": "افزودن کاربران به %(roomName)s با شکست روبرو شد",
-    "Inviting %(user)s and %(count)s others|other": "دعوت کردن %(user)s و %(count)s دیگر",
+    "Inviting %(user)s and %(count)s others": {
+        "other": "دعوت کردن %(user)s و %(count)s دیگر",
+        "one": "دعوت کردن %(user)s و ۱ دیگر"
+    },
     "Video call started in %(roomName)s. (not supported by this browser)": "تماس ویدئویی در %(roomName)s شروع شد. (توسط این مرورگر پشتیبانی نمی‌شود.)",
     "Video call started in %(roomName)s.": "تماس ویدئویی در %(roomName)s شروع شد.",
     "No virtual room for this room": "اتاق مجازی برای این اتاق وجود ندارد",
     "Switches to this room's virtual room, if it has one": "جابجایی به اتاق مجازی این اتاق، اگر یکی وجود داشت",
     "You need to be able to kick users to do that.": "برای انجام این کار نیاز دارید که بتوانید کاربران را حذف کنید.",
     "Empty room (was %(oldName)s)": "اتاق خالی (نام قبلی: %(oldName)s)",
-    "%(user)s and %(count)s others|other": "%(user)s و %(count)s دیگران",
+    "%(user)s and %(count)s others": {
+        "other": "%(user)s و %(count)s دیگران",
+        "one": "%(user)s و ۱ دیگر"
+    },
     "%(user1)s and %(user2)s": "%(user1)s و %(user2)s",
     "%(value)ss": "%(value)sس",
     "%(value)sm": "%(value)sم",
@@ -2398,7 +2496,9 @@
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "اطلاعات خود را به صورت ناشناس با ما به اشتراک بگذارید تا متوجه مشکلات موجود شویم. بدون استفاده شخصی توسط خود و یا شرکا<LearnMoreLink>یادگیری بیشتر</LearnMoreLink>",
     "%(creatorName)s created this room.": "%(creatorName)s این اتاق ساخته شده.",
     "In %(spaceName)s.": "در فضای %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "در %(spaceName)s و %(count)s دیگر فضاها.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "other": "در %(spaceName)s و %(count)s دیگر فضاها."
+    },
     "In spaces %(space1Name)s and %(space2Name)s.": "در فضای %(space1Name)s و %(space2Name)s.",
     "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s رد کردن %(targetName)s's دعوت",
     "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s قبول نکرد %(targetName)s's دعوت: %(reason)s",
@@ -2503,9 +2603,7 @@
     "%(senderName)s removed their profile picture": "%(senderName)s تصویر پروفایل ایشان حذف شد",
     "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s نام نمایشی ایشان حذف شد (%(oldDisplayName)s)",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "فرمان توسعه دهنده: سشن گروه خارجی فعلی رد شد و یک سشن دیگر تعریف شد",
-    "Inviting %(user)s and %(count)s others|one": "دعوت کردن %(user)s و ۱ دیگر",
     "Inviting %(user1)s and %(user2)s": "دعوت کردن %(user1)s و %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s و ۱ دیگر",
     "User is not logged in": "کاربر وارد نشده است",
     "Database unexpectedly closed": "پایگاه داده به طور غیرمنتظره ای بسته شد",
     "This may be caused by having the app open in multiple tabs or due to clearing browser data.": "این ممکن است به دلیل باز بودن برنامه در چندین برگه یا به دلیل پاک کردن داده های مرورگر باشد.",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index e7771c07b8..0a7241b7ae 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -42,8 +42,10 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Yhdistäminen kotipalvelimeen HTTP:n avulla ei ole mahdollista, kun selaimen osoitepalkissa on HTTPS-osoite. Käytä joko HTTPS:ää tai <a>salli turvattomat komentosarjat</a>.",
     "Change Password": "Vaihda salasana",
     "Account": "Tili",
-    "and %(count)s others...|other": "ja %(count)s muuta...",
-    "and %(count)s others...|one": "ja yksi muu...",
+    "and %(count)s others...": {
+        "other": "ja %(count)s muuta...",
+        "one": "ja yksi muu..."
+    },
     "Banned users": "Porttikiellon saaneet käyttäjät",
     "Bans user with given id": "Antaa porttikiellon tunnuksen mukaiselle käyttäjälle",
     "Changes your display nickname": "Vaihtaa näyttönimesi",
@@ -133,7 +135,10 @@
     "Unmute": "Poista mykistys",
     "Unnamed Room": "Nimeämätön huone",
     "Uploading %(filename)s": "Lähetetään %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Lähetetään %(filename)s ja %(count)s muuta",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Lähetetään %(filename)s ja %(count)s muuta",
+        "other": "Lähetetään %(filename)s ja %(count)s muuta"
+    },
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s vaihtoi huoneen nimeksi %(roomName)s.",
     "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön syntaksikorostusta varten",
     "Hangup": "Lopeta",
@@ -172,8 +177,10 @@
     "Failed to copy": "Kopiointi epäonnistui",
     "Connectivity to the server has been lost.": "Yhteys palvelimeen menetettiin.",
     "Sent messages will be stored until your connection has returned.": "Lähetetyt viestit tallennetaan kunnes yhteys on taas muodostettu.",
-    "(~%(count)s results)|one": "(~%(count)s tulos)",
-    "(~%(count)s results)|other": "(~%(count)s tulosta)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s tulos)",
+        "other": "(~%(count)s tulosta)"
+    },
     "New Password": "Uusi salasana",
     "Start automatically after system login": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
     "Analytics": "Analytiikka",
@@ -212,7 +219,6 @@
     "Unable to remove contact information": "Yhteystietojen poistaminen epäonnistui",
     "Unable to verify email address.": "Sähköpostin vahvistaminen epäonnistui.",
     "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
-    "Uploading %(filename)s and %(count)s others|other": "Lähetetään %(filename)s ja %(count)s muuta",
     "Upload Failed": "Lähetys epäonnistui",
     "Usage": "Käyttö",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s vaihtoi aiheeksi \"%(topic)s\".",
@@ -296,8 +302,13 @@
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Sinut ohjataan kolmannen osapuolen sivustolle, jotta voit autentikoida tilisi käyttääksesi palvelua %(integrationsUrl)s. Haluatko jatkaa?",
     "A text message has been sent to %(msisdn)s": "Tekstiviesti lähetetty numeroon %(msisdn)s",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "were unbanned %(count)s times|other": "vapautettiin porttikiellosta %(count)s kertaa",
-    "And %(count)s more...|other": "Ja %(count)s muuta...",
+    "were unbanned %(count)s times": {
+        "other": "vapautettiin porttikiellosta %(count)s kertaa",
+        "one": "vapautettiin porttikiellosta"
+    },
+    "And %(count)s more...": {
+        "other": "Ja %(count)s muuta..."
+    },
     "Leave": "Poistu",
     "Description": "Kuvaus",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Huomaa että olet kirjautumassa palvelimelle %(hs)s, etkä palvelimelle matrix.org.",
@@ -334,50 +345,89 @@
     "URL previews are disabled by default for participants in this room.": "URL-esikatselut ovat oletuksena pois päältä tämän huoneen jäsenillä.",
     "Token incorrect": "Väärä tunniste",
     "Delete Widget": "Poista sovelma",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s liittyivät",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s liittyi %(count)s kertaa",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s liittyi",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s poistuivat %(count)s kertaa",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s poistuivat",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s poistui %(count)s kertaa",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s poistui",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s liittyivät ja poistuivat %(count)s kertaa",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s liittyivät ja poistuivat",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s liittyi ja poistui %(count)s kertaa",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s liittyi ja poistui",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s poistuivat ja liittyivät uudelleen %(count)s kertaa",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s poistuivat ja liittyivät uudelleen",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s poistui ja liittyi uudelleen %(count)s kertaa",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s poistui ja liittyi uudelleen",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hylkäsivät kutsunsa %(count)s kertaa",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hylkäsivät kutsunsa",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s hylkäsi kutsun %(count)s kertaa",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s hylkäsi kutsun",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "Käyttäjien %(severalUsers)s kutsut peruttiin %(count)s kertaa",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "Käyttäjien %(severalUsers)s kutsut peruttiin",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "Käyttäjän %(oneUser)s kutsu peruttiin %(count)s kertaa",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "Käyttäjän %(oneUser)s kutsu peruttiin",
-    "were invited %(count)s times|other": "kutsuttiin %(count)s kertaa",
-    "were invited %(count)s times|one": "kutsuttiin",
-    "was invited %(count)s times|other": "kutsuttiin %(count)s kertaa",
-    "was invited %(count)s times|one": "kutsuttiin",
-    "were banned %(count)s times|other": "saivat porttikiellon %(count)s kertaa",
-    "were banned %(count)s times|one": "saivat porttikiellon",
-    "was banned %(count)s times|other": "sai porttikiellon %(count)s kertaa",
-    "was banned %(count)s times|one": "sai porttikiellon",
-    "were unbanned %(count)s times|one": "vapautettiin porttikiellosta",
-    "was unbanned %(count)s times|other": "porttikielto poistettiin %(count)s kertaa",
-    "was unbanned %(count)s times|one": "porttikielto poistettiin",
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)s liittyivät",
+        "other": "%(severalUsers)s liittyivät %(count)s kertaa"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s liittyi %(count)s kertaa",
+        "one": "%(oneUser)s liittyi"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s poistuivat %(count)s kertaa",
+        "one": "%(severalUsers)s poistuivat"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s poistui %(count)s kertaa",
+        "one": "%(oneUser)s poistui"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s liittyivät ja poistuivat %(count)s kertaa",
+        "one": "%(severalUsers)s liittyivät ja poistuivat"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s liittyi ja poistui %(count)s kertaa",
+        "one": "%(oneUser)s liittyi ja poistui"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s poistuivat ja liittyivät uudelleen %(count)s kertaa",
+        "one": "%(severalUsers)s poistuivat ja liittyivät uudelleen"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s poistui ja liittyi uudelleen %(count)s kertaa",
+        "one": "%(oneUser)s poistui ja liittyi uudelleen"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s hylkäsivät kutsunsa %(count)s kertaa",
+        "one": "%(severalUsers)s hylkäsivät kutsunsa"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s hylkäsi kutsun %(count)s kertaa",
+        "one": "%(oneUser)s hylkäsi kutsun"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "Käyttäjien %(severalUsers)s kutsut peruttiin %(count)s kertaa",
+        "one": "Käyttäjien %(severalUsers)s kutsut peruttiin"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "Käyttäjän %(oneUser)s kutsu peruttiin %(count)s kertaa",
+        "one": "Käyttäjän %(oneUser)s kutsu peruttiin"
+    },
+    "were invited %(count)s times": {
+        "other": "kutsuttiin %(count)s kertaa",
+        "one": "kutsuttiin"
+    },
+    "was invited %(count)s times": {
+        "other": "kutsuttiin %(count)s kertaa",
+        "one": "kutsuttiin"
+    },
+    "were banned %(count)s times": {
+        "other": "saivat porttikiellon %(count)s kertaa",
+        "one": "saivat porttikiellon"
+    },
+    "was banned %(count)s times": {
+        "other": "sai porttikiellon %(count)s kertaa",
+        "one": "sai porttikiellon"
+    },
+    "was unbanned %(count)s times": {
+        "other": "porttikielto poistettiin %(count)s kertaa",
+        "one": "porttikielto poistettiin"
+    },
     "expand": "laajenna",
     "collapse": "supista",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Sovelman poistaminen poistaa sen kaikilta huoneen käyttäjiltä. Haluatko varmasti poistaa tämän sovelman?",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s liittyivät %(count)s kertaa",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s vaihtoivat nimensä %(count)s kertaa",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s vaihtoivat nimensä",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s vaihtoi nimensä %(count)s kertaa",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s vaihtoi nimensä",
-    "%(items)s and %(count)s others|other": "%(items)s ja %(count)s muuta",
-    "%(items)s and %(count)s others|one": "%(items)s ja yksi muu",
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s vaihtoivat nimensä %(count)s kertaa",
+        "one": "%(severalUsers)s vaihtoivat nimensä"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s vaihtoi nimensä %(count)s kertaa",
+        "one": "%(oneUser)s vaihtoi nimensä"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s ja %(count)s muuta",
+        "one": "%(items)s ja yksi muu"
+    },
     "Old cryptography data detected": "Vanhaa salaustietoa havaittu",
     "Warning": "Varoitus",
     "Sunday": "Sunnuntai",
@@ -626,8 +676,10 @@
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s vaihtoi liittymisen ehdoksi säännön %(rule)s",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s vaihtoi vieraiden pääsyn tilaan %(rule)s",
     "%(displayName)s is typing …": "%(displayName)s kirjoittaa…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s ja %(count)s muuta kirjoittavat…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ja yksi muu kirjoittavat…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s ja %(count)s muuta kirjoittavat…",
+        "one": "%(names)s ja yksi muu kirjoittavat…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ja %(lastPerson)s kirjoittavat…",
     "This homeserver has hit its Monthly Active User limit.": "Tämän kotipalvelimen kuukausittaisten aktiivisten käyttäjien raja on täynnä.",
     "This homeserver has exceeded one of its resource limits.": "Tämä kotipalvelin on ylittänyt yhden rajoistaan.",
@@ -790,8 +842,10 @@
     "Invited by %(sender)s": "Kutsuttu henkilön %(sender)s toimesta",
     "Remember my selection for this widget": "Muista valintani tälle sovelmalle",
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Tunnistimme dataa, joka on lähtöisin vanhasta %(brand)sin versiosta. Tämä aiheuttaa toimintahäiriöitä päästä päähän -salauksessa vanhassa versiossa. Viestejä, jotka on salattu päästä päähän -salauksella vanhalla versiolla, ei välttämättä voida purkaa tällä versiolla. Tämä voi myös aiheuttaa epäonnistumisia viestien välityksessä tämän version kanssa. Jos kohtaat ongelmia, kirjaudu ulos ja takaisin sisään. Säilyttääksesi viestihistoriasi, vie salausavaimesi ja tuo ne uudelleen.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Sinulla on %(count)s lukematonta ilmoitusta huoneen edellisessä versiossa.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Sinulla on %(count)s lukematon ilmoitus huoneen edellisessä versiossa.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Sinulla on %(count)s lukematonta ilmoitusta huoneen edellisessä versiossa.",
+        "one": "Sinulla on %(count)s lukematon ilmoitus huoneen edellisessä versiossa."
+    },
     "Your password has been reset.": "Salasanasi on nollattu.",
     "Invalid homeserver discovery response": "Epäkelpo kotipalvelimen etsinnän vastaus",
     "Invalid identity server discovery response": "Epäkelpo identiteettipalvelimen etsinnän vastaus",
@@ -835,8 +889,10 @@
     "Upload files": "Lähetä tiedostot",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Tiedostot ovat <b>liian isoja</b> lähetettäväksi. Tiedoston kokoraja on %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Osa tiedostoista on <b>liian isoja</b> lähetettäväksi. Tiedoston kokoraja on %(limit)s.",
-    "Upload %(count)s other files|other": "Lähetä %(count)s muuta tiedostoa",
-    "Upload %(count)s other files|one": "Lähetä %(count)s muu tiedosto",
+    "Upload %(count)s other files": {
+        "other": "Lähetä %(count)s muuta tiedostoa",
+        "one": "Lähetä %(count)s muu tiedosto"
+    },
     "Cancel All": "Peruuta kaikki",
     "Upload Error": "Lähetysvirhe",
     "Use an email address to recover your account": "Voit palauttaa tilisi sähköpostiosoitteen avulla",
@@ -891,10 +947,14 @@
     "Upload all": "Lähetä kaikki palvelimelle",
     "Upload": "Lähetä",
     "Show all": "Näytä kaikki",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s eivät tehneet muutoksia %(count)s kertaa",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s eivät tehneet muutoksia",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s ei tehnyt muutoksia %(count)s kertaa",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s ei tehnyt muutoksia",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s eivät tehneet muutoksia %(count)s kertaa",
+        "one": "%(severalUsers)s eivät tehneet muutoksia"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s ei tehnyt muutoksia %(count)s kertaa",
+        "one": "%(oneUser)s ei tehnyt muutoksia"
+    },
     "Your homeserver doesn't seem to support this feature.": "Kotipalvelimesi ei näytä tukevan tätä ominaisuutta.",
     "Resend %(unsentCount)s reaction(s)": "Lähetä %(unsentCount)s reaktio(ta) uudelleen",
     "You're signed out": "Sinut on kirjattu ulos",
@@ -961,7 +1021,10 @@
     "No recent messages by %(user)s found": "Käyttäjän %(user)s kirjoittamia viimeaikaisia viestejä ei löytynyt",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Kokeile vierittää aikajanaa ylöspäin nähdäksesi, löytyykö aiempia viestejä.",
     "Remove recent messages by %(user)s": "Poista käyttäjän %(user)s viimeaikaiset viestit",
-    "Remove %(count)s messages|other": "Poista %(count)s viestiä",
+    "Remove %(count)s messages": {
+        "other": "Poista %(count)s viestiä",
+        "one": "Poista yksi viesti"
+    },
     "Remove recent messages": "Poista viimeaikaiset viestit",
     "Bold": "Lihavoitu",
     "Italics": "Kursivoitu",
@@ -995,8 +1058,14 @@
     "Topic (optional)": "Aihe (valinnainen)",
     "Show previews/thumbnails for images": "Näytä kuvien esikatselut/pienoiskuvat",
     "Clear cache and reload": "Tyhjennä välimuisti ja lataa uudelleen",
-    "%(count)s unread messages including mentions.|other": "%(count)s lukematonta viestiä, sisältäen maininnat.",
-    "%(count)s unread messages.|other": "%(count)s lukematonta viestiä.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s lukematonta viestiä, sisältäen maininnat.",
+        "one": "Yksi lukematon maininta."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s lukematonta viestiä.",
+        "one": "Yksi lukematon viesti."
+    },
     "Show image": "Näytä kuva",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Luo uusi issue</newIssueLink> GitHubissa, jotta voimme tutkia tätä ongelmaa.",
     "Close dialog": "Sulje dialogi",
@@ -1008,7 +1077,6 @@
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "tarkistaa, että selaimen lisäosat (kuten Privacy Badger) eivät estä identiteettipalvelinta",
     "contact the administrators of identity server <idserver />": "ottaa yhteyttä identiteettipalvelimen <idserver /> ylläpitäjiin",
     "wait and try again later": "odottaa ja yrittää uudelleen myöhemmin",
-    "Remove %(count)s messages|one": "Poista yksi viesti",
     "Room %(name)s": "Huone %(name)s",
     "React": "Reagoi",
     "Frequently Used": "Usein käytetyt",
@@ -1046,8 +1114,6 @@
     "eg: @bot:* or example.org": "esim. @bot:* tai esimerkki.org",
     "Your email address hasn't been verified yet": "Sähköpostiosoitettasi ei ole vielä varmistettu",
     "Verify the link in your inbox": "Varmista sähköpostiisi saapunut linkki",
-    "%(count)s unread messages including mentions.|one": "Yksi lukematon maininta.",
-    "%(count)s unread messages.|one": "Yksi lukematon viesti.",
     "Unread messages.": "Lukemattomat viestit.",
     "Message Actions": "Viestitoiminnot",
     "Custom (%(level)s)": "Mukautettu (%(level)s)",
@@ -1163,8 +1229,10 @@
     "<userName/> wants to chat": "<userName/> haluaa keskustella",
     "Start chatting": "Aloita keskustelu",
     "Hide verified sessions": "Piilota varmennetut istunnot",
-    "%(count)s verified sessions|other": "%(count)s varmennettua istuntoa",
-    "%(count)s verified sessions|one": "1 varmennettu istunto",
+    "%(count)s verified sessions": {
+        "other": "%(count)s varmennettua istuntoa",
+        "one": "1 varmennettu istunto"
+    },
     "Reactions": "Reaktiot",
     "Language Dropdown": "Kielipudotusvalikko",
     "Upgrade private room": "Päivitä yksityinen huone",
@@ -1212,8 +1280,10 @@
     "Enable desktop notifications for this session": "Ota käyttöön työpöytäilmoitukset tälle istunnolle",
     "Enable audible notifications for this session": "Ota käyttöön ääni-ilmoitukset tälle istunnolle",
     "Someone is using an unknown session": "Joku käyttää tuntematonta istuntoa",
-    "%(count)s sessions|other": "%(count)s istuntoa",
-    "%(count)s sessions|one": "%(count)s istunto",
+    "%(count)s sessions": {
+        "other": "%(count)s istuntoa",
+        "one": "%(count)s istunto"
+    },
     "Hide sessions": "Piilota istunnot",
     "Clear all data in this session?": "Poista kaikki tämän istunnon tiedot?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Kaikkien tämän istunnon tietojen poistaminen on pysyvää. Salatut viestit menetetään, ellei niiden avaimia ole varmuuskopioitu.",
@@ -1263,10 +1333,14 @@
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Antamasi allekirjoitusavain täsmää käyttäjältä %(userId)s saamaasi istunnon %(deviceId)s allekirjoitusavaimeen. Istunto on varmennettu.",
     "Displays information about a user": "Näyttää tietoa käyttäjästä",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s vaihtoi huoneen nimen %(oldRoomName)s nimeksi %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lisäsi vaihtoehtoiset osoitteet %(addresses)s tälle huoneelle.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s lisäsi vaihtoehtoisen osoitteen %(addresses)s tälle huoneelle.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s poisti vaihtoehtoiset osoitteet %(addresses)s tältä huoneelta.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s poisti vaihtoehtoisen osoitteitteen %(addresses)s tältä huoneelta.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s lisäsi vaihtoehtoiset osoitteet %(addresses)s tälle huoneelle.",
+        "one": "%(senderName)s lisäsi vaihtoehtoisen osoitteen %(addresses)s tälle huoneelle."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s poisti vaihtoehtoiset osoitteet %(addresses)s tältä huoneelta.",
+        "one": "%(senderName)s poisti vaihtoehtoisen osoitteitteen %(addresses)s tältä huoneelta."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s muutti tämän huoneen vaihtoehtoisia osoitteita.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutti tämän huoneen pää- sekä vaihtoehtoisia osoitteita.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s muutti tämän huoneen osoitteita.",
@@ -1498,8 +1572,10 @@
     "Wrong file type": "Väärä tiedostotyyppi",
     "Room address": "Huoneen osoite",
     "Message deleted on %(date)s": "Viesti poistettu %(date)s",
-    "Show %(count)s more|one": "Näytä %(count)s lisää",
-    "Show %(count)s more|other": "Näytä %(count)s lisää",
+    "Show %(count)s more": {
+        "one": "Näytä %(count)s lisää",
+        "other": "Näytä %(count)s lisää"
+    },
     "Mod": "Valvoja",
     "Read Marker off-screen lifetime (ms)": "Viestin luetuksi merkkaamisen kesto, kun Element ei ole näkyvissä (ms)",
     "Add widgets, bridges & bots": "Lisää sovelmia, siltoja ja botteja",
@@ -1890,7 +1966,9 @@
     "Use the <a>Desktop app</a> to see all encrypted files": "Voit tarkastella kaikkia salattuja tiedostoja <a>työpöytäsovelluksella</a>",
     "Use the <a>Desktop app</a> to search encrypted messages": "Käytä salattuja viestejä <a>työpöytäsovelluksella</a>",
     "Ignored attempt to disable encryption": "Ohitettu yritys poistaa salaus käytöstä",
-    "You can only pin up to %(count)s widgets|other": "Voit kiinnittää enintään %(count)s sovelmaa",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Voit kiinnittää enintään %(count)s sovelmaa"
+    },
     "Favourited": "Suositut",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s loi tämän huoneen palvelinten pääsynvalvontalistan.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s muutti tämän huoneen palvelinten pääsynvalvontalistaa.",
@@ -2019,10 +2097,14 @@
     "No results found": "Tuloksia ei löytynyt",
     "Mark as not suggested": "Merkitse ei-ehdotetuksi",
     "Mark as suggested": "Merkitse ehdotetuksi",
-    "%(count)s rooms|one": "%(count)s huone",
-    "%(count)s rooms|other": "%(count)s huonetta",
-    "%(count)s members|one": "%(count)s jäsen",
-    "%(count)s members|other": "%(count)s jäsentä",
+    "%(count)s rooms": {
+        "one": "%(count)s huone",
+        "other": "%(count)s huonetta"
+    },
+    "%(count)s members": {
+        "one": "%(count)s jäsen",
+        "other": "%(count)s jäsentä"
+    },
     "You don't have permission": "Sinulla ei ole lupaa",
     "Remember this": "Muista tämä",
     "Save Changes": "Tallenna muutokset",
@@ -2077,15 +2159,21 @@
     "We couldn't create your DM.": "Yksityisviestiä ei voitu luoda.",
     "Want to add a new room instead?": "Haluatko kuitenkin lisätä uuden huoneen?",
     "Add existing rooms": "Lisää olemassa olevia huoneita",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Lisätään huonetta...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Lisätään huoneita... (%(progress)s/%(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Lisätään huonetta...",
+        "other": "Lisätään huoneita... (%(progress)s/%(count)s)"
+    },
     "Not all selected were added": "Kaikkia valittuja ei lisätty",
     "You are not allowed to view this server's rooms list": "Sinulla ei ole oikeuksia nähdä tämän palvelimen huoneluetteloa",
     "View message": "Näytä viesti",
-    "%(count)s people you know have already joined|one": "%(count)s tuntemasi henkilö on jo liittynyt",
-    "%(count)s people you know have already joined|other": "%(count)s tuntemaasi ihmistä on jo liittynyt",
-    "View all %(count)s members|one": "Näytä yksi jäsen",
-    "View all %(count)s members|other": "Näytä kaikki %(count)s jäsentä",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s tuntemasi henkilö on jo liittynyt",
+        "other": "%(count)s tuntemaasi ihmistä on jo liittynyt"
+    },
+    "View all %(count)s members": {
+        "one": "Näytä yksi jäsen",
+        "other": "Näytä kaikki %(count)s jäsentä"
+    },
     "Add reaction": "Lisää reaktio",
     "Error processing voice message": "Virhe ääniviestin käsittelyssä",
     "We were unable to access your microphone. Please check your browser settings and try again.": "Mikrofoniasi ei voitu käyttää. Tarkista selaimesi asetukset ja yritä uudelleen.",
@@ -2186,8 +2274,10 @@
     "Change space avatar": "Vaihda avaruuden kuva",
     "Message bubbles": "Viestikuplat",
     "Space members": "Avaruuden jäsenet",
-    "& %(count)s more|one": "& %(count)s lisää",
-    "& %(count)s more|other": "& %(count)s lisää",
+    "& %(count)s more": {
+        "one": "& %(count)s lisää",
+        "other": "& %(count)s lisää"
+    },
     "Anyone can find and join.": "Kuka tahansa voi löytää ja liittyä.",
     "Only invited people can join.": "Vain kutsutut ihmiset voivat liittyä.",
     "Space options": "Avaruuden valinnat",
@@ -2369,13 +2459,19 @@
     "Unban from %(roomName)s": "Poista porttikielto huoneeseen %(roomName)s",
     "Export chat": "Vie keskustelu",
     "Insert link": "Lisää linkki",
-    "Show %(count)s other previews|one": "Näytä %(count)s muu esikatselu",
-    "Show %(count)s other previews|other": "Näytä %(count)s muuta esikatselua",
-    "%(count)s reply|one": "%(count)s vastaus",
-    "%(count)s reply|other": "%(count)s vastausta",
+    "Show %(count)s other previews": {
+        "one": "Näytä %(count)s muu esikatselu",
+        "other": "Näytä %(count)s muuta esikatselua"
+    },
+    "%(count)s reply": {
+        "one": "%(count)s vastaus",
+        "other": "%(count)s vastausta"
+    },
     "Failed to update the join rules": "Liittymissääntöjen päivittäminen epäonnistui",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Lähetetään kutsua...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Lähetetään kutsuja... (%(progress)s / %(count)s)",
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Lähetetään kutsua...",
+        "other": "Lähetetään kutsuja... (%(progress)s / %(count)s)"
+    },
     "Loading new room": "Ladataan uutta huonetta",
     "Upgrading room": "Päivitetään huonetta",
     "Upgrade required": "Päivitys vaaditaan",
@@ -2393,14 +2489,18 @@
     "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s antoi porttikiellon käyttäjälle %(targetName)s: %(reason)s",
     "Sidebar": "Sivupalkki",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Jaa anonyymia tietoa auttaaksesi ongelmien tunnistamisessa. Ei mitään henkilökohtaista. Ei kolmansia osapuolia.",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Päivitetään avaruutta...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Päivitetään avaruuksia... (%(progress)s/%(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Päivitetään avaruutta...",
+        "other": "Päivitetään avaruuksia... (%(progress)s/%(count)s)"
+    },
     "Use high contrast": "Käytä suurta kontrastia",
     "To view all keyboard shortcuts, <a>click here</a>.": "Katso kaikki pikanäppäimet <a>napsauttamalla tästä</a>.",
     "Select all": "Valitse kaikki",
     "Deselect all": "Älä valitse mitään",
-    "Click the button below to confirm signing out these devices.|one": "Napsauta alla olevaa painiketta vahvistaaksesi tämän laitteen uloskirjauksen.",
-    "Click the button below to confirm signing out these devices.|other": "Napsauta alla olevaa painiketta vahvistaaksesi näiden laitteiden uloskirjauksen.",
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Napsauta alla olevaa painiketta vahvistaaksesi tämän laitteen uloskirjauksen.",
+        "other": "Napsauta alla olevaa painiketta vahvistaaksesi näiden laitteiden uloskirjauksen."
+    },
     "Add some details to help people recognise it.": "Lisää joitain tietoja, jotta ihmiset tunnistavat sen.",
     "Pin to sidebar": "Kiinnitä sivupalkkiin",
     "Quick settings": "Pika-asetukset",
@@ -2452,14 +2552,18 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Kuka tahansa avaruudessa <spaceName/> voi löytää ja liittyä. Voit valita muitakin avaruuksia.",
     "Spaces with access": "Avaruudet, joilla on pääsyoikeus",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Kuka tahansa avaruuden jäsen voi löytää ja liittyä. <a>Muokkaa millä avaruuksilla on pääsyoikeus täällä.</a>",
-    "Currently, %(count)s spaces have access|one": "Tällä hetkellä yhdellä avaruudella on pääsyoikeus",
-    "Currently, %(count)s spaces have access|other": "Tällä hetkellä %(count)s avaruudella on pääsyoikeus",
+    "Currently, %(count)s spaces have access": {
+        "one": "Tällä hetkellä yhdellä avaruudella on pääsyoikeus",
+        "other": "Tällä hetkellä %(count)s avaruudella on pääsyoikeus"
+    },
     "Failed to update the visibility of this space": "Avaruuden näkyvyyden muuttaminen epäonnistui",
     "Failed to update the history visibility of this space": "Historian näkyvyysasetusten muuttaminen epäonnistui",
     "Failed to update the guest access of this space": "Vieraiden pääsyasetusten muuttaminen epäonnistui",
     "Sends the given message with a space themed effect": "Lähetä annettu viesti avaruusteemaisella tehosteella",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s ja %(count)s muu",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s ja %(count)s muuta",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s ja %(count)s muu",
+        "other": "%(spaceName)s ja %(count)s muuta"
+    },
     "Consult first": "Tiedustele ensin",
     "Transfer": "Siirrä",
     "Some suggestions may be hidden for privacy.": "Jotkut ehdotukset voivat olla piilotettu yksityisyyden takia.",
@@ -2486,15 +2590,23 @@
     "Command error: Unable to handle slash command.": "Määräys virhe: Ei voitu käsitellä / komentoa",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Lähetimme toisille, alla lista henkilöistä joita ei voitu kutsua <RoomName/>",
     "Location": "Sijainti",
-    "%(count)s votes|one": "%(count)s ääni",
-    "%(count)s votes|other": "%(count)s ääntä",
-    "Based on %(count)s votes|one": "Perustuu %(count)s ääneen",
-    "Based on %(count)s votes|other": "Perustuu %(count)s ääneen",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s ääni annettu. Äänestä nähdäksesi tulokset",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s ääntä annettu. Äänestä nähdäksesi tulokset",
+    "%(count)s votes": {
+        "one": "%(count)s ääni",
+        "other": "%(count)s ääntä"
+    },
+    "Based on %(count)s votes": {
+        "one": "Perustuu %(count)s ääneen",
+        "other": "Perustuu %(count)s ääneen"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s ääni annettu. Äänestä nähdäksesi tulokset",
+        "other": "%(count)s ääntä annettu. Äänestä nähdäksesi tulokset"
+    },
     "No votes cast": "Ääniä ei annettu",
-    "Final result based on %(count)s votes|one": "Lopullinen tulos %(count)s äänen perusteella",
-    "Final result based on %(count)s votes|other": "Lopullinen tulos %(count)s äänen perusteella",
+    "Final result based on %(count)s votes": {
+        "one": "Lopullinen tulos %(count)s äänen perusteella",
+        "other": "Lopullinen tulos %(count)s äänen perusteella"
+    },
     "Sorry, your vote was not registered. Please try again.": "Valitettavasti ääntäsi ei rekisteröity. Yritä uudelleen.",
     "Vote not registered": "Ääntä ei rekisteröity",
     "Almost there! Is your other device showing the same shield?": "Melkein valmista! Näyttääkö toinen laitteesi saman kilven?",
@@ -2507,8 +2619,10 @@
     "To publish an address, it needs to be set as a local address first.": "Osoitteen julkaisemiseksi se täytyy ensin asettaa paikalliseksi osoitteeksi.",
     "Published addresses can be used by anyone on any server to join your room.": "Julkaistujen osoitteiden avulla kuka tahansa millä tahansa palvelimella voi liittyä huoneeseesi.",
     "You were removed from %(roomName)s by %(memberName)s": "%(memberName)s poisti sinut huoneesta %(roomName)s",
-    "Currently joining %(count)s rooms|one": "Liitytään parhaillaan %(count)s huoneeseen",
-    "Currently joining %(count)s rooms|other": "Liitytään parhaillaan %(count)s huoneeseen",
+    "Currently joining %(count)s rooms": {
+        "one": "Liitytään parhaillaan %(count)s huoneeseen",
+        "other": "Liitytään parhaillaan %(count)s huoneeseen"
+    },
     "Join public room": "Liity julkiseen huoneeseen",
     "Start new chat": "Aloita uusi keskustelu",
     "Message didn't send. Click for info.": "Viestiä ei lähetetty. Lisätietoa napsauttamalla.",
@@ -2538,16 +2652,24 @@
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "Jaa anonyymiä tietoa ongelmien tunnistamiseksi. Ei mitään henkilökohtaista. Ei kolmansia tahoja. <LearnMoreLink>Lue lisää</LearnMoreLink>",
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "Olet aiemmin suostunut jakamaan anonyymiä käyttötietoa kanssamme. Päivitämme jakamisen toimintaperiaatteita.",
     "That's fine": "Sopii",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s tapahtuma viety %(seconds)s sekunnissa",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s tapahtumaa viety %(seconds)s sekunnissa",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s tapahtuma viety %(seconds)s sekunnissa",
+        "other": "%(count)s tapahtumaa viety %(seconds)s sekunnissa"
+    },
     "Export successful!": "Vienti onnistui!",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s tapahtuma noudettu %(seconds)s sekunnissa",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s tapahtumaa noudettu %(seconds)s sekunnissa",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "%(count)s tapahtuma noudettu %(seconds)s sekunnissa",
+        "other": "%(count)s tapahtumaa noudettu %(seconds)s sekunnissa"
+    },
     "Processing event %(number)s out of %(total)s": "Käsitellään tapahtumaa %(number)s / %(total)s",
-    "Fetched %(count)s events so far|one": "%(count)s tapahtuma noudettu tähän mennessä",
-    "Fetched %(count)s events so far|other": "%(count)s tapahtumaa noudettu tähän mennessä",
-    "Fetched %(count)s events out of %(total)s|one": "%(count)s / %(total)s tapahtumaa noudettu",
-    "Fetched %(count)s events out of %(total)s|other": "%(count)s / %(total)s tapahtumaa noudettu",
+    "Fetched %(count)s events so far": {
+        "one": "%(count)s tapahtuma noudettu tähän mennessä",
+        "other": "%(count)s tapahtumaa noudettu tähän mennessä"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "%(count)s / %(total)s tapahtumaa noudettu",
+        "other": "%(count)s / %(total)s tapahtumaa noudettu"
+    },
     "Generating a ZIP": "Luodaan ZIPiä",
     "Light high contrast": "Vaalea, suuri kontrasti",
     "%(senderName)s has ended a poll": "%(senderName)s on lopettanut kyselyn",
@@ -2571,14 +2693,22 @@
     "Edit poll": "Muokkaa kyselyä",
     "Create Poll": "Luo kysely",
     "Create poll": "Luo kysely",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)spoisti viestin",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)spoistivat %(count)s viestiä",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)spoistivat viestin",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)spoistivat %(count)s viestiä",
-    "was removed %(count)s times|one": "poistettiin",
-    "was removed %(count)s times|other": "poistettiin %(count)s kertaa",
-    "were removed %(count)s times|one": "poistettiin",
-    "were removed %(count)s times|other": "poistettiin %(count)s kertaa",
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)spoisti viestin",
+        "other": "%(oneUser)spoistivat %(count)s viestiä"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)spoistivat viestin",
+        "other": "%(severalUsers)spoistivat %(count)s viestiä"
+    },
+    "was removed %(count)s times": {
+        "one": "poistettiin",
+        "other": "poistettiin %(count)s kertaa"
+    },
+    "were removed %(count)s times": {
+        "one": "poistettiin",
+        "other": "poistettiin %(count)s kertaa"
+    },
     "My current location": "Tämänhetkinen sijaintini",
     "%(brand)s could not send your location. Please try again later.": "%(brand)s ei voinut lähettää sijaintiasi. Yritä myöhemmin uudelleen.",
     "Unknown error fetching location. Please try again later.": "Tuntematon virhe sijaintia noudettaessa. Yritä myöhemmin uudelleen.",
@@ -2599,8 +2729,10 @@
     "Manage pinned events": "Hallitse kiinnitettyjä tapahtumia",
     "Remove messages sent by me": "Poista lähettämäni viestit",
     "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "Tämä huone ei siltaa viestejä millekään alustalle. <a>Lue lisää.</a>",
-    "Sign out devices|one": "Kirjaa laite ulos",
-    "Sign out devices|other": "Kirjaa laitteet ulos",
+    "Sign out devices": {
+        "one": "Kirjaa laite ulos",
+        "other": "Kirjaa laitteet ulos"
+    },
     "No virtual room for this room": "Tällä huoneella ei ole virtuaalihuonetta",
     "Switches to this room's virtual room, if it has one": "Vaihtaa tämän huoneen virtuaalihuoneeseen, mikäli huoneella sellainen on",
     "Removes user with given id from this room": "Poistaa tunnuksen mukaisen käyttäjän tästä huoneesta",
@@ -2613,7 +2745,10 @@
     "Export Cancelled": "Vienti peruttu",
     "The poll has ended. Top answer: %(topAnswer)s": "Kysely on päättynyt. Suosituin vastaus: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "Kysely on päättynyt. Ääniä ei annettu.",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Olet poistamassa käyttäjän %(user)s %(count)s viestiä. Toimenpide poistaa ne pysyvästi kaikilta keskustelun osapuolilta. Haluatko jatkaa?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "other": "Olet poistamassa käyttäjän %(user)s %(count)s viestiä. Toimenpide poistaa ne pysyvästi kaikilta keskustelun osapuolilta. Haluatko jatkaa?",
+        "one": "Olet poistamassa käyttäjän %(user)s yhtä viestiä. Toimenpide poistaa ne pysyvästi kaikilta keskustelun osapuolilta. Haluatko jatkaa?"
+    },
     "To leave the beta, visit your settings.": "Poistu beetasta asetuksista.",
     "You can turn this off anytime in settings": "Tämän voi poistaa käytöstä koska tahansa asetuksista",
     "We <Bold>don't</Bold> share information with third parties": "<Bold>Emme</Bold> jaa tietoja kolmansille tahoille",
@@ -2623,14 +2758,22 @@
     "Missing room name or separator e.g. (my-room:domain.org)": "Puuttuva huoneen nimi tai erotin, esim. (oma-huone:verkkotunnus.org)",
     "Sorry, the poll you tried to create was not posted.": "Kyselyä, jota yritit luoda, ei valitettavasti julkaistu.",
     "Failed to post poll": "Kyselyn julkaiseminen epäonnistui",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)slähetti piilotetun viestin",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)slähetti %(count)s piilotettua viestiä",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)slähettivät piilotetun viestin",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)slähettivät %(count)s piilotettua viestiä",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)svaihtoi huoneen <a>kiinnitettyjä viestejä</a>",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)svaihtoi huoneen <a>kiinnitettyjä viestejä</a> %(count)s kertaa",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)svaihtoivat huoneen <a>kiinnitettyjä viestejä</a>",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)svaihtoivat huoneen <a>kiinnitettyjä viestejä</a> %(count)s kertaa",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)slähetti piilotetun viestin",
+        "other": "%(oneUser)slähetti %(count)s piilotettua viestiä"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)slähettivät piilotetun viestin",
+        "other": "%(severalUsers)slähettivät %(count)s piilotettua viestiä"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)svaihtoi huoneen <a>kiinnitettyjä viestejä</a>",
+        "other": "%(oneUser)svaihtoi huoneen <a>kiinnitettyjä viestejä</a> %(count)s kertaa"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)svaihtoivat huoneen <a>kiinnitettyjä viestejä</a>",
+        "other": "%(severalUsers)svaihtoivat huoneen <a>kiinnitettyjä viestejä</a> %(count)s kertaa"
+    },
     "Backspace": "Askelpalautin",
     "We couldn't send your location": "Emme voineet lähettää sijaintiasi",
     "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s ei saanut lupaa noutaa sijaintiasi. Salli sijainnin käyttäminen selaimen asetuksista.",
@@ -2642,8 +2785,10 @@
     "You were banned by %(memberName)s": "%(memberName)s antoi sinulle porttikiellon",
     "You were removed by %(memberName)s": "%(memberName)s poisti sinut",
     "Loading preview": "Ladataan esikatselua",
-    "Currently removing messages in %(count)s rooms|one": "Poistetaan parhaillaan viestejä yhdessä huoneessa",
-    "Currently removing messages in %(count)s rooms|other": "Poistetaan parhaillaan viestejä %(count)s huoneesta",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Poistetaan parhaillaan viestejä yhdessä huoneessa",
+        "other": "Poistetaan parhaillaan viestejä %(count)s huoneesta"
+    },
     "Busy": "Varattu",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "Tämän salatun viestin aitoutta ei voida taata tällä laitteella.",
     "Developer tools": "Kehittäjätyökalut",
@@ -2728,8 +2873,10 @@
     "The beginning of the room": "Huoneen alku",
     "Last month": "Viime kuukausi",
     "Last week": "Viime viikko",
-    "%(count)s participants|one": "1 osallistuja",
-    "%(count)s participants|other": "%(count)s osallistujaa",
+    "%(count)s participants": {
+        "one": "1 osallistuja",
+        "other": "%(count)s osallistujaa"
+    },
     "Copy room link": "Kopioi huoneen linkki",
     "New video room": "Uusi videohuone",
     "New room": "Uusi huone",
@@ -2744,7 +2891,6 @@
     "To continue, please enter your account password:": "Jatka kirjoittamalla tilisi salasana:",
     "You can't disable this later. Bridges & most bots won't work yet.": "Et voi poistaa tätä käytöstä myöhemmin. SIllat ja useimmat botit eivät vielä toimi.",
     "Preserve system messages": "Säilytä järjestelmän viestit",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Olet poistamassa käyttäjän %(user)s yhtä viestiä. Toimenpide poistaa ne pysyvästi kaikilta keskustelun osapuolilta. Haluatko jatkaa?",
     "Click to read topic": "Lue aihe napsauttamalla",
     "Edit topic": "Muokkaa aihetta",
     "What location type do you want to share?": "Minkä sijaintityypin haluat jakaa?",
@@ -2759,8 +2905,10 @@
     "Private room": "Yksityinen huone",
     "Video room": "Videohuone",
     "Read receipts": "Lukukuittaukset",
-    "Seen by %(count)s people|one": "Nähnyt yksi ihminen",
-    "Seen by %(count)s people|other": "Nähnyt %(count)s ihmistä",
+    "Seen by %(count)s people": {
+        "one": "Nähnyt yksi ihminen",
+        "other": "Nähnyt %(count)s ihmistä"
+    },
     "%(members)s and %(last)s": "%(members)s ja %(last)s",
     "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Ei ole suositeltavaa tehdä salausta käyttävistä huoneista julkisia.</b> Se tarkoittaa, että kuka vain voi löytää huoneen, joten kuka vain voi lukea viestejä. Salauksesta ei siis ole hyötyä. Viestien salaaminen julkisessa huoneessa hidastaa viestien vastaanottamista ja lähettämistä.",
     "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Vältä nämä ongelmat luomalla <a>uusi salausta käyttävä huone</a> keskustelua varten.",
@@ -2772,8 +2920,10 @@
     "Unmute microphone": "Poista mikrofonin mykistys",
     "Mute microphone": "Mykistä mikrofoni",
     "Audio devices": "Äänilaitteet",
-    "%(count)s people joined|one": "%(count)s ihminen liittyi",
-    "%(count)s people joined|other": "%(count)s ihmistä liittyi",
+    "%(count)s people joined": {
+        "one": "%(count)s ihminen liittyi",
+        "other": "%(count)s ihmistä liittyi"
+    },
     "sends hearts": "lähettää sydämiä",
     "Sends the given message with hearts": "Lähettää viestin sydämien kera",
     "Enable Markdown": "Ota Markdown käyttöön",
@@ -2807,7 +2957,9 @@
     "Input devices": "Sisääntulolaitteet",
     "Client Versions": "Asiakasversiot",
     "Server Versions": "Palvelinversiot",
-    "<%(count)s spaces>|other": "<%(count)s avaruutta>",
+    "<%(count)s spaces>": {
+        "other": "<%(count)s avaruutta>"
+    },
     "Click the button below to confirm setting up encryption.": "Napsauta alla olevaa painiketta vahvistaaksesi salauksen asettamisen.",
     "Forgotten or lost all recovery methods? <a>Reset all</a>": "Unohtanut tai kadottanut kaikki palautustavat? <a>Nollaa kaikki</a>",
     "Open room": "Avaa huone",
@@ -2834,8 +2986,10 @@
     "Group all your favourite rooms and people in one place.": "Ryhmitä kaikki suosimasi huoneet ja henkilöt yhteen paikkaan.",
     "Home is useful for getting an overview of everything.": "Koti on hyödyllinen, sillä sieltä näet yleisnäkymän kaikkeen.",
     "Deactivating your account is a permanent action — be careful!": "Tilin deaktivointi on peruuttamaton toiminto — ole varovainen!",
-    "Confirm signing out these devices|one": "Vahvista uloskirjautuminen tältä laitteelta",
-    "Confirm signing out these devices|other": "Vahvista uloskirjautuminen näiltä laitteilta",
+    "Confirm signing out these devices": {
+        "one": "Vahvista uloskirjautuminen tältä laitteelta",
+        "other": "Vahvista uloskirjautuminen näiltä laitteilta"
+    },
     "Cross-signing is ready but keys are not backed up.": "Ristiinvarmennus on valmis, mutta avaimia ei ole varmuuskopioitu.",
     "Search %(spaceName)s": "Etsi %(spaceName)s",
     "Call": "Soita",
@@ -2895,8 +3049,10 @@
     "We call the places where you can host your account 'homeservers'.": "Kutsumme \"kotipalvelimiksi\" paikkoja, missä voit isännöidä tiliäsi.",
     "Something went wrong in confirming your identity. Cancel and try again.": "Jokin meni pieleen henkilöllisyyttä vahvistaessa. Peruuta ja yritä uudelleen.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Vahvista tilin deaktivointi todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Vahvista tämän laitteen uloskirjaaminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Vahvista näiden laitteiden uloskirjaaminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Vahvista tämän laitteen uloskirjaaminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
+        "other": "Vahvista näiden laitteiden uloskirjaaminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen."
+    },
     "Switch to space by number": "Vaihda avaruuteen numerolla",
     "Navigate up in the room list": "Liiku ylös huoneluettelossa",
     "Navigate down in the room list": "Liiku alas huoneluettelossa",
@@ -2914,8 +3070,10 @@
     "You cannot search for rooms that are neither a room nor a space": "Et voi etsiä huoneita, jotka eivät ole huoneita tai avaruuksia",
     "Show spaces": "Näytä avaruudet",
     "Show rooms": "Näytä huoneet",
-    "%(count)s Members|one": "%(count)s jäsen",
-    "%(count)s Members|other": "%(count)s jäsentä",
+    "%(count)s Members": {
+        "one": "%(count)s jäsen",
+        "other": "%(count)s jäsentä"
+    },
     "Sections to show": "Näytettävät osiot",
     "Show: Matrix rooms": "Näytä: Matrix-huoneet",
     "Show: %(instance)s rooms (%(server)s)": "Näytä: %(instance)s-huoneet (%(server)s)",
@@ -3035,8 +3193,10 @@
     "Enable notifications for this device": "Ota ilmoitukset käyttöön tälle laitteelle",
     "Turn off to disable notifications on all your devices and sessions": "Poista käytöstä, niin kaikkien laitteiden ja istuntojen ilmoitukset ovat pois päältä",
     "Enable notifications for this account": "Ota ilmoitukset käyttöön tälle tilille",
-    "Only %(count)s steps to go|one": "Vain %(count)s vaihe jäljellä",
-    "Only %(count)s steps to go|other": "Vain %(count)s vaihetta jäljellä",
+    "Only %(count)s steps to go": {
+        "one": "Vain %(count)s vaihe jäljellä",
+        "other": "Vain %(count)s vaihetta jäljellä"
+    },
     "Welcome to %(brand)s": "Tervetuloa, tämä on %(brand)s",
     "Find your people": "Löydä ihmiset",
     "Community ownership": "Yhteisön omistajuus",
@@ -3077,19 +3237,25 @@
     "Video call started in %(roomName)s. (not supported by this browser)": "Videopuhelu alkoi huoneessa %(roomName)s. (ei tuettu selaimesi toimesta)",
     "Video call started in %(roomName)s.": "Videopuhelu alkoi huoneessa %(roomName)s.",
     "Empty room (was %(oldName)s)": "Tyhjä huone (oli %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Kutsutaan %(user)s ja 1 muu",
-    "Inviting %(user)s and %(count)s others|other": "Kutsutaan %(user)s ja %(count)s muuta",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Kutsutaan %(user)s ja 1 muu",
+        "other": "Kutsutaan %(user)s ja %(count)s muuta"
+    },
     "Inviting %(user1)s and %(user2)s": "Kutsutaan %(user1)s ja %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s ja 1 muu",
-    "%(user)s and %(count)s others|other": "%(user)s ja %(count)s muuta",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s ja 1 muu",
+        "other": "%(user)s ja %(count)s muuta"
+    },
     "%(user1)s and %(user2)s": "%(user1)s ja %(user2)s",
     "Force complete": "Pakota täydennys",
     "Open this settings tab": "Avaa tämä asetusvälilehti",
     "Jump to end of the composer": "Hyppää viestimuokkaimen loppuun",
     "Jump to start of the composer": "Hyppää viestimuokkaimen alkuun",
     "Toggle Link": "Linkki päälle/pois",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa. Käytössä %(size)s, talletetaan viestit %(rooms)s huoneesta.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa. Käytössä %(size)s, talletetaan viestit %(rooms)s huoneesta.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "other": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa. Käytössä %(size)s, talletetaan viestit %(rooms)s huoneesta.",
+        "one": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa. Käytössä %(size)s, talletetaan viestit %(rooms)s huoneesta."
+    },
     "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Varmuuskopioi salausavaimesi tilisi datan kanssa siltä varalta, että menetät pääsyn istuntoihisi. Avaimesi turvataan yksilöllisellä turva-avaimella.",
     "Your server doesn't support disabling sending read receipts.": "Palvelimesi ei tue lukukuittausten lähettämisen poistamista käytöstä.",
     "Next recently visited room or space": "Seuraava vierailtu huone tai avaruus",
@@ -3106,8 +3272,10 @@
     "Yes, the chat timeline is displayed alongside the video.": "Kyllä, keskustelun aikajana esitetään videon yhteydessä.",
     "Use the “+” button in the room section of the left panel.": "Käytä ”+”-painiketta vasemman paneelin huoneosiossa.",
     "A new way to chat over voice and video in %(brand)s.": "Uusi tapa keskustella äänen ja videon välityksellä %(brand)sissä.",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Avaruudessa %(spaceName)s ja %(count)s muussa avaruudessa.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Avaruudessa %(spaceName)s ja %(count)s muussa avaruudessa.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Avaruudessa %(spaceName)s ja %(count)s muussa avaruudessa.",
+        "other": "Avaruudessa %(spaceName)s ja %(count)s muussa avaruudessa."
+    },
     "Get notifications as set up in your <a>settings</a>": "Vastaanota ilmoitukset <a>asetuksissa</a> määrittämälläsi tavalla",
     "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "Vinkki: Jos teet virheilmoituksen, lähetä <debugLogsLink>vianjäljityslokit</debugLogsLink> jotta ongelman ratkaiseminen helpottuu.",
     "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Katso ensin <existingIssuesLink>aiemmin raportoidut virheet Githubissa</existingIssuesLink>. Eikö samanlaista virhettä löydy? <newIssueLink>Tee uusi ilmoitus virheestä</newIssueLink>.",
@@ -3166,8 +3334,10 @@
     "Video settings": "Videoasetukset",
     "Automatically adjust the microphone volume": "Säädä mikrofonin äänenvoimakkuutta automaattisesti",
     "Voice settings": "Ääniasetukset",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Haluatko varmasti kirjautua ulos %(count)s istunnosta?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Haluatko varmasti kirjautua ulos %(count)s istunnosta?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Haluatko varmasti kirjautua ulos %(count)s istunnosta?",
+        "other": "Haluatko varmasti kirjautua ulos %(count)s istunnosta?"
+    },
     "Reply in thread": "Vastaa ketjuun",
     "That e-mail address or phone number is already in use.": "Tämä sähköpostiosoite tai puhelinnumero on jo käytössä.",
     "Exporting your data": "Tietojen vienti",
@@ -3211,8 +3381,10 @@
     "Change layout": "Vaihda asettelua",
     "This message could not be decrypted": "Tämän viestin salausta ei voitu purkaa",
     "Improve your account security by following these recommendations.": "Paranna tilisi tietoturvaa seuraamalla näitä suosituksia.",
-    "%(count)s sessions selected|one": "%(count)s istunto valittu",
-    "%(count)s sessions selected|other": "%(count)s istuntoa valittu",
+    "%(count)s sessions selected": {
+        "one": "%(count)s istunto valittu",
+        "other": "%(count)s istuntoa valittu"
+    },
     "This session doesn't support encryption and thus can't be verified.": "Tämä istunto ei tue salausta, joten sitä ei voi vahvistaa.",
     "For best security and privacy, it is recommended to use Matrix clients that support encryption.": "Parhaan tietoturvan ja yksityisyyden vuoksi on suositeltavaa käyttää salausta tukevia Matrix-asiakasohjelmistoja.",
     "Upcoming features": "Tulevat ominaisuudet",
@@ -3268,8 +3440,10 @@
     "Link": "Linkki",
     "Create a link": "Luo linkki",
     " in <strong>%(room)s</strong>": " huoneessa <strong>%(room)s</strong>",
-    "Sign out of %(count)s sessions|one": "Kirjaudu ulos %(count)s istunnosta",
-    "Sign out of %(count)s sessions|other": "Kirjaudu ulos %(count)s istunnosta",
+    "Sign out of %(count)s sessions": {
+        "one": "Kirjaudu ulos %(count)s istunnosta",
+        "other": "Kirjaudu ulos %(count)s istunnosta"
+    },
     "Your current session is ready for secure messaging.": "Nykyinen istuntosi on valmis turvalliseen viestintään.",
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Kirjaudu ulos kaikista muista istunnoista (%(otherSessionsCount)s)",
     "You did it!": "Teit sen!",
@@ -3329,10 +3503,14 @@
     "unknown status code": "tuntematon tilakoodi",
     "Server returned %(statusCode)s with error code %(errorCode)s": "Palvelin palautti tilakoodin %(statusCode)s ja virhekoodin %(errorCode)s",
     "View poll": "Näytä kysely",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Menneitä kyselyitä ei ole viimeisen vuorokauden ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Menneitä kyselyitä ei ole viimeisen %(count)s päivän ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Aktiivisia kyselyitä ei ole viimeisen vuorokauden ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Aktiivisia kyselyitä ei ole viimeisen %(count)s päivän ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Menneitä kyselyitä ei ole viimeisen vuorokauden ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
+        "other": "Menneitä kyselyitä ei ole viimeisen %(count)s päivän ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt."
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Aktiivisia kyselyitä ei ole viimeisen vuorokauden ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
+        "other": "Aktiivisia kyselyitä ei ole viimeisen %(count)s päivän ajalta. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt."
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Menneitä kyselyitä ei ole. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
     "There are no active polls. Load more polls to view polls for previous months": "Aktiivisia kyselyitä ei ole. Lataa lisää kyselyitä nähdäksesi aiempien kuukausien kyselyt.",
     "There are no past polls in this room": "Tässä huoneessa ei ole menneitä kyselyitä",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index a2aafb4681..52dcd6dfc0 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -16,8 +16,10 @@
     "Admin": "Administrateur",
     "Advanced": "Avancé",
     "%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
-    "and %(count)s others...|other": "et %(count)s autres…",
-    "and %(count)s others...|one": "et un autre…",
+    "and %(count)s others...": {
+        "other": "et %(count)s autres…",
+        "one": "et un autre…"
+    },
     "A new password must be entered.": "Un nouveau mot de passe doit être saisi.",
     "Are you sure?": "Êtes-vous sûr ?",
     "Are you sure you want to reject the invitation?": "Voulez-vous vraiment rejeter l’invitation ?",
@@ -245,8 +247,10 @@
     "You have <a>enabled</a> URL previews by default.": "Vous avez <a>activé</a> les aperçus d’URL par défaut.",
     "Add": "Ajouter",
     "Uploading %(filename)s": "Envoi de %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Envoi de %(filename)s et %(count)s autre",
-    "Uploading %(filename)s and %(count)s others|other": "Envoi de %(filename)s et %(count)s autres",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Envoi de %(filename)s et %(count)s autre",
+        "other": "Envoi de %(filename)s et %(count)s autres"
+    },
     "You must <a>register</a> to use this functionality": "Vous devez vous <a>inscrire</a> pour utiliser cette fonctionnalité",
     "Create new room": "Créer un nouveau salon",
     "Start chat": "Commencer une conversation privée",
@@ -261,8 +265,10 @@
     "%(roomName)s is not accessible at this time.": "%(roomName)s n’est pas joignable pour le moment.",
     "Start authentication": "Commencer l’authentification",
     "Unnamed Room": "Salon anonyme",
-    "(~%(count)s results)|one": "(~%(count)s résultat)",
-    "(~%(count)s results)|other": "(~%(count)s résultats)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s résultat)",
+        "other": "(~%(count)s résultats)"
+    },
     "Home": "Accueil",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (rang %(powerLevelNumber)s)",
     "Your browser does not support the required cryptography extensions": "Votre navigateur ne prend pas en charge les extensions cryptographiques nécessaires",
@@ -311,49 +317,93 @@
     "Delete Widget": "Supprimer le widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Supprimer un widget le supprime pour tous les utilisateurs du salon. Voulez-vous vraiment supprimer ce widget ?",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s ont rejoint le salon %(count)s fois",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s ont rejoint le salon",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s a rejoint le salon %(count)s fois",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s a rejoint le salon",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s sont partis %(count)s fois",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s sont partis",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s est parti %(count)s fois",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s est parti",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s ont rejoint le salon et en sont partis %(count)s fois",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s ont rejoint le salon et en sont partis",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s a rejoint le salon et en est parti %(count)s fois",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s a rejoint le salon et en est parti",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s sont partis et revenus %(count)s fois",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s sont partis et revenus",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s est parti et revenu %(count)s fois",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s est parti et revenu",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s ont décliné leur invitation %(count)s fois",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s ont décliné leur invitation",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s a décliné son invitation %(count)s fois",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s a décliné son invitation",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s ont vu leur invitation révoquée %(count)s fois",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s ont vu leur invitation révoquée",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s a vu son invitation révoquée %(count)s fois",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s a vu son invitation révoquée",
-    "were invited %(count)s times|other": "ont été invités %(count)s fois",
-    "were invited %(count)s times|one": "ont été invités",
-    "was invited %(count)s times|other": "a été invité %(count)s fois",
-    "was invited %(count)s times|one": "a été invité",
-    "were banned %(count)s times|other": "ont été bannis %(count)s fois",
-    "were banned %(count)s times|one": "ont été bannis",
-    "was banned %(count)s times|other": "a été banni %(count)s fois",
-    "was banned %(count)s times|one": "a été banni",
-    "were unbanned %(count)s times|other": "ont vu leur bannissement révoqué %(count)s fois",
-    "were unbanned %(count)s times|one": "ont vu leur bannissement révoqué",
-    "was unbanned %(count)s times|other": "a vu son bannissement révoqué %(count)s fois",
-    "was unbanned %(count)s times|one": "a vu son bannissement révoqué",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s ont changé de nom %(count)s fois",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s ont changé de nom",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s a changé de nom %(count)s fois",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s a changé de nom",
-    "%(items)s and %(count)s others|other": "%(items)s et %(count)s autres",
-    "%(items)s and %(count)s others|one": "%(items)s et un autre",
-    "And %(count)s more...|other": "Et %(count)s autres…",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s ont rejoint le salon %(count)s fois",
+        "one": "%(severalUsers)s ont rejoint le salon"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s a rejoint le salon %(count)s fois",
+        "one": "%(oneUser)s a rejoint le salon"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s sont partis %(count)s fois",
+        "one": "%(severalUsers)s sont partis"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s est parti %(count)s fois",
+        "one": "%(oneUser)s est parti"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s ont rejoint le salon et en sont partis %(count)s fois",
+        "one": "%(severalUsers)s ont rejoint le salon et en sont partis"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s a rejoint le salon et en est parti %(count)s fois",
+        "one": "%(oneUser)s a rejoint le salon et en est parti"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s sont partis et revenus %(count)s fois",
+        "one": "%(severalUsers)s sont partis et revenus"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s est parti et revenu %(count)s fois",
+        "one": "%(oneUser)s est parti et revenu"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s ont décliné leur invitation %(count)s fois",
+        "one": "%(severalUsers)s ont décliné leur invitation"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s a décliné son invitation %(count)s fois",
+        "one": "%(oneUser)s a décliné son invitation"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s ont vu leur invitation révoquée %(count)s fois",
+        "one": "%(severalUsers)s ont vu leur invitation révoquée"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s a vu son invitation révoquée %(count)s fois",
+        "one": "%(oneUser)s a vu son invitation révoquée"
+    },
+    "were invited %(count)s times": {
+        "other": "ont été invités %(count)s fois",
+        "one": "ont été invités"
+    },
+    "was invited %(count)s times": {
+        "other": "a été invité %(count)s fois",
+        "one": "a été invité"
+    },
+    "were banned %(count)s times": {
+        "other": "ont été bannis %(count)s fois",
+        "one": "ont été bannis"
+    },
+    "was banned %(count)s times": {
+        "other": "a été banni %(count)s fois",
+        "one": "a été banni"
+    },
+    "were unbanned %(count)s times": {
+        "other": "ont vu leur bannissement révoqué %(count)s fois",
+        "one": "ont vu leur bannissement révoqué"
+    },
+    "was unbanned %(count)s times": {
+        "other": "a vu son bannissement révoqué %(count)s fois",
+        "one": "a vu son bannissement révoqué"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s ont changé de nom %(count)s fois",
+        "one": "%(severalUsers)s ont changé de nom"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s a changé de nom %(count)s fois",
+        "one": "%(oneUser)s a changé de nom"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s et %(count)s autres",
+        "one": "%(items)s et un autre"
+    },
+    "And %(count)s more...": {
+        "other": "Et %(count)s autres…"
+    },
     "Leave": "Quitter",
     "Description": "Description",
     "Mirror local video feed": "Inverser horizontalement la vidéo locale (effet miroir)",
@@ -590,8 +640,10 @@
     "Sets the room name": "Définit le nom du salon",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s a mis à niveau ce salon.",
     "%(displayName)s is typing …": "%(displayName)s est en train d'écrire…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s et %(count)s autres sont en train d’écrire…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s et un autre sont en train d’écrire…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s et %(count)s autres sont en train d’écrire…",
+        "one": "%(names)s et un autre sont en train d’écrire…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s et %(lastPerson)s sont en train d’écrire…",
     "Enable Emoji suggestions while typing": "Activer la suggestion d’émojis lors de la saisie",
     "Render simple counters in room header": "Afficher des compteurs simplifiés dans l’en-tête des salons",
@@ -800,8 +852,10 @@
     "Revoke invite": "Révoquer l’invitation",
     "Invited by %(sender)s": "Invité par %(sender)s",
     "Remember my selection for this widget": "Se souvenir de mon choix pour ce widget",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Vous avez %(count)s notifications non lues dans une version précédente de ce salon.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Vous avez %(count)s notification non lue dans une version précédente de ce salon.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Vous avez %(count)s notifications non lues dans une version précédente de ce salon.",
+        "one": "Vous avez %(count)s notification non lue dans une version précédente de ce salon."
+    },
     "The file '%(fileName)s' failed to upload.": "Le fichier « %(fileName)s » n’a pas pu être envoyé.",
     "GitHub issue": "Rapport GitHub",
     "Notes": "Notes",
@@ -817,8 +871,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Le fichier est <b>trop lourd</b> pour être envoyé. La taille limite est de %(limit)s mais la taille de ce fichier est de %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Ces fichiers sont <b>trop lourds</b> pour être envoyés. La taille limite des fichiers est de %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Certains fichiers sont <b>trop lourds</b> pour être envoyés. La taille limite des fichiers est de %(limit)s.",
-    "Upload %(count)s other files|other": "Envoyer %(count)s autres fichiers",
-    "Upload %(count)s other files|one": "Envoyer %(count)s autre fichier",
+    "Upload %(count)s other files": {
+        "other": "Envoyer %(count)s autres fichiers",
+        "one": "Envoyer %(count)s autre fichier"
+    },
     "Cancel All": "Tout annuler",
     "Upload Error": "Erreur d’envoi",
     "The server does not support the room version specified.": "Le serveur ne prend pas en charge la version de salon spécifiée.",
@@ -895,10 +951,14 @@
     "Message edits": "Modifications du message",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "La mise à niveau de ce salon nécessite de fermer l’instance actuelle du salon et de créer un nouveau salon à la place. Pour fournir la meilleure expérience possible aux utilisateurs, nous allons :",
     "Show all": "Tout afficher",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s n’a fait aucun changement %(count)s fois",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s n’ont fait aucun changement",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s n’a fait aucun changement %(count)s fois",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s n’a fait aucun changement",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s n’a fait aucun changement %(count)s fois",
+        "one": "%(severalUsers)s n’ont fait aucun changement"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s n’a fait aucun changement %(count)s fois",
+        "one": "%(oneUser)s n’a fait aucun changement"
+    },
     "Resend %(unsentCount)s reaction(s)": "Renvoyer %(unsentCount)s réaction(s)",
     "Your homeserver doesn't seem to support this feature.": "Il semble que votre serveur d’accueil ne prenne pas en charge cette fonctionnalité.",
     "You're signed out": "Vous êtes déconnecté",
@@ -991,7 +1051,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Essayez de faire défiler le fil de discussion vers le haut pour voir s’il y en a de plus anciens.",
     "Remove recent messages by %(user)s": "Supprimer les messages récents de %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Pour un grand nombre de messages, cela peut prendre du temps. N’actualisez pas votre client pendant ce temps.",
-    "Remove %(count)s messages|other": "Supprimer %(count)s messages",
+    "Remove %(count)s messages": {
+        "other": "Supprimer %(count)s messages",
+        "one": "Supprimer 1 message"
+    },
     "Remove recent messages": "Supprimer les messages récents",
     "View": "Afficher",
     "Explore rooms": "Parcourir les salons",
@@ -1022,11 +1085,16 @@
     "Show previews/thumbnails for images": "Afficher les aperçus/vignettes pour les images",
     "Show image": "Afficher l’image",
     "Clear cache and reload": "Vider le cache et recharger",
-    "%(count)s unread messages including mentions.|other": "%(count)s messages non lus y compris les mentions.",
-    "%(count)s unread messages.|other": "%(count)s messages non lus.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s messages non lus y compris les mentions.",
+        "one": "1 mention non lue."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s messages non lus.",
+        "one": "1 message non lu."
+    },
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Veuillez <newIssueLink>créer un nouveau rapport</newIssueLink> sur GitHub afin que l’on enquête sur cette erreur.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Clé public du captcha manquante dans la configuration du serveur d’accueil. Veuillez le signaler à l’administrateur de votre serveur d’accueil.",
-    "Remove %(count)s messages|one": "Supprimer 1 message",
     "Your email address hasn't been verified yet": "Votre adresse e-mail n’a pas encore été vérifiée",
     "Click the link in the email you received to verify and then click continue again.": "Cliquez sur le lien dans l’e-mail que vous avez reçu pour la vérifier et cliquez encore sur continuer.",
     "Add Email Address": "Ajouter une adresse e-mail",
@@ -1056,8 +1124,6 @@
     "Jump to first unread room.": "Sauter au premier salon non lu.",
     "Jump to first invite.": "Sauter à la première invitation.",
     "Room %(name)s": "Salon %(name)s",
-    "%(count)s unread messages including mentions.|one": "1 mention non lue.",
-    "%(count)s unread messages.|one": "1 message non lu.",
     "Unread messages.": "Messages non lus.",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Cette action nécessite l’accès au serveur d’identité par défaut <server /> afin de valider une adresse e-mail ou un numéro de téléphone, mais le serveur n’a aucune condition de service.",
     "Trust": "Faire confiance",
@@ -1171,8 +1237,10 @@
     "Unable to set up secret storage": "Impossible de configurer le coffre secret",
     "not stored": "non sauvegardé",
     "Hide verified sessions": "Masquer les sessions vérifiées",
-    "%(count)s verified sessions|other": "%(count)s sessions vérifiées",
-    "%(count)s verified sessions|one": "1 session vérifiée",
+    "%(count)s verified sessions": {
+        "other": "%(count)s sessions vérifiées",
+        "one": "1 session vérifiée"
+    },
     "Close preview": "Fermer l’aperçu",
     "Language Dropdown": "Sélection de la langue",
     "Country Dropdown": "Sélection du pays",
@@ -1282,8 +1350,10 @@
     "Mod": "Modérateur",
     "Encrypted by an unverified session": "Chiffré par une session non vérifiée",
     "Encrypted by a deleted session": "Chiffré par une session supprimée",
-    "%(count)s sessions|other": "%(count)s sessions",
-    "%(count)s sessions|one": "%(count)s session",
+    "%(count)s sessions": {
+        "other": "%(count)s sessions",
+        "one": "%(count)s session"
+    },
     "Hide sessions": "Masquer les sessions",
     "Encryption enabled": "Chiffrement activé",
     "Encryption not enabled": "Chiffrement non activé",
@@ -1335,10 +1405,14 @@
     "Mark all as read": "Tout marquer comme lu",
     "Not currently indexing messages for any room.": "N’indexe aucun message en ce moment.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s sur %(totalRooms)s",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s a ajouté les adresses alternatives %(addresses)s pour ce salon.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s a ajouté l’adresse alternative %(addresses)s pour ce salon.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s a supprimé les adresses alternatives %(addresses)s pour ce salon.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s a supprimé l’adresse alternative %(addresses)s pour ce salon.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s a ajouté les adresses alternatives %(addresses)s pour ce salon.",
+        "one": "%(senderName)s a ajouté l’adresse alternative %(addresses)s pour ce salon."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s a supprimé les adresses alternatives %(addresses)s pour ce salon.",
+        "one": "%(senderName)s a supprimé l’adresse alternative %(addresses)s pour ce salon."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s a modifié les adresses alternatives de ce salon.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s a modifié l’adresse principale et les adresses alternatives pour ce salon.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Une erreur est survenue lors de la mise à jour des adresses alternatives du salon. Ce n’est peut-être pas permis par le serveur ou une défaillance temporaire est survenue.",
@@ -1515,8 +1589,10 @@
     "Sort by": "Trier par",
     "Message preview": "Aperçu de message",
     "List options": "Options de liste",
-    "Show %(count)s more|other": "En afficher %(count)s de plus",
-    "Show %(count)s more|one": "En afficher %(count)s de plus",
+    "Show %(count)s more": {
+        "other": "En afficher %(count)s de plus",
+        "one": "En afficher %(count)s de plus"
+    },
     "Room options": "Options du salon",
     "Activity": "Activité",
     "A-Z": "A-Z",
@@ -1620,7 +1696,9 @@
     "Edit widgets, bridges & bots": "Modifier les widgets, passerelles et robots",
     "Widgets": "Widgets",
     "Unpin": "Désépingler",
-    "You can only pin up to %(count)s widgets|other": "Vous ne pouvez épingler que jusqu’à %(count)s widgets",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Vous ne pouvez épingler que jusqu’à %(count)s widgets"
+    },
     "Explore public rooms": "Parcourir les salons publics",
     "Show Widgets": "Afficher les widgets",
     "Hide Widgets": "Masquer les widgets",
@@ -2083,8 +2161,10 @@
     "Open dial pad": "Ouvrir le pavé de numérotation",
     "Recently visited rooms": "Salons visités récemment",
     "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Sauvegardez vos clés de chiffrement et les données de votre compte au cas où vous perdiez l’accès à vos sessions. Vos clés seront sécurisés avec une Clé de Sécurité unique.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche, en utilisant %(size)s pour stocker les messages de %(rooms)s salons.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche. Actuellement %(size)s sont utilisé pour stocker les messages de %(rooms)s salons.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche, en utilisant %(size)s pour stocker les messages de %(rooms)s salons.",
+        "other": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche. Actuellement %(size)s sont utilisé pour stocker les messages de %(rooms)s salons."
+    },
     "Channel: <channelLink/>": "Canal : <channelLink/>",
     "Workspace: <networkLink/>": "Espace de travail : <networkLink/>",
     "Dial pad": "Pavé de numérotation",
@@ -2142,8 +2222,10 @@
     "Support": "Prise en charge",
     "Random": "Aléatoire",
     "Welcome to <name/>": "Bienvenue dans <name/>",
-    "%(count)s members|one": "%(count)s membre",
-    "%(count)s members|other": "%(count)s membres",
+    "%(count)s members": {
+        "one": "%(count)s membre",
+        "other": "%(count)s membres"
+    },
     "Your server does not support showing space hierarchies.": "Votre serveur ne prend pas en charge l’affichage des hiérarchies d’espaces.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Êtes-vous sûr de vouloir quitter l’espace « %(spaceName)s » ?",
     "This space is not public. You will not be able to rejoin without an invite.": "Cet espace n’est pas public. Vous ne pourrez pas le rejoindre sans invitation.",
@@ -2203,8 +2285,10 @@
     "You may want to try a different search or check for typos.": "Essayez une requête différente, ou vérifiez que vous n’avez pas fait de faute de frappe.",
     "No results found": "Aucun résultat",
     "Failed to remove some rooms. Try again later": "Échec de la suppression de certains salons. Veuillez réessayez plus tard",
-    "%(count)s rooms|one": "%(count)s salon",
-    "%(count)s rooms|other": "%(count)s salons",
+    "%(count)s rooms": {
+        "one": "%(count)s salon",
+        "other": "%(count)s salons"
+    },
     "You don't have permission": "Vous n’avez pas l’autorisation",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Cela n’affecte généralement que la façon dont le salon est traité sur le serveur. Si vous avez des problèmes avec votre %(brand)s, signalez une anomalie.",
     "Invite to %(roomName)s": "Inviter dans %(roomName)s",
@@ -2225,8 +2309,10 @@
     "Invited people will be able to read old messages.": "Les personnes invitées pourront lire les anciens messages.",
     "We couldn't create your DM.": "Nous n’avons pas pu créer votre message direct.",
     "Add existing rooms": "Ajouter des salons existants",
-    "%(count)s people you know have already joined|one": "%(count)s personne que vous connaissez en fait déjà partie",
-    "%(count)s people you know have already joined|other": "%(count)s personnes que vous connaissez en font déjà partie",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s personne que vous connaissez en fait déjà partie",
+        "other": "%(count)s personnes que vous connaissez en font déjà partie"
+    },
     "Invite to just this room": "Inviter seulement dans ce salon",
     "Warn before quitting": "Avertir avant de quitter",
     "Manage & explore rooms": "Gérer et découvrir les salons",
@@ -2252,8 +2338,10 @@
     "Delete all": "Tout supprimer",
     "Some of your messages have not been sent": "Certains de vos messages n’ont pas été envoyés",
     "Including %(commaSeparatedMembers)s": "Dont %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Afficher le membre",
-    "View all %(count)s members|other": "Afficher les %(count)s membres",
+    "View all %(count)s members": {
+        "one": "Afficher le membre",
+        "other": "Afficher les %(count)s membres"
+    },
     "Failed to send": "Échec de l’envoi",
     "Play": "Lecture",
     "Pause": "Pause",
@@ -2267,8 +2355,10 @@
     "Leave the beta": "Quitter la bêta",
     "Beta": "Bêta",
     "Want to add a new room instead?": "Voulez-vous plutôt ajouter un nouveau salon ?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Ajout du salon…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Ajout des salons… (%(progress)s sur %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Ajout du salon…",
+        "other": "Ajout des salons… (%(progress)s sur %(count)s)"
+    },
     "Not all selected were added": "Toute la sélection n’a pas été ajoutée",
     "You are not allowed to view this server's rooms list": "Vous n’avez pas l’autorisation d’accéder à la liste des salons de ce serveur",
     "Error processing voice message": "Erreur lors du traitement du message vocal",
@@ -2291,8 +2381,10 @@
     "sends space invaders": "Envoie les Space Invaders",
     "Sends the given message with a space themed effect": "Envoyer le message avec un effet lié au thème de l’espace",
     "See when people join, leave, or are invited to your active room": "Afficher quand des personnes rejoignent, partent, ou sont invités dans votre salon actif",
-    "Currently joining %(count)s rooms|one": "Vous êtes en train de rejoindre %(count)s salon",
-    "Currently joining %(count)s rooms|other": "Vous êtes en train de rejoindre %(count)s salons",
+    "Currently joining %(count)s rooms": {
+        "one": "Vous êtes en train de rejoindre %(count)s salon",
+        "other": "Vous êtes en train de rejoindre %(count)s salons"
+    },
     "The user you called is busy.": "L’utilisateur que vous avez appelé est indisponible.",
     "User Busy": "Utilisateur indisponible",
     "Or send invite link": "Ou envoyer le lien d’invitation",
@@ -2325,10 +2417,14 @@
     "Disagree": "Désaccord",
     "Please pick a nature and describe what makes this message abusive.": "Veuillez choisir la nature du rapport et décrire ce qui rend ce message abusif.",
     "Please provide an address": "Veuillez fournir une adresse",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s a changé les listes de contrôle d’accès (ACLs) du serveur",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s a changé les liste de contrôle d’accès (ACLs) %(count)s fois",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s ont changé les listes de contrôle d’accès (ACLs) du serveur",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s ont changé les liste de contrôle d’accès (ACLs) %(count)s fois",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s a changé les listes de contrôle d’accès (ACLs) du serveur",
+        "other": "%(oneUser)s a changé les liste de contrôle d’accès (ACLs) %(count)s fois"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s ont changé les listes de contrôle d’accès (ACLs) du serveur",
+        "other": "%(severalUsers)s ont changé les liste de contrôle d’accès (ACLs) %(count)s fois"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Échec de l’initialisation de la recherche de messages, vérifiez <a>vos paramètres</a> pour plus d’information",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Définissez les adresses de cet espace pour que les utilisateurs puissent le trouver avec votre serveur d’accueil (%(localDomain)s)",
     "To publish an address, it needs to be set as a local address first.": "Pour publier une adresse, elle doit d’abord être définie comme adresse locale.",
@@ -2388,8 +2484,10 @@
     "Identity server URL must be HTTPS": "L’URL du serveur d’identité doit être en HTTPS",
     "User Directory": "Répertoire utilisateur",
     "Error processing audio message": "Erreur lors du traitement du message audio",
-    "Show %(count)s other previews|one": "Afficher %(count)s autre aperçu",
-    "Show %(count)s other previews|other": "Afficher %(count)s autres aperçus",
+    "Show %(count)s other previews": {
+        "one": "Afficher %(count)s autre aperçu",
+        "other": "Afficher %(count)s autres aperçus"
+    },
     "Images, GIFs and videos": "Images, GIF et vidéos",
     "Code blocks": "Blocs de code",
     "Displaying time": "Affichage de l’heure",
@@ -2412,8 +2510,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Tout le monde dans un espace peut trouver et venir. Vous pouvez sélectionner plusieurs espaces.",
     "Spaces with access": "Espaces avec accès",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Tout le monde dans un espace peut trouver et venir. <a>Modifier les accès des espaces ici.</a>",
-    "Currently, %(count)s spaces have access|other": "%(count)s espaces ont actuellement l’accès",
-    "& %(count)s more|other": "& %(count)s de plus",
+    "Currently, %(count)s spaces have access": {
+        "other": "%(count)s espaces ont actuellement l’accès",
+        "one": "Actuellement, un espace a accès"
+    },
+    "& %(count)s more": {
+        "other": "& %(count)s de plus",
+        "one": "& %(count)s autres"
+    },
     "Upgrade required": "Mise-à-jour nécessaire",
     "Anyone can find and join.": "Tout le monde peut trouver et venir.",
     "Only invited people can join.": "Seules les personnes invitées peuvent venir.",
@@ -2517,8 +2621,6 @@
     "Autoplay GIFs": "Jouer automatiquement les GIFs",
     "The above, but in <Room /> as well": "Comme ci-dessus, mais également dans <Room />",
     "The above, but in any room you are joined or invited to as well": "Comme ci-dessus, mais également dans tous les salons dans lesquels vous avez été invité ou que vous avez rejoint",
-    "Currently, %(count)s spaces have access|one": "Actuellement, un espace a accès",
-    "& %(count)s more|one": "& %(count)s autres",
     "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s a désépinglé un message de ce salon. Voir tous les messages épinglés.",
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s a désépinglé <a>un message</a> de ce salon. Voir tous les <b>messages épinglés</b>.",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s a épinglé un message dans ce salon. Voir tous les messages épinglés.",
@@ -2604,10 +2706,14 @@
     "Disinvite from %(roomName)s": "Annuler l’invitation à %(roomName)s",
     "Threads": "Fils de discussion",
     "Create poll": "Créer un sondage",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Mise-à-jour de l’espace…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Mise-à-jour des espaces… (%(progress)s sur %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Envoi de l’invitation…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Envoi des invitations… (%(progress)s sur %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Mise-à-jour de l’espace…",
+        "other": "Mise-à-jour des espaces… (%(progress)s sur %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Envoi de l’invitation…",
+        "other": "Envoi des invitations… (%(progress)s sur %(count)s)"
+    },
     "Loading new room": "Chargement du nouveau salon",
     "Upgrading room": "Mise-à-jour du salon",
     "The email address doesn't appear to be valid.": "L’adresse de courriel semble être invalide.",
@@ -2615,8 +2721,10 @@
     "See room timeline (devtools)": "Voir l’historique du salon (outils développeurs)",
     "View in room": "Voir dans le salon",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Saisissez votre phrase de sécurité ou <button>utilisez votre clé de sécurité</button> pour continuer.",
-    "%(count)s reply|one": "%(count)s réponse",
-    "%(count)s reply|other": "%(count)s réponses",
+    "%(count)s reply": {
+        "one": "%(count)s réponse",
+        "other": "%(count)s réponses"
+    },
     "Developer mode": "Mode développeur",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "Stockez votre clé de sécurité dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre, car elle est utilisée pour protéger vos données chiffrées.",
     "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Nous génèrerons une clé de sécurité que vous devrez stocker dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre.",
@@ -2641,12 +2749,18 @@
     "Rename": "Renommer",
     "Select all": "Tout sélectionner",
     "Deselect all": "Tout désélectionner",
-    "Sign out devices|one": "Déconnecter l’appareil",
-    "Sign out devices|other": "Déconnecter les appareils",
-    "Click the button below to confirm signing out these devices.|one": "Cliquer sur le bouton ci-dessous pour confirmer la déconnexion de cet appareil.",
-    "Click the button below to confirm signing out these devices.|other": "Cliquer sur le bouton ci-dessous pour confirmer la déconnexion de ces appareils.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Confirmez la déconnexion de cet appareil en utilisant l’authentification unique pour prouver votre identité.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Confirmez la déconnexion de ces appareils en utilisant l’authentification unique pour prouver votre identité.",
+    "Sign out devices": {
+        "one": "Déconnecter l’appareil",
+        "other": "Déconnecter les appareils"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Cliquer sur le bouton ci-dessous pour confirmer la déconnexion de cet appareil.",
+        "other": "Cliquer sur le bouton ci-dessous pour confirmer la déconnexion de ces appareils."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Confirmez la déconnexion de cet appareil en utilisant l’authentification unique pour prouver votre identité.",
+        "other": "Confirmez la déconnexion de ces appareils en utilisant l’authentification unique pour prouver votre identité."
+    },
     "Automatically send debug logs on any error": "Envoyer automatiquement les journaux de débogage en cas d’erreur",
     "Use a more compact 'Modern' layout": "Utiliser une mise en page « moderne » plus compacte",
     "Light high contrast": "Contraste élevé clair",
@@ -2697,10 +2811,14 @@
     "You may contact me if you want to follow up or to let me test out upcoming ideas": "Vous pouvez me contacter si vous voulez un suivi ou me laisser tester de nouvelles idées",
     "Sorry, the poll you tried to create was not posted.": "Désolé, le sondage que vous avez essayé de créer n’a pas été envoyé.",
     "Failed to post poll": "Échec lors de la soumission du sondage",
-    "Based on %(count)s votes|one": "Sur la base de %(count)s vote",
-    "Based on %(count)s votes|other": "Sur la base de %(count)s votes",
-    "%(count)s votes|one": "%(count)s vote",
-    "%(count)s votes|other": "%(count)s votes",
+    "Based on %(count)s votes": {
+        "one": "Sur la base de %(count)s vote",
+        "other": "Sur la base de %(count)s votes"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s vote",
+        "other": "%(count)s votes"
+    },
     "Sorry, your vote was not registered. Please try again.": "Désolé, votre vote n’a pas été enregistré. Veuillez réessayer.",
     "Vote not registered": "Vote non enregistré",
     "Chat": "Conversation privée",
@@ -2720,8 +2838,10 @@
     "Themes": "Thèmes",
     "Moderation": "Modération",
     "Messaging": "Messagerie",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s et %(count)s autre",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s et %(count)s autres",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s et %(count)s autre",
+        "other": "%(spaceName)s et %(count)s autres"
+    },
     "Toggle space panel": "(Dés)activer le panneau des espaces",
     "Link to room": "Lien vers le salon",
     "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "Êtes-vous sûr de vouloir terminer ce sondage ? Les résultats définitifs du sondage seront affichés et les gens ne pourront plus voter.",
@@ -2735,11 +2855,15 @@
     "We <Bold>don't</Bold> record or profile any account data": "Nous n’enregistrons ou ne profilons <Bold>aucune</Bold> donnée du compte",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "Vous pouvez lire toutes nos conditions <PrivacyPolicyUrl>ici</PrivacyPolicyUrl>",
     "Share location": "Partager la position",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s vote exprimé. Votez pour voir les résultats",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s votes exprimés. Votez pour voir les résultats",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s vote exprimé. Votez pour voir les résultats",
+        "other": "%(count)s votes exprimés. Votez pour voir les résultats"
+    },
     "No votes cast": "Aucun vote exprimé",
-    "Final result based on %(count)s votes|one": "Résultat final sur la base de %(count)s vote",
-    "Final result based on %(count)s votes|other": "Résultat final sur la base de %(count)s votes",
+    "Final result based on %(count)s votes": {
+        "one": "Résultat final sur la base de %(count)s vote",
+        "other": "Résultat final sur la base de %(count)s votes"
+    },
     "Manage pinned events": "Gérer les évènements épinglés",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Partager des données anonymisées pour nous aider à identifier les problèmes. Rien de personnel. Aucune tierce partie.",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "Partager des données anonymisées pour nous aider à identifier les problèmes. Aucune tierce partie. <LearnMoreLink>En savoir plus</LearnMoreLink>",
@@ -2759,16 +2883,24 @@
     "Spaces you're in": "Espaces où vous êtes",
     "Including you, %(commaSeparatedMembers)s": "Dont vous, %(commaSeparatedMembers)s",
     "Copy room link": "Copier le lien du salon",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s évènement exporté en %(seconds)s secondes",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s évènements exportés en %(seconds)s secondes",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s évènement exporté en %(seconds)s secondes",
+        "other": "%(count)s évènements exportés en %(seconds)s secondes"
+    },
     "Export successful!": "Export réussi !",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s évènement récupéré en %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s évènements récupérés en %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "%(count)s évènement récupéré en %(seconds)ss",
+        "other": "%(count)s évènements récupérés en %(seconds)ss"
+    },
     "Processing event %(number)s out of %(total)s": "Traitement de l’évènement %(number)s sur %(total)s",
-    "Fetched %(count)s events so far|one": "%(count)s évènements récupéré jusqu’ici",
-    "Fetched %(count)s events so far|other": "%(count)s évènements récupérés jusqu’ici",
-    "Fetched %(count)s events out of %(total)s|one": "%(count)s sur %(total)s évènement récupéré",
-    "Fetched %(count)s events out of %(total)s|other": "%(count)s sur %(total)s évènements récupérés",
+    "Fetched %(count)s events so far": {
+        "one": "%(count)s évènements récupéré jusqu’ici",
+        "other": "%(count)s évènements récupérés jusqu’ici"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "%(count)s sur %(total)s évènement récupéré",
+        "other": "%(count)s sur %(total)s évènements récupérés"
+    },
     "Generating a ZIP": "Génération d’un ZIP",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Nous n’avons pas pu comprendre la date saisie (%(inputDate)s). Veuillez essayer en utilisant le format AAAA-MM-JJ.",
     "Failed to load list of rooms.": "Impossible de charger la liste des salons.",
@@ -2814,10 +2946,14 @@
     "Command error: Unable to handle slash command.": "Erreur de commande : Impossible de gérer la commande de barre oblique.",
     "Open this settings tab": "Ouvrir cet onglet de paramètres",
     "Space home": "Accueil de l’espace",
-    "was removed %(count)s times|one": "a été expulsé(e)",
-    "were removed %(count)s times|other": "ont été expulsé(e)s %(count)s fois",
-    "was removed %(count)s times|other": "a été expulsé(e) %(count)s fois",
-    "were removed %(count)s times|one": "ont été expulsé(e)s",
+    "was removed %(count)s times": {
+        "one": "a été expulsé(e)",
+        "other": "a été expulsé(e) %(count)s fois"
+    },
+    "were removed %(count)s times": {
+        "other": "ont été expulsé(e)s %(count)s fois",
+        "one": "ont été expulsé(e)s"
+    },
     "Unknown error fetching location. Please try again later.": "Erreur inconnue en récupérant votre position. Veuillez réessayer plus tard.",
     "Timed out trying to fetch your location. Please try again later.": "Délai d’attente expiré en essayant de récupérer votre position. Veuillez réessayer plus tard.",
     "Failed to fetch your location. Please try again later.": "Impossible de récupérer votre position. Veuillez réessayer plus tard.",
@@ -2906,11 +3042,15 @@
     "Results will be visible when the poll is ended": "Les résultats seront visibles lorsque le sondage sera terminé",
     "Can't edit poll": "Impossible de modifier le sondage",
     "Sorry, you can't edit a poll after votes have been cast.": "Désolé, vous ne pouvez pas modifier un sondage après que les votes aient été exprimés.",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s a supprimé un message",
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s a supprimé un message",
+        "other": "%(oneUser)s a supprimé %(count)s messages"
+    },
     "Drop a Pin": "Choisir sur la carte",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s a supprimé %(count)s messages",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s ont supprimé un message",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s ont supprimé %(count)s messages",
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s ont supprimé un message",
+        "other": "%(severalUsers)s ont supprimé %(count)s messages"
+    },
     "What location type do you want to share?": "Quel type de localisation voulez-vous partager ?",
     "My live location": "Ma position en continu",
     "My current location": "Ma position actuelle",
@@ -2919,18 +3059,24 @@
     "Join %(roomAddress)s": "Rejoindre %(roomAddress)s",
     "Export Cancelled": "Export annulé",
     "<empty string>": "<chaîne de caractères vide>",
-    "<%(count)s spaces>|one": "<espace>",
-    "<%(count)s spaces>|other": "<%(count)s espaces>",
+    "<%(count)s spaces>": {
+        "one": "<espace>",
+        "other": "<%(count)s espaces>"
+    },
     "Results are only revealed when you end the poll": "Les résultats ne sont révélés que lorsque vous terminez le sondage",
     "Voters see results as soon as they have voted": "Les participants voient les résultats dès qu'ils ont voté",
     "Closed poll": "Sondage terminé",
     "Open poll": "Ouvrir le sondage",
     "Poll type": "Type de sondage",
     "Edit poll": "Modifier le sondage",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s a envoyé un message caché",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s ont envoyé %(count)s messages cachés",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s ont envoyé un message caché",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s ont envoyé %(count)s messages cachés",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)s a envoyé un message caché",
+        "other": "%(oneUser)s ont envoyé %(count)s messages cachés"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s ont envoyé un message caché",
+        "other": "%(severalUsers)s ont envoyé %(count)s messages cachés"
+    },
     "Click for more info": "Cliquez pour en savoir plus",
     "This is a beta feature": "Il s'agit d'une fonctionnalité bêta",
     "%(brand)s could not send your location. Please try again later.": "%(brand)s n'a pas pu envoyer votre position. Veuillez réessayer plus tard.",
@@ -2941,10 +3087,14 @@
     "Match system": "S’adapter au système",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Répondez à un fil de discussion en cours ou utilisez \"%(replyInThread)s\" lorsque vous passez la souris sur un message pour en commencer un nouveau.",
     "Insert a trailing colon after user mentions at the start of a message": "Insérer deux-points après les mentions de l'utilisateur au début d'un message",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s a changé les <a>messages épinglés</a> du salon",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s a changé %(count)s fois les <a>messages épinglés</a> du salon",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s ont modifié les <a>messages épinglés</a> pour le salon",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s ont changé %(count)s fois les <a>messages épinglés</a> du salon",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s a changé les <a>messages épinglés</a> du salon",
+        "other": "%(oneUser)s a changé %(count)s fois les <a>messages épinglés</a> du salon"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s ont modifié les <a>messages épinglés</a> pour le salon",
+        "other": "%(severalUsers)s ont changé %(count)s fois les <a>messages épinglés</a> du salon"
+    },
     "Show polls button": "Afficher le bouton des sondages",
     "We'll create rooms for each of them.": "Nous allons créer un salon pour chacun d’entre eux.",
     "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Ce serveur d’accueil n’est pas configuré correctement pour afficher des cartes, ou bien le serveur de carte configuré est peut-être injoignable.",
@@ -3004,15 +3154,19 @@
     "Send custom timeline event": "Envoyer des événements d’historique personnalisé",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Décocher si vous voulez également retirer les messages systèmes de cet utilisateur (par exemple changement de statut ou de profil…)",
     "Preserve system messages": "Préserver les messages systèmes",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Vous êtes sur le point de supprimer %(count)s messages de %(user)s. Ils seront supprimés définitivement et pour tout le monde dans la conversation. Voulez-vous continuer ?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Vous êtes sur le point de supprimer %(count)s message de %(user)s. Il sera supprimé définitivement et pour tout le monde dans la conversation. Voulez-vous continuer ?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "other": "Vous êtes sur le point de supprimer %(count)s messages de %(user)s. Ils seront supprimés définitivement et pour tout le monde dans la conversation. Voulez-vous continuer ?",
+        "one": "Vous êtes sur le point de supprimer %(count)s message de %(user)s. Il sera supprimé définitivement et pour tout le monde dans la conversation. Voulez-vous continuer ?"
+    },
     "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Aidez nous à identifier les problèmes et améliorer %(analyticsOwner)s en envoyant des rapports d’usage anonymes. Pour comprendre de quelle manière les gens utilisent plusieurs appareils, nous créeront un identifiant aléatoire commun à tous vos appareils.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser l’option de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en spécifiant une URL de serveur d'accueil différente. Cela vous permet d’utiliser %(brand)s avec un compte Matrix existant sur un serveur d’accueil différent.",
     "%(displayName)s's live location": "Position en direct de %(displayName)s",
     "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s n’a pas obtenu la permission de récupérer votre position. Veuillez autoriser l’accès à votre position dans les paramètres du navigateur.",
     "Share for %(duration)s": "Partagé pendant %(duration)s",
-    "Currently removing messages in %(count)s rooms|one": "Actuellement en train de supprimer les messages dans %(count)s salon",
-    "Currently removing messages in %(count)s rooms|other": "Actuellement en train de supprimer les messages dans %(count)s salons",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Actuellement en train de supprimer les messages dans %(count)s salon",
+        "other": "Actuellement en train de supprimer les messages dans %(count)s salons"
+    },
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Les journaux de débogage contiennent les données d’utilisation de l’application incluant votre nom d’utilisateur, les identifiants ou les alias des salons que vous avez visités, les derniers élément de l’interface avec lesquels vous avez interagis, et les noms d’utilisateurs des autres utilisateurs. Ils ne contiennent pas de messages.",
     "Developer tools": "Outils de développement",
     "Video": "Vidéo",
@@ -3027,8 +3181,10 @@
     "Create video room": "Crée le salon visio",
     "Create a video room": "Créer un salon visio",
     "%(featureName)s Beta feedback": "Commentaires sur la bêta de %(featureName)s",
-    "%(count)s participants|one": "1 participant",
-    "%(count)s participants|other": "%(count)s participants",
+    "%(count)s participants": {
+        "one": "1 participant",
+        "other": "%(count)s participants"
+    },
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s a été retourné en essayant d’accéder au salon. Si vous pensez que vous ne devriez pas voir ce message, veuillez <issueLink>soumettre un rapport d’anomalie</issueLink>.",
     "Try again later, or ask a room or space admin to check if you have access.": "Réessayez plus tard ou demandez à l’administrateur du salon ou de l’espace si vous y avez accès.",
     "This room or space is not accessible at this time.": "Ce salon ou cet espace n’est pas accessible en ce moment.",
@@ -3069,8 +3225,10 @@
     "Ban from room": "Bannir du salon",
     "Unban from room": "Révoquer le bannissement du salon",
     "Ban from space": "Bannir de l'espace",
-    "Confirm signing out these devices|one": "Confirmer la déconnexion de cet appareil",
-    "Confirm signing out these devices|other": "Confirmer la déconnexion de ces appareils",
+    "Confirm signing out these devices": {
+        "one": "Confirmer la déconnexion de cet appareil",
+        "other": "Confirmer la déconnexion de ces appareils"
+    },
     "Live location enabled": "Position en temps réel activée",
     "Live location error": "Erreur de positionnement en temps réel",
     "Live location ended": "Position en temps réel terminée",
@@ -3097,8 +3255,10 @@
     "Disinvite from room": "Désinviter du salon",
     "Remove from space": "Supprimer de l’espace",
     "Disinvite from space": "Désinviter de l’espace",
-    "Seen by %(count)s people|one": "Vu par %(count)s personne",
-    "Seen by %(count)s people|other": "Vu par %(count)s personnes",
+    "Seen by %(count)s people": {
+        "one": "Vu par %(count)s personne",
+        "other": "Vu par %(count)s personnes"
+    },
     "Your password was successfully changed.": "Votre mot de passe a été mis à jour.",
     "Turn on camera": "Activer la caméra",
     "Turn off camera": "Désactiver la caméra",
@@ -3139,8 +3299,10 @@
     "Joining…": "En train de rejoindre…",
     "Read receipts": "Accusés de réception",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "Activer l’accélération matérielle (redémarrer %(appName)s pour appliquer)",
-    "%(count)s people joined|one": "%(count)s personne s’est jointe",
-    "%(count)s people joined|other": "%(count)s personnes se sont jointes",
+    "%(count)s people joined": {
+        "one": "%(count)s personne s’est jointe",
+        "other": "%(count)s personnes se sont jointes"
+    },
     "Failed to set direct message tag": "Échec de l’ajout de l’étiquette de conversation privée",
     "Deactivating your account is a permanent action — be careful!": "La désactivation du compte est une action permanente. Soyez prudent !",
     "You were disconnected from the call. (Error: %(message)s)": "Vous avez déconnecté de l’appel. (Erreur : %(message)s)",
@@ -3158,8 +3320,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Si vous ne trouvez pas la personne que vous cherchez, envoyez-lui le lien d’invitation.",
     "Some results may be hidden for privacy": "Certains résultats pourraient être masqués pour des raisons de confidentialité",
     "Search for": "Recherche de",
-    "%(count)s Members|one": "%(count)s membre",
-    "%(count)s Members|other": "%(count)s membres",
+    "%(count)s Members": {
+        "one": "%(count)s membre",
+        "other": "%(count)s membres"
+    },
     "When you sign out, these keys will be deleted from this device, which means you won't be able to read encrypted messages unless you have the keys for them on your other devices, or backed them up to the server.": "Quand vous vous déconnectez, ces clés seront supprimées de cet appareil, et vous ne pourrez plus lire les messages chiffrés à moins d’avoir les clés de ces messages sur vos autres appareils, ou de les avoir sauvegardées sur le serveur.",
     "Show: Matrix rooms": "Afficher : Salons Matrix",
     "Show: %(instance)s rooms (%(server)s)": "Afficher : %(instance)s salons (%(server)s)",
@@ -3189,9 +3353,11 @@
     "Enter fullscreen": "Afficher en plein écran",
     "Map feedback": "Remarques sur la carte",
     "Toggle attribution": "Changer l’attribution",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Dans %(spaceName)s et %(count)s autre espace.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Dans %(spaceName)s et %(count)s autre espace.",
+        "other": "Dans %(spaceName)s et %(count)s autres espaces."
+    },
     "In %(spaceName)s.": "Dans l’espace %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Dans %(spaceName)s et %(count)s autres espaces.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Dans les espaces %(space1Name)s et %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Commande développeur : oublier la session de groupe sortante actuelle et négocier une nouvelle session Olm",
     "Stop and close": "Arrêter et fermer",
@@ -3210,8 +3376,10 @@
     "Spell check": "Vérificateur orthographique",
     "Complete these to get the most out of %(brand)s": "Terminez-les pour obtenir le maximum de %(brand)s",
     "You did it!": "Vous l’avez fait !",
-    "Only %(count)s steps to go|one": "Plus que %(count)s étape",
-    "Only %(count)s steps to go|other": "Plus que %(count)s étapes",
+    "Only %(count)s steps to go": {
+        "one": "Plus que %(count)s étape",
+        "other": "Plus que %(count)s étapes"
+    },
     "Welcome to %(brand)s": "Bienvenue sur %(brand)s",
     "Find your people": "Trouvez vos contacts",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Gardez le contrôle sur la discussion de votre communauté.\nPrend en charge des millions de messages, avec une interopérabilité et une modération efficace.",
@@ -3290,11 +3458,15 @@
     "Don’t miss a thing by taking %(brand)s with you": "Ne ratez pas une miette en emportant %(brand)s avec vous",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Il n'est pas recommandé d’ajouter le chiffrement aux salons publics.</b> Tout le monde peut trouver et rejoindre les salons publics, donc tout le monde peut lire les messages qui s’y trouvent. Vous n’aurez aucun des avantages du chiffrement, et vous ne pourrez pas le désactiver plus tard. Chiffrer les messages dans un salon public ralentira la réception et l’envoi de messages.",
     "Empty room (was %(oldName)s)": "Salon vide (précédemment %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Envoi de l’invitation à %(user)s et 1 autre",
-    "Inviting %(user)s and %(count)s others|other": "Envoi de l’invitation à %(user)s et %(count)s autres",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Envoi de l’invitation à %(user)s et 1 autre",
+        "other": "Envoi de l’invitation à %(user)s et %(count)s autres"
+    },
     "Inviting %(user1)s and %(user2)s": "Envoi de l’invitation à %(user1)s et %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s et un autre",
-    "%(user)s and %(count)s others|other": "%(user)s et %(count)s autres",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s et un autre",
+        "other": "%(user)s et %(count)s autres"
+    },
     "%(user1)s and %(user2)s": "%(user1)s et %(user2)s",
     "Show": "Afficher",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s ou %(copyButton)s",
@@ -3392,8 +3564,10 @@
     "You are already recording a voice broadcast. Please end your current voice broadcast to start a new one.": "Vous êtes déjà en train de réaliser une diffusion audio. Veuillez terminer votre diffusion audio actuelle pour en démarrer une nouvelle.",
     "Can't start a new voice broadcast": "Impossible de commencer une nouvelle diffusion audio",
     "play voice broadcast": "lire la diffusion audio",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Voulez-vous vraiment déconnecter %(count)s session ?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Voulez-vous vraiment déconnecter %(count)s de vos sessions ?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Voulez-vous vraiment déconnecter %(count)s session ?",
+        "other": "Voulez-vous vraiment déconnecter %(count)s de vos sessions ?"
+    },
     "Show formatting": "Afficher le formatage",
     "Consider signing out from old sessions (%(inactiveAgeDays)s days or older) you don't use anymore.": "Pensez à déconnecter les anciennes sessions (%(inactiveAgeDays)s jours ou plus) que vous n’utilisez plus.",
     "Removing inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.": "Supprimer les sessions inactives améliore la sécurité et les performances, et vous permets plus facilement d’identifier une nouvelle session suspicieuse.",
@@ -3487,8 +3661,10 @@
     "%(senderName)s ended a voice broadcast": "%(senderName)s a terminé une diffusion audio",
     "You ended a voice broadcast": "Vous avez terminé une diffusion audio",
     "Improve your account security by following these recommendations.": "Améliorez la sécurité de votre compte à l’aide de ces recommandations.",
-    "%(count)s sessions selected|one": "%(count)s session sélectionnée",
-    "%(count)s sessions selected|other": "%(count)s sessions sélectionnées",
+    "%(count)s sessions selected": {
+        "one": "%(count)s session sélectionnée",
+        "other": "%(count)s sessions sélectionnées"
+    },
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Vous ne pouvez pas démarrer un appel car vous êtes en train d’enregistrer une diffusion en direct. Veuillez terminer cette diffusion pour démarrer un appel.",
     "Can’t start a call": "Impossible de démarrer un appel",
     "Failed to read events": "Échec de la lecture des évènements",
@@ -3501,8 +3677,10 @@
     "Create a link": "Crée un lien",
     "Link": "Lien",
     "Force 15s voice broadcast chunk length": "Forcer la diffusion audio à utiliser des morceaux de 15s",
-    "Sign out of %(count)s sessions|one": "Déconnecter %(count)s session",
-    "Sign out of %(count)s sessions|other": "Déconnecter %(count)s sessions",
+    "Sign out of %(count)s sessions": {
+        "one": "Déconnecter %(count)s session",
+        "other": "Déconnecter %(count)s sessions"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Déconnecter toutes les autres sessions (%(otherSessionsCount)s)",
     "Yes, end my recording": "Oui, terminer mon enregistrement",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "En commençant à écouter cette diffusion en direct, votre enregistrement de diffusion en direct actuel sera interrompu.",
@@ -3609,7 +3787,9 @@
     "Room is <strong>encrypted ✅</strong>": "Le salon est <strong>chiffré ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "L’état des notifications est <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Statut non-lus du salon : <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Statut non-lus du salon : <strong>%(status)s</strong>, total : <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Statut non-lus du salon : <strong>%(status)s</strong>, total : <strong>%(count)s</strong>"
+    },
     "Ended a poll": "Sondage terminé",
     "Due to decryption errors, some votes may not be counted": "À cause d’erreurs de déchiffrement, certains votes pourraient ne pas avoir été pris en compte",
     "The sender has blocked you from receiving this message": "L’expéditeur a bloqué la réception de votre message",
@@ -3619,10 +3799,14 @@
     "If you know a room address, try joining through that instead.": "Si vous connaissez l’adresse d’un salon, essayez de l’utiliser à la place pour rejoindre ce salon.",
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "Vous avez essayé de rejoindre à l’aide de l’ID du salon sans fournir une liste de serveurs pour l’atteindre. Les IDs de salons sont des identifiants internes et ne peuvent être utilisés pour rejoindre un salon sans informations complémentaires.",
     "View poll": "Voir le sondage",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Il n'y a pas d’ancien sondage depuis hier. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Il n'y a pas d’ancien sondage sur les %(count)s derniers jours. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Il n’y a aucun sondage actif depuis hier. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Il n'y a pas de sondage en cours sur les %(count)s derniers jours. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Il n'y a pas d’ancien sondage depuis hier. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
+        "other": "Il n'y a pas d’ancien sondage sur les %(count)s derniers jours. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Il n’y a aucun sondage actif depuis hier. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
+        "other": "Il n'y a pas de sondage en cours sur les %(count)s derniers jours. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Il n'y a pas d’ancien sondage. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
     "There are no active polls. Load more polls to view polls for previous months": "Il n'y a pas de sondage en cours. Veuillez charger plus de sondages pour consulter les sondages des mois antérieurs",
     "Load more polls": "Charger plus de sondages",
@@ -3729,8 +3913,14 @@
     "<strong>Update:</strong>We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active. If you proceed, some of your settings may change. <a>Learn more</a>": "<strong>Mise-à-jour : </strong>Nous avons simplifié les paramètres de notifications pour rendre les options plus facile à trouver. Certains paramètres que vous aviez choisi par le passé ne sont pas visibles ici, mais ils sont toujours actifs. Si vous continuez, certains de vos paramètres peuvent changer. <a>En savoir plus</a>",
     "Show message preview in desktop notification": "Afficher l’aperçu du message dans la notification de bureau",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Les messages ici sont chiffrés de bout en bout. Quand les gens viennent, vous pouvez les vérifier dans leur profil, tapez simplement sur leur image de profil.",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)s ont changé d’image de profil %(count)s fois",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)s a changé d’image de profil %(count)s fois",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)s ont changé d’image de profil %(count)s fois",
+        "one": "%(severalUsers)s ont changé leur image de profil"
+    },
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)s a changé d’image de profil %(count)s fois",
+        "one": "%(oneUser)s a changé son image de profil"
+    },
     "Note that removing room changes like this could undo the change.": "Notez bien que la suppression de modification du salon comme celui-ci peut annuler ce changement.",
     "This homeserver doesn't offer any login flows that are supported by this client.": "Ce serveur d’accueil n’offre aucune méthode d’identification compatible avec ce client.",
     "Anyone can request to join, but admins or moderators need to grant access. You can change this later.": "Tout le monde peut demander à venir, mais un admin ou un modérateur doit autoriser l’accès. Vous pouvez modifier ceci plus tard.",
@@ -3773,8 +3963,6 @@
     "Request to join sent": "Demande d’accès envoyée",
     "Your request to join is pending.": "Votre demande d’accès est en cours.",
     "Cancel request": "Annuler la demande",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)s ont changé leur image de profil",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)s a changé son image de profil",
     "Ask to join %(roomName)s?": "Demander à venir dans %(roomName)s ?",
     "You need an invite to access this room.": "Vous avez besoin d’une invitation pour accéder à ce salon.",
     "Failed to cancel": "Erreur lors de l’annulation",
diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json
index 179ad6ee8e..2abf7e694c 100644
--- a/src/i18n/strings/ga.json
+++ b/src/i18n/strings/ga.json
@@ -4,8 +4,10 @@
     "Already have an account? <a>Sign in here</a>": "An bhfuil cuntas agat cheana? <a>Sínigh isteach anseo</a>",
     "Show less": "Taispeáin níos lú",
     "Show more": "Taispeáin níos mó",
-    "Show %(count)s more|one": "Taispeáin %(count)s níos mó",
-    "Show %(count)s more|other": "Taispeáin %(count)s níos mó",
+    "Show %(count)s more": {
+        "one": "Taispeáin %(count)s níos mó",
+        "other": "Taispeáin %(count)s níos mó"
+    },
     "Switch to dark mode": "Athraigh go mód dorcha",
     "Switch to light mode": "Athraigh go mód geal",
     "Got an account? <a>Sign in</a>": "An bhfuil cuntas agat? <a>Sínigh isteach</a>",
@@ -378,10 +380,18 @@
     "Notes": "Nótaí",
     "expand": "méadaigh",
     "collapse": "cumaisc",
-    "%(oneUser)sleft %(count)s times|one": "D'fhág %(oneUser)s",
-    "%(severalUsers)sleft %(count)s times|one": "D'fhág %(severalUsers)s",
-    "%(oneUser)sjoined %(count)s times|one": "Tháinig %(oneUser)s isteach",
-    "%(severalUsers)sjoined %(count)s times|one": "Tháinig %(severalUsers)s isteach",
+    "%(oneUser)sleft %(count)s times": {
+        "one": "D'fhág %(oneUser)s"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "D'fhág %(severalUsers)s"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "Tháinig %(oneUser)s isteach"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "Tháinig %(severalUsers)s isteach"
+    },
     "Join": "Téigh isteach",
     "Warning": "Rabhadh",
     "Update": "Uasdátaigh",
@@ -689,8 +699,10 @@
     "Share room": "Roinn seomra",
     "Forget room": "Déan dearmad ar an seomra",
     "Join Room": "Téigh isteach an seomra",
-    "(~%(count)s results)|one": "(~%(count)s toradh)",
-    "(~%(count)s results)|other": "(~%(count)s torthaí)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s toradh)",
+        "other": "(~%(count)s torthaí)"
+    },
     "No answer": "Gan freagair",
     "Unknown failure: %(reason)s": "Teip anaithnid: %(reason)s",
     "Enable encryption in settings.": "Tosaigh criptiú sna socruithe.",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index bc9510a8e0..e542fc66f9 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -128,8 +128,10 @@
     "Unmute": "Non acalar",
     "Mute": "Acalar",
     "Admin Tools": "Ferramentas de administración",
-    "and %(count)s others...|other": "e %(count)s outras...",
-    "and %(count)s others...|one": "e outra máis...",
+    "and %(count)s others...": {
+        "other": "e %(count)s outras...",
+        "one": "e outra máis..."
+    },
     "Invited": "Convidada",
     "Filter room members": "Filtrar os participantes da conversa",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (permiso %(powerLevelNumber)s)",
@@ -158,8 +160,10 @@
     "Replying": "Respondendo",
     "Unnamed room": "Sala sen nome",
     "Save": "Gardar",
-    "(~%(count)s results)|other": "(~%(count)s resultados)",
-    "(~%(count)s results)|one": "(~%(count)s resultado)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s resultados)",
+        "one": "(~%(count)s resultado)"
+    },
     "Join Room": "Unirse a sala",
     "Upload avatar": "Subir avatar",
     "Settings": "Axustes",
@@ -234,54 +238,98 @@
     "No results": "Sen resultados",
     "Home": "Inicio",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s uníronse %(count)s veces",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s uníronse",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s uniuse %(count)s veces",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s uniuse",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s saíron %(count)s veces",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s saíron",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saíu %(count)s veces",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saíu",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s uníronse e saíron %(count)s veces",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s uníronse e saíron",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s uníuse e saíu %(count)s veces",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s uniuse e saíu",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíron e volveron %(count)s veces",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíron e votaron",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saíu e volveu %(count)s veces",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saíu e volveu",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rexeitaron convites %(count)s veces",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rexeitaron os seus convites",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rexeitou o seu convite %(count)s veces",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rexeitou o seu convite",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "retiróuselle o convite a %(severalUsers)s %(count)s veces",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "retiróuselle o convite a %(severalUsers)s",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "retiróuselle o convite a %(oneUser)s %(count)s veces",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "retiróuselle o convite a %(oneUser)s",
-    "were invited %(count)s times|other": "foron convidados %(count)s veces",
-    "were invited %(count)s times|one": "foron convidados",
-    "was invited %(count)s times|other": "foi convidada %(count)s veces",
-    "was invited %(count)s times|one": "foi convidada",
-    "were banned %(count)s times|other": "foron prohibidas %(count)s veces",
-    "were banned %(count)s times|one": "foron prohibidas",
-    "was banned %(count)s times|other": "foi vetada %(count)s veces",
-    "was banned %(count)s times|one": "foi prohibida",
-    "were unbanned %(count)s times|other": "retiróuselle a prohibición %(count)s veces",
-    "were unbanned %(count)s times|one": "retrouseille a prohibición",
-    "was unbanned %(count)s times|other": "retirouselle o veto %(count)s veces",
-    "was unbanned %(count)s times|one": "retiróuselle a prohibición",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s cambiaron o seu nome %(count)s veces",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s cambiaron o seu nome",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s cambiou o seu nome %(count)s veces",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s cambiou o seu nome",
-    "%(items)s and %(count)s others|other": "%(items)s e %(count)s outras",
-    "%(items)s and %(count)s others|one": "%(items)s e outra máis",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s uníronse %(count)s veces",
+        "one": "%(severalUsers)s uníronse"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s uniuse %(count)s veces",
+        "one": "%(oneUser)s uniuse"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s saíron %(count)s veces",
+        "one": "%(severalUsers)s saíron"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s saíu %(count)s veces",
+        "one": "%(oneUser)s saíu"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s uníronse e saíron %(count)s veces",
+        "one": "%(severalUsers)s uníronse e saíron"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s uníuse e saíu %(count)s veces",
+        "one": "%(oneUser)s uniuse e saíu"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s saíron e volveron %(count)s veces",
+        "one": "%(severalUsers)s saíron e votaron"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s saíu e volveu %(count)s veces",
+        "one": "%(oneUser)s saíu e volveu"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s rexeitaron convites %(count)s veces",
+        "one": "%(severalUsers)s rexeitaron os seus convites"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s rexeitou o seu convite %(count)s veces",
+        "one": "%(oneUser)s rexeitou o seu convite"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "retiróuselle o convite a %(severalUsers)s %(count)s veces",
+        "one": "retiróuselle o convite a %(severalUsers)s"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "retiróuselle o convite a %(oneUser)s %(count)s veces",
+        "one": "retiróuselle o convite a %(oneUser)s"
+    },
+    "were invited %(count)s times": {
+        "other": "foron convidados %(count)s veces",
+        "one": "foron convidados"
+    },
+    "was invited %(count)s times": {
+        "other": "foi convidada %(count)s veces",
+        "one": "foi convidada"
+    },
+    "were banned %(count)s times": {
+        "other": "foron prohibidas %(count)s veces",
+        "one": "foron prohibidas"
+    },
+    "was banned %(count)s times": {
+        "other": "foi vetada %(count)s veces",
+        "one": "foi prohibida"
+    },
+    "were unbanned %(count)s times": {
+        "other": "retiróuselle a prohibición %(count)s veces",
+        "one": "retrouseille a prohibición"
+    },
+    "was unbanned %(count)s times": {
+        "other": "retirouselle o veto %(count)s veces",
+        "one": "retiróuselle a prohibición"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s cambiaron o seu nome %(count)s veces",
+        "one": "%(severalUsers)s cambiaron o seu nome"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s cambiou o seu nome %(count)s veces",
+        "one": "%(oneUser)s cambiou o seu nome"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s e %(count)s outras",
+        "one": "%(items)s e outra máis"
+    },
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
     "collapse": "comprimir",
     "expand": "despregar",
     "Custom level": "Nivel personalizado",
     "Start chat": "Iniciar conversa",
-    "And %(count)s more...|other": "E %(count)s máis...",
+    "And %(count)s more...": {
+        "other": "E %(count)s máis..."
+    },
     "Confirm Removal": "Confirma a retirada",
     "Create": "Crear",
     "Unknown error": "Fallo descoñecido",
@@ -325,9 +373,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial desta sala, pero non tes permiso para ver a mensaxe en cuestión.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial desta sala, pero non se puido atopar.",
     "Failed to load timeline position": "Fallo ao cargar posición da liña temporal",
-    "Uploading %(filename)s and %(count)s others|other": "Subindo %(filename)s e %(count)s máis",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Subindo %(filename)s e %(count)s máis",
+        "one": "Subindo %(filename)s e %(count)s máis"
+    },
     "Uploading %(filename)s": "Subindo %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Subindo %(filename)s e %(count)s máis",
     "Sign out": "Saír",
     "Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?",
     "Success": "Parabéns",
@@ -608,10 +658,14 @@
     "Joins room with given address": "Unirse a sala co enderezo dado",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s estableceu o enderezo principal da sala %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s eliminiou o enderezo principal desta sala.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s engadiu os enderezos alternativos %(addresses)s para esta sala.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s engadiu o enderezo alternativo %(addresses)s para esta sala.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s eliminou os enderezos alternativos %(addresses)s desta sala.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s eliminou o enderezo alternativo %(addresses)s desta sala.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s engadiu os enderezos alternativos %(addresses)s para esta sala.",
+        "one": "%(senderName)s engadiu o enderezo alternativo %(addresses)s para esta sala."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s eliminou os enderezos alternativos %(addresses)s desta sala.",
+        "one": "%(senderName)s eliminou o enderezo alternativo %(addresses)s desta sala."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s cambiou os enderezos alternativos desta sala.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s cambiou o enderezo principal e alternativo para esta sala.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s cambiou o enderezo desta sala.",
@@ -642,8 +696,10 @@
     "Not Trusted": "Non confiable",
     "Done": "Feito",
     "%(displayName)s is typing …": "%(displayName)s está escribindo…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s e outras %(count)s están escribindo…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s e outra están escribindo…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s e outras %(count)s están escribindo…",
+        "one": "%(names)s e outra están escribindo…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s e %(lastPerson)s están escribindo…",
     "Cannot reach homeserver": "Non se acadou o servidor",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Asegúrate de que tes boa conexión a internet, ou contacta coa administración do servidor",
@@ -1093,12 +1149,18 @@
     "Message preview": "Vista previa da mensaxe",
     "List options": "Opcións da listaxe",
     "Add room": "Engadir sala",
-    "Show %(count)s more|other": "Mostrar %(count)s máis",
-    "Show %(count)s more|one": "Mostrar %(count)s máis",
-    "%(count)s unread messages including mentions.|other": "%(count)s mensaxes non lidas incluíndo mencións.",
-    "%(count)s unread messages including mentions.|one": "1 mención non lida.",
-    "%(count)s unread messages.|other": "%(count)s mensaxe non lidas.",
-    "%(count)s unread messages.|one": "1 mensaxe non lida.",
+    "Show %(count)s more": {
+        "other": "Mostrar %(count)s máis",
+        "one": "Mostrar %(count)s máis"
+    },
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s mensaxes non lidas incluíndo mencións.",
+        "one": "1 mención non lida."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s mensaxe non lidas.",
+        "one": "1 mensaxe non lida."
+    },
     "Unread messages.": "Mensaxes non lidas.",
     "Room options": "Opcións da Sala",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ao actualizar a sala pecharás a instancia actual da sala e crearás unha versión mellorada co mesmo nome.",
@@ -1145,18 +1207,24 @@
     "Your homeserver": "O teu servidor",
     "Trusted": "Confiable",
     "Not trusted": "Non confiable",
-    "%(count)s verified sessions|other": "%(count)s sesións verificadas",
-    "%(count)s verified sessions|one": "1 sesión verificada",
+    "%(count)s verified sessions": {
+        "other": "%(count)s sesións verificadas",
+        "one": "1 sesión verificada"
+    },
     "Hide verified sessions": "Agochar sesións verificadas",
-    "%(count)s sessions|other": "%(count)s sesións",
-    "%(count)s sessions|one": "%(count)s sesión",
+    "%(count)s sessions": {
+        "other": "%(count)s sesións",
+        "one": "%(count)s sesión"
+    },
     "Hide sessions": "Agochar sesións",
     "No recent messages by %(user)s found": "Non se atoparon mensaxes recentes de %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Desprázate na cronoloxía para ver se hai algúns máis recentes.",
     "Remove recent messages by %(user)s": "Eliminar mensaxes recentes de %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Podería demorar un tempo se é un número grande de mensaxes. Non actualices o cliente mentras tanto.",
-    "Remove %(count)s messages|other": "Eliminar %(count)s mensaxes",
-    "Remove %(count)s messages|one": "Eliminar 1 mensaxe",
+    "Remove %(count)s messages": {
+        "other": "Eliminar %(count)s mensaxes",
+        "one": "Eliminar 1 mensaxe"
+    },
     "Remove recent messages": "Eliminar mensaxes recentes",
     "Deactivate user?": "¿Desactivar usuaria?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Ao desactivar esta usuaria ficará desconectada e non poderá volver a acceder. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
@@ -1239,10 +1307,14 @@
     "Rotate Left": "Rotar á esquerda",
     "Rotate Right": "Rotar á dereita",
     "Language Dropdown": "Selector de idioma",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s non fixeron cambios %(count)s veces",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s non fixeron cambios",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s non fixo cambios %(count)s veces",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s non fixo cambios",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s non fixeron cambios %(count)s veces",
+        "one": "%(severalUsers)s non fixeron cambios"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s non fixo cambios %(count)s veces",
+        "one": "%(oneUser)s non fixo cambios"
+    },
     "QR Code": "Código QR",
     "Room address": "Enderezo da sala",
     "e.g. my-room": "ex. a-miña-sala",
@@ -1380,8 +1452,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Este ficheiro é <b>demasiado grande</b> para subilo. O límite é %(limit)s mais o ficheiro é %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Estes ficheiros son <b>demasiado grandes</b> para subilos. O límite é %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Algúns ficheiros son <b>demasiado grandes</b> para subilos. O límite é %(limit)s.",
-    "Upload %(count)s other files|other": "Subir outros %(count)s ficheiros",
-    "Upload %(count)s other files|one": "Subir %(count)s ficheiro máis",
+    "Upload %(count)s other files": {
+        "other": "Subir outros %(count)s ficheiros",
+        "one": "Subir %(count)s ficheiro máis"
+    },
     "Cancel All": "Cancelar todo",
     "Upload Error": "Fallo ao subir",
     "Verification Request": "Solicitude de Verificación",
@@ -1425,8 +1499,10 @@
     "View": "Vista",
     "Jump to first unread room.": "Vaite a primeira sala non lida.",
     "Jump to first invite.": "Vai ó primeiro convite.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Tes %(count)s notificacións non lidas nunha versión previa desta sala.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Tes %(count)s notificacións non lidas nunha versión previa desta sala.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Tes %(count)s notificacións non lidas nunha versión previa desta sala.",
+        "one": "Tes %(count)s notificacións non lidas nunha versión previa desta sala."
+    },
     "Switch to light mode": "Cambiar a decorado claro",
     "Switch to dark mode": "Cambiar a decorado escuro",
     "Switch theme": "Cambiar decorado",
@@ -1649,7 +1725,9 @@
     "Move right": "Mover á dereita",
     "Move left": "Mover á esquerda",
     "Revoke permissions": "Revogar permisos",
-    "You can only pin up to %(count)s widgets|other": "Só podes fixar ata %(count)s widgets",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Só podes fixar ata %(count)s widgets"
+    },
     "Show Widgets": "Mostrar Widgets",
     "Hide Widgets": "Agochar Widgets",
     "The call was answered on another device.": "A chamada foi respondida noutro dispositivo.",
@@ -1937,8 +2015,10 @@
     "Equatorial Guinea": "Guinea Ecuatorial",
     "El Salvador": "O Salvador",
     "Egypt": "Exipto",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas.",
+        "other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas."
+    },
     "Go to Home View": "Ir á Páxina de Inicio",
     "The <b>%(capability)s</b> capability": "A capacidade de <b>%(capability)s</b>",
     "Decline All": "Rexeitar todo",
@@ -2140,8 +2220,10 @@
     "Support": "Axuda",
     "Random": "Ao chou",
     "Welcome to <name/>": "Benvida a <name/>",
-    "%(count)s members|one": "%(count)s participante",
-    "%(count)s members|other": "%(count)s participantes",
+    "%(count)s members": {
+        "one": "%(count)s participante",
+        "other": "%(count)s participantes"
+    },
     "Your server does not support showing space hierarchies.": "O teu servidor non soporta amosar xerarquías dos espazos.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Tes a certeza de querer deixar o espazo '%(spaceName)s'?",
     "This space is not public. You will not be able to rejoin without an invite.": "Este espazo non é público. Non poderás volver a unirte sen un convite.",
@@ -2203,8 +2285,10 @@
     "Failed to remove some rooms. Try again later": "Fallou a eliminación de algunhas salas. Inténtao máis tarde",
     "Suggested": "Recomendada",
     "This room is suggested as a good one to join": "Esta sala é recomendada como apropiada para unirse",
-    "%(count)s rooms|one": "%(count)s sala",
-    "%(count)s rooms|other": "%(count)s salas",
+    "%(count)s rooms": {
+        "one": "%(count)s sala",
+        "other": "%(count)s salas"
+    },
     "You don't have permission": "Non tes permiso",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Normalmente esto só afecta a como se xestiona a sala no servidor. Se tes problemas co teu %(brand)s, informa do fallo.",
     "Invite to %(roomName)s": "Convidar a %(roomName)s",
@@ -2226,8 +2310,10 @@
     "unknown person": "persoa descoñecida",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultando con %(transferTarget)s. <a>Transferir a %(transferee)s</a>",
     "Manage & explore rooms": "Xestionar e explorar salas",
-    "%(count)s people you know have already joined|other": "%(count)s persoas que coñeces xa se uniron",
-    "%(count)s people you know have already joined|one": "%(count)s persoa que coñeces xa se uniu",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s persoas que coñeces xa se uniron",
+        "one": "%(count)s persoa que coñeces xa se uniu"
+    },
     "Add existing rooms": "Engadir salas existentes",
     "Consult first": "Preguntar primeiro",
     "Reset event store": "Restablecer almacenaxe de eventos",
@@ -2252,8 +2338,10 @@
     "Delete all": "Eliminar todo",
     "Some of your messages have not been sent": "Algunha das túas mensaxes non se enviou",
     "Including %(commaSeparatedMembers)s": "Incluíndo a %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Ver 1 membro",
-    "View all %(count)s members|other": "Ver tódolos %(count)s membros",
+    "View all %(count)s members": {
+        "one": "Ver 1 membro",
+        "other": "Ver tódolos %(count)s membros"
+    },
     "Failed to send": "Fallou o envío",
     "Enter your Security Phrase a second time to confirm it.": "Escribe a túa Frase de Seguridade por segunda vez para confirmala.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Elixe salas ou conversas para engadilas. Este é un espazo para ti, ninguén será notificado. Podes engadir máis posteriormente.",
@@ -2266,8 +2354,10 @@
     "Leave the beta": "Saír da beta",
     "Beta": "Beta",
     "Want to add a new room instead?": "Queres engadir unha nova sala?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Engadindo sala...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Engadindo salas... (%(progress)s de %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Engadindo sala...",
+        "other": "Engadindo salas... (%(progress)s de %(count)s)"
+    },
     "Not all selected were added": "Non se engadiron tódolos seleccionados",
     "You are not allowed to view this server's rooms list": "Non tes permiso para ver a lista de salas deste servidor",
     "Error processing voice message": "Erro ao procesar a mensaxe de voz",
@@ -2291,8 +2381,10 @@
     "Sends the given message with a space themed effect": "Envía a mensaxe cun efecto de decorado espacial",
     "See when people join, leave, or are invited to your active room": "Mira cando alguén se une, sae ou é convidada á túa sala activa",
     "See when people join, leave, or are invited to this room": "Mira cando se une alguén, sae ou é convidada a esta sala",
-    "Currently joining %(count)s rooms|one": "Neste intre estás en %(count)s sala",
-    "Currently joining %(count)s rooms|other": "Neste intre estás en %(count)s salas",
+    "Currently joining %(count)s rooms": {
+        "one": "Neste intre estás en %(count)s sala",
+        "other": "Neste intre estás en %(count)s salas"
+    },
     "The user you called is busy.": "A persoa á que chamas está ocupada.",
     "User Busy": "Usuaria ocupada",
     "Or send invite link": "Ou envía ligazón de convite",
@@ -2324,10 +2416,14 @@
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "O que escribe esta usuaria non é correcto.\nSerá denunciado á moderación da sala.",
     "User Directory": "Directorio de Usuarias",
     "Please provide an address": "Proporciona un enderezo",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s cambiou ACLs do servidor",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s cambiou o ACLs do servidor %(count)s veces",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s cambiaron o ACLs do servidor",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s cambiaron ACLs do servidor %(count)s veces",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s cambiou ACLs do servidor",
+        "other": "%(oneUser)s cambiou o ACLs do servidor %(count)s veces"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s cambiaron o ACLs do servidor",
+        "other": "%(severalUsers)s cambiaron ACLs do servidor %(count)s veces"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Fallou a inicialización da busca de mensaxes, comproba <a>os axustes</a> para máis información",
     "Error processing audio message": "Erro ao procesar a mensaxe de audio",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Establecer enderezos para este espazo para que as usuarias poidan atopar o espazo no servidor (%(localDomain)s)",
@@ -2335,8 +2431,10 @@
     "Published addresses can be used by anyone on any server to join your room.": "Os enderezos publicados poden ser utilizados por calquera en calquera servidor para unirse á túa sala.",
     "Published addresses can be used by anyone on any server to join your space.": "Os enderezos publicados podense usar por calquera en calquera servidor para unirse ao teu espazo.",
     "This space has no local addresses": "Este espazo non ten enderezos locais",
-    "Show %(count)s other previews|one": "Mostrar %(count)s outra vista previa",
-    "Show %(count)s other previews|other": "Mostrar outras %(count)s vistas previas",
+    "Show %(count)s other previews": {
+        "one": "Mostrar %(count)s outra vista previa",
+        "other": "Mostrar outras %(count)s vistas previas"
+    },
     "Space information": "Información do Espazo",
     "Images, GIFs and videos": "Imaxes, GIFs e vídeos",
     "Code blocks": "Bloques de código",
@@ -2451,8 +2549,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Calquera nun espazo pode atopar e unirse. Podes elexir múltiples espazos.",
     "Spaces with access": "Espazos con acceso",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Calquera nun espazo pode atopala e unirse. <a>Editar que espazos poden acceder aquí.</a>",
-    "Currently, %(count)s spaces have access|other": "Actualmente, %(count)s espazos teñen acceso",
-    "& %(count)s more|other": "e %(count)s máis",
+    "Currently, %(count)s spaces have access": {
+        "other": "Actualmente, %(count)s espazos teñen acceso",
+        "one": "Actualmente, un espazo ten acceso"
+    },
+    "& %(count)s more": {
+        "other": "e %(count)s máis",
+        "one": "e %(count)s máis"
+    },
     "Upgrade required": "Actualización requerida",
     "Anyone can find and join.": "Calquera pode atopala e unirse.",
     "Only invited people can join.": "Só se poden unir persoas con convite.",
@@ -2513,8 +2617,6 @@
     "Are you sure you want to add encryption to this public room?": "Tes a certeza de querer engadir cifrado a esta sala pública?",
     "Cross-signing is ready but keys are not backed up.": "A sinatura-cruzada está preparada pero non hai copia das chaves.",
     "Thread": "Tema",
-    "Currently, %(count)s spaces have access|one": "Actualmente, un espazo ten acceso",
-    "& %(count)s more|one": "e %(count)s máis",
     "Autoplay GIFs": "Reprod. automática GIFs",
     "Autoplay videos": "Reprod. automática vídeo",
     "The above, but in <Room /> as well": "O de arriba, pero tamén en <Room />",
@@ -2604,12 +2706,18 @@
     "Disinvite from %(roomName)s": "Retirar o convite para %(roomName)s",
     "Threads": "Conversas",
     "Create poll": "Crear enquisa",
-    "%(count)s reply|one": "%(count)s resposta",
-    "%(count)s reply|other": "%(count)s respostas",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Actualizando espazo...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Actualizando espazos... (%(progress)s de %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Enviando convite...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Enviando convites... (%(progress)s de %(count)s)",
+    "%(count)s reply": {
+        "one": "%(count)s resposta",
+        "other": "%(count)s respostas"
+    },
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Actualizando espazo...",
+        "other": "Actualizando espazos... (%(progress)s de %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Enviando convite...",
+        "other": "Enviando convites... (%(progress)s de %(count)s)"
+    },
     "Loading new room": "Cargando nova sala",
     "Upgrading room": "Actualizando sala",
     "View in room": "Ver na sala",
@@ -2661,12 +2769,18 @@
     "Rename": "Cambiar nome",
     "Select all": "Seleccionar todos",
     "Deselect all": "Retirar selección a todos",
-    "Sign out devices|one": "Desconectar dispositivo",
-    "Sign out devices|other": "Desconectar dispositivos",
-    "Click the button below to confirm signing out these devices.|one": "Preme no botón inferior para confirmar a desconexión deste dispositivo.",
-    "Click the button below to confirm signing out these devices.|other": "Preme no botón inferior para confirmar a desconexión destos dispositivos.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Confirma a desconexión deste dispositivo usando Single Sign On para probar a túa identidade.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Confirma a desconexión destos dispositivos usando Single Sign On para probar a túa identidade.",
+    "Sign out devices": {
+        "one": "Desconectar dispositivo",
+        "other": "Desconectar dispositivos"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Preme no botón inferior para confirmar a desconexión deste dispositivo.",
+        "other": "Preme no botón inferior para confirmar a desconexión destos dispositivos."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Confirma a desconexión deste dispositivo usando Single Sign On para probar a túa identidade.",
+        "other": "Confirma a desconexión destos dispositivos usando Single Sign On para probar a túa identidade."
+    },
     "Other rooms": "Outras salas",
     "sends rainfall": "envía chuvia",
     "Sends the given message with rainfall": "Envía a mensaxe dada incluíndo chuvia",
@@ -2692,12 +2806,18 @@
     "We call the places where you can host your account 'homeservers'.": "Chamámoslle 'Servidores de Inicio' aos lugares onde podes ter a túa conta.",
     "Matrix.org is the biggest public homeserver in the world, so it's a good place for many.": "Matrix.org é o servidor público máis grande do mundo, podería ser un bo lugar para comezar.",
     "If you can't see who you're looking for, send them your invite link below.": "Se non atopas a quen buscas, envíalle a túa ligazón de convite.",
-    "Based on %(count)s votes|one": "Baseado en %(count)s voto",
-    "Based on %(count)s votes|other": "Baseado en %(count)s votos",
-    "%(count)s votes|one": "%(count)s voto",
-    "%(count)s votes|other": "%(count)s votos",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s e %(count)s outro",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s e outros %(count)s",
+    "Based on %(count)s votes": {
+        "one": "Baseado en %(count)s voto",
+        "other": "Baseado en %(count)s votos"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s voto",
+        "other": "%(count)s votos"
+    },
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s e %(count)s outro",
+        "other": "%(spaceName)s e outros %(count)s"
+    },
     "Sorry, the poll you tried to create was not posted.": "A enquisa que ías publicar non se puido publicar.",
     "Failed to post poll": "Non se puido publicar a enquisa",
     "Sorry, your vote was not registered. Please try again.": "O teu voto non foi rexistrado, inténtao outra vez.",
@@ -2725,8 +2845,10 @@
     "We <Bold>don't</Bold> share information with third parties": "<Bold>Non</Bold> compartimos a información con terceiras partes",
     "We <Bold>don't</Bold> record or profile any account data": "<Bold>Non</Bold> rexistramos o teu perfil nin datos da conta",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "Podes ler os nosos termos <PrivacyPolicyUrl>aquí</PrivacyPolicyUrl>",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s votos recollidos. Vota para ver os resultados",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s voto recollido. Vota para ver os resultados",
+    "%(count)s votes cast. Vote to see the results": {
+        "other": "%(count)s votos recollidos. Vota para ver os resultados",
+        "one": "%(count)s voto recollido. Vota para ver os resultados"
+    },
     "No votes cast": "Sen votos",
     "Share location": "Compartir localización",
     "Manage pinned events": "Xestiona os eventos fixados",
@@ -2756,20 +2878,30 @@
     "The poll has ended. Top answer: %(topAnswer)s": "Rematou a enquisa. O máis votado: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "Rematou a enquisa. Non houbo votos.",
     "Including you, %(commaSeparatedMembers)s": "Incluíndote a ti, %(commaSeparatedMembers)s",
-    "Final result based on %(count)s votes|one": "Resultado final baseado en %(count)s voto",
-    "Final result based on %(count)s votes|other": "Resultado final baseado en %(count)s votos",
+    "Final result based on %(count)s votes": {
+        "one": "Resultado final baseado en %(count)s voto",
+        "other": "Resultado final baseado en %(count)s votos"
+    },
     "Copy room link": "Copiar ligazón á sala",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Non entendemos a data proporcionada (%(inputDate)s). Intenta usar o formato AAAA-MM-DD.",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Exportado %(count)s evento en %(seconds)s segundos",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Exportados %(count)s eventos en %(seconds)s segundos",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Exportado %(count)s evento en %(seconds)s segundos",
+        "other": "Exportados %(count)s eventos en %(seconds)s segundos"
+    },
     "Export successful!": "Exportación correcta!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Obtido %(count)s evento en %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "Obtidos %(count)s eventos en %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Obtido %(count)s evento en %(seconds)ss",
+        "other": "Obtidos %(count)s eventos en %(seconds)ss"
+    },
     "Processing event %(number)s out of %(total)s": "Procesando evento %(number)s de %(total)s",
-    "Fetched %(count)s events so far|one": "Obtido %(count)s evento por agora",
-    "Fetched %(count)s events so far|other": "Obtidos %(count)s eventos por agora",
-    "Fetched %(count)s events out of %(total)s|one": "Obtido %(count)s evento de %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Obtidos %(count)s eventos de %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Obtido %(count)s evento por agora",
+        "other": "Obtidos %(count)s eventos por agora"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Obtido %(count)s evento de %(total)s",
+        "other": "Obtidos %(count)s eventos de %(total)s"
+    },
     "Generating a ZIP": "Creando un ZIP",
     "Remove, ban, or invite people to your active room, and make you leave": "Eliminar, vetar ou convidar persoas á túa sala activa, e saír ti mesmo",
     "Remove, ban, or invite people to this room, and make you leave": "Eliminar, vetar, ou convidar persas a esta sala, e saír ti mesmo",
@@ -2853,10 +2985,14 @@
     "This address does not point at this room": "Este enderezo non dirixe a esta sala",
     "Missing room name or separator e.g. (my-room:domain.org)": "Falta o nome da sala ou separador ex. (sala:dominio.org)",
     "Missing domain separator e.g. (:domain.org)": "Falta o separador do cominio ex. (:dominio.org)",
-    "was removed %(count)s times|one": "foi eliminado",
-    "was removed %(count)s times|other": "foi eliminado %(count)s veces",
-    "were removed %(count)s times|one": "foi eliminado",
-    "were removed %(count)s times|other": "foron eliminados %(count)s veces",
+    "was removed %(count)s times": {
+        "one": "foi eliminado",
+        "other": "foi eliminado %(count)s veces"
+    },
+    "were removed %(count)s times": {
+        "one": "foi eliminado",
+        "other": "foron eliminados %(count)s veces"
+    },
     "Backspace": "Retroceso",
     "Unknown error fetching location. Please try again later.": "Erro descoñecido ao obter a localización, inténtao máis tarde.",
     "Timed out trying to fetch your location. Please try again later.": "Caducou o intento de obter a localización, inténtao máis tarde.",
@@ -2900,16 +3036,26 @@
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s e %(space2Name)s",
     "Maximise": "Maximizar",
     "<empty string>": "<cadea baleira>",
-    "<%(count)s spaces>|one": "<spazo>",
-    "<%(count)s spaces>|other": "<%(count)s espazos>",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s enviou unha mensaxe oculta",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s enviou %(count)s mensaxes ocultas",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s enviou unha mensaxe oculta",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s enviaron %(count)s mensaxes ocultas",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s eliminou unha mensaxe",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s eliminou %(count)s mensaxes",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s eliminaron unha mensaxe",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s eliminaron %(count)s mensaxes",
+    "<%(count)s spaces>": {
+        "one": "<spazo>",
+        "other": "<%(count)s espazos>"
+    },
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)s enviou unha mensaxe oculta",
+        "other": "%(oneUser)s enviou %(count)s mensaxes ocultas"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s enviou unha mensaxe oculta",
+        "other": "%(severalUsers)s enviaron %(count)s mensaxes ocultas"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s eliminou unha mensaxe",
+        "other": "%(oneUser)s eliminou %(count)s mensaxes"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s eliminaron unha mensaxe",
+        "other": "%(severalUsers)s eliminaron %(count)s mensaxes"
+    },
     "Automatically send debug logs when key backup is not functioning": "Enviar automáticamente rexistros de depuración cando a chave da copia de apoio non funcione",
     "Join %(roomAddress)s": "Unirse a %(roomAddress)s",
     "Edit poll": "Editar enquisa",
@@ -2939,10 +3085,14 @@
     "No virtual room for this room": "No hai sala virtual para esta sala",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Responde a unha conversa en curso ou usa \"%(replyInThread)s\" cando pasas por enriba dunha mensaxe co rato para iniciar unha nova.",
     "We'll create rooms for each of them.": "Imos crear salas para cada un deles.",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s cambiou as <a>mensaxes fixadas</a> da sala",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s cambiou as <a>mensaxes fixadas</a> da sala %(count)s veces",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s cambiaron as <a>mensaxes fixadas</a> da sala",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s cambiaron as <a>mensaxes fixadas</a> da sala %(count)s veces",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s cambiou as <a>mensaxes fixadas</a> da sala",
+        "other": "%(oneUser)s cambiou as <a>mensaxes fixadas</a> da sala %(count)s veces"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s cambiaron as <a>mensaxes fixadas</a> da sala",
+        "other": "%(severalUsers)s cambiaron as <a>mensaxes fixadas</a> da sala %(count)s veces"
+    },
     "Click": "Premer",
     "Expand quotes": "Despregar as citas",
     "Collapse quotes": "Pregar as citas",
@@ -2955,8 +3105,10 @@
     "You are sharing your live location": "Vas compartir en directo a túa localización",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Desmarcar se tamén queres eliminar as mensaxes do sistema acerca da usuaria (ex. cambios na membresía, cambios no perfil...)",
     "Preserve system messages": "Conservar mensaxes do sistema",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Vas eliminar %(count)s mensaxe de %(user)s. Esto eliminaraa de xeito permanente para todas na conversa. Tes a certeza de querer eliminala?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Vas a eliminar %(count)s mensaxes de %(user)s. Así eliminaralos de xeito permanente para todas na conversa. Tes a certeza de facelo?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Vas eliminar %(count)s mensaxe de %(user)s. Esto eliminaraa de xeito permanente para todas na conversa. Tes a certeza de querer eliminala?",
+        "other": "Vas a eliminar %(count)s mensaxes de %(user)s. Así eliminaralos de xeito permanente para todas na conversa. Tes a certeza de facelo?"
+    },
     "%(displayName)s's live location": "Localización en directo de %(displayName)s",
     "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Este servidor non está correctamente configurado para mostrar mapas, ou o servidor de mapas configurado non é accesible.",
     "This homeserver is not configured to display maps.": "Este servidor non está configurado para mostrar mapas.",
@@ -2967,8 +3119,10 @@
     "Shared their location: ": "Compartiron a súa localización: ",
     "Unable to load map": "Non se cargou o mapa",
     "Can't create a thread from an event with an existing relation": "Non se pode crear un tema con unha relación existente desde un evento",
-    "Currently removing messages in %(count)s rooms|one": "Eliminando agora mensaxes de %(count)s sala",
-    "Currently removing messages in %(count)s rooms|other": "Eliminando agora mensaxes de %(count)s salas",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Eliminando agora mensaxes de %(count)s sala",
+        "other": "Eliminando agora mensaxes de %(count)s salas"
+    },
     "Busy": "Ocupado",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Se informaches do fallo en GitHub, os rexistros poden ser útiles para arranxar o problema. ",
     "%(value)ss": "%(value)ss",
@@ -3035,8 +3189,10 @@
     "Create video room": "Crear sala de vídeo",
     "Create a video room": "Crear sala de vídeo",
     "%(featureName)s Beta feedback": "Informe sobre %(featureName)s Beta",
-    "%(count)s participants|one": "1 participante",
-    "%(count)s participants|other": "%(count)s participantes",
+    "%(count)s participants": {
+        "one": "1 participante",
+        "other": "%(count)s participantes"
+    },
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Obtívose o erro %(errcode)s ao intentar acceder á sala ou espazo. Se cres que esta mensaxe é un erro, por favor <issueLink>envía un informe do fallo</issueLink>.",
     "Try again later, or ask a room or space admin to check if you have access.": "Inténtao máis tarde, ou solicita a admin da sala ou espazo que mire se tes acceso.",
     "This room or space is not accessible at this time.": "Esta sala ou espazo non é accesible neste intre.",
@@ -3064,8 +3220,10 @@
     "The user's homeserver does not support the version of the space.": "O servidor de inicio da usuaria non soporta a versión do Espazo.",
     "sends hearts": "envía corazóns",
     "Sends the given message with hearts": "Engádelle moitos corazóns á mensaxe",
-    "Confirm signing out these devices|one": "Confirma a desconexión deste dispositivo",
-    "Confirm signing out these devices|other": "Confirma a desconexión destos dispositivos",
+    "Confirm signing out these devices": {
+        "one": "Confirma a desconexión deste dispositivo",
+        "other": "Confirma a desconexión destos dispositivos"
+    },
     "Live location ended": "Rematou a localización en directo",
     "View live location": "Ver localización en directo",
     "Live location enabled": "Activada a localización en directo",
@@ -3104,8 +3262,10 @@
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Pechaches a sesión en tódolos dispositivos e non recibirás notificacións push. Para reactivalas notificacións volve a acceder en cada dispositivo.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Se queres manter o acceso ao historial de conversas en salas cifradas, configura a Copia de Apoio das Chaves ou exporta as chaves das mensaxes desde un dos teus dispositivos antes de continuar.",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Ao pechar sesión nos teus dispositivos eliminarás as chaves de cifrado de mensaxes gardadas neles, facendo ilexible o historial de conversas cifrado.",
-    "Seen by %(count)s people|one": "Visto por %(count)s persoa",
-    "Seen by %(count)s people|other": "Visto por %(count)s persoas",
+    "Seen by %(count)s people": {
+        "one": "Visto por %(count)s persoa",
+        "other": "Visto por %(count)s persoas"
+    },
     "Your password was successfully changed.": "Cambiouse correctamente o contrasinal.",
     "An error occurred while stopping your live location": "Algo fallou ao deter a compartición da localización en directo",
     "Enable live location sharing": "Activar a compartición da localización",
@@ -3137,8 +3297,10 @@
     "Click to read topic": "Preme para ler o tema",
     "Edit topic": "Editar asunto",
     "Joining…": "Entrando…",
-    "%(count)s people joined|one": "uníuse %(count)s persoa",
-    "%(count)s people joined|other": "%(count)s persoas uníronse",
+    "%(count)s people joined": {
+        "one": "uníuse %(count)s persoa",
+        "other": "%(count)s persoas uníronse"
+    },
     "Failed to set direct message tag": "Non se estableceu a etiqueta de mensaxe directa",
     "Read receipts": "Resgados de lectura",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "Activar aceleración por hardware (reiniciar %(appName)s para aplicar)",
@@ -3169,8 +3331,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Se non atopas a quen buscas, envíalle unha ligazón de convite.",
     "Some results may be hidden for privacy": "Algúns resultados poden estar agochados por privacidade",
     "Search for": "Buscar",
-    "%(count)s Members|one": "%(count)s Participante",
-    "%(count)s Members|other": "%(count)s Participantes",
+    "%(count)s Members": {
+        "one": "%(count)s Participante",
+        "other": "%(count)s Participantes"
+    },
     "Show: Matrix rooms": "Mostrar: salas Matrix",
     "Show: %(instance)s rooms (%(server)s)": "Mostrar: salas de %(instance)s (%(server)s)",
     "Add new server…": "Engadir novo servidor…",
@@ -3189,9 +3353,11 @@
     "Enter fullscreen": "Ir a pantalla completa",
     "Map feedback": "Opinión sobre Mapa",
     "Toggle attribution": "Cambiar atribución",
-    "In %(spaceName)s and %(count)s other spaces.|one": "No %(spaceName)s e %(count)s outro espazo.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "No %(spaceName)s e %(count)s outro espazo.",
+        "other": "No espazo %(spaceName)s e %(count)s outros espazos."
+    },
     "In %(spaceName)s.": "No espazo %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "No espazo %(spaceName)s e %(count)s outros espazos.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Nos espazos %(space1Name)s e %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Comando de desenvolvemento: descarta a actual sesión en grupo e crea novas sesións Olm",
     "Stop and close": "Deter e pechar",
@@ -3211,8 +3377,10 @@
     "Spell check": "Corrección",
     "Complete these to get the most out of %(brand)s": "Completa esto para sacarlle partido a %(brand)s",
     "You did it!": "Xa está!",
-    "Only %(count)s steps to go|one": "A só %(count)s paso de comezar",
-    "Only %(count)s steps to go|other": "Só %(count)s para comezar",
+    "Only %(count)s steps to go": {
+        "one": "A só %(count)s paso de comezar",
+        "other": "Só %(count)s para comezar"
+    },
     "Welcome to %(brand)s": "Benvida a %(brand)s",
     "Find your people": "Atopa a persoas",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Mantén o control e a propiedade sobre as conversas da comunidade.\nPodendo xestionar millóns de contas, con ferramentas para a moderación e a interoperabilidade.",
@@ -3290,11 +3458,15 @@
     "Welcome": "Benvida",
     "Don’t miss a thing by taking %(brand)s with you": "Non perdas nada e leva %(brand)s contigo",
     "Empty room (was %(oldName)s)": "Sala baleira (era %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Convidando a %(user)s e outra persoa",
-    "Inviting %(user)s and %(count)s others|other": "Convidando a %(user)s e %(count)s outras",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Convidando a %(user)s e outra persoa",
+        "other": "Convidando a %(user)s e %(count)s outras"
+    },
     "Inviting %(user1)s and %(user2)s": "Convidando a %(user1)s e %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s outra usuaria",
-    "%(user)s and %(count)s others|other": "%(user)s e %(count)s outras",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s outra usuaria",
+        "other": "%(user)s e %(count)s outras"
+    },
     "%(user1)s and %(user2)s": "%(user1)s e %(user2)s",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s ou %(copyButton)s",
     "%(securityKey)s or %(recoveryFile)s": "%(securityKey)s ou %(recoveryFile)s",
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 86eda97ec9..96d65dc141 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -515,8 +515,10 @@
     "about a minute ago": "לפני בערך דקה",
     "a few seconds ago": "לפני מספר שניות",
     "%(items)s and %(lastItem)s": "%(items)s ו%(lastItem)s אחרון",
-    "%(items)s and %(count)s others|one": "%(items)s ועוד אחד אחר",
-    "%(items)s and %(count)s others|other": "%(items)s ו%(count)s אחרים",
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s ועוד אחד אחר",
+        "other": "%(items)s ו%(count)s אחרים"
+    },
     "This homeserver has exceeded one of its resource limits.": "השרת הזה חרג מאחד ממגבלות המשאבים שלו.",
     "This homeserver has hit its Monthly Active User limit.": "השרת הזה הגיע לקצה מספר המשתמשים הפעילים לחודש.",
     "Unexpected error resolving identity server configuration": "שגיאה לא צפויה בהתחברות אל שרת הזיהוי",
@@ -586,8 +588,10 @@
     "Remain on your screen while running": "השארו במסך זה כאשר אתם פעילים",
     "Remain on your screen when viewing another room, when running": "השארו במסך הראשי כאשר אתם עברים בין חדרים בכל קהילה",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ו%(lastPerson)s כותבים…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ועוד משהו כותבים…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s ו%(count)s אחרים כותבים…",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s ועוד משהו כותבים…",
+        "other": "%(names)s ו%(count)s אחרים כותבים…"
+    },
     "%(displayName)s is typing …": "%(displayName)s כותב…",
     "Done": "סיום",
     "Not Trusted": "לא אמין",
@@ -635,10 +639,14 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s שינה את הכתובות של חדר זה.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s שינה את הכתובת הראשית והמשנית של חדר זה.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s שניה את הכתובת המשנית של חדר זה.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s הסיר את הכתובת המשנית %(addresses)s עבור חדר זה.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s הסיר את הכתובת המשנית %(addresses)s עבור חדר זה.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s הוסיף כתובת משנית %(addresses)s עבור חדר זה.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s הוסיף את הכתובת המשנית %(addresses)s עבור חדר זה.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s הסיר את הכתובת המשנית %(addresses)s עבור חדר זה.",
+        "other": "%(senderName)s הסיר את הכתובת המשנית %(addresses)s עבור חדר זה."
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s הוסיף כתובת משנית %(addresses)s עבור חדר זה.",
+        "other": "%(senderName)s הוסיף את הכתובת המשנית %(addresses)s עבור חדר זה."
+    },
     "%(senderName)s removed the main address for this room.": "%(senderName)s הסיר את הכתובת הראשית עבור חדר זה.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s הגדיר את הכתובת הראשית עבור חדר זה ל- %(address)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s שלח תמונה.",
@@ -687,8 +695,10 @@
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s חסרים כמה רכיבים הנדרשים לצורך אחסון במטמון מאובטח של הודעות מוצפנות באופן מקומי. אם תרצה להתנסות בתכונה זו, בנה %(brand)s מותאם אישית לדסקטום עם <nativeLink>חפש רכיבים להוספה</nativeLink>.",
     "Securely cache encrypted messages locally for them to appear in search results.": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש.",
     "Manage": "ניהול",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש באמצעות %(size)s לשמור הודעות מחדרים %(rooms)s.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש באמצעות %(size)s לשמור הודעות מחדרים %(rooms)s.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש באמצעות %(size)s לשמור הודעות מחדרים %(rooms)s.",
+        "other": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש באמצעות %(size)s לשמור הודעות מחדרים %(rooms)s."
+    },
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "אמת בנפרד כל מושב שמשתמש בו כדי לסמן אותו כאמצעי מהימן, ולא אמון על מכשירים חתומים צולבים.",
     "Encryption": "הצפנה",
     "Failed to set display name": "עדכון שם תצוגה נכשל",
@@ -997,7 +1007,9 @@
     "Looks good": "נראה טוב",
     "Enter a server name": "הכנס שם שרת",
     "Home": "הבית",
-    "And %(count)s more...|other": "ו%(count)s עוד...",
+    "And %(count)s more...": {
+        "other": "ו%(count)s עוד..."
+    },
     "Sign in with single sign-on": "היכנס באמצעות כניסה יחידה",
     "Continue with %(provider)s": "המשך עם %(provider)s",
     "Homeserver": "שרת הבית",
@@ -1013,50 +1025,94 @@
     "QR Code": "קוד QR",
     "Custom level": "דרגה מותאמת",
     "Power level": "דרגת מנהל",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s לא ערכו שינוי",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s לא ערך שום שינוי %(count)s פעמים",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s לא ערכו שום שינוי",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s לא ערכו שום שינוי %(count)s פעמים",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s שינו את שמם",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s שינו את שמם %(count)s פעמים",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s שינו את שמם",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s שינו את שמם %(count)s פעמים",
-    "was unbanned %(count)s times|one": "חסימה בוטלה",
-    "was unbanned %(count)s times|other": "חסימה בוטלה %(count)s פעמים",
-    "were unbanned %(count)s times|one": "חסימה בוטלה",
-    "were unbanned %(count)s times|other": "חסימה בוטלה %(count)s פעמים",
-    "was banned %(count)s times|one": "נחסם",
-    "was banned %(count)s times|other": "נחסם %(count)s פעמים",
-    "were banned %(count)s times|one": "נחסמו",
-    "were banned %(count)s times|other": "נחסם %(count)s פעמים",
-    "was invited %(count)s times|one": "הוזמן",
-    "was invited %(count)s times|other": "הוזמן %(count)s פעמים",
-    "were invited %(count)s times|one": "הוזמנו",
-    "were invited %(count)s times|other": "הוזמנו %(count)s פעמים",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s משכו את ההזמנה שלהם",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s משך את ההזמנה שלו %(count)s פעמים",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s משכו את ההזמנות שלהם",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s משכו את ההזמנות שלהם %(count)s פעמים",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s דחו את ההזמנה שלו\\ה",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s דחה את ההזמנה %(count)s פעמים",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s דחו את ההזמנה שלהם",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s דחו את ההזמנה שלהם%(count)s פעמים",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s עזב/ה וחזר/ה",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s עזב/ה וחזר/ה %(count)s פעמים",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s עזבו וחזרו",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s עזבו וחזרו %(count)s פעמים",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s הצטרף/ה ועזב/ה",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s הצטרף/ה ועזב/ה %(count)s פעמים",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s הצטרפו ועזבו",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s הצטרפו ועזבו %(count)s פעמים",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s עזב/ה",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s עזב/ה %(count)s פעמים",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s עזבו",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s עזבו %(count)s פעמים",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s הצטרף/ה",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s הצטרפו %(count)s פעמים",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s הצטרף/ה %(count)s פעמים",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s הצטרפ/ה",
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)s לא ערכו שינוי",
+        "other": "%(oneUser)s לא ערך שום שינוי %(count)s פעמים"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)s לא ערכו שום שינוי",
+        "other": "%(severalUsers)s לא ערכו שום שינוי %(count)s פעמים"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)s שינו את שמם",
+        "other": "%(oneUser)s שינו את שמם %(count)s פעמים"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)s שינו את שמם",
+        "other": "%(severalUsers)s שינו את שמם %(count)s פעמים"
+    },
+    "was unbanned %(count)s times": {
+        "one": "חסימה בוטלה",
+        "other": "חסימה בוטלה %(count)s פעמים"
+    },
+    "were unbanned %(count)s times": {
+        "one": "חסימה בוטלה",
+        "other": "חסימה בוטלה %(count)s פעמים"
+    },
+    "was banned %(count)s times": {
+        "one": "נחסם",
+        "other": "נחסם %(count)s פעמים"
+    },
+    "were banned %(count)s times": {
+        "one": "נחסמו",
+        "other": "נחסם %(count)s פעמים"
+    },
+    "was invited %(count)s times": {
+        "one": "הוזמן",
+        "other": "הוזמן %(count)s פעמים"
+    },
+    "were invited %(count)s times": {
+        "one": "הוזמנו",
+        "other": "הוזמנו %(count)s פעמים"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "%(oneUser)s משכו את ההזמנה שלהם",
+        "other": "%(oneUser)s משך את ההזמנה שלו %(count)s פעמים"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)s משכו את ההזמנות שלהם",
+        "other": "%(severalUsers)s משכו את ההזמנות שלהם %(count)s פעמים"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)s דחו את ההזמנה שלו\\ה",
+        "other": "%(oneUser)s דחה את ההזמנה %(count)s פעמים"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)s דחו את ההזמנה שלהם",
+        "other": "%(severalUsers)s דחו את ההזמנה שלהם%(count)s פעמים"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)s עזב/ה וחזר/ה",
+        "other": "%(oneUser)s עזב/ה וחזר/ה %(count)s פעמים"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)s עזבו וחזרו",
+        "other": "%(severalUsers)s עזבו וחזרו %(count)s פעמים"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)s הצטרף/ה ועזב/ה",
+        "other": "%(oneUser)s הצטרף/ה ועזב/ה %(count)s פעמים"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)s הצטרפו ועזבו",
+        "other": "%(severalUsers)s הצטרפו ועזבו %(count)s פעמים"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)s עזב/ה",
+        "other": "%(oneUser)s עזב/ה %(count)s פעמים"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)s עזבו",
+        "other": "%(severalUsers)s עזבו %(count)s פעמים"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)s הצטרף/ה",
+        "other": "%(oneUser)s הצטרף/ה %(count)s פעמים"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s הצטרפו %(count)s פעמים",
+        "one": "%(severalUsers)s הצטרפ/ה"
+    },
     "%(nameList)s %(transitionList)s": "%(nameList)s-%(transitionList)s",
     "Language Dropdown": "תפריט שפות",
     "Information": "מידע",
@@ -1137,8 +1193,10 @@
     "Failed to mute user": "כשלון בהשתקת משתמש",
     "Failed to ban user": "כשלון בחסימת משתמש",
     "Remove recent messages": "הסר הודעות אחרונות",
-    "Remove %(count)s messages|one": "הסר הודעה 1",
-    "Remove %(count)s messages|other": "הסר %(count)s הודעות",
+    "Remove %(count)s messages": {
+        "one": "הסר הודעה 1",
+        "other": "הסר %(count)s הודעות"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "עבור כמות גדולה של הודעות, זה עלול לארוך זמן מה. אנא אל תרענן את הלקוח שלך בינתיים.",
     "Remove recent messages by %(user)s": "הסר את ההודעות האחרונות של %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "נסה לגלול למעלה בציר הזמן כדי לראות אם יש קודמים.",
@@ -1151,11 +1209,15 @@
     "Mention": "אזכר",
     "Jump to read receipt": "קפצו לקבלת קריאה",
     "Hide sessions": "הסתר מושבים",
-    "%(count)s sessions|one": "%(count)s מושבים",
-    "%(count)s sessions|other": "%(count)s מושבים",
+    "%(count)s sessions": {
+        "one": "%(count)s מושבים",
+        "other": "%(count)s מושבים"
+    },
     "Hide verified sessions": "הסתר מושבים מאומתים",
-    "%(count)s verified sessions|one": "1 מושב מאומת",
-    "%(count)s verified sessions|other": "%(count)s מושבים מאומתים",
+    "%(count)s verified sessions": {
+        "one": "1 מושב מאומת",
+        "other": "%(count)s מושבים מאומתים"
+    },
     "Not trusted": "לא אמין",
     "Trusted": "אמין",
     "Room settings": "הגדרות חדר",
@@ -1167,7 +1229,9 @@
     "Widgets": "ישומונים",
     "Options": "אפשרויות",
     "Unpin": "הסר נעיצה",
-    "You can only pin up to %(count)s widgets|other": "אתה יכול להצמיד עד%(count)s ווידג'טים בלבד",
+    "You can only pin up to %(count)s widgets": {
+        "other": "אתה יכול להצמיד עד%(count)s ווידג'טים בלבד"
+    },
     "Your homeserver": "שרת הבית שלכם",
     "One of the following may be compromised:": "אחד מהדברים הבאים עלול להוות סיכון:",
     "Your messages are not secure": "ההודעות שלך אינן מאובטחות",
@@ -1231,10 +1295,14 @@
     "This room has already been upgraded.": "החדר הזה כבר שודרג.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "שדרוג חדר זה יסגור את המופע הנוכחי של החדר וייצור חדר משודרג עם אותו שם.",
     "Unread messages.": "הודעות שלא נקראו.",
-    "%(count)s unread messages.|one": "1 הודעה שלא נקראה.",
-    "%(count)s unread messages.|other": "%(count)s הודעות שלא נקראו.",
-    "%(count)s unread messages including mentions.|one": "1 אזכור שלא נקרא.",
-    "%(count)s unread messages including mentions.|other": "%(count)s הודעות שלא נקראו כולל אזכורים.",
+    "%(count)s unread messages.": {
+        "one": "1 הודעה שלא נקראה.",
+        "other": "%(count)s הודעות שלא נקראו."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "1 אזכור שלא נקרא.",
+        "other": "%(count)s הודעות שלא נקראו כולל אזכורים."
+    },
     "Room options": "אפשרויות חדר",
     "Sign Up": "הרשמה",
     "Join the conversation with an account": "הצטרף לשיחה עם חשבון",
@@ -1252,8 +1320,10 @@
     "Hide Widgets": "הסתר ישומונים",
     "Forget room": "שכח חדר",
     "Join Room": "הצטרף אל חדר",
-    "(~%(count)s results)|one": "(תוצאת %(count)s)",
-    "(~%(count)s results)|other": "(תוצאת %(count)s)",
+    "(~%(count)s results)": {
+        "one": "(תוצאת %(count)s)",
+        "other": "(תוצאת %(count)s)"
+    },
     "No recently visited rooms": "אין חדרים שבקרתם בהם לאחרונה",
     "Room %(name)s": "חדר %(name)s",
     "Replying": "משיבים",
@@ -1294,8 +1364,10 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (רמת הרשאה %(powerLevelNumber)s)",
     "Filter room members": "סינון חברי חדר",
     "Invited": "מוזמן",
-    "and %(count)s others...|one": "ועוד אחד אחר...",
-    "and %(count)s others...|other": "ו %(count)s אחרים...",
+    "and %(count)s others...": {
+        "one": "ועוד אחד אחר...",
+        "other": "ו %(count)s אחרים..."
+    },
     "Close preview": "סגור תצוגה מקדימה",
     "Scroll to most recent messages": "גלול להודעות האחרונות",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "לא ניתן להבטיח את האותנטיות של הודעה מוצפנת זו במכשיר זה.",
@@ -1589,8 +1661,10 @@
     "Favourited": "מועדפים",
     "Forget Room": "שכח חדר",
     "Notification options": "אפשרויות התרעות",
-    "Show %(count)s more|one": "הצג עוד %(count)s",
-    "Show %(count)s more|other": "הצג עוד %(count)s",
+    "Show %(count)s more": {
+        "one": "הצג עוד %(count)s",
+        "other": "הצג עוד %(count)s"
+    },
     "Jump to first invite.": "קפצו להזמנה ראשונה.",
     "Jump to first unread room.": "קפצו לחדר הראשון שלא נקרא.",
     "List options": "רשימת אפשרויות",
@@ -1723,8 +1797,10 @@
     "Verification Request": "בקשת אימות",
     "Upload Error": "שגיאת העלאה",
     "Cancel All": "בטל הכל",
-    "Upload %(count)s other files|one": "העלה %(count)s של קובץ אחר",
-    "Upload %(count)s other files|other": "העלה %(count)s של קבצים אחרים",
+    "Upload %(count)s other files": {
+        "one": "העלה %(count)s של קובץ אחר",
+        "other": "העלה %(count)s של קבצים אחרים"
+    },
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "חלק מהקבצים <b> גדולים מדי </b> כדי להעלות אותם. מגבלת גודל הקובץ היא %(limit)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "קבצים אלה <b> גדולים מדי </b> להעלאה. מגבלת גודל הקובץ היא %(limit)s.",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "קובץ זה <b> גדול מדי </b> להעלאה. מגבלת גודל הקובץ היא %(limit)s אך קובץ זה הוא %(sizeOfThisFile)s.",
@@ -2027,14 +2103,18 @@
     "All settings": "כל ההגדרות",
     "New here? <a>Create an account</a>": "חדש פה? <a> צור חשבון </a>",
     "Got an account? <a>Sign in</a>": "יש לך חשבון? <a> היכנס </a>",
-    "Uploading %(filename)s and %(count)s others|one": "מעלה %(filename)s ו-%(count)s אחרים",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "מעלה %(filename)s ו-%(count)s אחרים",
+        "other": "מעלה %(filename)s ו-%(count)s אחרים"
+    },
     "Uploading %(filename)s": "מעלה %(filename)s",
-    "Uploading %(filename)s and %(count)s others|other": "מעלה %(filename)s ו-%(count)s אחרים",
     "Failed to load timeline position": "טעינת מיקום ציר הזמן נכשלה",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "ניסה לטעון נקודה מסוימת בציר הזמן של החדר הזה, אך לא הצליח למצוא אותה.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "ניסיתי לטעון נקודה ספציפית בציר הזמן של החדר הזה, אך אין לך הרשאה להציג את ההודעה המדוברת.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "יש לך %(count)s הודעה שלא נקראה בגירסה קודמת של חדר זה.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "יש לך %(count)s הודעות שלא נקראו בגרסה קודמת של חדר זה.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "יש לך %(count)s הודעה שלא נקראה בגירסה קודמת של חדר זה.",
+        "other": "יש לך %(count)s הודעות שלא נקראו בגרסה קודמת של חדר זה."
+    },
     "Failed to reject invite": "דחיית הזמנה נכשלה",
     "Room": "חדר",
     "No more results": "אין יותר תוצאות",
@@ -2184,15 +2264,19 @@
     "Keyboard": "מקלדת",
     "Global": "כללי",
     "Loading new room": "טוען חדר חדש",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "שולח הזמנה...",
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "שולח הזמנה..."
+    },
     "Upgrade required": "נדרש שדרוג",
     "Anyone can find and join.": "כל אחד יכול למצוא ולהצטרף.",
     "Large": "גדול",
     "Rename": "שנה שם",
     "Select all": "בחר הכל",
     "Deselect all": "הסר סימון מהכל",
-    "Sign out devices|one": "צא מהמכשיר",
-    "Sign out devices|other": "צא ממכשירים",
+    "Sign out devices": {
+        "one": "צא מהמכשיר",
+        "other": "צא ממכשירים"
+    },
     "Visibility": "רְאוּת",
     "Share invite link": "שתף קישור להזמנה",
     "Invite people": "הזמן אנשים",
@@ -2242,8 +2326,14 @@
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "הסכמתם בעבר לשתף איתנו מידע אנונימי לגבי השימוש שלכם. אנחנו מעדכנים איך זה מתבצע.",
     "Topic: %(topic)s": "נושא: %(topic)s",
     "%(creatorName)s created this room.": "%(creatorName)s יצר/ה חדר זה.",
-    "Fetched %(count)s events so far|other": "נטענו %(count)s אירועים עד כה",
-    "Fetched %(count)s events out of %(total)s|other": "טוען %(count)s אירועים מתוך %(total)s",
+    "Fetched %(count)s events so far": {
+        "other": "נטענו %(count)s אירועים עד כה",
+        "one": "נטענו %(count)s אירועים עד כה"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "other": "טוען %(count)s אירועים מתוך %(total)s",
+        "one": "טוען %(count)s אירועים מתוך %(total)s"
+    },
     "Generating a ZIP": "מייצר קובץ ZIP",
     "This homeserver has been blocked by its administrator.": "שרת זה נחסם על ידי מנהלו.",
     "%(senderName)s has shared their location": "%(senderName)s שיתף/ה מיקום",
@@ -2264,8 +2354,13 @@
     "Confirm your Security Phrase": "אשר את ביטוי האבטחה שלך",
     "You're already in a call with this person.": "אתה כבר בשיחה עם האדם הזה.",
     "Already in call": "כבר בשיחה",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sהסיר%(count)sהודעות",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sהסיר הודעה",
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)sהסיר%(count)sהודעות",
+        "one": "%(oneUser)sהסיר הודעה"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sהסיר הודעה"
+    },
     "Application window": "חלון אפליקציה",
     "Results are only revealed when you end the poll": "תוצאות יהיה זמינות להצגה רק עם סגירת הסקר",
     "What is your poll question or topic?": "מה השאלה או הנושא שלכם בסקר?",
@@ -2294,17 +2389,27 @@
     "Capabilities": "יכולות",
     "Send custom state event": "שלח אירוע מצב מותאם אישית",
     "<empty string>": "<מחרוזת ריקה>",
-    "<%(count)s spaces>|one": "<רווח>",
+    "<%(count)s spaces>": {
+        "one": "<רווח>"
+    },
     "Friends and family": "חברים ומשפחה",
     "Android": "אנדרויד",
     "An error occurred whilst sharing your live location, please try again": "אירעה שגיאה במהלך שיתוף המיקום החי שלכם, אנא נסו שוב",
     "Only invited people can join.": "רק משתשים מוזמנים יכולים להצטרף.",
     "Private (invite only)": "פרטי (הזמנות בלבד)",
-    "%(count)s Members|one": "%(count)s חברים",
-    "%(count)s rooms|other": "%(count)s חדרים",
-    "Based on %(count)s votes|one": "מתבסס על %(count)s הצבעות",
-    "Based on %(count)s votes|other": "מתבסס על %(count)s הצבעות",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s.קולות הצביעו כדי לראות את התוצאות",
+    "%(count)s Members": {
+        "one": "%(count)s חברים"
+    },
+    "%(count)s rooms": {
+        "other": "%(count)s חדרים"
+    },
+    "Based on %(count)s votes": {
+        "one": "מתבסס על %(count)s הצבעות",
+        "other": "מתבסס על %(count)s הצבעות"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s.קולות הצביעו כדי לראות את התוצאות"
+    },
     "Create a video room": "צרו חדר וידאו",
     "Verification requested": "התבקש אימות",
     "Verify this device by completing one of the following:": "אמתו מכשיר זה על ידי מילוי אחת מהפעולות הבאות:",
@@ -2314,11 +2419,14 @@
     "Share your activity and status with others.": "שתפו את הפעילות והסטטוס שלכם עם אחרים.",
     "Presence": "נוכחות",
     "Room visibility": "נראות של החדר",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sשלח הודעה חבויה",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sשלח%(count)sהודעות מוחבאות",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sשלחו הודעות מוחבאות",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sשלחו%(count)sהודעות מוחבאות",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sהסיר הודעה",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sשלח הודעה חבויה",
+        "other": "%(oneUser)sשלח%(count)sהודעות מוחבאות"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sשלחו הודעות מוחבאות",
+        "other": "%(severalUsers)sשלחו%(count)sהודעות מוחבאות"
+    },
     "Send your first message to invite <displayName/> to chat": "שילחו את ההודעה הראשונה שלכם להזמין את <displayName/> לצ'אט",
     "sends hearts": "שולח לבבות",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "פקודת מפתחים: מסלקת את הפגישה הנוכחית של הקבוצה היוצאת ומגדירה הפעלות חדשות של Olm",
@@ -2413,18 +2521,20 @@
     "Review to ensure your account is safe": "בידקו כדי לוודא שהחשבון שלך בטוח",
     "Help improve %(analyticsOwner)s": "עזרו בשיפור %(analyticsOwner)s",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "שתף נתונים אנונימיים כדי לעזור לנו לזהות בעיות. ללא אישי. אין צדדים שלישיים. <LearnMoreLink>למידע נוסף</LearnMoreLink>",
-    "Exported %(count)s events in %(seconds)s seconds|one": "ייצא %(count)s תוך %(seconds)s שניות",
-    "Exported %(count)s events in %(seconds)s seconds|other": "ייצא %(count)s אירועים תוך %(seconds)s שניות",
-    "Fetched %(count)s events in %(seconds)ss|one": "משך %(count)s אירועים תוך %(seconds)s שניות",
-    "Fetched %(count)s events in %(seconds)ss|other": "עיבד %(count)s אירועים תוך %(seconds)s שניות",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "ייצא %(count)s תוך %(seconds)s שניות",
+        "other": "ייצא %(count)s אירועים תוך %(seconds)s שניות"
+    },
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "משך %(count)s אירועים תוך %(seconds)s שניות",
+        "other": "עיבד %(count)s אירועים תוך %(seconds)s שניות"
+    },
     "Processing event %(number)s out of %(total)s": "מעבד אירוע %(number)s מתוך %(total)s",
     "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "זאת התחלת ייצוא של <roomName/>. ייצוא ע\"י <exporterDetails/> ב %(exportDate)s.",
     "Media omitted - file size limit exceeded": "מדיה הושמטה - גודל קובץ חרג מהמותר",
     "Media omitted": "מדיה הושמטה",
     "JSON": "JSON",
     "HTML": "HTML",
-    "Fetched %(count)s events so far|one": "נטענו %(count)s אירועים עד כה",
-    "Fetched %(count)s events out of %(total)s|one": "טוען %(count)s אירועים מתוך %(total)s",
     "Zoom out": "התמקדות החוצה",
     "Zoom in": "התמקדות פנימה",
     "Reset bearing to north": "נעלו את המפה לכיוון צפון",
@@ -2534,8 +2644,10 @@
     "Space information": "מידע על מרחב העבודה",
     "View older version of %(spaceName)s.": "צפו בגירסא ישנה יותר של %(spaceName)s.",
     "Upgrade this space to the recommended room version": "שדרג את מרחב העבודה הזה לגרסת החדר המומלצת",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "מעדכן מרחב עבודה...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "מעדכן את מרחבי העבודה...%(progress)s מתוך %(count)s",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "מעדכן מרחב עבודה...",
+        "other": "מעדכן את מרחבי העבודה...%(progress)s מתוך %(count)s"
+    },
     "This upgrade will allow members of selected spaces access to this room without an invite.": "שדרוג זה יאפשר לחברים במרחבים נבחרים גישה לחדר זה ללא הזמנה.",
     "This room is in some spaces you're not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "החדר הזה נמצא בחלק ממרחבי העבודה שאתם לא מוגדרים כמנהלים בהם. במרחבים האלה, החדר הישן עדיין יוצג, אבל אנשים יתבקשו להצטרף לחדר החדש.",
     "Space members": "משתתפי מרחב העבודה",
@@ -2543,8 +2655,10 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "כל אחד ב-<spaceName/> יכול למצוא ולהצטרף. אתם יכולים לבחור גם מרחבי עבודה אחרים.",
     "Spaces with access": "מרחבי עבודה עם גישה",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "כל אחד במרחב העבודה יכול למצוא ולהצטרף. <a>ערוך לאילו מרחבי עבודה יש גישה כאן.</a>",
-    "Currently, %(count)s spaces have access|one": "כרגע, למרחב העבודה יש גישה",
-    "Currently, %(count)s spaces have access|other": "כרגע ל, %(count)s מרחבי עבודה יש גישה",
+    "Currently, %(count)s spaces have access": {
+        "one": "כרגע, למרחב העבודה יש גישה",
+        "other": "כרגע ל, %(count)s מרחבי עבודה יש גישה"
+    },
     "Space options": "אפשרויות מרחב העבודה",
     "Decide who can view and join %(spaceName)s.": "החליטו מי יכול לראות ולהצטרף אל %(spaceName)s.",
     "This may be useful for public spaces.": "זה יכול להיות שימושי למרחבי עבודה ציבוריים.",
@@ -2566,16 +2680,20 @@
     "User is already in the space": "המשתמש כבר במרחב העבודה",
     "User is already invited to the space": "המשתמש כבר מוזמן למרחב העבודה",
     "You do not have permission to invite people to this space.": "אין לכם הרשאה להזמין משתתפים אחרים למרחב עבודה זה.",
-    "In %(spaceName)s and %(count)s other spaces.|one": "ב%(spaceName)sו%(count)s מרחבי עבודה אחרים.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "ב%(spaceName)sו%(count)s מרחבי עבודה אחרים.",
+        "other": "%(spaceName)sו%(count)s מרחבי עבודה אחרים."
+    },
     "In %(spaceName)s.": "במרחבי עבודה%(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "%(spaceName)sו%(count)s מרחבי עבודה אחרים.",
     "In spaces %(space1Name)s and %(space2Name)s.": "במרחבי עבודה %(space1Name)sו%(space2Name)s.",
     "Search %(spaceName)s": "חיפוש %(spaceName)s",
     "sends space invaders": "שולח פולשים לחלל",
     "Sends the given message with a space themed effect": "שולח את ההודעה הנתונה עם אפקט בנושא חלל",
     "Invite to %(spaceName)s": "הזמן אל %(spaceName)s",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)sו%(count)sאחרים",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)sו%(count)s אחרים",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)sו%(count)sאחרים",
+        "other": "%(spaceName)sו%(count)s אחרים"
+    },
     "%(space1Name)s and %(space2Name)s": "%(space1Name)sו%(space2Name)s",
     "To leave the beta, visit your settings.": "כדי לעזוב את התכונה הניסיונית, כנסו להגדרות.",
     "Keyboard shortcuts": "קיצורי מקלדת",
diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
index c5068c2fde..25a215a97d 100644
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -206,8 +206,10 @@
     "Mute": "म्यूट",
     "Admin Tools": "व्यवस्थापक उपकरण",
     "Close": "बंद",
-    "and %(count)s others...|other": "और %(count)s अन्य ...",
-    "and %(count)s others...|one": "और एक अन्य...",
+    "and %(count)s others...": {
+        "other": "और %(count)s अन्य ...",
+        "one": "और एक अन्य..."
+    },
     "Invited": "आमंत्रित",
     "Filter room members": "रूम के सदस्यों को फ़िल्टर करें",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (शक्ति %(powerLevelNumber)s)",
@@ -248,8 +250,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ने मेहमानों को कमरे में शामिल होने से रोका है।",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ने अतिथि पहुंच %(rule)s में बदल दी",
     "%(displayName)s is typing …": "%(displayName)s टाइप कर रहा है …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s और %(count)s अन्य टाइप कर रहे हैं …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s और एक अन्य टाइप कर रहा है …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s और %(count)s अन्य टाइप कर रहे हैं …",
+        "one": "%(names)s और एक अन्य टाइप कर रहा है …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s और %(lastPerson)s टाइप कर रहे हैं …",
     "Unrecognised address": "अपरिचित पता",
     "Straight rows of keys are easy to guess": "कुंजी की सीधी पंक्तियों का अनुमान लगाना आसान है",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 267a2b99e1..0528587734 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -34,8 +34,10 @@
     "Close": "Bezárás",
     "Start chat": "Csevegés indítása",
     "%(items)s and %(lastItem)s": "%(items)s és %(lastItem)s",
-    "and %(count)s others...|other": "és még: %(count)s ...",
-    "and %(count)s others...|one": "és még egy...",
+    "and %(count)s others...": {
+        "other": "és még: %(count)s ...",
+        "one": "és még egy..."
+    },
     "A new password must be entered.": "Új jelszót kell megadni.",
     "An error has occurred.": "Hiba történt.",
     "Anyone": "Bárki",
@@ -178,8 +180,10 @@
     "Unmute": "Némítás visszavonása",
     "Unnamed Room": "Névtelen szoba",
     "Uploading %(filename)s": "%(filename)s feltöltése",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s és még %(count)s db másik feltöltése",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s és még %(count)s db másik feltöltése",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "%(filename)s és még %(count)s db másik feltöltése",
+        "other": "%(filename)s és még %(count)s db másik feltöltése"
+    },
     "Upload avatar": "Profilkép feltöltése",
     "Upload Failed": "Feltöltés sikertelen",
     "Usage": "Használat",
@@ -227,8 +231,10 @@
     "Room": "Szoba",
     "Connectivity to the server has been lost.": "A kapcsolat megszakadt a kiszolgálóval.",
     "Sent messages will be stored until your connection has returned.": "Az elküldött üzenetek addig lesznek tárolva amíg a kapcsolatod újra elérhető lesz.",
-    "(~%(count)s results)|one": "(~%(count)s db eredmény)",
-    "(~%(count)s results)|other": "(~%(count)s db eredmény)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s db eredmény)",
+        "other": "(~%(count)s db eredmény)"
+    },
     "New Password": "Új jelszó",
     "Start automatically after system login": "Automatikus indítás rendszerindítás után",
     "Analytics": "Analitika",
@@ -306,7 +312,9 @@
     "Message Pinning": "Üzenet kitűzése",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s megváltoztatta a szoba kitűzött üzeneteit.",
     "Unnamed room": "Névtelen szoba",
-    "And %(count)s more...|other": "És még %(count)s...",
+    "And %(count)s more...": {
+        "other": "És még %(count)s..."
+    },
     "Mention": "Megemlítés",
     "Invite": "Meghívás",
     "Delete Widget": "Kisalkalmazás törlése",
@@ -317,48 +325,90 @@
     "Members only (since they joined)": "Csak tagoknak (amióta csatlakoztak)",
     "A text message has been sent to %(msisdn)s": "Szöveges üzenetet küldtünk neki: %(msisdn)s",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s alkalommal csatlakozott",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s csatlakozott",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s alkalommal csatlakozott",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s csatlakozott",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s %(count)s alkalommal távozott",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s távozott",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s alkalommal távozott",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s távozott",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s %(count)s alkalommal csatlakozott és távozott",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s csatlakozott és távozott",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s alkalommal csatlakozott és távozott",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s csatlakozott és távozott",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s %(count)s alkalommal távozott és újra csatlakozott",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s távozott és újra csatlakozott",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s alkalommal távozott és újra csatlakozott",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s távozott és újra csatlakozott",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s %(count)s alkalommal elutasította a meghívóit",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s elutasította a meghívóit",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s %(count)s alkalommal elutasította a meghívóit",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s elutasította a meghívóit",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s meghívóit %(count)s alkalommal visszavonták",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s visszavonták a meghívásukat",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s meghívóit %(count)s alkalommal vonták vissza",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s meghívóit visszavonták",
-    "were invited %(count)s times|other": "%(count)s alkalommal lett meghívva",
-    "were invited %(count)s times|one": "meg lett hívva",
-    "was invited %(count)s times|other": "%(count)s alkalommal lett meghívva",
-    "was invited %(count)s times|one": "meg lett hívva",
-    "were banned %(count)s times|other": "%(count)s alkalommal lett kitiltva",
-    "were banned %(count)s times|one": "lett kitiltva",
-    "was banned %(count)s times|other": "%(count)s alkalommal lett kitiltva",
-    "was banned %(count)s times|one": "ki lett tiltva",
-    "were unbanned %(count)s times|other": "%(count)s alkalommal lett visszaengedve",
-    "were unbanned %(count)s times|one": "vissza lett engedve",
-    "was unbanned %(count)s times|other": "%(count)s alkalommal lett visszaengedve",
-    "was unbanned %(count)s times|one": "vissza lett engedve",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s %(count)s alkalommal megváltoztatta a nevét",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s megváltoztatta a nevét",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s %(count)s alkalommal megváltoztatta a nevét",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s megváltoztatta a nevét",
-    "%(items)s and %(count)s others|other": "%(items)s és még %(count)s másik",
-    "%(items)s and %(count)s others|one": "%(items)s és még egy másik",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal csatlakozott",
+        "one": "%(severalUsers)s csatlakozott"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s %(count)s alkalommal csatlakozott",
+        "one": "%(oneUser)s csatlakozott"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal távozott",
+        "one": "%(severalUsers)s távozott"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s %(count)s alkalommal távozott",
+        "one": "%(oneUser)s távozott"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal csatlakozott és távozott",
+        "one": "%(severalUsers)s csatlakozott és távozott"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s %(count)s alkalommal csatlakozott és távozott",
+        "one": "%(oneUser)s csatlakozott és távozott"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal távozott és újra csatlakozott",
+        "one": "%(severalUsers)s távozott és újra csatlakozott"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s %(count)s alkalommal távozott és újra csatlakozott",
+        "one": "%(oneUser)s távozott és újra csatlakozott"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal elutasította a meghívóit",
+        "one": "%(severalUsers)s elutasította a meghívóit"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s %(count)s alkalommal elutasította a meghívóit",
+        "one": "%(oneUser)s elutasította a meghívóit"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s meghívóit %(count)s alkalommal visszavonták",
+        "one": "%(severalUsers)s visszavonták a meghívásukat"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s meghívóit %(count)s alkalommal vonták vissza",
+        "one": "%(oneUser)s meghívóit visszavonták"
+    },
+    "were invited %(count)s times": {
+        "other": "%(count)s alkalommal lett meghívva",
+        "one": "meg lett hívva"
+    },
+    "was invited %(count)s times": {
+        "other": "%(count)s alkalommal lett meghívva",
+        "one": "meg lett hívva"
+    },
+    "were banned %(count)s times": {
+        "other": "%(count)s alkalommal lett kitiltva",
+        "one": "lett kitiltva"
+    },
+    "was banned %(count)s times": {
+        "other": "%(count)s alkalommal lett kitiltva",
+        "one": "ki lett tiltva"
+    },
+    "were unbanned %(count)s times": {
+        "other": "%(count)s alkalommal lett visszaengedve",
+        "one": "vissza lett engedve"
+    },
+    "was unbanned %(count)s times": {
+        "other": "%(count)s alkalommal lett visszaengedve",
+        "one": "vissza lett engedve"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal megváltoztatta a nevét",
+        "one": "%(severalUsers)s megváltoztatta a nevét"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s %(count)s alkalommal megváltoztatta a nevét",
+        "one": "%(oneUser)s megváltoztatta a nevét"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s és még %(count)s másik",
+        "one": "%(items)s és még egy másik"
+    },
     "Notify the whole room": "Az egész szoba értesítése",
     "Room Notification": "Szoba értesítések",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Vegye figyelembe, hogy a(z) %(hs)s kiszolgálóra jelentkezik be, és nem a matrix.org-ra.",
@@ -590,8 +640,10 @@
     "Sets the room name": "Szobanév beállítása",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s fejlesztette a szobát.",
     "%(displayName)s is typing …": "%(displayName)s gépel…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s és még %(count)s felhasználó gépel…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s és még valaki gépel…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s és még %(count)s felhasználó gépel…",
+        "one": "%(names)s és még valaki gépel…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s és %(lastPerson)s gépelnek…",
     "Render simple counters in room header": "Egyszerű számlálók a szoba fejlécében",
     "Enable Emoji suggestions while typing": "Emodzsik gépelés közbeni felajánlásának bekapcsolása",
@@ -800,8 +852,10 @@
     "Revoke invite": "Meghívó visszavonása",
     "Invited by %(sender)s": "Meghívta: %(sender)s",
     "Remember my selection for this widget": "A döntés megjegyzése ehhez a kisalkalmazáshoz",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
+        "one": "%(count)s olvasatlan értesítésed van a régi verziójú szobában."
+    },
     "The file '%(fileName)s' failed to upload.": "A(z) „%(fileName)s” fájl feltöltése sikertelen.",
     "GitHub issue": "GitHub hibajegy",
     "Notes": "Megjegyzések",
@@ -817,8 +871,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Ez a fájl <b>túl nagy</b>, hogy fel lehessen tölteni. A fájlméret korlátja %(limit)s, de a fájl %(sizeOfThisFile)s méretű.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "A fájl <b>túl nagy</b> a feltöltéshez. A fájlméret korlátja %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Néhány fájl <b>túl nagy</b>, hogy fel lehessen tölteni. A fájlméret korlátja %(limit)s.",
-    "Upload %(count)s other files|other": "%(count)s másik fájlt feltöltése",
-    "Upload %(count)s other files|one": "%(count)s másik fájl feltöltése",
+    "Upload %(count)s other files": {
+        "other": "%(count)s másik fájlt feltöltése",
+        "one": "%(count)s másik fájl feltöltése"
+    },
     "Cancel All": "Összes megszakítása",
     "Upload Error": "Feltöltési hiba",
     "The server does not support the room version specified.": "A kiszolgáló nem támogatja a megadott szobaverziót.",
@@ -895,10 +951,14 @@
     "Message edits": "Üzenetszerkesztések",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "A szoba fejlesztéséhez be kell zárnia ezt a szobát, és egy újat kell létrehoznia helyette. Hogy a szoba tagjai számára a lehető legjobb legyen a felhasználói élmény, a következők lépések lesznek végrehajtva:",
     "Show all": "Mind megjelenítése",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s alkalommal nem változtattak semmit",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s nem változtattak semmit",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s alkalommal nem változtatott semmit",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snem változtatott semmit",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal nem változtattak semmit",
+        "one": "%(severalUsers)s nem változtattak semmit"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s %(count)s alkalommal nem változtatott semmit",
+        "one": "%(oneUser)snem változtatott semmit"
+    },
     "Removing…": "Eltávolítás…",
     "Clear all data": "Minden adat törlése",
     "Your homeserver doesn't seem to support this feature.": "Úgy tűnik, hogy a Matrix-kiszolgálója nem támogatja ezt a szolgáltatást.",
@@ -989,7 +1049,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Az idővonalon próbálj meg felgörgetni, hogy megnézd van-e régebbi üzenet.",
     "Remove recent messages by %(user)s": "Friss üzenetek törlése a felhasználótól: %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Ez időt vehet igénybe ha sok üzenet érintett. Kérlek közben ne frissíts a kliensben.",
-    "Remove %(count)s messages|other": "%(count)s db üzenet törlése",
+    "Remove %(count)s messages": {
+        "other": "%(count)s db üzenet törlése",
+        "one": "1 üzenet törlése"
+    },
     "Remove recent messages": "Friss üzenetek törlése",
     "Error changing power level requirement": "A szükséges hozzáférési szint megváltoztatása nem sikerült",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Hiba történt a szobához szükséges hozzáférési szint megváltoztatása során. Ellenőrizze, hogy megvan-e hozzá a megfelelő jogosultsága, és próbálja újra.",
@@ -1015,8 +1078,14 @@
     "Close dialog": "Ablak bezárása",
     "Show previews/thumbnails for images": "Előnézet/bélyegkép megjelenítése a képekhez",
     "Clear cache and reload": "Gyorsítótár ürítése és újratöltés",
-    "%(count)s unread messages including mentions.|other": "%(count)s olvasatlan üzenet megemlítéssel.",
-    "%(count)s unread messages.|other": "%(count)s olvasatlan üzenet.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s olvasatlan üzenet megemlítéssel.",
+        "one": "1 olvasatlan megemlítés."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s olvasatlan üzenet.",
+        "one": "1 olvasatlan üzenet."
+    },
     "Show image": "Kép megjelenítése",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Ahhoz hogy megvizsgálhassuk a hibát, <newIssueLink>hozzon létre egy új hibajegyet</newIssueLink> a GitHubon.",
     "To continue you need to accept the terms of this service.": "A folytatáshoz el kell fogadnia a felhasználási feltételeket.",
@@ -1026,7 +1095,6 @@
     "Room Autocomplete": "Szoba automatikus kiegészítése",
     "User Autocomplete": "Felhasználó automatikus kiegészítése",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "A Matrix-kiszolgáló konfigurációjából hiányzik a captcha nyilvános kulcsa. Értesítse erről a Matrix-kiszolgáló rendszergazdáját.",
-    "Remove %(count)s messages|one": "1 üzenet törlése",
     "Your email address hasn't been verified yet": "Az e-mail-címe még nincs ellenőrizve",
     "Click the link in the email you received to verify and then click continue again.": "Ellenőrzéshez kattints a linkre az e-mailben amit kaptál és itt kattints a folytatásra újra.",
     "Add Email Address": "E-mail-cím hozzáadása",
@@ -1056,8 +1124,6 @@
     "Jump to first unread room.": "Ugrás az első olvasatlan szobához.",
     "Jump to first invite.": "Újrás az első meghívóhoz.",
     "Room %(name)s": "Szoba: %(name)s",
-    "%(count)s unread messages including mentions.|one": "1 olvasatlan megemlítés.",
-    "%(count)s unread messages.|one": "1 olvasatlan üzenet.",
     "Unread messages.": "Olvasatlan üzenetek.",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Ez a művelet az e-mail-cím vagy telefonszám ellenőrzése miatt hozzáférést igényel a(z) <server /> alapértelmezett azonosítási kiszolgálójához, de a kiszolgálónak nincsenek felhasználási feltételei.",
     "Trust": "Megbízom benne",
@@ -1171,8 +1237,10 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a kitiltó szabályt erről: %(oldGlob)s, erre: %(newGlob)s, ok: %(reason)s",
     "not stored": "nincs tárolva",
     "Hide verified sessions": "Ellenőrzött munkamenetek eltakarása",
-    "%(count)s verified sessions|other": "%(count)s ellenőrzött munkamenet",
-    "%(count)s verified sessions|one": "1 ellenőrzött munkamenet",
+    "%(count)s verified sessions": {
+        "other": "%(count)s ellenőrzött munkamenet",
+        "one": "1 ellenőrzött munkamenet"
+    },
     "Close preview": "Előnézet bezárása",
     "Language Dropdown": "Nyelvválasztó lenyíló menü",
     "Country Dropdown": "Ország lenyíló menü",
@@ -1279,8 +1347,10 @@
     "Your messages are not secure": "Az üzeneteid nincsenek biztonságban",
     "One of the following may be compromised:": "Valamelyik az alábbiak közül kompromittált:",
     "Your homeserver": "Matrix szervered",
-    "%(count)s sessions|other": "%(count)s munkamenet",
-    "%(count)s sessions|one": "%(count)s munkamenet",
+    "%(count)s sessions": {
+        "other": "%(count)s munkamenet",
+        "one": "%(count)s munkamenet"
+    },
     "Hide sessions": "Munkamenetek elrejtése",
     "Verify by emoji": "Ellenőrzés emodzsival",
     "Verify by comparing unique emoji.": "Ellenőrzés egyedi emodzsik összehasonlításával.",
@@ -1336,10 +1406,14 @@
     "Not currently indexing messages for any room.": "Jelenleg egyik szoba indexelése sem történik.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s megváltoztatta a szoba nevét erről: %(oldRoomName)s, erre: %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hozzáadta a szoba alternatív címeit: %(addresses)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s alternatív címeket adott hozzá a szobához: %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s eltávolította az alternatív címeket a szobáról: %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s eltávolította az alternatív címet a szobáról: %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s hozzáadta a szoba alternatív címeit: %(addresses)s.",
+        "one": "%(senderName)s alternatív címeket adott hozzá a szobához: %(addresses)s."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s eltávolította az alternatív címeket a szobáról: %(addresses)s.",
+        "one": "%(senderName)s eltávolította az alternatív címet a szobáról: %(addresses)s."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s megváltoztatta a szoba alternatív címeit.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s megváltoztatta a szoba elsődleges és alternatív címeit.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s megváltoztatta a szoba címeit.",
@@ -1510,8 +1584,10 @@
     "Sort by": "Rendezés",
     "Message preview": "Üzenet előnézet",
     "List options": "Lista beállításai",
-    "Show %(count)s more|other": "Még %(count)s megjelenítése",
-    "Show %(count)s more|one": "Még %(count)s megjelenítése",
+    "Show %(count)s more": {
+        "other": "Még %(count)s megjelenítése",
+        "one": "Még %(count)s megjelenítése"
+    },
     "Room options": "Szoba beállítások",
     "Switch to light mode": "Világos módra váltás",
     "Switch to dark mode": "Sötét módra váltás",
@@ -1652,7 +1728,9 @@
     "Revoke permissions": "Jogosultságok visszavonása",
     "Data on this screen is shared with %(widgetDomain)s": "Az ezen a képernyőn látható adatok megosztásra kerülnek ezzel: %(widgetDomain)s",
     "Modal Widget": "Előugró kisalkalmazás",
-    "You can only pin up to %(count)s widgets|other": "Csak %(count)s kisalkalmazást tud kitűzni",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Csak %(count)s kisalkalmazást tud kitűzni"
+    },
     "Show Widgets": "Kisalkalmazások megjelenítése",
     "Hide Widgets": "Kisalkalmazások elrejtése",
     "The call was answered on another device.": "A hívás másik eszközön lett fogadva.",
@@ -2050,8 +2128,10 @@
     "Send messages as you in your active room": "Üzenetek küldése az aktív szobájába saját néven",
     "Send messages as you in this room": "Üzenetek küldése ebbe a szobába saját néven",
     "Send stickers to your active room as you": "Matricák küldése az aktív szobájába saját néven",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "A titkosított üzenetek biztonságos helyi gyorsítótárazása, hogy megjelenhessenek a keresési találatok között, ehhez %(size)s helyet használ %(rooms)s szoba üzeneteihez.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "A titkosított üzenetek biztonságos helyi gyorsítótárazása, hogy megjelenhessenek a keresési találatok között, ehhez %(size)s helyet használ %(rooms)s szoba üzeneteihez.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "A titkosított üzenetek biztonságos helyi gyorsítótárazása, hogy megjelenhessenek a keresési találatok között, ehhez %(size)s helyet használ %(rooms)s szoba üzeneteihez.",
+        "other": "A titkosított üzenetek biztonságos helyi gyorsítótárazása, hogy megjelenhessenek a keresési találatok között, ehhez %(size)s helyet használ %(rooms)s szoba üzeneteihez."
+    },
     "%(name)s on hold": "%(name)s várakoztatva",
     "You held the call <a>Switch</a>": "A hívás várakozik, <a>átkapcsolás</a>",
     "sends snowfall": "hóesést küld",
@@ -2140,8 +2220,10 @@
     "Support": "Támogatás",
     "Random": "Véletlen",
     "Welcome to <name/>": "Üdvözöl a(z) <name/>",
-    "%(count)s members|one": "%(count)s tag",
-    "%(count)s members|other": "%(count)s tag",
+    "%(count)s members": {
+        "one": "%(count)s tag",
+        "other": "%(count)s tag"
+    },
     "Your server does not support showing space hierarchies.": "A kiszolgálója nem támogatja a terek hierarchiájának megjelenítését.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Biztos, hogy elhagyja ezt a teret: %(spaceName)s?",
     "This space is not public. You will not be able to rejoin without an invite.": "Ez a tér nem nyilvános. Kilépés után csak újabb meghívóval lehet újra belépni.",
@@ -2203,8 +2285,10 @@
     "Failed to remove some rooms. Try again later": "Néhány szoba törlése sikertelen. Próbálja később",
     "Suggested": "Javaslat",
     "This room is suggested as a good one to join": "Ez egy javasolt szoba csatlakozáshoz",
-    "%(count)s rooms|one": "%(count)s szoba",
-    "%(count)s rooms|other": "%(count)s szoba",
+    "%(count)s rooms": {
+        "one": "%(count)s szoba",
+        "other": "%(count)s szoba"
+    },
     "You don't have permission": "Nincs jogosultsága",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Ez általában a szoba kiszolgálóoldali kezelésében jelent változást. Ha a(z) %(brand)s kliensben tapasztal problémát, akkor küldjön egy hibajelentést.",
     "Invite to %(roomName)s": "Meghívás ide: %(roomName)s",
@@ -2225,8 +2309,10 @@
     "Invited people will be able to read old messages.": "A meghívott személyek el tudják olvasni a régi üzeneteket.",
     "We couldn't create your DM.": "Nem tudjuk elkészíteni a közvetlen üzenetét.",
     "Add existing rooms": "Létező szobák hozzáadása",
-    "%(count)s people you know have already joined|one": "%(count)s ismerős már csatlakozott",
-    "%(count)s people you know have already joined|other": "%(count)s ismerős már csatlakozott",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s ismerős már csatlakozott",
+        "other": "%(count)s ismerős már csatlakozott"
+    },
     "Invite to just this room": "Meghívás csak ebbe a szobába",
     "Warn before quitting": "Figyelmeztetés kilépés előtt",
     "Manage & explore rooms": "Szobák kezelése és felderítése",
@@ -2252,8 +2338,10 @@
     "Delete all": "Mind törlése",
     "Some of your messages have not been sent": "Néhány üzenete nem lett elküldve",
     "Including %(commaSeparatedMembers)s": "Beleértve: %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "1 résztvevő megmutatása",
-    "View all %(count)s members|other": "Az összes %(count)s résztvevő megmutatása",
+    "View all %(count)s members": {
+        "one": "1 résztvevő megmutatása",
+        "other": "Az összes %(count)s résztvevő megmutatása"
+    },
     "Failed to send": "Küldés sikertelen",
     "Enter your Security Phrase a second time to confirm it.": "A megerősítéshez adja meg a biztonsági jelmondatot még egyszer.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Válassz szobákat vagy beszélgetéseket amit hozzáadhat. Ez csak az ön tere, senki nem lesz értesítve. Továbbiakat később is hozzáadhat.",
@@ -2266,8 +2354,10 @@
     "Leave the beta": "Béta kikapcsolása",
     "Beta": "Béta",
     "Want to add a new room instead?": "Inkább új szobát adna hozzá?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Szobák hozzáadása…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Szobák hozzáadása… (%(progress)s ennyiből: %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Szobák hozzáadása…",
+        "other": "Szobák hozzáadása… (%(progress)s ennyiből: %(count)s)"
+    },
     "Not all selected were added": "Nem az összes kijelölt lett hozzáadva",
     "You are not allowed to view this server's rooms list": "Nincs joga ennek a szervernek a szobalistáját megnézni",
     "Error processing voice message": "Hiba a hangüzenet feldolgozásánál",
@@ -2291,8 +2381,10 @@
     "Sends the given message with a space themed effect": "Világűrös effekttel küldi el az üzenetet",
     "See when people join, leave, or are invited to your active room": "Emberek belépésének, távozásának vagy meghívásának a megjelenítése az aktív szobájában",
     "See when people join, leave, or are invited to this room": "Emberek belépésének, távozásának vagy meghívásának a megjelenítése ebben a szobában",
-    "Currently joining %(count)s rooms|one": "%(count)s szobába lép be",
-    "Currently joining %(count)s rooms|other": "%(count)s szobába lép be",
+    "Currently joining %(count)s rooms": {
+        "one": "%(count)s szobába lép be",
+        "other": "%(count)s szobába lép be"
+    },
     "The user you called is busy.": "A hívott felhasználó foglalt.",
     "User Busy": "A felhasználó foglalt",
     "Some suggestions may be hidden for privacy.": "Adatvédelmi okokból néhány javaslat rejtve lehet.",
@@ -2332,9 +2424,14 @@
     "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Ez a szoba illegális vagy mérgező tartalmat közvetít, vagy a moderátorok képtelenek ezeket megfelelően moderálni.\nEz jelezve lesz a(z) %(homeserver)s rendszergazdái felé. Az rendszergazdák NEM tudják olvasni a szoba titkosított tartalmát.",
     "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "A felhasználó kéretlen reklámokkal, reklámhivatkozásokkal vagy propagandával bombázza a szobát.\nEz jelezve lesz a szoba moderátorai felé.",
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "A felhasználó illegális viselkedést valósít meg, például kipécézett valakit vagy tettlegességgel fenyeget.\nEz moderátorok felé jelzésre kerül akik akár hivatalos személyek felé továbbíthatják ezt.",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)smegváltoztatta a szerver ACL-eket",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s %(count)s alkalommal megváltoztatta a kiszolgáló ACL-t",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s %(count)s alkalommal megváltoztatta a kiszolgáló ACL-t",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)smegváltoztatta a szerver ACL-eket",
+        "other": "%(oneUser)s %(count)s alkalommal megváltoztatta a kiszolgáló ACL-t"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "other": "%(severalUsers)s %(count)s alkalommal megváltoztatta a kiszolgáló ACL-t",
+        "one": "%(severalUsers)smegváltoztatta a szerver ACL-eket"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Üzenek keresés kezdő beállítása sikertelen, ellenőrizze a <a>beállításait</a> további információkért",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Cím beállítása ehhez a térhez, hogy a felhasználók a matrix szerveren megtalálhassák (%(localDomain)s)",
     "To publish an address, it needs to be set as a local address first.": "A cím publikálásához először helyi címet kell beállítani.",
@@ -2358,7 +2455,6 @@
     "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Bármi más ok. Írja le a problémát.\nEz lesz elküldve a szoba moderátorainak.",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Amit ez a felhasználó ír az rossz.\nErről a szoba moderátorának jelentés készül.",
     "Please provide an address": "Kérem adja meg a címet",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)smegváltoztatta a szerver ACL-eket",
     "This space has no local addresses": "Ennek a térnek nincs helyi címe",
     "Space information": "Tér információi",
     "Collapse": "Összecsukás",
@@ -2379,8 +2475,10 @@
     "Use Command + F to search timeline": "Command + F használata az idővonalon való kereséshez",
     "Unnamed audio": "Névtelen hang",
     "Error processing audio message": "Hiba a hangüzenet feldolgozásánál",
-    "Show %(count)s other previews|one": "%(count)s további előnézet megjelenítése",
-    "Show %(count)s other previews|other": "%(count)s további előnézet megjelenítése",
+    "Show %(count)s other previews": {
+        "one": "%(count)s további előnézet megjelenítése",
+        "other": "%(count)s további előnézet megjelenítése"
+    },
     "Images, GIFs and videos": "Képek, GIF-ek és videók",
     "Code blocks": "Kódblokkok",
     "Displaying time": "Idő megjelenítése",
@@ -2436,8 +2534,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "A téren bárki megtalálhatja és beléphet. Több teret is kiválaszthat.",
     "Spaces with access": "Terek hozzáféréssel",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "A téren bárki megtalálhatja és beléphet. <a>Szerkessze, hogy melyik tér férhet hozzá.</a>",
-    "Currently, %(count)s spaces have access|other": "Jelenleg %(count)s tér rendelkezik hozzáféréssel",
-    "& %(count)s more|other": "és még %(count)s",
+    "Currently, %(count)s spaces have access": {
+        "other": "Jelenleg %(count)s tér rendelkezik hozzáféréssel",
+        "one": "Jelenleg egy tér rendelkezik hozzáféréssel"
+    },
+    "& %(count)s more": {
+        "other": "és még %(count)s",
+        "one": "és még %(count)s"
+    },
     "Upgrade required": "Fejlesztés szükséges",
     "Anyone can find and join.": "Bárki megtalálhatja és beléphet.",
     "Only invited people can join.": "Csak a meghívott emberek léphetnek be.",
@@ -2521,8 +2625,6 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s levett egy kitűzött <a>üzenetet</a> ebben a szobában. Minden <b>kitűzött üzenet</b> megjelenítése.",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s kitűzött egy üzenetet ebben a szobában. Minden kitűzött üzenet megjelenítése.",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s kitűzött <a>egy üzenetet</a> ebben a szobában. Minden <b>kitűzött üzenet</b> megjelenítése.",
-    "Currently, %(count)s spaces have access|one": "Jelenleg egy tér rendelkezik hozzáféréssel",
-    "& %(count)s more|one": "és még %(count)s",
     "Some encryption parameters have been changed.": "Néhány titkosítási paraméter megváltozott.",
     "Role in <RoomName/>": "Szerep itt: <RoomName/>",
     "Send a sticker": "Matrica küldése",
@@ -2589,10 +2691,14 @@
     "Select from the options below to export chats from your timeline": "Az idővonalon a beszélgetés exportálásához tartozó beállítások kiválasztása",
     "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "Ez a(z) <roomName/> szoba exportálásának kezdete. Exportálta: <exporterDetails/>, időpont: %(exportDate)s.",
     "Create poll": "Szavazás létrehozása",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Terek frissítése…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Terek frissítése… (%(progress)s / %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Meghívók küldése…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Meghívók küldése… (%(progress)s / %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Terek frissítése…",
+        "other": "Terek frissítése… (%(progress)s / %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Meghívók küldése…",
+        "other": "Meghívók küldése… (%(progress)s / %(count)s)"
+    },
     "Loading new room": "Új szoba betöltése",
     "Upgrading room": "Szoba fejlesztése",
     "Show:": "Megjelenítés:",
@@ -2610,8 +2716,10 @@
     "Disinvite from %(roomName)s": "Meghívó visszavonása innen: %(roomName)s",
     "They'll still be able to access whatever you're not an admin of.": "Továbbra is hozzáférhetnek olyan helyekhez ahol ön nem adminisztrátor.",
     "Threads": "Üzenetszálak",
-    "%(count)s reply|one": "%(count)s válasz",
-    "%(count)s reply|other": "%(count)s válasz",
+    "%(count)s reply": {
+        "one": "%(count)s válasz",
+        "other": "%(count)s válasz"
+    },
     "View in room": "Megjelenítés szobában",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Adja meg a biztonsági jelmondatot vagy <button>használja a biztonsági kulcsot</button> a folytatáshoz.",
     "What projects are your team working on?": "Milyen projekteken dolgozik a csoportja?",
@@ -2626,7 +2734,10 @@
     "Use high contrast": "Nagy kontraszt használata",
     "Light high contrast": "Világos, nagy kontrasztú",
     "Automatically send debug logs on any error": "Hibakeresési naplók automatikus küldése bármilyen hiba esetén",
-    "Click the button below to confirm signing out these devices.|other": "Ezeknek a eszközöknek törlésének a megerősítéséhez kattintson a gombra lent.",
+    "Click the button below to confirm signing out these devices.": {
+        "other": "Ezeknek a eszközöknek törlésének a megerősítéséhez kattintson a gombra lent.",
+        "one": "Az eszközből való kilépés megerősítéséhez kattintson a lenti gombra."
+    },
     "Use a more compact 'Modern' layout": "Kompaktabb „Modern” elrendezés használata",
     "You do not have permission to start polls in this room.": "Nincs joga szavazást kezdeményezni ebben a szobában.",
     "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "Ez a szoba egy platformra sem hidalja át az üzeneteket. <a>Tudjon meg többet.</a>",
@@ -2634,11 +2745,14 @@
     "Rename": "Átnevezés",
     "Select all": "Mindet kijelöli",
     "Deselect all": "Semmit nem jelöl ki",
-    "Sign out devices|one": "Eszközből való kijelentkezés",
-    "Sign out devices|other": "Eszközökből való kijelentkezés",
-    "Click the button below to confirm signing out these devices.|one": "Az eszközből való kilépés megerősítéséhez kattintson a lenti gombra.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Az eszközből való kijelentkezéshez erősítse meg a személyazonosságát az egyszeri bejelentkezés használatával.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Az eszközökből való kijelentkezéshez erősítse meg a személyazonosságát az egyszeri bejelentkezés használatával.",
+    "Sign out devices": {
+        "one": "Eszközből való kijelentkezés",
+        "other": "Eszközökből való kijelentkezés"
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Az eszközből való kijelentkezéshez erősítse meg a személyazonosságát az egyszeri bejelentkezés használatával.",
+        "other": "Az eszközökből való kijelentkezéshez erősítse meg a személyazonosságát az egyszeri bejelentkezés használatával."
+    },
     "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "A biztonsági kulcsot tárolja biztonságos helyen, például egy jelszókezelőben vagy egy széfben, mivel ez tartja biztonságban a titkosított adatait.",
     "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "A biztonsági kulcsodat elkészül, ezt tárolja valamilyen biztonságos helyen, például egy jelszókezelőben vagy egy széfben.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.": "Szerezze vissza a hozzáférést a fiókjához és állítsa vissza az elmentett titkosítási kulcsokat ebben a munkamenetben. Ezek nélkül egyetlen munkamenetben sem tudja elolvasni a titkosított üzeneteit.",
@@ -2692,12 +2806,18 @@
     "%(senderName)s has updated the room layout": "%(senderName)s frissítette a szoba kinézetét",
     "Large": "Nagy",
     "Image size in the timeline": "Képméret az idővonalon",
-    "Based on %(count)s votes|one": "%(count)s szavazat alapján",
-    "Based on %(count)s votes|other": "%(count)s szavazat alapján",
-    "%(count)s votes|one": "%(count)s szavazat",
-    "%(count)s votes|other": "%(count)s szavazat",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s és még %(count)s másik",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s és még %(count)s másik",
+    "Based on %(count)s votes": {
+        "one": "%(count)s szavazat alapján",
+        "other": "%(count)s szavazat alapján"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s szavazat",
+        "other": "%(count)s szavazat"
+    },
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s és még %(count)s másik",
+        "other": "%(spaceName)s és még %(count)s másik"
+    },
     "Sorry, the poll you tried to create was not posted.": "Sajnos a szavazás amit készített nem lett elküldve.",
     "Failed to post poll": "A szavazást nem sikerült beküldeni",
     "Sorry, your vote was not registered. Please try again.": "Sajnos az Ön szavazata nem lett rögzítve. Kérjük ismételje meg újra.",
@@ -2725,8 +2845,10 @@
     "You can turn this off anytime in settings": "Ezt bármikor kikapcsolhatja a beállításokban",
     "We <Bold>don't</Bold> share information with third parties": "<Bold>Nem</Bold> osztunk meg információt harmadik féllel",
     "We <Bold>don't</Bold> record or profile any account data": "<Bold>Nem</Bold> mentünk vagy analizálunk semmilyen felhasználói adatot",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s leadott szavazat. Szavazzon az eredmény megtekintéséhez",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s leadott szavazat. Szavazzon az eredmény megtekintéséhez",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s leadott szavazat. Szavazzon az eredmény megtekintéséhez",
+        "other": "%(count)s leadott szavazat. Szavazzon az eredmény megtekintéséhez"
+    },
     "No votes cast": "Nem adtak le szavazatot",
     "Share location": "Tartózkodási hely megosztása",
     "Manage pinned events": "Kitűzött események kezelése",
@@ -2736,24 +2858,34 @@
     "Connectivity to the server has been lost": "Megszakadt a kapcsolat a kiszolgálóval",
     "You cannot place calls in this browser.": "Nem indíthat hívást ebben a böngészőben.",
     "Calls are unsupported": "A hívások nem támogatottak",
-    "Final result based on %(count)s votes|one": "Végeredmény %(count)s szavazat alapján",
-    "Final result based on %(count)s votes|other": "Végeredmény %(count)s szavazat alapján",
+    "Final result based on %(count)s votes": {
+        "one": "Végeredmény %(count)s szavazat alapján",
+        "other": "Végeredmény %(count)s szavazat alapján"
+    },
     "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "Biztosan lezárod ezt a szavazást? Ez megszünteti az új szavazatok leadásának lehetőségét, és kijelzi a végeredményt.",
     "End Poll": "Szavazás lezárása",
     "Sorry, the poll did not end. Please try again.": "Sajnáljuk, a szavazás nem lett lezárva. Kérjük, próbáld újra.",
     "Failed to end poll": "Nem sikerült a szavazás lezárása",
     "The poll has ended. Top answer: %(topAnswer)s": "A szavazás le lett zárva. Nyertes válasz: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "A szavazás le lett zárva. Nem lettek leadva szavazatok.",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s esemény exportálva %(seconds)s másodperc alatt",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s esemény exportálva %(seconds)s másodperc alatt",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s esemény exportálva %(seconds)s másodperc alatt",
+        "other": "%(count)s esemény exportálva %(seconds)s másodperc alatt"
+    },
     "Export successful!": "Sikeres exportálás!",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s esemény lekérve %(seconds)s másodperc alatt",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s esemény lekérve %(seconds)s másodperc alatt",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "%(count)s esemény lekérve %(seconds)s másodperc alatt",
+        "other": "%(count)s esemény lekérve %(seconds)s másodperc alatt"
+    },
     "Processing event %(number)s out of %(total)s": "Esemény feldolgozása: %(number)s. / %(total)s",
-    "Fetched %(count)s events so far|one": "Eddig %(count)s esemény lett lekérve",
-    "Fetched %(count)s events so far|other": "Eddig %(count)s esemény lett lekérve",
-    "Fetched %(count)s events out of %(total)s|one": "%(count)s / %(total)s esemény lekérve",
-    "Fetched %(count)s events out of %(total)s|other": "%(count)s / %(total)s esemény lekérve",
+    "Fetched %(count)s events so far": {
+        "one": "Eddig %(count)s esemény lett lekérve",
+        "other": "Eddig %(count)s esemény lett lekérve"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "%(count)s / %(total)s esemény lekérve",
+        "other": "%(count)s / %(total)s esemény lekérve"
+    },
     "Generating a ZIP": "ZIP előállítása",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "A megadott dátum (%(inputDate)s) nem értelmezhető. Próbálja meg az ÉÉÉÉ-HH-NN formátum használatát.",
     "Failed to load list of rooms.": "A szobák listájának betöltése nem sikerült.",
@@ -2813,10 +2945,14 @@
     "Command error: Unable to handle slash command.": "Parancs hiba: A / jellel kezdődő parancs támogatott.",
     "Open this settings tab": "Beállítások fül megnyitása",
     "Space home": "Kezdő tér",
-    "was removed %(count)s times|one": "eltávolítva",
-    "was removed %(count)s times|other": "%(count)s alkalommal lett eltávolítva",
-    "were removed %(count)s times|one": "eltávolítva",
-    "were removed %(count)s times|other": "%(count)s alkalommal lett eltávolítva",
+    "was removed %(count)s times": {
+        "one": "eltávolítva",
+        "other": "%(count)s alkalommal lett eltávolítva"
+    },
+    "were removed %(count)s times": {
+        "one": "eltávolítva",
+        "other": "%(count)s alkalommal lett eltávolítva"
+    },
     "Unknown error fetching location. Please try again later.": "Ismeretlen hiba a földrajzi helyzetének lekérésekor. Próbálja újra később.",
     "Timed out trying to fetch your location. Please try again later.": "Időtúllépés történt a földrajzi helyzetének lekérésekor. Próbálja újra később.",
     "Failed to fetch your location. Please try again later.": "Nem sikerült a földrajzi helyzetének lekérése. Próbálja újra később.",
@@ -2898,20 +3034,30 @@
     "This is a beta feature": "Ez egy beta állapotú funkció",
     "Use <arrows/> to scroll": "Görgetés ezekkel: <arrows/>",
     "Feedback sent! Thanks, we appreciate it!": "Visszajelzés elküldve. Köszönjük, nagyra értékeljük.",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s rejtett üzenetet küldött",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s %(count)s rejtett üzenetet küldött",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s rejtett üzenetet küldött",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s %(count)s rejtett üzenetet küldött",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s üzenetet törölt",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s %(count)s üzenetet törölt",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s üzenetet törölt",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s %(count)s üzenetet törölt",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)s rejtett üzenetet küldött",
+        "other": "%(oneUser)s %(count)s rejtett üzenetet küldött"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s rejtett üzenetet küldött",
+        "other": "%(severalUsers)s %(count)s rejtett üzenetet küldött"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s üzenetet törölt",
+        "other": "%(oneUser)s %(count)s üzenetet törölt"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s üzenetet törölt",
+        "other": "%(severalUsers)s %(count)s üzenetet törölt"
+    },
     "Maximise": "Teljes méret",
     "Automatically send debug logs when key backup is not functioning": "Hibakeresési naplók automatikus küldése, ha a kulcsmentés nem működik",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Köszönjük, hogy kipróbálja a béta programunkat, hogy fejleszthessünk, adjon olyan részletes visszajelzést, amennyire csak lehet.",
     "<empty string>": "<üres karakterek>",
-    "<%(count)s spaces>|other": "<%(count)s szóköz>",
-    "<%(count)s spaces>|one": "<szóköz>",
+    "<%(count)s spaces>": {
+        "other": "<%(count)s szóköz>",
+        "one": "<szóköz>"
+    },
     "Edit poll": "Szavazás szerkesztése",
     "Sorry, you can't edit a poll after votes have been cast.": "Sajnos a szavazás nem szerkeszthető miután szavazatok érkeztek.",
     "Can't edit poll": "A szavazás nem szerkeszthető",
@@ -2941,10 +3087,14 @@
     "We couldn't send your location": "A földrajzi helyzetet nem sikerült elküldeni",
     "Insert a trailing colon after user mentions at the start of a message": "Záró kettőspont beszúrása egy felhasználó üzenet elején való megemlítésekor",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Válaszoljon egy meglévő üzenetszálban, vagy új üzenetszál indításához használja a „%(replyInThread)s” lehetőséget az üzenet sarkában megjelenő menüben.",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s módosította a szoba <a>kitűzött üzeneteit</a>",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s módosította a szoba <a>kitűzött üzeneteit</a>",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s módosította a szoba <a>kitűzött üzeneteit</a>",
+        "other": "%(oneUser)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s módosította a szoba <a>kitűzött üzeneteit</a>",
+        "other": "%(severalUsers)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>"
+    },
     "Show polls button": "Szavazások gomb megjelenítése",
     "We'll create rooms for each of them.": "Mindenhez készítünk egy szobát.",
     "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Ez a Matrix-kiszolgáló nincs megfelelően beállítva a térképek megjelenítéséhez, vagy a beállított térképkiszolgáló nem érhető el.",
@@ -2966,8 +3116,10 @@
     "You are sharing your live location": "Ön folyamatosan megosztja az aktuális földrajzi pozícióját",
     "%(displayName)s's live location": "%(displayName)s élő földrajzi helyzete",
     "Preserve system messages": "Rendszerüzenetek megtartása",
-    "Currently removing messages in %(count)s rooms|one": "Üzenet törlése %(count)s szobából",
-    "Currently removing messages in %(count)s rooms|other": "Üzenet törlése %(count)s szobából",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Üzenet törlése %(count)s szobából",
+        "other": "Üzenet törlése %(count)s szobából"
+    },
     "Verification explorer": "Ellenőrzések böngésző",
     "Next recently visited room or space": "Következő, nemrég meglátogatott szoba vagy tér",
     "Previous recently visited room or space": "Előző, nemrég meglátogatott szoba vagy tér",
@@ -3007,8 +3159,10 @@
     "Explore room state": "Szoba állapot felderítése",
     "Send custom timeline event": "Egyedi idővonal esemény küldése",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Törölje a kijelölést ha a rendszer üzeneteket is törölni szeretné ettől a felhasználótól (pl. tagság változás, profil változás…)",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "%(count)s üzenetet készül törölni az alábbi felhasználótól: %(user)s. A művelet mindenki számára visszavonhatatlanul eltávolítja ezeket a beszélgetésekből. Biztos, hogy folytatja?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "%(count)s üzenetet készül törölni az alábbi felhasználótól: %(user)s. A művelet mindenki számára visszavonhatatlanul eltávolítja ezeket a beszélgetésekből. Biztos, hogy folytatja?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "%(count)s üzenetet készül törölni az alábbi felhasználótól: %(user)s. A művelet mindenki számára visszavonhatatlanul eltávolítja ezeket a beszélgetésekből. Biztos, hogy folytatja?",
+        "other": "%(count)s üzenetet készül törölni az alábbi felhasználótól: %(user)s. A művelet mindenki számára visszavonhatatlanul eltávolítja ezeket a beszélgetésekből. Biztos, hogy folytatja?"
+    },
     "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Segítsen észrevennünk a hibákat, és jobbá tenni a(z) %(analyticsOwner)s a névtelen használati adatok küldése által. Ahhoz, hogy megértsük, hogyan használnak a felhasználók egyszerre több eszközt, egy véletlenszerű azonosítót generálunk, ami az eszközei között meg lesz osztva.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Használhatja a más szerver opciót, hogy egy másik matrix szerverre jelentkezz be amihez megadod a szerver url címét. Ezzel használhatja a(z) %(brand)s klienst egy már létező Matrix fiókkal egy másik matrix szerveren.",
     "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "A(z) %(brand)s alkalmazásnak nincs jogosultsága a földrajzi helyzetének lekérdezéséhez. Engedélyezze a hely hozzáférését a böngészőbeállításokban.",
@@ -3058,8 +3212,10 @@
     "Ban from space": "Kitiltás a térről",
     "Unban from space": "Visszaengedés a térre",
     "Remove from space": "Eltávolítás a térről",
-    "%(count)s participants|one": "1 résztvevő",
-    "%(count)s participants|other": "%(count)s résztvevő",
+    "%(count)s participants": {
+        "one": "1 résztvevő",
+        "other": "%(count)s résztvevő"
+    },
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Amikor a szobát vagy teret próbáltuk elérni ezt a hibaüzenetet kaptuk: %(errcode)s. Ha úgy gondolja, hogy ez egy hiba legyen szíves<issueLink>nyisson egy hibajegyet</issueLink>.",
     "Try again later, or ask a room or space admin to check if you have access.": "Próbálkozzon később vagy kérje meg a szoba vagy tér adminisztrátorát, hogy nézze meg van-e hozzáférése.",
     "This room or space is not accessible at this time.": "Ez a szoba vagy tér jelenleg elérhetetlen.",
@@ -3078,8 +3234,10 @@
     "New room": "Új szoba",
     "View older version of %(spaceName)s.": "A(z) %(spaceName)s tér régebbi verziójának megtekintése.",
     "Upgrade this space to the recommended room version": "A tér frissítése a javasolt szobaverzióra",
-    "Confirm signing out these devices|one": "Megerősítés ebből az eszközből való kijelentkezéshez",
-    "Confirm signing out these devices|other": "Megerősítés ezekből az eszközökből való kijelentkezéshez",
+    "Confirm signing out these devices": {
+        "one": "Megerősítés ebből az eszközből való kijelentkezéshez",
+        "other": "Megerősítés ezekből az eszközökből való kijelentkezéshez"
+    },
     "Turn on camera": "Kamera bekapcsolása",
     "Turn off camera": "Kamera kikapcsolása",
     "Video devices": "Videóeszközök",
@@ -3099,8 +3257,10 @@
     "You will not be able to reactivate your account": "A fiók többi nem aktiválható",
     "Confirm that you would like to deactivate your account. If you proceed:": "Erősítse meg a fiók deaktiválását. Ha folytatja:",
     "To continue, please enter your account password:": "A folytatáshoz adja meg a jelszavát:",
-    "Seen by %(count)s people|one": "%(count)s ember látta",
-    "Seen by %(count)s people|other": "%(count)s ember látta",
+    "Seen by %(count)s people": {
+        "one": "%(count)s ember látta",
+        "other": "%(count)s ember látta"
+    },
     "Your password was successfully changed.": "A jelszó sikeresen megváltozott.",
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Az összes eszközéről kijelentkezett és leküldéses értesítéseket sem fog kapni. Az értesítések újbóli engedélyezéséhez újra be kell jelentkezni az egyes eszközökön.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Ha szeretné megtartani a hozzáférést a titkosított szobákban lévő csevegésekhez, állítson be Kulcs mentést vagy exportálja ki a kulcsokat valamelyik eszközéről mielőtt továbblép.",
@@ -3134,8 +3294,10 @@
     "Show Labs settings": "Labor beállítások megjelenítése",
     "To join, please enable video rooms in Labs first": "A belépéshez a Laborban be kell kapcsolni a videó szobákat",
     "To view, please enable video rooms in Labs first": "A megjelenítéshez a Laborban be kell kapcsolni a videó szobákat",
-    "%(count)s people joined|one": "%(count)s személy belépett",
-    "%(count)s people joined|other": "%(count)s személy belépett",
+    "%(count)s people joined": {
+        "one": "%(count)s személy belépett",
+        "other": "%(count)s személy belépett"
+    },
     "View related event": "Kapcsolódó események megjelenítése",
     "Check if you want to hide all current and future messages from this user.": "Válaszd ki ha ennek a felhasználónak a jelenlegi és jövőbeli üzeneteit el szeretnéd rejteni.",
     "Ignore user": "Felhasználó mellőzése",
@@ -3162,8 +3324,10 @@
     "Show spaces": "Terek megjelenítése",
     "Show rooms": "Szobák megjelenítése",
     "Search for": "Keresés:",
-    "%(count)s Members|one": "%(count)s tag",
-    "%(count)s Members|other": "%(count)s tag",
+    "%(count)s Members": {
+        "one": "%(count)s tag",
+        "other": "%(count)s tag"
+    },
     "Show: Matrix rooms": "Megjelenít: Matrix szobák",
     "Show: %(instance)s rooms (%(server)s)": "Megjelenít: %(instance)s szoba (%(server)s)",
     "Add new server…": "Új szerver hozzáadása…",
@@ -3198,16 +3362,20 @@
     "Enter fullscreen": "Teljes képernyőre váltás",
     "Map feedback": "Visszajelzés a térképről",
     "Toggle attribution": "Forrásmegjelölés be/ki",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Itt: %(spaceName)s és %(count)s másik térben.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Itt: %(spaceName)s és %(count)s másik térben.",
+        "other": "Itt: %(spaceName)s és %(count)s másik térben."
+    },
     "In %(spaceName)s.": "Ebben a térben: %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Itt: %(spaceName)s és %(count)s másik térben.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Ezekben a terekben: %(space1Name)s és %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Fejlesztői parancs: Eldobja a jelenlegi kimenő csoport kapcsolatot és új Olm munkamenetet hoz létre",
     "Send your first message to invite <displayName/> to chat": "Küldj egy üzenetet ahhoz, hogy meghívd <displayName/> felhasználót",
     "Messages in this chat will be end-to-end encrypted.": "Az üzenetek ebben a beszélgetésben végponti titkosítással vannak védve.",
     "You did it!": "Kész!",
-    "Only %(count)s steps to go|one": "Még %(count)s lépés",
-    "Only %(count)s steps to go|other": "Még %(count)s lépés",
+    "Only %(count)s steps to go": {
+        "one": "Még %(count)s lépés",
+        "other": "Még %(count)s lépés"
+    },
     "Welcome to %(brand)s": "Üdvözli a(z) %(brand)s",
     "Find your people": "Találja meg az embereket",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Tartsa meg a közösségi beszélgetések feletti irányítást.\nAkár milliók támogatásával, hatékony moderációs és együttműködési lehetőségekkel.",
@@ -3291,11 +3459,15 @@
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Nyilvános szobához nem javasolt a titkosítás beállítása.</b>Bárki megtalálhatja és csatlakozhat nyilvános szobákhoz, így bárki elolvashatja az üzeneteket bennük. A titkosítás előnyeit így nem jelentkeznek és később ezt nem lehet kikapcsolni. Nyilvános szobákban a titkosított üzenetek az üzenetküldést és fogadást csak lassítják.",
     "Don’t miss a thing by taking %(brand)s with you": "Ne maradjon le semmiről, legyen Önnél a(z) %(brand)s",
     "Empty room (was %(oldName)s)": "Üres szoba (%(oldName)s volt)",
-    "Inviting %(user)s and %(count)s others|one": "%(user)s és 1 további meghívása",
-    "Inviting %(user)s and %(count)s others|other": "%(user)s és %(count)s további meghívása",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "%(user)s és 1 további meghívása",
+        "other": "%(user)s és %(count)s további meghívása"
+    },
     "Inviting %(user1)s and %(user2)s": "%(user1)s és %(user2)s meghívása",
-    "%(user)s and %(count)s others|one": "%(user)s és 1 további",
-    "%(user)s and %(count)s others|other": "%(user)s és %(count)s további",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s és 1 további",
+        "other": "%(user)s és %(count)s további"
+    },
     "%(user1)s and %(user2)s": "%(user1)s és %(user2)s",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s vagy %(copyButton)s",
     "%(securityKey)s or %(recoveryFile)s": "%(securityKey)s vagy %(recoveryFile)s",
@@ -3392,8 +3564,10 @@
     "Review and approve the sign in": "Belépés áttekintése és engedélyezés",
     "You can use this device to sign in a new device with a QR code. You will need to scan the QR code shown on this device with your device that's signed out.": "Ennek az eszköznek a felhasználásával és a QR kóddal beléptethet egy másik eszközt. Be kell olvasni a QR kódot azon az eszközön ami még nincs belépve.",
     "play voice broadcast": "hangközvetítés lejátszása",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Biztos, hogy ki szeretne lépni %(count)s munkamenetből?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Biztos, hogy ki szeretne lépni %(count)s munkamenetből?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Biztos, hogy ki szeretne lépni %(count)s munkamenetből?",
+        "other": "Biztos, hogy ki szeretne lépni %(count)s munkamenetből?"
+    },
     "Show formatting": "Formázás megjelenítése",
     "Consider signing out from old sessions (%(inactiveAgeDays)s days or older) you don't use anymore.": "Fontolja meg a kijelentkezést a régi munkamenetekből (%(inactiveAgeDays)s napnál régebbi) ha már nem használja azokat.",
     "Removing inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.": "Az inaktív munkamenetek törlése növeli a biztonságot és a sebességet, valamint egyszerűbbé teszi a gyanús munkamenetek felismerését.",
@@ -3487,8 +3661,10 @@
     "%(senderName)s ended a voice broadcast": "%(senderName)s befejezte a hangközvetítést",
     "You ended a voice broadcast": "A hangközvetítés befejeződött",
     "Improve your account security by following these recommendations.": "Javítsa a fiókja biztonságát azzal, hogy követi a következő javaslatokat.",
-    "%(count)s sessions selected|one": "%(count)s munkamenet kiválasztva",
-    "%(count)s sessions selected|other": "%(count)s munkamenet kiválasztva",
+    "%(count)s sessions selected": {
+        "one": "%(count)s munkamenet kiválasztva",
+        "other": "%(count)s munkamenet kiválasztva"
+    },
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Nem lehet hívást kezdeményezni élő közvetítés felvétele közben. Az élő közvetítés bejezése szükséges a hívás indításához.",
     "Can’t start a call": "Nem sikerült hívást indítani",
     " in <strong>%(room)s</strong>": " itt: <strong>%(room)s</strong>",
@@ -3501,8 +3677,10 @@
     "Create a link": "Hivatkozás készítése",
     "Link": "Hivatkozás",
     "Force 15s voice broadcast chunk length": "Hangközvetítések 15 másodperces darabolásának kényszerítése",
-    "Sign out of %(count)s sessions|one": "Kijelentkezés %(count)s munkamenetből",
-    "Sign out of %(count)s sessions|other": "Kijelentkezés %(count)s munkamenetből",
+    "Sign out of %(count)s sessions": {
+        "one": "Kijelentkezés %(count)s munkamenetből",
+        "other": "Kijelentkezés %(count)s munkamenetből"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Kijelentkezés minden munkamenetből (%(otherSessionsCount)s)",
     "Yes, end my recording": "Igen, a felvétel befejezése",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "Ha hallgatja ezt az élő közvetítést, akkor a jelenlegi élő közvetítésének a felvétele befejeződik.",
@@ -3606,7 +3784,9 @@
     "Room is <strong>encrypted ✅</strong>": "A szoba <strong>titkosított ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Értesítés állapot: <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Szoba olvasatlan állapota: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Szoba olvasatlan állapota: <strong>%(status)s</strong>, darabszám: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Szoba olvasatlan állapota: <strong>%(status)s</strong>, darabszám: <strong>%(count)s</strong>"
+    },
     "Ended a poll": "Lezárta a szavazást",
     "Due to decryption errors, some votes may not be counted": "Visszafejtési hibák miatt néhány szavazat nem kerül beszámításra",
     "The sender has blocked you from receiving this message": "A feladó megtagadta az Ön hozzáférését ehhez az üzenethez",
@@ -3616,7 +3796,10 @@
     "Show NSFW content": "Felnőtt tartalmak megjelenítése",
     "Yes, it was me": "Igen, én voltam",
     "Answered elsewhere": "Máshol lett felvéve",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "%(count)s napja nincs aktív szavazás. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "other": "%(count)s napja nincs aktív szavazás. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
+        "one": "Nincs aktív szavazás az elmúlt napokból. További szavazások betöltése az előző havi szavazások megjelenítéséhez"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Nincs régebbi szavazás. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
     "There are no active polls. Load more polls to view polls for previous months": "Nincs aktív szavazás. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
     "Load more polls": "Még több szavazás betöltése",
@@ -3630,9 +3813,10 @@
     "Could not find room": "A szoba nem található",
     "iframe has no src attribute": "az iframe-nek nincs src attribútuma",
     "View poll": "Szavazás megtekintése",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Nincs aktív szavazás az elmúlt napokból. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "%(count)s napja nincs aktív szavazás. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Nincs aktív szavazás az elmúlt napokból. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Nincs aktív szavazás az elmúlt napokból. További szavazások betöltése az előző havi szavazások megjelenítéséhez",
+        "other": "%(count)s napja nincs aktív szavazás. További szavazások betöltése az előző havi szavazások megjelenítéséhez"
+    },
     "Invites by email can only be sent one at a time": "E-mail meghívóból egyszerre csak egy küldhető el",
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "A belépéshez csak a szoba azonosítóját adta meg a kiszolgáló nélkül. A szobaazonosító egy belső azonosító, amellyel további információk nélkül nem lehet belépni szobába.",
     "An error occurred when updating your notification preferences. Please try to toggle your option again.": "Hiba történt az értesítési beállítások frissítése során. Próbálja meg be- és kikapcsolni a beállítást.",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 4cfdbe0b7f..e89c5e3434 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -600,10 +600,22 @@
     "Code": "Kode",
     "Next": "Lanjut",
     "Refresh": "Muat Ulang",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)skeluar",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)skeluar",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sbergabung",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sbergabung",
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)skeluar",
+        "other": "%(oneUser)skeluar %(count)s kali"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)skeluar",
+        "other": "%(severalUsers)skeluar %(count)s kali"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)sbergabung",
+        "other": "%(oneUser)sbergabung %(count)s kali"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)sbergabung",
+        "other": "%(severalUsers)sbergabung %(count)s kali"
+    },
     "Invite": "Undang",
     "Mention": "Sebutkan",
     "Unknown": "Tidak Dikenal",
@@ -895,19 +907,39 @@
     "Event Type": "Tipe Peristiwa",
     "Event sent!": "Peristiwa terkirim!",
     "Logs sent": "Catatan terkirim",
-    "was unbanned %(count)s times|one": "dihilangkan cekalannya",
-    "were unbanned %(count)s times|one": "dihilangkan cekalannya",
-    "was banned %(count)s times|one": "dicekal",
+    "was unbanned %(count)s times": {
+        "one": "dihilangkan cekalannya",
+        "other": "dihilangkan cekalannya %(count)s kali"
+    },
+    "were unbanned %(count)s times": {
+        "one": "dihilangkan cekalannya",
+        "other": "dihilangkan cekalannya %(count)s kali"
+    },
+    "was banned %(count)s times": {
+        "one": "dicekal",
+        "other": "dicekal %(count)s kali"
+    },
     "Popout widget": "Widget popout",
     "Muted Users": "Pengguna yang Dibisukan",
     "Uploading %(filename)s": "Mengunggah %(filename)s",
     "Delete Widget": "Hapus Widget",
-    "were banned %(count)s times|one": "dicekal",
-    "was invited %(count)s times|one": "diundang",
-    "were invited %(count)s times|one": "diundang",
+    "were banned %(count)s times": {
+        "one": "dicekal",
+        "other": "dicekal %(count)s kali"
+    },
+    "was invited %(count)s times": {
+        "one": "diundang",
+        "other": "diundang %(count)s kali"
+    },
+    "were invited %(count)s times": {
+        "one": "diundang",
+        "other": "diundang %(count)s kali"
+    },
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "(~%(count)s results)|one": "(~%(count)s hasil)",
-    "(~%(count)s results)|other": "(~%(count)s hasil)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s hasil)",
+        "other": "(~%(count)s hasil)"
+    },
     "Message Pinning": "Pin Pesan",
     "Signed Out": "Keluar",
     "Start authentication": "Mulai autentikasi",
@@ -984,8 +1016,10 @@
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s mengubah akses tamu ke %(rule)s",
     "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s menghapus undangannya %(targetName)s: %(reason)s",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s membuat semua riwayat ruangan di masa mendatang dapat dilihat oleh orang yang tidak dikenal (%(visibility)s).",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s menghapus alamat alternatif %(addresses)s untuk ruangan ini.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s menghapus alamat alternatif %(addresses)s untuk ruangan ini.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s menghapus alamat alternatif %(addresses)s untuk ruangan ini.",
+        "other": "%(senderName)s menghapus alamat alternatif %(addresses)s untuk ruangan ini."
+    },
     "Hey you. You're the best!": "Hei kamu. Kamu adalah yang terbaik!",
     "See when a sticker is posted in this room": "Lihat saat sebuah stiker telah dikirim ke ruangan ini",
     "Send stickers to this room as you": "Kirim stiker ke ruangan ini sebagai Anda",
@@ -1010,8 +1044,10 @@
     "Remain on your screen while running": "Tetap di layar Anda saat berjalan",
     "Remain on your screen when viewing another room, when running": "Tetap di layar Anda saat melihat ruangan yang lain, saat berjalan",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s dan %(lastPerson)s sedang mengetik …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s dan satu lainnya sedang mengetik …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s dan %(count)s lainnya sedang mengetik …",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s dan satu lainnya sedang mengetik …",
+        "other": "%(names)s dan %(count)s lainnya sedang mengetik …"
+    },
     "%(displayName)s is typing …": "%(displayName)s sedang mengetik …",
     "Light high contrast": "Kontras tinggi terang",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s memperbarui sebuah peraturan pencekalan yang sebelumnya berisi %(oldGlob)s ke %(newGlob)s untuk %(reason)s",
@@ -1049,8 +1085,10 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s mengubah alamat-alamatnya untuk ruangan ini.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s mengubah alamat utama dan alamat alternatif untuk ruangan ini.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s mengubah alamat alternatifnya untuk ruangan ini.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s menambahkan alamat alternatif %(addresses)s untuk ruangan ini.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s menambahkan alamat alternatif %(addresses)s untuk ruangan ini.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s menambahkan alamat alternatif %(addresses)s untuk ruangan ini.",
+        "one": "%(senderName)s menambahkan alamat alternatif %(addresses)s untuk ruangan ini."
+    },
     "%(senderName)s removed the main address for this room.": "%(senderName)s menghapus alamat utamanya untuk ruangan ini.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s mengatur alamat utama untuk ruangan ini ke %(address)s.",
     "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s mengirim sebuah stiker.",
@@ -1123,8 +1161,10 @@
     "%(num)s minutes ago": "%(num)s menit yang lalu",
     "about a minute ago": "1 menit yang lalu",
     "a few seconds ago": "beberapa detik yang lalu",
-    "%(items)s and %(count)s others|one": "%(items)s dan satu lainnya",
-    "%(items)s and %(count)s others|other": "%(items)s dan %(count)s lainnya",
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s dan satu lainnya",
+        "other": "%(items)s dan %(count)s lainnya"
+    },
     "This homeserver has exceeded one of its resource limits.": "Homeserver ini telah melebihi batas sumber dayanya.",
     "This homeserver has been blocked by its administrator.": "Homeserver ini telah diblokir oleh administratornya.",
     "This homeserver has hit its Monthly Active User limit.": "Homeserver ini telah mencapai batasnya Pengguna Aktif Bulanan.",
@@ -1221,10 +1261,14 @@
     "Messages containing keywords": "Pesan berisi kata kunci",
     "Message bubbles": "Gelembung pesan",
     "Message layout": "Tata letak pesan",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Memperbarui space...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Memperbarui space... (%(progress)s dari %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Mengirimkan undangan...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Mengirimkan undangan... (%(progress)s dari %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Memperbarui space...",
+        "other": "Memperbarui space... (%(progress)s dari %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Mengirimkan undangan...",
+        "other": "Mengirimkan undangan... (%(progress)s dari %(count)s)"
+    },
     "Loading new room": "Memuat ruangan baru",
     "Upgrading room": "Meningkatkan ruangan",
     "This upgrade will allow members of selected spaces access to this room without an invite.": "Peningkatan ini akan mengizinkan anggota di space yang terpilih untuk dapat mengakses ruangan ini tanpa sebuah undangan.",
@@ -1234,10 +1278,14 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Siapa saja di <spaceName/> dapat menemukan dan bergabung. Anda juga dapat memilih space yang lain.",
     "Spaces with access": "Space dengan akses",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Siapa saja di dalam space dapat menemukan dan bergabung. <a>Edit space apa saja yang dapat mengakses.</a>",
-    "Currently, %(count)s spaces have access|one": "Saat ini, sebuah space memiliki akses",
-    "Currently, %(count)s spaces have access|other": "Saat ini, %(count)s space memiliki akses",
-    "& %(count)s more|one": "& %(count)s lainnya",
-    "& %(count)s more|other": "& %(count)s lainnya",
+    "Currently, %(count)s spaces have access": {
+        "one": "Saat ini, sebuah space memiliki akses",
+        "other": "Saat ini, %(count)s space memiliki akses"
+    },
+    "& %(count)s more": {
+        "one": "& %(count)s lainnya",
+        "other": "& %(count)s lainnya"
+    },
     "Upgrade required": "Peningkatan diperlukan",
     "Anyone can find and join.": "Siapa saja dapat menemukan dan bergabung.",
     "Only invited people can join.": "Hanya orang yang diundang dapat bergabung.",
@@ -1251,17 +1299,26 @@
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s tidak dapat menyimpan pesan terenkripsi secara lokal dengan aman saat dijalankan di browser. Gunakan <desktopLink>%(brand)s Desktop</desktopLink> supaya pesan terenkripsi dapat muncul di hasil pencarian.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s tidak memiliki beberapa komponen yang diperlukan untuk menyimpan pesan terenkripsi secara lokal dengan aman. Jika Anda ingin bereksperimen dengan fitur ini, buat %(brand)s Desktop yang khusus dengan <nativeLink>tambahan komponen penelusuran</nativeLink>.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Simpan pesan terenkripsi secara lokal dengan aman agar muncul di hasil pencarian.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Simpan pesan terenkripsi secara lokal dengan aman agar muncul di hasil pencarian, menggunakan %(size)s untuk menyimpan pesan dari %(rooms)s ruangan.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Simpan pesan terenkripsi secara lokal dengan aman agar muncul di hasil pencarian, menggunakan %(size)s untuk menyimpan pesan dari %(rooms)s ruangan.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Simpan pesan terenkripsi secara lokal dengan aman agar muncul di hasil pencarian, menggunakan %(size)s untuk menyimpan pesan dari %(rooms)s ruangan.",
+        "other": "Simpan pesan terenkripsi secara lokal dengan aman agar muncul di hasil pencarian, menggunakan %(size)s untuk menyimpan pesan dari %(rooms)s ruangan."
+    },
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifikasi setiap sesi yang digunakan oleh pengguna satu per satu untuk menandainya sebagai tepercaya, dan tidak memercayai perangkat yang ditandatangani silang.",
     "Failed to set display name": "Gagal untuk menetapkan nama tampilan",
     "Deselect all": "Batalkan semua pilihan",
     "Select all": "Pilih semua",
-    "Sign out devices|one": "Keluarkan perangkat",
-    "Sign out devices|other": "Keluarkan perangkat",
-    "Click the button below to confirm signing out these devices.|one": "Klik tombol di bawah untuk mengkonfirmasi mengeluarkan perangkat ini.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Konfirmasi mengeluarkan perangkat ini dengan menggunakan Single Sign On untuk membuktikan identitas Anda.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Konfirmasi mengeluarkan perangkat-perangkat ini dengan menggunakan Single Sign On untuk membuktikan identitas Anda.",
+    "Sign out devices": {
+        "one": "Keluarkan perangkat",
+        "other": "Keluarkan perangkat"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Klik tombol di bawah untuk mengkonfirmasi mengeluarkan perangkat ini.",
+        "other": "Klik tombol di bawah untuk mengkonfirmasi mengeluarkan perangkat-perangkat ini."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Konfirmasi mengeluarkan perangkat ini dengan menggunakan Single Sign On untuk membuktikan identitas Anda.",
+        "other": "Konfirmasi mengeluarkan perangkat-perangkat ini dengan menggunakan Single Sign On untuk membuktikan identitas Anda."
+    },
     "Session key:": "Kunci sesi:",
     "Session ID:": "ID Sesi:",
     "Import E2E room keys": "Impor kunci enkripsi ujung ke ujung",
@@ -1509,7 +1566,6 @@
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "periksa plugin browser Anda untuk apa saja yang mungkin memblokir server identitasnya (seperti Privacy Badger)",
     "You should:": "Anda seharusnya:",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Anda seharusnya <b>menghapus data personal Anda</b> dari server identitas <idserver /> sebelum memutuskan hubungan. Sayangnya, server identitas <idserver /> saat ini sedang luring atau tidak dapat dicapai.",
-    "Click the button below to confirm signing out these devices.|other": "Klik tombol di bawah untuk mengkonfirmasi mengeluarkan perangkat-perangkat ini.",
     "sends rainfall": "mengirim hujan",
     "Sends the given message with rainfall": "Kirim pesan dengan hujan",
     "Show all your rooms in Home, even if they're in a space.": "Tampilkan semua ruangan di Beranda, walaupun mereka berada di sebuah space.",
@@ -1585,7 +1641,9 @@
     "Unpin this widget to view it in this panel": "Lepaskan pin widget ini untuk menampilkanya di panel ini",
     "Pinned messages": "Pesan yang dipasangi pin",
     "Nothing pinned, yet": "Belum ada yang dipasangi pin",
-    "You can only pin up to %(count)s widgets|other": "Anda hanya dapat memasang pin sampai %(count)s widget",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Anda hanya dapat memasang pin sampai %(count)s widget"
+    },
     "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Jika Anda memiliki izin, buka menunya di pesan apa saja dan pilih <b>Pin</b> untuk menempelkannya di sini.",
     "Yours, or the other users' session": "Sesi Anda, atau pengguna yang lain",
     "Yours, or the other users' internet connection": "Koneksi internet Anda, atau pengguna yang lain",
@@ -1648,15 +1706,21 @@
     "This room has already been upgraded.": "Ruangan ini telah ditingkatkan.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Meningkatkan ruangan ini akan mematikan instansi ruangan saat ini dan membuat ruangan yang ditingkatkan dengan nama yang sama.",
     "Unread messages.": "Pesan yang belum dibaca.",
-    "%(count)s unread messages.|one": "1 pesan yang belum dibaca.",
-    "%(count)s unread messages.|other": "%(count)s pesan yang belum dibaca.",
-    "%(count)s unread messages including mentions.|one": "1 sebutan yang belum dibaca.",
-    "%(count)s unread messages including mentions.|other": "%(count)s pesan yang belum dibaca termasuk sebutan.",
+    "%(count)s unread messages.": {
+        "one": "1 pesan yang belum dibaca.",
+        "other": "%(count)s pesan yang belum dibaca."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "1 sebutan yang belum dibaca.",
+        "other": "%(count)s pesan yang belum dibaca termasuk sebutan."
+    },
     "Forget Room": "Lupakan Ruangan",
     "Notification options": "Opsi notifikasi",
     "Show less": "Tampilkan lebih sedikit",
-    "Show %(count)s more|one": "Tampilkan %(count)s lagi",
-    "Show %(count)s more|other": "Tampilkan %(count)s lagi",
+    "Show %(count)s more": {
+        "one": "Tampilkan %(count)s lagi",
+        "other": "Tampilkan %(count)s lagi"
+    },
     "List options": "Tampilkan daftar opsi",
     "Sort by": "Sortir berdasarkan",
     "Show previews of messages": "Tampilkan tampilan pesan",
@@ -1735,11 +1799,15 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tingkat daya %(powerLevelNumber)s)",
     "Filter room members": "Saring anggota ruangan",
     "Invite to this space": "Undang ke space ini",
-    "and %(count)s others...|one": "dan satu lainnya...",
-    "and %(count)s others...|other": "dan %(count)s lainnya...",
+    "and %(count)s others...": {
+        "one": "dan satu lainnya...",
+        "other": "dan %(count)s lainnya..."
+    },
     "Close preview": "Tutup tampilan",
-    "Show %(count)s other previews|one": "Tampilkan %(count)s tampilan lainnya",
-    "Show %(count)s other previews|other": "Tampilkan %(count)s tampilan lainnya",
+    "Show %(count)s other previews": {
+        "one": "Tampilkan %(count)s tampilan lainnya",
+        "other": "Tampilkan %(count)s tampilan lainnya"
+    },
     "Scroll to most recent messages": "Gulir ke pesan yang terbaru",
     "Failed to send": "Gagal untuk dikirim",
     "Your message was sent": "Pesan Anda telah terkirim",
@@ -1749,8 +1817,10 @@
     "Reply in thread": "Balas di utasan",
     "Message Actions": "Aksi Pesan",
     "This event could not be displayed": "Peristiwa ini tidak dapat ditampilkan",
-    "%(count)s reply|one": "%(count)s balasan",
-    "%(count)s reply|other": "%(count)s balasan",
+    "%(count)s reply": {
+        "one": "%(count)s balasan",
+        "other": "%(count)s balasan"
+    },
     "Send as message": "Kirim sebagai pesan",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Petunjuk: Mulai pesan Anda dengan <code>//</code> untuk memulainya dengan sebuah garis miring.",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Anda dapat menggunakan <code>/help</code> untuk melihat perintah yang tersedia. Apakah Anda bermaksud untuk mengirimkannya sebagai sebuah pesan?",
@@ -1930,8 +2000,10 @@
     "Ban from %(roomName)s": "Cekal dari %(roomName)s",
     "Unban from %(roomName)s": "Batalkan cekalan dari %(roomName)s",
     "Remove recent messages": "Hapus pesan terkini",
-    "Remove %(count)s messages|one": "Hapus 1 pesan",
-    "Remove %(count)s messages|other": "Hapus %(count)s pesan",
+    "Remove %(count)s messages": {
+        "one": "Hapus 1 pesan",
+        "other": "Hapus %(count)s pesan"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Untuk pesan yang jumlahnya banyak, ini mungkin membutuhkan beberapa waktu. Jangan muat ulang klien Anda untuk sementara.",
     "Remove recent messages by %(user)s": "Hapus pesan terkini dari %(user)s",
     "No recent messages by %(user)s found": "Tidak ada pesan terkini dari %(user)s yang ditemukan",
@@ -1943,11 +2015,15 @@
     "Share Link to User": "Bagikan Tautan ke Pengguna",
     "Jump to read receipt": "Pergi ke laporan dibaca",
     "Hide sessions": "Sembunyikan sesi",
-    "%(count)s sessions|one": "%(count)s sesi",
-    "%(count)s sessions|other": "%(count)s sesi",
+    "%(count)s sessions": {
+        "one": "%(count)s sesi",
+        "other": "%(count)s sesi"
+    },
     "Hide verified sessions": "Sembunyikan sesi terverifikasi",
-    "%(count)s verified sessions|one": "1 sesi terverifikasi",
-    "%(count)s verified sessions|other": "%(count)s sesi terverifikasi",
+    "%(count)s verified sessions": {
+        "one": "1 sesi terverifikasi",
+        "other": "%(count)s sesi terverifikasi"
+    },
     "Not trusted": "Tidak dipercayai",
     "Room settings": "Pengaturan ruangan",
     "Export chat": "Ekspor obrolan",
@@ -2036,8 +2112,10 @@
     "Add existing rooms": "Tambahkan ruangan yang sudah ada",
     "Space selection": "Pilihan space",
     "Direct Messages": "Pesan Langsung",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Menambahkan ruangan...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Menambahkan ruangan... (%(progress)s dari %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Menambahkan ruangan...",
+        "other": "Menambahkan ruangan... (%(progress)s dari %(count)s)"
+    },
     "Not all selected were added": "Tidak semua yang terpilih ditambahkan",
     "Search for spaces": "Cari space",
     "Create a new space": "Buat sebuah space baru",
@@ -2052,7 +2130,9 @@
     "Sign in with single sign-on": "Masuk dengan single sign on",
     "Looks good": "Kelihatannya bagus",
     "Enter a server name": "Masukkan sebuah nama server",
-    "And %(count)s more...|other": "Dan %(count)s lagi...",
+    "And %(count)s more...": {
+        "other": "Dan %(count)s lagi..."
+    },
     "Continue with %(provider)s": "Lanjutkan dengan %(provider)s",
     "Join millions for free on the largest public server": "Bergabung dengan jutaan orang lainnya secara gratis di server publik terbesar",
     "Server Options": "Opsi Server",
@@ -2073,52 +2153,74 @@
     "Question or topic": "Pertanyaan atau topik",
     "What is your poll question or topic?": "Apa pertanyaan atau topik poll Anda?",
     "Create Poll": "Buat Poll",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)smengubah ACL server",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)smengubah ACL server %(count)s kali",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)smengubah ACL server",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)smengubah ACL server %(count)s kali",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)stidak membuat perubahan",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)stidak membuat perubahan %(count)s kali",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)stidak membuat perubahan",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)stidak membuat perubahan %(count)s kali",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)smengubah namanya",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)smengubah namanya %(count)s kali",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)smengubah namanya",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)smengubah namanya %(count)s kali",
-    "was unbanned %(count)s times|other": "dihilangkan cekalannya %(count)s kali",
-    "were unbanned %(count)s times|other": "dihilangkan cekalannya %(count)s kali",
-    "was banned %(count)s times|other": "dicekal %(count)s kali",
-    "were banned %(count)s times|other": "dicekal %(count)s kali",
-    "was invited %(count)s times|other": "diundang %(count)s kali",
-    "were invited %(count)s times|other": "diundang %(count)s kali",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "undangannya %(oneUser)s dihapus",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "undangannya %(oneUser)s dihapus %(count)s kali",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "undangannya %(severalUsers)s dihapus",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "undangannya %(severalUsers)s dihapus %(count)s kali",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)smenolak undangannya",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)smenolak undangannya %(count)s kali",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)smenolak undangannya",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)smenolak undangannya %(count)s kali",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)skeluar dan bergabung kembali",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)skeluar dan bergabung kembali %(count)s kali",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)skeluar dan bergabung kembali",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)skeluar dan bergabung kembali %(count)s kali",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sbergabung dan keluar",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sbergabung dan keluar %(count)s kali",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sbergabung dan keluar",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sbergabung dan keluar %(count)s kali",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)skeluar %(count)s kali",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)skeluar %(count)s kali",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sbergabung %(count)s kali",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sbergabung %(count)s kali",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)smengubah ACL server",
+        "other": "%(oneUser)smengubah ACL server %(count)s kali"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)smengubah ACL server",
+        "other": "%(severalUsers)smengubah ACL server %(count)s kali"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)stidak membuat perubahan",
+        "other": "%(oneUser)stidak membuat perubahan %(count)s kali"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)stidak membuat perubahan",
+        "other": "%(severalUsers)stidak membuat perubahan %(count)s kali"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)smengubah namanya",
+        "other": "%(oneUser)smengubah namanya %(count)s kali"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)smengubah namanya",
+        "other": "%(severalUsers)smengubah namanya %(count)s kali"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "undangannya %(oneUser)s dihapus",
+        "other": "undangannya %(oneUser)s dihapus %(count)s kali"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "undangannya %(severalUsers)s dihapus",
+        "other": "undangannya %(severalUsers)s dihapus %(count)s kali"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)smenolak undangannya",
+        "other": "%(oneUser)smenolak undangannya %(count)s kali"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)smenolak undangannya",
+        "other": "%(severalUsers)smenolak undangannya %(count)s kali"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)skeluar dan bergabung kembali",
+        "other": "%(oneUser)skeluar dan bergabung kembali %(count)s kali"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)skeluar dan bergabung kembali",
+        "other": "%(severalUsers)skeluar dan bergabung kembali %(count)s kali"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)sbergabung dan keluar",
+        "other": "%(oneUser)sbergabung dan keluar %(count)s kali"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)sbergabung dan keluar",
+        "other": "%(severalUsers)sbergabung dan keluar %(count)s kali"
+    },
     "Language Dropdown": "Dropdown Bahasa",
     "Zoom in": "Perbesar",
     "Zoom out": "Perkecil",
-    "%(count)s people you know have already joined|one": "%(count)s orang yang Anda tahu telah bergabung",
-    "%(count)s people you know have already joined|other": "%(count)s orang yang Anda tahu telah bergabung",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s orang yang Anda tahu telah bergabung",
+        "other": "%(count)s orang yang Anda tahu telah bergabung"
+    },
     "Including %(commaSeparatedMembers)s": "Termasuk %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Tampilkan 1 pengguna",
-    "View all %(count)s members|other": "Tampilkan semua %(count)s anggota",
+    "View all %(count)s members": {
+        "one": "Tampilkan 1 pengguna",
+        "other": "Tampilkan semua %(count)s anggota"
+    },
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Mohon <newIssueLink>buat sebuah issue baru</newIssueLink> di GitHub supaya kami dapat memeriksa kutu ini.",
     "Share content": "Bagikan konten",
     "Application window": "Jendela aplikasi",
@@ -2254,8 +2356,10 @@
     "Original event source": "Sumber peristiwa asli",
     "Decrypted event source": "Sumber peristiwa terdekripsi",
     "Could not load user profile": "Tidak dapat memuat profil pengguna",
-    "Currently joining %(count)s rooms|one": "Saat ini bergabung dengan %(count)s ruangan",
-    "Currently joining %(count)s rooms|other": "Saat ini bergabung dengan %(count)s ruangan",
+    "Currently joining %(count)s rooms": {
+        "one": "Saat ini bergabung dengan %(count)s ruangan",
+        "other": "Saat ini bergabung dengan %(count)s ruangan"
+    },
     "User menu": "Menu pengguna",
     "Switch theme": "Ubah tema",
     "Switch to dark mode": "Ubah ke mode gelap",
@@ -2263,8 +2367,10 @@
     "All settings": "Semua pengaturan",
     "New here? <a>Create an account</a>": "Baru di sini? <a>Buat sebuah akun</a>",
     "Got an account? <a>Sign in</a>": "Punya sebuah akun? <a>Masuk</a>",
-    "Uploading %(filename)s and %(count)s others|one": "Mengunggah %(filename)s dan %(count)s lainnya",
-    "Uploading %(filename)s and %(count)s others|other": "Mengunggah %(filename)s dan %(count)s lainnya",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Mengunggah %(filename)s dan %(count)s lainnya",
+        "other": "Mengunggah %(filename)s dan %(count)s lainnya"
+    },
     "Failed to load timeline position": "Gagal untuk memuat posisi lini masa",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Mencoba memuat titik spesifik di lini masa ruangan ini, tetapi tidak dapat menemukannya.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Mencoba memuat titik spesifik di lini masa ruangan ini, tetapi Anda tidak memiliki izin untuk menampilkan pesannya.",
@@ -2310,8 +2416,10 @@
     "Select a room below first": "Pilih sebuah ruangan di bawah dahulu",
     "This room is suggested as a good one to join": "Ruangan ini disarankan sebagai ruangan yang baik untuk bergabung",
     "You don't have permission": "Anda tidak memiliki izin",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Anda punya %(count)s notifikasi yang belum dibaca dalam versi sebelumnya dari ruangan ini.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Anda punya %(count)s notifikasi yang belum dibaca dalam versi sebelumnya dari ruangan ini.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "Anda punya %(count)s notifikasi yang belum dibaca dalam versi sebelumnya dari ruangan ini.",
+        "other": "Anda punya %(count)s notifikasi yang belum dibaca dalam versi sebelumnya dari ruangan ini."
+    },
     "Drop file here to upload": "Lepaskan file di sini untuk mengunggah",
     "Failed to reject invite": "Gagal untuk menolak undangan",
     "No more results": "Tidak ada hasil lagi",
@@ -2508,8 +2616,10 @@
     "<a>Log in</a> to your new account.": "<a>Masuk</a> ke akun yang baru.",
     "Continue with previous account": "Lanjutkan dengan akun sebelumnya",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Akun Anda yang baru (%(newAccountId)s) telah didaftarkan, tetapi Anda telah masuk ke akun yang lain (%(loggedInUserId)s).",
-    "Upload %(count)s other files|one": "Unggah %(count)s file lainnya",
-    "Upload %(count)s other files|other": "Unggah %(count)s file lainnya",
+    "Upload %(count)s other files": {
+        "one": "Unggah %(count)s file lainnya",
+        "other": "Unggah %(count)s file lainnya"
+    },
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Beberapa file <b>terlalu besar</b> untuk diunggah. Batas ukuran unggahan file adalah %(limit)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "File-file ini <b>terlalu besar</b> untuk diunggah. Batas ukuran unggahan file adalah %(limit)s.",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "File ini <b>terlalu besar</b> untuk diunggah. Batas ukuran unggahan file adalah %(limit)s tetapi file ini %(sizeOfThisFile)s.",
@@ -2564,10 +2674,14 @@
     "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Tentukan space mana yang dapat mengakses ruangan ini. Jika sebuah space dipilih, anggotanya dapat menemukan dan bergabung <RoomName/>.",
     "Select spaces": "Pilih space",
     "You're removing all spaces. Access will default to invite only": "Anda menghilangkan semua space. Akses secara bawaan ke undangan saja",
-    "%(count)s rooms|one": "%(count)s ruangan",
-    "%(count)s rooms|other": "%(count)s ruangan",
-    "%(count)s members|one": "%(count)s anggota",
-    "%(count)s members|other": "%(count)s anggota",
+    "%(count)s rooms": {
+        "one": "%(count)s ruangan",
+        "other": "%(count)s ruangan"
+    },
+    "%(count)s members": {
+        "one": "%(count)s anggota",
+        "other": "%(count)s anggota"
+    },
     "Are you sure you want to sign out?": "Apakah Anda yakin ingin keluar?",
     "You'll lose access to your encrypted messages": "Anda akan kehilangan akses ke pesan terenkripsi Anda",
     "Manually export keys": "Ekspor kunci secara manual",
@@ -2635,12 +2749,18 @@
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifikasi perangkat ini untuk menandainya sebagai terpercaya. Mempercayai perangkat ini akan memberikan Anda dan pengguna lain ketenangan saat menggunakan pesan terenkripsi secara ujung ke ujung.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Memverifikasi pengguna ini akan menandai sesinya sebagai terpercaya, dan juga menandai sesi Anda sebagai terpercaya kepadanya.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifikasi pengguna ini untuk menandainya sebagai terpercaya. Mempercayai pengguna memberikan Anda ketenangan saat menggunakan pesan terenkripsi secara ujung ke ujung.",
-    "Based on %(count)s votes|one": "Berdasarkan oleh %(count)s suara",
-    "Based on %(count)s votes|other": "Berdasarkan oleh %(count)s suara",
-    "%(count)s votes|one": "%(count)s suara",
-    "%(count)s votes|other": "%(count)s suara",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s dan %(count)s lainnya",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s dan %(count)s lainnya",
+    "Based on %(count)s votes": {
+        "one": "Berdasarkan oleh %(count)s suara",
+        "other": "Berdasarkan oleh %(count)s suara"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s suara",
+        "other": "%(count)s suara"
+    },
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s dan %(count)s lainnya",
+        "other": "%(spaceName)s dan %(count)s lainnya"
+    },
     "Jump to room search": "Pergi ke pencarian ruangan",
     "Search (must be enabled)": "Cari (harus diaktifkan)",
     "Upload a file": "Unggah sebuah file",
@@ -2721,8 +2841,10 @@
     "Invite to space": "Undang ke space",
     "Start new chat": "Mulai obrolan baru",
     "Recently viewed": "Baru saja dilihat",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s suara. Vote untuk melihat hasilnya",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s suara. Vote untuk melihat hasilnya",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s suara. Vote untuk melihat hasilnya",
+        "other": "%(count)s suara. Vote untuk melihat hasilnya"
+    },
     "No votes cast": "Tidak ada suara",
     "To view all keyboard shortcuts, <a>click here</a>.": "Untuk melihat semua shortcut keyboard, <a>klik di sini</a>.",
     "You can turn this off anytime in settings": "Anda dapat mematikannya kapan saja di pengaturan",
@@ -2747,8 +2869,10 @@
     "Failed to end poll": "Gagal untuk mengakhiri poll",
     "The poll has ended. Top answer: %(topAnswer)s": "Poll telah berakhir. Jawaban teratas: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "Poll telah berakhir. Tidak ada yang memberi suara.",
-    "Final result based on %(count)s votes|other": "Hasil akhir bedasarkan dari %(count)s suara",
-    "Final result based on %(count)s votes|one": "Hasil akhir bedasarkan dari %(count)s suara",
+    "Final result based on %(count)s votes": {
+        "other": "Hasil akhir bedasarkan dari %(count)s suara",
+        "one": "Hasil akhir bedasarkan dari %(count)s suara"
+    },
     "Link to room": "Tautan ke ruangan",
     "Recent searches": "Pencarian terkini",
     "To search messages, look for this icon at the top of a room <icon/>": "Untuk mencari pesan-pesan, lihat ikon ini di atas ruangan <icon/>",
@@ -2760,16 +2884,24 @@
     "Including you, %(commaSeparatedMembers)s": "Termasuk Anda, %(commaSeparatedMembers)s",
     "Copy room link": "Salin tautan ruangan",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Kami tidak dapat mengerti tanggal yang dicantumkan (%(inputDate)s). Coba menggunakan format TTTT-BB-HH.",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Telah mengekspor %(count)s peristiwa dalam %(seconds)s detik",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Telah mengekspor %(count)s peristiwa dalam %(seconds)s detik",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Telah mengekspor %(count)s peristiwa dalam %(seconds)s detik",
+        "other": "Telah mengekspor %(count)s peristiwa dalam %(seconds)s detik"
+    },
     "Export successful!": "Pengeksporan berhasil!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Telah mendapatkan %(count)s peristiwa dalam %(seconds)sd",
-    "Fetched %(count)s events in %(seconds)ss|other": "Telah mendapatkan %(count)s peristiwa dalam %(seconds)sd",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Telah mendapatkan %(count)s peristiwa dalam %(seconds)sd",
+        "other": "Telah mendapatkan %(count)s peristiwa dalam %(seconds)sd"
+    },
     "Processing event %(number)s out of %(total)s": "Memproses peristiwa %(number)s dari %(total)s peristiwa",
-    "Fetched %(count)s events so far|one": "Telah mendapatkan %(count)s peristiwa sejauh ini",
-    "Fetched %(count)s events so far|other": "Telah mendapatkan %(count)s peristiwa sejauh ini",
-    "Fetched %(count)s events out of %(total)s|one": "Mendapatkan %(count)s peristiwa dari %(total)s peristiwa",
-    "Fetched %(count)s events out of %(total)s|other": "Mendapatkan %(count)s peristiwa dari %(total)s peristiwa",
+    "Fetched %(count)s events so far": {
+        "one": "Telah mendapatkan %(count)s peristiwa sejauh ini",
+        "other": "Telah mendapatkan %(count)s peristiwa sejauh ini"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Mendapatkan %(count)s peristiwa dari %(total)s peristiwa",
+        "other": "Mendapatkan %(count)s peristiwa dari %(total)s peristiwa"
+    },
     "Generating a ZIP": "Membuat sebuah ZIP",
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Ini mengelompokkan obrolan Anda dengan anggota space ini. Menonaktifkan ini akan menyembunyikan obrolan dari tampilan %(spaceName)s Anda.",
     "Sections to show": "Bagian untuk ditampilkan",
@@ -2821,10 +2953,14 @@
     "You were removed from %(roomName)s by %(memberName)s": "Anda telah dikeluarkan dari %(roomName)s oleh %(memberName)s",
     "%(senderName)s removed %(targetName)s": "%(senderName)s mengeluarkan %(targetName)s",
     "%(senderName)s removed %(targetName)s: %(reason)s": "%(senderName)s mengeluarkan %(targetName)s: %(reason)s",
-    "was removed %(count)s times|one": "dikeluarkan",
-    "was removed %(count)s times|other": "dikeluarkan %(count)s kali",
-    "were removed %(count)s times|one": "dikeluarkan",
-    "were removed %(count)s times|other": "dikeluarkan %(count)s kali",
+    "was removed %(count)s times": {
+        "one": "dikeluarkan",
+        "other": "dikeluarkan %(count)s kali"
+    },
+    "were removed %(count)s times": {
+        "one": "dikeluarkan",
+        "other": "dikeluarkan %(count)s kali"
+    },
     "Remove from room": "Keluarkan dari ruangan",
     "Failed to remove user": "Gagal untuk mengeluarkan pengguna",
     "Remove them from specific things I'm able to": "Keluarkan dari hal-hal spesifik yang saya bisa",
@@ -2900,18 +3036,28 @@
     "Feedback sent! Thanks, we appreciate it!": "Masukan terkirim! Terima kasih, kami mengapresiasinya!",
     "Maximise": "Maksimalkan",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Terima kasih untuk mencoba beta, silakan jelaskan secara detail sebanyaknya supaya kami dapat membuatnya lebih baik.",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s menghapus %(count)s pesan",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s menghapus sebuah pesan",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s menghapus %(count)s pesan",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s menghapus sebuah pesan",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s mengirim %(count)s pesan tersembunyi",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s mengirim sebuah pesan tersembunyi",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s sent %(count)s hidden messages",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s mengirim sebuah pesan tersembunyi",
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "other": "%(severalUsers)s menghapus %(count)s pesan",
+        "one": "%(severalUsers)s menghapus sebuah pesan"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)s menghapus %(count)s pesan",
+        "one": "%(oneUser)s menghapus sebuah pesan"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "other": "%(severalUsers)s mengirim %(count)s pesan tersembunyi",
+        "one": "%(severalUsers)s mengirim sebuah pesan tersembunyi"
+    },
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "other": "%(oneUser)s sent %(count)s hidden messages",
+        "one": "%(oneUser)s mengirim sebuah pesan tersembunyi"
+    },
     "Automatically send debug logs when key backup is not functioning": "Kirim catatan pengawakutu secara otomatis ketika pencadangan kunci tidak berfungsi",
     "<empty string>": "<string kosong>",
-    "<%(count)s spaces>|one": "<space>",
-    "<%(count)s spaces>|other": "<%(count)s space>",
+    "<%(count)s spaces>": {
+        "one": "<space>",
+        "other": "<%(count)s space>"
+    },
     "Edit poll": "Edit pungutan suara",
     "Sorry, you can't edit a poll after votes have been cast.": "Maaf, Anda tidak dapat mengedit sebuah poll setelah suara-suara diberikan.",
     "Can't edit poll": "Tidak dapat mengedit poll",
@@ -2942,10 +3088,14 @@
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Balas ke utasan yang sedang terjadi atau gunakan “%(replyInThread)s” ketika kursor diletakkan pada pesan untuk memulai yang baru.",
     "Insert a trailing colon after user mentions at the start of a message": "Tambahkan sebuah karakter titik dua sesudah sebutan pengguna dari awal pesan",
     "Show polls button": "Tampilkan tombol pemungutan suara",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s mengubah <a>pesan-pesan yang disematkan</a> di ruangan ini",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)smengubah <a>pesan-pesan yang dipasangi pin</a> untuk ruangan ini %(count)s kali",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s mengubah <a>pesan-pesan yang disematkan</a> di ruangan ini",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)smengubah <a>pesan-pesan yang dipasangi pin</a> untuk ruangan ini %(count)s kali",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s mengubah <a>pesan-pesan yang disematkan</a> di ruangan ini",
+        "other": "%(oneUser)smengubah <a>pesan-pesan yang dipasangi pin</a> untuk ruangan ini %(count)s kali"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s mengubah <a>pesan-pesan yang disematkan</a> di ruangan ini",
+        "other": "%(severalUsers)smengubah <a>pesan-pesan yang dipasangi pin</a> untuk ruangan ini %(count)s kali"
+    },
     "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Space adalah cara yang baru untuk mengelompokkan ruangan dan orang. Space apa yang Anda ingin buat? Ini dapat diubah nanti.",
     "Click": "Klik",
     "Expand quotes": "Buka kutip",
@@ -2967,10 +3117,14 @@
     "%(displayName)s's live location": "Lokasi langsung %(displayName)s",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Jangan centang jika Anda juga ingin menghapus pesan-pesan sistem pada pengguna ini (mis. perubahan keanggotaan, perubahan profil…)",
     "Preserve system messages": "Simpan pesan-pesan sistem",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Anda akan menghapus %(count)s pesan dari %(user)s. Ini akan dihapus secara permanen untuk semua dalam obrolan. Apakah Anda ingin lanjut?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Anda akan menghapus %(count)s pesan dari %(user)s. Ini akan dihapus secara permanen untuk semua dalam obrolan. Apakah Anda ingin lanjut?",
-    "Currently removing messages in %(count)s rooms|one": "Saat ini menghapus pesan-pesan di %(count)s ruangan",
-    "Currently removing messages in %(count)s rooms|other": "Saat ini menghapus pesan-pesan di %(count)s ruangan",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Anda akan menghapus %(count)s pesan dari %(user)s. Ini akan dihapus secara permanen untuk semua dalam obrolan. Apakah Anda ingin lanjut?",
+        "other": "Anda akan menghapus %(count)s pesan dari %(user)s. Ini akan dihapus secara permanen untuk semua dalam obrolan. Apakah Anda ingin lanjut?"
+    },
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Saat ini menghapus pesan-pesan di %(count)s ruangan",
+        "other": "Saat ini menghapus pesan-pesan di %(count)s ruangan"
+    },
     "Share for %(duration)s": "Bagikan selama %(duration)s",
     "%(value)ss": "%(value)sd",
     "%(value)sm": "%(value)sm",
@@ -3056,16 +3210,20 @@
     "Create room": "Buat ruangan",
     "Create video room": "Buat ruangan video",
     "Create a video room": "Buat sebuah ruangan video",
-    "%(count)s participants|one": "1 perserta",
-    "%(count)s participants|other": "%(count)s perserta",
+    "%(count)s participants": {
+        "one": "1 perserta",
+        "other": "%(count)s perserta"
+    },
     "New video room": "Ruangan video baru",
     "New room": "Ruangan baru",
     "Threads help keep your conversations on-topic and easy to track.": "Utasan membantu membuat obrolan sesuai topik dan mudah untuk dilacak.",
     "%(featureName)s Beta feedback": "Masukan %(featureName)s Beta",
     "sends hearts": "mengirim hati",
     "Sends the given message with hearts": "Kirim pesan dengan hati",
-    "Confirm signing out these devices|one": "Konfirmasi mengeluarkan perangkat ini",
-    "Confirm signing out these devices|other": "Konfirmasi mengeluarkan perangkat ini",
+    "Confirm signing out these devices": {
+        "one": "Konfirmasi mengeluarkan perangkat ini",
+        "other": "Konfirmasi mengeluarkan perangkat ini"
+    },
     "Live location ended": "Lokasi langsung berakhir",
     "View live location": "Tampilkan lokasi langsung",
     "Live location enabled": "Lokasi langsung diaktifkan",
@@ -3104,8 +3262,10 @@
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Anda telah dikeluarkan dari semua perangkat Anda dan tidak akan dapat notifikasi. Untuk mengaktifkan ulang notifikasi, masuk ulang pada setiap perangkat.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Jika Anda ingin mengakses riwayat obrolan di ruangan terenkripsi Anda, siapkan Cadangan Kunci atau ekspor kunci-kunci pesan Anda dari salah satu perangkat Anda yang lain sebelum melanjutkan.",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Mengeluarkan perangkat Anda akan menghapus kunci enkripsi pesan pada perangkat, dan membuat riwayat obrolan terenkripsi tidak dapat dibaca.",
-    "Seen by %(count)s people|one": "Dilihat oleh %(count)s orang",
-    "Seen by %(count)s people|other": "Dilihat oleh %(count)s orang",
+    "Seen by %(count)s people": {
+        "one": "Dilihat oleh %(count)s orang",
+        "other": "Dilihat oleh %(count)s orang"
+    },
     "Your password was successfully changed.": "Kata sandi Anda berhasil diubah.",
     "An error occurred while stopping your live location": "Sebuah kesalahan terjadi saat menghentikan lokasi langsung Anda",
     "Enable live location sharing": "Aktifkan pembagian lokasi langsung",
@@ -3134,8 +3294,10 @@
     "Unread email icon": "Ikon email belum dibaca",
     "Check your email to continue": "Periksa email Anda untuk melanjutkan",
     "Joining…": "Bergabung…",
-    "%(count)s people joined|one": "%(count)s orang bergabung",
-    "%(count)s people joined|other": "%(count)s orang bergabung",
+    "%(count)s people joined": {
+        "one": "%(count)s orang bergabung",
+        "other": "%(count)s orang bergabung"
+    },
     "Check if you want to hide all current and future messages from this user.": "Periksa jika Anda ingin menyembunyikan semua pesan saat ini dan pesan baru dari pengguna ini.",
     "Ignore user": "Abaikan pengguna",
     "View related event": "Tampilkan peristiwa terkait",
@@ -3169,8 +3331,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Jika Anda tidak dapat menemukan siapa yang Anda mencari, kirimkan tautan undangan Anda.",
     "Some results may be hidden for privacy": "Beberapa hasil mungkin disembunyikan untuk privasi",
     "Search for": "Cari",
-    "%(count)s Members|one": "%(count)s Anggota",
-    "%(count)s Members|other": "%(count)s Anggota",
+    "%(count)s Members": {
+        "one": "%(count)s Anggota",
+        "other": "%(count)s Anggota"
+    },
     "Show: Matrix rooms": "Tampilkan: ruangan Matrix",
     "Show: %(instance)s rooms (%(server)s)": "Tampilkan: %(instance)s ruangan (%(server)s)",
     "Add new server…": "Tambahkan server baru…",
@@ -3189,9 +3353,11 @@
     "Enter fullscreen": "Masuki layar penuh",
     "Map feedback": "Masukan peta",
     "Toggle attribution": "Alih atribusi",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Dalam %(spaceName)s dan %(count)s space lainnya.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Dalam %(spaceName)s dan %(count)s space lainnya.",
+        "other": "Dalam %(spaceName)s dan %(count)s space lainnya."
+    },
     "In %(spaceName)s.": "Dalam space %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Dalam %(spaceName)s dan %(count)s space lainnya.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Dalam space %(space1Name)s dan %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Perintah pengembang: Membuang sesi grup keluar saat ini dan menyiapkan sesi Olm baru",
     "Stop and close": "Berhenti dan tutup",
@@ -3225,8 +3391,10 @@
     "Share your activity and status with others.": "Bagikan aktivitas dan status Anda dengan orang lain.",
     "Presence": "Presensi",
     "You did it!": "Anda berhasil!",
-    "Only %(count)s steps to go|one": "Hanya %(count)s langkah lagi untuk dilalui",
-    "Only %(count)s steps to go|other": "Hanya %(count)s langkah lagi untuk dilalui",
+    "Only %(count)s steps to go": {
+        "one": "Hanya %(count)s langkah lagi untuk dilalui",
+        "other": "Hanya %(count)s langkah lagi untuk dilalui"
+    },
     "Find your people": "Temukan orang-orang Anda",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Tetap miliki kemilikan dan kendali atas diskusi komunitas.\nBesar untuk mendukung jutaan anggota, dengan moderasi dan interoperabilitas berdaya.",
     "Community ownership": "Kemilikan komunitas",
@@ -3291,10 +3459,14 @@
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Menambahkan enkripsi pada ruangan publik tidak disarankan.</b> Siapa pun dapat menemukan dan bergabung dengan ruangan publik, supaya siapa pun dapat membaca pesan di ruangan. Anda tidak akan mendapatkan manfaat dari enkripsi, dan Anda tidak akan dapat menonaktifkan nanti. Mengenkripsi pesan di ruangan publik akan membuat penerimaan dan pengiriman pesan lebih lambat.",
     "Don’t miss a thing by taking %(brand)s with you": "Jangan lewatkan hal-hal dengan membawa %(brand)s dengan Anda",
     "Empty room (was %(oldName)s)": "Ruangan kosong (sebelumnya %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Mengundang %(user)s dan 1 lainnya",
-    "Inviting %(user)s and %(count)s others|other": "Mengundang %(user)s dan %(count)s lainnya",
-    "%(user)s and %(count)s others|one": "%(user)s dan 1 lainnya",
-    "%(user)s and %(count)s others|other": "%(user)s dan %(count)s lainnya",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Mengundang %(user)s dan 1 lainnya",
+        "other": "Mengundang %(user)s dan %(count)s lainnya"
+    },
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s dan 1 lainnya",
+        "other": "%(user)s dan %(count)s lainnya"
+    },
     "%(user1)s and %(user2)s": "%(user1)s dan %(user2)s",
     "Show": "Tampilkan",
     "%(downloadButton)s or %(copyButton)s": "-%(downloadButton)s atau %(copyButton)s",
@@ -3392,8 +3564,10 @@
     "You don't have the required permissions to start a voice broadcast in this room. Contact a room administrator to upgrade your permissions.": "Anda tidak memiliki izin untuk memulai sebuah siaran suara di ruangan ini. Hubungi sebuah administrator ruangan untuk meningkatkan izin Anda.",
     "You are already recording a voice broadcast. Please end your current voice broadcast to start a new one.": "Anda saat ini merekam sebuah siaran suara. Mohon akhiri siaran suara Anda saat ini untuk memulai yang baru.",
     "Can't start a new voice broadcast": "Tidak dapat memulai sebuah siaran suara baru",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Apakah Anda yakin untuk mengeluarkan %(count)s sesi?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Apakah Anda yakin untuk mengeluarkan %(count)s sesi?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Apakah Anda yakin untuk mengeluarkan %(count)s sesi?",
+        "other": "Apakah Anda yakin untuk mengeluarkan %(count)s sesi?"
+    },
     "Removing inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.": "Mengeluarkan sesi yang tidak aktif meningkatkan keamanan dan performa, dan membuatnya lebih mudah untuk Anda untuk mengenal jika sebuah sesi baru itu mencurigakan.",
     "Inactive sessions are sessions you have not used in some time, but they continue to receive encryption keys.": "Sesi tidak aktif adalah sesi yang Anda belum gunakan dalam beberapa waktu, tetapi mereka masih mendapatkan kunci enkripsi.",
     "Consider signing out from old sessions (%(inactiveAgeDays)s days or older) you don't use anymore.": "Pertimbangkan untuk mengeluarkan sesi lama (%(inactiveAgeDays)s hari atau lebih) yang Anda tidak gunakan lagi.",
@@ -3489,8 +3663,10 @@
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Anda tidak dapat memulai sebuah panggilan karena Anda saat ini merekam sebuah siaran langsung. Mohon akhiri siaran langsung Anda untuk memulai sebuah panggilan.",
     "Can’t start a call": "Tidak dapat memulai panggilan",
     "Improve your account security by following these recommendations.": "Tingkatkan keamanan akun Anda dengan mengikuti saran berikut.",
-    "%(count)s sessions selected|one": "%(count)s sesi dipilih",
-    "%(count)s sessions selected|other": "%(count)s sesi dipilih",
+    "%(count)s sessions selected": {
+        "one": "%(count)s sesi dipilih",
+        "other": "%(count)s sesi dipilih"
+    },
     "Failed to read events": "Gagal membaca peristiwa",
     "Failed to send event": "Gagal mengirimkan peristiwa",
     " in <strong>%(room)s</strong>": " di <strong>%(room)s</strong>",
@@ -3501,8 +3677,10 @@
     "Create a link": "Buat sebuah tautan",
     "Link": "Tautan",
     "Force 15s voice broadcast chunk length": "Paksakan panjang bagian siaran suara 15d",
-    "Sign out of %(count)s sessions|one": "Keluar dari %(count)s sesi",
-    "Sign out of %(count)s sessions|other": "Keluar dari %(count)s sesi",
+    "Sign out of %(count)s sessions": {
+        "one": "Keluar dari %(count)s sesi",
+        "other": "Keluar dari %(count)s sesi"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Keluar dari semua sesi lain (%(otherSessionsCount)s)",
     "Yes, end my recording": "Ya, hentikan rekaman saya",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "Jika Anda mendengarkan siaran langsung ini, rekaman siaran langsung Anda saat ini akan dihentikan.",
@@ -3603,7 +3781,9 @@
     "Your keys are now being backed up from this device.": "Kunci Anda sekarang dicadangkan dari perangkat ini.",
     "Loading polls": "Memuat pemungutan suara",
     "Room unread status: <strong>%(status)s</strong>": "Keadaan belum dibaca ruangan: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Keadaan belum dibaca ruangan: <strong>%(status)s</strong>, jumlah: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Keadaan belum dibaca ruangan: <strong>%(status)s</strong>, jumlah: <strong>%(count)s</strong>"
+    },
     "Ended a poll": "Mengakhiri sebuah pemungutan suara",
     "Due to decryption errors, some votes may not be counted": "Karena kesalahan pendekripsian, beberapa suara tidak dihitung",
     "The sender has blocked you from receiving this message": "Pengirim telah memblokir Anda supaya tidak menerima pesan ini",
@@ -3619,10 +3799,14 @@
     "If you know a room address, try joining through that instead.": "Jika Anda tahu sebuah alamat ruangan, coba bergabung melalui itu saja.",
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "Anda mencoba untuk bergabung menggunakan sebuah ID ruangan tanpa menyediakan daftar server untuk bergabung melalui server. ID ruangan adalah pengenal internal dan tidak dapat digunakan untuk bergabung dengan sebuah ruangan tanpa informasi tambahan.",
     "View poll": "Tampilkan pemungutan suara",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Tidak ada pemungutan suara untuk hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Tidak ada pemungutan suara untuk %(count)s hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Tidak ada pemungutan suara untuk hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Tidak ada pemungutan suara yang aktif %(count)s hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Tidak ada pemungutan suara untuk hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
+        "other": "Tidak ada pemungutan suara untuk %(count)s hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Tidak ada pemungutan suara untuk hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
+        "other": "Tidak ada pemungutan suara yang aktif %(count)s hari terakhir. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Tidak ada pemungutan suara sebelumnya. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
     "There are no active polls. Load more polls to view polls for previous months": "Tidak ada pemungutan suara yang aktif. Muat lebih banyak pemungutan suara untuk melihat pemungutan suara untuk bulan-bulan terakhir",
     "Load more polls": "Muat lebih banyak pemungutan suara",
@@ -3738,8 +3922,14 @@
     "Notify when someone mentions using @displayname or %(mxid)s": "Beri tahu ketika seseorang memberi tahu menggunakan @namatampilan atau %(mxid)s",
     "Unable to find user by email": "Tidak dapat mencari pengguna dengan surel",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Pesan-pesan di ruangan ini dienkripsi secara ujung ke ujung. Ketika orang-orang bergabung, Anda dapat memverifikasi mereka di profil mereka dengan mengetuk pada foto profil mereka.",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)smengubah foto profil mereka %(count)s kali",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)smengubah foto profilnya %(count)s kali",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)smengubah foto profil mereka %(count)s kali",
+        "one": "%(severalUsers)smengubah foto profil mereka"
+    },
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)smengubah foto profilnya %(count)s kali",
+        "one": "%(oneUser)smengubah foto profilnya"
+    },
     "Anyone can request to join, but admins or moderators need to grant access. You can change this later.": "Siapa pun dapat meminta untuk bergabung, tetapi admin atau administrator perlu memberikan akses. Anda dapat mengubah ini nanti.",
     "Upgrade room": "Tingkatkan ruangan",
     "User read up to (ignoreSynthetic): ": "Pengguna membaca sampai (ignoreSynthetic): ",
@@ -3772,8 +3962,6 @@
     "Request access": "Minta akses",
     "Your request to join is pending.": "Permintaan Anda untuk bergabung sedang ditunda.",
     "Cancel request": "Batalkan permintaan",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)smengubah foto profil mereka",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)smengubah foto profilnya",
     "You need an invite to access this room.": "Anda memerlukan undangan untuk mengakses ruangan ini.",
     "Failed to cancel": "Gagal membatalkan",
     "You need to be granted access to this room in order to view or participate in the conversation. You can send a request to join below.": "Anda memerlukan akses untuk mengakses ruangan ini supaya dapat melihat atau berpartisipasi dalam percakapan. Anda dapat mengirimkan permintaan untuk bergabung di bawah.",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 4d3cc90d4e..63f8bb2fac 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -255,9 +255,17 @@
     "Delete Widget": "Eyða viðmótshluta",
     "Delete widget": "Eyða viðmótshluta",
     "Create new room": "Búa til nýja spjallrás",
-    "were invited %(count)s times|one": "var boðið",
-    "was invited %(count)s times|one": "var boðið",
-    "And %(count)s more...|other": "Og %(count)s til viðbótar...",
+    "were invited %(count)s times": {
+        "one": "var boðið",
+        "other": "var boðið %(count)s sinnum"
+    },
+    "was invited %(count)s times": {
+        "one": "var boðið",
+        "other": "var boðið %(count)s sinnum"
+    },
+    "And %(count)s more...": {
+        "other": "Og %(count)s til viðbótar..."
+    },
     "Event sent!": "Atburður sendur!",
     "State Key": "Stöðulykill",
     "Clear Storage and Sign Out": "Hreinsa gagnageymslu og skrá út",
@@ -271,9 +279,11 @@
     "No more results": "Ekki fleiri niðurstöður",
     "Failed to reject invite": "Mistókst að hafna boði",
     "Failed to load timeline position": "Mistókst að hlaða inn staðsetningu á tímalínu",
-    "Uploading %(filename)s and %(count)s others|other": "Sendi inn %(filename)s og %(count)s til viðbótar",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Sendi inn %(filename)s og %(count)s til viðbótar",
+        "one": "Sendi inn %(filename)s og %(count)s til viðbótar"
+    },
     "Uploading %(filename)s": "Sendi inn %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Sendi inn %(filename)s og %(count)s til viðbótar",
     "Unable to remove contact information": "Ekki tókst að fjarlægja upplýsingar um tengilið",
     "<not supported>": "<ekki stutt>",
     "No Microphones detected": "Engir hljóðnemar fundust",
@@ -406,8 +416,10 @@
     "Share Link to User": "Deila Hlekk að Notanda",
     "You have verified this user. This user has verified all of their sessions.": "Þú hefur sannreynt þennan notanda. Þessi notandi hefur sannreynt öll tæki þeirra.",
     "This user has not verified all of their sessions.": "Þessi notandi hefur ekki sannreynt öll tæki þeirra.",
-    "%(count)s verified sessions|one": "1 sannreynd seta",
-    "%(count)s verified sessions|other": "%(count)s sannreyndar setur",
+    "%(count)s verified sessions": {
+        "one": "1 sannreynd seta",
+        "other": "%(count)s sannreyndar setur"
+    },
     "Hide verified sessions": "Fela sannreyndar setur",
     "Remove recent messages": "Fjarlægja nýleg skilaboð",
     "Remove recent messages by %(user)s": "Fjarlægja nýleg skilaboð frá %(user)s",
@@ -499,10 +511,22 @@
     "Next": "Næsta",
     "Legal": "Lagalegir fyrirvarar",
     "Demote": "Leggja til baka",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sfór út",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sfóru út",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sskráði sig",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sskráðu sig",
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)sfór út",
+        "other": "%(oneUser)sfór út %(count)s sinnum"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)sfóru út",
+        "other": "%(severalUsers)sfóru út %(count)s sinnum"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)sskráði sig",
+        "other": "%(oneUser)shefur skráð sig %(count)s sinnum"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)sskráðu sig",
+        "other": "%(severalUsers)shafa skráð sig %(count)s sinnum"
+    },
     "Stickerpack": "Límmerkjapakki",
     "Replying": "Svara",
     "%(duration)sd": "%(duration)sd",
@@ -523,8 +547,10 @@
     "Unable to access microphone": "Mistókst að ná aðgangi að hljóðnema",
     "Search for rooms": "Leita að spjallrásum",
     "Create a new room": "Búa til nýja spjallrás",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Bæti við spjallrás ...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Bæti við spjallrásum... (%(progress)s af %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Bæti við spjallrás ...",
+        "other": "Bæti við spjallrásum... (%(progress)s af %(count)s)"
+    },
     "Role in <RoomName/>": "Hlutverk í <RoomName/>",
     "Forget Room": "Gleyma spjallrás",
     "Spaces": "Svæði",
@@ -835,7 +861,10 @@
     "Sets the room name": "Stillir heiti spjallrásar",
     "Effects": "Brellur",
     "Setting up keys": "Set upp dulritunarlykla",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s og %(count)s til viðbótar",
+    "%(spaceName)s and %(count)s others": {
+        "other": "%(spaceName)s og %(count)s til viðbótar",
+        "one": "%(spaceName)s og %(count)s til viðbótar"
+    },
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s og %(space2Name)s",
     "Custom (%(level)s)": "Sérsniðið (%(level)s)",
     "Sign In or Create Account": "Skráðu þig inn eða búðu til aðgang",
@@ -955,8 +984,10 @@
     "Send report": "Senda kæru",
     "Email (optional)": "Tölvupóstfang (valfrjálst)",
     "Session name": "Nafn á setu",
-    "%(count)s rooms|one": "%(count)s spjallrás",
-    "%(count)s rooms|other": "%(count)s spjallrásir",
+    "%(count)s rooms": {
+        "one": "%(count)s spjallrás",
+        "other": "%(count)s spjallrásir"
+    },
     "Are you sure you want to sign out?": "Ertu viss um að þú viljir skrá þig út?",
     "Leave space": "Yfirgefa svæði",
     "Leave %(spaceName)s": "Yfirgefa %(spaceName)s",
@@ -982,8 +1013,10 @@
     "Edit setting": "Breyta stillingu",
     "Value": "Gildi",
     "<empty string>": "<auður strengur>",
-    "<%(count)s spaces>|one": "<svæði>",
-    "<%(count)s spaces>|other": "<%(count)s svæði>",
+    "<%(count)s spaces>": {
+        "one": "<svæði>",
+        "other": "<%(count)s svæði>"
+    },
     "Public space": "Opinbert svæði",
     "Private space (invite only)": "Einkasvæði (einungis gegn boði)",
     "Public room": "Almenningsspjallrás",
@@ -1011,8 +1044,10 @@
     "Share location": "Deila staðsetningu",
     "Location": "Staðsetning",
     "Show all": "Sýna allt",
-    "%(count)s votes|one": "%(count)s atkvæði",
-    "%(count)s votes|other": "%(count)s atkvæði",
+    "%(count)s votes": {
+        "one": "%(count)s atkvæði",
+        "other": "%(count)s atkvæði"
+    },
     "Zoom out": "Renna frá",
     "Zoom in": "Renna að",
     "Image": "Mynd",
@@ -1044,7 +1079,10 @@
     "No microphone found": "Enginn hljóðnemi fannst",
     "Mark all as read": "Merkja allt sem lesið",
     "Unread messages.": "Ólesin skilaboð.",
-    "%(count)s unread messages.|one": "1 ólesin skilaboð.",
+    "%(count)s unread messages.": {
+        "one": "1 ólesin skilaboð.",
+        "other": "%(count)s ólesin skilaboð."
+    },
     "Copy room link": "Afrita tengil spjallrásar",
     "A-Z": "A-Ö",
     "Activity": "Virkni",
@@ -1104,7 +1142,10 @@
     "Global": "Víðvært",
     "Keyword": "Stikkorð",
     "Modern": "Nútímalegt",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Uppfæri svæði...",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Uppfæri svæði...",
+        "other": "Uppfæri svæði... (%(progress)s af %(count)s)"
+    },
     "Space members": "Meðlimir svæðis",
     "Upgrade required": "Uppfærsla er nauðsynleg",
     "Large": "Stórt",
@@ -1203,11 +1244,12 @@
     "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s samþykkti boð um að taka þátt í %(displayName)s",
     "Are you sure you want to cancel entering passphrase?": "Viltu örugglega hætta við að setja inn lykilfrasa?",
     "Cancel entering passphrase?": "Hætta við að setja inn lykilfrasa?",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s og %(count)s til viðbótar",
     "Connectivity to the server has been lost": "Tenging við vefþjón hefur rofnað",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s eru að skrifa…… …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s og einn til viðbótar eru að skrifa……",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s til viðbótar eru að skrifa……",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s og einn til viðbótar eru að skrifa……",
+        "other": "%(names)s og %(count)s til viðbótar eru að skrifa……"
+    },
     "%(senderName)s has ended a poll": "%(senderName)s hefur lokið könnun",
     "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)s hefur sett í gang könnun - %(pollQuestion)s",
     "%(senderName)s has shared their location": "%(senderName)s hefur deilt staðsetningu sinni",
@@ -1353,19 +1395,27 @@
     "Don't miss a reply": "Ekki missa af svari",
     "Review to ensure your account is safe": "Yfirfarðu þetta til að tryggja að aðgangurinn þinn sé öruggur",
     "Help improve %(analyticsOwner)s": "Hjálpaðu okkur að bæta %(analyticsOwner)s",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Flutti út %(count)s atburð á %(seconds)ssek",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Flutti út %(count)s atburði á %(seconds)ssek",
-    "Fetched %(count)s events in %(seconds)ss|one": "Hef náð í %(count)s atburð á %(seconds)ssek",
-    "Fetched %(count)s events in %(seconds)ss|other": "Hef náð í %(count)s atburði á %(seconds)ssek",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Flutti út %(count)s atburð á %(seconds)ssek",
+        "other": "Flutti út %(count)s atburði á %(seconds)ssek"
+    },
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Hef náð í %(count)s atburð á %(seconds)ssek",
+        "other": "Hef náð í %(count)s atburði á %(seconds)ssek"
+    },
     "Processing event %(number)s out of %(total)s": "Vinn með atburð %(number)s af %(total)s",
     "Error fetching file": "Villa við að sækja skrá",
     "%(creatorName)s created this room.": "%(creatorName)s bjó til þessa spjallrás.",
     "Media omitted - file size limit exceeded": "Myndefni sleppt - skráastærð fer fram úr hámarki",
     "Media omitted": "Myndefni sleppt",
-    "Fetched %(count)s events so far|one": "Hef náð í %(count)s atburð að svo komnu",
-    "Fetched %(count)s events so far|other": "Hef náð í %(count)s atburði að svo komnu",
-    "Fetched %(count)s events out of %(total)s|one": "Hef náð í %(count)s atburð af %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Hef náð í %(count)s atburði af %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Hef náð í %(count)s atburð að svo komnu",
+        "other": "Hef náð í %(count)s atburði að svo komnu"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Hef náð í %(count)s atburð af %(total)s",
+        "other": "Hef náð í %(count)s atburði af %(total)s"
+    },
     "Specify a number of messages": "Skilgreindu fjölda skilaboða",
     "Generating a ZIP": "Útbý ZIP-safnskrá",
     "Are you sure you want to exit during this export?": "Ertu viss um að þú viljir hætta á meðan þessum útflutningi stendur?",
@@ -1391,8 +1441,10 @@
     "about a minute ago": "fyrir um það bil mínútu síðan",
     "a few seconds ago": "fyrir örfáum sekúndum síðan",
     "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
-    "%(items)s and %(count)s others|one": "%(items)s og einn til viðbótar",
-    "%(items)s and %(count)s others|other": "%(items)s og %(count)s til viðbótar",
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s og einn til viðbótar",
+        "other": "%(items)s og %(count)s til viðbótar"
+    },
     "No homeserver URL provided": "Engin slóð heimaþjóns tilgreind",
     "Cannot reach identity server": "Næ ekki sambandi við auðkennisþjón",
     "Send a sticker": "Senda límmerki",
@@ -1420,10 +1472,14 @@
     "Edit poll": "Breyta könnun",
     "Create Poll": "Búa til könnun",
     "Create poll": "Búa til könnun",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbreytti nafni sínu",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sbreytti nafni sínu %(count)s sinnum",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbreyttu nafni sínu",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbreyttu nafni sínu %(count)s sinnum",
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)sbreytti nafni sínu",
+        "other": "%(oneUser)sbreytti nafni sínu %(count)s sinnum"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)sbreyttu nafni sínu",
+        "other": "%(severalUsers)sbreyttu nafni sínu %(count)s sinnum"
+    },
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "Share content": "Deila efni",
     "Share entire screen": "Deila öllum skjánum",
@@ -1448,8 +1504,10 @@
     "Start new chat": "Hefja nýtt spjall",
     "Show Widgets": "Sýna viðmótshluta",
     "Hide Widgets": "Fela viðmótshluta",
-    "(~%(count)s results)|one": "(~%(count)s niðurstaða)",
-    "(~%(count)s results)|other": "(~%(count)s niðurstöður)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s niðurstaða)",
+        "other": "(~%(count)s niðurstöður)"
+    },
     "No recently visited rooms": "Engar nýlega skoðaðar spjallrásir",
     "Recently visited rooms": "Nýlega skoðaðar spjallrásir",
     "Room %(name)s": "Spjallrás %(name)s",
@@ -1461,8 +1519,10 @@
     "Send voice message": "Senda talskilaboð",
     "%(seconds)ss left": "%(seconds)ssek eftir",
     "Invite to this space": "Bjóða inn á þetta svæði",
-    "and %(count)s others...|one": "og einn í viðbót...",
-    "and %(count)s others...|other": "og %(count)s til viðbótar...",
+    "and %(count)s others...": {
+        "one": "og einn í viðbót...",
+        "other": "og %(count)s til viðbótar..."
+    },
     "Close preview": "Loka forskoðun",
     "View in room": "Skoða á spjallrás",
     "Notify everyone": "Tilkynna öllum",
@@ -1504,8 +1564,10 @@
     "Displays information about a user": "Birtir upplýsingar um notanda",
     "Define the power level of a user": "Skilgreindu völd notanda",
     "Failed to set display name": "Mistókst að stilla birtingarnafn",
-    "Sign out devices|one": "Skrá út tæki",
-    "Sign out devices|other": "Skrá út tæki",
+    "Sign out devices": {
+        "one": "Skrá út tæki",
+        "other": "Skrá út tæki"
+    },
     "Show advanced": "Birta ítarlegt",
     "Hide advanced": "Fela ítarlegt",
     "Edit settings relating to your space.": "Breyta stillingum viðkomandi svæðinu þínu.",
@@ -1581,11 +1643,15 @@
     "Message bubbles": "Skilaboðablöðrur",
     "IRC (Experimental)": "IRC (á tilraunastigi)",
     "Message layout": "Framsetning skilaboða",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Sendi boð...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Sendi boð... (%(progress)s af %(count)s)",
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Sendi boð...",
+        "other": "Sendi boð... (%(progress)s af %(count)s)"
+    },
     "Spaces with access": "Svæði með aðgang",
-    "& %(count)s more|one": "og %(count)s til viðbótar",
-    "& %(count)s more|other": "og %(count)s til viðbótar",
+    "& %(count)s more": {
+        "one": "og %(count)s til viðbótar",
+        "other": "og %(count)s til viðbótar"
+    },
     "Anyone can find and join.": "Hver sem er getur fundið og tekið þátt.",
     "Only invited people can join.": "Aðeins fólk sem er boðið getur tekið þátt.",
     "Private (invite only)": "Einka (einungis gegn boði)",
@@ -1606,8 +1672,10 @@
     "Could not find user in room": "Gat ekki fundið notanda á spjallrás",
     "Favourited": "Í eftirlætum",
     "Notification options": "Valkostir tilkynninga",
-    "Show %(count)s more|one": "Birta %(count)s til viðbótar",
-    "Show %(count)s more|other": "Birta %(count)s til viðbótar",
+    "Show %(count)s more": {
+        "one": "Birta %(count)s til viðbótar",
+        "other": "Birta %(count)s til viðbótar"
+    },
     "Show previews of messages": "Sýna forskoðun skilaboða",
     "Show rooms with unread messages first": "Birta spjallrásir með ólesnum skilaboðum fyrst",
     "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Svæði eru ný leið til að hópa fólk og spjallrásir. Hverskyns svæði langar þig til að útbúa? Þessu má breyta síðar.",
@@ -1820,8 +1888,10 @@
     "You can turn this off anytime in settings": "Þú getur slökkt á þessu hvenær sem er í stillingunum",
     "Create a new space": "Búa til nýtt svæði",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Þú hefur hunsað þennan notanda, þannig að skilaboð frá honum eru falin. <a>Birta samts.</a>",
-    "Show %(count)s other previews|one": "Sýna %(count)s forskoðun til viðbótar",
-    "Show %(count)s other previews|other": "Sýna %(count)s forskoðanir til viðbótar",
+    "Show %(count)s other previews": {
+        "one": "Sýna %(count)s forskoðun til viðbótar",
+        "other": "Sýna %(count)s forskoðanir til viðbótar"
+    },
     "You have no ignored users.": "Þú ert ekki með neina hunsaða notendur.",
     "Read Marker off-screen lifetime (ms)": "Líftími lesmerkis utan skjás (ms)",
     "Read Marker lifetime (ms)": "Líftími lesmerkis (ms)",
@@ -1875,9 +1945,10 @@
     "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Notaðu samþættingarstýringu <b>(%(serverName)s)</b> til að stýra vélmennum, viðmótshlutum og límmerkjapökkum.",
     "An error occurred whilst saving your notification preferences.": "Villa kom upp við að vista valkosti þína fyrir tilkynningar.",
     "Error saving notification preferences": "Villa við að vista valkosti tilkynninga",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Uppfæri svæði... (%(progress)s af %(count)s)",
-    "Currently, %(count)s spaces have access|one": "Núna er svæði með aðgang",
-    "Currently, %(count)s spaces have access|other": "Núna eru %(count)s svæði með aðgang",
+    "Currently, %(count)s spaces have access": {
+        "one": "Núna er svæði með aðgang",
+        "other": "Núna eru %(count)s svæði með aðgang"
+    },
     "The integration manager is offline or it cannot reach your homeserver.": "Samþættingarstýringin er ekki nettengd og nær ekki að tengjast heimaþjóninum þínum.",
     "Cannot connect to integration manager": "Get ekki tengst samþættingarstýringu",
     "Use between %(min)s pt and %(max)s pt": "Nota á milli %(min)s pt og %(max)s pt",
@@ -1885,8 +1956,10 @@
     "Size must be a number": "Stærð verður að vera tala",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s nær ekki að setja dulrituð skilaboð leynilega í skyndiminni á tækinu á meðan keyrt er í vafra. Notaðu <desktopLink>%(brand)s Desktop vinnutölvuútgáfuna</desktopLink> svo skilaboðin birtist í leitarniðurstöðum.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum, notar %(size)s til að geyma skilaboð frá %(rooms)s spjallrásum.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum, notar %(size)s til að geyma skilaboð frá %(rooms)s spjallrásum.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum, notar %(size)s til að geyma skilaboð frá %(rooms)s spjallrásum.",
+        "other": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum, notar %(size)s til að geyma skilaboð frá %(rooms)s spjallrásum."
+    },
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Sannreyndu hverja setu sem notandinn notar til að merkja hana sem treysta, án þess að treyta kross-undirrituðum tækjum.",
     "Cross-signing private keys:": "Kross-undirritun einkalykla:",
     "Cross-signing public keys:": "Kross-undirritun dreifilykla:",
@@ -1935,13 +2008,19 @@
     "Add reaction": "Bæta við viðbrögðum",
     "Error processing voice message": "Villa við meðhöndlun talskilaboða",
     "Error decrypting video": "Villa við afkóðun myndskeiðs",
-    "Based on %(count)s votes|one": "Byggt á %(count)s atkvæði",
-    "Based on %(count)s votes|other": "Byggt á %(count)s atkvæðum",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s atkvæði greitt. Greiddu atkvæði til að sjá útkomuna",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s atkvæði greidd. Greiddu atkvæði til að sjá útkomuna",
+    "Based on %(count)s votes": {
+        "one": "Byggt á %(count)s atkvæði",
+        "other": "Byggt á %(count)s atkvæðum"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s atkvæði greitt. Greiddu atkvæði til að sjá útkomuna",
+        "other": "%(count)s atkvæði greidd. Greiddu atkvæði til að sjá útkomuna"
+    },
     "Results will be visible when the poll is ended": "Niðurstöður birtast einungis eftir að könnuninni hefur lokið",
-    "Final result based on %(count)s votes|one": "Lokaniðurstöður byggðar á %(count)s atkvæði",
-    "Final result based on %(count)s votes|other": "Lokaniðurstöður byggðar á %(count)s atkvæðum",
+    "Final result based on %(count)s votes": {
+        "one": "Lokaniðurstöður byggðar á %(count)s atkvæði",
+        "other": "Lokaniðurstöður byggðar á %(count)s atkvæðum"
+    },
     "Sorry, your vote was not registered. Please try again.": "Því miður, atkvæðið þitt var ekki skráð. Prófaðu aftur.",
     "Vote not registered": "Atkvæði ekki skráð",
     "Sorry, you can't edit a poll after votes have been cast.": "Því miður, þú getur ekki breytt könnun eftir að atkvæði hafa verið greidd.",
@@ -1965,12 +2044,16 @@
     "Deactivate user?": "Gera notanda óvirkan?",
     "Failed to mute user": "Mistókst að þagga niður í notanda",
     "Failed to ban user": "Mistókst að banna notanda",
-    "Remove %(count)s messages|one": "Fjarlægja 1 skilaboð",
-    "Remove %(count)s messages|other": "Fjarlægja %(count)s skilaboð",
+    "Remove %(count)s messages": {
+        "one": "Fjarlægja 1 skilaboð",
+        "other": "Fjarlægja %(count)s skilaboð"
+    },
     "Failed to remove user": "Mistókst að fjarlægja notanda",
     "Hide sessions": "Fela setur",
-    "%(count)s sessions|one": "%(count)s seta",
-    "%(count)s sessions|other": "%(count)s setur",
+    "%(count)s sessions": {
+        "one": "%(count)s seta",
+        "other": "%(count)s setur"
+    },
     "Not trusted": "Ekki treyst",
     "Export chat": "Flytja út spjall",
     "Pinned": "Fest",
@@ -1987,8 +2070,10 @@
     "Disagree": "Ósammála",
     "Verify session": "Sannprófa setu",
     "Search spaces": "Leita að svæðum",
-    "%(count)s members|one": "%(count)s þátttakandi",
-    "%(count)s members|other": "%(count)s þátttakendur",
+    "%(count)s members": {
+        "one": "%(count)s þátttakandi",
+        "other": "%(count)s þátttakendur"
+    },
     "You'll lose access to your encrypted messages": "Þú munt tapa dulrituðu skilaboðunum þínum",
     "Leave some rooms": "Yfirgefa sumar spjallrásir",
     "Leave all rooms": "Yfirgefa allar spjallrásir",
@@ -2043,36 +2128,54 @@
     "What is your poll question or topic?": "Hver er spurning eða viðfangsefni könnunarinnar?",
     "Failed to post poll": "Mistókst að birta könnun",
     "Language Dropdown": "Fellilisti tungumála",
-    "%(count)s people you know have already joined|one": "%(count)s aðili sem þú þekkir hefur þegar tekið þátt",
-    "%(count)s people you know have already joined|other": "%(count)s aðilar sem þú þekkir hafa þegar tekið þátt",
-    "View all %(count)s members|one": "Sjá 1 meðlim",
-    "View all %(count)s members|other": "Sjá alla %(count)s meðlimina",
-    "was removed %(count)s times|one": "var fjarlægð/ur",
-    "was removed %(count)s times|other": "var fjarlægður %(count)s sinnum",
-    "were removed %(count)s times|one": "voru fjarlægð",
-    "were removed %(count)s times|other": "voru fjarlægð %(count)s sinnum",
-    "was unbanned %(count)s times|one": "var tekin/n úr banni",
-    "was unbanned %(count)s times|other": "var tekin/n úr banni %(count)s sinnum",
-    "were unbanned %(count)s times|one": "voru tekin úr banni",
-    "were unbanned %(count)s times|other": "voru tekin úr banni %(count)s sinnum",
-    "was banned %(count)s times|one": "var bannaður",
-    "was banned %(count)s times|other": "var bannaður %(count)s sinnum",
-    "were banned %(count)s times|one": "voru bönnuð",
-    "were banned %(count)s times|other": "voru bönnuð %(count)s sinnum",
-    "was invited %(count)s times|other": "var boðið %(count)s sinnum",
-    "were invited %(count)s times|other": "var boðið %(count)s sinnum",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sfór og skráði sig aftur",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sfór og skráði sig aftur %(count)s sinnum",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sfóru og skráðu sig aftur",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)shafa skráð sig aftur %(count)s sinnum",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sskráði sig og fór",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)shefur skráð sig og farið %(count)s sinnum",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sskráðu sig og fóru",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sskráðu sig og fóru %(count)s sinnum",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sfór út %(count)s sinnum",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sfóru út %(count)s sinnum",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)shefur skráð sig %(count)s sinnum",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)shafa skráð sig %(count)s sinnum",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s aðili sem þú þekkir hefur þegar tekið þátt",
+        "other": "%(count)s aðilar sem þú þekkir hafa þegar tekið þátt"
+    },
+    "View all %(count)s members": {
+        "one": "Sjá 1 meðlim",
+        "other": "Sjá alla %(count)s meðlimina"
+    },
+    "was removed %(count)s times": {
+        "one": "var fjarlægð/ur",
+        "other": "var fjarlægður %(count)s sinnum"
+    },
+    "were removed %(count)s times": {
+        "one": "voru fjarlægð",
+        "other": "voru fjarlægð %(count)s sinnum"
+    },
+    "was unbanned %(count)s times": {
+        "one": "var tekin/n úr banni",
+        "other": "var tekin/n úr banni %(count)s sinnum"
+    },
+    "were unbanned %(count)s times": {
+        "one": "voru tekin úr banni",
+        "other": "voru tekin úr banni %(count)s sinnum"
+    },
+    "was banned %(count)s times": {
+        "one": "var bannaður",
+        "other": "var bannaður %(count)s sinnum"
+    },
+    "were banned %(count)s times": {
+        "one": "voru bönnuð",
+        "other": "voru bönnuð %(count)s sinnum"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)sfór og skráði sig aftur",
+        "other": "%(oneUser)sfór og skráði sig aftur %(count)s sinnum"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)sfóru og skráðu sig aftur",
+        "other": "%(severalUsers)shafa skráð sig aftur %(count)s sinnum"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)sskráði sig og fór",
+        "other": "%(oneUser)shefur skráð sig og farið %(count)s sinnum"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)sskráðu sig og fóru",
+        "other": "%(severalUsers)sskráðu sig og fóru %(count)s sinnum"
+    },
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s breytti auðkennismynd spjallrásarinnar í <img/>",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s breytti auðkennismyndinni fyrir %(roomName)s",
     "You don't have permission to view messages from before you joined.": "Þú hefur ekki heimildir til að skoða skilaboð frá því áður en þú fórst að taka þátt.",
@@ -2202,13 +2305,22 @@
     "Confirm to continue": "Staðfestu til að halda áfram",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Staðfestu að aðgangurinn þinn sé gerður óvirkur með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
     "Clear all data in this session?": "Hreinsa öll gögn í þessari setu?",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)ssendi falin skilaboð",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)ssendi %(count)s falin skilaboð",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sfjarlægði skilaboð",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sbreytti <a>föstum skilaboðum</a> fyrir spjallrásina",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sbreytti <a>föstum skilaboðum</a> fyrir spjallrásina %(count)s sinnum",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sgerði engar breytingar",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sgerði engar breytingar %(count)s sinnum",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)ssendi falin skilaboð",
+        "other": "%(oneUser)ssendi %(count)s falin skilaboð"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)sfjarlægði skilaboð",
+        "other": "%(oneUser)sfjarlægði %(count)s skilaboð"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)sbreytti <a>föstum skilaboðum</a> fyrir spjallrásina",
+        "other": "%(oneUser)sbreytti <a>föstum skilaboðum</a> fyrir spjallrásina %(count)s sinnum"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)sgerði engar breytingar",
+        "other": "%(oneUser)sgerði engar breytingar %(count)s sinnum"
+    },
     "%(displayName)s's live location": "Staðsetning fyrir %(displayName)s í rauntíma",
     "%(brand)s could not send your location. Please try again later.": "%(brand)s gat ekki sent staðsetninguna þína. Reyndu aftur síðar.",
     "Edited at %(date)s. Click to view edits.": "Breytt þann %(date)s. Smelltu hér til að skoða breytingar.",
@@ -2221,12 +2333,15 @@
     "Ask %(displayName)s to scan your code:": "Biddu %(displayName)s um að skanna kóðann þinn:",
     "Compare unique emoji": "Bera saman einstakar táknmyndir",
     "Accepting…": "Samþykki…",
-    "%(count)s reply|one": "%(count)s svar",
-    "%(count)s reply|other": "%(count)s svör",
+    "%(count)s reply": {
+        "one": "%(count)s svar",
+        "other": "%(count)s svör"
+    },
     "Add some now": "Bæta við núna",
-    "%(count)s unread messages.|other": "%(count)s ólesin skilaboð.",
-    "%(count)s unread messages including mentions.|one": "1 ólesin tilvísun í þig.",
-    "%(count)s unread messages including mentions.|other": "%(count)s ólesin skilaboð að meðtöldum þar sem minnst er á þig.",
+    "%(count)s unread messages including mentions.": {
+        "one": "1 ólesin tilvísun í þig.",
+        "other": "%(count)s ólesin skilaboð að meðtöldum þar sem minnst er á þig."
+    },
     "%(roomName)s is not accessible at this time.": "%(roomName)s er ekki aðgengileg í augnablikinu.",
     "Do you want to chat with %(user)s?": "Viltu spjalla við %(user)s?",
     "Add space": "Bæta við svæði",
@@ -2235,8 +2350,10 @@
     "Decide who can join %(roomName)s.": "Veldu hverjir geta tekið þátt í %(roomName)s.",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Aftengjast frá auðkennisþjóninum <current /> og tengjast í staðinn við <new />?",
     "Checking server": "Athuga með þjón",
-    "Click the button below to confirm signing out these devices.|one": "Smelltu á hnappinn hér að neðan til að staðfesta útskráningu þessa tækis.",
-    "Click the button below to confirm signing out these devices.|other": "Smelltu á hnappinn hér að neðan til að staðfesta útskráningu þessara tækja.",
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Smelltu á hnappinn hér að neðan til að staðfesta útskráningu þessa tækis.",
+        "other": "Smelltu á hnappinn hér að neðan til að staðfesta útskráningu þessara tækja."
+    },
     "Do you want to set an email address?": "Viltu skrá tölvupóstfang?",
     "Decide who can view and join %(spaceName)s.": "Veldu hverjir geta skoðað og tekið þátt í %(spaceName)s.",
     "Change the avatar of your active room": "Breyta auðkennismynd virku spjallrásarinnar þinnar",
@@ -2425,10 +2542,14 @@
     "Try to join anyway": "Reyna samt að taka þátt",
     "You were removed from %(roomName)s by %(memberName)s": "Þú hefur verið fjarlægð/ur á %(roomName)s af %(memberName)s",
     "Join the conversation with an account": "Taktu þátt í samtalinu með notandaaðgangi",
-    "Currently removing messages in %(count)s rooms|one": "Er núna að fjarlægja skilaboð í %(count)s spjallrás",
-    "Currently removing messages in %(count)s rooms|other": "Er núna að fjarlægja skilaboð í %(count)s spjallrásum",
-    "Currently joining %(count)s rooms|one": "Er núna að ganga til liðs við %(count)s spjallrás",
-    "Currently joining %(count)s rooms|other": "Er núna að ganga til liðs við %(count)s spjallrásir",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Er núna að fjarlægja skilaboð í %(count)s spjallrás",
+        "other": "Er núna að fjarlægja skilaboð í %(count)s spjallrásum"
+    },
+    "Currently joining %(count)s rooms": {
+        "one": "Er núna að ganga til liðs við %(count)s spjallrás",
+        "other": "Er núna að ganga til liðs við %(count)s spjallrásir"
+    },
     "You do not have permissions to add spaces to this space": "Þú hefur ekki heimild til að bæta svæðum í þetta svæði",
     "You do not have permissions to add rooms to this space": "Þú hefur ekki heimild til að bæta spjallrásum í þetta svæði",
     "You do not have permissions to create new rooms in this space": "Þú hefur ekki heimild til að búa til nýjar spjallrásir í þessu svæði",
@@ -2451,8 +2572,10 @@
     "Please review and accept the policies of this homeserver:": "Yfirfarðu og samþykktu reglur þessa heimaþjóns:",
     "Please review and accept all of the homeserver's policies": "Yfirfarðu og samþykktu allar reglur þessa heimaþjóns",
     "To continue, use Single Sign On to prove your identity.": "Til að halda áfram skaltu nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Staðfestu útskráningu af þessu tæki með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Staðfestu útskráningu af þessum tækjum með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Staðfestu útskráningu af þessu tæki með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
+        "other": "Staðfestu útskráningu af þessum tækjum með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt."
+    },
     "Homeserver feature support:": "Heimaþjónninn styður eftirfarandi eiginleika:",
     "Waiting for you to verify on your other device…": "Bíð eftir að þú staðfestir á hinu tækinu…",
     "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…": "Bíð eftir að þú staðfestir á hinu tækinu, %(deviceName)s (%(deviceId)s)…",
@@ -2573,8 +2696,10 @@
     "Safeguard against losing access to encrypted messages & data": "Tryggðu þig gegn því að missa aðgang að dulrituðum skilaboðum og gögnum",
     "Unable to query secret storage status": "Tókst ekki að finna stöðu á leynigeymslu",
     "Unable to restore backup": "Tekst ekki að endurheimta öryggisafrit",
-    "Upload %(count)s other files|one": "Senda inn %(count)s skrá til viðbótar",
-    "Upload %(count)s other files|other": "Senda inn %(count)s skrár til viðbótar",
+    "Upload %(count)s other files": {
+        "one": "Senda inn %(count)s skrá til viðbótar",
+        "other": "Senda inn %(count)s skrár til viðbótar"
+    },
     "Use \"%(query)s\" to search": "Notaðu \"%(query)s\" til að leita",
     "Sections to show": "Hlutar sem á að sýna",
     "The server has denied your request.": "Þjóninum hefur hafnað beiðninni þinni.",
@@ -2590,7 +2715,9 @@
     "Almost there! Is your other device showing the same shield?": "Næstum því búið! Sýnir hitt tækið þitt sama skjöldinn?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Þú getur ekki afturkallað þessa aðgerð, þar sem þú ert að gefa notandanum jafn mikil völd og þú hefur sjálf/ur.",
     "Failed to change power level": "Mistókst að breyta valdastigi",
-    "You can only pin up to %(count)s widgets|other": "Þú getur bara fest allt að %(count)s viðmótshluta",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Þú getur bara fest allt að %(count)s viðmótshluta"
+    },
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Öryggi skilaboðanna þinna er tryggt og einungis þú og viðtakendurnir hafa dulritunarlyklana til að opna skilaboðin.",
     "Waiting for %(displayName)s to accept…": "Bíð eftir að %(displayName)s samþykki…",
     "Your area is experiencing difficulties connecting to the internet.": "Landssvæðið þar sem þú ert á í vandræðum með að tengjast við internetið.",
@@ -2634,10 +2761,14 @@
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir alla meðlimi spjallrásarinnar síðan þeim var boðið.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendi boð til %(targetDisplayName)s um þátttöku í spjallrásinni.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s afturkallaði boð til %(targetDisplayName)s um þátttöku í spjallrásinni.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s fjarlægði varavistfangið %(addresses)s af þessari spjallrás.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s fjarlægði varavistföngin %(addresses)s af þessari spjallrás.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s bætti við varavistfanginu %(addresses)s fyrir þessa spjallrás.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bætti við varavistföngunum %(addresses)s fyrir þessa spjallrás.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s fjarlægði varavistfangið %(addresses)s af þessari spjallrás.",
+        "other": "%(senderName)s fjarlægði varavistföngin %(addresses)s af þessari spjallrás."
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s bætti við varavistfanginu %(addresses)s fyrir þessa spjallrás.",
+        "other": "%(senderName)s bætti við varavistföngunum %(addresses)s fyrir þessa spjallrás."
+    },
     "Failed to join": "Mistókst að taka þátt",
     "The person who invited you has already left, or their server is offline.": "Aðilinn sem bauð þér er þegar farinn eða að netþjónninn hans/hennar er ekki tengdur.",
     "The person who invited you has already left.": "Aðilinn sem bauð þér er þegar farinn.",
@@ -2788,10 +2919,14 @@
     "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s breytti reglu sem bannar notendur sem samsvara %(oldGlob)s yfir í að samsvara %(glob)s, vegna %(reason)s",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Undirritunarlykillinn sem þú gafst upp samsvarar lyklinum sem þú fékkst frá %(userId)s og setunni %(deviceId)s. Setan er því merkt sem sannreynd.",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AÐVÖRUN: SANNVOTTUN LYKILS MISTÓKST! Undirritunarlykillinn fyrir %(userId)s og setuna %(deviceId)s er \"%(fprint)s\" sem samsvarar ekki uppgefna lyklinum \"%(fingerprint)s\". Þetta gæti þýtt að einhver hafi komist inn í samskiptin þín!",
-    "Confirm signing out these devices|one": "Staðfestu útskráningu þessa tækis",
-    "Confirm signing out these devices|other": "Staðfestu útskráningu þessara tækja",
-    "%(count)s people joined|one": "%(count)s aðili hefur tekið þátt",
-    "%(count)s people joined|other": "%(count)s aðilar hafa tekið þátt",
+    "Confirm signing out these devices": {
+        "one": "Staðfestu útskráningu þessa tækis",
+        "other": "Staðfestu útskráningu þessara tækja"
+    },
+    "%(count)s people joined": {
+        "one": "%(count)s aðili hefur tekið þátt",
+        "other": "%(count)s aðilar hafa tekið þátt"
+    },
     "sends hearts": "sendir hjörtu",
     "Sends the given message with hearts": "Sendir skilaboðin með hjörtum",
     "Enable hardware acceleration": "Virkja vélbúnaðarhröðun",
@@ -2814,15 +2949,19 @@
     "Some results may be hidden": "Sumar niðurstöður gætu verið faldar",
     "Copy invite link": "Afrita boðstengil",
     "Search for": "Leita að",
-    "%(count)s Members|one": "%(count)s meðlimur",
-    "%(count)s Members|other": "%(count)s meðlimir",
+    "%(count)s Members": {
+        "one": "%(count)s meðlimur",
+        "other": "%(count)s meðlimir"
+    },
     "Ignore user": "Hunsa notanda",
     "Create room": "Búa til spjallrás",
     "Create video room": "Búa til myndspjallrás",
     "Add new server…": "Bæta við nýjum þjóni…",
     "Minimise": "Lágmarka",
-    "%(count)s participants|one": "1 þáttakandi",
-    "%(count)s participants|other": "%(count)s þátttakendur",
+    "%(count)s participants": {
+        "one": "1 þáttakandi",
+        "other": "%(count)s þátttakendur"
+    },
     "Joining…": "Geng í hópinn…",
     "New video room": "Ný myndspjallrás",
     "New room": "Ný spjallrás",
@@ -2847,14 +2986,23 @@
     "Unban from room": "Afbanna úr herbergi",
     "Ban from space": "Banna úr svæði",
     "Unban from space": "Afbanna úr svæði",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sfjarlægðu skilaboð",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sfjarlægði %(count)s skilaboð",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sfjarlægðu %(count)s skilaboð",
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sfjarlægðu skilaboð",
+        "other": "%(severalUsers)sfjarlægðu %(count)s skilaboð"
+    },
     "Confirm account deactivation": "Staðfestu óvirkjun reiknings",
     "a key signature": "Fingrafar lykils",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sgerðu engar breytingar",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)shafnaði boði sínu",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)shöfnuðu boði þeirra",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)sgerðu engar breytingar"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)shafnaði boði sínu",
+        "other": "%(oneUser)shafnaði boði sínu %(count)s sinnum"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)shöfnuðu boði þeirra",
+        "other": "%(severalUsers)shöfnuðu boðum þeirra %(count)s sinnum"
+    },
     "Enable notifications": "Virkja tilkynningar",
     "Your profile": "Notandasnið þitt",
     "Download apps": "Sækja forrit",
@@ -2933,11 +3081,15 @@
     "Live": "Beint",
     "You need to be able to kick users to do that.": "Þú þarft að hafa heimild til að sparka notendum til að gera þetta.",
     "Empty room (was %(oldName)s)": "Tóm spjallrás (var %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Býð %(user)s og 1 öðrum",
-    "Inviting %(user)s and %(count)s others|other": "Býð %(user)s og %(count)s til viðbótar",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Býð %(user)s og 1 öðrum",
+        "other": "Býð %(user)s og %(count)s til viðbótar"
+    },
     "Inviting %(user1)s and %(user2)s": "Býð %(user1)s og %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s og 1 annar",
-    "%(user)s and %(count)s others|other": "%(user)s og %(count)s til viðbótar",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s og 1 annar",
+        "other": "%(user)s og %(count)s til viðbótar"
+    },
     "%(user1)s and %(user2)s": "%(user1)s og %(user2)s",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s eða %(copyButton)s",
     "Did not receive it? <a>Resend it</a>": "Fékkstu hann ekki? <a>Endursenda hann</a>",
@@ -2959,8 +3111,10 @@
     "To view %(roomName)s, you need an invite": "Til að skoða %(roomName)s þarftu boð",
     "Ongoing call": "Símtal í gangi",
     "Video call (Jitsi)": "Myndsímtal (Jitsi)",
-    "Seen by %(count)s people|one": "Séð af %(count)s aðila",
-    "Seen by %(count)s people|other": "Séð af %(count)s aðilum",
+    "Seen by %(count)s people": {
+        "one": "Séð af %(count)s aðila",
+        "other": "Séð af %(count)s aðilum"
+    },
     "Send your first message to invite <displayName/> to chat": "Sendu fyrstu skilaboðin þín til að bjóða <displayName/> að spjalla",
     "Security recommendations": "Ráðleggingar varðandi öryggi",
     "Filter devices": "Sía tæki",
@@ -2981,12 +3135,14 @@
     "You will not be able to reactivate your account": "Þú munt ekki geta endurvirkjað aðganginn þinn",
     "Google Play and the Google Play logo are trademarks of Google LLC.": "Google Play og Google Play táknmerkið eru vörumerki í eigu Google LLC.",
     "App Store® and the Apple logo® are trademarks of Apple Inc.": "App Store® og Apple logo® eru vörumerki í eigu Apple Inc.",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)ssendu falin skilaboð",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)ssendu %(count)s falin skilaboð",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sbreyttu <a>föstum skilaboðum</a> fyrir spjallrásina",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sbreyttu <a>föstum skilaboðum</a> fyrir spjallrásina %(count)s sinnum",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)shafnaði boði sínu %(count)s sinnum",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shöfnuðu boðum þeirra %(count)s sinnum",
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)ssendu falin skilaboð",
+        "other": "%(severalUsers)ssendu %(count)s falin skilaboð"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)sbreyttu <a>föstum skilaboðum</a> fyrir spjallrásina",
+        "other": "%(severalUsers)sbreyttu <a>föstum skilaboðum</a> fyrir spjallrásina %(count)s sinnum"
+    },
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Að nota þennan viðmótshluta gæti deilt gögnum <helpIcon /> með %(widgetDomain)s.",
     "Any of the following data may be shared:": "Eftirfarandi gögnum gæti verið deilt:",
     "You don't have permission to share locations": "Þú hefur ekki heimildir til að deila staðsetningum",
@@ -3015,9 +3171,11 @@
     "You were disconnected from the call. (Error: %(message)s)": "Þú varst aftengd/ur frá samtalinu. (Villa: %(message)s)",
     "Reset bearing to north": "Frumstilla stefnu á norður",
     "Toggle attribution": "Víxla tilvísun af/á",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Á %(spaceName)s og %(count)s svæði til viðbótar.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Á %(spaceName)s og %(count)s svæði til viðbótar.",
+        "other": "Á %(spaceName)s og %(count)s svæðum til viðbótar."
+    },
     "In %(spaceName)s.": "Á svæðinu %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Á %(spaceName)s og %(count)s svæðum til viðbótar.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Á svæðunum %(space1Name)s og %(space2Name)s.",
     "You're the only admin of this space. Leaving it will mean no one has control over it.": "Þú ert eini stjórnandi þessa svæðis. Ef þú yfirgefur það verður enginn annar sem er með stjórn yfir því.",
     "You won't be able to rejoin unless you are re-invited.": "Þú munt ekki geta tekið þátt aftur nema þér verði boðið aftur.",
@@ -3108,8 +3266,10 @@
     "Search users in this room…": "Leita að notendum á þessari spjallrás…",
     "Complete these to get the most out of %(brand)s": "Kláraðu þetta til að fá sem mest út úr %(brand)s",
     "You did it!": "Þú kláraðir þetta!",
-    "Only %(count)s steps to go|one": "Aðeins %(count)s skref í viðbót",
-    "Only %(count)s steps to go|other": "Aðeins %(count)s skref í viðbót",
+    "Only %(count)s steps to go": {
+        "one": "Aðeins %(count)s skref í viðbót",
+        "other": "Aðeins %(count)s skref í viðbót"
+    },
     "Find your people": "Finndu fólkið þitt",
     "Find your co-workers": "Finndu samstarfsaðilana þína",
     "Secure messaging for work": "Örugg skilaboð í vinnunni",
@@ -3159,10 +3319,14 @@
     "You don't have permission to view messages from before you were invited.": "Þú hefur ekki heimildir til að skoða skilaboð frá því áður en þér var boðið.",
     "This message could not be decrypted": "Þessi skilaboð er ekki hægt að afkóða",
     " in <strong>%(room)s</strong>": " í <strong>%(room)s</strong>",
-    "Sign out of %(count)s sessions|one": "Skrá út úr %(count)s setu",
-    "Sign out of %(count)s sessions|other": "Skrá út úr %(count)s setum",
-    "%(count)s sessions selected|one": "%(count)s seta valin",
-    "%(count)s sessions selected|other": "%(count)s setur valdar",
+    "Sign out of %(count)s sessions": {
+        "one": "Skrá út úr %(count)s setu",
+        "other": "Skrá út úr %(count)s setum"
+    },
+    "%(count)s sessions selected": {
+        "one": "%(count)s seta valin",
+        "other": "%(count)s setur valdar"
+    },
     "Inactive for %(inactiveAgeDays)s days or longer": "Óvirk í %(inactiveAgeDays)s+ daga eða lengur",
     "Not ready for secure messaging": "Ekki tilbúið fyrir örugg skilaboð",
     "Ready for secure messaging": "Tilbúið fyrir örugg skilaboð",
@@ -3182,8 +3346,10 @@
     "Voice broadcasts": "Útsendingar tals",
     "Voice processing": "Meðhöndlun tals",
     "Automatically adjust the microphone volume": "Aðlaga hljóðstyrk hljóðnema sjálfvirkt",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Ertu viss um að þú viljir skrá þig út úr %(count)s setu?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Ertu viss um að þú viljir skrá þig út úr %(count)s setum?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Ertu viss um að þú viljir skrá þig út úr %(count)s setu?",
+        "other": "Ertu viss um að þú viljir skrá þig út úr %(count)s setum?"
+    },
     "What's next for %(brand)s? Labs are the best way to get things early, test out new features and help shape them before they actually launch.": "Hvað er væntanlegt í %(brand)s? Að taka þátt í tilraunum gefur færi á að sjá nýja hluti fyrr, prófa nýja eiginleika og vera með í að móta þá áður en þeir fara í almenna notkun.",
     "Upcoming features": "Væntanlegir eiginleikar",
     "Enable notifications for this device": "Virkja tilkynningar á þessu tæki",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 87b6f20c91..192209514e 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -154,8 +154,10 @@
     "Mention": "Cita",
     "Invite": "Invita",
     "Unmute": "Togli silenzio",
-    "and %(count)s others...|other": "e altri %(count)s ...",
-    "and %(count)s others...|one": "e un altro...",
+    "and %(count)s others...": {
+        "other": "e altri %(count)s ...",
+        "one": "e un altro..."
+    },
     "Invited": "Invitato/a",
     "Filter room members": "Filtra membri della stanza",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (poteri %(powerLevelNumber)s)",
@@ -181,8 +183,10 @@
     "Offline": "Offline",
     "Unknown": "Sconosciuto",
     "Save": "Salva",
-    "(~%(count)s results)|other": "(~%(count)s risultati)",
-    "(~%(count)s results)|one": "(~%(count)s risultato)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s risultati)",
+        "one": "(~%(count)s risultato)"
+    },
     "Join Room": "Entra nella stanza",
     "Upload avatar": "Invia avatar",
     "Forget room": "Dimentica la stanza",
@@ -245,54 +249,98 @@
     "No results": "Nessun risultato",
     "Home": "Pagina iniziale",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)ssono entrati %(count)s volte",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)ssono entrati",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s è entrato/a %(count)s volte",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s è entrato/a",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)ssono usciti %(count)s volte",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)ssono usciti",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s è uscito/a %(count)s volte",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s è uscito/a",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)ssono entrati e usciti %(count)s volte",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)ssono entrati e usciti",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s è entrato/a e uscito/a %(count)s volte",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s è entrato/a e uscito/a",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)ssono usciti e rientrati %(count)s volte",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)ssono usciti e rientrati",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s è uscito/a e rientrato/a %(count)s volte",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s è uscito/a e rientrato/a",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shanno rifiutato i loro inviti %(count)s volte",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)shanno rifiutato i loro inviti",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sha rifiutato il suo invito %(count)s volte",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sha rifiutato il suo invito",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)shanno visto revocato il loro invito %(count)s volte",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)shanno visto revocato il loro invito",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sha visto revocato il suo invito %(count)s volte",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sha visto revocato il suo invito",
-    "were invited %(count)s times|other": "sono stati invitati %(count)s volte",
-    "were invited %(count)s times|one": "sono stati invitati",
-    "was invited %(count)s times|other": "è stato/a invitato/a %(count)s volte",
-    "was invited %(count)s times|one": "è stato/a invitato/a",
-    "were banned %(count)s times|other": "sono stati banditi %(count)s volte",
-    "were banned %(count)s times|one": "sono stati banditi",
-    "was banned %(count)s times|other": "è stato bandito %(count)s volte",
-    "was banned %(count)s times|one": "è stato bandito",
-    "were unbanned %(count)s times|other": "sono stati riammessi %(count)s volte",
-    "were unbanned %(count)s times|one": "sono stati riammessi",
-    "was unbanned %(count)s times|other": "è stato riammesso %(count)s volte",
-    "was unbanned %(count)s times|one": "è stato riammesso",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)shanno modificato il loro nome %(count)s volte",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)shanno modificato il loro nome",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sha modificato il suo nome %(count)s volte",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sha modificato il suo nome",
-    "%(items)s and %(count)s others|other": "%(items)s e altri %(count)s",
-    "%(items)s and %(count)s others|one": "%(items)s e un altro",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)ssono entrati %(count)s volte",
+        "one": "%(severalUsers)ssono entrati"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s è entrato/a %(count)s volte",
+        "one": "%(oneUser)s è entrato/a"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)ssono usciti %(count)s volte",
+        "one": "%(severalUsers)ssono usciti"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s è uscito/a %(count)s volte",
+        "one": "%(oneUser)s è uscito/a"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)ssono entrati e usciti %(count)s volte",
+        "one": "%(severalUsers)ssono entrati e usciti"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s è entrato/a e uscito/a %(count)s volte",
+        "one": "%(oneUser)s è entrato/a e uscito/a"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)ssono usciti e rientrati %(count)s volte",
+        "one": "%(severalUsers)ssono usciti e rientrati"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s è uscito/a e rientrato/a %(count)s volte",
+        "one": "%(oneUser)s è uscito/a e rientrato/a"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)shanno rifiutato i loro inviti %(count)s volte",
+        "one": "%(severalUsers)shanno rifiutato i loro inviti"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)sha rifiutato il suo invito %(count)s volte",
+        "one": "%(oneUser)sha rifiutato il suo invito"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)shanno visto revocato il loro invito %(count)s volte",
+        "one": "%(severalUsers)shanno visto revocato il loro invito"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)sha visto revocato il suo invito %(count)s volte",
+        "one": "%(oneUser)sha visto revocato il suo invito"
+    },
+    "were invited %(count)s times": {
+        "other": "sono stati invitati %(count)s volte",
+        "one": "sono stati invitati"
+    },
+    "was invited %(count)s times": {
+        "other": "è stato/a invitato/a %(count)s volte",
+        "one": "è stato/a invitato/a"
+    },
+    "were banned %(count)s times": {
+        "other": "sono stati banditi %(count)s volte",
+        "one": "sono stati banditi"
+    },
+    "was banned %(count)s times": {
+        "other": "è stato bandito %(count)s volte",
+        "one": "è stato bandito"
+    },
+    "were unbanned %(count)s times": {
+        "other": "sono stati riammessi %(count)s volte",
+        "one": "sono stati riammessi"
+    },
+    "was unbanned %(count)s times": {
+        "other": "è stato riammesso %(count)s volte",
+        "one": "è stato riammesso"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)shanno modificato il loro nome %(count)s volte",
+        "one": "%(severalUsers)shanno modificato il loro nome"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sha modificato il suo nome %(count)s volte",
+        "one": "%(oneUser)sha modificato il suo nome"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s e altri %(count)s",
+        "one": "%(items)s e un altro"
+    },
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
     "collapse": "richiudi",
     "expand": "espandi",
     "Custom level": "Livello personalizzato",
     "<a>In reply to</a> <pill>": "<a>In risposta a</a> <pill>",
-    "And %(count)s more...|other": "E altri %(count)s ...",
+    "And %(count)s more...": {
+        "other": "E altri %(count)s ..."
+    },
     "Confirm Removal": "Conferma la rimozione",
     "Create": "Crea",
     "Unknown error": "Errore sconosciuto",
@@ -336,9 +384,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non hai l'autorizzazione per vedere il messaggio in questione.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non è stato trovato.",
     "Failed to load timeline position": "Caricamento posizione cronologica fallito",
-    "Uploading %(filename)s and %(count)s others|other": "Invio di %(filename)s e altri %(count)s",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Invio di %(filename)s e altri %(count)s",
+        "one": "Invio di %(filename)s e altri %(count)s"
+    },
     "Uploading %(filename)s": "Invio di %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Invio di %(filename)s e altri %(count)s",
     "Sign out": "Disconnetti",
     "Success": "Successo",
     "Unable to remove contact information": "Impossibile rimuovere le informazioni di contatto",
@@ -601,8 +651,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ha disattivato l'accesso per ospiti alla stanza.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ha cambiato l'accesso per ospiti a %(rule)s",
     "%(displayName)s is typing …": "%(displayName)s sta scrivendo …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s e altri %(count)s stanno scrivendo …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ed un altro stanno scrivendo …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s e altri %(count)s stanno scrivendo …",
+        "one": "%(names)s ed un altro stanno scrivendo …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s e %(lastPerson)s stanno scrivendo …",
     "The user must be unbanned before they can be invited.": "L'utente non deve essere bandito per essere invitato.",
     "Render simple counters in room header": "Mostra contatori semplici nell'header della stanza",
@@ -800,8 +852,10 @@
     "Revoke invite": "Revoca invito",
     "Invited by %(sender)s": "Invitato/a da %(sender)s",
     "Remember my selection for this widget": "Ricorda la mia scelta per questo widget",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Hai %(count)s notifiche non lette in una versione precedente di questa stanza.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Hai %(count)s notifiche non lette in una versione precedente di questa stanza.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Hai %(count)s notifiche non lette in una versione precedente di questa stanza.",
+        "one": "Hai %(count)s notifiche non lette in una versione precedente di questa stanza."
+    },
     "The file '%(fileName)s' failed to upload.": "Invio del file '%(fileName)s' fallito.",
     "The server does not support the room version specified.": "Il server non supporta la versione di stanza specificata.",
     "Unbans user with given ID": "Riammette l'utente con l'ID dato",
@@ -847,8 +901,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Questo file è <b>troppo grande</b> da inviare. Il limite di dimensione è %(limit)s ma questo file è di %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Questi file sono <b>troppo grandi</b> da inviare. Il limite di dimensione è %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Alcuni file sono <b>troppo grandi</b> da inviare. Il limite di dimensione è %(limit)s.",
-    "Upload %(count)s other files|other": "Invia altri %(count)s file",
-    "Upload %(count)s other files|one": "Invia %(count)s altro file",
+    "Upload %(count)s other files": {
+        "other": "Invia altri %(count)s file",
+        "one": "Invia %(count)s altro file"
+    },
     "Cancel All": "Annulla tutto",
     "Upload Error": "Errore di invio",
     "Use an email address to recover your account": "Usa un indirizzo email per ripristinare il tuo account",
@@ -895,10 +951,14 @@
     "Message edits": "Modifiche del messaggio",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Per aggiornare questa stanza devi chiudere l'istanza attuale e creare una nuova stanza al suo posto. Per offrire la migliore esperienza possibile ai membri della stanza:",
     "Show all": "Mostra tutto",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)snon hanno fatto modifiche %(count)s volte",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)snon hanno fatto modifiche",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)snon ha fatto modifiche %(count)s volte",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snon ha fatto modifiche",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)snon hanno fatto modifiche %(count)s volte",
+        "one": "%(severalUsers)snon hanno fatto modifiche"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)snon ha fatto modifiche %(count)s volte",
+        "one": "%(oneUser)snon ha fatto modifiche"
+    },
     "Resend %(unsentCount)s reaction(s)": "Reinvia %(unsentCount)s reazione/i",
     "Your homeserver doesn't seem to support this feature.": "Il tuo homeserver non sembra supportare questa funzione.",
     "You're signed out": "Sei disconnesso",
@@ -987,7 +1047,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Prova a scorrere la linea temporale per vedere se ce ne sono di precedenti.",
     "Remove recent messages by %(user)s": "Rimuovi gli ultimi messaggi di %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Se i messaggi sono tanti può volerci un po' di tempo. Nel frattempo, per favore, non fare alcun refresh.",
-    "Remove %(count)s messages|other": "Rimuovi %(count)s messaggi",
+    "Remove %(count)s messages": {
+        "other": "Rimuovi %(count)s messaggi",
+        "one": "Rimuovi 1 messaggio"
+    },
     "Remove recent messages": "Rimuovi i messaggi recenti",
     "Bold": "Grassetto",
     "Italics": "Corsivo",
@@ -1013,8 +1076,14 @@
     "Explore rooms": "Esplora stanze",
     "Show previews/thumbnails for images": "Mostra anteprime/miniature per le immagini",
     "Clear cache and reload": "Svuota la cache e ricarica",
-    "%(count)s unread messages including mentions.|other": "%(count)s messaggi non letti incluse le citazioni.",
-    "%(count)s unread messages.|other": "%(count)s messaggi non letti.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s messaggi non letti incluse le citazioni.",
+        "one": "1 citazione non letta."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s messaggi non letti.",
+        "one": "1 messaggio non letto."
+    },
     "Show image": "Mostra immagine",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Segnala un nuovo problema</newIssueLink> su GitHub in modo che possiamo indagare su questo errore.",
     "To continue you need to accept the terms of this service.": "Per continuare devi accettare le condizioni di servizio.",
@@ -1023,7 +1092,6 @@
     "Notification Autocomplete": "Autocompletamento notifiche",
     "Room Autocomplete": "Autocompletamento stanze",
     "User Autocomplete": "Autocompletamento utenti",
-    "Remove %(count)s messages|one": "Rimuovi 1 messaggio",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Chiave pubblica di Captcha mancante nella configurazione dell'homeserver. Segnalalo all'amministratore dell'homeserver.",
     "Add Email Address": "Aggiungi indirizzo email",
     "Add Phone Number": "Aggiungi numero di telefono",
@@ -1056,8 +1124,6 @@
     "Jump to first invite.": "Salta al primo invito.",
     "Command Autocomplete": "Autocompletamento comando",
     "Room %(name)s": "Stanza %(name)s",
-    "%(count)s unread messages including mentions.|one": "1 citazione non letta.",
-    "%(count)s unread messages.|one": "1 messaggio non letto.",
     "Unread messages.": "Messaggi non letti.",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Questa azione richiede l'accesso al server di identità predefinito <server /> per verificare un indirizzo email o numero di telefono, ma il server non ha termini di servizio.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
@@ -1171,8 +1237,10 @@
     "Start chatting": "Inizia a chattare",
     "not stored": "non salvato",
     "Hide verified sessions": "Nascondi sessioni verificate",
-    "%(count)s verified sessions|other": "%(count)s sessioni verificate",
-    "%(count)s verified sessions|one": "1 sessione verificata",
+    "%(count)s verified sessions": {
+        "other": "%(count)s sessioni verificate",
+        "one": "1 sessione verificata"
+    },
     "Unable to set up secret storage": "Impossibile impostare un archivio segreto",
     "Close preview": "Chiudi anteprima",
     "Language Dropdown": "Lingua a tendina",
@@ -1275,8 +1343,10 @@
     "Your messages are not secure": "I tuoi messaggi non sono sicuri",
     "One of the following may be compromised:": "Uno dei seguenti potrebbe essere compromesso:",
     "Your homeserver": "Il tuo homeserver",
-    "%(count)s sessions|other": "%(count)s sessioni",
-    "%(count)s sessions|one": "%(count)s sessione",
+    "%(count)s sessions": {
+        "other": "%(count)s sessioni",
+        "one": "%(count)s sessione"
+    },
     "Hide sessions": "Nascondi sessione",
     "Verify by emoji": "Verifica via emoji",
     "Verify by comparing unique emoji.": "Verifica confrontando emoji specifici.",
@@ -1337,10 +1407,14 @@
     "Not currently indexing messages for any room.": "Attualmente non si stanno indicizzando i messaggi di alcuna stanza.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s di %(totalRooms)s",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ha cambiato il nome della stanza da %(oldRoomName)s a %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s ha aggiunto gli indirizzi alternativi %(addresses)s per questa stanza.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s ha aggiunto l'indirizzo alternativo %(addresses)s per questa stanza.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s ha rimosso gli indirizzi alternativi %(addresses)s per questa stanza.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s ha rimosso l'indirizzo alternativo %(addresses)s per questa stanza.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s ha aggiunto gli indirizzi alternativi %(addresses)s per questa stanza.",
+        "one": "%(senderName)s ha aggiunto l'indirizzo alternativo %(addresses)s per questa stanza."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s ha rimosso gli indirizzi alternativi %(addresses)s per questa stanza.",
+        "one": "%(senderName)s ha rimosso l'indirizzo alternativo %(addresses)s per questa stanza."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ha cambiato gli indirizzi alternativi per questa stanza.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ha cambiato gli indirizzi principali ed alternativi per questa stanza.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s ha cambiato gli indirizzi per questa stanza.",
@@ -1516,8 +1590,10 @@
     "Sort by": "Ordina per",
     "Message preview": "Anteprima messaggio",
     "List options": "Opzioni lista",
-    "Show %(count)s more|other": "Mostra altri %(count)s",
-    "Show %(count)s more|one": "Mostra %(count)s altro",
+    "Show %(count)s more": {
+        "other": "Mostra altri %(count)s",
+        "one": "Mostra %(count)s altro"
+    },
     "Room options": "Opzioni stanza",
     "Activity": "Attività",
     "A-Z": "A-Z",
@@ -1650,7 +1726,9 @@
     "Move right": "Sposta a destra",
     "Move left": "Sposta a sinistra",
     "Revoke permissions": "Revoca autorizzazioni",
-    "You can only pin up to %(count)s widgets|other": "Puoi ancorare al massimo %(count)s widget",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Puoi ancorare al massimo %(count)s widget"
+    },
     "Show Widgets": "Mostra i widget",
     "Hide Widgets": "Nascondi i widget",
     "The call was answered on another device.": "La chiamata è stata accettata su un altro dispositivo.",
@@ -1938,8 +2016,10 @@
     "United States": "Stati Uniti",
     "United Kingdom": "Regno Unito",
     "Go to Home View": "Vai alla vista home",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(rooms)s stanza.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(rooms)s stanze.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(rooms)s stanza.",
+        "other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(rooms)s stanze."
+    },
     "See text messages posted to your active room": "Vedi messaggi di testo inviati alla tua stanza attiva",
     "See text messages posted to this room": "Vedi messaggi di testo inviati a questa stanza",
     "Send text messages as you in your active room": "Invia messaggi di testo a tuo nome nella tua stanza attiva",
@@ -2140,8 +2220,10 @@
     "Support": "Supporto",
     "Random": "Casuale",
     "Welcome to <name/>": "Ti diamo il benvenuto in <name/>",
-    "%(count)s members|one": "%(count)s membro",
-    "%(count)s members|other": "%(count)s membri",
+    "%(count)s members": {
+        "one": "%(count)s membro",
+        "other": "%(count)s membri"
+    },
     "Your server does not support showing space hierarchies.": "Il tuo server non supporta la visualizzazione di gerarchie di spazi.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Vuoi veramente uscire dallo spazio '%(spaceName)s'?",
     "This space is not public. You will not be able to rejoin without an invite.": "Questo spazio non è pubblico. Non potrai rientrare senza un invito.",
@@ -2203,8 +2285,10 @@
     "Failed to remove some rooms. Try again later": "Rimozione di alcune stanze fallita. Riprova più tardi",
     "Suggested": "Consigliato",
     "This room is suggested as a good one to join": "Questa è una buona stanza in cui entrare",
-    "%(count)s rooms|one": "%(count)s stanza",
-    "%(count)s rooms|other": "%(count)s stanze",
+    "%(count)s rooms": {
+        "one": "%(count)s stanza",
+        "other": "%(count)s stanze"
+    },
     "You don't have permission": "Non hai il permesso",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Solitamente ciò influisce solo su come la stanza viene elaborata sul server. Se stai riscontrando problemi con il tuo %(brand)s, segnala un errore.",
     "Invite to %(roomName)s": "Invita in %(roomName)s",
@@ -2219,8 +2303,10 @@
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultazione con %(transferTarget)s. <a>Trasferisci a %(transferee)s</a>",
     "Manage & explore rooms": "Gestisci ed esplora le stanze",
     "Invite to just this room": "Invita solo in questa stanza",
-    "%(count)s people you know have already joined|other": "%(count)s persone che conosci sono già entrate",
-    "%(count)s people you know have already joined|one": "%(count)s persona che conosci è già entrata",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s persone che conosci sono già entrate",
+        "one": "%(count)s persona che conosci è già entrata"
+    },
     "Add existing rooms": "Aggiungi stanze esistenti",
     "Warn before quitting": "Avvisa prima di uscire",
     "Invited people will be able to read old messages.": "Le persone invitate potranno leggere i vecchi messaggi.",
@@ -2252,8 +2338,10 @@
     "Delete all": "Elimina tutti",
     "Some of your messages have not been sent": "Alcuni tuoi messaggi non sono stati inviati",
     "Including %(commaSeparatedMembers)s": "Inclusi %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Vedi 1 membro",
-    "View all %(count)s members|other": "Vedi tutti i %(count)s membri",
+    "View all %(count)s members": {
+        "one": "Vedi 1 membro",
+        "other": "Vedi tutti i %(count)s membri"
+    },
     "Failed to send": "Invio fallito",
     "Enter your Security Phrase a second time to confirm it.": "Inserisci di nuovo la password di sicurezza per confermarla.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Scegli le stanze o le conversazioni da aggiungere. Questo è uno spazio solo per te, nessuno ne saprà nulla. Puoi aggiungerne altre in seguito.",
@@ -2266,8 +2354,10 @@
     "Leave the beta": "Abbandona la beta",
     "Beta": "Beta",
     "Want to add a new room instead?": "Vuoi invece aggiungere una nuova stanza?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Aggiunta stanza...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Aggiunta stanze... (%(progress)s di %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Aggiunta stanza...",
+        "other": "Aggiunta stanze... (%(progress)s di %(count)s)"
+    },
     "Not all selected were added": "Non tutti i selezionati sono stati aggiunti",
     "You are not allowed to view this server's rooms list": "Non hai i permessi per vedere l'elenco di stanze del server",
     "Error processing voice message": "Errore di elaborazione del vocale",
@@ -2291,8 +2381,10 @@
     "Sends the given message with a space themed effect": "Invia il messaggio con un effetto a tema spaziale",
     "See when people join, leave, or are invited to this room": "Vedere quando le persone entrano, escono o sono invitate in questa stanza",
     "See when people join, leave, or are invited to your active room": "Vedere quando le persone entrano, escono o sono invitate nella tua stanza attiva",
-    "Currently joining %(count)s rooms|one": "Stai entrando in %(count)s stanza",
-    "Currently joining %(count)s rooms|other": "Stai entrando in %(count)s stanze",
+    "Currently joining %(count)s rooms": {
+        "one": "Stai entrando in %(count)s stanza",
+        "other": "Stai entrando in %(count)s stanze"
+    },
     "The user you called is busy.": "L'utente che hai chiamato è occupato.",
     "User Busy": "Utente occupato",
     "Or send invite link": "O manda un collegamento di invito",
@@ -2353,10 +2445,14 @@
     "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Questo utente sta facendo spam nella stanza con pubblicità, collegamenti ad annunci o a propagande.\nVerrà segnalato ai moderatori della stanza.",
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Questo utente sta mostrando un comportamento illegale, ad esempio facendo doxing o minacciando violenza.\nVerrà segnalato ai moderatori della stanza che potrebbero portarlo in ambito legale.",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Questo utente sta scrivendo cose sbagliate.\nVerrà segnalato ai moderatori della stanza.",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sha cambiato le ACL del server",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sha cambiato le ACL del server %(count)s volte",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)shanno cambiato le ACL del server",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)shanno cambiato le ACL del server %(count)s volte",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sha cambiato le ACL del server",
+        "other": "%(oneUser)sha cambiato le ACL del server %(count)s volte"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)shanno cambiato le ACL del server",
+        "other": "%(severalUsers)shanno cambiato le ACL del server %(count)s volte"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Inizializzazione ricerca messaggi fallita, controlla <a>le impostazioni</a> per maggiori informazioni",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Imposta gli indirizzi per questo spazio affinché gli utenti lo trovino attraverso il tuo homeserver (%(localDomain)s)",
     "To publish an address, it needs to be set as a local address first.": "Per pubblicare un indirizzo, deve prima essere impostato come indirizzo locale.",
@@ -2391,8 +2487,10 @@
     "Unable to copy room link": "Impossibile copiare il link della stanza",
     "Unnamed audio": "Audio senza nome",
     "Error processing audio message": "Errore elaborazione messaggio audio",
-    "Show %(count)s other previews|one": "Mostra %(count)s altra anteprima",
-    "Show %(count)s other previews|other": "Mostra altre %(count)s anteprime",
+    "Show %(count)s other previews": {
+        "one": "Mostra %(count)s altra anteprima",
+        "other": "Mostra altre %(count)s anteprime"
+    },
     "Images, GIFs and videos": "Immagini, GIF e video",
     "Code blocks": "Blocchi di codice",
     "Keyboard shortcuts": "Scorciatoie da tastiera",
@@ -2445,8 +2543,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Chiunque in uno spazio può trovare ed entrare. Puoi selezionare più spazi.",
     "Spaces with access": "Spazi con accesso",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Chiunque in uno spazio può trovare ed entrare. <a>Modifica quali spazi possono accedere qui.</a>",
-    "Currently, %(count)s spaces have access|other": "Attualmente, %(count)s spazi hanno accesso",
-    "& %(count)s more|other": "e altri %(count)s",
+    "Currently, %(count)s spaces have access": {
+        "other": "Attualmente, %(count)s spazi hanno accesso",
+        "one": "Attualmente, uno spazio ha accesso"
+    },
+    "& %(count)s more": {
+        "other": "e altri %(count)s",
+        "one": "e altri %(count)s"
+    },
     "Upgrade required": "Aggiornamento necessario",
     "Anyone can find and join.": "Chiunque può trovare ed entrare.",
     "Only invited people can join.": "Solo le persone invitate possono entrare.",
@@ -2514,8 +2618,6 @@
     "Thread": "Conversazione",
     "The above, but in any room you are joined or invited to as well": "Quanto sopra, ma anche in qualsiasi stanza tu sia entrato/a o invitato/a",
     "The above, but in <Room /> as well": "Quanto sopra, ma anche in <Room />",
-    "Currently, %(count)s spaces have access|one": "Attualmente, uno spazio ha accesso",
-    "& %(count)s more|one": "e altri %(count)s",
     "Autoplay videos": "Auto-riproduci i video",
     "Autoplay GIFs": "Auto-riproduci le GIF",
     "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s ha tolto un messaggio ancorato da questa stanza. Vedi tutti i messaggi ancorati.",
@@ -2589,10 +2691,14 @@
     "Media omitted - file size limit exceeded": "File omesso - superata dimensione massima",
     "Media omitted": "File omesso",
     "Create poll": "Crea sondaggio",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Aggiornamento spazio...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Aggiornamento spazi... (%(progress)s di %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Spedizione invito...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Spedizione inviti... (%(progress)s di %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Aggiornamento spazio...",
+        "other": "Aggiornamento spazi... (%(progress)s di %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Spedizione invito...",
+        "other": "Spedizione inviti... (%(progress)s di %(count)s)"
+    },
     "Loading new room": "Caricamento nuova stanza",
     "Upgrading room": "Aggiornamento stanza",
     "Ban them from everything I'm able to": "Bandiscilo ovunque io possa farlo",
@@ -2602,8 +2708,10 @@
     "They'll still be able to access whatever you're not an admin of.": "Potrà ancora accedere dove non sei amministratore.",
     "Disinvite from %(roomName)s": "Annulla l'invito da %(roomName)s",
     "Threads": "Conversazioni",
-    "%(count)s reply|one": "%(count)s risposta",
-    "%(count)s reply|other": "%(count)s risposte",
+    "%(count)s reply": {
+        "one": "%(count)s risposta",
+        "other": "%(count)s risposte"
+    },
     "Show:": "Mostra:",
     "Shows all threads from current room": "Mostra tutte le conversazioni dalla stanza attuale",
     "All threads": "Tutte le conversazioni",
@@ -2645,12 +2753,18 @@
     "Rename": "Rinomina",
     "Select all": "Seleziona tutti",
     "Deselect all": "Deseleziona tutti",
-    "Sign out devices|one": "Disconnetti dispositivo",
-    "Sign out devices|other": "Disconnetti dispositivi",
-    "Click the button below to confirm signing out these devices.|one": "Clicca il pulsante sottostante per confermare la disconnessione da questo dispositivo.",
-    "Click the button below to confirm signing out these devices.|other": "Clicca il pulsante sottostante per confermare la disconnessione da questi dispositivi.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Conferma la disconnessione da questo dispositivo usando Single Sign On per dare prova della tua identità.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Conferma la disconnessione da questi dispositivi usando Single Sign On per dare prova della tua identità.",
+    "Sign out devices": {
+        "one": "Disconnetti dispositivo",
+        "other": "Disconnetti dispositivi"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Clicca il pulsante sottostante per confermare la disconnessione da questo dispositivo.",
+        "other": "Clicca il pulsante sottostante per confermare la disconnessione da questi dispositivi."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Conferma la disconnessione da questo dispositivo usando Single Sign On per dare prova della tua identità.",
+        "other": "Conferma la disconnessione da questi dispositivi usando Single Sign On per dare prova della tua identità."
+    },
     "Use a more compact 'Modern' layout": "Usa una disposizione \"Moderna\" più compatta",
     "Add option": "Aggiungi opzione",
     "Write an option": "Scrivi un'opzione",
@@ -2692,12 +2806,18 @@
     "Large": "Grande",
     "Image size in the timeline": "Dimensione immagine nella linea temporale",
     "%(senderName)s has updated the room layout": "%(senderName)s ha aggiornato la disposizione della stanza",
-    "Based on %(count)s votes|one": "Basato su %(count)s voto",
-    "Based on %(count)s votes|other": "Basato su %(count)s voti",
-    "%(count)s votes|one": "%(count)s voto",
-    "%(count)s votes|other": "%(count)s voti",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s e altri %(count)s",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s e altri %(count)s",
+    "Based on %(count)s votes": {
+        "one": "Basato su %(count)s voto",
+        "other": "Basato su %(count)s voti"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s voto",
+        "other": "%(count)s voti"
+    },
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s e altri %(count)s",
+        "other": "%(spaceName)s e altri %(count)s"
+    },
     "Sorry, the poll you tried to create was not posted.": "Spiacenti, il sondaggio che hai provato a creare non è stato inviato.",
     "Failed to post poll": "Invio del sondaggio fallito",
     "Sorry, your vote was not registered. Please try again.": "Spiacenti, il tuo voto non è stato registrato. Riprova.",
@@ -2720,8 +2840,10 @@
     "You do not have permissions to invite people to this space": "Non hai l'autorizzazione di invitare persone in questo spazio",
     "Invite to space": "Invita nello spazio",
     "Start new chat": "Inizia nuova chat",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s voto. Vota per vedere i risultati",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s voti. Vota per vedere i risultati",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s voto. Vota per vedere i risultati",
+        "other": "%(count)s voti. Vota per vedere i risultati"
+    },
     "No votes cast": "Nessun voto",
     "Recently viewed": "Visti di recente",
     "To view all keyboard shortcuts, <a>click here</a>.": "Per vedere tutte le scorciatoie, <a>clicca qui</a>.",
@@ -2746,8 +2868,10 @@
     "Failed to end poll": "Chiusura del sondaggio fallita",
     "The poll has ended. Top answer: %(topAnswer)s": "Il sondaggio è terminato. Risposta più scelta: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "Il sondaggio è terminato. Nessun voto inviato.",
-    "Final result based on %(count)s votes|one": "Risultato finale basato su %(count)s voto",
-    "Final result based on %(count)s votes|other": "Risultato finale basato su %(count)s voti",
+    "Final result based on %(count)s votes": {
+        "one": "Risultato finale basato su %(count)s voto",
+        "other": "Risultato finale basato su %(count)s voti"
+    },
     "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "Vuoi davvero terminare questo sondaggio? Verranno mostrati i risultati finali e le persone non potranno più votare.",
     "Recent searches": "Ricerche recenti",
     "To search messages, look for this icon at the top of a room <icon/>": "Per cercare messaggi, trova questa icona in cima ad una stanza <icon/>",
@@ -2763,16 +2887,24 @@
     "Failed to load list of rooms.": "Caricamento dell'elenco di stanze fallito.",
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Ciò raggruppa le tue chat con i membri di questo spazio. Se lo disattivi le chat verranno nascoste dalla tua vista di %(spaceName)s.",
     "Sections to show": "Sezioni da mostrare",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Esportato %(count)s evento in %(seconds)s secondi",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Esportati %(count)s eventi in %(seconds)s secondi",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Esportato %(count)s evento in %(seconds)s secondi",
+        "other": "Esportati %(count)s eventi in %(seconds)s secondi"
+    },
     "Export successful!": "Esportazione riuscita!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Ricevuto %(count)s evento in %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "Ricevuti %(count)s eventi in %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Ricevuto %(count)s evento in %(seconds)ss",
+        "other": "Ricevuti %(count)s eventi in %(seconds)ss"
+    },
     "Processing event %(number)s out of %(total)s": "Elaborazione evento %(number)s di %(total)s",
-    "Fetched %(count)s events so far|one": "Ricevuto %(count)s evento finora",
-    "Fetched %(count)s events so far|other": "Ricevuti %(count)s eventi finora",
-    "Fetched %(count)s events out of %(total)s|one": "Ricevuto %(count)s evento di %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Ricevuti %(count)s eventi di %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Ricevuto %(count)s evento finora",
+        "other": "Ricevuti %(count)s eventi finora"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Ricevuto %(count)s evento di %(total)s",
+        "other": "Ricevuti %(count)s eventi di %(total)s"
+    },
     "Generating a ZIP": "Generazione di uno ZIP",
     "Open in OpenStreetMap": "Apri in OpenStreetMap",
     "This address had invalid server or is already in use": "Questo indirizzo aveva un server non valido o è già in uso",
@@ -2818,10 +2950,14 @@
     "From a thread": "Da una conversazione",
     "Automatically send debug logs on decryption errors": "Invia automaticamente log di debug per errori di decifrazione",
     "Open this settings tab": "Apri questa scheda di impostazioni",
-    "was removed %(count)s times|one": "è stato rimosso",
-    "was removed %(count)s times|other": "è stato rimosso %(count)s volte",
-    "were removed %(count)s times|one": "sono stati rimossi",
-    "were removed %(count)s times|other": "sono stati rimossi %(count)s volte",
+    "was removed %(count)s times": {
+        "one": "è stato rimosso",
+        "other": "è stato rimosso %(count)s volte"
+    },
+    "were removed %(count)s times": {
+        "one": "sono stati rimossi",
+        "other": "sono stati rimossi %(count)s volte"
+    },
     "Remove from room": "Rimuovi dalla stanza",
     "Failed to remove user": "Rimozione utente fallita",
     "Remove them from specific things I'm able to": "Rimuovilo da cose specifiche dove posso farlo",
@@ -2899,19 +3035,29 @@
     "Feedback sent! Thanks, we appreciate it!": "Opinione inviata! Grazie, lo apprezziamo!",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Grazie per avere provato la beta, ti preghiamo di darci più dettagli possibili in modo che possiamo migliorare.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s e %(space2Name)s",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sha inviato un messaggio nascosto",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sha inviato %(count)s messaggi nascosti",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)shanno inviato un messaggio nascosto",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)shanno inviato %(count)s messaggi nascosti",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sha rimosso un messaggio",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sha rimosso %(count)s messaggi",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)shanno rimosso un messaggio",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)shanno rimosso %(count)s messaggi",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sha inviato un messaggio nascosto",
+        "other": "%(oneUser)sha inviato %(count)s messaggi nascosti"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)shanno inviato un messaggio nascosto",
+        "other": "%(severalUsers)shanno inviato %(count)s messaggi nascosti"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)sha rimosso un messaggio",
+        "other": "%(oneUser)sha rimosso %(count)s messaggi"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)shanno rimosso un messaggio",
+        "other": "%(severalUsers)shanno rimosso %(count)s messaggi"
+    },
     "Maximise": "Espandi",
     "Automatically send debug logs when key backup is not functioning": "Invia automaticamente log di debug quando il backup delle chiavi non funziona",
     "<empty string>": "<stringa vuota>",
-    "<%(count)s spaces>|one": "<spazio>",
-    "<%(count)s spaces>|other": "<%(count)s spazi>",
+    "<%(count)s spaces>": {
+        "one": "<spazio>",
+        "other": "<%(count)s spazi>"
+    },
     "Join %(roomAddress)s": "Entra in %(roomAddress)s",
     "Edit poll": "Modifica sondaggio",
     "Sorry, you can't edit a poll after votes have been cast.": "Spiacenti, non puoi modificare un sondaggio dopo che sono stati inviati voti.",
@@ -2940,10 +3086,14 @@
     "%(brand)s could not send your location. Please try again later.": "%(brand)s non ha potuto inviare la tua posizione. Riprova più tardi.",
     "We couldn't send your location": "Non siamo riusciti ad inviare la tua posizione",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Rispondi ad una conversazione in corso o usa \"%(replyInThread)s\" passando sopra ad un messaggio per iniziarne una nuova.",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)shanno cambiato i <a>messaggi ancorati</a> della stanza",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sha cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)shanno cambiato i <a>messaggi ancorati</a> della stanza",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)shanno cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)shanno cambiato i <a>messaggi ancorati</a> della stanza",
+        "other": "%(oneUser)sha cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)shanno cambiato i <a>messaggi ancorati</a> della stanza",
+        "other": "%(severalUsers)shanno cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte"
+    },
     "Insert a trailing colon after user mentions at the start of a message": "Inserisci dei due punti dopo le citazioni degli utenti all'inizio di un messaggio",
     "Show polls button": "Mostra pulsante sondaggi",
     "We'll create rooms for each of them.": "Creeremo stanze per ognuno di essi.",
@@ -2966,12 +3116,16 @@
     "You are sharing your live location": "Stai condividendo la tua posizione in tempo reale",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Deseleziona se vuoi rimuovere anche i messaggi di sistema per questo utente (es. cambiamenti di sottoscrizione, modifiche al profilo…)",
     "Preserve system messages": "Conserva i messaggi di sistema",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Stai per rimuovere %(count)s messaggio di %(user)s. Verrà rimosso permanentemente per chiunque nella conversazione. Vuoi continuare?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Stai per rimuovere %(count)s messaggi di %(user)s. Verranno rimossi permanentemente per chiunque nella conversazione. Vuoi continuare?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Stai per rimuovere %(count)s messaggio di %(user)s. Verrà rimosso permanentemente per chiunque nella conversazione. Vuoi continuare?",
+        "other": "Stai per rimuovere %(count)s messaggi di %(user)s. Verranno rimossi permanentemente per chiunque nella conversazione. Vuoi continuare?"
+    },
     "%(displayName)s's live location": "Posizione in tempo reale di %(displayName)s",
     "Share for %(duration)s": "Condividi per %(duration)s",
-    "Currently removing messages in %(count)s rooms|one": "Rimozione di messaggi in corso in %(count)s stanza",
-    "Currently removing messages in %(count)s rooms|other": "Rimozione di messaggi in corso in %(count)s stanze",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Rimozione di messaggi in corso in %(count)s stanza",
+        "other": "Rimozione di messaggi in corso in %(count)s stanze"
+    },
     "%(value)ss": "%(value)ss",
     "%(value)sm": "%(value)sm",
     "%(value)sh": "%(value)so",
@@ -3056,8 +3210,10 @@
     "Create room": "Crea stanza",
     "Create video room": "Crea stanza video",
     "Create a video room": "Crea una stanza video",
-    "%(count)s participants|one": "1 partecipante",
-    "%(count)s participants|other": "%(count)s partecipanti",
+    "%(count)s participants": {
+        "one": "1 partecipante",
+        "other": "%(count)s partecipanti"
+    },
     "New video room": "Nuova stanza video",
     "New room": "Nuova stanza",
     "Threads help keep your conversations on-topic and easy to track.": "Le conversazioni ti aiutano a tenere le tue discussioni in tema e rintracciabili.",
@@ -3079,8 +3235,10 @@
     "Disinvite from room": "Disinvita dalla stanza",
     "Remove from space": "Rimuovi dallo spazio",
     "Disinvite from space": "Disinvita dallo spazio",
-    "Confirm signing out these devices|one": "Conferma la disconnessione da questo dispositivo",
-    "Confirm signing out these devices|other": "Conferma la disconnessione da questi dispositivi",
+    "Confirm signing out these devices": {
+        "one": "Conferma la disconnessione da questo dispositivo",
+        "other": "Conferma la disconnessione da questi dispositivi"
+    },
     "sends hearts": "invia cuori",
     "Sends the given message with hearts": "Invia il messaggio con cuori",
     "Enable Markdown": "Attiva markdown",
@@ -3104,8 +3262,10 @@
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Hai eseguito la disconnessione da tutti i dispositivi e non riceverai più notifiche push. Per riattivare le notifiche, riaccedi su ogni dispositivo.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Se vuoi mantenere l'accesso alla cronologia della chat nelle stanze cifrate, imposta il backup delle chiavi o esporta le tue chiavi dei messaggi da un altro dispositivo prima di procedere.",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "La disconnessione dai tuoi dispositivi eliminerà le chiavi di crittografia dei messaggi salvate in essi, rendendo illeggibile la cronologia delle chat cifrate.",
-    "Seen by %(count)s people|one": "Visto da %(count)s persona",
-    "Seen by %(count)s people|other": "Visto da %(count)s persone",
+    "Seen by %(count)s people": {
+        "one": "Visto da %(count)s persona",
+        "other": "Visto da %(count)s persone"
+    },
     "Your password was successfully changed.": "La tua password è stata cambiata correttamente.",
     "An error occurred while stopping your live location": "Si è verificato un errore fermando la tua posizione in tempo reale",
     "Enable live location sharing": "Attiva condivisione posizione in tempo reale",
@@ -3134,8 +3294,10 @@
     "Click to read topic": "Clicca per leggere l'argomento",
     "Edit topic": "Modifica argomento",
     "Joining…": "Ingresso…",
-    "%(count)s people joined|one": "È entrata %(count)s persona",
-    "%(count)s people joined|other": "Sono entrate %(count)s persone",
+    "%(count)s people joined": {
+        "one": "È entrata %(count)s persona",
+        "other": "Sono entrate %(count)s persone"
+    },
     "View related event": "Vedi evento correlato",
     "Check if you want to hide all current and future messages from this user.": "Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente.",
     "Ignore user": "Ignora utente",
@@ -3152,8 +3314,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Se non vedi chi stai cercando, mandagli il tuo collegamento di invito.",
     "Some results may be hidden for privacy": "Alcuni risultati potrebbero essere nascosti per privacy",
     "Search for": "Cerca",
-    "%(count)s Members|one": "%(count)s membro",
-    "%(count)s Members|other": "%(count)s membri",
+    "%(count)s Members": {
+        "one": "%(count)s membro",
+        "other": "%(count)s membri"
+    },
     "Show: Matrix rooms": "Mostra: stanze di Matrix",
     "Show: %(instance)s rooms (%(server)s)": "Mostra: stanze di %(instance)s (%(server)s)",
     "Add new server…": "Aggiungi nuovo server…",
@@ -3190,9 +3354,11 @@
     "Enter fullscreen": "Attiva schermo intero",
     "Map feedback": "Feedback mappa",
     "Toggle attribution": "Attiva/disattiva attribuzione",
-    "In %(spaceName)s and %(count)s other spaces.|one": "In %(spaceName)s e in %(count)s altro spazio.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "In %(spaceName)s e in %(count)s altro spazio.",
+        "other": "In %(spaceName)s e in altri %(count)s spazi."
+    },
     "In %(spaceName)s.": "Nello spazio %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s e in altri %(count)s spazi.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Negli spazi %(space1Name)s e %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Comando sviluppatore: scarta l'attuale sessione di gruppo in uscita e imposta nuove sessioni Olm",
     "You're in": "Sei dentro",
@@ -3211,8 +3377,10 @@
     "Spell check": "Controllo ortografico",
     "Complete these to get the most out of %(brand)s": "Completa questi per ottenere il meglio da %(brand)s",
     "You did it!": "Ce l'hai fatta!",
-    "Only %(count)s steps to go|one": "Solo %(count)s passo per iniziare",
-    "Only %(count)s steps to go|other": "Solo %(count)s passi per iniziare",
+    "Only %(count)s steps to go": {
+        "one": "Solo %(count)s passo per iniziare",
+        "other": "Solo %(count)s passi per iniziare"
+    },
     "Welcome to %(brand)s": "Benvenuti in %(brand)s",
     "Find your people": "Trova la tua gente",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Mantieni il possesso e il controllo delle discussioni nella comunità.\nScalabile per supportarne milioni, con solida moderazione e interoperabilità.",
@@ -3290,11 +3458,15 @@
     "Show shortcut to welcome checklist above the room list": "Mostra scorciatoia per l'elenco di benvenuto sopra la lista stanze",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Non è consigliabile aggiungere la crittografia alle stanze pubbliche.</b>Chiunque può trovare ed entrare in stanze pubbliche, quindi chiunque può leggere i messaggi. Non avrai alcun beneficio dalla crittografia e non potrai disattivarla in seguito. Cifrare i messaggi in una stanza pubblica renderà più lenti l'invio e la ricezione dei messaggi.",
     "Empty room (was %(oldName)s)": "Stanza vuota (era %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Invito di %(user)s e 1 altro",
-    "Inviting %(user)s and %(count)s others|other": "Invito di %(user)s e altri %(count)s",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Invito di %(user)s e 1 altro",
+        "other": "Invito di %(user)s e altri %(count)s"
+    },
     "Inviting %(user1)s and %(user2)s": "Invito di %(user1)s e %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s e 1 altro",
-    "%(user)s and %(count)s others|other": "%(user)s e altri %(count)s",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s e 1 altro",
+        "other": "%(user)s e altri %(count)s"
+    },
     "%(user1)s and %(user2)s": "%(user1)s e %(user2)s",
     "Show": "Mostra",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s o %(copyButton)s",
@@ -3392,8 +3564,10 @@
     "Browser": "Browser",
     "play voice broadcast": "avvia trasmissione vocale",
     "Someone else is already recording a voice broadcast. Wait for their voice broadcast to end to start a new one.": "Qualcun altro sta già registrando una trasmissione vocale. Aspetta che finisca prima di iniziarne una nuova.",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Vuoi davvero disconnetterti da %(count)s sessione?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Vuoi davvero disconnetterti da %(count)s sessioni?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Vuoi davvero disconnetterti da %(count)s sessione?",
+        "other": "Vuoi davvero disconnetterti da %(count)s sessioni?"
+    },
     "You should make especially certain that you recognise these sessions as they could represent an unauthorised use of your account.": "Dovresti essere particolarmente certo di riconoscere queste sessioni dato che potrebbero rappresentare un uso non autorizzato del tuo account.",
     "Unverified sessions are sessions that have logged in with your credentials but have not been cross-verified.": "Le sessioni non verificate sono quelle che hanno effettuato l'accesso con le tue credenziali ma non sono state verificate.",
     "Removing inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.": "La rimozione delle sessioni inattive migliora la sicurezza e le prestazioni, e ti semplifica identificare se una sessione nuova è sospetta.",
@@ -3486,8 +3660,10 @@
     "Unable to decrypt message": "Impossibile decifrare il messaggio",
     "This message could not be decrypted": "Non è stato possibile decifrare questo messaggio",
     "Improve your account security by following these recommendations.": "Migliora la sicurezza del tuo account seguendo questi consigli.",
-    "%(count)s sessions selected|one": "%(count)s sessione selezionata",
-    "%(count)s sessions selected|other": "%(count)s sessioni selezionate",
+    "%(count)s sessions selected": {
+        "one": "%(count)s sessione selezionata",
+        "other": "%(count)s sessioni selezionate"
+    },
     "Rust cryptography implementation": "Implementazione crittografia Rust",
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Non puoi avviare una chiamata perché stai registrando una trasmissione in diretta. Termina la trasmissione per potere iniziare una chiamata.",
     "Can’t start a call": "Impossibile avviare una chiamata",
@@ -3501,8 +3677,10 @@
     "Verify your current session for enhanced secure messaging.": "Verifica la tua sessione attuale per messaggi più sicuri.",
     "Your current session is ready for secure messaging.": "La tua sessione attuale è pronta per i messaggi sicuri.",
     "Force 15s voice broadcast chunk length": "Forza lunghezza pezzo trasmissione vocale a 15s",
-    "Sign out of %(count)s sessions|one": "Disconnetti %(count)s sessione",
-    "Sign out of %(count)s sessions|other": "Disconnetti %(count)s sessioni",
+    "Sign out of %(count)s sessions": {
+        "one": "Disconnetti %(count)s sessione",
+        "other": "Disconnetti %(count)s sessioni"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Disconnetti tutte le altre sessioni (%(otherSessionsCount)s)",
     "Yes, end my recording": "Sì, termina la mia registrazione",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "Se inizi ad ascoltare questa trasmissione in diretta, l'attuale registrazione della tua trasmissione in diretta finirà.",
@@ -3606,7 +3784,9 @@
     "Room is <strong>encrypted ✅</strong>": "La stanza è <strong>crittografata ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Lo stato di notifica è <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Stato \"non letto\" nella stanza: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Stato \"non letto\" nella stanza: <strong>%(status)s</strong>, conteggio: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Stato \"non letto\" nella stanza: <strong>%(status)s</strong>, conteggio: <strong>%(count)s</strong>"
+    },
     "Ended a poll": "Terminato un sondaggio",
     "Due to decryption errors, some votes may not be counted": "A causa di errori di decifrazione, alcuni voti potrebbero non venire contati",
     "Answered elsewhere": "Risposto altrove",
@@ -3619,10 +3799,14 @@
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "Hai provato ad entrare usando un ID stanza senza fornire una lista di server attraverso cui entrare. Gli ID stanza sono identificativi interni e non possono essere usati per entrare in una stanza senza informazioni aggiuntive.",
     "Yes, it was me": "Sì, ero io",
     "View poll": "Vedi sondaggio",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Non ci sono sondaggi passati nell'ultimo giorno. Carica più sondaggi per vedere quelli dei mesi precedenti",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Non ci sono sondaggi passati negli ultimi %(count)s giorni. Carica più sondaggi per vedere quelli dei mesi precedenti",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Non ci sono sondaggi attivi nell'ultimo giorno. Carica più sondaggi per vedere quelli dei mesi precedenti",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Non ci sono sondaggi attivi negli ultimi %(count)s giorni. Carica più sondaggi per vedere quelli dei mesi precedenti",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Non ci sono sondaggi passati nell'ultimo giorno. Carica più sondaggi per vedere quelli dei mesi precedenti",
+        "other": "Non ci sono sondaggi passati negli ultimi %(count)s giorni. Carica più sondaggi per vedere quelli dei mesi precedenti"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Non ci sono sondaggi attivi nell'ultimo giorno. Carica più sondaggi per vedere quelli dei mesi precedenti",
+        "other": "Non ci sono sondaggi attivi negli ultimi %(count)s giorni. Carica più sondaggi per vedere quelli dei mesi precedenti"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Non ci sono sondaggi passati. Carica più sondaggi per vedere quelli dei mesi precedenti",
     "There are no active polls. Load more polls to view polls for previous months": "Non ci sono sondaggi attivi. Carica più sondaggi per vedere quelli dei mesi precedenti",
     "Load more polls": "Carica più sondaggi",
@@ -3747,8 +3931,14 @@
     "Enter keywords here, or use for spelling variations or nicknames": "Inserisci le parole chiave qui, o usa per variazioni ortografiche o nomi utente",
     "Quick Actions": "Azioni rapide",
     "Your profile picture URL": "L'URL della tua immagine del profilo",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)shanno cambiato la loro immagine del profilo %(count)s volte",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)sha cambiato la sua immagine del profilo %(count)s volte",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)shanno cambiato la loro immagine del profilo %(count)s volte",
+        "one": "%(severalUsers)shanno cambiato la propria immagine del profilo"
+    },
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)sha cambiato la sua immagine del profilo %(count)s volte",
+        "one": "%(oneUser)sha cambiato la propria immagine del profilo"
+    },
     "Views room with given address": "Visualizza la stanza con l'indirizzo dato",
     "Introducing a simpler way to change your notification settings. Customize your %(brand)s, just the way you like.": "Ti presentiamo un modo più semplice per cambiare le impostazioni di notifica. Personalizza %(brand)s, come piace a te.",
     "Allow screen share only mode": "Consenti modalità solo condivisione schermo",
@@ -3766,7 +3956,6 @@
     "%(senderDisplayName)s changed the join rule to ask to join.": "%(senderDisplayName)s ha cambiato la regola di accesso in \"Chiedi di entrare\".",
     "Under active development, new room header & details interface": "In sviluppo attivo, nuova interfaccia per intestazione e dettagli stanza",
     "You need to be granted access to this room in order to view or participate in the conversation. You can send a request to join below.": "Ti deve venire dato l'accesso alla stanza per potere vedere o partecipare alla conversazione. Puoi inviare una richiesta di accesso sotto.",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)shanno cambiato la propria immagine del profilo",
     "Ask to join %(roomName)s?": "Chiedi di entrare in %(roomName)s?",
     "Ask to join?": "Chiedi di entrare?",
     "Message (optional)": "Messaggio (facoltativo)",
@@ -3774,7 +3963,6 @@
     "Request to join sent": "Richiesta di ingresso inviata",
     "Your request to join is pending.": "La tua richiesta di ingresso è in attesa.",
     "Cancel request": "Annulla richiesta",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)sha cambiato la propria immagine del profilo",
     "Other spaces you know": "Altri spazi che conosci",
     "You need an invite to access this room.": "Ti serve un invito per entrare in questa stanza.",
     "Failed to cancel": "Annullamento fallito",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 7b383b18af..f868db358e 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -240,8 +240,10 @@
     "Share Link to User": "ユーザーへのリンクを共有",
     "Unmute": "ミュート解除",
     "Admin Tools": "管理者ツール",
-    "and %(count)s others...|other": "他%(count)s人…",
-    "and %(count)s others...|one": "他1人…",
+    "and %(count)s others...": {
+        "other": "他%(count)s人…",
+        "one": "他1人…"
+    },
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（権限レベル：%(powerLevelNumber)s）",
     "Attachment": "添付ファイル",
     "Hangup": "電話を切る",
@@ -268,8 +270,10 @@
     "Unknown": "不明",
     "Replying": "以下に返信",
     "Save": "保存",
-    "(~%(count)s results)|other": "（〜%(count)s件）",
-    "(~%(count)s results)|one": "（〜%(count)s件）",
+    "(~%(count)s results)": {
+        "other": "（〜%(count)s件）",
+        "one": "（〜%(count)s件）"
+    },
     "Join Room": "ルームに参加",
     "Forget room": "ルームを消去",
     "Share room": "ルームを共有",
@@ -340,53 +344,99 @@
     "No results": "結果がありません",
     "Home": "ホーム",
     "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sが%(count)s回参加しました",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sが参加しました",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sが%(count)s回参加しました",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sが参加しました",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sが%(count)s回退出しました",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sが退出しました",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sが%(count)s回退出しました",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sが退出しました",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sが%(count)s回参加し、退出しました",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sが参加して退出しました",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sが%(count)s回参加し退出しました",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sが参加し退出しました",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sが%(count)s回退出し再参加しました",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sが退出し再参加しました",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sが%(count)s回退出し再参加しました",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sが退出し再参加しました",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sが%(count)s回招待を拒否しました",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sが招待を拒否しました",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sが%(count)s回招待を拒否しました",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sが招待を拒否しました",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sが招待を取り消しました",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sが%(count)s回招待を取り消しました",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sが招待を取り消しました",
-    "were invited %(count)s times|other": "が%(count)s回招待されました",
-    "were invited %(count)s times|one": "が招待されました",
-    "was invited %(count)s times|other": "が%(count)s回招待されました",
-    "was invited %(count)s times|one": "が招待されました",
-    "were banned %(count)s times|other": "が%(count)s回ブロックされました",
-    "were banned %(count)s times|one": "がブロックされました",
-    "was banned %(count)s times|other": "が%(count)s回ブロックされました",
-    "was banned %(count)s times|one": "がブロックされました",
-    "were unbanned %(count)s times|other": "が%(count)s回ブロック解除されました",
-    "were unbanned %(count)s times|one": "がブロック解除されました",
-    "was unbanned %(count)s times|other": "が%(count)s回ブロック解除されました",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sが%(count)s回名前を変更しました",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sが名前を変更しました",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sが%(count)s回名前を変更しました",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sが名前を変更しました",
-    "%(items)s and %(count)s others|other": "%(items)sと他%(count)s人",
-    "%(items)s and %(count)s others|one": "%(items)sともう1人",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)sが%(count)s回参加しました",
+        "one": "%(severalUsers)sが参加しました"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)sが%(count)s回参加しました",
+        "one": "%(oneUser)sが参加しました"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)sが%(count)s回退出しました",
+        "one": "%(severalUsers)sが退出しました"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)sが%(count)s回退出しました",
+        "one": "%(oneUser)sが退出しました"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)sが%(count)s回参加し、退出しました",
+        "one": "%(severalUsers)sが参加して退出しました"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)sが%(count)s回参加し退出しました",
+        "one": "%(oneUser)sが参加し退出しました"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)sが%(count)s回退出し再参加しました",
+        "one": "%(severalUsers)sが退出し再参加しました"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)sが%(count)s回退出し再参加しました",
+        "one": "%(oneUser)sが退出し再参加しました"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)sが%(count)s回招待を拒否しました",
+        "one": "%(severalUsers)sが招待を拒否しました"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)sが%(count)s回招待を拒否しました",
+        "one": "%(oneUser)sが招待を拒否しました"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)sが招待を取り消しました",
+        "other": "%(severalUsers)sが%(count)s回招待を取り消しました"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)sが%(count)s回招待を取り消しました",
+        "one": "%(oneUser)sが招待を取り消しました"
+    },
+    "were invited %(count)s times": {
+        "other": "が%(count)s回招待されました",
+        "one": "が招待されました"
+    },
+    "was invited %(count)s times": {
+        "other": "が%(count)s回招待されました",
+        "one": "が招待されました"
+    },
+    "were banned %(count)s times": {
+        "other": "が%(count)s回ブロックされました",
+        "one": "がブロックされました"
+    },
+    "was banned %(count)s times": {
+        "other": "が%(count)s回ブロックされました",
+        "one": "がブロックされました"
+    },
+    "were unbanned %(count)s times": {
+        "other": "が%(count)s回ブロック解除されました",
+        "one": "がブロック解除されました"
+    },
+    "was unbanned %(count)s times": {
+        "other": "が%(count)s回ブロック解除されました",
+        "one": "がブロック解除されました"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)sが%(count)s回名前を変更しました",
+        "one": "%(severalUsers)sが名前を変更しました"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sが%(count)s回名前を変更しました",
+        "one": "%(oneUser)sが名前を変更しました"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)sと他%(count)s人",
+        "one": "%(items)sともう1人"
+    },
     "%(items)s and %(lastItem)s": "%(items)s, %(lastItem)s",
     "collapse": "折りたたむ",
     "expand": "展開",
     "Custom level": "ユーザー定義のレベル",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "返信されたイベントを読み込めません。存在しないか、表示する権限がありません。",
     "<a>In reply to</a> <pill>": "<pill>への<a>返信</a>",
-    "And %(count)s more...|other": "他%(count)s人以上…",
+    "And %(count)s more...": {
+        "other": "他%(count)s人以上…"
+    },
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "ログを送信する前に、問題を説明する<a>GitHub issueを作成</a>してください。",
     "Confirm Removal": "削除の確認",
     "Create": "作成",
@@ -408,8 +458,6 @@
     "Update any local room aliases to point to the new room": "新しいルームを指すようにローカルルームのエイリアスを更新",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "古いバージョンのルームでユーザーが投稿できないよう設定し、新しいルームに移動するようユーザーに通知するメッセージを投稿",
     "Mention": "メンション",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sが%(count)s回招待を取り消しました",
-    "was unbanned %(count)s times|one": "がブロック解除されました",
     "Put a link back to the old room at the start of the new room so people can see old messages": "以前のメッセージを閲覧できるように、新しいルームの先頭に古いルームへのリンクを設定",
     "Sign out": "サインアウト",
     "Clear Storage and Sign Out": "ストレージをクリアし、サインアウト",
@@ -466,9 +514,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "このルームのタイムラインの特定の地点を読み込もうとしましたが、問題のメッセージを閲覧する権限がありません。",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "このルームのタイムラインの特定の地点を読み込もうとしましたが、見つけられませんでした。",
     "Failed to load timeline position": "タイムラインの位置を読み込めませんでした",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)sと他%(count)s件をアップロードしています",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "%(filename)sと他%(count)s件をアップロードしています",
+        "one": "%(filename)sと他%(count)s件をアップロードしています"
+    },
     "Uploading %(filename)s": "%(filename)sをアップロードしています",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)sと他%(count)s件をアップロードしています",
     "Success": "成功",
     "Unable to remove contact information": "連絡先の情報を削除できません",
     "<not supported>": "<サポート対象外>",
@@ -579,8 +629,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)sがこのルームへのゲストによる参加を拒否しました。",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)sがゲストによるアクセスを「%(rule)s」に変更しました。",
     "%(displayName)s is typing …": "%(displayName)sが入力しています…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)sと他%(count)s人が入力しています…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)sともう1人が入力しています…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)sと他%(count)s人が入力しています…",
+        "one": "%(names)sともう1人が入力しています…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)sと%(lastPerson)sが入力しています…",
     "Cannot reach homeserver": "ホームサーバーに接続できません",
     "Your %(brand)s is misconfigured": "あなたの%(brand)sは正しく設定されていません",
@@ -753,11 +805,15 @@
     "Verify": "認証",
     "Trusted": "信頼済",
     "Not trusted": "信頼されていません",
-    "%(count)s verified sessions|other": "%(count)s件の認証済のセッション",
-    "%(count)s verified sessions|one": "1件の認証済のセッション",
+    "%(count)s verified sessions": {
+        "other": "%(count)s件の認証済のセッション",
+        "one": "1件の認証済のセッション"
+    },
     "Hide verified sessions": "認証済のセッションを隠す",
-    "%(count)s sessions|other": "%(count)s個のセッション",
-    "%(count)s sessions|one": "%(count)s個のセッション",
+    "%(count)s sessions": {
+        "other": "%(count)s個のセッション",
+        "one": "%(count)s個のセッション"
+    },
     "Hide sessions": "セッションを隠す",
     "Security": "セキュリティー",
     "Welcome to %(appName)s": "%(appName)sにようこそ",
@@ -884,8 +940,10 @@
     "Use Single Sign On to continue": "シングルサインオンを使用して続行",
     "Accept <policyLink /> to continue:": "<policyLink />に同意して続行：",
     "Always show the window menu bar": "常にウィンドウメニューバーを表示",
-    "Show %(count)s more|other": "さらに%(count)s件を表示",
-    "Show %(count)s more|one": "さらに%(count)s件を表示",
+    "Show %(count)s more": {
+        "other": "さらに%(count)s件を表示",
+        "one": "さらに%(count)s件を表示"
+    },
     "%(num)s minutes ago": "%(num)s分前",
     "%(num)s hours ago": "%(num)s時間前",
     "%(num)s days ago": "%(num)s日前",
@@ -974,8 +1032,10 @@
     "Room address": "ルームのアドレス",
     "New published address (e.g. #alias:server)": "新しい公開アドレス（例：#alias:server）",
     "No other published addresses yet, add one below": "他の公開アドレスはまだありません。以下から追加できます",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s個のルームのメッセージの保存に%(size)sを使用しています。",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s個のルームのメッセージの保存に%(size)sを使用しています。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s個のルームのメッセージの保存に%(size)sを使用しています。",
+        "other": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s個のルームのメッセージの保存に%(size)sを使用しています。"
+    },
     "Security Key": "セキュリティーキー",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "IDサーバーの使用は任意です。IDサーバーを使用しない場合、他のユーザーによって見つけられず、また、メールアドレスや電話で他のユーザーを招待することもできません。",
     "Integrations not allowed": "インテグレーションは許可されていません",
@@ -1028,10 +1088,14 @@
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "このルームをアップグレードすると、現在のルームの使用を終了し、アップグレードしたルームを同じ名前で作成します。",
     "This room has already been upgraded.": "このルームは既にアップグレードされています。",
     "Unread messages.": "未読メッセージ。",
-    "%(count)s unread messages.|one": "未読メッセージ1件。",
-    "%(count)s unread messages.|other": "未読メッセージ%(count)s件。",
-    "%(count)s unread messages including mentions.|one": "未読のメンション1件。",
-    "%(count)s unread messages including mentions.|other": "メンションを含む未読メッセージ%(count)s件。",
+    "%(count)s unread messages.": {
+        "one": "未読メッセージ1件。",
+        "other": "未読メッセージ%(count)s件。"
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "未読のメンション1件。",
+        "other": "メンションを含む未読メッセージ%(count)s件。"
+    },
     "Jump to first invite.": "最初の招待に移動。",
     "Jump to first unread room.": "未読のある最初のルームにジャンプします。",
     "A-Z": "アルファベット順",
@@ -1323,10 +1387,14 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)sがこのルームのアドレスを変更しました。",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)sがこのルームのメインアドレスと代替アドレスを変更しました。",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)sがこのルームの代替アドレスを変更しました。",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)sがこのルームの代替アドレス %(addresses)s を削除しました。",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)sがこのルームの代替アドレス %(addresses)s を削除しました。",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)sがこのルームの代替アドレス %(addresses)s を追加しました。",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)sがこのルームの代替アドレス %(addresses)s を追加しました。",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)sがこのルームの代替アドレス %(addresses)s を削除しました。",
+        "other": "%(senderName)sがこのルームの代替アドレス %(addresses)s を削除しました。"
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)sがこのルームの代替アドレス %(addresses)s を追加しました。",
+        "other": "%(senderName)sがこのルームの代替アドレス %(addresses)s を追加しました。"
+    },
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉全てのサーバーの参加がブロックされています！このルームは使用できなくなりました。",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)sがこのルームのサーバーアクセス制御リストを変更しました。",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)sがこのルームのサーバーアクセス制御リストを設定しました。",
@@ -1750,8 +1818,10 @@
     "Deactivate user": "ユーザーを無効化",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "このユーザーを無効化すると、このユーザーはログアウトし、再度ログインすることはできなくなります。また、現在参加している全てのルームから退出します。このアクションを元に戻すことはできません。このユーザーを無効化してもよろしいですか？",
     "Deactivate user?": "ユーザーを無効化しますか？",
-    "Remove %(count)s messages|one": "1件のメッセージを削除",
-    "Remove %(count)s messages|other": "%(count)s件のメッセージを削除",
+    "Remove %(count)s messages": {
+        "one": "1件のメッセージを削除",
+        "other": "%(count)s件のメッセージを削除"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "大量のメッセージだと時間がかかるかもしれません。その間はクライアントを再読み込みしないでください。",
     "Remove recent messages by %(user)s": "%(user)sからの最近のメッセージを削除",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "タイムラインを上にスクロールして、以前のものがあるかどうかを確認してください。",
@@ -1761,7 +1831,9 @@
     "Edit widgets, bridges & bots": "ウィジェット、ブリッジ、ボットを編集",
     "Set my room layout for everyone": "このルームのレイアウトを参加者全体に設定",
     "Unpin": "ピン留めを外す",
-    "You can only pin up to %(count)s widgets|other": "ウィジェットのピン留めは%(count)s件までです",
+    "You can only pin up to %(count)s widgets": {
+        "other": "ウィジェットのピン留めは%(count)s件までです"
+    },
     "One of the following may be compromised:": "次のいずれかのセキュリティーが破られている可能性があります。",
     "Your messages are not secure": "あなたのメッセージは保護されていません",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "暗号化されたルームでは、あなたのメッセージは保護されています。メッセージのロックを解除するための固有の鍵は、あなたと受信者だけが持っています。",
@@ -1824,8 +1896,10 @@
     "Are you sure you want to leave the space '%(spaceName)s'?": "このスペース「%(spaceName)s」から退出してよろしいですか？",
     "This space is not public. You will not be able to rejoin without an invite.": "このスペースは公開されていません。再度参加するには、招待が必要です。",
     "You are the only person here. If you leave, no one will be able to join in the future, including you.": "このルームの参加者はあなただけです。退出すると、今後あなたを含めて誰もこのルームに参加できなくなります。",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "ルームを追加しています…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "ルームを追加しています…（計%(count)s個のうち%(progress)s個）",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "ルームを追加しています…",
+        "other": "ルームを追加しています…（計%(count)s個のうち%(progress)s個）"
+    },
     "Skip for now": "スキップ",
     "What do you want to organise?": "何を追加しますか？",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "ルームや会話を追加できます。これはあなた専用のスペースで、他の人からは見えません。後から追加することもできます。",
@@ -1962,8 +2036,10 @@
     "This upgrade will allow members of selected spaces access to this room without an invite.": "このアップグレードにより、選択したスペースのメンバーは、招待なしでこのルームにアクセスできるようになります。",
     "Select all": "全て選択",
     "Deselect all": "全ての選択を解除",
-    "Sign out devices|one": "端末からサインアウト",
-    "Sign out devices|other": "端末からサインアウト",
+    "Sign out devices": {
+        "one": "端末からサインアウト",
+        "other": "端末からサインアウト"
+    },
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "匿名のデータを共有すると、問題の特定に役立ちます。個人データの収集や、第三者とのデータ共有はありません。",
     "Hide sidebar": "サイドバーを表示しない",
     "Start sharing your screen": "画面共有を開始",
@@ -1974,8 +2050,10 @@
     "Failed to transfer call": "通話の転送に失敗しました",
     "Topic: %(topic)s": "トピック：%(topic)s",
     "Command error: Unable to handle slash command.": "コマンドエラー：スラッシュコマンドは使えません。",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)sと他%(count)s個",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)sと他%(count)s個",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)sと他%(count)s個",
+        "other": "%(spaceName)sと他%(count)s個"
+    },
     "%(space1Name)s and %(space2Name)s": "%(space1Name)sと%(space2Name)s",
     "%(date)s at %(time)s": "%(date)s %(time)s",
     "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>アップグレードすると、このルームの新しいバージョンが作成されます。</b>今ある全てのメッセージは、アーカイブしたルームに残ります。",
@@ -2016,8 +2094,10 @@
     "Automatically send debug logs when key backup is not functioning": "鍵のバックアップが機能していない際に、自動的にデバッグログを送信",
     "Automatically send debug logs on decryption errors": "復号化エラーが生じた際に、自動的にデバッグログを送信",
     "Automatically send debug logs on any error": "エラーが生じた際に、自動的にデバッグログを送信",
-    "%(count)s votes|one": "%(count)s個の投票",
-    "%(count)s votes|other": "%(count)s個の投票",
+    "%(count)s votes": {
+        "one": "%(count)s個の投票",
+        "other": "%(count)s個の投票"
+    },
     "Image": "画像",
     "Reply in thread": "スレッドで返信",
     "Decrypting": "復号化しています",
@@ -2079,9 +2159,14 @@
     "Message bubbles": "吹き出し",
     "Modern": "モダン",
     "Message layout": "メッセージのレイアウト",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "スペースを更新しています…",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "招待を送信しています…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "招待を送信しています…（計%(count)s件のうち%(progress)s件）",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "スペースを更新しています…",
+        "other": "スペースを更新しています…（計%(count)s個のうち%(progress)s個）"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "招待を送信しています…",
+        "other": "招待を送信しています…（計%(count)s件のうち%(progress)s件）"
+    },
     "Loading new room": "新しいルームを読み込んでいます",
     "Upgrading room": "ルームをアップグレードしています",
     "IRC (Experimental)": "IRC（実験的）",
@@ -2115,8 +2200,10 @@
     "Toggle hidden event visibility": "非表示のイベントの見え方を切り替える",
     "Spaces you know that contain this space": "このスペースを含む参加済のスペース",
     "Spaces you know that contain this room": "このルームを含む参加済のスペース",
-    "%(count)s members|one": "%(count)s人",
-    "%(count)s members|other": "%(count)s人",
+    "%(count)s members": {
+        "one": "%(count)s人",
+        "other": "%(count)s人"
+    },
     "Automatically invite members from this room to the new one": "このルームのメンバーを新しいルームに自動的に招待",
     "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "このルームにアクセスできるスペースを選択してください。選択したスペースのメンバーは<RoomName/>を検索し、参加できるようになります。",
     "Only people invited will be able to find and join this space.": "招待された人のみがこのスペースを検索し、参加できます。",
@@ -2226,10 +2313,14 @@
     "%(senderName)s made no change": "%(senderName)sは変更を加えませんでした",
     "%(senderName)s removed %(targetName)s": "%(senderName)sが%(targetName)sを追放しました",
     "%(senderName)s removed %(targetName)s: %(reason)s": "%(senderName)sが%(targetName)sを追放しました。理由：%(reason)s",
-    "was removed %(count)s times|one": "が追放されました",
-    "was removed %(count)s times|other": "が%(count)s回追放されました",
-    "were removed %(count)s times|one": "が追放されました",
-    "were removed %(count)s times|other": "が%(count)s回追放されました",
+    "was removed %(count)s times": {
+        "one": "が追放されました",
+        "other": "が%(count)s回追放されました"
+    },
+    "were removed %(count)s times": {
+        "one": "が追放されました",
+        "other": "が%(count)s回追放されました"
+    },
     "Original event source": "元のイベントのソースコード",
     "Invite by email": "電子メールで招待",
     "Start a conversation with someone using their name or username (like <userId/>).": "名前かユーザー名（<userId/>の形式）で検索して、チャットを開始しましょう。",
@@ -2256,10 +2347,14 @@
     "Invite anyway and never warn me again": "招待し、再び警告しない",
     "Recovery Method Removed": "復元方法を削除しました",
     "Failed to remove some rooms. Try again later": "いくつかのルームの削除に失敗しました。後でもう一度やり直してください",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sがメッセージを削除しました",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sが%(count)s件のメッセージを削除しました",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sがメッセージを削除しました",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sが%(count)s件のメッセージを削除しました",
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)sがメッセージを削除しました",
+        "other": "%(oneUser)sが%(count)s件のメッセージを削除しました"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sがメッセージを削除しました",
+        "other": "%(severalUsers)sが%(count)s件のメッセージを削除しました"
+    },
     "Remove from room": "ルームから追放",
     "Failed to remove user": "ユーザーの追放に失敗しました",
     "Success!": "成功しました！",
@@ -2272,7 +2367,10 @@
     "Search for spaces": "スペースを検索",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "規約は<PrivacyPolicyUrl>ここ</PrivacyPolicyUrl>で確認できます",
     "Share location": "位置情報を共有",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sが%(count)s回変更を加えませんでした",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)sが%(count)s回変更を加えませんでした",
+        "one": "%(severalUsers)sは変更を加えませんでした"
+    },
     "Feedback sent! Thanks, we appreciate it!": "フィードバックを送信しました！ありがとうございました！",
     "This is a beta feature": "この機能はベータ版です",
     "Maximise": "最大化",
@@ -2292,8 +2390,10 @@
     "Open user settings": "ユーザーの設定を開く",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "指定した日時（%(inputDate)s）を理解できませんでした。YYYY-MM-DDのフォーマットを使用してください。",
     "Some invites couldn't be sent": "いくつかの招待を送信できませんでした",
-    "Upload %(count)s other files|one": "あと%(count)s個のファイルをアップロード",
-    "Upload %(count)s other files|other": "あと%(count)s個のファイルをアップロード",
+    "Upload %(count)s other files": {
+        "one": "あと%(count)s個のファイルをアップロード",
+        "other": "あと%(count)s個のファイルをアップロード"
+    },
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "アップロードしようとしているファイルのサイズが<b>大きすぎます</b>。最大のサイズは%(limit)sですが、ファイルのサイズは%(sizeOfThisFile)sです。",
     "Approve": "同意",
     "Away": "離席中",
@@ -2307,16 +2407,26 @@
     "Room members": "ルームのメンバー",
     "Back to thread": "スレッドに戻る",
     "Create options": "選択肢を作成",
-    "View all %(count)s members|one": "1人のメンバーを表示",
-    "View all %(count)s members|other": "全%(count)s人のメンバーを表示",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sがサーバーのアクセス制御リストを変更しました",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sがサーバーのアクセス制御リストを%(count)s回変更しました",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sがサーバーのアクセス制御リストを変更しました",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sがサーバーのアクセス制御リストを%(count)s回変更しました",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sは変更を加えませんでした",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sが%(count)s回変更を加えませんでした",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sは変更を加えませんでした",
-    "<%(count)s spaces>|one": "<スペース>",
+    "View all %(count)s members": {
+        "one": "1人のメンバーを表示",
+        "other": "全%(count)s人のメンバーを表示"
+    },
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sがサーバーのアクセス制御リストを変更しました",
+        "other": "%(oneUser)sがサーバーのアクセス制御リストを%(count)s回変更しました"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)sがサーバーのアクセス制御リストを変更しました",
+        "other": "%(severalUsers)sがサーバーのアクセス制御リストを%(count)s回変更しました"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)sは変更を加えませんでした",
+        "other": "%(oneUser)sが%(count)s回変更を加えませんでした"
+    },
+    "<%(count)s spaces>": {
+        "one": "<スペース>",
+        "other": "<%(count)s個のスペース>"
+    },
     "Results will be visible when the poll is ended": "アンケートが終了するまで結果は表示できません",
     "Open thread": "スレッドを開く",
     "Pinned": "固定メッセージ",
@@ -2375,8 +2485,10 @@
     "Device verified": "端末が認証されました",
     "This session is encrypting history using the new recovery method.": "このセッションでは新しい復元方法で履歴を暗号化しています。",
     "Go to Settings": "設定を開く",
-    "%(count)s rooms|one": "%(count)s個のルーム",
-    "%(count)s rooms|other": "%(count)s個のルーム",
+    "%(count)s rooms": {
+        "one": "%(count)s個のルーム",
+        "other": "%(count)s個のルーム"
+    },
     "Would you like to leave the rooms in this space?": "このスペースのルームから退出しますか？",
     "Don't leave any rooms": "どのルームからも退出しない",
     "Unable to upload": "アップロードできません",
@@ -2422,7 +2534,10 @@
     "Enable encryption in settings.": "暗号化を設定から有効にする。",
     "Reply to thread…": "スレッドに返信…",
     "Reply to encrypted thread…": "暗号化されたスレッドに返信…",
-    "Show %(count)s other previews|one": "他%(count)s個のプレビューを表示",
+    "Show %(count)s other previews": {
+        "one": "他%(count)s個のプレビューを表示",
+        "other": "他%(count)s個のプレビューを表示"
+    },
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "このユーザーを認証すると、信頼済として表示します。ユーザーを信頼すると、より一層安心してエンドツーエンド暗号化を使用することができます。",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "この端末を認証すると、信頼済として表示します。相手の端末を信頼すると、より一層安心してエンドツーエンド暗号化を使用することができます。",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "以下のMatrix IDのプロフィールを発見できません。招待しますか？",
@@ -2539,16 +2654,25 @@
     "You cancelled verification on your other device.": "他の端末で認証がキャンセルされました。",
     "You won't be able to rejoin unless you are re-invited.": "再び招待されない限り、再参加することはできません。",
     "Search %(spaceName)s": "%(spaceName)sを検索",
-    "Fetched %(count)s events out of %(total)s|one": "計%(total)s個のうち%(count)s個のイベントを取得しました",
-    "Fetched %(count)s events out of %(total)s|other": "計%(total)s個のうち%(count)s個のイベントを取得しました",
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "計%(total)s個のうち%(count)s個のイベントを取得しました",
+        "other": "計%(total)s個のうち%(count)s個のイベントを取得しました"
+    },
     "Are you sure you want to exit during this export?": "エクスポートを中断してよろしいですか？",
-    "Fetched %(count)s events so far|one": "%(count)s個のイベントを取得しました",
-    "Fetched %(count)s events so far|other": "%(count)s個のイベントを取得しました",
+    "Fetched %(count)s events so far": {
+        "one": "%(count)s個のイベントを取得しました",
+        "other": "%(count)s個のイベントを取得しました"
+    },
     "Processing event %(number)s out of %(total)s": "計%(total)s個のうち%(number)s個のイベントを処理しています",
     "Error fetching file": "ファイルの取得中にエラーが発生しました",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s個のイベントを%(seconds)s秒でエクスポートしました",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s個のイベントを%(seconds)s秒でエクスポートしました",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s個のイベントを%(seconds)s秒で取得しました",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s個のイベントを%(seconds)s秒でエクスポートしました",
+        "other": "%(count)s個のイベントを%(seconds)s秒でエクスポートしました"
+    },
+    "Fetched %(count)s events in %(seconds)ss": {
+        "other": "%(count)s個のイベントを%(seconds)s秒で取得しました",
+        "one": "%(count)s個のイベントを%(seconds)s秒で取得しました"
+    },
     "That's fine": "問題ありません",
     "Your new device is now verified. Other users will see it as trusted.": "端末が認証されました。他のユーザーに「信頼済」として表示されます。",
     "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "新しい端末が認証されました。端末は暗号化されたメッセージにアクセスすることができます。また、端末は他のユーザーに「信頼済」として表示されます。",
@@ -2569,7 +2693,6 @@
     "Got an account? <a>Sign in</a>": "アカウントがありますか？<a>サインインしてください</a>",
     "New here? <a>Create an account</a>": "初めてですか？<a>アカウントを作成しましょう</a>",
     "Identity server URL does not appear to be a valid identity server": "これは正しいIDサーバーのURLではありません",
-    "<%(count)s spaces>|other": "<%(count)s個のスペース>",
     "Create key backup": "鍵のバックアップを作成",
     "My current location": "自分の現在の位置情報",
     "My live location": "自分の位置情報（ライブ）",
@@ -2579,7 +2702,10 @@
     "%(brand)s could not send your location. Please try again later.": "%(brand)sは位置情報を送信できませんでした。後でもう一度やり直してください。",
     "Could not fetch location": "位置情報を取得できませんでした",
     "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "通常、ダイレクトメッセージは暗号化されていますが、このルームは暗号化されていません。一般にこれは、非サポートの端末が使用されているか、電子メールなどによる招待が行われたことが理由です。",
-    "%(count)s reply|other": "%(count)s件の返信",
+    "%(count)s reply": {
+        "other": "%(count)s件の返信",
+        "one": "%(count)s件の返信"
+    },
     "Call declined": "拒否しました",
     "Unable to check if username has been taken. Try again later.": "そのユーザー名が既に取得されているか確認できません。後でもう一度やり直してください。",
     "Show tray icon and minimise window to it on close": "トレイアイコンを表示し、ウインドウを閉じるとトレイに最小化",
@@ -2592,22 +2718,29 @@
     "Enter your Security Phrase a second time to confirm it.": "確認のため、セキュリティーフレーズを再入力してください。",
     "Enter a Security Phrase": "セキュリティーフレーズを入力",
     "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "このセキュリティーフレーズではバックアップを復号化できませんでした。正しいセキュリティーフレーズを入力したことを確認してください。",
-    "%(count)s reply|one": "%(count)s件の返信",
     "Switches to this room's virtual room, if it has one": "このルームのバーチャルルームに移動（あれば）",
     "No virtual room for this room": "このルームのバーチャルルームはありません",
     "Drop a Pin": "場所を選択",
     "No votes cast": "投票がありません",
     "What is your poll question or topic?": "アンケートの質問、あるいはトピックは何でしょうか？",
     "Failed to post poll": "アンケートの作成に失敗しました",
-    "Based on %(count)s votes|one": "%(count)s個の投票に基づく",
-    "Based on %(count)s votes|other": "%(count)s個の投票に基づく",
-    "Final result based on %(count)s votes|one": "合計%(count)s票に基づく最終結果",
-    "Final result based on %(count)s votes|other": "合計%(count)s票に基づく最終結果",
+    "Based on %(count)s votes": {
+        "one": "%(count)s個の投票に基づく",
+        "other": "%(count)s個の投票に基づく"
+    },
+    "Final result based on %(count)s votes": {
+        "one": "合計%(count)s票に基づく最終結果",
+        "other": "合計%(count)s票に基づく最終結果"
+    },
     "Sorry, you can't edit a poll after votes have been cast.": "投票があったアンケートは編集できません。",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sが1件の非表示のメッセージを送信しました",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sが%(count)s件の非表示のメッセージを送信しました",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sが1件の非表示のメッセージを送信しました",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sが%(count)s件の非表示のメッセージを送信しました",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sが1件の非表示のメッセージを送信しました",
+        "other": "%(oneUser)sが%(count)s件の非表示のメッセージを送信しました"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sが1件の非表示のメッセージを送信しました",
+        "other": "%(severalUsers)sが%(count)s件の非表示のメッセージを送信しました"
+    },
     "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "アンケートを終了してよろしいですか？投票を締め切り、最終結果を表示します。",
     "Call": "通話",
     "Your camera is still enabled": "カメラがまだ有効です",
@@ -2627,10 +2760,14 @@
     "The poll has ended. Top answer: %(topAnswer)s": "アンケートが終了しました。最も多い投票数を獲得した選択肢：%(topAnswer)s",
     "The poll has ended. No votes were cast.": "アンケートが終了しました。投票はありませんでした。",
     "Value in this room:": "このルームでの値：",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "シングルサインオンを使用して本人確認を行い、端末からのログアウトを承認してください。",
-    "Click the button below to confirm signing out these devices.|one": "下のボタンをクリックして、端末からのログアウトを承認してください。",
-    "Click the button below to confirm signing out these devices.|other": "下のボタンをクリックして、端末からのログアウトを承認してください。",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "シングルサインオンを使用して本人確認を行い、端末からのログアウトを承認してください。",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "シングルサインオンを使用して本人確認を行い、端末からのログアウトを承認してください。",
+        "other": "シングルサインオンを使用して本人確認を行い、端末からのログアウトを承認してください。"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "下のボタンをクリックして、端末からのログアウトを承認してください。",
+        "other": "下のボタンをクリックして、端末からのログアウトを承認してください。"
+    },
     "Waiting for you to verify on your other device…": "他の端末での認証を待機しています…",
     "Light high contrast": "ライト（高コントラスト）",
     "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)sがアンケートを開始しました - %(pollQuestion)s",
@@ -2642,7 +2779,6 @@
     "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!": "ここでコピーペーストを行うように伝えられた場合は、あなたが詐欺の対象となっている可能性が非常に高いです！",
     "You don't have permission to view messages from before you joined.": "参加する前のメッセージを表示する権限がありません。",
     "You don't have permission to view messages from before you were invited.": "招待される前のメッセージを表示する権限がありません。",
-    "Show %(count)s other previews|other": "他%(count)s個のプレビューを表示",
     "Error processing audio message": "音声メッセージを処理する際にエラーが発生しました",
     "The beginning of the room": "ルームの先頭",
     "Jump to date": "日付に移動",
@@ -2686,7 +2822,6 @@
     "Olm version:": "Olmのバージョン：",
     "There was an error loading your notification settings.": "通知設定を読み込む際にエラーが発生しました。",
     "Error saving notification preferences": "通知の設定を保存する際にエラーが発生しました",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "スペースを更新しています…（計%(count)s個のうち%(progress)s個）",
     "Message search initialisation failed": "メッセージの検索機能の初期化に失敗しました",
     "Failed to update the visibility of this space": "このスペースの見え方の更新に失敗しました",
     "Your server requires encryption to be enabled in private rooms.": "このサーバーでは、非公開のルームでは暗号化を有効にする必要があります。",
@@ -2762,8 +2897,10 @@
     "Value in this room": "このルームでの値",
     "Visible to space members": "スペースの参加者に表示",
     "Search names and descriptions": "名前と説明文を検索",
-    "Currently joining %(count)s rooms|one": "現在%(count)s個のルームに参加しています",
-    "Currently joining %(count)s rooms|other": "現在%(count)s個のルームに参加しています",
+    "Currently joining %(count)s rooms": {
+        "one": "現在%(count)s個のルームに参加しています",
+        "other": "現在%(count)s個のルームに参加しています"
+    },
     "Error downloading audio": "音声をダウンロードする際にエラーが発生しました",
     "Share entire screen": "全画面を共有",
     "Show polls button": "アンケートのボタンを表示",
@@ -2789,8 +2926,10 @@
     "Message search initialisation failed, check <a>your settings</a> for more information": "メッセージの検索の初期化に失敗しました。<a>設定</a>から詳細を確認してください",
     "Any of the following data may be shared:": "以下のデータが共有される可能性があります：",
     "%(reactors)s reacted with %(content)s": "%(reactors)sは%(content)sでリアクションしました",
-    "%(count)s votes cast. Vote to see the results|one": "合計%(count)s票。投票すると結果を確認できます",
-    "%(count)s votes cast. Vote to see the results|other": "合計%(count)s票。投票すると結果を確認できます",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "合計%(count)s票。投票すると結果を確認できます",
+        "other": "合計%(count)s票。投票すると結果を確認できます"
+    },
     "Some encryption parameters have been changed.": "暗号化のパラメーターのいくつかが変更されました。",
     "The call is in an unknown state!": "通話の状態が不明です！",
     "Verify this device by completing one of the following:": "以下のいずれかでこの端末を認証してください：",
@@ -2798,18 +2937,24 @@
     "Failed to update the join rules": "参加のルールの更新に失敗しました",
     "Surround selected text when typing special characters": "特殊な文字の入力中に、選択した文章を囲む",
     "Let moderators hide messages pending moderation.": "モデレーターに、保留中のモデレーションのメッセージを非表示にすることを許可。",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sがこのルームの<a>固定メッセージ</a>を変更しました",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sがこのルームの<a>固定メッセージ</a>を変更しました",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(severalUsers)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました",
+        "one": "%(severalUsers)sがこのルームの<a>固定メッセージ</a>を変更しました"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(oneUser)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました",
+        "one": "%(oneUser)sがこのルームの<a>固定メッセージ</a>を変更しました"
+    },
     "They'll still be able to access whatever you're not an admin of.": "あなたが管理者ではないスペースやルームには、引き続きアクセスできます。",
     "Setting definition:": "設定の定義：",
     "Restore your key backup to upgrade your encryption": "鍵のバックアップを復元し、暗号化をアップグレードしてください",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "セキュリティーフレーズと、セキュアメッセージの鍵が削除されました。",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "偶然削除してしまった場合は、このセッションで、メッセージの暗号化を設定することができます。設定すると、新しい復元方法でセッションのデータを改めて暗号化します。",
     "Message downloading sleep time(ms)": "メッセージをダウンロードする際の待機時間（ミリ秒）",
-    "%(count)s people you know have already joined|one": "%(count)s人の知人が既に参加しています",
-    "%(count)s people you know have already joined|other": "%(count)s人の知人が既に参加しています",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s人の知人が既に参加しています",
+        "other": "%(count)s人の知人が既に参加しています"
+    },
     "Sections to show": "表示するセクション",
     "Missing domain separator e.g. (:domain.org)": "ドメイン名のセパレーターが入力されていません。例は:domain.orgとなります",
     "Missing room name or separator e.g. (my-room:domain.org)": "ルーム名あるいはセパレーターが入力されていません。例はmy-room:domain.orgとなります",
@@ -2820,7 +2965,6 @@
     "Media omitted": "メディアファイルは省かれました",
     "See when people join, leave, or are invited to your active room": "アクティブなルームに参加、退出、招待された日時を表示",
     "Remove, ban, or invite people to your active room, and make you leave": "アクティブなルームから追放、ブロック、ルームに招待、また、退出を要求",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s個のイベントを%(seconds)s秒で取得しました",
     "What are some things you want to discuss in %(spaceName)s?": "%(spaceName)sのテーマは何でしょうか？",
     "You can add more later too, including already existing ones.": "ルームは後からも追加できます。",
     "Let's create a room for each of them.": "テーマごとにルームを作りましょう。",
@@ -2887,8 +3031,10 @@
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "もしGitHubで不具合を報告した場合は、デバッグログが問題の解決に役立ちます。 ",
     "Live location error": "位置情報（ライブ）のエラー",
     "sends hearts": "ハートを送信",
-    "Confirm signing out these devices|other": "端末からのサインアウトを承認",
-    "Confirm signing out these devices|one": "端末からのサインアウトを承認",
+    "Confirm signing out these devices": {
+        "other": "端末からのサインアウトを承認",
+        "one": "端末からのサインアウトを承認"
+    },
     "View live location": "位置情報（ライブ）を表示",
     "Failed to join": "参加に失敗しました",
     "The person who invited you has already left, or their server is offline.": "招待した人が既に退出したか、サーバーがオフラインです。",
@@ -2923,8 +3069,10 @@
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "ルームまたはスペースにアクセスする際にエラー %(errcode)s が発生しました。エラー発生時にこのメッセージが表示されているなら、<issueLink>バグレポートを送信してください</issueLink>。",
     "New room": "新しいルーム",
     "New video room": "新しいビデオ通話ルーム",
-    "%(count)s participants|other": "%(count)s人の参加者",
-    "%(count)s participants|one": "1人の参加者",
+    "%(count)s participants": {
+        "other": "%(count)s人の参加者",
+        "one": "1人の参加者"
+    },
     "Create a video room": "ビデオ通話ルームを作成",
     "Create video room": "ビデオ通話ルームを作成",
     "Create room": "ルームを作成",
@@ -2936,7 +3084,10 @@
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "ユーザーの投稿内容が正しくない。\nこのユーザーをルームのモデレーターに報告します。",
     "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "その他の理由。問題を記入してください。\nルームのモデレーターに報告します。",
     "Please pick a nature and describe what makes this message abusive.": "特徴を選び、このメッセージを報告する理由を記入してください。",
-    "Currently, %(count)s spaces have access|other": "現在%(count)s個のスペースがアクセスできます",
+    "Currently, %(count)s spaces have access": {
+        "other": "現在%(count)s個のスペースがアクセスできます",
+        "one": "現在1個のスペースがアクセスできます"
+    },
     "Previous recently visited room or space": "以前に訪問したルームあるいはスペース",
     "Next recently visited room or space": "以後に訪問したルームあるいはスペース",
     "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)sは携帯端末のウェブブラウザーでは実験的です。よりよい使用経験や最新機能を求める場合は、フリーのネイティブアプリをご利用ください。",
@@ -2986,11 +3137,15 @@
     "Video call started in %(roomName)s.": "ビデオ通話が%(roomName)sで開始しました。",
     "You need to be able to kick users to do that.": "それを行うにはユーザーをキックする権限が必要です。",
     "Empty room (was %(oldName)s)": "空のルーム（以前の名前は%(oldName)s）",
-    "Inviting %(user)s and %(count)s others|one": "%(user)sと1人を招待しています",
-    "Inviting %(user)s and %(count)s others|other": "%(user)sと%(count)s人を招待しています",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "%(user)sと1人を招待しています",
+        "other": "%(user)sと%(count)s人を招待しています"
+    },
     "Inviting %(user1)s and %(user2)s": "%(user1)sと%(user2)sを招待しています",
-    "%(user)s and %(count)s others|one": "%(user)sと1人",
-    "%(user)s and %(count)s others|other": "%(user)sと%(count)s人",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)sと1人",
+        "other": "%(user)sと%(count)s人"
+    },
     "Video call started": "ビデオ通話を開始しました",
     "Unknown room": "不明のルーム",
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "以前あなたは利用状況に関する匿名データの共有に同意しました。私たちはそれが機能する仕方を更新しています。",
@@ -2998,9 +3153,14 @@
     "Location not available": "位置情報は利用できません",
     "Find my location": "位置を発見",
     "Map feedback": "地図のフィードバック",
-    "In %(spaceName)s and %(count)s other spaces.|one": "%(spaceName)sと他%(count)s個のスペース。",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "このルームの以前のバージョンに、未読の通知が%(count)s件あります。",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "このルームの以前のバージョンに、未読の通知が%(count)s件あります。",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "%(spaceName)sと他%(count)s個のスペース。",
+        "other": "スペース %(spaceName)s と他%(count)s個のスペース内。"
+    },
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "このルームの以前のバージョンに、未読の通知が%(count)s件あります。",
+        "other": "このルームの以前のバージョンに、未読の通知が%(count)s件あります。"
+    },
     "Remember my selection for this widget": "このウィジェットに関する選択を記憶",
     "Unable to load commit detail: %(msg)s": "コミットの詳細を読み込めません：%(msg)s",
     "Capabilities": "機能",
@@ -3072,7 +3232,10 @@
     "Ignore user": "ユーザーを無視",
     "Proxy URL (optional)": "プロクシーのURL（任意）",
     "Proxy URL": "プロクシーのURL",
-    "%(count)s Members|other": "%(count)s人の参加者",
+    "%(count)s Members": {
+        "other": "%(count)s人の参加者",
+        "one": "%(count)s人の参加者"
+    },
     "%(securityKey)s or %(recoveryFile)s": "%(securityKey)sまたは%(recoveryFile)s",
     "Edit values": "値の編集",
     "Input devices": "入力装置",
@@ -3134,8 +3297,10 @@
     "Welcome to %(brand)s": "%(brand)sにようこそ",
     "Find your co-workers": "同僚を見つける",
     "Start your first chat": "最初のチャットを始めましょう",
-    "%(count)s people joined|one": "%(count)s人が参加しました",
-    "%(count)s people joined|other": "%(count)s人が参加しました",
+    "%(count)s people joined": {
+        "one": "%(count)s人が参加しました",
+        "other": "%(count)s人が参加しました"
+    },
     "Video devices": "ビデオ装置",
     "Audio devices": "オーディオ装置",
     "Turn on notifications": "通知を有効にする",
@@ -3171,8 +3336,10 @@
     "Spotlight": "スポットライト",
     "There's no one here to call": "ここには通話できる人はいません",
     "Read receipts": "開封確認メッセージ",
-    "Seen by %(count)s people|one": "%(count)s人が閲覧済",
-    "Seen by %(count)s people|other": "%(count)s人が閲覧済",
+    "Seen by %(count)s people": {
+        "one": "%(count)s人が閲覧済",
+        "other": "%(count)s人が閲覧済"
+    },
     "%(members)s and %(last)s": "%(members)sと%(last)s",
     "Hide formatting": "フォーマットを表示しない",
     "Show formatting": "フォーマットを表示",
@@ -3221,8 +3388,10 @@
     "Text": "テキスト",
     "Link": "リンク",
     "Freedom": "自由",
-    "%(count)s sessions selected|one": "%(count)s個のセッションを選択済",
-    "%(count)s sessions selected|other": "%(count)s個のセッションを選択済",
+    "%(count)s sessions selected": {
+        "one": "%(count)s個のセッションを選択済",
+        "other": "%(count)s個のセッションを選択済"
+    },
     "No sessions found.": "セッションが見つかりません。",
     "Unverified sessions": "未認証のセッション",
     "Sign out of all other sessions (%(otherSessionsCount)s)": "他のすべてのセッションからサインアウト（%(otherSessionsCount)s）",
@@ -3235,8 +3404,10 @@
     "Voice processing": "音声を処理しています",
     "Automatically adjust the microphone volume": "マイクの音量を自動的に調節",
     "For best security, verify your sessions and sign out from any session that you don't recognize or use anymore.": "セキュリティーを最大限に高めるには、セッションを認証し、不明なセッションや使用していないセッションからサインアウトしてください。",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "%(count)s個のセッションからサインアウトしてよろしいですか？",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "%(count)s個のセッションからサインアウトしてよろしいですか？",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "%(count)s個のセッションからサインアウトしてよろしいですか？",
+        "other": "%(count)s個のセッションからサインアウトしてよろしいですか？"
+    },
     "Bulk options": "一括オプション",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "ハードウェアアクセラレーションを有効にする（%(appName)sを再起動すると有効になります）",
     "Your server doesn't support disabling sending read receipts.": "あなたのサーバーは開封確認メッセージの送信防止をサポートしていません。",
@@ -3305,8 +3476,10 @@
     "An error occurred whilst sharing your live location": "位置情報（ライブ）を共有している際にエラーが発生しました",
     "An error occurred while stopping your live location": "位置情報（ライブ）を停止する際にエラーが発生しました",
     "Leaving the beta will reload %(brand)s.": "ベータ版を終了すると%(brand)sをリロードします。",
-    "Only %(count)s steps to go|one": "あと%(count)sつのステップです",
-    "Only %(count)s steps to go|other": "あと%(count)sつのステップです",
+    "Only %(count)s steps to go": {
+        "one": "あと%(count)sつのステップです",
+        "other": "あと%(count)sつのステップです"
+    },
     "You did it!": "完了しました！",
     "Find your people": "知人を見つける",
     "Secure messaging for work": "仕事で安全なメッセージングを",
@@ -3329,7 +3502,6 @@
     "Close call": "通話を終了",
     "Verified sessions": "認証済のセッション",
     "Search for": "検索",
-    "%(count)s Members|one": "%(count)s人の参加者",
     "%(timeRemaining)s left": "残り%(timeRemaining)s",
     "Started": "開始済",
     "Requested": "要求済",
@@ -3383,8 +3555,10 @@
     "Wrong email address?": "メールアドレスが正しくありませんか？",
     "Re-enter email address": "メールアドレスを再入力",
     "For best security and privacy, it is recommended to use Matrix clients that support encryption.": "セキュリティーとプライバシー保護の観点から、暗号化をサポートしているMatrixのクライアントの使用を推奨します。",
-    "Sign out of %(count)s sessions|other": "%(count)s件のセッションからサインアウト",
-    "Sign out of %(count)s sessions|one": "%(count)s件のセッションからサインアウト",
+    "Sign out of %(count)s sessions": {
+        "other": "%(count)s件のセッションからサインアウト",
+        "one": "%(count)s件のセッションからサインアウト"
+    },
     "Unable to play this voice broadcast": "この音声配信を再生できません",
     "Registration token": "登録用トークン",
     "Enter a registration token provided by the homeserver administrator.": "ホームサーバーの管理者から提供された登録用トークンを入力してください。",
@@ -3416,8 +3590,10 @@
     "Reset your password": "パスワードを再設定",
     "Sign out of all devices": "全ての端末からサインアウト",
     "Confirm new password": "新しいパスワードを確認",
-    "Currently removing messages in %(count)s rooms|one": "現在%(count)s個のルームのメッセージを削除しています",
-    "Currently removing messages in %(count)s rooms|other": "現在%(count)s個のルームのメッセージを削除しています",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "現在%(count)s個のルームのメッセージを削除しています",
+        "other": "現在%(count)s個のルームのメッセージを削除しています"
+    },
     "Verify or sign out from this session for best security and reliability.": "セキュリティーと安定性の観点から、このセッションを認証するかサインアウトしてください。",
     "Review and approve the sign in": "サインインを確認して承認",
     "By approving access for this device, it will have full access to your account.": "この端末へのアクセスを許可すると、あなたのアカウントに完全にアクセスできるようになります。",
@@ -3441,10 +3617,11 @@
     "Message pending moderation: %(reason)s": "メッセージはモデレートの保留中です：%(reason)s",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "招待の検証を試みる際にエラー（%(errcode)s）が発生しました。あなたを招待した人にこの情報を渡してみてください。",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "管理者コマンド：現在のアウトバウンドグループセッションを破棄して、新しいOlmセッションを設定",
-    "Currently, %(count)s spaces have access|one": "現在1個のスペースがアクセスできます",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "このユーザーに関するシステムメッセージ（メンバーシップの変更、プロフィールの変更など）も削除したい場合は、チェックを外してください",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "%(user)sによる%(count)s件のメッセージを削除しようとしています。これは会話に参加している全員からメッセージを永久に削除します。続行してよろしいですか？",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "%(user)sによる%(count)s件のメッセージを削除しようとしています。これは会話に参加している全員からメッセージを永久に削除します。続行してよろしいですか？",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "%(user)sによる%(count)s件のメッセージを削除しようとしています。これは会話に参加している全員からメッセージを永久に削除します。続行してよろしいですか？",
+        "other": "%(user)sによる%(count)s件のメッセージを削除しようとしています。これは会話に参加している全員からメッセージを永久に削除します。続行してよろしいですか？"
+    },
     "This provides them with confidence that they are really speaking to you, but it also means they can see the session name you enter here.": "セッションの一覧から、相手はあなたとやり取りしていることを確かめることができます。なお、あなたがここに入力するセッション名は相手に対して表示されます。",
     "Your message wasn't sent because this homeserver has been blocked by its administrator. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーが管理者によりブロックされているため、メッセージを送信できませんでした。サービスを引き続き使用するには、<a>サービスの管理者にお問い合わせ</a>ください。",
     "You may want to try a different search or check for typos.": "別のキーワードで検索するか、キーワードが正しいか確認してください。",
@@ -3521,7 +3698,6 @@
     "Sliding Sync mode": "スライド式同期モード",
     "Use rich text instead of Markdown in the message composer.": "メッセージ入力欄でマークダウンの代わりにリッチテキストを使用。",
     "In %(spaceName)s.": "スペース %(spaceName)s内。",
-    "In %(spaceName)s and %(count)s other spaces.|other": "スペース %(spaceName)s と他%(count)s個のスペース内。",
     "In spaces %(space1Name)s and %(space2Name)s.": "スペース %(space1Name)sと%(space2Name)s内。",
     "The above, but in <Room /> as well": "上記、ただし<Room />でも同様",
     "The above, but in any room you are joined or invited to as well": "上記、ただし参加または招待されたルームでも同様",
diff --git a/src/i18n/strings/jbo.json b/src/i18n/strings/jbo.json
index 2166cf642a..c17fe7281b 100644
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@@ -157,10 +157,14 @@
     "%(senderDisplayName)s made the room invite only.": ".i ro da zo'u gau la'o zoi. %(senderDisplayName)s .zoi lo nu de friti le ka ziljmina le se zilbe'i kei da sarcu",
     "%(senderDisplayName)s has allowed guests to join the room.": ".i la'o zoi. %(senderDisplayName)s .zoi curmi lo nu ro na te friti cu ka'e ziljmina le se zilbe'i",
     "%(senderDisplayName)s has prevented guests from joining the room.": ".i la'o zoi. %(senderDisplayName)s .zoi na curmi lo nu ro na te friti cu ka'e ziljmina le se zilbe'i",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'a judri le se zilbe'i",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'a judri le se zilbe'i",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'u judri le se zilbe'i",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'u judri le se zilbe'i",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'a judri le se zilbe'i",
+        "one": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'a judri le se zilbe'i"
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'u judri le se zilbe'i",
+        "one": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'u judri le se zilbe'i"
+    },
     "%(senderName)s changed the alternative addresses for this room.": ".i gau la'o zoi. %(senderName)s .zoi pa na ralju cu basti da le ka judri le se zilbe'i",
     "%(senderName)s changed the main and alternative addresses for this room.": ".i gau la'o zoi. %(senderName)s .zoi pa ralju je pa na ralju cu basti da le ka judri le se zilbe'i",
     "%(senderName)s changed the addresses for this room.": ".i gau la'o zoi. %(senderName)s .zoi da basti de le ka judri le se zilbe'i",
@@ -239,8 +243,10 @@
     "Search": "nu sisku",
     "People": "prenu",
     "Rooms": "ve zilbe'i",
-    "Show %(count)s more|other": "nu viska %(count)s na du",
-    "Show %(count)s more|one": "nu viska %(count)s na du",
+    "Show %(count)s more": {
+        "other": "nu viska %(count)s na du",
+        "one": "nu viska %(count)s na du"
+    },
     "Search…": "nu sisku",
     "Sunday": "li jy. dy. ze detri",
     "Monday": "li jy. dy. pa detri",
@@ -271,8 +277,10 @@
     "Not Trusted": "na se lacri",
     "Done": "nu mo'u co'e",
     "%(displayName)s is typing …": ".i la'o zoi. %(displayName)s .zoi ca'o ciska",
-    "%(names)s and %(count)s others are typing …|other": ".i la'o zoi. %(names)s .zoi je %(count)s na du ca'o ciska",
-    "%(names)s and %(count)s others are typing …|one": ".i la'o zoi. %(names)s .zoi je pa na du ca'o ciska",
+    "%(names)s and %(count)s others are typing …": {
+        "other": ".i la'o zoi. %(names)s .zoi je %(count)s na du ca'o ciska",
+        "one": ".i la'o zoi. %(names)s .zoi je pa na du ca'o ciska"
+    },
     "%(names)s and %(lastPerson)s are typing …": ".i la'o zoi. %(names)s .zoi je la'o zoi. %(lastPerson)s .zoi ca'o ciska",
     "Cannot reach homeserver": ".i ca ku na da ka'e zilbe'i le samtcise'u",
     "Match system theme": "nu mapti le jvinu be le vanbi",
@@ -326,11 +334,15 @@
     "Messages in this room are not end-to-end encrypted.": ".i na pa zilbe'i be fo le cei'i cu mifra",
     "Trusted": "se lacri",
     "Not trusted": "na se lacri",
-    "%(count)s verified sessions|other": ".i lacri %(count)s se samtcise'u",
-    "%(count)s verified sessions|one": ".i lacri pa se samtcise'u",
+    "%(count)s verified sessions": {
+        "other": ".i lacri %(count)s se samtcise'u",
+        "one": ".i lacri pa se samtcise'u"
+    },
     "Hide verified sessions": "nu ro se samtcise'u poi se lacri cu zilmipri",
-    "%(count)s sessions|other": ".i samtcise'u %(count)s da",
-    "%(count)s sessions|one": ".i samtcise'u %(count)s da",
+    "%(count)s sessions": {
+        "other": ".i samtcise'u %(count)s da",
+        "one": ".i samtcise'u %(count)s da"
+    },
     "Hide sessions": "nu ro se samtcise'u cu zilmipri",
     "Invite": "nu friti le ka ziljmina",
     "Logout": "nu co'u jaspu",
@@ -351,7 +363,9 @@
     "Sign out": "nu co'u jaspu",
     "Are you sure you want to sign out?": ".i xu do birti le du'u do kaidji le ka co'u se jaspu",
     "Sign out and remove encryption keys?": ".i xu do djica lo nu co'u jaspu do je lo nu tolmo'i le du'u mifra ckiku",
-    "Upload %(count)s other files|one": "nu kibdu'a %(count)s vreji poi na du",
+    "Upload %(count)s other files": {
+        "one": "nu kibdu'a %(count)s vreji poi na du"
+    },
     "Are you sure you want to leave the room '%(roomName)s'?": ".i xu do birti le du'u do kaidji le ka co'u pagbu le se zilbe'i be fo la'o zoi. %(roomName)s .zoi",
     "For security, this session has been signed out. Please sign in again.": ".i ki'u lo nu snura co'u jaspu le se samtcise'u .i ko za'u re'u co'a se jaspu",
     "React": "nu cinmo spuda",
diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json
index ebef804197..96012af630 100644
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@@ -399,16 +399,23 @@
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s yefka tisirag i uttekki deg texxamt.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s yuzen-d tugna.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s yekkes tansa tagejdant n texxamt-a.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s yerna tansiwin-nniḍen %(addresses)s ɣer texxamt-a.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s yerna tansiwin-nniḍen %(addresses)s ɣer texxamt-a.",
+        "one": "%(senderName)s yerna tansa-nniḍen %(addresses)s i texxamt-a."
+    },
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s awiǧit yettwarna sɣur %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s awiǧit yettwakkes sɣur %(senderName)s",
     "Not Trusted": "Ur yettwattkal ara",
     "%(displayName)s is typing …": "%(displayName)s yettaru-d …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s d %(count)s wiyaḍ ttarun-d …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s d wayeḍ-nniḍen yettaru-d …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s d %(count)s wiyaḍ ttarun-d …",
+        "one": "%(names)s d wayeḍ-nniḍen yettaru-d …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s d %(lastPerson)s ttarun-d …",
-    "%(items)s and %(count)s others|other": "%(items)s d %(count)s wiyaḍ",
-    "%(items)s and %(count)s others|one": "%(items)s d wayeḍ-nniḍen",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s d %(count)s wiyaḍ",
+        "one": "%(items)s d wayeḍ-nniḍen"
+    },
     "%(items)s and %(lastItem)s": "%(items)s d %(lastItem)s",
     "a few seconds ago": "kra n tesinin seg yimir-nni",
     "about a minute ago": "tasdidt seg yimir-nni",
@@ -543,9 +550,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ur yeǧǧi ara i yimerza ad kecmen ɣer texxamt.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ibeddel anekcum n yimerza s %(rule)s",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s yesbadu tansa tagejdant i texxamt-a s %(address)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s yerna tansa-nniḍen %(addresses)s i texxamt-a.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s yekkes tansa-nni-nniḍen %(addresses)s i texxamt-a.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s yekkes tansa-nni tayeḍ %(addresses)s i texxamt-a.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s yekkes tansa-nni-nniḍen %(addresses)s i texxamt-a.",
+        "one": "%(senderName)s yekkes tansa-nni tayeḍ %(addresses)s i texxamt-a."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ibeddel tansa-nni tayeḍ n texxamt-a.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ibeddel tansa tagejdant d tansa-nni tayeḍ i texxamt-a.",
     "Sends a message as html, without interpreting it as markdown": "Yuzen izen d html war ma isegza-t belli d tukksa n tecreḍt",
@@ -663,8 +671,10 @@
     "Encrypted by a deleted session": "Yettuwgelhen s texxamt yettwakksen",
     "Scroll to most recent messages": "Drurem ɣer yiznan akk n melmi kan",
     "Close preview": "Mdel taskant",
-    "and %(count)s others...|other": "d %(count)s wiyaḍ...",
-    "and %(count)s others...|one": "d wayeḍ-nniḍen...",
+    "and %(count)s others...": {
+        "other": "d %(count)s wiyaḍ...",
+        "one": "d wayeḍ-nniḍen..."
+    },
     "Invite to this room": "Nced-d ɣer texxamt-a",
     "Filter room members": "Sizdeg iɛeggalen n texxamt",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (i iǧehden %(powerLevelNumber)s",
@@ -679,7 +689,10 @@
     "Idle for %(duration)s": "D arurmid azal n %(duration)s",
     "Offline for %(duration)s": "Beṛṛa n tuqqna  azal n %(duration)s",
     "Replying": "Tiririt",
-    "(~%(count)s results)|one": "(~%(count)s igmaḍ)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s igmaḍ)",
+        "other": "(~%(count)s igmaḍ)"
+    },
     "Join Room": "Rnu ɣer texxamt",
     "Forget room": "Tettuḍ taxxamt",
     "Rooms": "Timɣiwent",
@@ -709,11 +722,17 @@
     "Verify User": "Senqed aseqdac",
     "Your messages are not secure": "Iznan-inek·inem d ariɣelsanen",
     "Hide verified sessions": "Ffer tiɣimiyin yettwasneqden",
-    "%(count)s sessions|other": "Tiɣimiyin n %(count)s",
+    "%(count)s sessions": {
+        "other": "Tiɣimiyin n %(count)s",
+        "one": "Tiɣimit n %(count)s"
+    },
     "Hide sessions": "Ffer tiɣimiyin",
     "Jump to read receipt": "Ɛeddi ɣer tɣuri n wawwaḍ",
     "Share Link to User": "Bḍu aseɣwen d useqdac",
-    "Remove %(count)s messages|one": "Kkes 1 izen",
+    "Remove %(count)s messages": {
+        "one": "Kkes 1 izen",
+        "other": "Kkes iznan n %(count)s"
+    },
     "Remove recent messages": "Kkes iznan n melmi kan",
     "Failed to mute user": "Tasusmi n useqdac ur yeddi ara",
     "Deactivate user?": "Kkes aseqdac-a?",
@@ -756,7 +775,9 @@
     "<a>In reply to</a> <pill>": "<a>Deg tririt i</a> <pill>",
     "e.g. my-room": "e.g. taxxamt-inu",
     "Sign in with single sign-on": "Qqen s unekcum asuf",
-    "And %(count)s more...|other": "D %(count)s ugar...",
+    "And %(count)s more...": {
+        "other": "D %(count)s ugar..."
+    },
     "Enter a server name": "Sekcem isem n uqeddac",
     "Matrix": "Matrix",
     "The following users may not exist": "Iseqdacen i d-iteddun yezmer ad ilin ulac-iten",
@@ -865,13 +886,20 @@
     "%(roomName)s does not exist.": "%(roomName)s ulac-it.",
     "Show rooms with unread messages first": "Sken tixxamin yesεan iznan ur nettwaɣra ara d timezwura",
     "List options": "Tixtiṛiyin n tebdart",
-    "Show %(count)s more|other": "Sken %(count)s ugar",
-    "Show %(count)s more|one": "Sken %(count)s ugar",
+    "Show %(count)s more": {
+        "other": "Sken %(count)s ugar",
+        "one": "Sken %(count)s ugar"
+    },
     "Notification options": "Tixtiṛiyin n wulɣu",
     "Room options": "Tixtiṛiyin n texxamt",
-    "%(count)s unread messages including mentions.|one": "1 ubdar ur nettwaɣra ara.",
-    "%(count)s unread messages.|other": "Iznan ur nettwaɣra ara %(count)s.",
-    "%(count)s unread messages.|one": "1 yizen ur nettwaɣra ara.",
+    "%(count)s unread messages including mentions.": {
+        "one": "1 ubdar ur nettwaɣra ara.",
+        "other": "%(count)s yiznan ur nettwaɣra ara rnu ɣer-sen ibdaren."
+    },
+    "%(count)s unread messages.": {
+        "other": "Iznan ur nettwaɣra ara %(count)s.",
+        "one": "1 yizen ur nettwaɣra ara."
+    },
     "Unread messages.": "Iznan ur nettwaɣra ara.",
     "All Rooms": "Akk tixxamin",
     "Unknown Command": "Taladna tarussint",
@@ -902,50 +930,94 @@
     "Rotate Left": "Zzi ɣer uzelmaḍ",
     "Rotate Right": "Zzi ɣer uyeffus",
     "Language Dropdown": "Tabdart n udrurem n tutlayin",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)srnan-d %(count)s tikkal",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)srnan-d",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)syerna-d %(count)s tikkal",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)syerna-d",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sffɣen %(count)s tikkal",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s ffɣen",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s yeffeɣ %(count)s tikkal",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s yeffeɣ",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)srnan-d syen ffɣen %(count)s tikkal",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)srnan-d syen ffɣen",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)syerna-d syen yeffeɣ %(count)s tikkal",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)syerna-d syen yeffeɣ",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sffɣen syen uɣalen-d %(count)s tikkal",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sffɣen syen uɣalen-d",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)syeffeɣ-d syen yuɣal-d %(count)s tikkal",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)syeffeɣ-d syen yuɣal-d",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sugin tinubgiwin-nsen %(count)s tikkal",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sugin tinubgiwin-nsen",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)syugi tinubga-ines %(count)s tikkal",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)syugi tinubga-ines",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sunfen i tinubgiwin-nsen yettwagin %(count)s tikkal",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sunfen i tinubgiwin-nsen yettwagin",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)syunef i tinubga-ines yettwagin %(count)s tikkal",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)syunef i tinubga-ines yettwagin",
-    "were invited %(count)s times|other": "ttwanecden-d %(count)s tikkal",
-    "were invited %(count)s times|one": "ttwanecden-d",
-    "was invited %(count)s times|other": "yettwanced-d %(count)s tikkal",
-    "was invited %(count)s times|one": "yettwanced-d",
-    "were banned %(count)s times|other": "ttwazeglen %(count)s tikkal",
-    "were banned %(count)s times|one": "ttwazeglen",
-    "was banned %(count)s times|other": "yettwazgel %(count)s tikkal",
-    "was banned %(count)s times|one": "yettwazgel",
-    "were unbanned %(count)s times|other": "ur ttwazeglen ara %(count)s tikkal",
-    "were unbanned %(count)s times|one": "ur ttwazeglen ara",
-    "was unbanned %(count)s times|other": "ur yettwazgel ara %(count)s tikkal",
-    "was unbanned %(count)s times|one": "ur yettwazgel ara",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbeddlen ismawen-nsen %(count)s tikkal",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbeddlen ismawen-nsen",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sibeddel isem-is %(count)s tikkal",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sibeddel isem-is",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sur gin ara isnifal %(count)s tikkal",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sur gin ara isnifal",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sur ye gi ara isnifal %(count)s tikkal",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sur ye gi ara isnifal",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)srnan-d %(count)s tikkal",
+        "one": "%(severalUsers)srnan-d"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)syerna-d %(count)s tikkal",
+        "one": "%(oneUser)syerna-d"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)sffɣen %(count)s tikkal",
+        "one": "%(severalUsers)s ffɣen"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s yeffeɣ %(count)s tikkal",
+        "one": "%(oneUser)s yeffeɣ"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)srnan-d syen ffɣen %(count)s tikkal",
+        "one": "%(severalUsers)srnan-d syen ffɣen"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)syerna-d syen yeffeɣ %(count)s tikkal",
+        "one": "%(oneUser)syerna-d syen yeffeɣ"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)sffɣen syen uɣalen-d %(count)s tikkal",
+        "one": "%(severalUsers)sffɣen syen uɣalen-d"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)syeffeɣ-d syen yuɣal-d %(count)s tikkal",
+        "one": "%(oneUser)syeffeɣ-d syen yuɣal-d"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)sugin tinubgiwin-nsen %(count)s tikkal",
+        "one": "%(severalUsers)sugin tinubgiwin-nsen"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)syugi tinubga-ines %(count)s tikkal",
+        "one": "%(oneUser)syugi tinubga-ines"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)sunfen i tinubgiwin-nsen yettwagin %(count)s tikkal",
+        "one": "%(severalUsers)sunfen i tinubgiwin-nsen yettwagin"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)syunef i tinubga-ines yettwagin %(count)s tikkal",
+        "one": "%(oneUser)syunef i tinubga-ines yettwagin"
+    },
+    "were invited %(count)s times": {
+        "other": "ttwanecden-d %(count)s tikkal",
+        "one": "ttwanecden-d"
+    },
+    "was invited %(count)s times": {
+        "other": "yettwanced-d %(count)s tikkal",
+        "one": "yettwanced-d"
+    },
+    "were banned %(count)s times": {
+        "other": "ttwazeglen %(count)s tikkal",
+        "one": "ttwazeglen"
+    },
+    "was banned %(count)s times": {
+        "other": "yettwazgel %(count)s tikkal",
+        "one": "yettwazgel"
+    },
+    "were unbanned %(count)s times": {
+        "other": "ur ttwazeglen ara %(count)s tikkal",
+        "one": "ur ttwazeglen ara"
+    },
+    "was unbanned %(count)s times": {
+        "other": "ur yettwazgel ara %(count)s tikkal",
+        "one": "ur yettwazgel ara"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)sbeddlen ismawen-nsen %(count)s tikkal",
+        "one": "%(severalUsers)sbeddlen ismawen-nsen"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sibeddel isem-is %(count)s tikkal",
+        "one": "%(oneUser)sibeddel isem-is"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)sur gin ara isnifal %(count)s tikkal",
+        "one": "%(severalUsers)sur gin ara isnifal"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)sur ye gi ara isnifal %(count)s tikkal",
+        "one": "%(oneUser)sur ye gi ara isnifal"
+    },
     "QR Code": "Tangalt QR",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "YEgguma ad d-tali tedyant iɣef d-ttunefk tririt, ahat d tilin ur telli ara neɣ ur tesɛiḍ ara tisirag ad tt-twaliḍ.",
     "Room address": "Tansa n texxamt",
@@ -1030,16 +1102,16 @@
     "Phone numbers": "Uṭṭunen n tiliɣri",
     "Language and region": "Tutlayt d temnaḍt",
     "Not trusted": "Ur yettwattkal ara",
-    "%(count)s verified sessions|other": "%(count)s isenqed tiɣimiyin",
-    "%(count)s verified sessions|one": "1 n tɣimit i yettwasneqden",
-    "%(count)s sessions|one": "Tiɣimit n %(count)s",
+    "%(count)s verified sessions": {
+        "other": "%(count)s isenqed tiɣimiyin",
+        "one": "1 n tɣimit i yettwasneqden"
+    },
     "Demote yourself?": "Ṣubb deg usellun-ik·im?",
     "Demote": "Ṣubb deg usellun",
     "No recent messages by %(user)s found": "Ulac iznan i yettwafen sɣur %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Ɛreḍ adrurem deg wazemzakud i wakken ad twaliḍ ma yella llan wid yellan uqbel.",
     "Remove recent messages by %(user)s": "Kkes iznan n melmi kan sɣur %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "I tugget meqqren n yiznan, ayagi yezmer ad yeṭṭef kra n wakud. Ṛǧu ur sirin ara amsaɣ-ik·im deg leɛḍil.",
-    "Remove %(count)s messages|other": "Kkes iznan n %(count)s",
     "Failed to ban user": "Tigtin n useqdac ur yeddi ara",
     "Failed to change power level": "Asnifel n uswir afellay ur yeddi ara",
     "Failed to deactivate user": "Asensi n useqdac ur yeddi ara",
@@ -1192,7 +1264,6 @@
     "Room %(name)s": "Taxxamt %(name)s",
     "No recently visited rooms": "Ulac taxxamt yemmeẓren melmi kan",
     "Unnamed room": "Taxxamt war isem",
-    "(~%(count)s results)|other": "(~%(count)s igmaḍ)",
     "Share room": "Bḍu taxxamt",
     "Invites": "Inced-d",
     "Start chat": "Bdu adiwenni",
@@ -1219,7 +1290,6 @@
     "Favourited": "Yettusmenyaf",
     "Favourite": "Asmenyif",
     "Low Priority": "Tazwart taddayt",
-    "%(count)s unread messages including mentions.|other": "%(count)s yiznan ur nettwaɣra ara rnu ɣer-sen ibdaren.",
     "This room has already been upgraded.": "Taxxamt-a tettuleqqam yakan.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Taxxamt-a tesedday lqem n texxamt <roomVersion />, i yecreḍ uqeddac-a agejdan <i>ur yerkid ara</i>.",
     "Only room administrators will see this warning": "Ala inedbalen kan n texxamt ara iwalin tuccḍa-a",
@@ -1335,9 +1405,11 @@
     "Failed to forget room %(errCode)s": "Tatut n texxamt %(errCode)s ur teddi ara",
     "Search failed": "Ur iddi ara unadi",
     "No more results": "Ulac ugar n yigmaḍ",
-    "Uploading %(filename)s and %(count)s others|other": "Asali n %(filename)s d %(count)s wiyaḍ-nniḍen",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Asali n %(filename)s d %(count)s wiyaḍ-nniḍen",
+        "one": "Asali n %(filename)s d %(count)s wayeḍ-nniḍen"
+    },
     "Uploading %(filename)s": "Asali n %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Asali n %(filename)s d %(count)s wayeḍ-nniḍen",
     "User menu": "Umuɣ n useqdac",
     "Could not load user profile": "Yegguma ad d-yali umaɣnu n useqdac",
     "New passwords must match each other.": "Awalen uffiren imaynuten ilaq ad mṣadan.",
@@ -1445,8 +1517,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Afaylu-a <b>ɣezzif aṭas</b> i wakken ad d-yali. Talast n teɣzi n ufaylu d %(limit)s maca afaylu-a d %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Ifuyla-a <b>ɣezzifit aṭas</b> i wakken ad d-alin. Talast n teɣzi n ufaylu d %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Kra n yifuyla <b>ɣezzifit aṭas</b> i wakken ad d-alin. Talast n teɣzi n ufaylu d %(limit)s.",
-    "Upload %(count)s other files|other": "Sali-d %(count)s ifuyla-nniḍen",
-    "Upload %(count)s other files|one": "Sali-d %(count)s afaylu-nniḍen",
+    "Upload %(count)s other files": {
+        "other": "Sali-d %(count)s ifuyla-nniḍen",
+        "one": "Sali-d %(count)s afaylu-nniḍen"
+    },
     "Upload Error": "Tuccḍa deg usali",
     "Remember my selection for this widget": "Cfu ɣef tefrant-inu i uwiǧit-a",
     "Wrong file type": "Anaw n yifuyla d arameɣtu",
@@ -1460,8 +1534,10 @@
     "Sent messages will be stored until your connection has returned.": "Iznan yettwaznen ad ttwakelsen alamma tuɣal-d tuqqna.",
     "You seem to be uploading files, are you sure you want to quit?": "Aql-ak·akem tessalayeḍ-d ifuyla, tebɣiḍ stidet ad teffɣeḍ?",
     "Server may be unavailable, overloaded, or search timed out :(": "Aqeddac yezmer ulac-it, iɛedda aɛebbi i ilaqen neɣ yekfa wakud n unadi:(",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Ɣur-k·m %(count)s ilɣa ur nettwaɣra ara deg lqem yezrin n texxamt-a.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Ɣur-k·m %(count)s ilɣa ur nettwaɣra ara deg lqem yezrin n texxamt-a.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Ɣur-k·m %(count)s ilɣa ur nettwaɣra ara deg lqem yezrin n texxamt-a.",
+        "one": "Ɣur-k·m %(count)s ilɣa ur nettwaɣra ara deg lqem yezrin n texxamt-a."
+    },
     "The email address linked to your account must be entered.": "Tansa n yimayl i icudden ɣer umiḍan-ik·im ilaq ad tettwasekcem.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Ttxil-k·m gar tamawt aql-ak·akem tkecmeḍ ɣer uqeddac %(hs)s, neɣ matrix.org.",
     "Failed to perform homeserver discovery": "Tifin n uqeddac agejdan tegguma ad teddu",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index b41259219e..40253a5425 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -47,8 +47,10 @@
     "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했습니다. 이 비밀번호가 맞나요?",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "수동으로 %(brand)s에 마이크와 카메라를 허용해야 함",
     "%(items)s and %(lastItem)s": "%(items)s님과 %(lastItem)s님",
-    "and %(count)s others...|one": "외 한 명...",
-    "and %(count)s others...|other": "외 %(count)s명...",
+    "and %(count)s others...": {
+        "one": "외 한 명...",
+        "other": "외 %(count)s명..."
+    },
     "Are you sure you want to reject the invitation?": "초대를 거절하시겠어요?",
     "Bans user with given id": "받은 ID로 사용자 출입 금지하기",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "홈서버에 연결할 수 없음 - 연결 상태를 확인하거나, <a>홈서버의 SSL 인증서</a>가 믿을 수 있는지 확인하고, 브라우저 확장 기능이 요청을 막고 있는지 확인해주세요.",
@@ -182,8 +184,10 @@
     "Unmute": "음소거 끄기",
     "Unnamed Room": "이름 없는 방",
     "Uploading %(filename)s": "%(filename)s을(를) 올리는 중",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s 외 %(count)s개를 올리는 중",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s 외 %(count)s개를 올리는 중",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "%(filename)s 외 %(count)s개를 올리는 중",
+        "other": "%(filename)s 외 %(count)s개를 올리는 중"
+    },
     "Upload avatar": "아바타 업로드",
     "Upload Failed": "업로드 실패",
     "Usage": "사용",
@@ -229,8 +233,10 @@
     "Room": "방",
     "Connectivity to the server has been lost.": "서버 연결이 끊어졌습니다.",
     "Sent messages will be stored until your connection has returned.": "보낸 메시지는 연결이 돌아올 때까지 저장됩니다.",
-    "(~%(count)s results)|one": "(~%(count)s개의 결과)",
-    "(~%(count)s results)|other": "(~%(count)s개의 결과)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s개의 결과)",
+        "other": "(~%(count)s개의 결과)"
+    },
     "New Password": "새 비밀번호",
     "Start automatically after system login": "컴퓨터를 시작할 때 자동으로 실행하기",
     "Analytics": "정보 분석",
@@ -328,10 +334,14 @@
     "Thank you!": "감사합니다!",
     "View Source": "소스 보기",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s가 방의 고정된 메시지를 바꿨습니다.",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s이 이름을 %(count)s번 바꿨습니다",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s이 이름을 바꿨습니다",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s님이 이름을 %(count)s번 바꿨습니다",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s님이 이름을 바꿨습니다",
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s이 이름을 %(count)s번 바꿨습니다",
+        "one": "%(severalUsers)s이 이름을 바꿨습니다"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s님이 이름을 %(count)s번 바꿨습니다",
+        "one": "%(oneUser)s님이 이름을 바꿨습니다"
+    },
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "이전 버전 %(brand)s의 데이터가 감지됬습니다. 이 때문에 이전 버전에서 종단간 암호화가 작동하지 않을 수 있습니다. 이전 버전을 사용하면서 최근에 교환한 종단간 암호화 메시지를 이 버전에서는 복호화할 수 없습니다. 이 버전에서 메시지를 교환할 수 없을 수도 있습니다. 문제가 발생하면 로그아웃한 후 다시 로그인하세요. 메시지 기록을 유지하려면 키를 내보낸 후 다시 가져오세요.",
     "This event could not be displayed": "이 이벤트를 표시할 수 없음",
     "Banned by %(displayName)s": "%(displayName)s님에 의해 출입 금지됨",
@@ -383,14 +393,22 @@
     "Unignore": "그만 무시하기",
     "Demote": "강등",
     "Demote yourself?": "자신을 강등하시겠습니까?",
-    "were banned %(count)s times|other": "이 %(count)s번 출입 금지 당했습니다",
-    "were banned %(count)s times|one": "이 출입 금지 당했습니다",
-    "was banned %(count)s times|other": "님이 %(count)s번 출입 금지 당했습니다",
-    "was banned %(count)s times|one": "님이 출입 금지 당했습니다",
-    "were unbanned %(count)s times|other": "의 출입 금지이 %(count)s번 풀렸습니다",
-    "were unbanned %(count)s times|one": "의 출입 금지이 풀렸습니다",
-    "was unbanned %(count)s times|other": "님의 출입 금지이 %(count)s번 풀렸습니다",
-    "was unbanned %(count)s times|one": "님의 출입 금지이 풀렸습니다",
+    "were banned %(count)s times": {
+        "other": "이 %(count)s번 출입 금지 당했습니다",
+        "one": "이 출입 금지 당했습니다"
+    },
+    "was banned %(count)s times": {
+        "other": "님이 %(count)s번 출입 금지 당했습니다",
+        "one": "님이 출입 금지 당했습니다"
+    },
+    "were unbanned %(count)s times": {
+        "other": "의 출입 금지이 %(count)s번 풀렸습니다",
+        "one": "의 출입 금지이 풀렸습니다"
+    },
+    "was unbanned %(count)s times": {
+        "other": "님의 출입 금지이 %(count)s번 풀렸습니다",
+        "one": "님의 출입 금지이 풀렸습니다"
+    },
     "This room is not public. You will not be able to rejoin without an invite.": "이 방은 공개되지 않았습니다. 초대 없이는 다시 들어올 수 없습니다.",
     "Enable URL previews for this room (only affects you)": "이 방에서 URL 미리보기 사용하기 (오직 나만 영향을 받음)",
     "Enable URL previews by default for participants in this room": "이 방에 참여한 모두에게 기본으로 URL 미리보기 사용하기",
@@ -401,22 +419,42 @@
     "Jump to read receipt": "읽은 기록으로 건너뛰기",
     "Share room": "방 공유하기",
     "Members only (since they joined)": "구성원만(구성원들이 참여한 시점부터)",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s님이 참여했습니다",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s이 %(count)s번 참여했습니다",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s님이 %(count)s번 참여했습니다",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s님이 참여했습니다",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s님이 %(count)s번 참여하고 떠났습니다",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s님이 참여하고 떠났습니다",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s님이 %(count)s번 참여하고 떠났습니다",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s님이 참여하고 떠났습니다",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s님이 떠나고 다시 참여했습니다",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s님이 %(count)s번 떠나고 다시 참여했습니다",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s님이 떠나고 다시 참여했습니다",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s이 %(count)s번 떠났습니다",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s이 떠났습니다",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s님이 %(count)s번 떠났습니다",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s님이 떠났습니다",
-    "%(items)s and %(count)s others|one": "%(items)s님 외 한 명",
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)s님이 참여했습니다",
+        "other": "%(severalUsers)s이 %(count)s번 참여했습니다"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s님이 %(count)s번 참여했습니다",
+        "one": "%(oneUser)s님이 참여했습니다"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s님이 %(count)s번 참여하고 떠났습니다",
+        "one": "%(severalUsers)s님이 참여하고 떠났습니다"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s님이 %(count)s번 참여하고 떠났습니다",
+        "one": "%(oneUser)s님이 참여하고 떠났습니다"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)s님이 떠나고 다시 참여했습니다",
+        "other": "%(severalUsers)s님이 %(count)s번 떠나고 다시 참여했습니다"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s님이 %(count)s번 떠나고 다시 참여했습니다",
+        "one": "%(oneUser)s님이 떠나고 다시 참여했습니다"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s이 %(count)s번 떠났습니다",
+        "one": "%(severalUsers)s이 떠났습니다"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s님이 %(count)s번 떠났습니다",
+        "one": "%(oneUser)s님이 떠났습니다"
+    },
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s님 외 한 명",
+        "other": "%(items)s님 외 %(count)s명"
+    },
     "Permission Required": "권한 필요",
     "You do not have permission to start a conference call in this room": "이 방에서는 회의 전화를 시작할 권한이 없습니다",
     "Copied!": "복사했습니다!",
@@ -430,18 +468,27 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "위젯을 삭제하면 이 방의 모든 사용자에게도 제거됩니다. 위젯을 삭제하겠습니까?",
     "Delete widget": "위젯 삭제",
     "Popout widget": "위젯 팝업",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s이 초대를 거절했습니다",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s님이 초대를 %(count)s번 거절했습니다",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s님이 초대를 거절했습니다",
-    "were invited %(count)s times|other": "%(count)s번 초대했습니다",
-    "were invited %(count)s times|one": "초대했습니다",
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)s이 초대를 거절했습니다",
+        "other": "%(severalUsers)s이 초대를 %(count)s번 거절했습니다"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s님이 초대를 %(count)s번 거절했습니다",
+        "one": "%(oneUser)s님이 초대를 거절했습니다"
+    },
+    "were invited %(count)s times": {
+        "other": "%(count)s번 초대했습니다",
+        "one": "초대했습니다"
+    },
     "Event Content": "이벤트 내용",
     "Event Type": "이벤트 종류",
     "Event sent!": "이벤트를 보냈습니다!",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "응답한 이벤트를 불러오지 못했습니다, 존재하지 않거나 볼 수 있는 권한이 없습니다.",
     "A text message has been sent to %(msisdn)s": "%(msisdn)s님에게 문자 메시지를 보냈습니다",
-    "was invited %(count)s times|one": "님이 초대받았습니다",
-    "was invited %(count)s times|other": "님이 %(count)s번 초대받았습니다",
+    "was invited %(count)s times": {
+        "one": "님이 초대받았습니다",
+        "other": "님이 %(count)s번 초대받았습니다"
+    },
     "collapse": "접기",
     "expand": "펼치기",
     "Preparing to send logs": "로그 보내려고 준비 중",
@@ -454,7 +501,9 @@
     "Share Room Message": "방 메시지 공유",
     "Link to selected message": "선택한 메시지로 연결",
     "Reply": "답장",
-    "And %(count)s more...|other": "%(count)s개 더...",
+    "And %(count)s more...": {
+        "other": "%(count)s개 더..."
+    },
     "Description": "설명",
     "Can't leave Server Notices room": "서버 알림 방을 떠날 수는 없음",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "이 방은 홈서버로부터 중요한 메시지를 받는 데 쓰이므로 떠날 수 없습니다.",
@@ -480,7 +529,6 @@
     "This room is a continuation of another conversation.": "이 방은 다른 대화방의 연장선입니다.",
     "Click here to see older messages.": "여길 눌러 오래된 메시지를 보세요.",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s님이 %(count)s번 떠나고 다시 참여했습니다",
     "<a>In reply to</a> <pill>": "<a>관련 대화</a> <pill>",
     "Updating %(brand)s": "%(brand)s 업데이트 중",
     "Upgrade this room to version %(version)s": "이 방을 %(version)s 버전으로 업그레이드",
@@ -528,8 +576,10 @@
     "%(senderName)s removed the main address for this room.": "%(senderName)s님이 이 방의 메인 주소를 제거했습니다.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 보낸 초대를 취소했습니다.",
     "%(displayName)s is typing …": "%(displayName)s님이 적고 있습니다 …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s 외 %(count)s명이 적고 있습니다 …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s 외 한 명이 적고 있습니다 …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s 외 %(count)s명이 적고 있습니다 …",
+        "one": "%(names)s 외 한 명이 적고 있습니다 …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s님과 %(lastPerson)s님이 적고 있습니다 …",
     "Cannot reach homeserver": "홈서버에 연결할 수 없습니다",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "인터넷 연결이 안정적인지 확인하세요, 또는 서버 관리자에게 연락하세요",
@@ -543,7 +593,6 @@
     "Unexpected error resolving homeserver configuration": "홈서버 설정을 해결하는 중 예기치 않은 오류",
     "Unexpected error resolving identity server configuration": "ID 서버 설정을 해결하는 중 예기치 않은 오류",
     "This homeserver has exceeded one of its resource limits.": "이 홈서버가 리소스 한도를 초과했습니다.",
-    "%(items)s and %(count)s others|other": "%(items)s님 외 %(count)s명",
     "Unrecognised address": "인식할 수 없는 주소",
     "You do not have permission to invite people to this room.": "이 방에 사람을 초대할 권한이 없습니다.",
     "The user must be unbanned before they can be invited.": "초대하려면 사용자가 출입 금지되지 않은 상태여야 합니다.",
@@ -813,15 +862,22 @@
     "No": "아니오",
     "Rotate Left": "왼쪽으로 회전",
     "Rotate Right": "오른쪽으로 회전",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s이 초대를 %(count)s번 거절했습니다",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s이 초대를 %(count)s번 취소했습니다",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s이 초대를 취소했습니다",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s님이 초대를 %(count)s번 취소했습니다",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s님이 초대를 취소했습니다",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s이 %(count)s번 변경 사항을 되돌렸습니다",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s이 변경 사항을 되돌렸습니다",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s님이 %(count)s번 변경 사항을 되돌렸습니다",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s님이 변경 사항을 되돌렸습니다",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s이 초대를 %(count)s번 취소했습니다",
+        "one": "%(severalUsers)s이 초대를 취소했습니다"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s님이 초대를 %(count)s번 취소했습니다",
+        "one": "%(oneUser)s님이 초대를 취소했습니다"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s이 %(count)s번 변경 사항을 되돌렸습니다",
+        "one": "%(severalUsers)s이 변경 사항을 되돌렸습니다"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s님이 %(count)s번 변경 사항을 되돌렸습니다",
+        "one": "%(oneUser)s님이 변경 사항을 되돌렸습니다"
+    },
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "이메일로 초대하기 위해 ID 서버를 사용합니다. <default>기본 (%(defaultIdentityServerName)s)을(를) 사용하거나</default> <settings>설정</settings>에서 관리하세요.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "이메일로 초대하기 위해 ID 서버를 사용합니다. <settings>설정</settings>에서 관리하세요.",
     "The following users may not exist": "다음 사용자는 존재하지 않을 수 있습니다",
@@ -878,8 +934,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "이 파일은 업로드하기에 <b>너무 큽니다</b>. 파일 크기 한도는 %(limit)s이지만 이 파일은 %(sizeOfThisFile)s입니다.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "이 파일들은 업로드하기에 <b>너무 큽니다</b>. 파일 크기 한도는 %(limit)s입니다.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "일부 파일이 업로드하기에 <b>너무 큽니다</b>. 파일 크기 한도는 %(limit)s입니다.",
-    "Upload %(count)s other files|other": "%(count)s개의 다른 파일 업로드",
-    "Upload %(count)s other files|one": "%(count)s개의 다른 파일 업로드",
+    "Upload %(count)s other files": {
+        "other": "%(count)s개의 다른 파일 업로드",
+        "one": "%(count)s개의 다른 파일 업로드"
+    },
     "Cancel All": "전부 취소",
     "Upload Error": "업로드 오류",
     "Remember my selection for this widget": "이 위젯에 대해 내 선택 기억하기",
@@ -912,8 +970,10 @@
     "Couldn't load page": "페이지를 불러올 수 없음",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "이 홈서버가 리소스 한도를 초과했기 때문에 메시지를 보낼 수 없었습니다. 서비스를 계속 사용하려면 <a>서비스 관리자에게 연락</a>해주세요.",
     "Add room": "방 추가",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다.",
+        "one": "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다."
+    },
     "Guest": "손님",
     "Could not load user profile": "사용자 프로필을 불러올 수 없음",
     "Your password has been reset.": "비밀번호가 초기화되었습니다.",
@@ -990,7 +1050,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "이전 타임라인이 있는지 위로 스크롤하세요.",
     "Remove recent messages by %(user)s": "%(user)s님의 최근 메시지 삭제",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "메시지의 양이 많아서 시간이 걸릴 수 있습니다. 처리하는 동안 클라이언트를 새로고침하지 말아주세요.",
-    "Remove %(count)s messages|other": "%(count)s개의 메시지 삭제",
+    "Remove %(count)s messages": {
+        "other": "%(count)s개의 메시지 삭제",
+        "one": "1개의 메시지 삭제"
+    },
     "Remove recent messages": "최근 메시지 삭제",
     "View": "보기",
     "Explore rooms": "방 검색",
@@ -1021,10 +1084,15 @@
     "Show previews/thumbnails for images": "이미지로 미리 보기/썸네일 보이기",
     "Show image": "이미지 보이기",
     "Clear cache and reload": "캐시 지우기 및 새로고침",
-    "%(count)s unread messages including mentions.|other": "언급을 포함한 %(count)s개의 읽지 않은 메시지.",
-    "%(count)s unread messages.|other": "%(count)s개의 읽지 않은 메시지.",
+    "%(count)s unread messages including mentions.": {
+        "other": "언급을 포함한 %(count)s개의 읽지 않은 메시지.",
+        "one": "1개의 읽지 않은 언급."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s개의 읽지 않은 메시지.",
+        "one": "1개의 읽지 않은 메시지."
+    },
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "이 버그를 조사할 수 있도록 GitHub에 <newIssueLink>새 이슈를 추가</newIssueLink>해주세요.",
-    "Remove %(count)s messages|one": "1개의 메시지 삭제",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "홈서버 설정에서 캡챠 공개 키가 없습니다. 홈서버 관리자에게 이것을 신고해주세요.",
     "Your email address hasn't been verified yet": "이메일 주소가 아직 확인되지 않았습니다",
     "Click the link in the email you received to verify and then click continue again.": "받은 이메일에 있는 링크를 클릭해서 확인한 후에 계속하기를 클릭하세요.",
@@ -1055,8 +1123,6 @@
     "Jump to first unread room.": "읽지 않은 첫 방으로 건너뜁니다.",
     "Jump to first invite.": "첫 초대로 건너뜁니다.",
     "Room %(name)s": "%(name)s 방",
-    "%(count)s unread messages including mentions.|one": "1개의 읽지 않은 언급.",
-    "%(count)s unread messages.|one": "1개의 읽지 않은 메시지.",
     "Unread messages.": "읽지 않은 메시지.",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "이 작업에는 이메일 주소 또는 전화번호를 확인하기 위해 기본 ID 서버 <server />에 접근해야 합니다. 하지만 서버가 서비스 약관을 갖고 있지 않습니다.",
     "Trust": "신뢰함",
@@ -1244,7 +1310,9 @@
     "Start a conversation with someone using their name or username (like <userId/>).": "이름이나 사용자명(<userId/> 형식)을 사용하는 사람들과 대화를 시작하세요.",
     "Direct Messages": "다이렉트 메세지",
     "Explore public rooms": "공개 방 목록 살펴보기",
-    "Show %(count)s more|other": "%(count)s개 더 보기",
+    "Show %(count)s more": {
+        "other": "%(count)s개 더 보기"
+    },
     "People": "사람들",
     "If you can't see who you're looking for, send them your invite link below.": "찾으려는 사람이 보이지 않으면, 아래의 초대링크를 보내세요.",
     "Some suggestions may be hidden for privacy.": "일부 추천 목록은 개인 정보 보호를 위해 보이지 않을 수 있습니다.",
diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json
index 181c6e4a02..03661cdb04 100644
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -704,7 +704,10 @@
     "Italics": "ໂຕໜັງສືອຽງ",
     "Home options": "ຕົວເລືອກໜ້າຫຼັກ",
     "%(spaceName)s menu": "ເມນູ %(spaceName)s",
-    "Currently removing messages in %(count)s rooms|one": "ຕອນນີ້ກຳລັງລຶບຂໍ້ຄວາມຢູ່ໃນຫ້ອງ %(count)s",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "ຕອນນີ້ກຳລັງລຶບຂໍ້ຄວາມຢູ່ໃນຫ້ອງ %(count)s",
+        "other": "ກຳລັງລຶບຂໍ້ຄວາມຢູ່ໃນ %(count)s ຫ້ອງ"
+    },
     "Live location enabled": "ເປີດໃຊ້ສະຖານທີປັດຈຸບັນແລ້ວ",
     "You are sharing your live location": "ທ່ານກໍາລັງແບ່ງປັນສະຖານທີ່ປັດຈຸບັນຂອງທ່ານ",
     "Close sidebar": "ປິດແຖບດ້ານຂ້າງ",
@@ -774,15 +777,26 @@
     "This UI does NOT check the types of the values. Use at your own risk.": "UI ນີ້ບໍ່ໄດ້ກວດເບິ່ງປະເພດຂອງຄ່າ. ໃຊ້ຢູ່ໃນຄວາມສ່ຽງຂອງທ່ານເອງ.",
     "Caution:": "ຂໍ້ຄວນລະວັງ:",
     "Setting:": "ການຕັ້ງຄ່າ:",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sໄດ້ປ່ຽນຊື່ຂອງເຂົາເຈົ້າ",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sປ່ຽນຊື່ຂອງເຂົາເຈົ້າ",
-    "was removed %(count)s times|one": "ລືບອອກ",
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)sໄດ້ປ່ຽນຊື່ຂອງເຂົາເຈົ້າ",
+        "other": "%(oneUser)sປ່ຽນຊື່ຂອງເຂົາເຈົ້າ %(count)sຄັ້ງ"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)sປ່ຽນຊື່ຂອງເຂົາເຈົ້າ",
+        "other": "%(severalUsers)sປ່ຽນຊື່ຂອງເຂົາເຈົ້າ %(count)sຄັ້ງ"
+    },
+    "was removed %(count)s times": {
+        "one": "ລືບອອກ",
+        "other": "ລຶບອອກ %(count)s ເທື່ອ"
+    },
     "We encountered an error trying to restore your previous session.": "ພວກເຮົາພົບຄວາມຜິດພາດໃນການພະຍາຍາມຟື້ນຟູພາກສ່ວນທີ່ຜ່ານມາຂອງທ່ານ.",
     "Please provide an address": "ກະລຸນາລະບຸທີ່ຢູ່",
     "Some characters not allowed": "ບໍ່ອະນຸຍາດໃຫ້ບາງຕົວອັກສອນ",
     "Missing room name or separator e.g. (my-room:domain.org)": "ບໍ່ມີຊື່ຫ້ອງ ຫຼື ຕົວແຍກເຊັ່ນ: (my-room:domain.org)",
-    "View all %(count)s members|one": "ເບິ່ງສະມາຊິກ 1 ຄົນ",
-    "View all %(count)s members|other": "ເບິ່ງສະມາຊິກ %(count)s ທັງໝົດ",
+    "View all %(count)s members": {
+        "one": "ເບິ່ງສະມາຊິກ 1 ຄົນ",
+        "other": "ເບິ່ງສະມາຊິກ %(count)s ທັງໝົດ"
+    },
     "Including %(commaSeparatedMembers)s": "ລວມທັງ %(commaSeparatedMembers)s",
     "Including you, %(commaSeparatedMembers)s": "ລວມທັງທ່ານ, %(commaSeparatedMembers)s",
     "This address had invalid server or is already in use": "ທີ່ຢູ່ນີ້ມີເຊີບເວີທີ່ບໍ່ຖືກຕ້ອງ ຫຼື ຖືກໃຊ້ງານຢູ່ແລ້ວ",
@@ -800,8 +814,10 @@
     "Server name": "ຊື່ເຊີບເວີ",
     "Enter the name of a new server you want to explore.": "ໃສ່ຊື່ຂອງເຊີບເວີໃໝ່ທີ່ທ່ານຕ້ອງການສຳຫຼວດ.",
     "Add a new server": "ເພີ່ມເຊີບເວີໃໝ່",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "ກຳລັງເພີ່ມຫ້ອງ...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "ກຳລັງເພີ່ມຫ້ອງ... (%(progress)s ຈາກທັງໝົດ %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "ກຳລັງເພີ່ມຫ້ອງ...",
+        "other": "ກຳລັງເພີ່ມຫ້ອງ... (%(progress)s ຈາກທັງໝົດ %(count)s)"
+    },
     "Search for spaces": "ຊອກຫາພື້ນທີ່",
     "Create a new space": "ສ້າງພື້ນທີ່ໃຫມ່",
     "Want to add a new space instead?": "ຕ້ອງການເພີ່ມພື້ນທີ່ໃໝ່ແທນບໍ?",
@@ -850,7 +866,9 @@
     "Close this widget to view it in this panel": "ປິດວິດເຈັດນີ້ເພື່ອເບິ່ງມັນຢູ່ໃນແຜງນີ້",
     "Unpin this widget to view it in this panel": "ຖອນປັກໝຸດວິດເຈັດນີ້ເພື່ອເບິ່ງມັນຢູ່ໃນແຜງນີ້",
     "Maximise": "ສູງສຸດ",
-    "You can only pin up to %(count)s widgets|other": "ທ່ານສາມາດປັກໝຸດໄດ້ເຖິງ %(count)s widget ເທົ່ານັ້ນ",
+    "You can only pin up to %(count)s widgets": {
+        "other": "ທ່ານສາມາດປັກໝຸດໄດ້ເຖິງ %(count)s widget ເທົ່ານັ້ນ"
+    },
     "Spaces": "ພື້ນທີ່",
     "Profile": "ໂປຣໄຟລ໌",
     "Messaging": "ການສົ່ງຂໍ້ຄວາມ",
@@ -924,9 +942,11 @@
     "Switch to light mode": "ສະຫຼັບໄປໂໝດແສງ",
     "New here? <a>Create an account</a>": "ມາໃໝ່ບໍ? <a>ສ້າງບັນຊີ</a>",
     "Got an account? <a>Sign in</a>": "ມີບັນຊີບໍ? <a>ເຂົ້າສູ່ລະບົບ</a>",
-    "Uploading %(filename)s and %(count)s others|one": "ກຳລັງອັບໂຫລດ %(filename)s ແລະ %(count)s ອື່ນໆ",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "ກຳລັງອັບໂຫລດ %(filename)s ແລະ %(count)s ອື່ນໆ",
+        "other": "ກຳລັງອັບໂຫລດ %(filename)s ແລະ %(count)s ອື່ນໆ"
+    },
     "Uploading %(filename)s": "ກຳລັງອັບໂຫລດ %(filename)s",
-    "Uploading %(filename)s and %(count)s others|other": "ກຳລັງອັບໂຫລດ %(filename)s ແລະ %(count)s ອື່ນໆ",
     "Failed to load timeline position": "ໂຫຼດຕໍາແໜ່ງທາມລາຍບໍ່ສຳເລັດ",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "ພະຍາຍາມໂຫຼດຈຸດສະເພາະໃນທາມລາຍຂອງຫ້ອງນີ້, ແຕ່ບໍ່ສາມາດຊອກຫາມັນໄດ້.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "ພະຍາຍາມໂຫຼດຈຸດສະເພາະຢູ່ໃນທາມລາຍຂອງຫ້ອງນີ້, ແຕ່ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເບິ່ງຂໍ້ຄວາມທີ່ເປັນຄໍາຖາມ.",
@@ -985,8 +1005,10 @@
     "Joined": "ເຂົ້າຮ່ວມແລ້ວ",
     "You don't have permission": "ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດ",
     "Joining": "ເຂົ້າຮ່ວມ",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "ທ່ານມີ %(count)s ການແຈ້ງເຕືອນທີ່ຍັງບໍ່ໄດ້ອ່ານຢູ່ໃນສະບັບກ່ອນໜ້າຂອງຫ້ອງນີ້.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "ທ່ານມີ %(count)s ການແຈ້ງເຕືອນທີ່ຍັງບໍ່ໄດ້ອ່ານຢູ່ໃນສະບັບກ່ອນໜ້າຂອງຫ້ອງນີ້.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "ທ່ານມີ %(count)s ການແຈ້ງເຕືອນທີ່ຍັງບໍ່ໄດ້ອ່ານຢູ່ໃນສະບັບກ່ອນໜ້າຂອງຫ້ອງນີ້.",
+        "other": "ທ່ານມີ %(count)s ການແຈ້ງເຕືອນທີ່ຍັງບໍ່ໄດ້ອ່ານຢູ່ໃນສະບັບກ່ອນໜ້າຂອງຫ້ອງນີ້."
+    },
     "Failed to reject invite": "ປະຕິເສດຄຳເຊີນບໍ່ສຳເລັດ",
     "No more results": "ບໍ່ມີຜົນອີກຕໍ່ໄປ",
     "Server may be unavailable, overloaded, or search timed out :(": "ເຊີບເວີອາດຈະບໍ່ມີຢູ່, ໂຫຼດເກີນ, ຫຼື ໝົດເວລາການຊອກຫາ :(",
@@ -1050,10 +1072,15 @@
     "Jump to read receipt": "ຂ້າມເພື່ອອ່ານໃບຮັບເງິນ",
     "Message": "ຂໍ້ຄວາມ",
     "Hide sessions": "ເຊື່ອງsessions",
-    "%(count)s sessions|one": "%(count)s ລະບົບ",
-    "%(count)s sessions|other": "%(count)ssessions",
+    "%(count)s sessions": {
+        "one": "%(count)s ລະບົບ",
+        "other": "%(count)ssessions"
+    },
     "Hide verified sessions": "ເຊື່ອງ sessionsທີ່ຢືນຢັນແລ້ວ",
-    "%(count)s verified sessions|one": "ຢືນຢັນ 1 session ແລ້ວ",
+    "%(count)s verified sessions": {
+        "one": "ຢືນຢັນ 1 session ແລ້ວ",
+        "other": "%(count)sລະບົບຢືນຢັນແລ້ວ"
+    },
     "Chat": "ສົນທະນາ",
     "Pinned messages": "ປັກໝຸດຂໍ້ຄວາມ",
     "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "ຖ້າຫາກທ່ານມີການອະນຸຍາດ, ເປີດເມນູໃນຂໍ້ຄວາມໃດຫນຶ່ງ ແລະ ເລືອກ <b>Pin</b> ເພື່ອຕິດໃຫ້ເຂົາເຈົ້າຢູ່ທີ່ນີ້.",
@@ -1117,8 +1144,10 @@
     "Mark all as read": "ໝາຍທັງໝົດວ່າອ່ານແລ້ວ",
     "Jump to first unread message.": "ຂ້າມໄປຫາຂໍ້ຄວາມທຳອິດທີ່ຍັງບໍ່ໄດ້ອ່ານ.",
     "Open thread": "ເປີດກະທູ້",
-    "%(count)s reply|one": "%(count)s ຕອບກັບ",
-    "%(count)s reply|other": "%(count)s ຕອບກັບ",
+    "%(count)s reply": {
+        "one": "%(count)s ຕອບກັບ",
+        "other": "%(count)s ຕອບກັບ"
+    },
     "Invited by %(sender)s": "ເຊີນໂດຍ%(sender)s",
     "Revoke invite": "ຍົກເລີກຄຳເຊີນ",
     "Admin Tools": "ເຄື່ອງມືຜູ້ຄຸ້ມຄອງ",
@@ -1136,12 +1165,18 @@
     "This room has already been upgraded.": "ຫ້ອງນີ້ໄດ້ຖືກປັບປຸງແລ້ວ.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "ການຍົກລະດັບຫ້ອງນີ້ຈະປິດຕົວຢ່າງປັດຈຸບັນຂອງຫ້ອງ ແລະ ຍົກລະດັບການສ້າງຫ້ອງທີ່ມີຊື່ດຽວກັນ.",
     "Unread messages.": "ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ.",
-    "%(count)s unread messages.|one": "1 ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ.",
-    "%(count)s unread messages.|other": "%(count)s ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ.",
-    "%(count)s unread messages including mentions.|one": "ການກ່າວເຖິງທີ່ຍັງບໍ່ໄດ້ອ່ານ 1.",
-    "%(count)s unread messages including mentions.|other": "%(count)s ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ ລວມທັງການກ່າວເຖິງ.",
-    "%(count)s participants|one": "ຜູ້ເຂົ້າຮ່ວມ 1ຄົນ",
-    "%(count)s participants|other": "ຜູ້ເຂົ້າຮ່ວມ %(count)s ຄົນ",
+    "%(count)s unread messages.": {
+        "one": "1 ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ.",
+        "other": "%(count)s ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "ການກ່າວເຖິງທີ່ຍັງບໍ່ໄດ້ອ່ານ 1.",
+        "other": "%(count)s ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ ລວມທັງການກ່າວເຖິງ."
+    },
+    "%(count)s participants": {
+        "one": "ຜູ້ເຂົ້າຮ່ວມ 1ຄົນ",
+        "other": "ຜູ້ເຂົ້າຮ່ວມ %(count)s ຄົນ"
+    },
     "Video": "ວິດີໂອ",
     "Leave": "ອອກຈາກ",
     "Copy room link": "ສຳເນົາລິ້ງຫ້ອງ",
@@ -1151,8 +1186,10 @@
     "Forget Room": "ລືມຫ້ອງ",
     "Notification options": "ຕົວເລືອກການແຈ້ງເຕືອນ",
     "Show less": "ສະແດງໜ້ອຍລົງ",
-    "Show %(count)s more|one": "ສະແດງ %(count)s ເພີ່ມເຕີມ",
-    "Show %(count)s more|other": "ສະແດງ %(count)s ເພີ່ມເຕີມ",
+    "Show %(count)s more": {
+        "one": "ສະແດງ %(count)s ເພີ່ມເຕີມ",
+        "other": "ສະແດງ %(count)s ເພີ່ມເຕີມ"
+    },
     "List options": "ລາຍຊື່ຕົວເລືອກ",
     "A-Z": "A-Z",
     "Activity": "ກິດຈະກໍາ",
@@ -1364,10 +1401,14 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s ໄດ້ປ່ຽນທີ່ຢູ່ຂອງຫ້ອງນີ້.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ໄດ້ປ່ຽນທີ່ຢູ່ຫລັກ ແລະ ທາງເລືອກສຳລັບຫ້ອງນີ້.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ໄດ້ປ່ຽນທີ່ຢູ່ທາງເລືອກສຳລັບຫ້ອງນີ້.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s ໄດ້ລຶບທີ່ຢູ່ສຳຮອງ%(addresses)s ສໍາລັບຫ້ອງນີ້.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s ໄດ້ລຶບທີ່ຢູ່ສຳຮອງ %(addresses)s ຂອງຫ້ອງນີ້ອອກ.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s ໄດ້ເພີ່ມທີ່ຢູ່ສຳຮອງ%(addresses)sສໍາລັບຫ້ອງນີ້.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s ໄດ້ເພີ່ມທີ່ຢູ່ສຳຮອງ%(addresses)s ສໍາລັບຫ້ອງນີ້.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s ໄດ້ລຶບທີ່ຢູ່ສຳຮອງ%(addresses)s ສໍາລັບຫ້ອງນີ້.",
+        "other": "%(senderName)s ໄດ້ລຶບທີ່ຢູ່ສຳຮອງ %(addresses)s ຂອງຫ້ອງນີ້ອອກ."
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s ໄດ້ເພີ່ມທີ່ຢູ່ສຳຮອງ%(addresses)sສໍາລັບຫ້ອງນີ້.",
+        "other": "%(senderName)s ໄດ້ເພີ່ມທີ່ຢູ່ສຳຮອງ%(addresses)s ສໍາລັບຫ້ອງນີ້."
+    },
     "%(senderName)s removed the main address for this room.": "%(senderName)s ໄດ້ລຶບທີ່ຢູ່ຂອງຫ້ອງນີ້ອອກ.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ກຳນົດທີ່ຢູ່ຂອງຫ້ອງນີ້ເປັນ %(address)s.",
     "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s ສົ່ງສະຕິກເກີ.",
@@ -1521,8 +1562,10 @@
     "Remain on your screen while running": "ຢູ່ໃນຫນ້າຈໍຂອງທ່ານໃນຂະນະທີ່ກຳລັງດຳເນີນການ",
     "Remain on your screen when viewing another room, when running": "ຢູ່ຫນ້າຈໍຂອງທ່ານໃນເວລາເບິ່ງຫ້ອງອື່ນ, ໃນຄະນະທີ່ກຳລັງດຳເນີນການ",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ແລະ %(lastPerson)s ກຳລັງພິມ…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ແລະ ອີກຄົນນຶ່ງກຳລັງພິມ…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)sຄົນອື່ນກຳລັງພິມ…",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s ແລະ ອີກຄົນນຶ່ງກຳລັງພິມ…",
+        "other": "%(names)s and %(count)sຄົນອື່ນກຳລັງພິມ…"
+    },
     "%(displayName)s is typing …": "%(displayName)s ກຳລັງພິມ…",
     "Dark": "ມືດ",
     "Light high contrast": "ແສງສະຫວ່າງຄວາມຄົມຊັດສູງ",
@@ -1562,10 +1605,14 @@
     "Modern": "ທັນສະໄຫມ",
     "IRC (Experimental)": "(ທົດລອງ)IRC",
     "Message layout": "ຮູບແບບຂໍ້ຄວາມ",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "ກຳລັງປັບປຸງພື້ນທີ່..",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "ກຳລັງຍົກລະດັບພື້ນທີ່... (%(progress)s ຈາກທັງໝົດ %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "ກຳລັງສົ່ງຄຳເຊີນ...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "ກຳລັງສົ່ງຄຳເຊີນ... (%(progress)s ຈາກທັງໝົດ %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "ກຳລັງປັບປຸງພື້ນທີ່..",
+        "other": "ກຳລັງຍົກລະດັບພື້ນທີ່... (%(progress)s ຈາກທັງໝົດ %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "ກຳລັງສົ່ງຄຳເຊີນ...",
+        "other": "ກຳລັງສົ່ງຄຳເຊີນ... (%(progress)s ຈາກທັງໝົດ %(count)s)"
+    },
     "Loading new room": "ກຳລັງໂຫຼດຫ້ອງໃໝ່",
     "Upgrading room": "ການຍົກລະດັບຫ້ອງ",
     "This upgrade will allow members of selected spaces access to this room without an invite.": "ການຍົກລະດັບນີ້ຈະອະນຸຍາດໃຫ້ສະມາຊິກຂອງພື້ນທີ່ທີ່ເລືອກເຂົ້າມາໃນຫ້ອງນີ້ໂດຍບໍ່ມີການເຊີນ.",
@@ -1575,10 +1622,14 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "ທຸກຄົນໃນ <spaceName/> ສາມາດຊອກຫາ ແລະເຂົ້າຮ່ວມໄດ້. ທ່ານສາມາດເລືອກບ່ອນອື່ນໄດ້ຄືກັນ.",
     "Spaces with access": "ພຶ້ນທີ່ ທີ່ມີການເຂົ້າເຖິງ",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "ທຸກຄົນຢູ່ໃນພື້ນທີ່ສາມາດຊອກຫາ ແລະເຂົ້າຮ່ວມໄດ້. <a>ແກ້ໄຂພື້ນທີ່ໃດທີ່ສາມາດເຂົ້າເຖິງທີ່ນີ້.</a>",
-    "Currently, %(count)s spaces have access|one": "ໃນປັດຈຸບັນ, ມີການເຂົ້າເຖິງພື້ນທີ່",
-    "Currently, %(count)s spaces have access|other": "ໃນປັດຈຸບັນ, %(count)s ມີການເຂົ້າເຖິງພື້ນທີ່",
-    "& %(count)s more|one": "& %(count)s ເພີ່ມເຕີມ",
-    "& %(count)s more|other": "&%(count)s ເພີ່ມເຕີມ",
+    "Currently, %(count)s spaces have access": {
+        "one": "ໃນປັດຈຸບັນ, ມີການເຂົ້າເຖິງພື້ນທີ່",
+        "other": "ໃນປັດຈຸບັນ, %(count)s ມີການເຂົ້າເຖິງພື້ນທີ່"
+    },
+    "& %(count)s more": {
+        "one": "& %(count)s ເພີ່ມເຕີມ",
+        "other": "&%(count)s ເພີ່ມເຕີມ"
+    },
     "Upgrade required": "ຕ້ອງການບົກລະດັບ",
     "Anyone can find and join.": "ທຸກຄົນສາມາດຊອກຫາ ແລະ ເຂົ້າຮ່ວມໄດ້.",
     "Only invited people can join.": "ສະເພາະຄົນທີ່ຖືກເຊີນເທົ່ານັ້ນທີ່ສາມາດເຂົ້າຮ່ວມໄດ້.",
@@ -1597,8 +1648,10 @@
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s ຂາດບາງອົງປະກອບທີ່ຕ້ອງການສໍາລັບການເກັບຂໍ້ຄວາມເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງ. ຖ້າທ່ານຕ້ອງການທົດລອງໃຊ້ຄຸນສົມບັດນີ້, ສ້າງ %(brand)s Desktop ແບບກຳນົດເອງດ້ວຍການເພີ່ມ <nativeLink>ອົງປະກອບການຄົ້ນຫາ</nativeLink>.",
     "Securely cache encrypted messages locally for them to appear in search results.": "ເກັບຮັກສາຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງເພື່ອໃຫ້ປາກົດໃນຜົນການຄົ້ນຫາ.",
     "Manage": "ຄຸ້ມຄອງ",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "ຈັດເກັບຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງເພື່ອໃຫ້ປາກົດໃນຜົນການຊອກຫາ, ໂດຍໃຊ້ %(size)s ເພື່ອເກັບຂໍ້ຄວາມຈາກຫ້ອງ %(rooms)s.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "ຈັດເກັບຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງເພື່ອໃຫ້ປາກົດໃນຜົນການຊອກຫາ, ໂດຍໃຊ້ %(size)s ເພື່ອເກັບຂໍ້ຄວາມຈາກ %(rooms)s ຫ້ອງ.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "ຈັດເກັບຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງເພື່ອໃຫ້ປາກົດໃນຜົນການຊອກຫາ, ໂດຍໃຊ້ %(size)s ເພື່ອເກັບຂໍ້ຄວາມຈາກຫ້ອງ %(rooms)s.",
+        "other": "ຈັດເກັບຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງເພື່ອໃຫ້ປາກົດໃນຜົນການຊອກຫາ, ໂດຍໃຊ້ %(size)s ເພື່ອເກັບຂໍ້ຄວາມຈາກ %(rooms)s ຫ້ອງ."
+    },
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "ຢືນຢັນແຕ່ລະລະບົບທີ່ໃຊ້ໂດຍຜູ້ໃຊ້ເພື່ອໝາຍວ່າເປັນທີ່ໜ້າເຊື່ອຖືໄດ້, ບໍ່ໄວ້ໃຈອຸປະກອນທີ່ cross-signed.",
     "Rename": "ປ່ຽນຊື່",
     "Display Name": "ຊື່ສະແດງ",
@@ -1747,8 +1800,10 @@
     "Verify other device": "ຢືນຢັນອຸປະກອນອື່ນ",
     "Upload Error": "ອັບໂຫຼດຜິດພາດ",
     "Cancel All": "ຍົກເລີກທັງໝົດ",
-    "Upload %(count)s other files|one": "ອັບໂຫຼດ %(count)s ໄຟລ໌ອື່ນ",
-    "Upload %(count)s other files|other": "ອັບໂຫຼດ %(count)s ໄຟລ໌ອື່ນໆ",
+    "Upload %(count)s other files": {
+        "one": "ອັບໂຫຼດ %(count)s ໄຟລ໌ອື່ນ",
+        "other": "ອັບໂຫຼດ %(count)s ໄຟລ໌ອື່ນໆ"
+    },
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "ບາງໄຟລ໌ <b>ໃຫຍ່ເກີນໄປ</b> ທີ່ຈະອັບໂຫລດໄດ້. ຂີດຈຳກັດຂະໜາດໄຟລ໌ແມ່ນ %(limit)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "ໄຟລ໌ເຫຼົ່ານີ້ <b>ໃຫຍ່ເກີນໄປ</b> ທີ່ຈະອັບໂຫລດ. ຂີດຈຳກັດຂະໜາດໄຟລ໌ແມ່ນ %(limit)s.",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "ໄຟລ໌ນີ້ <b>ໃຫຍ່ເກີນໄປ</b> ທີ່ຈະອັບໂຫລດໄດ້. ຂະໜາດໄຟລ໌ຈຳກັດ%(limit)s ແຕ່ໄຟລ໌ນີ້ແມ່ນ %(sizeOfThisFile)s.",
@@ -1891,62 +1946,114 @@
     "Rotate Left": "ໝຸນດ້ານຊ້າຍ",
     "expand": "ຂະຫຍາຍ",
     "collapse": "ບໍ່ສຳເລັດ",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sສົ່ງຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s ສົ່ງ %(count)s ຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sສົ່ງຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s ສົ່ງ %(count)s ຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sລຶບຂໍ້ຄວາມອອກແລ້ວ",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sລຶບ %(count)s ຂໍ້ຄວາມອອກແລ້ວ",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sໄດ້ລຶບຂໍ້ຄວາມອອກ",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sລຶບ %(count)s ຂໍ້ຄວາມອອກແລ້ວ",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ %(count)s ເທື່ອ",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sໄດ້ປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ%(count)sເທື່ອ",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sໄດ້ປ່ຽນເຊີບເວີ ACLs",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sປ່ຽນເຊີບເວີ ACLs %(count)s ເທື່ອ",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sປ່ຽນ ACL ຂອງເຊີບເວີ",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sປ່ຽນເຊີບເວີ ACLs %(count)sຄັ້ງ",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sບໍ່ໄດ້ປ່ຽນແປງ",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sບໍ່ໄດ້ປ່ຽນແປງ %(count)s ເທື່ອ",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sບໍ່ມີການປ່ຽນແປງ",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sບໍ່ໄດ້ປ່ຽນແປງ %(count)s ເທື່ອ",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sປ່ຽນຊື່ຂອງເຂົາເຈົ້າ %(count)sຄັ້ງ",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sປ່ຽນຊື່ຂອງເຂົາເຈົ້າ %(count)sຄັ້ງ",
-    "were unbanned %(count)s times|one": "ຍົກເລີກການຫ້າມ",
-    "were unbanned %(count)s times|other": "ຖືກຫ້າມ %(count)s ເທື່ອ",
-    "was banned %(count)s times|one": "ຖືກຫ້າມ",
-    "was banned %(count)s times|other": "ຖືກຫ້າມ %(count)s ເທື່ອ",
-    "were banned %(count)s times|one": "ຖືກຫ້າມ",
-    "were banned %(count)s times|other": "ຖືກຫ້າມ %(count)s ເທື່ອ",
-    "was invited %(count)s times|one": "ຖືກເຊີນ",
-    "was invited %(count)s times|other": "ຖືກເຊີນ %(count)s ເທື່ອ",
-    "were invited %(count)s times|one": "ໄດ້ຖືກເຊື້ອເຊີນ",
-    "were invited %(count)s times|other": "ໄດ້ຖືກເຊີນ %(count)s ເທື່ອ",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sໄດ້ຖອນການເຊີນຂອງເຂົາເຈົ້າອອກແລ້ວ",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sshad ການເຊີນຂອງເຂົາເຈົ້າຖອນອອກ %(count)s ຄັ້ງ",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s shad ການເຊີນຂອງເຂົາເຈົ້າຖອນອອກ",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s shad ການເຊີນຂອງພວກເຂົາຖືກຖອນ %(count)s ຄັ້ງ",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sປະຕິເສດການເຊີນຂອງເຂົາເຈົ້າ",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sປະຕິເສດການເຊີນຂອງເຂົາເຈົ້າ %(count)s ຄັ້ງ",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sປະຕິເສດຄຳເຊີນຂອງເຂົາເຈົ້າ",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sປະຕິເສດຄຳເຊີນຂອງເຂົາເຈົ້າ %(count)sເທື່ອ",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ອອກ ແລະເຂົ້າຮ່ວມຄືນໃໝ່",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sອອກ ແລະເຂົ້າຮ່ວມ %(count)sຄັ້ງ",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s ອອກ ແລະເຂົ້າຮ່ວມໃຫມ່",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s ອອກ ແລະເຂົ້າຮ່ວມຄືນ %(count)sຄັ້ງ",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sເຂົ້າຮ່ວມ ແລະ ອອກ",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sເຂົ້າຮ່ວມ ແລະ ອອກ %(count)s ຄັ້ງ",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sເຂົ້າຮ່ວມ ແລະ ອອກ",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sເຂົ້າຮ່ວມ ແລະອອກຈາກ %(count)s ເທື່ອ",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sອອກ",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sອອກຈາກ%(count)s ເທື່ອ",
-    "%(severalUsers)sleft %(count)s times|one": "ອອກຈາກ%(severalUsers)s",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sອອກ %(count)sຄັ້ງ",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sເຂົ້າຮ່ວມ",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sເຂົ້າຮ່ວມ %(count)sຄັ້ງ",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sເຂົ້າຮ່ວມ",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sເຂົ້າຮ່ວມ %(count)sຄັ້ງ",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sສົ່ງຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້",
+        "other": "%(oneUser)s ສົ່ງ %(count)s ຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sສົ່ງຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້",
+        "other": "%(severalUsers)s ສົ່ງ %(count)s ຂໍ້ຄວາມທີ່ເຊື່ອງໄວ້"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)sລຶບຂໍ້ຄວາມອອກແລ້ວ",
+        "other": "%(oneUser)sລຶບ %(count)s ຂໍ້ຄວາມອອກແລ້ວ"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sໄດ້ລຶບຂໍ້ຄວາມອອກ",
+        "other": "%(severalUsers)sລຶບ %(count)s ຂໍ້ຄວາມອອກແລ້ວ"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)sປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ",
+        "other": "%(oneUser)sປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ %(count)s ເທື່ອ"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)sໄດ້ປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ",
+        "other": "%(severalUsers)sປ່ຽນ <a>ຂໍ້ຄວາມທີ່ປັກໝຸດໄວ້</a> ສຳລັບຫ້ອງ%(count)sເທື່ອ"
+    },
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sໄດ້ປ່ຽນເຊີບເວີ ACLs",
+        "other": "%(oneUser)sປ່ຽນເຊີບເວີ ACLs %(count)s ເທື່ອ"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)sປ່ຽນ ACL ຂອງເຊີບເວີ",
+        "other": "%(severalUsers)sປ່ຽນເຊີບເວີ ACLs %(count)sຄັ້ງ"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)sບໍ່ໄດ້ປ່ຽນແປງ",
+        "other": "%(oneUser)sບໍ່ໄດ້ປ່ຽນແປງ %(count)s ເທື່ອ"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)sບໍ່ມີການປ່ຽນແປງ",
+        "other": "%(severalUsers)sບໍ່ໄດ້ປ່ຽນແປງ %(count)s ເທື່ອ"
+    },
+    "were unbanned %(count)s times": {
+        "one": "ຍົກເລີກການຫ້າມ",
+        "other": "ຖືກຫ້າມ %(count)s ເທື່ອ"
+    },
+    "was banned %(count)s times": {
+        "one": "ຖືກຫ້າມ",
+        "other": "ຖືກຫ້າມ %(count)s ເທື່ອ"
+    },
+    "were banned %(count)s times": {
+        "one": "ຖືກຫ້າມ",
+        "other": "ຖືກຫ້າມ %(count)s ເທື່ອ"
+    },
+    "was invited %(count)s times": {
+        "one": "ຖືກເຊີນ",
+        "other": "ຖືກເຊີນ %(count)s ເທື່ອ"
+    },
+    "were invited %(count)s times": {
+        "one": "ໄດ້ຖືກເຊື້ອເຊີນ",
+        "other": "ໄດ້ຖືກເຊີນ %(count)s ເທື່ອ"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "%(oneUser)sໄດ້ຖອນການເຊີນຂອງເຂົາເຈົ້າອອກແລ້ວ",
+        "other": "%(oneUser)sshad ການເຊີນຂອງເຂົາເຈົ້າຖອນອອກ %(count)s ຄັ້ງ"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)s shad ການເຊີນຂອງເຂົາເຈົ້າຖອນອອກ",
+        "other": "%(severalUsers)s shad ການເຊີນຂອງພວກເຂົາຖືກຖອນ %(count)s ຄັ້ງ"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)sປະຕິເສດການເຊີນຂອງເຂົາເຈົ້າ",
+        "other": "%(oneUser)sປະຕິເສດການເຊີນຂອງເຂົາເຈົ້າ %(count)s ຄັ້ງ"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)sປະຕິເສດຄຳເຊີນຂອງເຂົາເຈົ້າ",
+        "other": "%(severalUsers)sປະຕິເສດຄຳເຊີນຂອງເຂົາເຈົ້າ %(count)sເທື່ອ"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)s ອອກ ແລະເຂົ້າຮ່ວມຄືນໃໝ່",
+        "other": "%(oneUser)sອອກ ແລະເຂົ້າຮ່ວມ %(count)sຄັ້ງ"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)s ອອກ ແລະເຂົ້າຮ່ວມໃຫມ່",
+        "other": "%(severalUsers)s ອອກ ແລະເຂົ້າຮ່ວມຄືນ %(count)sຄັ້ງ"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)sເຂົ້າຮ່ວມ ແລະ ອອກ",
+        "other": "%(oneUser)sເຂົ້າຮ່ວມ ແລະ ອອກ %(count)s ຄັ້ງ"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)sເຂົ້າຮ່ວມ ແລະ ອອກ",
+        "other": "%(severalUsers)sເຂົ້າຮ່ວມ ແລະອອກຈາກ %(count)s ເທື່ອ"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)sອອກ",
+        "other": "%(oneUser)sອອກຈາກ%(count)s ເທື່ອ"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "ອອກຈາກ%(severalUsers)s",
+        "other": "%(severalUsers)sອອກ %(count)sຄັ້ງ"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)sເຂົ້າຮ່ວມ",
+        "other": "%(oneUser)sເຂົ້າຮ່ວມ %(count)sຄັ້ງ"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)sເຂົ້າຮ່ວມ",
+        "other": "%(severalUsers)sເຂົ້າຮ່ວມ %(count)sຄັ້ງ"
+    },
     "Something went wrong!": "ມີບາງຢ່າງຜິດພາດ!",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "ກະລຸນາ <newIssueLink>ສ້າງບັນຫາໃໝ່</newIssueLink> ໃນ GitHub ເພື່ອໃຫ້ພວກເຮົາສາມາດກວດສອບຂໍ້ຜິດພາດນີ້ໄດ້.",
     "Backspace": "ປຸ່ມກົດລຶບ",
@@ -2188,8 +2295,10 @@
     "Favourites": "ລາຍການທີ່ມັກ",
     "Replying": "ກຳລັງຕອບກັບ",
     "Recently viewed": "ເບິ່ງເມື່ອບໍ່ດົນມານີ້",
-    "Seen by %(count)s people|one": "ເຫັນໂດຍ %(count)s ຄົນ",
-    "Seen by %(count)s people|other": "ເຫັນໂດຍ %(count)s ຄົນ",
+    "Seen by %(count)s people": {
+        "one": "ເຫັນໂດຍ %(count)s ຄົນ",
+        "other": "ເຫັນໂດຍ %(count)s ຄົນ"
+    },
     "Join": "ເຂົ້າຮ່ວມ",
     "View": "ເບິ່ງ",
     "Unknown": "ບໍ່ຮູ້ຈັກ",
@@ -2260,17 +2369,25 @@
     "Add reaction": "ເພີ່ມການຕອບໂຕ້",
     "Error processing voice message": "ການປະມວນຜົນຂໍ້ຄວາມສຽງຜິດພາດ",
     "Error decrypting video": "ການຖອດລະຫັດວິດີໂອຜິດພາດ",
-    "%(count)s votes|one": "%(count)s ລົງຄະແນນສຽງ",
-    "%(count)s votes|other": "%(count)s ຄະແນນສຽງ",
+    "%(count)s votes": {
+        "one": "%(count)s ລົງຄະແນນສຽງ",
+        "other": "%(count)s ຄະແນນສຽງ"
+    },
     "edited": "ດັດແກ້",
-    "Based on %(count)s votes|one": "ອີງຕາມການລົງຄະແນນສຽງ %(count)s",
-    "Based on %(count)s votes|other": "ອີງຕາມ %(count)s ການລົງຄະເເນນສຽງ",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s ລົງຄະແນນສຽງ. ລົງຄະແນນສຽງເພື່ອເບິ່ງຜົນໄດ້ຮັບ",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s ລົງຄະແນນສຽງ. ລົງຄະແນນສຽງເພື່ອເບິ່ງຜົນໄດ້ຮັບ",
+    "Based on %(count)s votes": {
+        "one": "ອີງຕາມການລົງຄະແນນສຽງ %(count)s",
+        "other": "ອີງຕາມ %(count)s ການລົງຄະເເນນສຽງ"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s ລົງຄະແນນສຽງ. ລົງຄະແນນສຽງເພື່ອເບິ່ງຜົນໄດ້ຮັບ",
+        "other": "%(count)s ລົງຄະແນນສຽງ. ລົງຄະແນນສຽງເພື່ອເບິ່ງຜົນໄດ້ຮັບ"
+    },
     "No votes cast": "ບໍ່ມີການລົງຄະແນນສຽງ",
     "Results will be visible when the poll is ended": "ຜົນໄດ້ຮັບຈະເຫັນໄດ້ເມື່ອການສໍາຫຼວດສິ້ນສຸດລົງ",
-    "Final result based on %(count)s votes|one": "ຜົນສຸດທ້າຍໂດຍອີງໃສ່ %(count)s ຄະແນນສຽງ",
-    "Final result based on %(count)s votes|other": "ຜົນສຸດທ້າຍໂດຍອີງໃສ່ %(count)s ຄະແນນສຽງ",
+    "Final result based on %(count)s votes": {
+        "one": "ຜົນສຸດທ້າຍໂດຍອີງໃສ່ %(count)s ຄະແນນສຽງ",
+        "other": "ຜົນສຸດທ້າຍໂດຍອີງໃສ່ %(count)s ຄະແນນສຽງ"
+    },
     "Sorry, your vote was not registered. Please try again.": "ຂໍອະໄພ, ການລົງຄະແນນສຽງຂອງທ່ານບໍ່ໄດ້ລົງທະບຽນ. ກະລຸນາລອງອີກຄັ້ງ.",
     "Vote not registered": "ລົງຄະແນນສຽງບໍ່ໄດ້ລົງທະບຽນ",
     "Sorry, you can't edit a poll after votes have been cast.": "ຂໍອະໄພ, ທ່ານບໍ່ສາມາດແກ້ໄຂແບບສຳຫຼວດໄດ້ຫຼັງຈາກລົງຄະແນນສຽງແລ້ວ.",
@@ -2339,11 +2456,15 @@
     "That's fine": "ບໍ່ເປັນຫຍັງ",
     "Enable": "ເປີດໃຊ້ງານ",
     "File Attached": "ແນບໄຟລ໌",
-    "Exported %(count)s events in %(seconds)s seconds|one": "ສົ່ງອອກ %(count)s ເຫດການໃນ %(seconds)sວິນາທີ",
-    "Exported %(count)s events in %(seconds)s seconds|other": "ສົ່ງອອກ %(count)s ເຫດການໃນ %(seconds)s ວິນາທີ",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "ສົ່ງອອກ %(count)s ເຫດການໃນ %(seconds)sວິນາທີ",
+        "other": "ສົ່ງອອກ %(count)s ເຫດການໃນ %(seconds)s ວິນາທີ"
+    },
     "Export successful!": "ສົ່ງອອກສຳເລັດ!",
-    "Fetched %(count)s events in %(seconds)ss|one": "ດຶງເອົາ %(count)s ໃນເຫດການ%(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "ດຶງເອົາເຫດການ %(count)s ໃນ %(seconds)s",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "ດຶງເອົາ %(count)s ໃນເຫດການ%(seconds)ss",
+        "other": "ດຶງເອົາເຫດການ %(count)s ໃນ %(seconds)s"
+    },
     "Processing event %(number)s out of %(total)s": "ກຳລັງປະມວນຜົນເຫດການ %(number)s ຈາກທັງໝົດ %(total)s",
     "Error fetching file": "ເກີດຄວາມຜິດພາດໃນການດຶງໄຟລ໌",
     "Topic: %(topic)s": "ຫົວຂໍ້: %(topic)s",
@@ -2357,10 +2478,14 @@
     "Plain Text": "ຂໍ້ຄວາມທຳມະດາ",
     "JSON": "JSON",
     "HTML": "HTML",
-    "Fetched %(count)s events so far|one": "ດຶງເອົາເຫດການ %(count)s ຈົນເຖິງຕອນນັ້ນ",
-    "Fetched %(count)s events so far|other": "ດຶງເອົາເຫດການ %(count)s ຈົນເຖິງຕອນນັ້ນ",
-    "Fetched %(count)s events out of %(total)s|one": "ດຶງເອົາເຫດການ %(count)s ອອກຈາກ %(total)s ແລ້ວ",
-    "Fetched %(count)s events out of %(total)s|other": "ດຶງເອົາ %(count)sunt)s ເຫດການອອກຈາກ %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "ດຶງເອົາເຫດການ %(count)s ຈົນເຖິງຕອນນັ້ນ",
+        "other": "ດຶງເອົາເຫດການ %(count)s ຈົນເຖິງຕອນນັ້ນ"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "ດຶງເອົາເຫດການ %(count)s ອອກຈາກ %(total)s ແລ້ວ",
+        "other": "ດຶງເອົາ %(count)sunt)s ເຫດການອອກຈາກ %(total)s"
+    },
     "Generating a ZIP": "ການສ້າງ ZIP",
     "Are you sure you want to exit during this export?": "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການອອກໃນລະຫວ່າງການສົ່ງອອກນີ້?",
     "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "homeserver ນີ້ບໍ່ໄດ້ຖືກຕັ້ງຄ່າຢ່າງຖືກຕ້ອງເພື່ອສະແດງແຜນທີ່, ຫຼື ເຊີບເວີແຜນທີ່ ທີ່ຕັ້ງໄວ້ອາດຈະບໍ່ສາມາດຕິດຕໍ່ໄດ້.",
@@ -2419,8 +2544,10 @@
     "Can't leave Server Notices room": "ບໍ່ສາມາດອອກຈາກຫ້ອງແຈ້ງເຕືອນຂອງເຊີບເວີໄດ້",
     "Unexpected server error trying to leave the room": "ເກີດຄວາມຜິດພາດທີ່ບໍ່ຄາດຄິດຂອງເຊີບເວີ ໃນຄະນະທີ່ພະຍາຍາມອອກຈາກຫ້ອງ",
     "%(name)s (%(userId)s)": "%(name)s(%(userId)s)",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s ແລະ %(count)s ອື່ນໆ",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s ແລະ %(count)s ອື່ນໆ",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s ແລະ %(count)s ອື່ນໆ",
+        "other": "%(spaceName)s ແລະ %(count)s ອື່ນໆ"
+    },
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s ແລະ %(space2Name)s",
     "%(num)s days from now": "%(num)s ມື້ຕໍ່ຈາກນີ້",
     "about a day from now": "ປະມານນຶ່ງມື້ຈາກນີ້",
@@ -2437,8 +2564,10 @@
     "about a minute ago": "ປະມານໜຶ່ງວິນາທີກ່ອນຫນ້ານີ້",
     "a few seconds ago": "ສອງສາມວິນາທີກ່ອນຫນ້ານີ້",
     "%(items)s and %(lastItem)s": "%(items)s ແລະ %(lastItem)s",
-    "%(items)s and %(count)s others|one": "%(items)s ແລະ ອີກນຶ່ງລາຍການ",
-    "%(items)s and %(count)s others|other": "%(items)s ແລະ %(count)s ອື່ນໆ",
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s ແລະ ອີກນຶ່ງລາຍການ",
+        "other": "%(items)s ແລະ %(count)s ອື່ນໆ"
+    },
     "Attachment": "ຄັດຕິດ",
     "This homeserver has exceeded one of its resource limits.": "homeserverນີ້ໃຊ້ຊັບພະຍາກອນເກີນຂີດຈຳກັດຢ່າງໃດຢ່າງໜຶ່ງ.",
     "This homeserver has been blocked by its administrator.": "homeserver ນີ້ຖືກບລັອກໂດຍຜູູ້ຄຸ້ມຄອງລະບົບ.",
@@ -2481,7 +2610,10 @@
     "Please fill why you're reporting.": "ກະລຸນາຕື່ມຂໍ້ມູນວ່າເປັນຫຍັງທ່ານກໍາລັງລາຍງານ.",
     "Email (optional)": "ອີເມວ (ທາງເລືອກ)",
     "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "ກະລຸນາຮັບຊາບວ່າ, ຖ້າທ່ານບໍ່ເພີ່ມອີເມວ ແລະ ລືມລະຫັດຜ່ານຂອງທ່ານ, ທ່ານອາດ <b>ສູນເສຍການເຂົ້າເຖິງບັນຊີຂອງທ່ານຢ່າງຖາວອນ</b>.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນເຫຼົ່ານີ້ໂດຍໃຊ້ລະບົບປະຕູດຽວ( SSO) ເພື່ອພິສູດຕົວຕົນຂອງທ່ານ.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "other": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນເຫຼົ່ານີ້ໂດຍໃຊ້ລະບົບປະຕູດຽວ( SSO) ເພື່ອພິສູດຕົວຕົນຂອງທ່ານ.",
+        "one": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນນີ້ໂດຍໃຊ້ ລະບົບຈັດການປະຕູດຽວ (SSO) ເພື່ອພິສູດຕົວຕົນຂອງທ່ານ."
+    },
     "Session key:": "ກະແຈລະບົບ:",
     "Session ID:": "ID ລະບົບ:",
     "Cryptography": "ການເຂົ້າລະຫັດລັບ",
@@ -2579,13 +2711,18 @@
     "Select all": "ເລືອກທັງຫມົດ",
     "Deselect all": "ຍົກເລີກການເລືອກທັງໝົດ",
     "Authentication": "ການຢືນຢັນ",
-    "Sign out devices|one": "ອອກຈາກລະບົບອຸປະກອນ",
-    "Sign out devices|other": "ອອກຈາກລະບົບອຸປະກອນ",
-    "Click the button below to confirm signing out these devices.|one": "ກົດທີ່ປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຢືນຢັນການອອກຈາກລະບົບອຸປະກອນນີ້.",
-    "Click the button below to confirm signing out these devices.|other": "ກົດທີ່ປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຢືນຢັນການອອກຈາກລະບົບອຸປະກອນເຫຼົ່ານີ້.",
-    "Confirm signing out these devices|one": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນນີ້",
-    "Confirm signing out these devices|other": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນເຫຼົ່ານີ້",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນນີ້ໂດຍໃຊ້ ລະບົບຈັດການປະຕູດຽວ (SSO) ເພື່ອພິສູດຕົວຕົນຂອງທ່ານ.",
+    "Sign out devices": {
+        "one": "ອອກຈາກລະບົບອຸປະກອນ",
+        "other": "ອອກຈາກລະບົບອຸປະກອນ"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "ກົດທີ່ປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຢືນຢັນການອອກຈາກລະບົບອຸປະກອນນີ້.",
+        "other": "ກົດທີ່ປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຢືນຢັນການອອກຈາກລະບົບອຸປະກອນເຫຼົ່ານີ້."
+    },
+    "Confirm signing out these devices": {
+        "one": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນນີ້",
+        "other": "ຢືນຢັນການອອກຈາກລະບົບອຸປະກອນເຫຼົ່ານີ້"
+    },
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "ການລຶບລ້າງຂໍ້ມູນທັງໝົດຈາກລະບົບນີ້ຖາວອນ. ຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດຈະສູນເສຍເວັ້ນເສຍແຕ່ກະແຈຂອງເຂົາເຈົ້າໄດ້ຮັບການສໍາຮອງຂໍ້ມູນ.",
     "%(duration)sd": "%(duration)sd",
     "Topic: %(topic)s (<a>edit</a>)": "ຫົວຂໍ້: %(topic)s (<a>ແກ້ໄຂ</a>)",
@@ -2632,9 +2769,10 @@
     "Loading preview": "ກຳລັງໂຫຼດຕົວຢ່າງ",
     "Sign Up": "ລົງທະບຽນ",
     "Join the conversation with an account": "ເຂົ້າຮ່ວມການສົນທະນາດ້ວຍບັນຊີ",
-    "Currently removing messages in %(count)s rooms|other": "ກຳລັງລຶບຂໍ້ຄວາມຢູ່ໃນ %(count)s ຫ້ອງ",
-    "Currently joining %(count)s rooms|one": "ກຳລັງເຂົ້າຮ່ວມຫ້ອງ %(count)s",
-    "Currently joining %(count)s rooms|other": "ປະຈຸບັນກຳລັງເຂົ້າຮ່ວມ %(count)s ຫ້ອງ",
+    "Currently joining %(count)s rooms": {
+        "one": "ກຳລັງເຂົ້າຮ່ວມຫ້ອງ %(count)s",
+        "other": "ປະຈຸບັນກຳລັງເຂົ້າຮ່ວມ %(count)s ຫ້ອງ"
+    },
     "Join public room": "ເຂົ້າຮ່ວມຫ້ອງສາທາລະນະ",
     "You do not have permissions to add spaces to this space": "ທ່ານບໍ່ມີການອະນຸຍາດໃຫ້ເພີ່ມພື້ນທີ່ໃສ່ພື້ນທີ່ນີ້",
     "Add space": "ເພີ່ມພື້ນທີ່",
@@ -2679,10 +2817,14 @@
     "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "ຕັດສິນໃຈວ່າບ່ອນໃດທີ່ສາມາດເຂົ້າເຖິງຫ້ອງນີ້ໄດ້. ຖ້າຫາກພື້ນທີ່ເລືອກ, ສະມາຊິກຂອງຕົນສາມາດຊອກຫາ ແລະເຂົ້າຮ່ວມ <RoomName/>.",
     "Select spaces": "ເລືອກພື້ນທີ່",
     "You're removing all spaces. Access will default to invite only": "ທ່ານກຳລັງລຶບພື້ນທີ່ທັງໝົດອອກ. ການເຂົ້າເຖິງຈະເປັນຄ່າເລີ່ມຕົ້ນເພື່ອເຊີນເທົ່ານັ້ນ",
-    "%(count)s rooms|one": "%(count)s ຫ້ອງ",
-    "%(count)s rooms|other": "%(count)s ຫ້ອງ",
-    "%(count)s members|one": "ສະມາຊິກ %(count)s",
-    "%(count)s members|other": "ສະມາຊິກ %(count)s",
+    "%(count)s rooms": {
+        "one": "%(count)s ຫ້ອງ",
+        "other": "%(count)s ຫ້ອງ"
+    },
+    "%(count)s members": {
+        "one": "ສະມາຊິກ %(count)s",
+        "other": "ສະມາຊິກ %(count)s"
+    },
     "Are you sure you want to sign out?": "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການອອກຈາກລະບົບ?",
     "You'll lose access to your encrypted messages": "ທ່ານຈະສູນເສຍການເຂົ້າເຖິງລະຫັດຂໍ້ຄວາມຂອງທ່ານ",
     "Manually export keys": "ສົ່ງກະແຈອອກດ້ວຍຕົນເອງ",
@@ -2730,11 +2872,14 @@
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "ຕອນນີ້ທ່ານກຳລັງໃຊ້ <server></server> ເພື່ອຄົ້ນຫາ ແລະ ສາມາດຄົ້ນຫາໄດ້ໂດຍຜູ້ຕິດຕໍ່ທີ່ມີຢູ່ແລ້ວ. ທ່ານສາມາດປ່ຽນເຊີບເວນຂອງທ່ານໄດ້ຂ້າງລຸ່ມນີ້.",
     "Identity server (%(server)s)": "ເຊີບເວີ %(server)s)",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "ພວກເຮົາແນະນໍາໃຫ້ທ່ານເອົາທີ່ຢູ່ອີເມວ ແລະ ເບີໂທລະສັບຂອງທ່ານອອກຈາກເຊີບເວີກ່ອນທີ່ຈະຕັດການເຊື່ອມຕໍ່.",
-    "was unbanned %(count)s times|one": "ຍົກເລີກການຫ້າມ",
-    "was unbanned %(count)s times|other": "ຖືກຍົກເລີກການຫ້າມ %(count)s ເທື່ອ",
-    "was removed %(count)s times|other": "ລຶບອອກ %(count)s ເທື່ອ",
-    "were removed %(count)s times|one": "ໄດ້ຖືກລຶບອອກ",
-    "were removed %(count)s times|other": "ໄດ້ຖືກ]ລືບອອກ %(count)s ເທື່ອ",
+    "was unbanned %(count)s times": {
+        "one": "ຍົກເລີກການຫ້າມ",
+        "other": "ຖືກຍົກເລີກການຫ້າມ %(count)s ເທື່ອ"
+    },
+    "were removed %(count)s times": {
+        "one": "ໄດ້ຖືກລຶບອອກ",
+        "other": "ໄດ້ຖືກ]ລືບອອກ %(count)s ເທື່ອ"
+    },
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "ທ່ານຍັງ <b>ແບ່ງປັນຂໍ້ມູນສ່ວນຕົວຂອງທ່ານ</b> ຢູ່ໃນເຊີບເວີ <idserver />.",
     "Disconnect anyway": "ຍົກເລີກການເຊື່ອມຕໍ່",
     "wait and try again later": "ລໍຖ້າແລ້ວລອງໃໝ່ໃນພາຍຫຼັງ",
@@ -2942,13 +3087,17 @@
     "Changelog": "ບັນທຶກການປ່ຽນແປງ",
     "Unavailable": "ບໍ່ສາມາດໃຊ້ງານໄດ້",
     "Unable to load commit detail: %(msg)s": "ບໍ່ສາມາດໂຫຼດລາຍລະອຽດຂອງ commit: %(msg)s",
-    "Remove %(count)s messages|one": "ລຶບອອກ 1 ຂໍ້ຄວາມ",
-    "Remove %(count)s messages|other": "ເອົາ %(count)s ຂໍ້ຄວາມອອກ",
+    "Remove %(count)s messages": {
+        "one": "ລຶບອອກ 1 ຂໍ້ຄວາມ",
+        "other": "ເອົາ %(count)s ຂໍ້ຄວາມອອກ"
+    },
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "ຍົກເລີກການກວດກາ ຖ້າທ່ານຕ້ອງການລຶບຂໍ້ຄວາມໃນລະບົບຜູ້ໃຊ້ນີ້ (ເຊັ່ນ: ການປ່ຽນແປງສະມາຊິກ, ການປ່ຽນແປງໂປຣໄຟລ໌...)",
     "Preserve system messages": "ຮັກສາຂໍ້ຄວາມຂອງລະບົບ",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "ສໍາລັບຈໍານວນຂໍ້ຄວາມຂະຫນາດໃຫຍ່, ນີ້ອາດຈະໃຊ້ເວລາ, ກະລຸນາຢ່າໂຫຼດຂໍ້ມູນລູກຄ້າຂອງທ່ານຄືນໃໝ່ໃນລະຫວ່າງນີ້.",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "ທ່ານກຳລັງຈະລຶບ %(count)s ຂໍ້ຄວາມໂດຍ %(user)s. ນີ້ຈະເປັນການລຶບຂໍ້ຄວາມອອກຖາວອນສຳລັບທຸກຄົນໃນການສົນທະນາ. ທ່ານຕ້ອງການສືບຕໍ່ບໍ?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "ທ່ານກຳລັງຈະລຶບ %(count)s ຂໍ້ຄວາມອອກໂດຍ %(user)s. ນີ້ຈະເປັນການລຶບຂໍ້ຄວາມອອກຖາວອນສຳລັບທຸກຄົນໃນການສົນທະນາ. ທ່ານຕ້ອງການສືບຕໍ່ບໍ?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "ທ່ານກຳລັງຈະລຶບ %(count)s ຂໍ້ຄວາມໂດຍ %(user)s. ນີ້ຈະເປັນການລຶບຂໍ້ຄວາມອອກຖາວອນສຳລັບທຸກຄົນໃນການສົນທະນາ. ທ່ານຕ້ອງການສືບຕໍ່ບໍ?",
+        "other": "ທ່ານກຳລັງຈະລຶບ %(count)s ຂໍ້ຄວາມອອກໂດຍ %(user)s. ນີ້ຈະເປັນການລຶບຂໍ້ຄວາມອອກຖາວອນສຳລັບທຸກຄົນໃນການສົນທະນາ. ທ່ານຕ້ອງການສືບຕໍ່ບໍ?"
+    },
     "Remove recent messages by %(user)s": "ລຶບຂໍ້ຄວາມຫຼ້າສຸດໂດຍ %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "ລອງເລື່ອນຂຶ້ນໃນທາມລາຍເພື່ອເບິ່ງວ່າມີອັນໃດກ່ອນໜ້ານີ້.",
     "No recent messages by %(user)s found": "ບໍ່ພົບຂໍ້ຄວາມຫຼ້າສຸດໂດຍ %(user)s",
@@ -2968,8 +3117,10 @@
     "Report the entire room": "ລາຍງານຫ້ອງທັງໝົດ",
     "Spam or propaganda": "ຂໍ້ຄວາມຂີ້ເຫຍື້ອ ຫຼື ການໂຄສະນາເຜີຍແຜ່",
     "Close preview": "ປິດຕົວຢ່າງ",
-    "Show %(count)s other previews|one": "ສະແດງຕົວຢ່າງ %(count)s ອື່ນໆ",
-    "Show %(count)s other previews|other": "ສະແດງຕົວຢ່າງອື່ນໆ %(count)s",
+    "Show %(count)s other previews": {
+        "one": "ສະແດງຕົວຢ່າງ %(count)s ອື່ນໆ",
+        "other": "ສະແດງຕົວຢ່າງອື່ນໆ %(count)s"
+    },
     "Scroll to most recent messages": "ເລື່ອນໄປຫາຂໍ້ຄວາມຫຼ້າສຸດ",
     "You can't see earlier messages": "ທ່ານບໍ່ສາມາດເຫັນຂໍ້ຄວາມກ່ອນໜ້ານີ້",
     "Mod": "ກາປັບປ່ຽນ",
@@ -3036,8 +3187,10 @@
     "Report Content": "ລາຍງານເນື້ອຫາ",
     "Please pick a nature and describe what makes this message abusive.": "ກະລຸນາເລືອກລັກສະນະ ແລະ ການອະທິບາຍຂອງຂໍ້ຄວາມໃດໜຶ່ງທີ່ສຸພາບ.",
     "<empty string>": "<Empty string>",
-    "<%(count)s spaces>|one": "<space>",
-    "<%(count)s spaces>|other": "<%(count)s spaces>",
+    "<%(count)s spaces>": {
+        "one": "<space>",
+        "other": "<%(count)s spaces>"
+    },
     "Link to room": "ເຊື່ອມຕໍ່ທີ່ຫ້ອງ",
     "Link to selected message": "ເຊື່ອມຕໍ່ກັບຂໍ້ຄວາມທີ່ເລືອກ",
     "Share Room Message": "ແບ່ງປັນຂໍ້ຄວາມໃນຫ້ອງ",
@@ -3056,9 +3209,13 @@
     "Not all selected were added": "ບໍ່ໄດ້ເລືອກທັງໝົດທີ່ຖືກເພີ່ມ",
     "Matrix": "Matrix",
     "Looks good": "ດີ",
-    "And %(count)s more...|other": "ແລະ %(count)sອີກ...",
-    "%(count)s people you know have already joined|one": "%(count)s ຄົນທີ່ທ່ານຮູ້ຈັກໄດ້ເຂົ້າຮ່ວມແລ້ວ",
-    "%(count)s people you know have already joined|other": "%(count)s ຄົນທີ່ທ່ານຮູ້ຈັກໄດ້ເຂົ້າຮ່ວມແລ້ວ",
+    "And %(count)s more...": {
+        "other": "ແລະ %(count)sອີກ..."
+    },
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s ຄົນທີ່ທ່ານຮູ້ຈັກໄດ້ເຂົ້າຮ່ວມແລ້ວ",
+        "other": "%(count)s ຄົນທີ່ທ່ານຮູ້ຈັກໄດ້ເຂົ້າຮ່ວມແລ້ວ"
+    },
     "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
     "%(brand)s URL": "%(brand)s URL",
     "Failed to ban user": "ຫ້າມຜູ້ໃຊ້ບໍ່ສຳເລັດ",
@@ -3072,7 +3229,6 @@
     "Ban from room": "ຫ້າມອອກຈາກຫ້ອງ",
     "Unban from room": "ຫ້າມຈາກຫ້ອງ",
     "Ban from space": "ພື້ນທີ່ຫ້າມຈາກ",
-    "%(count)s verified sessions|other": "%(count)sລະບົບຢືນຢັນແລ້ວ",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "ໃນຫ້ອງທີ່ເຂົ້າລະຫັດ, ເຊັ່ນດຽວກັບ, ການສະແດງຕົວຢ່າງ URLໄດ້ປິດໃຊ້ງານໂດຍຄ່າເລີ່ມຕົ້ນເພື່ອຮັບປະກັນວ່າ homeserver ຂອງທ່ານ (ບ່ອນສະແດງຕົວຢ່າງ) ບໍ່ສາມາດລວບລວມຂໍ້ມູນກ່ຽວກັບການເຊື່ອມຕໍ່ທີ່ທ່ານເຫັນຢູ່ໃນຫ້ອງນີ້.",
     "Invite": "ເຊີນ",
     "Search": "ຊອກຫາ",
@@ -3081,8 +3237,10 @@
     "Forget room": "ລືມຫ້ອງ",
     "Room options": "ຕົວເລືອກຫ້ອງ",
     "Join Room": "ເຂົ້າຮ່ວມຫ້ອງ",
-    "(~%(count)s results)|one": "(~%(count)sຜົນຮັບ)",
-    "(~%(count)s results)|other": "(~%(count)sຜົນຮັບ)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)sຜົນຮັບ)",
+        "other": "(~%(count)sຜົນຮັບ)"
+    },
     "No recently visited rooms": "ບໍ່ມີຫ້ອງທີ່ເຂົ້າເບິ່ງເມື່ອບໍ່ດົນມານີ້",
     "Recently visited rooms": "ຫ້ອງທີ່ເຂົ້າເບິ່ງເມື່ອບໍ່ດົນມານີ້",
     "Room %(name)s": "ຫ້ອງ %(name)s",
@@ -3109,8 +3267,10 @@
     "Reply to thread…": "ຕອບກັບກະທູ້…",
     "Invite to this space": "ເຊີນໄປບ່ອນນີ້",
     "Invite to this room": "ເຊີນເຂົ້າຫ້ອງນີ້",
-    "and %(count)s others...|one": "ແລະ ອີກອັນນຶ່ງ...",
-    "and %(count)s others...|other": "ແລະ %(count)s ຜູ້ອຶ່ນ...",
+    "and %(count)s others...": {
+        "one": "ແລະ ອີກອັນນຶ່ງ...",
+        "other": "ແລະ %(count)s ຜູ້ອຶ່ນ..."
+    },
     "%(members)s and %(last)s": "%(members)s ແລະ %(last)s",
     "%(members)s and more": "%(members)s ແລະອື່ນໆ",
     "Open room": "ເປີດຫ້ອງ",
@@ -3136,8 +3296,10 @@
     "Click to read topic": "ກົດເພື່ອອ່ານຫົວຂໍ້",
     "Edit topic": "ແກ້ໄຂຫົວຂໍ້",
     "Joining…": "ກຳລັງເຂົ້າ…",
-    "%(count)s people joined|one": "%(count)s ຄົນເຂົ້າຮ່ວມ\"",
-    "%(count)s people joined|other": "%(count)s ຄົນເຂົ້າຮ່ວມ",
+    "%(count)s people joined": {
+        "one": "%(count)s ຄົນເຂົ້າຮ່ວມ\"",
+        "other": "%(count)s ຄົນເຂົ້າຮ່ວມ"
+    },
     "View related event": "ເບິ່ງເຫດການທີ່ກ່ຽວຂ້ອງ",
     "Read receipts": "ຢັ້ງຢືນອ່ານແລ້ວ",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "ເພີ່ມຂີດຄວາມສາມາດຂອງອຸປະກອນ (ບູສແອັບ %(appName)s ນີ້ໃໝ່ເພື່ອເຫັນຜົນ)"
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index a0a587aa74..1e43428c0c 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -166,8 +166,10 @@
     "Command error": "Komandos klaida",
     "Unknown": "Nežinoma",
     "Save": "Išsaugoti",
-    "(~%(count)s results)|other": "(~%(count)s rezultatų(-ai))",
-    "(~%(count)s results)|one": "(~%(count)s rezultatas)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s rezultatų(-ai))",
+        "one": "(~%(count)s rezultatas)"
+    },
     "Upload avatar": "Įkelti pseudoportretą",
     "Settings": "Nustatymai",
     "%(roomName)s does not exist.": "%(roomName)s neegzistuoja.",
@@ -201,9 +203,11 @@
     "No more results": "Daugiau nėra jokių rezultatų",
     "Room": "Kambarys",
     "Failed to reject invite": "Nepavyko atmesti pakvietimo",
-    "Uploading %(filename)s and %(count)s others|other": "Įkeliamas %(filename)s ir dar %(count)s failai",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Įkeliamas %(filename)s ir dar %(count)s failai",
+        "one": "Įkeliamas %(filename)s ir dar %(count)s failas"
+    },
     "Uploading %(filename)s": "Įkeliamas %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Įkeliamas %(filename)s ir dar %(count)s failas",
     "Success": "Pavyko",
     "Unable to remove contact information": "Nepavyko pašalinti kontaktinės informacijos",
     "<not supported>": "<nepalaikoma>",
@@ -307,7 +311,10 @@
     "Create new room": "Sukurti naują kambarį",
     "No results": "Jokių rezultatų",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s pasikeitė vardą",
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)s pasikeitė vardą",
+        "other": "%(oneUser)s pasikeitė vardą %(count)s kartų(-us)"
+    },
     "collapse": "suskleisti",
     "expand": "išskleisti",
     "Start chat": "Pradėti pokalbį",
@@ -333,8 +340,10 @@
     "Enable widget screenshots on supported widgets": "Įjungti valdiklių ekrano kopijas palaikomuose valdikliuose",
     "Export E2E room keys": "Eksportuoti E2E (visapusio šifravimo) kambarių raktus",
     "Unignore": "Nebeignoruoti",
-    "and %(count)s others...|other": "ir %(count)s kitų...",
-    "and %(count)s others...|one": "ir dar vienas...",
+    "and %(count)s others...": {
+        "other": "ir %(count)s kitų...",
+        "one": "ir dar vienas..."
+    },
     "Mention": "Paminėti",
     "This room has been replaced and is no longer active.": "Šis kambarys buvo pakeistas ir daugiau nebėra aktyvus.",
     "You do not have permission to post to this room": "Jūs neturite leidimų rašyti šiame kambaryje",
@@ -346,13 +355,21 @@
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s pašalino kambario pseudoportretą.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s pakeitė kambario pseudoportretą į <img/>",
     "Home": "Pradžia",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s išėjo %(count)s kartų(-us)",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s išėjo",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s išėjo %(count)s kartų(-us)",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s išėjo",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s pasikeitė vardus",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s pasikeitė vardą %(count)s kartų(-us)",
-    "And %(count)s more...|other": "Ir dar %(count)s...",
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s išėjo %(count)s kartų(-us)",
+        "one": "%(severalUsers)s išėjo"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s išėjo %(count)s kartų(-us)",
+        "one": "%(oneUser)s išėjo"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)s pasikeitė vardus",
+        "other": "%(severalUsers)s pasikeitė vardus %(count)s kartų(-us)"
+    },
+    "And %(count)s more...": {
+        "other": "Ir dar %(count)s..."
+    },
     "Default": "Numatytas",
     "Restricted": "Apribotas",
     "Moderator": "Moderatorius",
@@ -476,8 +493,10 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s galios lygį iš %(fromPowerLevel)s į %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s pakeitė %(powerLevelDiffText)s.",
     "%(displayName)s is typing …": "%(displayName)s rašo …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s ir %(count)s kiti(-ų) rašo …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ir dar vienas rašo …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s ir %(count)s kiti(-ų) rašo …",
+        "one": "%(names)s ir dar vienas rašo …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ir %(lastPerson)s rašo …",
     "Cannot reach homeserver": "Serveris nepasiekiamas",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Įsitikinkite, kad jūsų interneto ryšys yra stabilus, arba susisiekite su serverio administratoriumi",
@@ -489,8 +508,10 @@
     "No homeserver URL provided": "Nepateiktas serverio URL",
     "Unexpected error resolving homeserver configuration": "Netikėta klaida nusistatant serverio konfigūraciją",
     "Unexpected error resolving identity server configuration": "Netikėta klaida nusistatant tapatybės serverio konfigūraciją",
-    "%(items)s and %(count)s others|other": "%(items)s ir %(count)s kiti(-ų)",
-    "%(items)s and %(count)s others|one": "%(items)s ir dar vienas",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s ir %(count)s kiti(-ų)",
+        "one": "%(items)s ir dar vienas"
+    },
     "%(items)s and %(lastItem)s": "%(items)s ir %(lastItem)s",
     "Unrecognised address": "Neatpažintas adresas",
     "You do not have permission to invite people to this room.": "Jūs neturite leidimo pakviesti žmones į šį kambarį.",
@@ -521,8 +542,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Šis failas yra <b>per didelis</b> įkėlimui. Failų dydžio limitas yra %(limit)s, bet šis failas užima %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Šie failai yra <b>per dideli</b> įkėlimui. Failų dydžio limitas yra %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Kai kurie failai yra <b>per dideli</b> įkėlimui. Failų dydžio limitas yra %(limit)s.",
-    "Upload %(count)s other files|other": "Įkelti %(count)s kitus failus",
-    "Upload %(count)s other files|one": "Įkelti %(count)s kitą failą",
+    "Upload %(count)s other files": {
+        "other": "Įkelti %(count)s kitus failus",
+        "one": "Įkelti %(count)s kitą failą"
+    },
     "Cancel All": "Atšaukti visus",
     "Upload Error": "Įkėlimo klaida",
     "This room is not public. You will not be able to rejoin without an invite.": "Šis kambarys nėra viešas. Jūs negalėsite prisijungti iš naujo be pakvietimo.",
@@ -554,43 +577,78 @@
     "Help & About": "Pagalba ir Apie",
     "Direct Messages": "Privačios žinutės",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Nustatykite adresus šiam kambariui, kad vartotojai galėtų surasti šį kambarį per jūsų serverį (%(localDomain)s)",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s prisijungė %(count)s kartų(-us)",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s prisijungė",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s prisijungė %(count)s kartų(-us)",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s prisijungė",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s prisijungė ir išėjo %(count)s kartų(-us)",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s prisijungė ir išėjo",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s prisijungė ir išėjo %(count)s kartų(-us)",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s prisijungė ir išėjo",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s išėjo ir vėl prisijungė %(count)s kartų(-us)",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s išėjo ir vėl prisijungė",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s išėjo ir vėl prisijungė %(count)s kartų(-us)",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s išėjo ir vėl prisijungė",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s atmetė pakvietimus %(count)s kartų(-us)",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s atmetė pakvietimus",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s atmetė pakvietimą %(count)s kartų(-us)",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s atmetė pakvietimą",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s atšaukė savo pakvietimus %(count)s kartų(-us)",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s atšaukė savo pakvietimus",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s atšaukė savo pakvietimą %(count)s kartų(-us)",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s atšaukė savo pakvietimą",
-    "were invited %(count)s times|other": "buvo pakviesti %(count)s kartų(-us)",
-    "were invited %(count)s times|one": "buvo pakviesti",
-    "was invited %(count)s times|other": "buvo pakviestas %(count)s kartų(-us)",
-    "was invited %(count)s times|one": "buvo pakviestas",
-    "were banned %(count)s times|other": "buvo užblokuoti %(count)s kartų(-us)",
-    "were banned %(count)s times|one": "buvo užblokuoti",
-    "was banned %(count)s times|other": "buvo užblokuotas %(count)s kartų(-us)",
-    "was banned %(count)s times|one": "buvo užblokuotas",
-    "were unbanned %(count)s times|other": "buvo atblokuoti %(count)s kartų(-us)",
-    "were unbanned %(count)s times|one": "buvo atblokuoti",
-    "was unbanned %(count)s times|other": "buvo atblokuotas %(count)s kartų(-us)",
-    "was unbanned %(count)s times|one": "buvo atblokuotas",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s pasikeitė vardus %(count)s kartų(-us)",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s neatliko jokių pakeitimų %(count)s kartų(-us)",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s neatliko jokių pakeitimų",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s neatliko jokių pakeitimų %(count)s kartų(-us)",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s neatliko jokių pakeitimų",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s prisijungė %(count)s kartų(-us)",
+        "one": "%(severalUsers)s prisijungė"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s prisijungė %(count)s kartų(-us)",
+        "one": "%(oneUser)s prisijungė"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s prisijungė ir išėjo %(count)s kartų(-us)",
+        "one": "%(severalUsers)s prisijungė ir išėjo"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s prisijungė ir išėjo %(count)s kartų(-us)",
+        "one": "%(oneUser)s prisijungė ir išėjo"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s išėjo ir vėl prisijungė %(count)s kartų(-us)",
+        "one": "%(severalUsers)s išėjo ir vėl prisijungė"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s išėjo ir vėl prisijungė %(count)s kartų(-us)",
+        "one": "%(oneUser)s išėjo ir vėl prisijungė"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s atmetė pakvietimus %(count)s kartų(-us)",
+        "one": "%(severalUsers)s atmetė pakvietimus"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s atmetė pakvietimą %(count)s kartų(-us)",
+        "one": "%(oneUser)s atmetė pakvietimą"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s atšaukė savo pakvietimus %(count)s kartų(-us)",
+        "one": "%(severalUsers)s atšaukė savo pakvietimus"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s atšaukė savo pakvietimą %(count)s kartų(-us)",
+        "one": "%(oneUser)s atšaukė savo pakvietimą"
+    },
+    "were invited %(count)s times": {
+        "other": "buvo pakviesti %(count)s kartų(-us)",
+        "one": "buvo pakviesti"
+    },
+    "was invited %(count)s times": {
+        "other": "buvo pakviestas %(count)s kartų(-us)",
+        "one": "buvo pakviestas"
+    },
+    "were banned %(count)s times": {
+        "other": "buvo užblokuoti %(count)s kartų(-us)",
+        "one": "buvo užblokuoti"
+    },
+    "was banned %(count)s times": {
+        "other": "buvo užblokuotas %(count)s kartų(-us)",
+        "one": "buvo užblokuotas"
+    },
+    "were unbanned %(count)s times": {
+        "other": "buvo atblokuoti %(count)s kartų(-us)",
+        "one": "buvo atblokuoti"
+    },
+    "was unbanned %(count)s times": {
+        "other": "buvo atblokuotas %(count)s kartų(-us)",
+        "one": "buvo atblokuotas"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s neatliko jokių pakeitimų %(count)s kartų(-us)",
+        "one": "%(severalUsers)s neatliko jokių pakeitimų"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s neatliko jokių pakeitimų %(count)s kartų(-us)",
+        "one": "%(oneUser)s neatliko jokių pakeitimų"
+    },
     "Power level": "Galios lygis",
     "Custom level": "Pritaikytas lygis",
     "Can't find this server or its room list": "Negalime rasti šio serverio arba jo kambarių sąrašo",
@@ -709,9 +767,15 @@
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Šifruotuose kambariuose jūsų žinutės yra apsaugotos ir tik jūs ir gavėjas turite unikalius raktus joms atrakinti.",
     "Verify User": "Patvirtinti Vartotoją",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Dėl papildomo saugumo patvirtinkite šį vartotoją patikrindami vienkartinį kodą abiejuose jūsų įrenginiuose.",
-    "%(count)s verified sessions|other": "%(count)s patvirtintų seansų",
+    "%(count)s verified sessions": {
+        "other": "%(count)s patvirtintų seansų",
+        "one": "1 patvirtintas seansas"
+    },
     "Hide verified sessions": "Slėpti patvirtintus seansus",
-    "%(count)s sessions|other": "%(count)s seansai(-ų)",
+    "%(count)s sessions": {
+        "other": "%(count)s seansai(-ų)",
+        "one": "%(count)s seansas"
+    },
     "Hide sessions": "Slėpti seansus",
     "Security": "Saugumas",
     "Verify by scanning": "Patvirtinti nuskaitant",
@@ -884,7 +948,6 @@
     "Everyone in this room is verified": "Visi šiame kambaryje yra patvirtinti",
     "Encrypted by a deleted session": "Užšifruota ištrinto seanso",
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Nustatymuose naudokite tapatybės serverį, kad gautumėte pakvietimus tiesiai į %(brand)s.",
-    "%(count)s verified sessions|one": "1 patvirtintas seansas",
     "If you can't scan the code above, verify by comparing unique emoji.": "Jei nuskaityti aukščiau esančio kodo negalite, patvirtinkite palygindami unikalius jaustukus.",
     "You've successfully verified your device!": "Jūs sėkmingai patvirtinote savo įrenginį!",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Jūs sėkmingai patvirtinote %(deviceName)s (%(deviceId)s)!",
@@ -1106,10 +1169,14 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s pakeitė šio kambario adresus.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s pakeitė pagrindinį ir alternatyvius šio kambario adresus.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s pakeitė alternatyvius šio kambario adresus.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pridėjo alternatyvų šio kambario adresą %(addresses)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pridėjo alternatyvius šio kambario adresus %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pašalino alternatyvų šio kambario adresą %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pašalino alternatyvius šio kambario adresus %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s pridėjo alternatyvų šio kambario adresą %(addresses)s.",
+        "other": "%(senderName)s pridėjo alternatyvius šio kambario adresus %(addresses)s."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s pašalino alternatyvų šio kambario adresą %(addresses)s.",
+        "other": "%(senderName)s pašalino alternatyvius šio kambario adresus %(addresses)s."
+    },
     "Room settings": "Kambario nustatymai",
     "Link to most recent message": "Nuoroda į naujausią žinutę",
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Pakviesti ką nors naudojant jų vardą, vartotojo vardą (pvz.: <userId/>) arba <a>bendrinti šį kambarį</a>.",
@@ -1119,7 +1186,9 @@
     "Add widgets, bridges & bots": "Pridėti valdiklius, tiltus ir botus",
     "Edit widgets, bridges & bots": "Redaguoti valdiklius, tiltus ir botus",
     "Widgets": "Valdikliai",
-    "You can only pin up to %(count)s widgets|other": "Galite prisegti tik iki %(count)s valdiklių",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Galite prisegti tik iki %(count)s valdiklių"
+    },
     "Hide Widgets": "Slėpti Valdiklius",
     "Modify widgets": "Keisti valdiklius",
     "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s dabar naudoja 3-5 kartus mažiau atminties, įkeliant vartotojų informaciją tik prireikus. Palaukite, kol mes iš naujo sinchronizuosime su serveriu!",
@@ -1151,8 +1220,10 @@
     "Show all": "Rodyti viską",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Jūs ignoravote šį vartotoją, todėl jo žinutė yra paslėpta. <a>Rodyti vistiek.</a>",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Kai kas nors į savo žinutę įtraukia URL, gali būti rodoma URL peržiūra, suteikianti daugiau informacijos apie tą nuorodą, tokios kaip pavadinimas, aprašymas ir vaizdas iš svetainės.",
-    "Show %(count)s more|one": "Rodyti dar %(count)s",
-    "Show %(count)s more|other": "Rodyti dar %(count)s",
+    "Show %(count)s more": {
+        "one": "Rodyti dar %(count)s",
+        "other": "Rodyti dar %(count)s"
+    },
     "Show previews of messages": "Rodyti žinučių peržiūras",
     "Show rooms with unread messages first": "Pirmiausia rodyti kambarius su neperskaitytomis žinutėmis",
     "Show Widgets": "Rodyti Valdiklius",
@@ -1223,8 +1294,10 @@
     "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s atnaujino taisyklę, draudžiančią vartotojus, sutampančius su %(glob)s dėl %(reason)s",
     "Failed to remove tag %(tagName)s from room": "Nepavyko pašalinti žymos %(tagName)s iš kambario",
     "Your browser likely removed this data when running low on disk space.": "Jūsų naršyklė greičiausiai pašalino šiuos duomenis pritrūkus vietos diske.",
-    "Remove %(count)s messages|one": "Pašalinti 1 žinutę",
-    "Remove %(count)s messages|other": "Pašalinti %(count)s žinutes(-ų)",
+    "Remove %(count)s messages": {
+        "one": "Pašalinti 1 žinutę",
+        "other": "Pašalinti %(count)s žinutes(-ų)"
+    },
     "Remove %(phone)s?": "Pašalinti %(phone)s?",
     "Remove %(email)s?": "Pašalinti %(email)s?",
     "Remove messages sent by others": "Pašalinti kitų siųstas žinutes",
@@ -1300,8 +1373,10 @@
     "List options": "Sąrašo parinktys",
     "Notification Autocomplete": "Pranešimo Automatinis Užbaigimas",
     "Room Notification": "Kambario Pranešimas",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Jūs turite %(count)s neperskaitytą pranešimą ankstesnėje šio kambario versijoje.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Jūs turite %(count)s neperskaitytus(-ų) pranešimus(-ų) ankstesnėje šio kambario versijoje.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "Jūs turite %(count)s neperskaitytą pranešimą ankstesnėje šio kambario versijoje.",
+        "other": "Jūs turite %(count)s neperskaitytus(-ų) pranešimus(-ų) ankstesnėje šio kambario versijoje."
+    },
     "Notification options": "Pranešimų parinktys",
     "Favourited": "Mėgstamas",
     "Room options": "Kambario parinktys",
@@ -1407,7 +1482,6 @@
     "Confirm this user's session by comparing the following with their User Settings:": "Patvirtinkite šio vartotojo seansą, palygindami tai, kas nurodyta toliau, su jo Vartotojo Nustatymais:",
     "Confirm by comparing the following with the User Settings in your other session:": "Patvirtinkite, palygindami tai, kas nurodyta toliau, su Vartotojo Nustatymais kitame jūsų seanse:",
     "Clear all data in this session?": "Išvalyti visus duomenis šiame seanse?",
-    "%(count)s sessions|one": "%(count)s seansas",
     "Missing session data": "Trūksta seanso duomenų",
     "Successfully restored %(sessionCount)s keys": "Sėkmingai atkurti %(sessionCount)s raktai",
     "Reason (optional)": "Priežastis (nebūtina)",
@@ -1756,24 +1830,32 @@
     "Mentions & keywords": "Paminėjimai & Raktažodžiai",
     "New keyword": "Naujas raktažodis",
     "Keyword": "Raktažodis",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Siunčiame pakvietimą...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Siunčiame pakvietimus... (%(progress)s iš %(count)s)",
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Siunčiame pakvietimą...",
+        "other": "Siunčiame pakvietimus... (%(progress)s iš %(count)s)"
+    },
     "Loading new room": "Įkeliamas naujas kambarys",
     "Upgrading room": "Atnaujinamas kambarys",
     "Large": "Didelis",
-    "& %(count)s more|one": "& %(count)s daugiau",
-    "& %(count)s more|other": "& %(count)s daugiau",
+    "& %(count)s more": {
+        "one": "& %(count)s daugiau",
+        "other": "& %(count)s daugiau"
+    },
     "Upgrade required": "Reikalingas atnaujinimas",
     "Anyone can find and join.": "Bet kas gali rasti ir prisijungti.",
     "Only invited people can join.": "Tik pakviesti žmonės gali prisijungti.",
     "Private (invite only)": "Privatus (tik su pakvietimu)",
-    "Click the button below to confirm signing out these devices.|other": "Spustelėkite mygtuką žemiau kad patvirtinti šių įrenginių atjungimą.",
-    "Click the button below to confirm signing out these devices.|one": "Spustelėkite mygtuką žemiau kad patvirtinti šio įrenginio atjungimą.",
+    "Click the button below to confirm signing out these devices.": {
+        "other": "Spustelėkite mygtuką žemiau kad patvirtinti šių įrenginių atjungimą.",
+        "one": "Spustelėkite mygtuką žemiau kad patvirtinti šio įrenginio atjungimą."
+    },
     "Rename": "Pervadinti",
     "Deselect all": "Nuimti pasirinkimą nuo visko",
     "Select all": "Pasirinkti viską",
-    "Sign out devices|other": "Atjungti įrenginius",
-    "Sign out devices|one": "Atjungti įrenginį",
+    "Sign out devices": {
+        "other": "Atjungti įrenginius",
+        "one": "Atjungti įrenginį"
+    },
     "Decide who can view and join %(spaceName)s.": "Nuspręskite kas gali peržiūrėti ir prisijungti prie %(spaceName)s.",
     "Channel: <channelLink/>": "Kanalas: <channelLink/>",
     "Visibility": "Matomumas",
@@ -1878,8 +1960,10 @@
     "Mark all as read": "Pažymėti viską kaip perskaitytą",
     "Jump to first unread message.": "Pereiti prie pirmos neperskaitytos žinutės.",
     "Open thread": "Atidaryti temą",
-    "%(count)s reply|one": "%(count)s atsakymas",
-    "%(count)s reply|other": "%(count)s atsakymai",
+    "%(count)s reply": {
+        "one": "%(count)s atsakymas",
+        "other": "%(count)s atsakymai"
+    },
     "Invited by %(sender)s": "Pakvietė %(sender)s",
     "Revoke invite": "Atšaukti kvietimą",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kvietimo atšaukti nepavyko. Gali būti, kad serveryje kilo laikina problema arba neturite pakankamų leidimų atšaukti kvietimą.",
@@ -1888,16 +1972,22 @@
     "Add some now": "Pridėkite keletą dabar",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Šiame kambaryje naudojama kambario versija <roomVersion />, kurią šis namų serveris pažymėjo kaip <i>nestabilią</i>.",
     "This room has already been upgraded.": "Šis kambarys jau yra atnaujintas.",
-    "%(count)s participants|one": "1 dalyvis",
-    "%(count)s participants|other": "%(count)s dalyviai",
+    "%(count)s participants": {
+        "one": "1 dalyvis",
+        "other": "%(count)s dalyviai"
+    },
     "Joined": "Prisijungta",
     "Joining…": "Prisijungiama…",
     "Video": "Vaizdo įrašas",
     "Unread messages.": "Neperskaitytos žinutės.",
-    "%(count)s unread messages.|one": "1 neperskaityta žinutė.",
-    "%(count)s unread messages.|other": "%(count)s neperskaitytos žinutės.",
-    "%(count)s unread messages including mentions.|one": "1 neperskaitytas paminėjimas.",
-    "%(count)s unread messages including mentions.|other": "%(count)s neperskaitytos žinutės, įskaitant paminėjimus.",
+    "%(count)s unread messages.": {
+        "one": "1 neperskaityta žinutė.",
+        "other": "%(count)s neperskaitytos žinutės."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "1 neperskaitytas paminėjimas.",
+        "other": "%(count)s neperskaitytos žinutės, įskaitant paminėjimus."
+    },
     "Show Labs settings": "Rodyti laboratorijų nustatymus",
     "To join, please enable video rooms in Labs first": "Norint prisijungti, pirmiausia įjunkite vaizdo kambarius laboratorijose",
     "To view, please enable video rooms in Labs first": "Norint peržiūrėti, pirmiausia įjunkite vaizdo kambarius laboratorijose",
@@ -1941,10 +2031,14 @@
     "Device": "Įrenginys",
     "Last activity": "Paskutinė veikla",
     "Rename session": "Pervadinti sesiją",
-    "Confirm signing out these devices|one": "Patvirtinkite šio įrenginio atjungimą",
-    "Confirm signing out these devices|other": "Patvirtinkite šių įrenginių atjungimą",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Patvirtinkite atsijungimą iš šio prietaiso naudodami vienkartinį prisijungimą, kad įrodytumėte savo tapatybę.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Patvirtinkite atsijungimą iš šių įrenginių naudodami vienkartinį prisijungimą, kad įrodytumėte savo tapatybę.",
+    "Confirm signing out these devices": {
+        "one": "Patvirtinkite šio įrenginio atjungimą",
+        "other": "Patvirtinkite šių įrenginių atjungimą"
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Patvirtinkite atsijungimą iš šio prietaiso naudodami vienkartinį prisijungimą, kad įrodytumėte savo tapatybę.",
+        "other": "Patvirtinkite atsijungimą iš šių įrenginių naudodami vienkartinį prisijungimą, kad įrodytumėte savo tapatybę."
+    },
     "Current session": "Dabartinė sesija",
     "Unable to revoke sharing for email address": "Nepavyksta atšaukti el. pašto adreso bendrinimo",
     "People with supported clients will be able to join the room without having a registered account.": "Žmonės su palaikomais klientais galės prisijungti prie kambario neturėdami registruotos paskyros.",
@@ -2030,8 +2124,10 @@
     "An error occurred whilst saving your notification preferences.": "Išsaugant pranešimų nuostatas įvyko klaida.",
     "Error saving notification preferences": "Klaida išsaugant pranešimų nuostatas",
     "IRC (Experimental)": "IRC (eksperimentinis)",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Atnaujinama erdvė...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Atnaujinamos erdvės... (%(progress)s iš %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Atnaujinama erdvė...",
+        "other": "Atnaujinamos erdvės... (%(progress)s iš %(count)s)"
+    },
     "This upgrade will allow members of selected spaces access to this room without an invite.": "Šis atnaujinimas suteiks galimybę pasirinktų erdvių nariams patekti į šį kambarį be kvietimo.",
     "This room is in some spaces you're not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Šis kambarys yra kai kuriose erdvėse, kuriose nesate administratorius. Šiose erdvėse senasis kambarys vis dar bus rodomas, bet žmonės bus raginami prisijungti prie naujojo.",
     "Space members": "Erdvės nariai",
@@ -2039,12 +2135,16 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Kiekvienas iš <spaceName/> gali rasti ir prisijungti. Galite pasirinkti ir kitas erdves.",
     "Spaces with access": "Erdvės su prieiga",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Bet kas erdvėje gali rasti ir prisijungti. <a>Redaguoti kurios erdvės gali pasiekti čia.</a>",
-    "Currently, %(count)s spaces have access|one": "Šiuo metu erdvė turi prieigą",
-    "Currently, %(count)s spaces have access|other": "Šiuo metu %(count)s erdvės turi prieigą",
+    "Currently, %(count)s spaces have access": {
+        "one": "Šiuo metu erdvė turi prieigą",
+        "other": "Šiuo metu %(count)s erdvės turi prieigą"
+    },
     "Image size in the timeline": "Paveikslėlio dydis laiko juostoje",
     "Message search initialisation failed": "Nepavyko inicializuoti žinučių paieškos",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Saugiai talpinkite užšifruotas žinutes vietoje, kad jos būtų rodomos paieškos rezultatuose, naudojant %(size)s žinutėms iš %(rooms)s kambario saugoti.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Saugiai talpinkite užšifruotas žinutes vietoje, kad jos būtų rodomos paieškos rezultatuose, naudojant %(size)s žinutėms iš %(rooms)s kambarių saugoti.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Saugiai talpinkite užšifruotas žinutes vietoje, kad jos būtų rodomos paieškos rezultatuose, naudojant %(size)s žinutėms iš %(rooms)s kambario saugoti.",
+        "other": "Saugiai talpinkite užšifruotas žinutes vietoje, kad jos būtų rodomos paieškos rezultatuose, naudojant %(size)s žinutėms iš %(rooms)s kambarių saugoti."
+    },
     "Cross-signing is ready but keys are not backed up.": "Kryžminis pasirašymas paruoštas, tačiau raktai neturi atsarginės kopijos.",
     "Workspace: <networkLink/>": "Darbo aplinka: <networkLink/>",
     "Space options": "Erdvės parinktys",
@@ -2119,10 +2219,14 @@
     "Stop": "Sustabdyti",
     "That's fine": "Tai gerai",
     "File Attached": "Failas pridėtas",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Eksportavome %(count)s įvyki per %(seconds)s sekundes",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Eksportavome %(count)s įvykius per %(seconds)s sekundes",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Eksportavome %(count)s įvyki per %(seconds)s sekundes",
+        "other": "Eksportavome %(count)s įvykius per %(seconds)s sekundes"
+    },
     "Export successful!": "Eksportas sėkmingas!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Surinkome %(count)s įvykius per %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Surinkome %(count)s įvykius per %(seconds)ss"
+    },
     "Preview Space": "Peržiūrėti erdvę",
     "Failed to update the visibility of this space": "Nepavyko atnaujinti šios erdvės matomumo",
     "Access": "Prieiga",
@@ -2157,8 +2261,10 @@
     "Quick settings": "Greiti nustatymai",
     "Complete these to get the most out of %(brand)s": "Užbaikite šiuos žingsnius, kad gautumėte daugiausiai iš %(brand)s",
     "You did it!": "Jums pavyko!",
-    "Only %(count)s steps to go|one": "Liko tik %(count)s žingsnis",
-    "Only %(count)s steps to go|other": "Liko tik %(count)s žingsniai",
+    "Only %(count)s steps to go": {
+        "one": "Liko tik %(count)s žingsnis",
+        "other": "Liko tik %(count)s žingsniai"
+    },
     "Welcome to %(brand)s": "Sveiki atvykę į %(brand)s",
     "Find your people": "Rasti savo žmones",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Išlaikykite bendruomenės diskusijų nuosavybę ir kontrolę.\nPlėskitės ir palaikykite milijonus žmonių, naudodami galingą moderavimą ir sąveiką.",
@@ -2195,8 +2301,10 @@
     "Turn off camera": "Išjungti kamerą",
     "Video devices": "Vaizdo įrenginiai",
     "Audio devices": "Garso įrenginiai",
-    "%(count)s people joined|one": "%(count)s žmogus prisijungė",
-    "%(count)s people joined|other": "%(count)s žmonės prisijungė",
+    "%(count)s people joined": {
+        "one": "%(count)s žmogus prisijungė",
+        "other": "%(count)s žmonės prisijungė"
+    },
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Patarimas: norėdami žinutę pradėti pasviruoju brūkšniu, pradėkite ją su <code>//</code>.",
     "Unrecognised command: %(commandText)s": "Neatpažinta komanda: %(commandText)s",
     "Unknown Command": "Nežinoma komanda",
@@ -2253,10 +2361,14 @@
     "Join the room to participate": "Prisijunkite prie kambario ir dalyvaukite",
     "Home options": "Pradžios parinktys",
     "%(spaceName)s menu": "%(spaceName)s meniu",
-    "Currently removing messages in %(count)s rooms|one": "Šiuo metu šalinamos žinutės iš %(count)s kambario",
-    "Currently removing messages in %(count)s rooms|other": "Šiuo metu šalinamos žinutės iš %(count)s kambarių",
-    "Currently joining %(count)s rooms|one": "Šiuo metu prisijungiama prie %(count)s kambario",
-    "Currently joining %(count)s rooms|other": "Šiuo metu prisijungiama prie %(count)s kambarių",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Šiuo metu šalinamos žinutės iš %(count)s kambario",
+        "other": "Šiuo metu šalinamos žinutės iš %(count)s kambarių"
+    },
+    "Currently joining %(count)s rooms": {
+        "one": "Šiuo metu prisijungiama prie %(count)s kambario",
+        "other": "Šiuo metu prisijungiama prie %(count)s kambarių"
+    },
     "Join public room": "Prisijungti prie viešo kambario",
     "You do not have permissions to add spaces to this space": "Neturite leidimų į šią erdvę pridėti erdvių",
     "Add space": "Pridėti erdvę",
@@ -2272,8 +2384,10 @@
     "You do not have permissions to invite people to this space": "Neturite leidimų kviesti žmones į šią erdvę",
     "Invite to space": "Pakviesti į erdvę",
     "Start new chat": "Pradėti naują pokalbį",
-    "%(count)s members|one": "%(count)s narys",
-    "%(count)s members|other": "%(count)s nariai",
+    "%(count)s members": {
+        "one": "%(count)s narys",
+        "other": "%(count)s nariai"
+    },
     "Private room": "Privatus kambarys",
     "Private space": "Privati erdvė",
     "Public room": "Viešas kambarys",
@@ -2285,8 +2399,10 @@
     "Replying": "Atsakoma",
     "Recently viewed": "Neseniai peržiūrėti",
     "Read receipts": "Skaitymo kvitai",
-    "Seen by %(count)s people|one": "Matė %(count)s žmogus",
-    "Seen by %(count)s people|other": "Matė %(count)s žmonės",
+    "Seen by %(count)s people": {
+        "one": "Matė %(count)s žmogus",
+        "other": "Matė %(count)s žmonės"
+    },
     "%(members)s and %(last)s": "%(members)s ir %(last)s",
     "%(members)s and more": "%(members)s ir daugiau",
     "Busy": "Užsiėmęs",
@@ -2323,8 +2439,10 @@
     "Send message": "Siųsti žinutę",
     "Invite to this space": "Pakviesti į šią erdvę",
     "Close preview": "Uždaryti peržiūrą",
-    "Show %(count)s other previews|one": "Rodyti %(count)s kitą peržiūrą",
-    "Show %(count)s other previews|other": "Rodyti %(count)s kitas peržiūras",
+    "Show %(count)s other previews": {
+        "one": "Rodyti %(count)s kitą peržiūrą",
+        "other": "Rodyti %(count)s kitas peržiūras"
+    },
     "Scroll to most recent messages": "Slinkite prie naujausių žinučių",
     "You can't see earlier messages": "Negalite matyti ankstesnių žinučių",
     "Encrypted messages before this point are unavailable.": "Iki šio taško užšifruotos žinutės yra neprieinamos.",
@@ -2352,11 +2470,15 @@
     "Japan": "Japonija",
     "Italy": "Italija",
     "Empty room (was %(oldName)s)": "Tuščias kambarys (buvo %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Kviečiami %(user)s ir 1 kitas",
-    "Inviting %(user)s and %(count)s others|other": "Kviečiami %(user)s ir %(count)s kiti",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Kviečiami %(user)s ir 1 kitas",
+        "other": "Kviečiami %(user)s ir %(count)s kiti"
+    },
     "Inviting %(user1)s and %(user2)s": "Kviečiami %(user1)s ir %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s ir 1 kitas",
-    "%(user)s and %(count)s others|other": "%(user)s ir %(count)s kiti",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s ir 1 kitas",
+        "other": "%(user)s ir %(count)s kiti"
+    },
     "%(user1)s and %(user2)s": "%(user1)s ir %(user2)s",
     "Empty room": "Tuščias kambarys",
     "%(value)ss": "%(value)ss",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 015e8e776d..aaf8893cbc 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -139,14 +139,18 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
     "Uploading %(filename)s": "Tiek augšupielādēts %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Tiek augšupielādēts %(filename)s un %(count)s citi",
-    "Uploading %(filename)s and %(count)s others|other": "Tiek augšupielādēts %(filename)s un %(count)s citi",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Tiek augšupielādēts %(filename)s un %(count)s citi",
+        "other": "Tiek augšupielādēts %(filename)s un %(count)s citi"
+    },
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tiesību līmenis %(powerLevelNumber)s)",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "(~%(count)s results)|one": "(~%(count)s rezultāts)",
-    "(~%(count)s results)|other": "(~%(count)s rezultāti)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s rezultāts)",
+        "other": "(~%(count)s rezultāti)"
+    },
     "Reject all %(invitedRooms)s invites": "Noraidīt visus %(invitedRooms)s uzaicinājumus",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
@@ -271,8 +275,10 @@
     "Authentication check failed: incorrect password?": "Autentifikācijas pārbaude neizdevās. Nepareiza parole?",
     "Do you want to set an email address?": "Vai vēlies norādīt epasta adresi?",
     "Skip": "Izlaist",
-    "and %(count)s others...|other": "un vēl %(count)s citi...",
-    "and %(count)s others...|one": "un vēl viens cits...",
+    "and %(count)s others...": {
+        "other": "un vēl %(count)s citi...",
+        "one": "un vēl viens cits..."
+    },
     "Delete widget": "Dzēst vidžetu",
     "Define the power level of a user": "Definē lietotāja statusu",
     "Edit": "Rediģēt",
@@ -337,42 +343,80 @@
     "Delete Widget": "Dzēst vidžetu",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Vidžeta dzēšana to dzēš visiem šīs istabas lietotājiem. Vai tiešām vēlies dzēst šo vidžetu?",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)spievienojās %(count)s reizes",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)spievienojās",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)spievienojās %(count)s reizes",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)spievienojās",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)spameta %(count)s reizes",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)spameta",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)spameta %(count)s reizes",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)spameta",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)spievienojās un pameta %(count)s reizes",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)spievienojās un pameta",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)spievienojās un pameta %(count)s reizes",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)spievienojās un pameta",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)spameta un atkal pievienojās %(count)s reizes",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s noraidīja uzaicinājumus %(count)s reizes",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s atsauca izsniegtos uzaicinājumus %(count)s reizes",
-    "were banned %(count)s times|other": "tika bloķēti (liegta piekļuve) %(count)s reizes",
-    "was banned %(count)s times|other": "tika bloķēts (liegta piekļuve) %(count)s reizes",
-    "were unbanned %(count)s times|other": "tika atbloķēti (atgriezta pieeja) %(count)s reizes",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)spievienojās %(count)s reizes",
+        "one": "%(severalUsers)spievienojās"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)spievienojās %(count)s reizes",
+        "one": "%(oneUser)spievienojās"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)spameta %(count)s reizes",
+        "one": "%(severalUsers)spameta"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)spameta %(count)s reizes",
+        "one": "%(oneUser)spameta"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)spievienojās un pameta %(count)s reizes",
+        "one": "%(severalUsers)spievienojās un pameta"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)spievienojās un pameta %(count)s reizes",
+        "one": "%(oneUser)spievienojās un pameta"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)spameta un atkal pievienojās %(count)s reizes",
+        "one": "%(severalUsers)spameta un atkal pievienojās"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s noraidīja uzaicinājumus %(count)s reizes",
+        "one": "%(severalUsers)s noraidīja uzaicinājumus"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s atsauca izsniegtos uzaicinājumus %(count)s reizes",
+        "one": "%(severalUsers)satsauca uzaicinājumus"
+    },
+    "were banned %(count)s times": {
+        "other": "tika bloķēti (liegta piekļuve) %(count)s reizes",
+        "one": "tika liegta pieeja"
+    },
+    "was banned %(count)s times": {
+        "other": "tika bloķēts (liegta piekļuve) %(count)s reizes",
+        "one": "tika liegta pieeja"
+    },
+    "were unbanned %(count)s times": {
+        "other": "tika atbloķēti (atgriezta pieeja) %(count)s reizes",
+        "one": "tika atcelts pieejas liegums"
+    },
     "collapse": "sakļaut",
     "expand": "izvērst",
     "<a>In reply to</a> <pill>": "<a>Atbildē uz</a> <pill>",
-    "And %(count)s more...|other": "Un par %(count)s vairāk...",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)spameta un atkal pievienojās",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)spameta un atkal pievienojās %(count)s reizes",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)spameta un atkal pievienojās",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s noraidīja uzaicinājumus",
-    "were invited %(count)s times|one": "tika uzaicināti",
-    "was invited %(count)s times|other": "tika uzaicināta %(count)s reizes",
-    "was invited %(count)s times|one": "tika uzaicināts(a)",
-    "were unbanned %(count)s times|one": "tika atcelts pieejas liegums",
-    "was unbanned %(count)s times|other": "tika atbloķēts %(count)s reizes",
-    "was banned %(count)s times|one": "tika liegta pieeja",
-    "were banned %(count)s times|one": "tika liegta pieeja",
-    "was unbanned %(count)s times|one": "tika atcelts pieejas liegums",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sizmainīja savu lietotājvārdu %(count)s reizes",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sizmainīja savu lietotājvārdu",
+    "And %(count)s more...": {
+        "other": "Un par %(count)s vairāk..."
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)spameta un atkal pievienojās %(count)s reizes",
+        "one": "%(oneUser)spameta un atkal pievienojās"
+    },
+    "were invited %(count)s times": {
+        "one": "tika uzaicināti",
+        "other": "bija uzaicināti %(count)s reizes"
+    },
+    "was invited %(count)s times": {
+        "other": "tika uzaicināta %(count)s reizes",
+        "one": "tika uzaicināts(a)"
+    },
+    "was unbanned %(count)s times": {
+        "other": "tika atbloķēts %(count)s reizes",
+        "one": "tika atcelts pieejas liegums"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)sizmainīja savu lietotājvārdu %(count)s reizes",
+        "one": "%(severalUsers)sizmainīja savu lietotājvārdu"
+    },
     "Description": "Apraksts",
     "This room is not public. You will not be able to rejoin without an invite.": "Šī istaba nav publiska un jūs nevarēsiet atkārtoti pievienoties bez uzaicinājuma.",
     "Old cryptography data detected": "Tika uzieti novecojuši šifrēšanas dati",
@@ -383,16 +427,22 @@
     "Notify the whole room": "Paziņot visai istabai",
     "Room Notification": "Istabas paziņojums",
     "Code": "Kods",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)snoraidīja uzaicinājumu %(count)s reizes",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)snoraidīja uzaicinājumu",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)satsauca uzaicinājumus",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)satsauca savus uzaicinājumus %(count)s reizes",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)satsauca savu uzaicinājumu",
-    "were invited %(count)s times|other": "bija uzaicināti %(count)s reizes",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sizmainīja savu vārdu %(count)s reizes",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sizmainīja savu vārdu",
-    "%(items)s and %(count)s others|one": "%(items)s un viens cits",
-    "%(items)s and %(count)s others|other": "%(items)s un %(count)s citus",
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)snoraidīja uzaicinājumu %(count)s reizes",
+        "one": "%(oneUser)snoraidīja uzaicinājumu"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)satsauca savus uzaicinājumus %(count)s reizes",
+        "one": "%(oneUser)satsauca savu uzaicinājumu"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sizmainīja savu vārdu %(count)s reizes",
+        "one": "%(oneUser)sizmainīja savu vārdu"
+    },
+    "%(items)s and %(count)s others": {
+        "one": "%(items)s un viens cits",
+        "other": "%(items)s un %(count)s citus"
+    },
     "Submit debug logs": "Iesniegt atutošanas logfailus",
     "Opens the Developer Tools dialog": "Atver izstrādātāja rīku logu",
     "Sunday": "Svētdiena",
@@ -461,11 +511,16 @@
     "You sent a verification request": "Jūs nosūtījāt verifikācijas pieprasījumu",
     "Start Verification": "Uzsākt verifikāciju",
     "Hide verified sessions": "Slēpt verificētas sesijas",
-    "%(count)s verified sessions|one": "1 verificēta sesija",
-    "%(count)s verified sessions|other": "%(count)s verificētas sesijas",
+    "%(count)s verified sessions": {
+        "one": "1 verificēta sesija",
+        "other": "%(count)s verificētas sesijas"
+    },
     "Encrypted by an unverified session": "Šifrēts ar neverificētu sesiju",
     "Verify your other session using one of the options below.": "Verificējiet citas jūsu sesijas, izmantojot kādu no iespējām zemāk.",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s un %(count)s citi raksta…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s un %(count)s citi raksta…",
+        "one": "%(names)s un vēl viens raksta…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s un %(lastPerson)s raksta…",
     "Enable Emoji suggestions while typing": "Iespējot emocijzīmju ieteikumus rakstīšanas laikā",
     "Show typing notifications": "Rādīt paziņojumus par rakstīšanu",
@@ -473,7 +528,6 @@
     "Philippines": "Filipīnas",
     "Unpin": "Atspraust",
     "Pin": "Piespraust",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s un vēl viens raksta…",
     "%(displayName)s is typing …": "%(displayName)s raksta…",
     "Got it": "Sapratu",
     "Got It": "Sapratu",
@@ -490,8 +544,10 @@
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Jūsu ziņas ir drošībā - tikai jums un saņēmējam ir unikālas atslēgas, lai ziņas atšifrētu.",
     "Direct Messages": "Tiešā sarakste",
     "Hide sessions": "Slēpt sesijas",
-    "%(count)s sessions|one": "%(count)s sesija",
-    "%(count)s sessions|other": "%(count)s sesijas",
+    "%(count)s sessions": {
+        "one": "%(count)s sesija",
+        "other": "%(count)s sesijas"
+    },
     "Once enabled, encryption cannot be disabled.": "Šifrēšana nevar tikt atspējota, ja reiz tikusi iespējota.",
     "Encryption not enabled": "Šifrēšana nav iespējota",
     "Encryption enabled": "Šifrēšana iespējota",
@@ -632,10 +688,14 @@
     "Never send encrypted messages to unverified sessions from this session": "Nesūtīt šifrētas ziņas no šīs sesijas neverificētām sesijām",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Notikusi kļūda, mēģinot atjaunināt istabas alternatīvās adreses. Iespējams, tas ir liegts servera iestatījumos vai arī notikusi kāda pagaidu kļūme.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s nomainīja šīs istabas alternatīvās adreses.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s dzēsa šīs istabas alternatīvo adresi %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s dzēsa šīs istabas alternatīvās adreses %(addresses)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pievienoja alternatīvo adresi %(addresses)s šai istabai.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pievienoja alternatīvās adreses %(addresses)s šai istabai.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s dzēsa šīs istabas alternatīvo adresi %(addresses)s.",
+        "other": "%(senderName)s dzēsa šīs istabas alternatīvās adreses %(addresses)s."
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s pievienoja alternatīvo adresi %(addresses)s šai istabai.",
+        "other": "%(senderName)s pievienoja alternatīvās adreses %(addresses)s šai istabai."
+    },
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Izmantojiet identitātes serveri, lai uzaicinātu ar epastu. Pārvaldiet <settings>iestatījumos</settings>.",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Uzaiciniet kādu personu, izmantojot vārdu, epasta adresi, lietotājvārdu (piemēram, <userId/>) vai <a>dalieties ar šo istabu</a>.",
     "Verified!": "Verificēts!",
@@ -717,8 +777,10 @@
     "Other": "Citi",
     "Show less": "Rādīt mazāk",
     "Show more": "Rādīt vairāk",
-    "Show %(count)s more|one": "Rādīt vēl %(count)s",
-    "Show %(count)s more|other": "Rādīt vēl %(count)s",
+    "Show %(count)s more": {
+        "one": "Rādīt vēl %(count)s",
+        "other": "Rādīt vēl %(count)s"
+    },
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Notikusi kļūda, mēģinot atjaunināt istabas galveno adresi. Iespējams, tas ir liegts servera iestatījumos vai arī notikusi kāda pagaidu kļūme.",
     "Error updating main address": "Kļūda galvenās adreses atjaunināšanā",
     "This address is available to use": "Šī adrese ir pieejama",
@@ -833,8 +895,10 @@
     "User menu": "Lietotāja izvēlne",
     "New here? <a>Create an account</a>": "Pirmo reizi šeit? <a>Izveidojiet kontu</a>",
     "Got an account? <a>Sign in</a>": "Vai jums ir konts? <a>Pierakstieties</a>",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Jums ir %(count)s nelasīts paziņojums iepriekšējā šīs istabas versijā.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Jums ir %(count)s nelasīti paziņojumi iepriekšējā šīs istabas versijā.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "Jums ir %(count)s nelasīts paziņojums iepriekšējā šīs istabas versijā.",
+        "other": "Jums ir %(count)s nelasīti paziņojumi iepriekšējā šīs istabas versijā."
+    },
     "Add a photo so people know it's you.": "Pievienot foto, lai cilvēki zina, ka tas esat jūs.",
     "Great, that'll help people know it's you": "Lieliski, tas ļaus cilvēkiem tevi atpazīt",
     "Couldn't load page": "Neizdevās ielādēt lapu",
@@ -933,8 +997,10 @@
     "A private space for you and your teammates": "Privāta vieta jums un jūsu komandas dalībniekiem",
     "A private space to organise your rooms": "Privāta vieta, kur organizēt jūsu istabas",
     "<inviter/> invites you": "<inviter/> uzaicina jūs",
-    "%(count)s rooms|one": "%(count)s istaba",
-    "%(count)s rooms|other": "%(count)s istabas",
+    "%(count)s rooms": {
+        "one": "%(count)s istaba",
+        "other": "%(count)s istabas"
+    },
     "Are you sure you want to leave the space '%(spaceName)s'?": "Vai tiešām vēlaties pamest vietu '%(spaceName)s'?",
     "Create a Group Chat": "Izveidot grupas čatu",
     "Missing session data": "Trūkst sesijas datu",
@@ -946,10 +1012,14 @@
     "Create a new room": "Izveidot jaunu istabu",
     "All rooms": "Visas istabas",
     "Continue with %(provider)s": "Turpināt ar %(provider)s",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sneveica nekādas izmaiņas",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sneveica nekādas izmaiņas %(count)s reizes",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sneveica nekādas izmaiņas",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sneveica nekādas izmaiņas %(count)s reizes",
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)sneveica nekādas izmaiņas",
+        "other": "%(oneUser)sneveica nekādas izmaiņas %(count)s reizes"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)sneveica nekādas izmaiņas",
+        "other": "%(severalUsers)sneveica nekādas izmaiņas %(count)s reizes"
+    },
     "%(name)s cancelled": "%(name)s atcēla",
     "%(name)s cancelled verifying": "%(name)s atcēla verifikāciju",
     "Deactivate user": "Deaktivizēt lietotāju",
@@ -957,10 +1027,14 @@
     "Demote": "Pazemināt",
     "Demote yourself?": "Pazemināt sevi?",
     "Accepting…": "Akceptē…",
-    "%(count)s unread messages.|one": "1 nelasīta ziņa.",
-    "%(count)s unread messages.|other": "%(count)s nelasītas ziņas.",
-    "%(count)s unread messages including mentions.|one": "1 neslasīts pieminējums.",
-    "%(count)s unread messages including mentions.|other": "%(count)s nelasītas ziņas, ieskaitot pieminēšanu.",
+    "%(count)s unread messages.": {
+        "one": "1 nelasīta ziņa.",
+        "other": "%(count)s nelasītas ziņas."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "1 neslasīts pieminējums.",
+        "other": "%(count)s nelasītas ziņas, ieskaitot pieminēšanu."
+    },
     "A-Z": "A-Ž",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s priekšskatījums nav pieejams. Vai vēlaties tai pievienoties?",
     "Empty room": "Tukša istaba",
@@ -1017,8 +1091,10 @@
     "You cancelled verifying %(name)s": "Jūs atvēlāt %(name)s verifikāciju",
     "You cancelled verification.": "Jūs atcēlāt verifikāciju.",
     "Edit devices": "Rediģēt ierīces",
-    "Remove %(count)s messages|one": "Dzēst 1 ziņu",
-    "Remove %(count)s messages|other": "Dzēst %(count)s ziņas",
+    "Remove %(count)s messages": {
+        "one": "Dzēst 1 ziņu",
+        "other": "Dzēst %(count)s ziņas"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Lielam ziņu apjomam tas var aizņemt kādu laiku. Lūdzu, tikmēr neatsvaidziniet klientu.",
     "You don't have permission to delete the address.": "Jums nav atļaujas dzēst adresi.",
     "Add some now": "Pievienot kādu tagad",
@@ -1038,13 +1114,17 @@
     "You're already in a call with this person.": "Jums jau notiek zvans ar šo personu.",
     "Already in call": "Notiek zvans",
     "%(deviceId)s from %(ip)s": "%(deviceId)s no %(ip)s",
-    "%(count)s people you know have already joined|other": "%(count)s pazīstami cilvēki ir jau pievienojusies",
-    "%(count)s people you know have already joined|one": "%(count)s pazīstama persona ir jau pievienojusies",
-    "%(count)s members|one": "%(count)s dalībnieks",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s pazīstami cilvēki ir jau pievienojusies",
+        "one": "%(count)s pazīstama persona ir jau pievienojusies"
+    },
+    "%(count)s members": {
+        "one": "%(count)s dalībnieks",
+        "other": "%(count)s dalībnieki"
+    },
     "Save Changes": "Saglabāt izmaiņas",
     "Welcome to <name/>": "Laipni lūdzam uz <name/>",
     "Room name": "Istabas nosaukums",
-    "%(count)s members|other": "%(count)s dalībnieki",
     "Room List": "Istabu saraksts",
     "Send as message": "Nosūtīt kā ziņu",
     "%(brand)s URL": "%(brand)s URL",
@@ -1503,8 +1583,10 @@
     "Explore public rooms": "Pārlūkot publiskas istabas",
     "Enable encryption in settings.": "Iespējot šifrēšanu iestatījumos.",
     "%(seconds)ss left": "%(seconds)s sekundes atlikušas",
-    "Show %(count)s other previews|one": "Rādīt %(count)s citu priekšskatījumu",
-    "Show %(count)s other previews|other": "Rādīt %(count)s citus priekšskatījumus",
+    "Show %(count)s other previews": {
+        "one": "Rādīt %(count)s citu priekšskatījumu",
+        "other": "Rādīt %(count)s citus priekšskatījumus"
+    },
     "Share": "Dalīties",
     "Access": "Piekļuve",
     "People with supported clients will be able to join the room without having a registered account.": "Cilvēki ar atbalstītām lietotnēm varēs pievienoties istabai bez reģistrēta konta.",
@@ -1557,10 +1639,14 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s noņēma piespraustu <a>ziņu</a> šajā istabā. Skatīt visas <b>piespraustās ziņas</b>.",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s piesprauda ziņu šajā istabā. Skatīt visas piespraustās ziņas.",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s piesprauda <a>ziņu</a> šajā istabā. Skatīt visas <b>piespraustās ziņas</b>.",
-    "Final result based on %(count)s votes|one": "Gala rezultāts pamatojoties uz %(count)s balss",
-    "Based on %(count)s votes|one": "Pamatojoties uz %(count)s balss",
-    "Based on %(count)s votes|other": "Pamatojoties uz %(count)s balsīm",
-    "Final result based on %(count)s votes|other": "Gala rezultāts pamatojoties uz %(count)s balsīm",
+    "Final result based on %(count)s votes": {
+        "one": "Gala rezultāts pamatojoties uz %(count)s balss",
+        "other": "Gala rezultāts pamatojoties uz %(count)s balsīm"
+    },
+    "Based on %(count)s votes": {
+        "one": "Pamatojoties uz %(count)s balss",
+        "other": "Pamatojoties uz %(count)s balsīm"
+    },
     "No votes cast": "Nav balsojumu",
     "Proxy URL (optional)": "Proxy URL (izvēles)",
     "Write an option": "Uzrakstiet variantu",
@@ -1640,10 +1726,14 @@
     "Unable to access your microphone": "Nevar piekļūt mikrofonam",
     "Error processing voice message": "Balss ziņas apstrādes kļūda",
     "Voice Message": "Balss ziņa",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)snomainīja <a>piespraustās ziņas</a> istabā %(count)s reizes",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)snomainīja <a>piespraustās ziņas</a> istabā %(count)s reizes",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)snomainīja <a>piespraustās ziņas</a> istabā",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)snomainīja <a>piespraustās ziņas</a> istabā",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(oneUser)snomainīja <a>piespraustās ziņas</a> istabā %(count)s reizes",
+        "one": "%(oneUser)snomainīja <a>piespraustās ziņas</a> istabā"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(severalUsers)snomainīja <a>piespraustās ziņas</a> istabā %(count)s reizes",
+        "one": "%(severalUsers)snomainīja <a>piespraustās ziņas</a> istabā"
+    },
     "Nothing pinned, yet": "Vēl nekas nav piesprausts",
     "Pinned messages": "Piespraustās ziņas",
     "Pinned": "Piesprausts",
@@ -1657,8 +1747,10 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nevar atrast zemāk norādīto Matrix ID profilus - vai tomēr vēlaties tos uzaicināt?",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Daži faili ir <b>pārlieku lieli</b>, lai tos augšupielādētu. Faila izmēra ierobežojums ir %(limit)s.",
     "This version of %(brand)s does not support viewing some encrypted files": "Šī %(brand)s versija neatbalsta atsevišķu šifrētu failu skatīšanu",
-    "Upload %(count)s other files|one": "Augšupielādēt %(count)s citu failu",
-    "Upload %(count)s other files|other": "Augšupielādēt %(count)s citus failus",
+    "Upload %(count)s other files": {
+        "one": "Augšupielādēt %(count)s citu failu",
+        "other": "Augšupielādēt %(count)s citus failus"
+    },
     "Files": "Faili",
     "Your private space": "Jūsu privāta vieta",
     "Your profile": "Jūsu profils",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 5b29682abf..83f98dc934 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -156,8 +156,10 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendte en invitasjon til %(targetDisplayName)s om å bli med i rommet.",
     "Done": "Fullført",
     "%(displayName)s is typing …": "%(displayName)s skriver …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s andre skriver …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s og én annen bruker skriver …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s og %(count)s andre skriver …",
+        "one": "%(names)s og én annen bruker skriver …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s skriver …",
     "%(num)s minutes ago": "%(num)s minutter siden",
     "%(num)s hours ago": "%(num)s timer siden",
@@ -530,10 +532,22 @@
     "No results": "Ingen treff",
     "Rotate Left": "Roter til venstre",
     "Rotate Right": "Roter til høyre",
-    "were invited %(count)s times|one": "ble invitert",
-    "was invited %(count)s times|one": "ble invitert",
-    "were banned %(count)s times|one": "ble bannlyst",
-    "was banned %(count)s times|one": "ble bannlyst",
+    "were invited %(count)s times": {
+        "one": "ble invitert",
+        "other": "ble invitert %(count)s ganger"
+    },
+    "was invited %(count)s times": {
+        "one": "ble invitert",
+        "other": "ble invitert %(count)s ganger"
+    },
+    "were banned %(count)s times": {
+        "one": "ble bannlyst",
+        "other": "ble bannlyst %(count)s ganger"
+    },
+    "was banned %(count)s times": {
+        "one": "ble bannlyst",
+        "other": "ble bannlyst %(count)s ganger"
+    },
     "Power level": "Styrkenivå",
     "e.g. my-room": "f.eks. mitt-rom",
     "Enter a server name": "Skriv inn et tjenernavn",
@@ -574,8 +588,10 @@
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s endret rommets navn fra %(oldRoomName)s til %(newRoomName)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s endret rommets navn til %(roomName)s.",
     "Not Trusted": "Ikke betrodd",
-    "%(items)s and %(count)s others|other": "%(items)s og %(count)s andre",
-    "%(items)s and %(count)s others|one": "%(items)s og én annen",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s og %(count)s andre",
+        "one": "%(items)s og én annen"
+    },
     "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
     "a few seconds ago": "noen sekunder siden",
     "about a minute ago": "cirka 1 minutt siden",
@@ -628,7 +644,10 @@
     "Replying": "Svarer på",
     "Room %(name)s": "Rom %(name)s",
     "Start chatting": "Begynn å chatte",
-    "%(count)s unread messages.|one": "1 ulest melding.",
+    "%(count)s unread messages.": {
+        "one": "1 ulest melding.",
+        "other": "%(count)s uleste meldinger."
+    },
     "Unread messages.": "Uleste meldinger.",
     "Send as message": "Send som en melding",
     "You don't currently have any stickerpacks enabled": "Du har ikke skrudd på noen klistremerkepakker for øyeblikket",
@@ -654,18 +673,33 @@
     "Create new room": "Opprett et nytt rom",
     "Language Dropdown": "Språk-nedfallsmeny",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s ble med %(count)s ganger",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s ble med",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s ble med %(count)s ganger",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s ble med",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s forlot rommet %(count)s ganger",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s forlot rommet",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s forlot rommet %(count)s ganger",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s forlot rommet",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s endret navnene sine",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s endret navnet sitt",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s ble med %(count)s ganger",
+        "one": "%(severalUsers)s ble med"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s ble med %(count)s ganger",
+        "one": "%(oneUser)s ble med"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s forlot rommet %(count)s ganger",
+        "one": "%(severalUsers)s forlot rommet"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s forlot rommet %(count)s ganger",
+        "one": "%(oneUser)s forlot rommet"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)s endret navnene sine"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)s endret navnet sitt",
+        "other": "%(oneUser)sendret navnet sitt %(count)s ganger"
+    },
     "Custom level": "Tilpasset nivå",
-    "And %(count)s more...|other": "Og %(count)s til...",
+    "And %(count)s more...": {
+        "other": "Og %(count)s til..."
+    },
     "Matrix": "Matrix",
     "Logs sent": "Loggbøkene ble sendt",
     "GitHub issue": "Github-saksrapport",
@@ -722,15 +756,22 @@
     "Remove %(email)s?": "Vil du fjerne %(email)s?",
     "Invalid Email Address": "Ugyldig E-postadresse",
     "Try to join anyway": "Forsøk å bli med likevel",
-    "%(count)s unread messages including mentions.|one": "1 ulest nevnelse.",
-    "%(count)s unread messages.|other": "%(count)s uleste meldinger.",
+    "%(count)s unread messages including mentions.": {
+        "one": "1 ulest nevnelse.",
+        "other": "%(count)s uleste meldinger inkludert der du nevnes."
+    },
     "Command error": "Kommandofeil",
     "Room avatar": "Rommets avatar",
     "Start Verification": "Begynn verifisering",
     "Verify User": "Verifiser bruker",
-    "%(count)s verified sessions|one": "1 verifisert økt",
-    "%(count)s sessions|other": "%(count)s økter",
-    "%(count)s sessions|one": "%(count)s økt",
+    "%(count)s verified sessions": {
+        "one": "1 verifisert økt",
+        "other": "%(count)s verifiserte økter"
+    },
+    "%(count)s sessions": {
+        "other": "%(count)s økter",
+        "one": "%(count)s økt"
+    },
     "Verify by scanning": "Verifiser med skanning",
     "Verify by emoji": "Verifiser med emoji",
     "Message Actions": "Meldingshandlinger",
@@ -740,14 +781,14 @@
     "%(name)s wants to verify": "%(name)s ønsker å verifisere",
     "Failed to copy": "Mislyktes i å kopiere",
     "Submit logs": "Send inn loggføringer",
-    "were invited %(count)s times|other": "ble invitert %(count)s ganger",
-    "was invited %(count)s times|other": "ble invitert %(count)s ganger",
-    "were banned %(count)s times|other": "ble bannlyst %(count)s ganger",
-    "was banned %(count)s times|other": "ble bannlyst %(count)s ganger",
-    "were unbanned %(count)s times|other": "fikk bannlysningene sine opphevet %(count)s ganger",
-    "were unbanned %(count)s times|one": "fikk bannlysningene sine opphevet",
-    "was unbanned %(count)s times|other": "fikk bannlysningen sin opphevet %(count)s ganger",
-    "was unbanned %(count)s times|one": "fikk bannlysningen sin opphevet",
+    "were unbanned %(count)s times": {
+        "other": "fikk bannlysningene sine opphevet %(count)s ganger",
+        "one": "fikk bannlysningene sine opphevet"
+    },
+    "was unbanned %(count)s times": {
+        "other": "fikk bannlysningen sin opphevet %(count)s ganger",
+        "one": "fikk bannlysningen sin opphevet"
+    },
     "Clear all data": "Tøm alle data",
     "Verify session": "Verifiser økten",
     "Upload completed": "Opplasting fullført",
@@ -822,8 +863,10 @@
     "Close preview": "Lukk forhåndsvisning",
     "Demote yourself?": "Vil du degradere deg selv?",
     "Demote": "Degrader",
-    "and %(count)s others...|other": "og %(count)s andre …",
-    "and %(count)s others...|one": "og én annen …",
+    "and %(count)s others...": {
+        "other": "og %(count)s andre …",
+        "one": "og én annen …"
+    },
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (styrkenivå %(powerLevelNumber)s)",
     "Hangup": "Legg på røret",
     "The conversation continues here.": "Samtalen fortsetter her.",
@@ -841,7 +884,6 @@
     "Other published addresses:": "Andre publiserte adresser:",
     "Waiting for %(displayName)s to accept…": "Venter på at %(displayName)s skal akseptere …",
     "Your homeserver": "Hjemmetjeneren din",
-    "%(count)s verified sessions|other": "%(count)s verifiserte økter",
     "Hide verified sessions": "Skjul verifiserte økter",
     "Decrypt %(text)s": "Dekrypter %(text)s",
     "You verified %(name)s": "Du verifiserte %(name)s",
@@ -902,8 +944,10 @@
     "Message preview": "Meldingsforhåndsvisning",
     "This room has no local addresses": "Dette rommet har ikke noen lokale adresser",
     "Remove recent messages by %(user)s": "Fjern nylige meldinger fra %(user)s",
-    "Remove %(count)s messages|other": "Slett %(count)s meldinger",
-    "Remove %(count)s messages|one": "Slett 1 melding",
+    "Remove %(count)s messages": {
+        "other": "Slett %(count)s meldinger",
+        "one": "Slett 1 melding"
+    },
     "You've successfully verified your device!": "Du har vellykket verifisert enheten din!",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du har vellykket verifisert %(deviceName)s (%(deviceId)s)!",
     "You've successfully verified %(displayName)s!": "Du har vellykket verifisert %(displayName)s!",
@@ -930,8 +974,10 @@
     "Verification Pending": "Avventer verifisering",
     "Share Room": "Del rommet",
     "Share User": "Del brukeren",
-    "Upload %(count)s other files|other": "Last opp %(count)s andre filer",
-    "Upload %(count)s other files|one": "Last opp %(count)s annen fil",
+    "Upload %(count)s other files": {
+        "other": "Last opp %(count)s andre filer",
+        "one": "Last opp %(count)s annen fil"
+    },
     "Appearance": "Utseende",
     "Keys restored": "Nøklene ble gjenopprettet",
     "Reject invitation": "Avslå invitasjonen",
@@ -965,8 +1011,10 @@
     "Lock": "Lås",
     "Modern": "Moderne",
     "Server or user ID to ignore": "Tjener- eller bruker-ID-en som skal ignoreres",
-    "Show %(count)s more|other": "Vis %(count)s til",
-    "Show %(count)s more|one": "Vis %(count)s til",
+    "Show %(count)s more": {
+        "other": "Vis %(count)s til",
+        "one": "Vis %(count)s til"
+    },
     "Notification options": "Varselsinnstillinger",
     "Room options": "Rominnstillinger",
     "Your messages are not secure": "Dine meldinger er ikke sikre",
@@ -1016,7 +1064,6 @@
     "Use Single Sign On to continue": "Bruk Single Sign On for å fortsette",
     "Appearance Settings only affect this %(brand)s session.": "Stilendringer gjelder kun i denne %(brand)s sesjonen.",
     "Use Ctrl + Enter to send a message": "Bruk Ctrl + Enter for å sende en melding",
-    "%(count)s unread messages including mentions.|other": "%(count)s uleste meldinger inkludert der du nevnes.",
     "Belgium": "Belgia",
     "American Samoa": "Amerikansk Samoa",
     "United States": "USA",
@@ -1081,7 +1128,10 @@
     "Suggested Rooms": "Foreslåtte rom",
     "Welcome %(name)s": "Velkommen, %(name)s",
     "Verification requested": "Verifisering ble forespurt",
-    "%(count)s members|one": "%(count)s medlem",
+    "%(count)s members": {
+        "one": "%(count)s medlem",
+        "other": "%(count)s medlemmer"
+    },
     "No results found": "Ingen resultater ble funnet",
     "Public space": "Offentlig område",
     "Private space": "Privat område",
@@ -1092,14 +1142,15 @@
     "Leave Space": "Forlat området",
     "Save Changes": "Lagre endringer",
     "You don't have permission": "Du har ikke tillatelse",
-    "%(count)s rooms|other": "%(count)s rom",
-    "%(count)s rooms|one": "%(count)s rom",
+    "%(count)s rooms": {
+        "other": "%(count)s rom",
+        "one": "%(count)s rom"
+    },
     "Invite by username": "Inviter etter brukernavn",
     "Delete": "Slett",
     "Your public space": "Ditt offentlige område",
     "Your private space": "Ditt private område",
     "Invite to %(spaceName)s": "Inviter til %(spaceName)s",
-    "%(count)s members|other": "%(count)s medlemmer",
     "Random": "Tilfeldig",
     "unknown person": "ukjent person",
     "Public": "Offentlig",
@@ -1108,7 +1159,9 @@
     "Share invite link": "Del invitasjonslenke",
     "Leave space": "Forlat området",
     "Warn before quitting": "Advar før avslutning",
-    "%(count)s people you know have already joined|other": "%(count)s personer du kjenner har allerede blitt med",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s personer du kjenner har allerede blitt med"
+    },
     "Add existing rooms": "Legg til eksisterende rom",
     "Create a new room": "Opprett et nytt rom",
     "Value": "Verdi",
@@ -1164,14 +1217,27 @@
     "Continue with %(provider)s": "Fortsett med %(provider)s",
     "This address is already in use": "Denne adressen er allerede i bruk",
     "<a>In reply to</a> <pill>": "<a>Som svar på</a> <pill>",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sendret navnet sitt %(count)s ganger",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sfikk sin invitasjon trukket tilbake",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sfikk sine invitasjoner trukket tilbake",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)savslo invitasjonen sin",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sforlot og ble med igjen",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sforlot og ble med igjen",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sble med og forlot igjen",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sble med og forlot igjen",
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "%(oneUser)sfikk sin invitasjon trukket tilbake"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)sfikk sine invitasjoner trukket tilbake"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)savslo invitasjonen sin"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)sforlot og ble med igjen"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)sforlot og ble med igjen"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)sble med og forlot igjen"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)sble med og forlot igjen"
+    },
     "Information": "Informasjon",
     "%(name)s cancelled verifying": "%(name)s avbrøt verifiseringen",
     "You cancelled verifying %(name)s": "Du avbrøt verifiseringen av %(name)s",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index d98bf16bcf..ace7f15ad9 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -5,8 +5,10 @@
     "Always show message timestamps": "Altijd tijdstempels van berichten tonen",
     "Authentication": "Login bevestigen",
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
-    "and %(count)s others...|other": "en %(count)s anderen…",
-    "and %(count)s others...|one": "en één andere…",
+    "and %(count)s others...": {
+        "other": "en %(count)s anderen…",
+        "one": "en één andere…"
+    },
     "A new password must be entered.": "Er moet een nieuw wachtwoord ingevoerd worden.",
     "An error has occurred.": "Er is een fout opgetreden.",
     "Are you sure?": "Weet je het zeker?",
@@ -201,8 +203,10 @@
     "Unmute": "Niet dempen",
     "Unnamed Room": "Naamloze Kamer",
     "Uploading %(filename)s": "%(filename)s wordt geüpload",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander worden geüpload",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere worden geüpload",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "%(filename)s en %(count)s ander worden geüpload",
+        "other": "%(filename)s en %(count)s andere worden geüpload"
+    },
     "Upload avatar": "Afbeelding uploaden",
     "Upload Failed": "Uploaden mislukt",
     "Usage": "Gebruik",
@@ -228,8 +232,10 @@
     "Room": "Kamer",
     "Connectivity to the server has been lost.": "De verbinding met de server is verbroken.",
     "Sent messages will be stored until your connection has returned.": "Verstuurde berichten zullen opgeslagen worden totdat je verbinding hersteld is.",
-    "(~%(count)s results)|one": "(~%(count)s resultaat)",
-    "(~%(count)s results)|other": "(~%(count)s resultaten)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s resultaat)",
+        "other": "(~%(count)s resultaten)"
+    },
     "New Password": "Nieuw wachtwoord",
     "Start automatically after system login": "Automatisch starten na systeemlogin",
     "Analytics": "Gebruiksgegevens",
@@ -333,51 +339,96 @@
     "URL previews are disabled by default for participants in this room.": "URL-voorvertoningen zijn voor deelnemers van deze kamer standaard uitgeschakeld.",
     "A text message has been sent to %(msisdn)s": "Er is een sms naar %(msisdn)s verstuurd",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s zijn %(count)s keer toegetreden",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s zijn toegetreden",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s is %(count)s keer toegetreden",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s is toegetreden",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s is %(count)s keer vertrokken",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s zijn vertrokken",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s is %(count)s keer vertrokken",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s is vertrokken",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s zijn %(count)s keer toegetreden en vertrokken",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s zijn toegetreden en vertrokken",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s is toegetreden en %(count)s zijn er vertrokken",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s is toegetreden en vertrokken",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s zijn vertrokken en %(count)s keer weer toegetreden",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s zijn vertrokken en weer toegetreden",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s is %(count)s keer vertrokken en weer toegetreden",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s is vertrokken en weer toegetreden",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer afgeslagen",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgeslagen",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)s keer geweigerd",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s heeft de uitnodiging geweigerd",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer ingetrokken",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "De uitnodigingen van %(severalUsers)s zijn ingetrokken",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "De uitnodiging van %(oneUser)s is %(count)s keer ingetrokken",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "De uitnodiging van %(oneUser)s is ingetrokken",
-    "were invited %(count)s times|other": "zijn %(count)s keer uitgenodigd",
-    "were invited %(count)s times|one": "zijn uitgenodigd",
-    "was invited %(count)s times|other": "is %(count)s keer uitgenodigd",
-    "was invited %(count)s times|one": "is uitgenodigd",
-    "were banned %(count)s times|other": "zijn %(count)s keer verbannen",
-    "were banned %(count)s times|one": "zijn verbannen",
-    "was banned %(count)s times|other": "is %(count)s keer verbannen",
-    "was banned %(count)s times|one": "is verbannen",
-    "were unbanned %(count)s times|other": "zijn %(count)s keer ontbannen",
-    "was unbanned %(count)s times|other": "is %(count)s keer ontbannen",
-    "was unbanned %(count)s times|one": "is ontbannen",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s hebben hun naam %(count)s keer gewijzigd",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s hebben hun naam gewijzigd",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s is %(count)s keer van naam veranderd",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s is van naam veranderd",
-    "%(items)s and %(count)s others|other": "%(items)s en %(count)s andere",
-    "%(items)s and %(count)s others|one": "%(items)s en één ander",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s zijn %(count)s keer toegetreden",
+        "one": "%(severalUsers)s zijn toegetreden"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s is %(count)s keer toegetreden",
+        "one": "%(oneUser)s is toegetreden"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s is %(count)s keer vertrokken",
+        "one": "%(severalUsers)s zijn vertrokken"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s is %(count)s keer vertrokken",
+        "one": "%(oneUser)s is vertrokken"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s zijn %(count)s keer toegetreden en vertrokken",
+        "one": "%(severalUsers)s zijn toegetreden en vertrokken"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s is toegetreden en %(count)s zijn er vertrokken",
+        "one": "%(oneUser)s is toegetreden en vertrokken"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s zijn vertrokken en %(count)s keer weer toegetreden",
+        "one": "%(severalUsers)s zijn vertrokken en weer toegetreden"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s is %(count)s keer vertrokken en weer toegetreden",
+        "one": "%(oneUser)s is vertrokken en weer toegetreden"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer afgeslagen",
+        "one": "%(severalUsers)s hebben hun uitnodigingen afgeslagen"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s heeft de uitnodiging %(count)s keer geweigerd",
+        "one": "%(oneUser)s heeft de uitnodiging geweigerd"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer ingetrokken",
+        "one": "De uitnodigingen van %(severalUsers)s zijn ingetrokken"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "De uitnodiging van %(oneUser)s is %(count)s keer ingetrokken",
+        "one": "De uitnodiging van %(oneUser)s is ingetrokken"
+    },
+    "were invited %(count)s times": {
+        "other": "zijn %(count)s keer uitgenodigd",
+        "one": "zijn uitgenodigd"
+    },
+    "was invited %(count)s times": {
+        "other": "is %(count)s keer uitgenodigd",
+        "one": "is uitgenodigd"
+    },
+    "were banned %(count)s times": {
+        "other": "zijn %(count)s keer verbannen",
+        "one": "zijn verbannen"
+    },
+    "was banned %(count)s times": {
+        "other": "is %(count)s keer verbannen",
+        "one": "is verbannen"
+    },
+    "were unbanned %(count)s times": {
+        "other": "zijn %(count)s keer ontbannen",
+        "one": "zijn ontbannen"
+    },
+    "was unbanned %(count)s times": {
+        "other": "is %(count)s keer ontbannen",
+        "one": "is ontbannen"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s hebben hun naam %(count)s keer gewijzigd",
+        "one": "%(severalUsers)s hebben hun naam gewijzigd"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s is %(count)s keer van naam veranderd",
+        "one": "%(oneUser)s is van naam veranderd"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s en %(count)s andere",
+        "one": "%(items)s en één ander"
+    },
     "collapse": "dichtvouwen",
     "expand": "uitvouwen",
     "Quote": "Citeren",
-    "And %(count)s more...|other": "En %(count)s meer…",
+    "And %(count)s more...": {
+        "other": "En %(count)s meer…"
+    },
     "Leave": "Verlaten",
     "Description": "Omschrijving",
     "Old cryptography data detected": "Oude cryptografiegegevens gedetecteerd",
@@ -390,7 +441,6 @@
     "Room Notification": "Kamermelding",
     "<a>In reply to</a> <pill>": "<a>Als antwoord op</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dit is geen publieke kamer. Slechts op uitnodiging zal je opnieuw kunnen toetreden.",
-    "were unbanned %(count)s times|one": "zijn ontbannen",
     "Failed to remove tag %(tagName)s from room": "Verwijderen van %(tagName)s-label van kamer is mislukt",
     "Failed to add tag %(tagName)s to room": "Toevoegen van %(tagName)s-label aan kamer is mislukt",
     "Stickerpack": "Stickerpakket",
@@ -509,8 +559,10 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s heeft %(address)s als hoofdadres voor deze kamer ingesteld.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s heeft het hoofdadres voor deze kamer verwijderd.",
     "%(displayName)s is typing …": "%(displayName)s is aan het typen…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s en %(count)s anderen zijn aan het typen…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s en nog iemand zijn aan het typen…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s en %(count)s anderen zijn aan het typen…",
+        "one": "%(names)s en nog iemand zijn aan het typen…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s en %(lastPerson)s zijn aan het typen…",
     "Unrecognised address": "Adres niet herkend",
     "You do not have permission to invite people to this room.": "Je bent niet bevoegd anderen in deze kamer uit te nodigen.",
@@ -800,8 +852,10 @@
     "Revoke invite": "Uitnodiging intrekken",
     "Invited by %(sender)s": "Uitgenodigd door %(sender)s",
     "Remember my selection for this widget": "Onthoud mijn keuze voor deze widget",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Je hebt %(count)s ongelezen meldingen in een vorige versie van deze kamer.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Je hebt %(count)s ongelezen meldingen in een vorige versie van deze kamer.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Je hebt %(count)s ongelezen meldingen in een vorige versie van deze kamer.",
+        "one": "Je hebt %(count)s ongelezen meldingen in een vorige versie van deze kamer."
+    },
     "The file '%(fileName)s' failed to upload.": "Het bestand ‘%(fileName)s’ kon niet geüpload worden.",
     "GitHub issue": "GitHub-melding",
     "Notes": "Opmerkingen",
@@ -817,8 +871,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Dit bestand is <b>te groot</b> om te versturen. Het limiet is %(limit)s en dit bestand is %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Deze bestanden zijn <b>te groot</b> om te versturen. De bestandsgroottelimiet is %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Sommige bestanden zijn <b>te groot</b> om te versturen. De bestandsgroottelimiet is %(limit)s.",
-    "Upload %(count)s other files|other": "%(count)s overige bestanden versturen",
-    "Upload %(count)s other files|one": "%(count)s overig bestand versturen",
+    "Upload %(count)s other files": {
+        "other": "%(count)s overige bestanden versturen",
+        "one": "%(count)s overig bestand versturen"
+    },
     "Cancel All": "Alles annuleren",
     "Upload Error": "Fout bij versturen van bestand",
     "The server does not support the room version specified.": "De server ondersteunt deze versie van kamers niet.",
@@ -895,10 +951,14 @@
     "Message edits": "Berichtbewerkingen",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Deze kamer bijwerken vereist dat je de huidige afsluit en in de plaats een nieuwe kamer aanmaakt. Om leden de best mogelijke ervaring te bieden, zullen we:",
     "Show all": "Alles tonen",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s hebben %(count)s keer niets gewijzigd",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s hebben niets gewijzigd",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s heeft %(count)s keer niets gewijzigd",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s heeft niets gewijzigd",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s hebben %(count)s keer niets gewijzigd",
+        "one": "%(severalUsers)s hebben niets gewijzigd"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s heeft %(count)s keer niets gewijzigd",
+        "one": "%(oneUser)s heeft niets gewijzigd"
+    },
     "Removing…": "Bezig met verwijderen…",
     "Clear all data": "Alle gegevens wissen",
     "Your homeserver doesn't seem to support this feature.": "Jouw homeserver biedt geen ondersteuning voor deze functie.",
@@ -982,7 +1042,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Probeer omhoog te scrollen in de tijdslijn om te kijken of er eerdere zijn.",
     "Remove recent messages by %(user)s": "Recente berichten door %(user)s verwijderen",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Bij een groot aantal berichten kan dit even duren. Herlaad je cliënt niet gedurende deze tijd.",
-    "Remove %(count)s messages|other": "%(count)s berichten verwijderen",
+    "Remove %(count)s messages": {
+        "other": "%(count)s berichten verwijderen",
+        "one": "1 bericht verwijderen"
+    },
     "Deactivate user?": "Persoon deactiveren?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deze persoon deactiveren zal deze persoon uitloggen en verhinderen dat de persoon weer inlogt. Bovendien zal de persoon alle kamers waaraan de persoon deelneemt verlaten. Deze actie is niet terug te draaien. Weet je zeker dat je deze persoon wilt deactiveren?",
     "Deactivate user": "Persoon deactiveren",
@@ -1007,9 +1070,14 @@
     "Explore rooms": "Kamers ontdekken",
     "Show previews/thumbnails for images": "Miniaturen voor afbeeldingen tonen",
     "Clear cache and reload": "Cache wissen en herladen",
-    "Remove %(count)s messages|one": "1 bericht verwijderen",
-    "%(count)s unread messages including mentions.|other": "%(count)s ongelezen berichten, inclusief vermeldingen.",
-    "%(count)s unread messages.|other": "%(count)s ongelezen berichten.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s ongelezen berichten, inclusief vermeldingen.",
+        "one": "1 ongelezen vermelding."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s ongelezen berichten.",
+        "one": "1 ongelezen bericht."
+    },
     "Show image": "Afbeelding tonen",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Maak een nieuwe issue aan</newIssueLink> op GitHub zodat we deze bug kunnen onderzoeken.",
     "e.g. my-room": "bv. mijn-kamer",
@@ -1199,8 +1267,6 @@
     "<userName/> wants to chat": "<userName/> wil een chat met je beginnen",
     "Start chatting": "Gesprek beginnen",
     "Reject & Ignore user": "Weigeren en persoon negeren",
-    "%(count)s unread messages including mentions.|one": "1 ongelezen vermelding.",
-    "%(count)s unread messages.|one": "1 ongelezen bericht.",
     "Unread messages.": "Ongelezen berichten.",
     "Unknown Command": "Onbekende opdracht",
     "Unrecognised command: %(commandText)s": "Onbekende opdracht: %(commandText)s",
@@ -1223,11 +1289,15 @@
     "Done": "Klaar",
     "Trusted": "Vertrouwd",
     "Not trusted": "Niet vertrouwd",
-    "%(count)s verified sessions|other": "%(count)s geverifieerde sessies",
-    "%(count)s verified sessions|one": "1 geverifieerde sessie",
+    "%(count)s verified sessions": {
+        "other": "%(count)s geverifieerde sessies",
+        "one": "1 geverifieerde sessie"
+    },
     "Hide verified sessions": "Geverifieerde sessies verbergen",
-    "%(count)s sessions|other": "%(count)s sessies",
-    "%(count)s sessions|one": "%(count)s sessie",
+    "%(count)s sessions": {
+        "other": "%(count)s sessies",
+        "one": "%(count)s sessie"
+    },
     "Hide sessions": "Sessies verbergen",
     "This client does not support end-to-end encryption.": "Deze cliënt biedt geen ondersteuning voor eind-tot-eind-versleuteling.",
     "Messages in this room are not end-to-end encrypted.": "De berichten in deze kamer worden niet eind-tot-eind-versleuteld.",
@@ -1350,10 +1420,14 @@
     "Please supply a widget URL or embed code": "Gelieve een widgetURL of in te bedden code te geven",
     "Send a bug report with logs": "Stuur een bugrapport met logs",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s heeft de kamer %(oldRoomName)s hernoemd tot %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft dit kamer de nevenadressen %(addresses)s toegekend.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft deze kamer het nevenadres %(addresses)s toegekend.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft de nevenadressen %(addresses)s voor deze kamer geschrapt.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft het nevenadres %(addresses)s voor deze kamer geschrapt.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s heeft dit kamer de nevenadressen %(addresses)s toegekend.",
+        "one": "%(senderName)s heeft deze kamer het nevenadres %(addresses)s toegekend."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s heeft de nevenadressen %(addresses)s voor deze kamer geschrapt.",
+        "one": "%(senderName)s heeft het nevenadres %(addresses)s voor deze kamer geschrapt."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s heeft de nevenadressen voor deze kamer gewijzigd.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s heeft hoofd- en nevenadressen voor deze kamer gewijzigd.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s heeft de adressen voor deze kamer gewijzigd.",
@@ -1672,8 +1746,10 @@
     "Favourited": "Favoriet",
     "Forget Room": "Kamer vergeten",
     "Notification options": "Meldingsinstellingen",
-    "Show %(count)s more|one": "Toon %(count)s meer",
-    "Show %(count)s more|other": "Toon %(count)s meer",
+    "Show %(count)s more": {
+        "one": "Toon %(count)s meer",
+        "other": "Toon %(count)s meer"
+    },
     "Show rooms with unread messages first": "Kamers met ongelezen berichten als eerste tonen",
     "Show Widgets": "Widgets tonen",
     "Hide Widgets": "Widgets verbergen",
@@ -1779,7 +1855,9 @@
     "Not encrypted": "Niet versleuteld",
     "Widgets": "Widgets",
     "Unpin": "Losmaken",
-    "You can only pin up to %(count)s widgets|other": "Je kunt maar %(count)s widgets vastzetten",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Je kunt maar %(count)s widgets vastzetten"
+    },
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In versleutelde kamers zijn jouw berichten beveiligd, enkel de ontvanger en jij hebben de unieke sleutels om ze te ontsleutelen.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Stel een adres in zodat personen deze kamer via jouw homeserver (%(localDomain)s) kunnen vinden",
     "Local Addresses": "Lokale adressen",
@@ -2079,8 +2157,10 @@
     "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Maak een back-up van je versleutelingssleutels met je accountgegevens voor het geval je de toegang tot je sessies verliest. Je sleutels worden beveiligd met een unieke veiligheidssleutel.",
     "well formed": "goed gevormd",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s kan versleutelde berichten niet veilig lokaal opslaan in een webbrowser. Gebruik <desktopLink>%(brand)s Desktop</desktopLink> om versleutelde berichten in zoekresultaten te laten verschijnen.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s kamer.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s kamers.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s kamer.",
+        "other": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s kamers."
+    },
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifieer elke sessie die door een persoon wordt gebruikt afzonderlijk. Dit markeert hen als vertrouwd zonder te vertrouwen op kruislings ondertekende apparaten.",
     "User signing private key:": "Persoonsondertekening-privésleutel:",
     "Master private key:": "Hoofdprivésleutel:",
@@ -2139,8 +2219,10 @@
     "Support": "Ondersteuning",
     "Random": "Willekeurig",
     "Welcome to <name/>": "Welkom in <name/>",
-    "%(count)s members|other": "%(count)s personen",
-    "%(count)s members|one": "%(count)s persoon",
+    "%(count)s members": {
+        "other": "%(count)s personen",
+        "one": "%(count)s persoon"
+    },
     "Your server does not support showing space hierarchies.": "Jouw server heeft geen ondersteuning voor het weergeven van Space-indelingen.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Weet je zeker dat je de Space '%(spaceName)s' wilt verlaten?",
     "This space is not public. You will not be able to rejoin without an invite.": "Deze Space is niet publiek. Zonder uitnodiging zal je niet opnieuw kunnen toetreden.",
@@ -2201,8 +2283,10 @@
     "Failed to remove some rooms. Try again later": "Het verwijderen van sommige kamers is mislukt. Probeer het opnieuw",
     "Suggested": "Aanbevolen",
     "This room is suggested as a good one to join": "Dit is een aanbevolen kamer om aan deel te nemen",
-    "%(count)s rooms|one": "%(count)s kamer",
-    "%(count)s rooms|other": "%(count)s kamers",
+    "%(count)s rooms": {
+        "one": "%(count)s kamer",
+        "other": "%(count)s kamers"
+    },
     "You don't have permission": "Je hebt geen toestemming",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Normaal gesproken heeft dit alleen invloed op het verwerken van de kamer op de server. Als je problemen ervaart met %(brand)s, stuur dan een bugmelding.",
     "Invite to %(roomName)s": "Uitnodiging voor %(roomName)s",
@@ -2223,8 +2307,10 @@
     "Invited people will be able to read old messages.": "Uitgenodigde personen kunnen de oude berichten lezen.",
     "We couldn't create your DM.": "We konden je DM niet aanmaken.",
     "Add existing rooms": "Bestaande kamers toevoegen",
-    "%(count)s people you know have already joined|one": "%(count)s persoon die je kent is al geregistreerd",
-    "%(count)s people you know have already joined|other": "%(count)s personen die je kent hebben zich al geregistreerd",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s persoon die je kent is al geregistreerd",
+        "other": "%(count)s personen die je kent hebben zich al geregistreerd"
+    },
     "Invite to just this room": "Uitnodigen voor alleen deze kamer",
     "Warn before quitting": "Waarschuwen voordat je afsluit",
     "Manage & explore rooms": "Beheer & ontdek kamers",
@@ -2250,8 +2336,10 @@
     "Delete all": "Verwijder alles",
     "Some of your messages have not been sent": "Enkele van jouw berichten zijn niet verstuurd",
     "Including %(commaSeparatedMembers)s": "Inclusief %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "1 lid bekijken",
-    "View all %(count)s members|other": "Bekijk alle %(count)s personen",
+    "View all %(count)s members": {
+        "one": "1 lid bekijken",
+        "other": "Bekijk alle %(count)s personen"
+    },
     "Failed to send": "Versturen is mislukt",
     "Enter your Security Phrase a second time to confirm it.": "Voer je veiligheidswachtwoord een tweede keer in om het te bevestigen.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Kies een kamer of gesprek om hem toe te voegen. Dit is een Space voor jou, niemand zal hiervan een melding krijgen. Je kan er later meer toevoegen.",
@@ -2264,8 +2352,10 @@
     "Leave the beta": "Beta verlaten",
     "Beta": "Beta",
     "Want to add a new room instead?": "Wil je anders een nieuwe kamer toevoegen?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Kamer toevoegen...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Kamers toevoegen... (%(progress)s van %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Kamer toevoegen...",
+        "other": "Kamers toevoegen... (%(progress)s van %(count)s)"
+    },
     "Not all selected were added": "Niet alle geselecteerden zijn toegevoegd",
     "You are not allowed to view this server's rooms list": "Je hebt geen toegang tot deze server zijn kamergids",
     "Error processing voice message": "Fout bij verwerking spraakbericht",
@@ -2289,8 +2379,10 @@
     "Sends the given message with a space themed effect": "Stuurt het bericht met space invaders",
     "See when people join, leave, or are invited to your active room": "Zie wanneer personen deelnemen, vertrekken of worden uitgenodigd in je actieve kamer",
     "See when people join, leave, or are invited to this room": "Zie wanneer personen deelnemen, vertrekken of worden uitgenodigd voor deze kamer",
-    "Currently joining %(count)s rooms|one": "Momenteel aan het toetreden tot %(count)s kamer",
-    "Currently joining %(count)s rooms|other": "Momenteel aan het toetreden tot %(count)s kamers",
+    "Currently joining %(count)s rooms": {
+        "one": "Momenteel aan het toetreden tot %(count)s kamer",
+        "other": "Momenteel aan het toetreden tot %(count)s kamers"
+    },
     "The user you called is busy.": "De persoon die je belde is bezet.",
     "User Busy": "Persoon Bezet",
     "Or send invite link": "Of verstuur je uitnodigingslink",
@@ -2325,10 +2417,14 @@
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Deze persoon vertoont illegaal gedrag, bijvoorbeeld door doxing van personen of te dreigen met geweld.\nDit zal gerapporteerd worden aan de moderators van deze kamer die dit kunnen doorzetten naar de gerechtelijke autoriteiten.",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Wat deze persoon schrijft is verkeerd.\nDit zal worden gerapporteerd aan de kamermoderators.",
     "Please provide an address": "Geef een adres op",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s veranderde de server ACLs",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s veranderde de server ACLs %(count)s keer",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s veranderden de server ACLs",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s veranderden de server ACLs %(count)s keer",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s veranderde de server ACLs",
+        "other": "%(oneUser)s veranderde de server ACLs %(count)s keer"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s veranderden de server ACLs",
+        "other": "%(severalUsers)s veranderden de server ACLs %(count)s keer"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Bericht zoeken initialisatie mislukt, controleer <a>je instellingen</a> voor meer informatie",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Stel adressen in voor deze Space zodat personen deze Space kunnen vinden via jouw homeserver (%(localDomain)s)",
     "To publish an address, it needs to be set as a local address first.": "Om een adres te publiceren, moet het eerst als een lokaaladres worden ingesteld.",
@@ -2378,8 +2474,10 @@
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "De anderen zijn verstuurd, maar de volgende personen konden niet worden uitgenodigd voor <RoomName/>",
     "Unnamed audio": "Naamloze audio",
     "Error processing audio message": "Fout bij verwerking audiobericht",
-    "Show %(count)s other previews|one": "%(count)s andere preview weergeven",
-    "Show %(count)s other previews|other": "%(count)s andere previews weergeven",
+    "Show %(count)s other previews": {
+        "one": "%(count)s andere preview weergeven",
+        "other": "%(count)s andere previews weergeven"
+    },
     "Images, GIFs and videos": "Afbeeldingen, GIF's en video's",
     "Code blocks": "Codeblokken",
     "Displaying time": "Tijdsweergave",
@@ -2421,8 +2519,14 @@
     "Could not connect media": "Mediaverbinding mislukt",
     "Spaces with access": "Spaces met toegang",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Iedereen in een space kan hem vinden en deelnemen. <a>Wijzig hier welke spaces toegang hebben.</a>",
-    "Currently, %(count)s spaces have access|other": "Momenteel hebben %(count)s spaces toegang",
-    "& %(count)s more|other": "& %(count)s meer",
+    "Currently, %(count)s spaces have access": {
+        "other": "Momenteel hebben %(count)s spaces toegang",
+        "one": "Momenteel heeft één space toegang"
+    },
+    "& %(count)s more": {
+        "other": "& %(count)s meer",
+        "one": "& %(count)s meer"
+    },
     "Upgrade required": "Upgrade noodzakelijk",
     "Anyone can find and join.": "Iedereen kan hem vinden en deelnemen.",
     "Only invited people can join.": "Alleen uitgenodigde personen kunnen deelnemen.",
@@ -2521,8 +2625,6 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s maakte <a>een vastgeprikt bericht</a> los van deze kamer. Bekijk alle <b>vastgeprikte berichten</b>.",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s prikte een bericht vast aan deze kamer. Bekijk alle vastgeprikte berichten.",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s prikte <a>een bericht</a> aan deze kamer. Bekijk alle <b>vastgeprikte berichten</b>.",
-    "Currently, %(count)s spaces have access|one": "Momenteel heeft één space toegang",
-    "& %(count)s more|one": "& %(count)s meer",
     "Some encryption parameters have been changed.": "Enkele versleutingsparameters zijn gewijzigd.",
     "Role in <RoomName/>": "Rol in <RoomName/>",
     "Send a sticker": "Verstuur een sticker",
@@ -2595,12 +2697,18 @@
     "Disinvite from %(roomName)s": "Uitnodiging intrekken voor %(roomName)s",
     "Threads": "Threads",
     "Create poll": "Poll aanmaken",
-    "%(count)s reply|one": "%(count)s reactie",
-    "%(count)s reply|other": "%(count)s reacties",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Spaces bijwerken...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Spaces bijwerken... (%(progress)s van %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Uitnodigingen versturen...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Uitnodigingen versturen... (%(progress)s van %(count)s)",
+    "%(count)s reply": {
+        "one": "%(count)s reactie",
+        "other": "%(count)s reacties"
+    },
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Spaces bijwerken...",
+        "other": "Spaces bijwerken... (%(progress)s van %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Uitnodigingen versturen...",
+        "other": "Uitnodigingen versturen... (%(progress)s van %(count)s)"
+    },
     "Loading new room": "Nieuwe kamer laden",
     "Upgrading room": "Kamer aan het bijwerken",
     "Developer mode": "Ontwikkelaar mode",
@@ -2627,12 +2735,18 @@
     "Light high contrast": "Lichte hoog contrast",
     "Select all": "Allemaal selecteren",
     "Deselect all": "Allemaal deselecteren",
-    "Sign out devices|one": "Apparaat uitloggen",
-    "Sign out devices|other": "Apparaten uitloggen",
-    "Click the button below to confirm signing out these devices.|one": "Klik op onderstaande knop om het uitloggen van dit apparaat te bevestigen.",
-    "Click the button below to confirm signing out these devices.|other": "Klik op onderstaande knop om het uitloggen van deze apparaten te bevestigen.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Bevestig je identiteit met eenmalig inloggen om dit apparaat uit te loggen.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Bevestig je identiteit met eenmalig inloggen om deze apparaten uit te loggen.",
+    "Sign out devices": {
+        "one": "Apparaat uitloggen",
+        "other": "Apparaten uitloggen"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Klik op onderstaande knop om het uitloggen van dit apparaat te bevestigen.",
+        "other": "Klik op onderstaande knop om het uitloggen van deze apparaten te bevestigen."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Bevestig je identiteit met eenmalig inloggen om dit apparaat uit te loggen.",
+        "other": "Bevestig je identiteit met eenmalig inloggen om deze apparaten uit te loggen."
+    },
     "Use a more compact 'Modern' layout": "Compacte 'Moderne'-indeling gebruiken",
     "Other rooms": "Andere kamers",
     "Automatically send debug logs on any error": "Automatisch foutenlogboek versturen bij een fout",
@@ -2659,10 +2773,14 @@
     "Question or topic": "Vraag of onderwerp",
     "What is your poll question or topic?": "Wat is jouw poll vraag of onderwerp?",
     "Create Poll": "Poll aanmaken",
-    "Based on %(count)s votes|one": "Gebaseerd op %(count)s stem",
-    "Based on %(count)s votes|other": "Gebaseerd op %(count)s stemmen",
-    "%(count)s votes|one": "%(count)s stem",
-    "%(count)s votes|other": "%(count)s stemmen",
+    "Based on %(count)s votes": {
+        "one": "Gebaseerd op %(count)s stem",
+        "other": "Gebaseerd op %(count)s stemmen"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s stem",
+        "other": "%(count)s stemmen"
+    },
     "In encrypted rooms, verify all users to ensure it's secure.": "Controleer alle personen in versleutelde kamers om er zeker van te zijn dat het veilig is.",
     "Files": "Bestanden",
     "Close this widget to view it in this panel": "Sluit deze widget om het in dit paneel weer te geven",
@@ -2691,8 +2809,10 @@
     "Sends the given message with rainfall": "Stuurt het bericht met neerslag",
     "sends rainfall": "stuurt neerslag",
     "%(senderName)s has updated the room layout": "%(senderName)s heeft de kamerindeling bijgewerkt",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s en %(count)s andere",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s en %(count)s andere",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s en %(count)s andere",
+        "other": "%(spaceName)s en %(count)s andere"
+    },
     "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Wij maken een veiligheidssleutel voor je aan die je ergens veilig kunt opbergen, zoals in een wachtwoordmanager of een kluis.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.": "Ontvang toegang tot je account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder deze sleutels zijn sommige van je versleutelde berichten in je sessies onleesbaar.",
     "Without verifying, you won't have access to all your messages and may appear as untrusted to others.": "Zonder verifiëren heb je geen toegang tot al je berichten en kan je als onvertrouwd aangemerkt staan bij anderen.",
@@ -2725,8 +2845,10 @@
     "We <Bold>don't</Bold> share information with third parties": "We delen <Bold>geen</Bold> informatie met derde partijen",
     "We <Bold>don't</Bold> record or profile any account data": "We verwerken of bewaren <Bold>geen</Bold> accountgegevens",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "Je kan alle voorwaarden <PrivacyPolicyUrl>hier</PrivacyPolicyUrl> lezen",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s stem uitgebracht. Stem om de resultaten te zien",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s stemmen uitgebracht. Stem om de resultaten te zien",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s stem uitgebracht. Stem om de resultaten te zien",
+        "other": "%(count)s stemmen uitgebracht. Stem om de resultaten te zien"
+    },
     "No votes cast": "Geen stemmen uitgebracht",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Deel anonieme gedragsdata om ons te helpen problemen te identificeren. Geen persoonsgegevens. Geen derde partijen.",
     "To view all keyboard shortcuts, <a>click here</a>.": "Om alle sneltoetsen te bekijken, <a>klik hier</a>.",
@@ -2747,8 +2869,10 @@
     "Failed to end poll": "Poll sluiten is mislukt",
     "The poll has ended. Top answer: %(topAnswer)s": "De poll is gesloten. Meest gestemd: %(topAnswer)s",
     "The poll has ended. No votes were cast.": "De poll is gesloten. Er kan niet meer worden gestemd.",
-    "Final result based on %(count)s votes|one": "Einduitslag gebaseerd op %(count)s stem",
-    "Final result based on %(count)s votes|other": "Einduitslag gebaseerd op %(count)s stemmen",
+    "Final result based on %(count)s votes": {
+        "one": "Einduitslag gebaseerd op %(count)s stem",
+        "other": "Einduitslag gebaseerd op %(count)s stemmen"
+    },
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "We konden de datum niet verwerken (%(inputDate)s). Probeer het opnieuw met het formaat JJJJ-MM-DD.",
     "Failed to load list of rooms.": "Het laden van de kamerslijst is mislukt.",
     "Open in OpenStreetMap": "In OpenStreetMap openen",
@@ -2764,16 +2888,24 @@
     "Link to room": "Link naar kamer",
     "Including you, %(commaSeparatedMembers)s": "Inclusief jij, %(commaSeparatedMembers)s",
     "Copy room link": "Kamerlink kopiëren",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s gebeurtenis geëxporteerd in %(seconds)s seconden",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s gebeurtenissen geëxporteerd in %(seconds)s seconden",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s gebeurtenis geëxporteerd in %(seconds)s seconden",
+        "other": "%(count)s gebeurtenissen geëxporteerd in %(seconds)s seconden"
+    },
     "Export successful!": "Export gelukt!",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s gebeurtenis opgehaald in %(seconds)s",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s gebeurtenissen opgehaald in %(seconds)s",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "%(count)s gebeurtenis opgehaald in %(seconds)s",
+        "other": "%(count)s gebeurtenissen opgehaald in %(seconds)s"
+    },
     "Processing event %(number)s out of %(total)s": "%(number)s gebeurtenis verwerkt van de %(total)s",
-    "Fetched %(count)s events so far|one": "%(count)s gebeurtenis opgehaald zover",
-    "Fetched %(count)s events so far|other": "%(count)s gebeurtenissen opgehaald zover",
-    "Fetched %(count)s events out of %(total)s|one": "%(count)s gebeurtenis opgehaald van de %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "%(count)s gebeurtenissen opgehaald van de %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "%(count)s gebeurtenis opgehaald zover",
+        "other": "%(count)s gebeurtenissen opgehaald zover"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "%(count)s gebeurtenis opgehaald van de %(total)s",
+        "other": "%(count)s gebeurtenissen opgehaald van de %(total)s"
+    },
     "Generating a ZIP": "Genereer een ZIP",
     "Your new device is now verified. Other users will see it as trusted.": "Jouw nieuwe apparaat is nu geverifieerd. Andere personen zien het nu als vertrouwd.",
     "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jouw nieuwe apparaat is nu geverifieerd. Het heeft toegang tot je versleutelde berichten en andere personen zien het als vertrouwd.",
@@ -2813,10 +2945,14 @@
     "Command error: Unable to handle slash command.": "Commandofout: Kan slash commando niet verwerken.",
     "Open this settings tab": "Open dit tabblad met instellingen",
     "Space home": "Space home",
-    "was removed %(count)s times|one": "was verwijderd",
-    "was removed %(count)s times|other": "is %(count)s keer verwijderd",
-    "were removed %(count)s times|one": "zijn verwijderd",
-    "were removed %(count)s times|other": "werden %(count)s keer verwijderd",
+    "was removed %(count)s times": {
+        "one": "was verwijderd",
+        "other": "is %(count)s keer verwijderd"
+    },
+    "were removed %(count)s times": {
+        "one": "zijn verwijderd",
+        "other": "werden %(count)s keer verwijderd"
+    },
     "Unknown error fetching location. Please try again later.": "Onbekende fout bij ophalen van locatie. Probeer het later opnieuw.",
     "Timed out trying to fetch your location. Please try again later.": "Er is een time-out opgetreden bij het ophalen van jouw locatie. Probeer het later opnieuw.",
     "Failed to fetch your location. Please try again later.": "Kan jouw locatie niet ophalen. Probeer het later opnieuw.",
@@ -2897,16 +3033,26 @@
     "Use <arrows/> to scroll": "Gebruik <arrows/> om te scrollen",
     "Feedback sent! Thanks, we appreciate it!": "Reactie verzonden! Bedankt, we waarderen het!",
     "<empty string>": "<empty string>",
-    "<%(count)s spaces>|one": "<space>",
-    "<%(count)s spaces>|other": "<%(count)s spaces>",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sverzond een verborgen bericht",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sverzond %(count)s verborgen berichten",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sverzond verborgen bericht",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sverzond %(count)s verborgen berichten",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sheeft een bericht verwijderd",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sverwijderde %(count)s berichten",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)shebben een bericht verwijderd",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sverwijderde %(count)s berichten",
+    "<%(count)s spaces>": {
+        "one": "<space>",
+        "other": "<%(count)s spaces>"
+    },
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sverzond een verborgen bericht",
+        "other": "%(oneUser)sverzond %(count)s verborgen berichten"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sverzond verborgen bericht",
+        "other": "%(severalUsers)sverzond %(count)s verborgen berichten"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)sheeft een bericht verwijderd",
+        "other": "%(oneUser)sverwijderde %(count)s berichten"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)shebben een bericht verwijderd",
+        "other": "%(severalUsers)sverwijderde %(count)s berichten"
+    },
     "Maximise": "Maximaliseren",
     "You do not have permissions to add spaces to this space": "Je bent niet gemachtigd om spaces aan deze space toe te voegen",
     "Automatically send debug logs when key backup is not functioning": "Automatisch foutopsporingslogboeken versturen wanneer de sleutelback-up niet werkt",
@@ -2961,8 +3107,10 @@
     "Create a video room": "Creëer een videokamer",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Schakel het vinkje uit als je ook systeemberichten van deze persoon wil verwijderen (bijv. lidmaatschapswijziging, profielwijziging...)",
     "Preserve system messages": "Systeemberichten behouden",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Je staat op het punt %(count)s bericht te verwijderen door %(user)s. Hierdoor worden ze permanent verwijderd voor iedereen in het gesprek. Wil je doorgaan?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Je staat op het punt %(count)s berichten te verwijderen door %(user)s. Hierdoor worden ze permanent verwijderd voor iedereen in het gesprek. Wil je doorgaan?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Je staat op het punt %(count)s bericht te verwijderen door %(user)s. Hierdoor worden ze permanent verwijderd voor iedereen in het gesprek. Wil je doorgaan?",
+        "other": "Je staat op het punt %(count)s berichten te verwijderen door %(user)s. Hierdoor worden ze permanent verwijderd voor iedereen in het gesprek. Wil je doorgaan?"
+    },
     "%(featureName)s Beta feedback": "%(featureName)s Bèta-feedback",
     "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Help ons problemen te identificeren en %(analyticsOwner)s te verbeteren door anonieme gebruiksgegevens te delen. Om inzicht te krijgen in hoe mensen meerdere apparaten gebruiken, genereren we een willekeurige identificatie die door jouw apparaten wordt gedeeld.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Je kan de aangepaste serveropties gebruiken om je aan te melden bij andere Matrix-servers door een andere server-URL op te geven. Hierdoor kan je %(brand)s gebruiken met een bestaand Matrix-account op een andere thuisserver.",
@@ -2972,10 +3120,14 @@
     "Open poll": "Start poll",
     "Poll type": "Poll type",
     "Edit poll": "Bewerk poll",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sheeft de <a>vastgezette berichten</a> voor de kamer gewijzigd",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sheeft de <a>vastgezette berichten</a> voor de kamer %(count)s keer gewijzigd",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)shebben de <a>vastgezette berichten</a> voor de kamer gewijzigd",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sheeft de <a>vastgezette berichten</a> voor de kamer %(count)s keer gewijzigd",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)sheeft de <a>vastgezette berichten</a> voor de kamer gewijzigd",
+        "other": "%(oneUser)sheeft de <a>vastgezette berichten</a> voor de kamer %(count)s keer gewijzigd"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)shebben de <a>vastgezette berichten</a> voor de kamer gewijzigd",
+        "other": "%(severalUsers)sheeft de <a>vastgezette berichten</a> voor de kamer %(count)s keer gewijzigd"
+    },
     "What location type do you want to share?": "Welk locatietype wil je delen?",
     "Drop a Pin": "Zet een pin neer",
     "My live location": "Mijn live locatie",
@@ -2999,8 +3151,10 @@
     "Can't create a thread from an event with an existing relation": "Kan geen discussie maken van een gebeurtenis met een bestaande relatie",
     "Pinned": "Vastgezet",
     "Open thread": "Open discussie",
-    "%(count)s participants|one": "1 deelnemer",
-    "%(count)s participants|other": "%(count)s deelnemers",
+    "%(count)s participants": {
+        "one": "1 deelnemer",
+        "other": "%(count)s deelnemers"
+    },
     "Video": "Video",
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s is geretourneerd tijdens een poging om toegang te krijgen tot de kamer of space. Als je denkt dat je dit bericht ten onrechte ziet, <issueLink>dien dan een bugrapport in</issueLink>.",
     "Try again later, or ask a room or space admin to check if you have access.": "Probeer het later opnieuw of vraag een kamer- of space beheerder om te controleren of je toegang hebt.",
@@ -3017,8 +3171,10 @@
     "Forget this space": "Vergeet deze space",
     "You were removed by %(memberName)s": "Je bent verwijderd door %(memberName)s",
     "Loading preview": "Voorbeeld laden",
-    "Currently removing messages in %(count)s rooms|one": "Momenteel berichten in %(count)s kamer aan het verwijderen",
-    "Currently removing messages in %(count)s rooms|other": "Momenteel berichten in %(count)s kamers aan het verwijderen",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Momenteel berichten in %(count)s kamer aan het verwijderen",
+        "other": "Momenteel berichten in %(count)s kamers aan het verwijderen"
+    },
     "New video room": "Nieuwe video kamer",
     "New room": "Nieuwe kamer",
     "Busy": "Bezet",
@@ -3076,8 +3232,10 @@
     "Disinvite from room": "Uitnodiging van kamer afwijzen",
     "Remove from space": "Verwijder van space",
     "Disinvite from space": "Uitnodiging van space afwijzen",
-    "Confirm signing out these devices|one": "Uitloggen van dit apparaat bevestigen",
-    "Confirm signing out these devices|other": "Uitloggen van deze apparaten bevestigen",
+    "Confirm signing out these devices": {
+        "one": "Uitloggen van dit apparaat bevestigen",
+        "other": "Uitloggen van deze apparaten bevestigen"
+    },
     "Jump to the given date in the timeline": "Spring naar de opgegeven datum in de tijdlijn",
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Je bent afgemeld op al je apparaten en zal geen pushmeldingen meer ontvangen. Meld je op elk apparaat opnieuw aan om weer meldingen te ontvangen.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Als je toegang tot je berichten wilt behouden, stel dan sleutelback-up in of exporteer je sleutels vanaf een van je andere apparaten voordat je verder gaat.",
@@ -3097,8 +3255,10 @@
     "You will not be able to reactivate your account": "Zal je jouw account niet kunnen heractiveren",
     "Confirm that you would like to deactivate your account. If you proceed:": "Bevestig dat je jouw account wil deactiveren. Als je doorgaat:",
     "To continue, please enter your account password:": "Voer je wachtwoord in om verder te gaan:",
-    "Seen by %(count)s people|one": "Gezien door %(count)s persoon",
-    "Seen by %(count)s people|other": "Gezien door %(count)s mensen",
+    "Seen by %(count)s people": {
+        "one": "Gezien door %(count)s persoon",
+        "other": "Gezien door %(count)s mensen"
+    },
     "Your password was successfully changed.": "Wachtwoord veranderen geslaagd.",
     "Turn on camera": "Camera inschakelen",
     "Turn off camera": "Camera uitschakelen",
@@ -3139,8 +3299,10 @@
     "Joining…": "Deelnemen…",
     "Read receipts": "Leesbevestigingen",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "Schakel hardwareversnelling in (start %(appName)s opnieuw op)",
-    "%(count)s people joined|one": "%(count)s persoon toegetreden",
-    "%(count)s people joined|other": "%(count)s mensen toegetreden",
+    "%(count)s people joined": {
+        "one": "%(count)s persoon toegetreden",
+        "other": "%(count)s mensen toegetreden"
+    },
     "Failed to set direct message tag": "Kan tag voor direct bericht niet instellen",
     "You were disconnected from the call. (Error: %(message)s)": "De verbinding is verbroken van uw oproep. (Error: %(message)s)",
     "Connection lost": "Verbinding verloren",
@@ -3158,8 +3320,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Als u niet kunt zien wie u zoekt, stuur ze dan uw uitnodigingslink.",
     "Some results may be hidden for privacy": "Sommige resultaten kunnen om privacyredenen verborgen zijn",
     "Search for": "Zoeken naar",
-    "%(count)s Members|one": "%(count)s Lid",
-    "%(count)s Members|other": "%(count)s Leden",
+    "%(count)s Members": {
+        "one": "%(count)s Lid",
+        "other": "%(count)s Leden"
+    },
     "When you sign out, these keys will be deleted from this device, which means you won't be able to read encrypted messages unless you have the keys for them on your other devices, or backed them up to the server.": "Wanneer je jezelf afmeldt, worden deze sleutels van dit apparaat verwijderd, wat betekent dat je geen versleutelde berichten kunt lezen, tenzij je de sleutels ervoor op je andere apparaten hebt of er een back-up van hebt gemaakt op de server.",
     "Show: Matrix rooms": "Toon: Matrix kamers",
     "Show: %(instance)s rooms (%(server)s)": "Toon: %(instance)s kamers (%(server)s)",
@@ -3198,9 +3362,11 @@
     "Enter fullscreen": "Volledig scherm openen",
     "Map feedback": "Kaart feedback",
     "Toggle attribution": "Attributie in-/uitschakelen",
-    "In %(spaceName)s and %(count)s other spaces.|one": "In %(spaceName)s en %(count)s andere space.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "In %(spaceName)s en %(count)s andere space.",
+        "other": "In %(spaceName)s en %(count)s andere spaces."
+    },
     "In %(spaceName)s.": "In space %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s en %(count)s andere spaces.",
     "In spaces %(space1Name)s and %(space2Name)s.": "In spaces %(space1Name)s en %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Opdracht voor ontwikkelaars: verwijdert de huidige uitgaande groepssessie en stelt nieuwe Olm-sessies in",
     "Messages in this chat will be end-to-end encrypted.": "Berichten in deze chat worden eind-tot-eind versleuteld.",
@@ -3221,8 +3387,10 @@
     "Spell check": "Spellingscontrole",
     "Complete these to get the most out of %(brand)s": "Voltooi deze om het meeste uit %(brand)s te halen",
     "You did it!": "Het is je gelukt!",
-    "Only %(count)s steps to go|one": "Nog maar %(count)s stap te gaan",
-    "Only %(count)s steps to go|other": "Nog maar %(count)s stappen te gaan",
+    "Only %(count)s steps to go": {
+        "one": "Nog maar %(count)s stap te gaan",
+        "other": "Nog maar %(count)s stappen te gaan"
+    },
     "Welcome to %(brand)s": "Welkom bij %(brand)s",
     "Find your people": "Vind je mensen",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Houd het eigendom en de controle over de discussie in de gemeenschap.\nSchaal om miljoenen te ondersteunen, met krachtige beheersbaarheid en interoperabiliteit.",
@@ -3290,11 +3458,15 @@
     "Show shortcut to welcome checklist above the room list": "Toon snelkoppeling naar welkomstchecklist boven de kamer gids",
     "Send read receipts": "Stuur leesbevestigingen",
     "Empty room (was %(oldName)s)": "Lege ruimte (was %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "%(user)s en 1 andere uitnodigen",
-    "Inviting %(user)s and %(count)s others|other": "%(user)s en %(count)s anderen uitnodigen",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "%(user)s en 1 andere uitnodigen",
+        "other": "%(user)s en %(count)s anderen uitnodigen"
+    },
     "Inviting %(user1)s and %(user2)s": "%(user1)s en %(user2)s uitnodigen",
-    "%(user)s and %(count)s others|one": "%(user)s en 1 andere",
-    "%(user)s and %(count)s others|other": "%(user)s en %(count)s anderen",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s en 1 andere",
+        "other": "%(user)s en %(count)s anderen"
+    },
     "%(user1)s and %(user2)s": "%(user1)s en %(user2)s",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s of %(copyButton)s",
     "%(securityKey)s or %(recoveryFile)s": "%(securityKey)s of %(recoveryFile)s",
@@ -3377,8 +3549,10 @@
     "Join %(brand)s calls": "Deelnemen aan %(brand)s gesprekken",
     "Start %(brand)s calls": "%(brand)s oproepen starten",
     "Voice broadcasts": "Spraakuitzendingen",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Weet u zeker dat u zich wilt afmelden bij %(count)s sessies?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Weet u zeker dat u zich wilt afmelden bij %(count)s sessies?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Weet u zeker dat u zich wilt afmelden bij %(count)s sessies?",
+        "other": "Weet u zeker dat u zich wilt afmelden bij %(count)s sessies?"
+    },
     "Enable notifications for this device": "Meldingen inschakelen voor dit apparaat",
     "Turn off to disable notifications on all your devices and sessions": "Schakel dit uit om meldingen op al je apparaten en sessies uit te schakelen",
     "Enable notifications for this account": "Meldingen inschakelen voor dit account",
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index a7a63a3ebb..91818aa4e5 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -161,8 +161,10 @@
     "Unmute": "Fjern demping",
     "Mute": "Demp",
     "Admin Tools": "Administratorverktøy",
-    "and %(count)s others...|other": "og %(count)s andre...",
-    "and %(count)s others...|one": "og ein annan...",
+    "and %(count)s others...": {
+        "other": "og %(count)s andre...",
+        "one": "og ein annan..."
+    },
     "Invited": "Invitert",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tilgangsnivå %(powerLevelNumber)s)",
     "Attachment": "Vedlegg",
@@ -190,8 +192,10 @@
     "Replying": "Svarar",
     "Unnamed room": "Rom utan namn",
     "Save": "Lagra",
-    "(~%(count)s results)|other": "(~%(count)s resultat)",
-    "(~%(count)s results)|one": "(~%(count)s resultat)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s resultat)",
+        "one": "(~%(count)s resultat)"
+    },
     "Join Room": "Bli med i rom",
     "Upload avatar": "Last avatar opp",
     "Settings": "Innstillingar",
@@ -283,54 +287,98 @@
     "Create new room": "Lag nytt rom",
     "No results": "Ingen resultat",
     "Home": "Heim",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s har kome inn %(count)s gonger",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s kom inn",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s har kome inn %(count)s gonger",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s kom inn",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s har fare %(count)s gonger",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s fór",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s har fare %(count)s gonger",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s fór",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s har kome inn og fare att %(count)s gonger",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s kom inn og fór",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s har kome inn og fare att %(count)s gonger",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s kom inn og fór",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s har fare og kome inn att %(count)s gonger",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s fór og kom inn att",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s har fare og kome inn att %(count)s gonger",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s fór og kom inn att",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s sa nei til innbydingane %(count)s gonger",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s sa nei til innbydingane",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s sa nei til innbydinga %(count)s gonger",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s sa nei til innbydinga",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s fekk innbydingane sine attekne %(count)s gonger",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s fekk innbydinga si attteke",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s fekk innbydinga si atteke %(count)s gonger",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s fekk innbydinga si atteke",
-    "were invited %(count)s times|other": "vart boden inn %(count)s gonger",
-    "were invited %(count)s times|one": "vart boden inn",
-    "was invited %(count)s times|other": "vart boden inn %(count)s gonger",
-    "was invited %(count)s times|one": "vart boden inn",
-    "were banned %(count)s times|other": "har vore stengd ute %(count)s gonger",
-    "were banned %(count)s times|one": "vart stengd ute",
-    "was banned %(count)s times|other": "har vore stengd ute %(count)s gonger",
-    "was banned %(count)s times|one": "vart stengd ute",
-    "were unbanned %(count)s times|other": "har vorta sloppe inn att %(count)s gonger",
-    "were unbanned %(count)s times|one": "vart sloppe inn att",
-    "was unbanned %(count)s times|other": "har vorte sloppe inn att %(count)s gonger",
-    "was unbanned %(count)s times|one": "vart sloppe inn att",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s har endra namna sine %(count)s gonger",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s endra namna sine",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s har endra namnet sitt %(count)s gonger",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s endra namnet sitt",
-    "%(items)s and %(count)s others|other": "%(items)s og %(count)s til",
-    "%(items)s and %(count)s others|one": "%(items)s og ein til",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s har kome inn %(count)s gonger",
+        "one": "%(severalUsers)s kom inn"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s har kome inn %(count)s gonger",
+        "one": "%(oneUser)s kom inn"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s har fare %(count)s gonger",
+        "one": "%(severalUsers)s fór"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s har fare %(count)s gonger",
+        "one": "%(oneUser)s fór"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s har kome inn og fare att %(count)s gonger",
+        "one": "%(severalUsers)s kom inn og fór"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s har kome inn og fare att %(count)s gonger",
+        "one": "%(oneUser)s kom inn og fór"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s har fare og kome inn att %(count)s gonger",
+        "one": "%(severalUsers)s fór og kom inn att"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s har fare og kome inn att %(count)s gonger",
+        "one": "%(oneUser)s fór og kom inn att"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s sa nei til innbydingane %(count)s gonger",
+        "one": "%(severalUsers)s sa nei til innbydingane"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s sa nei til innbydinga %(count)s gonger",
+        "one": "%(oneUser)s sa nei til innbydinga"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s fekk innbydingane sine attekne %(count)s gonger",
+        "one": "%(severalUsers)s fekk innbydinga si attteke"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s fekk innbydinga si atteke %(count)s gonger",
+        "one": "%(oneUser)s fekk innbydinga si atteke"
+    },
+    "were invited %(count)s times": {
+        "other": "vart boden inn %(count)s gonger",
+        "one": "vart boden inn"
+    },
+    "was invited %(count)s times": {
+        "other": "vart boden inn %(count)s gonger",
+        "one": "vart boden inn"
+    },
+    "were banned %(count)s times": {
+        "other": "har vore stengd ute %(count)s gonger",
+        "one": "vart stengd ute"
+    },
+    "was banned %(count)s times": {
+        "other": "har vore stengd ute %(count)s gonger",
+        "one": "vart stengd ute"
+    },
+    "were unbanned %(count)s times": {
+        "other": "har vorta sloppe inn att %(count)s gonger",
+        "one": "vart sloppe inn att"
+    },
+    "was unbanned %(count)s times": {
+        "other": "har vorte sloppe inn att %(count)s gonger",
+        "one": "vart sloppe inn att"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s har endra namna sine %(count)s gonger",
+        "one": "%(severalUsers)s endra namna sine"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s har endra namnet sitt %(count)s gonger",
+        "one": "%(oneUser)s endra namnet sitt"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s og %(count)s til",
+        "one": "%(items)s og ein til"
+    },
     "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
     "collapse": "Slå saman",
     "expand": "Utvid",
     "<a>In reply to</a> <pill>": "<a>Som svar til</a> <pill>",
     "Start chat": "Start samtale",
-    "And %(count)s more...|other": "Og %(count)s til...",
+    "And %(count)s more...": {
+        "other": "Og %(count)s til..."
+    },
     "Preparing to send logs": "Førebur loggsending",
     "Logs sent": "Loggar sende",
     "Thank you!": "Takk skal du ha!",
@@ -417,9 +465,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Prøvde å laste eit bestemt punkt i rommet sin historikk, men du har ikkje lov til å sjå den spesifike meldingen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Prøvde å lasta eit bestemt punkt i rommet sin historikk, men klarde ikkje å finna det.",
     "Failed to load timeline position": "Innlasting av punkt i historikken feila.",
-    "Uploading %(filename)s and %(count)s others|other": "Lastar opp %(filename)s og %(count)s andre",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Lastar opp %(filename)s og %(count)s andre",
+        "one": "Lastar opp %(filename)s og %(count)s andre"
+    },
     "Uploading %(filename)s": "Lastar opp %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Lastar opp %(filename)s og %(count)s andre",
     "Success": "Suksess",
     "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
     "<not supported>": "<ikkje støtta>",
@@ -498,8 +548,10 @@
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Meldinga di vart ikkje send, for denne heimetenaren har nådd grensa for maksimalt aktive brukarar pr. månad. Kontakt <a>systemadministratoren</a> for å vidare nytte denne tenesta.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Denne meldingen vart ikkje send fordi heimetenaren har nådd grensa for tilgjengelege systemressursar. Kontakt <a>systemadministratoren</a> for å vidare nytta denne tenesta.",
     "Add room": "Legg til rom",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Du har %(count)s uleste varslingar i ein tidligare versjon av dette rommet.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Du har %(count)s ulest varsel i ein tidligare versjon av dette rommet.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Du har %(count)s uleste varslingar i ein tidligare versjon av dette rommet.",
+        "one": "Du har %(count)s ulest varsel i ein tidligare versjon av dette rommet."
+    },
     "Guest": "Gjest",
     "Could not load user profile": "Klarde ikkje å laste brukarprofilen",
     "Your password has been reset.": "Passodet ditt vart nullstilt.",
@@ -629,8 +681,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Prøv å rulle oppover i historikken for å sjå om det finst nokon eldre.",
     "Remove recent messages by %(user)s": "Fjern nyare meldingar frå %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Ved store mengder meldingar kan dette ta tid. Ver venleg å ikkje last om klienten din mens dette pågår.",
-    "Remove %(count)s messages|other": "Fjern %(count)s meldingar",
-    "Remove %(count)s messages|one": "Fjern 1 melding",
+    "Remove %(count)s messages": {
+        "other": "Fjern %(count)s meldingar",
+        "one": "Fjern 1 melding"
+    },
     "Deactivate user?": "Deaktivere brukar?",
     "Deactivate user": "Deaktiver brukar",
     "Failed to deactivate user": "Fekk ikkje til å deaktivere brukaren",
@@ -668,8 +722,10 @@
     "Reject & Ignore user": "Avslå og ignorer brukar",
     "You're previewing %(roomName)s. Want to join it?": "Du førehandsviser %(roomName)s. Ynskjer du å bli med ?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikkje førehandsvisast. Ynskjer du å bli med ?",
-    "%(count)s unread messages.|other": "%(count)s uleste meldingar.",
-    "%(count)s unread messages.|one": "1 ulesen melding.",
+    "%(count)s unread messages.": {
+        "other": "%(count)s uleste meldingar.",
+        "one": "1 ulesen melding."
+    },
     "Unread messages.": "Uleste meldingar.",
     "Unknown Command": "Ukjend kommando",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Du kan bruka <code>/help</code> for å lista tilgjengelege kommandoar. Meinte du å senda dette som ein melding ?",
@@ -745,8 +801,10 @@
     "Collapse room list section": "Minimer romkatalog-seksjonen",
     "Expand room list section": "Utvid romkatalog-seksjonen",
     "%(displayName)s is typing …": "%(displayName)s skriv…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s andre skriv…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s og ein annan skriv…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s og %(count)s andre skriv…",
+        "one": "%(names)s og ein annan skriv…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s skriv…",
     "Enable Emoji suggestions while typing": "Aktiver Emoji-forslag under skriving",
     "Show a placeholder for removed messages": "Vis ein plassholdar for sletta meldingar",
@@ -815,10 +873,14 @@
     "Opens chat with the given user": "Opna ein samtale med den spesifiserte brukaren",
     "Sends a message to the given user": "Send ein melding til den spesifiserte brukaren",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s endra romnamnet frå %(oldRoomName)s til %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s la til dei alternative adressene %(addresses)s for dette rommet.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s la til ei alternativ adresse %(addresses)s for dette rommet.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tok vekk dei alternative adressene %(addresses)s for dette rommet.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tok vekk den alternative adressa %(addresses)s for dette rommet.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s la til dei alternative adressene %(addresses)s for dette rommet.",
+        "one": "%(senderName)s la til ei alternativ adresse %(addresses)s for dette rommet."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s tok vekk dei alternative adressene %(addresses)s for dette rommet.",
+        "one": "%(senderName)s tok vekk den alternative adressa %(addresses)s for dette rommet."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s endre den alternative adressa for dette rommet.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s endra hovud- og alternativ-adressene for dette rommet.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s endre adressene for dette rommet.",
@@ -986,9 +1048,15 @@
     "Deactivate account": "Avliv brukarkontoen",
     "Enter a new identity server": "Skriv inn ein ny identitetstenar",
     "Rename": "Endra namn",
-    "Click the button below to confirm signing out these devices.|one": "Trykk på knappen under for å stadfesta utlogging frå denne eininga.",
-    "Confirm signing out these devices|one": "Stadfest utlogging frå denne eininga",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Stadfest utlogging av denne eininga ved å nytta Single-sign-on for å bevise identiteten din.",
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Trykk på knappen under for å stadfesta utlogging frå denne eininga."
+    },
+    "Confirm signing out these devices": {
+        "one": "Stadfest utlogging frå denne eininga"
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Stadfest utlogging av denne eininga ved å nytta Single-sign-on for å bevise identiteten din."
+    },
     "Verify this device by confirming the following number appears on its screen.": "Verifiser denne eininga ved å stadfeste det følgjande talet når det kjem til syne på skjermen.",
     "Quick settings": "Hurtigval",
     "More options": "Fleire val",
@@ -998,8 +1066,10 @@
     "Room settings": "Rominnstillingar",
     "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)s endra kven som kan bli med i rommet. <a>Vis innstillingar</a>.",
     "Join the conference from the room information card on the right": "Bli med i konferanse frå rominfo-kortet til høgre",
-    "Final result based on %(count)s votes|one": "Endeleg resultat basert etter %(count)s stemme",
-    "Final result based on %(count)s votes|other": "Endeleg resultat basert etter %(count)s stemmer",
+    "Final result based on %(count)s votes": {
+        "one": "Endeleg resultat basert etter %(count)s stemme",
+        "other": "Endeleg resultat basert etter %(count)s stemmer"
+    },
     "Failed to transfer call": "Overføring av samtalen feila",
     "Transfer Failed": "Overføring feila",
     "Unable to transfer call": "Fekk ikkje til å overføra samtalen",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index dcc92206be..41aa6d4714 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -80,8 +80,10 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Czy na pewno chcesz opuścić pokój '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Czy na pewno chcesz odrzucić zaproszenie?",
     "Bans user with given id": "Blokuje użytkownika o podanym ID",
-    "and %(count)s others...|other": "i %(count)s innych...",
-    "and %(count)s others...|one": "i jeden inny...",
+    "and %(count)s others...": {
+        "other": "i %(count)s innych...",
+        "one": "i jeden inny..."
+    },
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nie można nawiązać połączenia z serwerem - proszę sprawdź twoje połączenie, upewnij się, że <a>certyfikat SSL serwera</a> jest zaufany, i że dodatki przeglądarki nie blokują żądania.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nie można nawiązać połączenia z serwerem przy użyciu HTTP podczas korzystania z HTTPS dla bieżącej strony. Użyj HTTPS lub <a>włącz niebezpieczne skrypty</a>.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmienił poziom uprawnień %(powerLevelDiffText)s.",
@@ -217,8 +219,10 @@
     "Unmute": "Wyłącz wyciszenie",
     "Unnamed Room": "Pokój bez nazwy",
     "Uploading %(filename)s": "Przesyłanie %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Przesyłanie %(filename)s oraz %(count)s innych",
-    "Uploading %(filename)s and %(count)s others|other": "Przesyłanie %(filename)s oraz %(count)s innych",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Przesyłanie %(filename)s oraz %(count)s innych",
+        "other": "Przesyłanie %(filename)s oraz %(count)s innych"
+    },
     "Upload avatar": "Prześlij awatar",
     "Upload Failed": "Błąd przesyłania",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (moc uprawnień administratorskich %(powerLevelNumber)s)",
@@ -248,8 +252,10 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Sent messages will be stored until your connection has returned.": "Wysłane wiadomości będą przechowywane aż do momentu odzyskania połączenia.",
-    "(~%(count)s results)|one": "(~%(count)s wynik)",
-    "(~%(count)s results)|other": "(~%(count)s wyników)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s wynik)",
+        "other": "(~%(count)s wyników)"
+    },
     "Start automatically after system login": "Uruchom automatycznie po zalogowaniu się do systemu",
     "Analytics": "Analityka",
     "Passphrases must match": "Hasła szyfrujące muszą być identyczne",
@@ -431,10 +437,18 @@
     "Demote yourself?": "Zdegradować siebie?",
     "Demote": "Degraduj",
     "Call Failed": "Nieudane połączenie",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sdołączyło",
-    "was invited %(count)s times|other": "został zaproszony %(count)s razy",
-    "was invited %(count)s times|one": "został zaproszony",
-    "was banned %(count)s times|one": "został zbanowany",
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)sdołączyło",
+        "other": "%(severalUsers)s dołączyło %(count)s razy"
+    },
+    "was invited %(count)s times": {
+        "other": "został zaproszony %(count)s razy",
+        "one": "został zaproszony"
+    },
+    "was banned %(count)s times": {
+        "one": "został zbanowany",
+        "other": "został zbanowany %(count)s razy"
+    },
     "Permission Required": "Wymagane Uprawnienia",
     "You do not have permission to start a conference call in this room": "Nie posiadasz uprawnień do rozpoczęcia rozmowy grupowej w tym pokoju",
     "Unignored user": "Nieignorowany użytkownik",
@@ -455,18 +469,27 @@
     "Stickerpack": "Pakiet naklejek",
     "This room is a continuation of another conversation.": "Ten pokój jest kontynuacją innej rozmowy.",
     "Click here to see older messages.": "Kliknij tutaj, aby zobaczyć starsze wiadomości.",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s dołączyło %(count)s razy",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s dołączył %(count)s razy",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s dołączył",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s wyszło",
-    "were invited %(count)s times|one": "zostało zaproszonych",
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s dołączył %(count)s razy",
+        "one": "%(oneUser)s dołączył"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)s wyszło",
+        "other": "%(severalUsers)swyszło %(count)s razy"
+    },
+    "were invited %(count)s times": {
+        "one": "zostało zaproszonych",
+        "other": "zostało zaproszonych %(count)s razy"
+    },
     "Updating %(brand)s": "Aktualizowanie %(brand)s",
     "Please <a>contact your service administrator</a> to continue using this service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji.",
     "Only room administrators will see this warning": "Tylko administratorzy pokojów widzą to ostrzeżenie",
     "Clear cache and resync": "Wyczyść pamięć podręczną i zsynchronizuj ponownie",
     "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s używa teraz 3-5x mniej pamięci, ładując informacje o innych użytkownikach tylko wtedy, gdy jest to konieczne. Poczekaj, aż ponownie zsynchronizujemy się z serwerem!",
     "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Jeśli inna wersja %(brand)s jest nadal otwarta w innej zakładce, proszę zamknij ją, ponieważ używanie %(brand)s na tym samym komputerze z włączonym i wyłączonym jednocześnie leniwym ładowaniem będzie powodować problemy.",
-    "And %(count)s more...|other": "I %(count)s więcej…",
+    "And %(count)s more...": {
+        "other": "I %(count)s więcej…"
+    },
     "Delete Backup": "Usuń kopię zapasową",
     "Unable to load! Check your network connectivity and try again.": "Nie można załadować! Sprawdź połączenie sieciowe i spróbuj ponownie.",
     "Use a few words, avoid common phrases": "Użyj kilku słów, unikaj typowych zwrotów",
@@ -489,36 +512,60 @@
     "Common names and surnames are easy to guess": "Popularne imiona i nazwiska są łatwe do odgadnięcia",
     "You do not have permission to invite people to this room.": "Nie masz uprawnień do zapraszania ludzi do tego pokoju.",
     "Unknown server error": "Nieznany błąd serwera",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s wyszedł",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s dołączył i wyszedł %(count)s razy",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s dołączył i wyszedł",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)swyszło %(count)s razy",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sopuścił %(count)s razy",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s dołączyło i wyszło",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s dołączyło i wyszło %(count)s razy",
-    "were invited %(count)s times|other": "zostało zaproszonych %(count)s razy",
-    "were banned %(count)s times|one": "zostało zbanowanych",
-    "were banned %(count)s times|other": "zostało zbanowanych %(count)s razy",
-    "was banned %(count)s times|other": "został zbanowany %(count)s razy",
-    "%(items)s and %(count)s others|other": "%(items)s i %(count)s innych",
-    "%(items)s and %(count)s others|one": "%(items)s i jedna inna osoba",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)szmienił swoją nazwę",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)szmienił swoją nazwę %(count)s razy",
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)s wyszedł",
+        "other": "%(oneUser)sopuścił %(count)s razy"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s dołączył i wyszedł %(count)s razy",
+        "one": "%(oneUser)s dołączył i wyszedł"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)s dołączyło i wyszło",
+        "other": "%(severalUsers)s dołączyło i wyszło %(count)s razy"
+    },
+    "were banned %(count)s times": {
+        "one": "zostało zbanowanych",
+        "other": "zostało zbanowanych %(count)s razy"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s i %(count)s innych",
+        "one": "%(items)s i jedna inna osoba"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)szmienił swoją nazwę",
+        "other": "%(oneUser)szmienił swoją nazwę %(count)s razy"
+    },
     "Add some now": "Dodaj teraz kilka",
     "Please review and accept all of the homeserver's policies": "Przeczytaj i zaakceptuj wszystkie zasady dotyczące serwera domowego",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)swyszło i dołączyło ponownie %(count)s razy",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)swyszło i dołączyło ponownie",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s wyszedł i dołączył ponownie %(count)s razy",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s wyszedł i dołączył ponownie",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sodrzucił ich zaproszenie %(count)s razy",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sodrzucił ich zaproszenie",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sodrzuciło ich zaproszenia",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)swycofał zaproszenie %(count)s razy",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)swycofał zaproszenie",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)swycofało zaproszenie %(count)s razy",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)swycofało zaproszenie",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)szmieniło ich nazwę %(count)s razy",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)szmieniło ich nazwę",
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)swyszło i dołączyło ponownie %(count)s razy",
+        "one": "%(severalUsers)swyszło i dołączyło ponownie"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s wyszedł i dołączył ponownie %(count)s razy",
+        "one": "%(oneUser)s wyszedł i dołączył ponownie"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)sodrzucił ich zaproszenie %(count)s razy",
+        "one": "%(oneUser)sodrzucił ich zaproszenie"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)sodrzuciło ich zaproszenia",
+        "other": "%(severalUsers)sodrzuciło ich zaproszenia %(count)s razy"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)swycofał zaproszenie %(count)s razy",
+        "one": "%(oneUser)swycofał zaproszenie"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)swycofało zaproszenie %(count)s razy",
+        "one": "%(severalUsers)swycofało zaproszenie"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)szmieniło ich nazwę %(count)s razy",
+        "one": "%(severalUsers)szmieniło ich nazwę"
+    },
     "Continue With Encryption Disabled": "Kontynuuj Z Wyłączonym Szyfrowaniem",
     "Capitalization doesn't help very much": "Kapitalizacja nie pomaga bardzo",
     "This is a top-10 common password": "To jest 10 najpopularniejszych haseł",
@@ -529,10 +576,14 @@
     "Next": "Dalej",
     "No backup found!": "Nie znaleziono kopii zapasowej!",
     "Create a new room with the same name, description and avatar": "Utwórz nowy pokój o tej samej nazwie, opisie i awatarze",
-    "was unbanned %(count)s times|one": "został odbanowany",
-    "were unbanned %(count)s times|one": "zostali odbanowani",
-    "was unbanned %(count)s times|other": "został odbanowany %(count)s razy",
-    "were unbanned %(count)s times|other": "zostali odbanowani %(count)s razy",
+    "was unbanned %(count)s times": {
+        "one": "został odbanowany",
+        "other": "został odbanowany %(count)s razy"
+    },
+    "were unbanned %(count)s times": {
+        "one": "zostali odbanowani",
+        "other": "zostali odbanowani %(count)s razy"
+    },
     "Please review and accept the policies of this homeserver:": "Przeczytaj i zaakceptuj zasady tego serwera domowego:",
     "Messages containing @room": "Wiadomości zawierające @room",
     "This is similar to a commonly used password": "Jest to podobne do powszechnie stosowanego hasła",
@@ -540,7 +591,10 @@
     "Go to Settings": "Przejdź do ustawień",
     "%(displayName)s is typing …": "%(displayName)s pisze…",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s i %(lastPerson)s piszą…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s i %(count)s innych piszą…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s i %(count)s innych piszą…",
+        "one": "%(names)s i jedna osoba pisze…"
+    },
     "Unrecognised address": "Nierozpoznany adres",
     "Short keyboard patterns are easy to guess": "Krótkie wzory klawiszowe są łatwe do odgadnięcia",
     "Enable Emoji suggestions while typing": "Włącz podpowiedzi Emoji podczas pisania",
@@ -696,7 +750,6 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s zabronił gościom dołączać do pokoju.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s zmienił dostęp dla gości dla %(rule)s",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odwołał zaproszenie dla %(targetDisplayName)s, aby dołączył do pokoju.",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s i jedna osoba pisze…",
     "Cannot reach homeserver": "Błąd połączenia z serwerem domowym",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Upewnij się, że posiadasz stabilne połączenie internetowe lub skontaktuj się z administratorem serwera",
     "Your %(brand)s is misconfigured": "Twój %(brand)s jest źle skonfigurowany",
@@ -817,19 +870,27 @@
     "Do you want to join %(roomName)s?": "Czy chcesz dołączyć do %(roomName)s?",
     "<userName/> invited you": "<userName/> zaprosił Cię",
     "You're previewing %(roomName)s. Want to join it?": "Przeglądasz %(roomName)s. Czy chcesz dołączyć do pokoju?",
-    "%(count)s unread messages including mentions.|other": "%(count)s nieprzeczytanych wiadomości, wliczając wzmianki.",
-    "%(count)s unread messages including mentions.|one": "1 nieprzeczytana wzmianka.",
-    "%(count)s unread messages.|other": "%(count)s nieprzeczytanych wiadomości.",
-    "%(count)s unread messages.|one": "1 nieprzeczytana wiadomość.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s nieprzeczytanych wiadomości, wliczając wzmianki.",
+        "one": "1 nieprzeczytana wzmianka."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s nieprzeczytanych wiadomości.",
+        "one": "1 nieprzeczytana wiadomość."
+    },
     "Unread messages.": "Nieprzeczytane wiadomości.",
     "Join": "Dołącz",
     "%(creator)s created and configured the room.": "%(creator)s stworzył i skonfigurował pokój.",
     "View": "Wyświetl",
     "Missing media permissions, click the button below to request.": "Brakuje uprawnień do mediów, kliknij przycisk poniżej, aby o nie zapytać.",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)snie wykonało zmian %(count)s razy",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)snie wykonało zmian",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)snie wykonał zmian %(count)s razy",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snie wykonał zmian",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)snie wykonało zmian %(count)s razy",
+        "one": "%(severalUsers)snie wykonało zmian"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)snie wykonał zmian %(count)s razy",
+        "one": "%(oneUser)snie wykonał zmian"
+    },
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nie zdołano wczytać zdarzenia, na które odpowiedziano, może ono nie istnieć lub nie masz uprawnienia, by je zobaczyć.",
     "e.g. my-room": "np. mój-pokój",
     "Some characters not allowed": "Niektóre znaki niedozwolone",
@@ -934,11 +995,15 @@
     "Disable": "Wyłącz",
     "Verify": "Weryfikuj",
     "Manage integrations": "Zarządzaj integracjami",
-    "%(count)s verified sessions|other": "%(count)s zweryfikowanych sesji",
-    "%(count)s verified sessions|one": "1 zweryfikowana sesja",
+    "%(count)s verified sessions": {
+        "other": "%(count)s zweryfikowanych sesji",
+        "one": "1 zweryfikowana sesja"
+    },
     "Hide verified sessions": "Ukryj zweryfikowane sesje",
-    "%(count)s sessions|other": "%(count)s sesji",
-    "%(count)s sessions|one": "%(count)s sesja",
+    "%(count)s sessions": {
+        "other": "%(count)s sesji",
+        "one": "%(count)s sesja"
+    },
     "Hide sessions": "Ukryj sesje",
     "Security": "Bezpieczeństwo",
     "Integrations are disabled": "Integracje są wyłączone",
@@ -966,8 +1031,10 @@
     "Verify this session": "Zweryfikuj tę sesję",
     "%(name)s is requesting verification": "%(name)s prosi o weryfikację",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s zmienił nazwę pokoju z %(oldRoomName)s na %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s dodał alternatywne adresy %(addresses)s dla tego pokoju.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s dodał alternatywny adres %(addresses)s dla tego pokoju.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s dodał alternatywne adresy %(addresses)s dla tego pokoju.",
+        "one": "%(senderName)s dodał alternatywny adres %(addresses)s dla tego pokoju."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s zmienił alternatywne adresy dla tego pokoju.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s zmienił główne i alternatywne adresy dla tego pokoju.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s zmienił adresy dla tego pokoju.",
@@ -991,8 +1058,10 @@
     "Upload completed": "Przesyłanie zakończone",
     "Message edits": "Edycje wiadomości",
     "Terms of Service": "Warunki użytkowania",
-    "Upload %(count)s other files|other": "Prześlij %(count)s innych plików",
-    "Upload %(count)s other files|one": "Prześlij %(count)s inny plik",
+    "Upload %(count)s other files": {
+        "other": "Prześlij %(count)s innych plików",
+        "one": "Prześlij %(count)s inny plik"
+    },
     "Send a Direct Message": "Wyślij wiadomość prywatną",
     "Explore Public Rooms": "Przeglądaj pokoje publiczne",
     "Create a Group Chat": "Utwórz czat grupowy",
@@ -1038,8 +1107,10 @@
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Możesz użyć <code>/help</code> aby wyświetlić listę dostępnych poleceń. Czy chciałeś wysłać to jako wiadomość?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Wskazówka: Rozpocznij swoją wiadomość od <code>//</code>, aby rozpocząć ją ukośnikiem.",
     "Send as message": "Wyślij jako wiadomość",
-    "Remove %(count)s messages|other": "Usuń %(count)s wiadomości",
-    "Remove %(count)s messages|one": "Usuń 1 wiadomość",
+    "Remove %(count)s messages": {
+        "other": "Usuń %(count)s wiadomości",
+        "one": "Usuń 1 wiadomość"
+    },
     "Switch to light mode": "Przełącz na tryb jasny",
     "Switch to dark mode": "Przełącz na tryb ciemny",
     "Switch theme": "Przełącz motyw",
@@ -1105,8 +1176,10 @@
     "Block anyone not part of %(serverName)s from ever joining this room.": "Zablokuj wszystkich niebędących użytkownikami %(serverName)s w tym pokoju.",
     "Start a conversation with someone using their name or username (like <userId/>).": "Rozpocznij konwersację z innymi korzystając z ich nazwy lub nazwy użytkownika (np. <userId/>).",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Rozpocznij konwersację z innymi korzystając z ich nazwy, adresu e-mail lub nazwy użytkownika (np. <userId/>).",
-    "Show %(count)s more|one": "Pokaż %(count)s więcej",
-    "Show %(count)s more|other": "Pokaż %(count)s więcej",
+    "Show %(count)s more": {
+        "one": "Pokaż %(count)s więcej",
+        "other": "Pokaż %(count)s więcej"
+    },
     "Room options": "Ustawienia pokoju",
     "Manually verify all remote sessions": "Ręcznie weryfikuj wszystkie zdalne sesje",
     "Privacy": "Prywatność",
@@ -1454,8 +1527,10 @@
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s usunął regułę banującą serwery pasujące do wzorca %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s usunął regułę banującą pokoje pasujące do wzorca %(glob)s",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s usunął regułę banującą użytkowników pasujących do wzorca %(glob)s",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s usunął alternatywny adres %(addresses)s tego pokoju.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s usunął alternatywny adres %(addresses)s tego pokoju.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s usunął alternatywny adres %(addresses)s tego pokoju.",
+        "other": "%(senderName)s usunął alternatywny adres %(addresses)s tego pokoju."
+    },
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Wszystkie serwery zostały wykluczone z uczestnictwa! Ten pokój nie może być już używany.",
     "Effects": "Efekty",
     "Japan": "Japonia",
@@ -1676,10 +1751,14 @@
     "Retry all": "Spróbuj ponownie wszystkie",
     "Suggested": "Polecany",
     "This room is suggested as a good one to join": "Ten pokój jest polecany jako dobry do dołączenia",
-    "%(count)s rooms|one": "%(count)s pokój",
-    "%(count)s rooms|other": "%(count)s pokojów",
-    "%(count)s members|one": "%(count)s członek",
-    "%(count)s members|other": "%(count)s członkowie",
+    "%(count)s rooms": {
+        "one": "%(count)s pokój",
+        "other": "%(count)s pokojów"
+    },
+    "%(count)s members": {
+        "one": "%(count)s członek",
+        "other": "%(count)s członkowie"
+    },
     "You don't have permission": "Nie masz uprawnień",
     "Failed to remove some rooms. Try again later": "Nie udało się usunąć niektórych pokojów. Spróbuj ponownie później",
     "Select a room below first": "Najpierw wybierz poniższy pokój",
@@ -1741,8 +1820,10 @@
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Dodaje (╯°□°）╯︵ ┻━┻ na początku wiadomości tekstowej",
     "Command error: Unable to find rendering type (%(renderingType)s)": "Błąd polecenia: Nie można znaleźć renderowania typu (%(renderingType)s)",
     "Command error: Unable to handle slash command.": "Błąd polecenia: Nie można obsłużyć polecenia z ukośnikiem.",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s i %(count)s pozostała",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s i %(count)s pozostałych",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s i %(count)s pozostała",
+        "other": "%(spaceName)s i %(count)s pozostałych"
+    },
     "You cannot place calls without a connection to the server.": "Nie możesz wykonywać rozmów bez połączenia z serwerem.",
     "Connectivity to the server has been lost": "Połączenie z serwerem zostało przerwane",
     "You cannot place calls in this browser.": "Nie możesz wykonywać połączeń z tej przeglądarki.",
@@ -1786,11 +1867,15 @@
     "Stop": "Stop",
     "That's fine": "To jest w porządku",
     "File Attached": "Plik załączony",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Wyeksportowano %(count)s wydarzenie w %(seconds)s sekund",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Wyeksportowano %(count)s wydarzeń w %(seconds)s sekund",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Wyeksportowano %(count)s wydarzenie w %(seconds)s sekund",
+        "other": "Wyeksportowano %(count)s wydarzeń w %(seconds)s sekund"
+    },
     "Export successful!": "Eksport zakończony pomyślnie!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Pobrano %(count)s wydarzenie w %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "Pobrano %(count)s wydarzeń w %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Pobrano %(count)s wydarzenie w %(seconds)ss",
+        "other": "Pobrano %(count)s wydarzeń w %(seconds)ss"
+    },
     "Processing event %(number)s out of %(total)s": "Przetwarzanie wydarzenia %(number)s z %(total)s",
     "Error fetching file": "Wystąpił błąd przy pobieraniu pliku",
     "Topic: %(topic)s": "Temat: %(topic)s",
@@ -1804,10 +1889,14 @@
     "Plain Text": "Tekst",
     "JSON": "JSON",
     "HTML": "HTML",
-    "Fetched %(count)s events so far|one": "Pobrano %(count)s wydarzenie",
-    "Fetched %(count)s events so far|other": "Pobrano %(count)s wydarzeń",
-    "Fetched %(count)s events out of %(total)s|one": "Pobrano %(count)s wydarzenie z %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Pobrano %(count)s wydarzeń z %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Pobrano %(count)s wydarzenie",
+        "other": "Pobrano %(count)s wydarzeń"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Pobrano %(count)s wydarzenie z %(total)s",
+        "other": "Pobrano %(count)s wydarzeń z %(total)s"
+    },
     "Generating a ZIP": "Generowanie pliku ZIP",
     "Are you sure you want to exit during this export?": "Czy na pewno chcesz wyjść podczas tego eksportu?",
     "Share your public space": "Zaproś do swojej publicznej przestrzeni",
@@ -1886,8 +1975,10 @@
     "ready": "gotowy",
     "Disagree": "Nie zgadzam się",
     "Create a new room": "Utwórz nowy pokój",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Dodawanie pokojów... (%(progress)s z %(count)s)",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Dodawanie pokoju...",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "other": "Dodawanie pokojów... (%(progress)s z %(count)s)",
+        "one": "Dodawanie pokoju..."
+    },
     "Autoplay GIFs": "Auto odtwarzanie GIF'ów",
     "Let moderators hide messages pending moderation.": "Daj moderatorom ukrycie wiadomości które są sprawdzane.",
     "No virtual room for this room": "Brak wirtualnego pokoju dla tego pokoju",
@@ -1923,10 +2014,14 @@
     "Message bubbles": "Dymki wiadomości",
     "IRC (Experimental)": "IRC (eksperymentalny)",
     "Message layout": "Wygląd wiadomości",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Aktualizowanie przestrzeni...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Aktualizowanie przestrzeni... (%(progress)s z %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Wysyłanie zaproszenia...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Wysyłanie zaproszeń... (%(progress)s z %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Aktualizowanie przestrzeni...",
+        "other": "Aktualizowanie przestrzeni... (%(progress)s z %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Wysyłanie zaproszenia...",
+        "other": "Wysyłanie zaproszeń... (%(progress)s z %(count)s)"
+    },
     "Loading new room": "Wczytywanie nowego pokoju",
     "Upgrading room": "Aktualizowanie pokoju",
     "This upgrade will allow members of selected spaces access to this room without an invite.": "To ulepszenie pozwoli członkom wybranych przestrzeni uzyskać dostęp do tego pokoju bez zaproszenia.",
@@ -1936,10 +2031,14 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Każdy w <spaceName/> może znaleźć i dołączyć. Możesz też wybrać inne przestrzenie.",
     "Spaces with access": "Przestrzenie z dostępem",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Każdy w przestrzeni może znaleźć i dołączyć. <a>Kliknij tu, aby ustawić które przestrzenie mają dostęp.</a>",
-    "Currently, %(count)s spaces have access|one": "Obecnie jedna przestrzeń ma dostęp",
-    "Currently, %(count)s spaces have access|other": "Obecnie %(count)s przestrzeni ma dostęp",
-    "& %(count)s more|one": "i %(count)s więcej",
-    "& %(count)s more|other": "i %(count)s więcej",
+    "Currently, %(count)s spaces have access": {
+        "one": "Obecnie jedna przestrzeń ma dostęp",
+        "other": "Obecnie %(count)s przestrzeni ma dostęp"
+    },
+    "& %(count)s more": {
+        "one": "i %(count)s więcej",
+        "other": "i %(count)s więcej"
+    },
     "Upgrade required": "Aktualizacja wymagana",
     "Anyone can find and join.": "Każdy może znaleźć i dołączyć.",
     "Only invited people can join.": "Tylko zaproszeni ludzie mogą dołączyć.",
@@ -1979,7 +2078,10 @@
     "User is already invited to the room": "Użytkownik jest już zaproszony do tego pokoju",
     "User is already invited to the space": "Użytkownik jest już zaproszony do tej przestrzeni",
     "You do not have permission to invite people to this space.": "Nie masz uprawnień, by zapraszać ludzi do tej przestrzeni.",
-    "In %(spaceName)s and %(count)s other spaces.|one": "W %(spaceName)s i %(count)s innej przestrzeni.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "W %(spaceName)s i %(count)s innej przestrzeni.",
+        "other": "W %(spaceName)s i %(count)s innych przestrzeniach."
+    },
     "In %(spaceName)s.": "W przestrzeni %(spaceName)s.",
     "In spaces %(space1Name)s and %(space2Name)s.": "W przestrzeniach %(space1Name)s i %(space2Name)s.",
     "Jump to the given date in the timeline": "Przeskocz do podanej daty w linii czasu",
@@ -1989,14 +2091,17 @@
     "Mapbox logo": "Logo Mapbox",
     "Map feedback": "Opinia o mapie",
     "Empty room (was %(oldName)s)": "Pusty pokój (poprzednio %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Zapraszanie %(user)s i 1 więcej",
-    "Inviting %(user)s and %(count)s others|other": "Zapraszanie %(user)s i %(count)s innych",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Zapraszanie %(user)s i 1 więcej",
+        "other": "Zapraszanie %(user)s i %(count)s innych"
+    },
     "Inviting %(user1)s and %(user2)s": "Zapraszanie %(user1)s i %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s i 1 inny",
-    "%(user)s and %(count)s others|other": "%(user)s i %(count)s innych",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s i 1 inny",
+        "other": "%(user)s i %(count)s innych"
+    },
     "%(user1)s and %(user2)s": "%(user1)s i %(user2)s",
     "%(value)sd": "%(value)sd",
-    "In %(spaceName)s and %(count)s other spaces.|other": "W %(spaceName)s i %(count)s innych przestrzeniach.",
     "Video rooms are always-on VoIP channels embedded within a room in %(brand)s.": "Pokoje wideo są stale dostępnymi kanałami VoIP osadzonymi w pokoju w %(brand)s.",
     "Send your first message to invite <displayName/> to chat": "Wyślij pierwszą wiadomość, aby zaprosić <displayName/> do rozmowy",
     "Spell check": "Sprawdzanie pisowni",
@@ -2086,8 +2191,10 @@
     "Quick settings": "Szybkie ustawienia",
     "Complete these to get the most out of %(brand)s": "Wykonaj je, aby jak najlepiej wykorzystać %(brand)s",
     "You did it!": "Udało ci się!",
-    "Only %(count)s steps to go|one": "Jeszcze tylko %(count)s krok",
-    "Only %(count)s steps to go|other": "Jeszcze tylko %(count)s kroki",
+    "Only %(count)s steps to go": {
+        "one": "Jeszcze tylko %(count)s krok",
+        "other": "Jeszcze tylko %(count)s kroki"
+    },
     "Welcome to %(brand)s": "Witaj w %(brand)s",
     "Find your people": "Znajdź swoich ludzi",
     "Find your co-workers": "Znajdź swoich współpracowników",
@@ -2126,8 +2233,10 @@
     "Unmute microphone": "Wyłącz wyciszenie mikrofonu",
     "Mute microphone": "Wycisz mikrofon",
     "Audio devices": "Urządzenia audio",
-    "%(count)s people joined|one": "%(count)s osoba dołączyła",
-    "%(count)s people joined|other": "%(count)s osób dołączyło",
+    "%(count)s people joined": {
+        "one": "%(count)s osoba dołączyła",
+        "other": "%(count)s osób dołączyło"
+    },
     "sends hearts": "wysyła serduszka",
     "Sends the given message with hearts": "Wysyła podaną wiadomość z serduszkami",
     "sends space invaders": "wysyła kosmicznych najeźdźców",
@@ -2218,8 +2327,10 @@
     "Join public room": "Dołącz do publicznego pokoju",
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Dzienniki debugowania zawierają dane o korzystaniu z aplikacji, w tym nazwę użytkownika, identyfikatory lub aliasy odwiedzonych pokoi, elementy interfejsu użytkownika, z którymi ostatnio wchodziłeś w interakcje oraz nazwy innych użytkowników. Nie zawierają treści wiadomości.",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Jeśli zgłosiłeś błąd za pomocą serwisu GitHub, dzienniki debugowania mogą pomóc nam w namierzeniu problemu. ",
-    "Seen by %(count)s people|one": "Odczytane przez %(count)s osobę",
-    "Seen by %(count)s people|other": "Odczytane przez %(count)s osób",
+    "Seen by %(count)s people": {
+        "one": "Odczytane przez %(count)s osobę",
+        "other": "Odczytane przez %(count)s osób"
+    },
     "New room": "Nowy pokój",
     "Group all your rooms that aren't part of a space in one place.": "Pogrupuj wszystkie pokoje, które nie są częścią przestrzeni, w jednym miejscu.",
     "Show all your rooms in Home, even if they're in a space.": "Pokaż wszystkie swoje pokoje na głównej, nawet jeśli znajdują się w przestrzeni.",
@@ -2486,8 +2597,10 @@
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s nie jest w stanie bezpiecznie przechowywać wiadomości szyfrowanych lokalnie, gdy działa w przeglądarce. Użyj <desktopLink> Desktop</desktopLink>, aby wiadomości pojawiły się w wynikach wyszukiwania.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s brakuje niektórych komponentów wymaganych do bezpiecznego przechowywania wiadomości szyfrowanych lokalnie. Jeśli chcesz eksperymentować z tą funkcją, zbuduj własny %(brand)s Desktop z <nativeLink> dodanymi komponentami wyszukiwania</nativeLink>.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Bezpiecznie przechowuj lokalnie wiadomości szyfrowane, aby mogły się wyświetlać w wynikach wyszukiwania.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Bezpiecznie przechowuj lokalnie wiadomości szyfrowane, aby mogły się wyświetlać w wynikach wyszukiwania. Zostanie użyte %(size)s do przechowywania wiadomości z %(rooms)s pokoju.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Bezpiecznie przechowuj lokalnie wiadomości szyfrowane, aby mogły się wyświetlać w wynikach wyszukiwania. Zostanie użyte %(size)s do przechowywania wiadomości z %(rooms)s pokoi.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Bezpiecznie przechowuj lokalnie wiadomości szyfrowane, aby mogły się wyświetlać w wynikach wyszukiwania. Zostanie użyte %(size)s do przechowywania wiadomości z %(rooms)s pokoju.",
+        "other": "Bezpiecznie przechowuj lokalnie wiadomości szyfrowane, aby mogły się wyświetlać w wynikach wyszukiwania. Zostanie użyte %(size)s do przechowywania wiadomości z %(rooms)s pokoi."
+    },
     "Homeserver feature support:": "Wsparcie funkcji serwera domowego:",
     "User signing private key:": "Podpisany przez użytkownika klucz prywatny:",
     "Self signing private key:": "Samo-podpisujący klucz prywatny:",
@@ -2506,8 +2619,10 @@
     "Home options": "Opcje głównej",
     "Home is useful for getting an overview of everything.": "Strona główna to przydatne miejsce dla podsumowania wszystkiego.",
     "For best security, verify your sessions and sign out from any session that you don't recognize or use anymore.": "Dla najlepszego bezpieczeństwa, zweryfikuj swoje sesje i wyloguj się ze wszystkich sesji, których nie rozpoznajesz lub nie używasz.",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Czy na pewno chcesz się wylogować z %(count)s sesji?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Czy na pewno chcesz się wylogować z %(count)s sesji?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Czy na pewno chcesz się wylogować z %(count)s sesji?",
+        "other": "Czy na pewno chcesz się wylogować z %(count)s sesji?"
+    },
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Twój administrator serwera wyłączył szyfrowanie end-to-end domyślnie w pokojach prywatnych i wiadomościach bezpośrednich.",
     "You have no ignored users.": "Nie posiadasz ignorowanych użytkowników.",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "Włącz akceleracje sprzętową (uruchom ponownie %(appName)s, aby zastosować zmiany)",
@@ -2549,14 +2664,22 @@
     "Renaming sessions": "Zmienianie nazwy sesji",
     "Please be aware that session names are also visible to people you communicate with.": "Należy pamiętać, że nazwy sesji są widoczne również dla osób, z którymi się komunikujesz.",
     "Rename session": "Zmień nazwę sesji",
-    "Sign out devices|one": "Wyloguj urządzenie",
-    "Sign out devices|other": "Wyloguj urządzenia",
-    "Click the button below to confirm signing out these devices.|one": "Kliknij przycisk poniżej, aby potwierdzić wylogowanie tego urządzenia.",
-    "Click the button below to confirm signing out these devices.|other": "Kliknij przycisk poniżej, aby potwierdzić wylogowanie tych urządzeń.",
-    "Confirm signing out these devices|one": "Potwierdź wylogowanie z tego urządzenia",
-    "Confirm signing out these devices|other": "Potwierdź wylogowanie z tych urządzeń",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Potwierdź wylogowanie z tego urządzenia, udowadniając swoją tożsamość za pomocą pojedynczego logowania.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Potwierdź wylogowanie z tych urządzeń, udowadniając swoją tożsamość za pomocą pojedynczego logowania.",
+    "Sign out devices": {
+        "one": "Wyloguj urządzenie",
+        "other": "Wyloguj urządzenia"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Kliknij przycisk poniżej, aby potwierdzić wylogowanie tego urządzenia.",
+        "other": "Kliknij przycisk poniżej, aby potwierdzić wylogowanie tych urządzeń."
+    },
+    "Confirm signing out these devices": {
+        "one": "Potwierdź wylogowanie z tego urządzenia",
+        "other": "Potwierdź wylogowanie z tych urządzeń"
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Potwierdź wylogowanie z tego urządzenia, udowadniając swoją tożsamość za pomocą pojedynczego logowania.",
+        "other": "Potwierdź wylogowanie z tych urządzeń, udowadniając swoją tożsamość za pomocą pojedynczego logowania."
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Wyloguj się z wszystkich pozostałych sesji (%(otherSessionsCount)s)",
     "Unable to revoke sharing for phone number": "Nie można odwołać udostępniania numeru telefonu",
     "Verify the link in your inbox": "Zweryfikuj link w swojej skrzynce odbiorczej",
@@ -2627,13 +2750,17 @@
     "Security recommendations": "Rekomendacje bezpieczeństwa",
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Zostałeś wylogowany z wszystkich urządzeń i przestaniesz otrzymywać powiadomienia push. Aby włączyć powiadomienia, zaloguj się ponownie na każdym urządzeniu.",
     "Sign out of all devices": "Wyloguj się z wszystkich urządzeń",
-    "Sign out of %(count)s sessions|one": "Wyloguj się z %(count)s sesji",
-    "Sign out of %(count)s sessions|other": "Wyloguj się z %(count)s sesji",
+    "Sign out of %(count)s sessions": {
+        "one": "Wyloguj się z %(count)s sesji",
+        "other": "Wyloguj się z %(count)s sesji"
+    },
     "Show QR code": "Pokaż kod QR",
     "You can use this device to sign in a new device with a QR code. You will need to scan the QR code shown on this device with your device that's signed out.": "Możesz użyć tego urządzenia, aby zalogować nowe za pomocą kodu QR. Zeskanuj kod QR wyświetlany na tym urządzeniu za pomocą drugiego wylogowanego.",
     "Sign in with QR code": "Zaloguj się za pomocą kodu QR",
-    "%(count)s sessions selected|one": "Zaznaczono %(count)s sesję",
-    "%(count)s sessions selected|other": "Zaznaczono %(count)s sesji",
+    "%(count)s sessions selected": {
+        "one": "Zaznaczono %(count)s sesję",
+        "other": "Zaznaczono %(count)s sesji"
+    },
     "Filter devices": "Filtruj urządzenia",
     "Consider signing out from old sessions (%(inactiveAgeDays)s days or older) you don't use anymore.": "Rozważ wylogowanie się ze starych sesji (%(inactiveAgeDays)s dni lub starsze), jeśli już z nich nie korzystasz.",
     "Verify your sessions for enhanced secure messaging or sign out from those you don't recognize or use anymore.": "Dla wzmocnienia bezpiecznych wiadomości, zweryfikuj swoje sesje i wyloguj się ze wszystkich sesji, których nie rozpoznajesz lub nie używasz.",
@@ -2655,10 +2782,14 @@
     "Reply to thread…": "Odpowiedz do wątku…",
     "Reply to encrypted thread…": "Odpowiedz do wątku szyfrowanego…",
     "Invite to this space": "Zaproś do tej przestrzeni",
-    "%(count)s participants|one": "1 uczestnik",
-    "%(count)s participants|other": "%(count)s uczestników",
-    "Show %(count)s other previews|one": "Pokaż %(count)s inny podgląd",
-    "Show %(count)s other previews|other": "Pokaż %(count)s innych podglądów",
+    "%(count)s participants": {
+        "one": "1 uczestnik",
+        "other": "%(count)s uczestników"
+    },
+    "Show %(count)s other previews": {
+        "one": "Pokaż %(count)s inny podgląd",
+        "other": "Pokaż %(count)s innych podglądów"
+    },
     "You can't see earlier messages": "Nie możesz widzieć poprzednich wiadomości",
     "Encrypted messages before this point are unavailable.": "Wiadomości szyfrowane przed tym punktem są niedostępne.",
     "You don't have permission to view messages from before you joined.": "Nie posiadasz uprawnień, aby wyświetlić wiadomości, które wysłano zanim dołączyłeś.",
@@ -2714,10 +2845,14 @@
     "Joining room…": "Dołączanie do pokoju…",
     "Joining space…": "Dołączanie do przestrzeni…",
     "%(spaceName)s menu": "menu %(spaceName)s",
-    "Currently removing messages in %(count)s rooms|one": "Aktualnie usuwanie wiadomości z %(count)s pokoju",
-    "Currently joining %(count)s rooms|one": "Aktualnie dołączanie do %(count)s pokoju",
-    "Currently joining %(count)s rooms|other": "Aktualnie dołączanie do %(count)s pokoi",
-    "Currently removing messages in %(count)s rooms|other": "Aktualnie usuwanie wiadomości z %(count)s pokoi",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Aktualnie usuwanie wiadomości z %(count)s pokoju",
+        "other": "Aktualnie usuwanie wiadomości z %(count)s pokoi"
+    },
+    "Currently joining %(count)s rooms": {
+        "one": "Aktualnie dołączanie do %(count)s pokoju",
+        "other": "Aktualnie dołączanie do %(count)s pokoi"
+    },
     "Ongoing call": "Rozmowa w toku",
     "You do not have permissions to add spaces to this space": "Nie masz uprawnień, aby dodać przestrzenie do tej przestrzeni",
     "Add space": "Dodaj przestrzeń",
@@ -2796,10 +2931,14 @@
     "Unable to access your microphone": "Nie można uzyskać dostępu do mikrofonu",
     "Unable to decrypt message": "Nie można rozszyfrować wiadomości",
     "Open thread": "Otwórz wątek",
-    "%(count)s reply|one": "%(count)s odpowiedź",
-    "%(count)s reply|other": "%(count)s odpowiedzi",
+    "%(count)s reply": {
+        "one": "%(count)s odpowiedź",
+        "other": "%(count)s odpowiedzi"
+    },
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ten pokój działa na wersji <roomVersion />, którą serwer domowy oznaczył jako <i>niestabilną</i>.",
-    "You can only pin up to %(count)s widgets|other": "Możesz przypiąć do %(count)s widżetów",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Możesz przypiąć do %(count)s widżetów"
+    },
     "Room info": "Informacje pokoju",
     "Chat": "Czat",
     "We were unable to start a chat with the other user.": "Nie byliśmy w stanie rozpocząć czatu z innym użytkownikiem.",
@@ -2867,13 +3006,19 @@
     "A network error occurred while trying to find and jump to the given date. Your homeserver might be down or there was just a temporary problem with your internet connection. Please try again. If this continues, please contact your homeserver administrator.": "Wystąpił błąd sieci w trakcie próby przeskoczenia do określonej daty. Twój serwer domowy mógł zostać wyłączony lub wystąpił tymczasowym problem z Twoim połączeniem sieciowym. Spróbuj ponownie. Jeśli problem będzie się powtarzał, skontaktuj się z administratorem serwera domowego.",
     "Video call ended": "Rozmowa wideo została zakończona",
     "%(name)s started a video call": "%(name)s rozpoczął rozmowę wideo",
-    "Final result based on %(count)s votes|one": "Ostateczny wynik na podstawie %(count)s głosu",
-    "Final result based on %(count)s votes|other": "Ostateczne wyniki na podstawie %(count)s głosów",
+    "Final result based on %(count)s votes": {
+        "one": "Ostateczny wynik na podstawie %(count)s głosu",
+        "other": "Ostateczne wyniki na podstawie %(count)s głosów"
+    },
     "View poll": "Wyświetl ankietę",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Nie znaleziono przeszłych ankiet w ostatnim dniu. Wczytaj więcej ankiet, aby wyświetlić ankiety z poprzednich miesięcy",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Nie znaleziono przeszłych ankiet w ostatnich %(count)s dniach. Wczytaj więcej ankiet, aby wyświetlić poprzednie miesiące",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Nie znaleziono aktywnych ankiet w ostatnim dniu. Wczytaj więcej ankiet, aby wyświetlić poprzednie miesiące",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Nie znaleziono aktywnych ankiet w ostatnich %(count)s dniach. Wczytaj więcej ankiet, aby wyświetlić ankiety z poprzednich miesięcy",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Nie znaleziono przeszłych ankiet w ostatnim dniu. Wczytaj więcej ankiet, aby wyświetlić ankiety z poprzednich miesięcy",
+        "other": "Nie znaleziono przeszłych ankiet w ostatnich %(count)s dniach. Wczytaj więcej ankiet, aby wyświetlić poprzednie miesiące"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Nie znaleziono aktywnych ankiet w ostatnim dniu. Wczytaj więcej ankiet, aby wyświetlić poprzednie miesiące",
+        "other": "Nie znaleziono aktywnych ankiet w ostatnich %(count)s dniach. Wczytaj więcej ankiet, aby wyświetlić ankiety z poprzednich miesięcy"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Nie znaleziono przeszłych ankiet. Wczytaj więcej ankiet, aby wyświetlić poprzednie miesiące",
     "There are no active polls. Load more polls to view polls for previous months": "Nie znaleziono aktywnych ankiet. Wczytaj więcej ankiet, aby wyświetlić poprzednie miesiące",
     "There are no past polls in this room": "Brak przeszłych ankiet w tym pokoju",
@@ -2883,8 +3028,10 @@
     "Past polls": "Przeszłe ankiety",
     "Active polls": "Aktywne ankiety",
     "View poll in timeline": "Wyświetl ankietę na osi czasu",
-    "%(count)s votes|one": "%(count)s głos",
-    "%(count)s votes|other": "%(count)s głosów",
+    "%(count)s votes": {
+        "one": "%(count)s głos",
+        "other": "%(count)s głosów"
+    },
     "Verification cancelled": "Weryfikacja anulowana",
     "You cancelled verification.": "Anulowałeś weryfikację.",
     "%(displayName)s cancelled verification.": "%(displayName)s anulował weryfikację.",
@@ -2968,10 +3115,14 @@
     "Add reaction": "Dodaj reakcje",
     "Error processing voice message": "Wystąpił błąd procesowania wiadomości głosowej",
     "Ended a poll": "Zakończył ankietę",
-    "Based on %(count)s votes|one": "Oparte na %(count)s głosie",
-    "Based on %(count)s votes|other": "Oparte na %(count)s głosach",
-    "%(count)s votes cast. Vote to see the results|one": "Oddano %(count)s głos. Zagłosuj, aby zobaczyć wyniki",
-    "%(count)s votes cast. Vote to see the results|other": "Oddano %(count)s głosów. Zagłosuj, aby zobaczyć wyniki",
+    "Based on %(count)s votes": {
+        "one": "Oparte na %(count)s głosie",
+        "other": "Oparte na %(count)s głosach"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "Oddano %(count)s głos. Zagłosuj, aby zobaczyć wyniki",
+        "other": "Oddano %(count)s głosów. Zagłosuj, aby zobaczyć wyniki"
+    },
     "No votes cast": "Brak głosów",
     "Results will be visible when the poll is ended": "Wyniki będą widoczne po zakończeniu ankiety",
     "Due to decryption errors, some votes may not be counted": "Ze względu na błędy rozszyfrowywania, niektóre głosy mogły nie zostać policzone",
@@ -3104,8 +3255,10 @@
     "Create video room": "Utwórz pokój wideo",
     "Visible to space members": "Widoczne dla członków przestrzeni",
     "Online community members": "Członkowie społeczności online",
-    "View all %(count)s members|one": "Wyświetl 1 członka",
-    "View all %(count)s members|other": "Wyświetl wszystkich %(count)s członków",
+    "View all %(count)s members": {
+        "one": "Wyświetl 1 członka",
+        "other": "Wyświetl wszystkich %(count)s członków"
+    },
     "Private room (invite only)": "Pokój prywatny (tylko na zaproszenie)",
     "Room visibility": "Widoczność pokoju",
     "Create a room": "Utwórz pokój",
@@ -3128,8 +3281,10 @@
     "Can't start voice message": "Nie można rozpocząć wiadomości głosowej",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Odznacz, jeśli chcesz również usunąć wiadomości systemowe tego użytkownika (np. zmiana członkostwa, profilu…)",
     "Preserve system messages": "Zachowaj komunikaty systemowe",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Zamierzasz usunąć %(count)s wiadomość przez %(user)s. To usunie ją permanentnie dla wszystkich w konwersacji. Czy chcesz kontynuować?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Zamierzasz usunąć %(count)s wiadomości przez %(user)s. To usunie je permanentnie dla wszystkich w konwersacji. Czy chcesz kontynuować?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Zamierzasz usunąć %(count)s wiadomość przez %(user)s. To usunie ją permanentnie dla wszystkich w konwersacji. Czy chcesz kontynuować?",
+        "other": "Zamierzasz usunąć %(count)s wiadomości przez %(user)s. To usunie je permanentnie dla wszystkich w konwersacji. Czy chcesz kontynuować?"
+    },
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Spróbuj przewinąć się w górę na osi czasu, aby sprawdzić, czy nie ma wcześniejszych.",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Jeśli istnieje dodatkowy kontekst, który pomógłby nam w analizie zgłoszenia, taki jak co robiłeś w trakcie wystąpienia problemu, ID pokojów, ID użytkowników, itd., wprowadź go tutaj.",
     "Download logs": "Pobierz dzienniki",
@@ -3178,8 +3333,10 @@
     "Message search initialisation failed, check <a>your settings</a> for more information": "Wystąpił błąd inicjalizacji wyszukiwania wiadomości, sprawdź <a>swoje ustawienia</a> po więcej informacji",
     "Click to read topic": "Kliknij, aby przeczytać temat",
     "Edit topic": "Edytuj temat",
-    "%(count)s people you know have already joined|one": "%(count)s osoba, którą znasz, już dołączyła",
-    "%(count)s people you know have already joined|other": "%(count)s osób, które znasz, już dołączyło",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s osoba, którą znasz, już dołączyła",
+        "other": "%(count)s osób, które znasz, już dołączyło"
+    },
     "Including %(commaSeparatedMembers)s": "Włączając %(commaSeparatedMembers)s",
     "Including you, %(commaSeparatedMembers)s": "Włączając Ciebie, %(commaSeparatedMembers)s",
     "This address had invalid server or is already in use": "Ten adres posiadał nieprawidłowy serwer lub jest już w użyciu",
@@ -3209,27 +3366,46 @@
     "Language Dropdown": "Rozwiń języki",
     "Message in %(room)s": "Wiadomość w %(room)s",
     "Image view": "Widok obrazu",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)swysłał ukrytą wiadomość",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)swysłał %(count)s ukrytych wiadomości",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)swysłało %(count)s ukrytych wiadomości",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)swysłało ukrytą wiadomość",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)susunął wiadomość",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)susunął %(count)s wiadomości",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)susunęło wiadomość",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)susunęło %(count)s wiadomości",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)szmienił <a>przypięte wiadomości</a> pokoju",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)szmienił <a>przypięte wiadomości</a> pokoju %(count)s razy",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)szmieniło <a>przypięte wiadomości</a> pokoju",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)szmieniło <a>przypięte wiadomości</a> pokoju %(count)s razy",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)szmienił ACL serwera",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)szmienił ACL serwera %(count)s razy",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)szmieniło ACL serwera",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)szmieniło ACL serwera %(count)s razy",
-    "was removed %(count)s times|one": "zostało usunięte",
-    "was removed %(count)s times|other": "zostało usunięte %(count)s raz",
-    "were removed %(count)s times|one": "zostało usuniętych",
-    "were removed %(count)s times|other": "zostało usuniętych %(count)s razy",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sodrzuciło ich zaproszenia %(count)s razy",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)swysłał ukrytą wiadomość",
+        "other": "%(oneUser)swysłał %(count)s ukrytych wiadomości"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "other": "%(severalUsers)swysłało %(count)s ukrytych wiadomości",
+        "one": "%(severalUsers)swysłało ukrytą wiadomość"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)susunął wiadomość",
+        "other": "%(oneUser)susunął %(count)s wiadomości"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)susunęło wiadomość",
+        "other": "%(severalUsers)susunęło %(count)s wiadomości"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)szmienił <a>przypięte wiadomości</a> pokoju",
+        "other": "%(oneUser)szmienił <a>przypięte wiadomości</a> pokoju %(count)s razy"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)szmieniło <a>przypięte wiadomości</a> pokoju",
+        "other": "%(severalUsers)szmieniło <a>przypięte wiadomości</a> pokoju %(count)s razy"
+    },
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)szmienił ACL serwera",
+        "other": "%(oneUser)szmienił ACL serwera %(count)s razy"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)szmieniło ACL serwera",
+        "other": "%(severalUsers)szmieniło ACL serwera %(count)s razy"
+    },
+    "was removed %(count)s times": {
+        "one": "zostało usunięte",
+        "other": "zostało usunięte %(count)s raz"
+    },
+    "were removed %(count)s times": {
+        "one": "zostało usuniętych",
+        "other": "zostało usuniętych %(count)s razy"
+    },
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Utwórz nowe zgłoszenie</newIssueLink> na GitHubie, abyśmy mogli zbadać ten błąd.",
     "Popout widget": "Wyskakujący widżet",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Korzystanie z tego widżetu może współdzielić dane <helpIcon /> z %(widgetDomain)s i Twoim menedżerem integracji.",
@@ -3314,8 +3490,10 @@
     "Search for": "Szukaj",
     "Use \"%(query)s\" to search": "Użyj \"%(query)s\" w trakcie szukania",
     "Public rooms": "Pokoje publiczne",
-    "%(count)s Members|one": "%(count)s członek",
-    "%(count)s Members|other": "%(count)s członków",
+    "%(count)s Members": {
+        "one": "%(count)s członek",
+        "other": "%(count)s członków"
+    },
     "Remember this": "Zapamiętaj to",
     "The widget will verify your user ID, but won't be able to perform actions for you:": "Widżet zweryfikuje twoje ID użytkownika, lecz nie będzie w stanie wykonywać za Ciebie działań:",
     "Allow this widget to verify your identity": "Zezwól temu widżetowi na weryfikacje Twojej tożsamości",
@@ -3483,8 +3661,10 @@
     "Capabilities": "Możliwości",
     "Send custom state event": "Wyślij własne wydarzenie stanu",
     "<empty string>": "<empty string>",
-    "<%(count)s spaces>|one": "<space>",
-    "<%(count)s spaces>|other": "<%(count)s spacji>",
+    "<%(count)s spaces>": {
+        "one": "<space>",
+        "other": "<%(count)s spacji>"
+    },
     "Thread Id: ": "ID wątku: ",
     "Threads timeline": "Oś czasu wątków",
     "Sender: ": "Nadawca: ",
@@ -3501,7 +3681,9 @@
     "Room is <strong>encrypted ✅</strong>": "Pokój jest <strong>szyfrowany ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Status powiadomień <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Status nieprzeczytanych wiadomości pokoju: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Status nieprzeczytanych wiadomości pokoju: <strong>%(status)s</strong>, ilość: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Status nieprzeczytanych wiadomości pokoju: <strong>%(status)s</strong>, ilość: <strong>%(count)s</strong>"
+    },
     "Room status": "Status pokoju",
     "Failed to send event!": "Nie udało się wysłać wydarzenia!",
     "Doesn't look like valid JSON.": "Nie wygląda to na prawidłowy JSON.",
@@ -3667,8 +3849,10 @@
     "Mark as suggested": "Oznacz jako sugerowane",
     "Mark as not suggested": "Oznacz jako nie sugerowane",
     "Joining": "Dołączanie",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Masz %(count)s nieprzeczytanych powiadomień we wcześniejszej wersji tego pokoju.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Masz %(count)s nieprzeczytane powiadomienie we wcześniejszej wersji tego pokoju.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "Masz %(count)s nieprzeczytanych powiadomień we wcześniejszej wersji tego pokoju.",
+        "other": "Masz %(count)s nieprzeczytane powiadomienie we wcześniejszej wersji tego pokoju."
+    },
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Wiadomość nie została wysłana, ponieważ serwer domowy przekroczył limit swoich zasobów. <a>Skontaktuj się z administratorem serwisu</a>, aby kontynuować.",
     "Your message wasn't sent because this homeserver has been blocked by its administrator. Please <a>contact your service administrator</a> to continue using the service.": "Wiadomość nie została wysłana, ponieważ serwer domowy został zablokowany przez jego administratora. <a>Skontaktuj się z administratorem serwisu</a>, aby kontynuować.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Wiadomość nie została wysłana, ponieważ serwer domowy przekroczył miesięczny limit aktywnych użytkowników. <a>Skontaktuj się z administratorem serwisu</a>, aby kontynuować.",
@@ -3747,9 +3931,13 @@
     "Great! This passphrase looks strong enough": "Świetnie! To hasło wygląda na wystarczająco silne",
     "New room activity, upgrades and status messages occur": "Pojawiła się nowa aktywność pokoju, aktualizacje i status wiadomości",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their profile picture.": "Wiadomości tutaj są szyfrowane end-to-end. Aby zweryfikować profil %(displayName)s - kliknij na zdjęcie profilowe.",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)szmieniło swoje zdjęcie profilowe %(count)s razy",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)szmieniło swoje zdjęcie profilowe %(count)s razy"
+    },
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Wiadomości w tym pokoju są szyfrowane end-to-end. Możesz zweryfikować osoby, które dołączą klikając na ich zdjęcie profilowe.",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)szmienił swoje zdjęcie profilowe %(count)s razy",
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)szmienił swoje zdjęcie profilowe %(count)s razy"
+    },
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a unique passphrase below, which will only be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Eksportowany plik zezwoli każdemu, kto go odczyta na szyfrowanie i rozszyfrowanie wiadomości, które widzisz. By usprawnić proces, wprowadź hasło poniżej, które posłuży do szyfrowania eksportowanych danych. Importowanie danych będzie możliwe wyłącznie za pomocą tego hasła.",
     "Applied by default to all rooms on all devices.": "Zastosowano domyślnie do wszystkich pokoi na każdym urządzeniu.",
     "Show a badge <badge/> when keywords are used in a room.": "Wyświetl plakietkę <badge/>, gdy słowa kluczowe są używane w pokoju.",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 3523b19a9b..e9ca2e8a24 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -136,8 +136,10 @@
     "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
     "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
-    "and %(count)s others...|other": "e %(count)s outros...",
-    "and %(count)s others...|one": "e um outro...",
+    "and %(count)s others...": {
+        "other": "e %(count)s outros...",
+        "one": "e um outro..."
+    },
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s às %(time)s",
@@ -245,17 +247,21 @@
     "You have <a>enabled</a> URL previews by default.": "Você <a>habilitou</a> pré-visualizações de links por padrão.",
     "Create new room": "Criar nova sala",
     "No display name": "Sem nome público de usuária(o)",
-    "Uploading %(filename)s and %(count)s others|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
+        "other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos"
+    },
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
     "Uploading %(filename)s": "Enviando o arquivo %(filename)s",
     "Admin Tools": "Ferramentas de Administração",
     "%(roomName)s does not exist.": "%(roomName)s não existe.",
-    "(~%(count)s results)|other": "(~%(count)s resultados)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s resultados)",
+        "one": "(~%(count)s resultado)"
+    },
     "Start authentication": "Iniciar autenticação",
-    "(~%(count)s results)|one": "(~%(count)s resultado)",
     "New Password": "Nova Palavra-Passe",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Não foi possível conectar ao Servidor de Base. Por favor, confira sua conectividade à internet, garanta que o <a>certificado SSL do Servidor de Base</a> é confiável, e que uma extensão do navegador não esteja bloqueando as requisições de rede.",
-    "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Close": "Fechar",
     "Decline": "Recusar",
     "Add": "Adicionar",
@@ -438,7 +444,10 @@
     "Aruba": "Aruba",
     "Unable to transfer call": "Não foi possível transferir a chamada",
     "Transfer Failed": "A Transferência Falhou",
-    "Inviting %(user)s and %(count)s others|other": "Convidando %(user)s e %(count)s outros",
+    "Inviting %(user)s and %(count)s others": {
+        "other": "Convidando %(user)s e %(count)s outros",
+        "one": "Convidando %(user)s e 1 outro"
+    },
     "Azerbaijan": "Azerbaijão",
     "Failed to transfer call": "Falha ao transferir chamada",
     "%(user1)s and %(user2)s": "%(user1)s e %(user2)s",
@@ -446,7 +455,10 @@
     "Unable to look up phone number": "Não foi possível procurar o número de telefone",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Pedimos ao navegador que se lembrasse do homeserver que usa para permitir o início de sessão, mas infelizmente o seu navegador esqueceu. Aceda à página de início de sessão e tente novamente.",
     "This may be caused by having the app open in multiple tabs or due to clearing browser data.": "Isto pode ser causado por ter a aplicação aberta em vários separadores ou devido à limpeza dos dados do navegador.",
-    "%(user)s and %(count)s others|one": "%(user)s e 1 outro",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s e 1 outro",
+        "other": "%(user)s e %(count)s outros"
+    },
     "Inviting %(user1)s and %(user2)s": "Convidando %(user1)s e %(user2)s",
     "United Kingdom": "Reino Unido",
     "Bahrain": "Bahrain",
@@ -464,8 +476,6 @@
     "%(name)s is requesting verification": "%(name)s está a pedir verificação",
     "Permission Required": "Permissão Requerida",
     "%(senderName)s started a voice broadcast": "%(senderName)s iniciou uma transmissão de voz",
-    "%(user)s and %(count)s others|other": "%(user)s e %(count)s outros",
-    "Inviting %(user)s and %(count)s others|one": "Convidando %(user)s e 1 outro",
     "Antigua & Barbuda": "Antígua e Barbuda",
     "Andorra": "Andorra",
     "Cocos (Keeling) Islands": "Ilhas Cocos (Keeling)",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 047610f204..d55b9208f6 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -136,8 +136,10 @@
     "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
     "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
-    "and %(count)s others...|one": "e um outro...",
-    "and %(count)s others...|other": "e %(count)s outros...",
+    "and %(count)s others...": {
+        "one": "e um outro...",
+        "other": "e %(count)s outros..."
+    },
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s às %(time)s",
@@ -246,8 +248,10 @@
     "Add": "Adicionar",
     "Home": "Home",
     "Uploading %(filename)s": "Enviando o arquivo %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
-    "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
+        "other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos"
+    },
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para usar este recurso",
     "Create new room": "Criar nova sala",
     "Start chat": "Iniciar conversa",
@@ -264,8 +268,10 @@
     "Start authentication": "Iniciar autenticação",
     "Unnamed Room": "Sala sem nome",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nível de permissão %(powerLevelNumber)s)",
-    "(~%(count)s results)|one": "(~%(count)s resultado)",
-    "(~%(count)s results)|other": "(~%(count)s resultados)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s resultado)",
+        "other": "(~%(count)s resultados)"
+    },
     "Your browser does not support the required cryptography extensions": "O seu navegador não suporta as extensões de criptografia necessárias",
     "Not a valid %(brand)s keyfile": "Não é um arquivo de chave válido do %(brand)s",
     "Authentication check failed: incorrect password?": "Falha ao checar a autenticação: senha incorreta?",
@@ -330,52 +336,96 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Remover um widget o remove para todas as pessoas desta sala. Tem certeza que quer remover este widget?",
     "Delete widget": "Remover widget",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s entraram %(count)s vezes",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s entraram",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s entrou %(count)s vezes",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s entrou",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s saíram %(count)s vezes",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s saíram",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saiu %(count)s vezes",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saiu",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s entraram e saíram %(count)s vezes",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s entraram e saíram",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s entrou e saiu %(count)s vezes",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s entrou e saiu",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíram e entraram %(count)s vezes",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíram e entraram",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saiu e entrou %(count)s vezes",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saiu e entrou",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s recusaram os convites %(count)s vezes",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s recusaram os convites",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s recusou o convite %(count)s vezes",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s recusou o convite",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s tiveram os convites retirados %(count)s vezes",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s tiveram os convites retirados",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s teve os convites removidos %(count)s vezes",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s teve o convite removido",
-    "were invited %(count)s times|other": "foram convidadas/os %(count)s vezes",
-    "were invited %(count)s times|one": "foram convidadas/os",
-    "was invited %(count)s times|other": "foi convidada/o %(count)s vezes",
-    "was invited %(count)s times|one": "foi convidada/o",
-    "were banned %(count)s times|other": "foram banidos %(count)s vezes",
-    "were banned %(count)s times|one": "foram banidos",
-    "was banned %(count)s times|other": "foi banido %(count)s vezes",
-    "was banned %(count)s times|one": "foi banido",
-    "were unbanned %(count)s times|other": "tiveram o banimento removido %(count)s vezes",
-    "were unbanned %(count)s times|one": "tiveram o banimento removido",
-    "was unbanned %(count)s times|other": "teve o banimento removido %(count)s vezes",
-    "was unbanned %(count)s times|one": "teve o banimento removido",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s alteraram o nome e sobrenome %(count)s vezes",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s alteraram o nome e sobrenome",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s alterou o nome e sobrenome %(count)s vezes",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s alterou o nome e sobrenome",
-    "%(items)s and %(count)s others|other": "%(items)s e %(count)s outras",
-    "%(items)s and %(count)s others|one": "%(items)s e uma outra",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s entraram %(count)s vezes",
+        "one": "%(severalUsers)s entraram"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s entrou %(count)s vezes",
+        "one": "%(oneUser)s entrou"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s saíram %(count)s vezes",
+        "one": "%(severalUsers)s saíram"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s saiu %(count)s vezes",
+        "one": "%(oneUser)s saiu"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s entraram e saíram %(count)s vezes",
+        "one": "%(severalUsers)s entraram e saíram"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s entrou e saiu %(count)s vezes",
+        "one": "%(oneUser)s entrou e saiu"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s saíram e entraram %(count)s vezes",
+        "one": "%(severalUsers)s saíram e entraram"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s saiu e entrou %(count)s vezes",
+        "one": "%(oneUser)s saiu e entrou"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s recusaram os convites %(count)s vezes",
+        "one": "%(severalUsers)s recusaram os convites"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s recusou o convite %(count)s vezes",
+        "one": "%(oneUser)s recusou o convite"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s tiveram os convites retirados %(count)s vezes",
+        "one": "%(severalUsers)s tiveram os convites retirados"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s teve os convites removidos %(count)s vezes",
+        "one": "%(oneUser)s teve o convite removido"
+    },
+    "were invited %(count)s times": {
+        "other": "foram convidadas/os %(count)s vezes",
+        "one": "foram convidadas/os"
+    },
+    "was invited %(count)s times": {
+        "other": "foi convidada/o %(count)s vezes",
+        "one": "foi convidada/o"
+    },
+    "were banned %(count)s times": {
+        "other": "foram banidos %(count)s vezes",
+        "one": "foram banidos"
+    },
+    "was banned %(count)s times": {
+        "other": "foi banido %(count)s vezes",
+        "one": "foi banido"
+    },
+    "were unbanned %(count)s times": {
+        "other": "tiveram o banimento removido %(count)s vezes",
+        "one": "tiveram o banimento removido"
+    },
+    "was unbanned %(count)s times": {
+        "other": "teve o banimento removido %(count)s vezes",
+        "one": "teve o banimento removido"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s alteraram o nome e sobrenome %(count)s vezes",
+        "one": "%(severalUsers)s alteraram o nome e sobrenome"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s alterou o nome e sobrenome %(count)s vezes",
+        "one": "%(oneUser)s alterou o nome e sobrenome"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s e %(count)s outras",
+        "one": "%(items)s e uma outra"
+    },
     "collapse": "recolher",
     "expand": "expandir",
     "<a>In reply to</a> <pill>": "<a>Em resposta a</a> <pill>",
-    "And %(count)s more...|other": "E %(count)s mais...",
+    "And %(count)s more...": {
+        "other": "E %(count)s mais..."
+    },
     "Create": "Criar",
     "Leave": "Sair",
     "Description": "Descrição",
@@ -602,8 +652,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s impediu que convidados entrassem na sala.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s alterou a permissão de acesso de convidados para %(rule)s",
     "%(displayName)s is typing …": "%(displayName)s está digitando…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s e %(count)s outras pessoas estão digitando…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s e outra pessoa estão digitando…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s e %(count)s outras pessoas estão digitando…",
+        "one": "%(names)s e outra pessoa estão digitando…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s e %(lastPerson)s estão digitando…",
     "Show read receipts sent by other users": "Mostrar confirmações de leitura dos outros usuários",
     "Enable big emoji in chat": "Ativar emojis grandes no bate-papo",
@@ -794,10 +846,14 @@
     "Opens chat with the given user": "Abre um chat com determinada pessoa",
     "Sends a message to the given user": "Envia uma mensagem para determinada pessoa",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s alterou o nome da sala de %(oldRoomName)s para %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s adicionou os endereços alternativos %(addresses)s desta sala.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s adicionou o endereço alternativo %(addresses)s desta sala.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s removeu os endereços alternativos %(addresses)s desta sala.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s removeu o endereço alternativo %(addresses)s desta sala.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s adicionou os endereços alternativos %(addresses)s desta sala.",
+        "one": "%(senderName)s adicionou o endereço alternativo %(addresses)s desta sala."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s removeu os endereços alternativos %(addresses)s desta sala.",
+        "one": "%(senderName)s removeu o endereço alternativo %(addresses)s desta sala."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s alterou os endereços alternativos desta sala.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s alterou os endereços principal e alternativos desta sala.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s alterou os endereços desta sala.",
@@ -1118,13 +1174,19 @@
     "Jump to first unread room.": "Ir para a primeira sala não lida.",
     "Jump to first invite.": "Ir para o primeiro convite.",
     "Add room": "Adicionar sala",
-    "Show %(count)s more|other": "Mostrar %(count)s a mais",
-    "Show %(count)s more|one": "Mostrar %(count)s a mais",
+    "Show %(count)s more": {
+        "other": "Mostrar %(count)s a mais",
+        "one": "Mostrar %(count)s a mais"
+    },
     "Room options": "Opções da Sala",
-    "%(count)s unread messages including mentions.|other": "%(count)s mensagens não lidas, incluindo menções.",
-    "%(count)s unread messages including mentions.|one": "1 menção não lida.",
-    "%(count)s unread messages.|other": "%(count)s mensagens não lidas.",
-    "%(count)s unread messages.|one": "1 mensagem não lida.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s mensagens não lidas, incluindo menções.",
+        "one": "1 menção não lida."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s mensagens não lidas.",
+        "one": "1 mensagem não lida."
+    },
     "Unread messages.": "Mensagens não lidas.",
     "This room is public": "Esta sala é pública",
     "Away": "Ausente",
@@ -1140,10 +1202,14 @@
     "Your user ID": "Sua ID de usuário",
     "%(brand)s URL": "Link do %(brand)s",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Se você usar esse widget, os dados <helpIcon /> poderão ser compartilhados com %(widgetDomain)s.",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s não fizeram alterações %(count)s vezes",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s não fizeram alterações",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s não fez alterações %(count)s vezes",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s não fez alterações",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s não fizeram alterações %(count)s vezes",
+        "one": "%(severalUsers)s não fizeram alterações"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s não fez alterações %(count)s vezes",
+        "one": "%(oneUser)s não fez alterações"
+    },
     "Power level": "Nível de permissão",
     "Looks good": "Muito bem",
     "Close dialog": "Fechar caixa de diálogo",
@@ -1359,16 +1425,22 @@
     "Your homeserver": "Seu servidor local",
     "Trusted": "Confiável",
     "Not trusted": "Não confiável",
-    "%(count)s verified sessions|other": "%(count)s sessões confirmadas",
-    "%(count)s verified sessions|one": "1 sessão confirmada",
+    "%(count)s verified sessions": {
+        "other": "%(count)s sessões confirmadas",
+        "one": "1 sessão confirmada"
+    },
     "Hide verified sessions": "Esconder sessões confirmadas",
-    "%(count)s sessions|other": "%(count)s sessões",
-    "%(count)s sessions|one": "%(count)s sessão",
+    "%(count)s sessions": {
+        "other": "%(count)s sessões",
+        "one": "%(count)s sessão"
+    },
     "Hide sessions": "Esconder sessões",
     "No recent messages by %(user)s found": "Nenhuma mensagem recente de %(user)s foi encontrada",
     "Remove recent messages by %(user)s": "Apagar mensagens de %(user)s na sala",
-    "Remove %(count)s messages|other": "Apagar %(count)s mensagens para todos",
-    "Remove %(count)s messages|one": "Remover 1 mensagem",
+    "Remove %(count)s messages": {
+        "other": "Apagar %(count)s mensagens para todos",
+        "one": "Remover 1 mensagem"
+    },
     "Remove recent messages": "Apagar mensagens desta pessoa na sala",
     "Deactivate user?": "Desativar usuário?",
     "Deactivate user": "Desativar usuário",
@@ -1415,8 +1487,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Este arquivo é <b>muito grande</b> para ser enviado. O limite do tamanho de arquivos é %(limit)s, enquanto que o tamanho desse arquivo é %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Esses arquivos são <b>muito grandes</b> para serem enviados. O limite do tamanho de arquivos é %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Alguns arquivos são <b>muito grandes</b> para serem enviados. O limite do tamanho de arquivos é %(limit)s.",
-    "Upload %(count)s other files|other": "Enviar %(count)s outros arquivos",
-    "Upload %(count)s other files|one": "Enviar %(count)s outros arquivos",
+    "Upload %(count)s other files": {
+        "other": "Enviar %(count)s outros arquivos",
+        "one": "Enviar %(count)s outros arquivos"
+    },
     "Cancel All": "Cancelar tudo",
     "Upload Error": "Erro no envio",
     "Verification Request": "Solicitação de confirmação",
@@ -1432,8 +1506,10 @@
     "Sign in with SSO": "Faça login com SSO (Login Único)",
     "Couldn't load page": "Não foi possível carregar a página",
     "View": "Ver",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
+        "one": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala."
+    },
     "Feedback": "Fale conosco",
     "User menu": "Menu do usuário",
     "Could not load user profile": "Não foi possível carregar o perfil do usuário",
@@ -1645,7 +1721,9 @@
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s definiu a lista de controle de acesso do servidor para esta sala.",
     "The call could not be established": "Não foi possível iniciar a chamada",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Todos os servidores foram banidos desta sala! Esta sala não pode mais ser utilizada.",
-    "You can only pin up to %(count)s widgets|other": "Você pode fixar até %(count)s widgets",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Você pode fixar até %(count)s widgets"
+    },
     "Move right": "Mover para a direita",
     "Move left": "Mover para a esquerda",
     "Revoke permissions": "Revogar permissões",
@@ -1935,8 +2013,10 @@
     "Vatican City": "Cidade do Vaticano",
     "Vanuatu": "Vanuatu",
     "Uzbekistan": "Uzbequistão",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s sala.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s salas.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s sala.",
+        "other": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s salas."
+    },
     "Go to Home View": "Ir para a tela inicial",
     "Remain on your screen while running": "Permaneça na tela, quando executar",
     "Remain on your screen when viewing another room, when running": "Permaneça na tela ao visualizar outra sala, quando executar",
@@ -2138,8 +2218,10 @@
     "This homeserver has been blocked by its administrator.": "Este servidor local foi bloqueado pelo seu administrador.",
     "You're already in a call with this person.": "Você já está em uma chamada com essa pessoa.",
     "Failed to create initial space rooms": "Falha ao criar salas de espaço iniciais",
-    "%(count)s members|one": "%(count)s integrante",
-    "%(count)s members|other": "%(count)s integrantes",
+    "%(count)s members": {
+        "one": "%(count)s integrante",
+        "other": "%(count)s integrantes"
+    },
     "Are you sure you want to leave the space '%(spaceName)s'?": "Tem certeza de que deseja sair desse espaço '%(spaceName)s'?",
     "This space is not public. You will not be able to rejoin without an invite.": "Este espaço não é público. Você não poderá entrar novamente sem um convite.",
     "Save Changes": "Salvar alterações",
@@ -2207,7 +2289,10 @@
     "Decide who can join %(roomName)s.": "Decida quem pode entrar em %(roomName)s.",
     "Space members": "Membros do espaço",
     "Spaces with access": "Espaço com acesso",
-    "& %(count)s more|other": "e %(count)s mais",
+    "& %(count)s more": {
+        "other": "e %(count)s mais",
+        "one": "& %(count)s mais"
+    },
     "Upgrade required": "Atualização necessária",
     "Anyone can find and join.": "Todos podem encontrar e entrar.",
     "Only invited people can join.": "Apenas pessoas convidadas podem entrar.",
@@ -2329,17 +2414,23 @@
     "To leave the beta, visit your settings.": "Para sair do beta, vá nas suas configurações.",
     "Search for rooms": "Buscar salas",
     "Add existing rooms": "Adicionar salas existentes",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Adicionando sala…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Adicionando salas… (%(progress)s de %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Adicionando sala…",
+        "other": "Adicionando salas… (%(progress)s de %(count)s)"
+    },
     "Create a new space": "Criar um novo espaço",
     "Add existing space": "Adicionar espaço existente",
     "You are not allowed to view this server's rooms list": "Você não tem a permissão para ver a lista de salas deste servidor",
     "Please provide an address": "Por favor, digite um endereço",
-    "%(count)s people you know have already joined|one": "%(count)s pessoa que você conhece já entrou",
-    "%(count)s people you know have already joined|other": "%(count)s pessoas que você conhece já entraram",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s pessoa que você conhece já entrou",
+        "other": "%(count)s pessoas que você conhece já entraram"
+    },
     "Including %(commaSeparatedMembers)s": "Incluindo %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Ver 1 membro",
-    "View all %(count)s members|other": "Ver todos os %(count)s membros",
+    "View all %(count)s members": {
+        "one": "Ver 1 membro",
+        "other": "Ver todos os %(count)s membros"
+    },
     "Share content": "Compatilhe conteúdo",
     "Application window": "Janela da aplicação",
     "Share entire screen": "Compartilhe a tela inteira",
@@ -2411,8 +2502,10 @@
     "Space selection": "Seleção de Espaços",
     "Use a more compact 'Modern' layout": "Usar um layout \"moderno\" mais compacto",
     "%(senderDisplayName)s changed the room avatar.": "%(senderDisplayName)s mudou a foto da sala.",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s e %(count)s outro",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s e %(count)s outros",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s e %(count)s outro",
+        "other": "%(spaceName)s e %(count)s outros"
+    },
     "%(date)s at %(time)s": "%(date)s às %(time)s",
     "Experimental": "Experimental",
     "Themes": "Temas",
@@ -2453,14 +2546,20 @@
     "Developer mode": "Modo desenvolvedor",
     "Automatically send debug logs on any error": "Enviar automaticamente logs de depuração em qualquer erro",
     "Surround selected text when typing special characters": "Circule o texto selecionado ao digitar caracteres especiais",
-    "Click the button below to confirm signing out these devices.|one": "Clique no botão abaixo para confirmar a desconexão deste dispositivo.",
-    "Click the button below to confirm signing out these devices.|other": "Clique no botão abaixo para confirmar a desconexão de outros dispositivos.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Confirme o logout deste dispositivo usando o logon único para provar sua identidade.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Confirme o logout desses dispositivos usando o logon único para provar sua identidade.",
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Clique no botão abaixo para confirmar a desconexão deste dispositivo.",
+        "other": "Clique no botão abaixo para confirmar a desconexão de outros dispositivos."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Confirme o logout deste dispositivo usando o logon único para provar sua identidade.",
+        "other": "Confirme o logout desses dispositivos usando o logon único para provar sua identidade."
+    },
     "Error - Mixed content": "Erro - Conteúdo misto",
     "Error loading Widget": "Erro ao carregar o Widget",
-    "Show %(count)s other previews|one": "Exibir a %(count)s outra prévia",
-    "Show %(count)s other previews|other": "Exibir as %(count)s outras prévias",
+    "Show %(count)s other previews": {
+        "one": "Exibir a %(count)s outra prévia",
+        "other": "Exibir as %(count)s outras prévias"
+    },
     "People with supported clients will be able to join the room without having a registered account.": "Pessoas com clientes suportados poderão entrar na sala sem ter uma conta registrada.",
     "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Não é recomendado adicionar criptografia a salas públicas.</b>Qualqer um pode encontrar e se juntar a salas públicas, então qualquer um pode ler as mensagens nelas. Você não terá nenhum dos benefícios da criptografia, e você não poderá desligá-la depois. Criptografar mensagens em uma sala pública fará com que receber e enviar mensagens fiquem mais lentos do que o normal.",
     "Failed to update the join rules": "Falha ao atualizar as regras de entrada",
@@ -2469,18 +2568,28 @@
     "This upgrade will allow members of selected spaces access to this room without an invite.": "Esta melhoria permite que membros de espaços selecionados acessem esta sala sem um convite.",
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Qualquer um em <spaceName/> pode encontrar e se juntar. Você pode selecionar outros espaços também.",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Qualquer um em um espaço pode encontrar e se juntar. <a>Edite quais espaços podem ser acessados aqui.</a>",
-    "Currently, %(count)s spaces have access|one": "Atualmente, um espaço tem acesso",
-    "Currently, %(count)s spaces have access|other": "Atualmente, %(count)s espaços tem acesso",
+    "Currently, %(count)s spaces have access": {
+        "one": "Atualmente, um espaço tem acesso",
+        "other": "Atualmente, %(count)s espaços tem acesso"
+    },
     "Including you, %(commaSeparatedMembers)s": "Incluindo você, %(commaSeparatedMembers)s",
-    "%(count)s votes|one": "%(count)s voto",
-    "%(count)s votes|other": "%(count)s votos",
-    "Based on %(count)s votes|one": "Com base na votação de %(count)s",
-    "Based on %(count)s votes|other": "Com base em %(count)s votos",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s votos expressos. Vote para ver os resultados",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s votos expressos. Vote para ver os resultados",
+    "%(count)s votes": {
+        "one": "%(count)s voto",
+        "other": "%(count)s votos"
+    },
+    "Based on %(count)s votes": {
+        "one": "Com base na votação de %(count)s",
+        "other": "Com base em %(count)s votos"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s votos expressos. Vote para ver os resultados",
+        "other": "%(count)s votos expressos. Vote para ver os resultados"
+    },
     "No votes cast": "Sem votos expressos",
-    "Final result based on %(count)s votes|one": "Resultado final baseado em %(count)s votos",
-    "Final result based on %(count)s votes|other": "Resultado final baseado em %(count)s votos",
+    "Final result based on %(count)s votes": {
+        "one": "Resultado final baseado em %(count)s votos",
+        "other": "Resultado final baseado em %(count)s votos"
+    },
     "Sorry, your vote was not registered. Please try again.": "Desculpe, seu voto não foi registrado. Por favor, tente novamente.",
     "Vote not registered": "Voto não registrado",
     "Downloading": "Baixando",
@@ -2504,8 +2613,10 @@
     "The homeserver the user you're verifying is connected to": "O servidor doméstico do usuário que você está verificando está conectado",
     "Home options": "Opções do Início",
     "%(spaceName)s menu": "%(spaceName)s menu",
-    "Currently joining %(count)s rooms|one": "Entrando na %(count)s sala",
-    "Currently joining %(count)s rooms|other": "Entrando atualmente em %(count)s salas",
+    "Currently joining %(count)s rooms": {
+        "one": "Entrando na %(count)s sala",
+        "other": "Entrando atualmente em %(count)s salas"
+    },
     "Join public room": "Entrar na sala pública",
     "Add people": "Adicionar pessoas",
     "You do not have permissions to invite people to this space": "Você não tem permissão para convidar pessoas para este espaço",
@@ -2520,8 +2631,10 @@
     "You do not have permission to start polls in this room.": "Você não tem permissão para iniciar enquetes nesta sala.",
     "Share location": "Compartilhar localização",
     "Reply in thread": "Responder no tópico",
-    "%(count)s reply|one": "%(count)s resposta",
-    "%(count)s reply|other": "%(count)s respostas",
+    "%(count)s reply": {
+        "one": "%(count)s resposta",
+        "other": "%(count)s respostas"
+    },
     "Manage pinned events": "Gerenciar eventos fixados",
     "Manage rooms in this space": "Gerenciar salas neste espaço",
     "Change space avatar": "Alterar avatar do espaço",
@@ -2542,21 +2655,26 @@
     "To view all keyboard shortcuts, <a>click here</a>.": "Para ver todos os atalhos do teclado, <a>clique aqui</a>.",
     "Show tray icon and minimise window to it on close": "Mostrar o ícone da bandeja e minimizar a janela ao fechar",
     "Use high contrast": "Usar alto contraste",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Atualizando espaço...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Atualizando espaços... (%(progress)s de %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Enviando convite...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Enviando convites... (%(progress)s de %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Atualizando espaço...",
+        "other": "Atualizando espaços... (%(progress)s de %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Enviando convite...",
+        "other": "Enviando convites... (%(progress)s de %(count)s)"
+    },
     "Loading new room": "Carregando nova sala",
     "Upgrading room": "Atualizando sala",
     "This room is in some spaces you're not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Esta sala está em alguns espaços dos quais você não é administrador. Nesses espaços, a sala antiga ainda será exibida, mas as pessoas serão solicitadas a ingressar na nova.",
-    "& %(count)s more|one": "& %(count)s mais",
     "Large": "Grande",
     "Image size in the timeline": "Tamanho da imagem na linha do tempo",
     "Rename": "Renomear",
     "Deselect all": "Desmarcar todos",
     "Select all": "Selecionar tudo",
-    "Sign out devices|one": "Desconectar dispositivo",
-    "Sign out devices|other": "Desconectar dispositivos",
+    "Sign out devices": {
+        "one": "Desconectar dispositivo",
+        "other": "Desconectar dispositivos"
+    },
     "Command error: Unable to handle slash command.": "Erro de comando: Não é possível manipular o comando de barra.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s e %(space2Name)s",
     "%(value)ss": "%(value)ss",
@@ -2590,14 +2708,20 @@
     "Android": "Android",
     "iOS": "iOS",
     "Add new server…": "Adicionar um novo servidor…",
-    "were removed %(count)s times|other": "foram removidos %(count)s vezes",
-    "were removed %(count)s times|one": "foram removidos",
-    "was removed %(count)s times|other": "foi removido %(count)s vezes",
-    "was removed %(count)s times|one": "foi removido",
+    "were removed %(count)s times": {
+        "other": "foram removidos %(count)s vezes",
+        "one": "foram removidos"
+    },
+    "was removed %(count)s times": {
+        "other": "foi removido %(count)s vezes",
+        "one": "foi removido"
+    },
     "Last month": "Último mês",
     "Last week": "Última semana",
-    "%(count)s participants|other": "%(count)s participantes",
-    "%(count)s participants|one": "1 participante",
+    "%(count)s participants": {
+        "other": "%(count)s participantes",
+        "one": "1 participante"
+    },
     "Saved Items": "Itens salvos",
     "Add space": "Adicionar espaço",
     "Video room": "Sala de vídeo",
@@ -2605,8 +2729,10 @@
     "Private room": "Sala privada",
     "New video room": "Nova sala de vídeo",
     "New room": "Nova sala",
-    "Seen by %(count)s people|one": "Visto por %(count)s pessoa",
-    "Seen by %(count)s people|other": "Visto por %(count)s pessoas",
+    "Seen by %(count)s people": {
+        "one": "Visto por %(count)s pessoa",
+        "other": "Visto por %(count)s pessoas"
+    },
     "Security recommendations": "Recomendações de segurança",
     "Filter devices": "Filtrar dispositivos",
     "Inactive sessions": "Sessões inativas",
@@ -2658,15 +2784,21 @@
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Não foi possível entender a data fornecida (%(inputDate)s). Tente usando o formato AAAA-MM-DD.",
     "You need to be able to kick users to do that.": "Você precisa ter permissão de expulsar usuários para fazer isso.",
     "Failed to invite users to %(roomName)s": "Falha ao convidar usuários para %(roomName)s",
-    "Inviting %(user)s and %(count)s others|one": "Convidando %(user)s e 1 outro",
-    "Inviting %(user)s and %(count)s others|other": "Convidando %(user)s e %(count)s outros",
-    "%(user)s and %(count)s others|one": "%(user)s e 1 outro",
-    "%(user)s and %(count)s others|other": "%(user)s e %(count)s outros",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Convidando %(user)s e 1 outro",
+        "other": "Convidando %(user)s e %(count)s outros"
+    },
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s e 1 outro",
+        "other": "%(user)s e %(count)s outros"
+    },
     "You were disconnected from the call. (Error: %(message)s)": "Você foi desconectado da chamada. (Erro: %(message)s)",
     "Remove messages sent by me": "",
     "Welcome": "Boas-vindas",
-    "%(count)s people joined|one": "%(count)s pessoa entrou",
-    "%(count)s people joined|other": "%(count)s pessoas entraram",
+    "%(count)s people joined": {
+        "one": "%(count)s pessoa entrou",
+        "other": "%(count)s pessoas entraram"
+    },
     "Audio devices": "Dispositivos de áudio",
     "Unmute microphone": "Habilitar microfone",
     "Mute microphone": "Silenciar microfone",
@@ -2692,9 +2824,11 @@
     "User is already invited to the room": "O usuário já foi convidado para a sala",
     "User is already invited to the space": "O usuário já foi convidado para o espaço",
     "You do not have permission to invite people to this space.": "Você não tem permissão para convidar pessoas para este espaço.",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Em %(spaceName)s e %(count)s outro espaço.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Em %(spaceName)s e %(count)s outro espaço.",
+        "other": "Em %(spaceName)s e %(count)s outros espaços."
+    },
     "In %(spaceName)s.": "No espaço %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Em %(spaceName)s e %(count)s outros espaços.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Nos espaços %(space1Name)s e %(space2Name)s.",
     "Empty room (was %(oldName)s)": "Sala vazia (era %(oldName)s)",
     "Unknown session type": "Tipo de sessão desconhecido",
@@ -2708,14 +2842,18 @@
     "Version": "Versão",
     "Application": "Aplicação",
     "Last activity": "Última atividade",
-    "Confirm signing out these devices|other": "Confirme a saída destes dispositivos",
-    "Confirm signing out these devices|one": "Confirme a saída deste dispositivo",
+    "Confirm signing out these devices": {
+        "other": "Confirme a saída destes dispositivos",
+        "one": "Confirme a saída deste dispositivo"
+    },
     "Current session": "Sessão atual",
     "Developer tools": "Ferramentas de desenvolvimento",
     "Welcome to %(brand)s": "Bem-vindo a %(brand)s",
     "Processing event %(number)s out of %(total)s": "Processando evento %(number)s de %(total)s",
-    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s evento exportado em %(seconds)s segundos",
-    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s eventos exportados em %(seconds)s segundos",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "%(count)s evento exportado em %(seconds)s segundos",
+        "other": "%(count)s eventos exportados em %(seconds)s segundos"
+    },
     "Yes, stop broadcast": "Sim, interromper a transmissão",
     "Stop live broadcasting?": "Parar a transmissão ao vivo?",
     "Someone else is already recording a voice broadcast. Wait for their voice broadcast to end to start a new one.": "Outra pessoa já está gravando uma transmissão de voz. Aguarde o término da transmissão de voz para iniciar uma nova.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 4f53f13bcc..4b2ea99c9f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -105,8 +105,10 @@
     "Unable to enable Notifications": "Не удалось включить уведомления",
     "Upload Failed": "Сбой отправки файла",
     "Usage": "Использование",
-    "and %(count)s others...|other": "и %(count)s других...",
-    "and %(count)s others...|one": "и ещё кто-то...",
+    "and %(count)s others...": {
+        "other": "и %(count)s других...",
+        "one": "и ещё кто-то..."
+    },
     "Are you sure?": "Вы уверены?",
     "Decrypt %(text)s": "Расшифровать %(text)s",
     "Download %(text)s": "Скачать %(text)s",
@@ -247,8 +249,10 @@
     "Start chat": "Отправить личное сообщение",
     "Add": "Добавить",
     "Uploading %(filename)s": "Отправка %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Отправка %(filename)s и %(count)s другой",
-    "Uploading %(filename)s and %(count)s others|other": "Отправка %(filename)s и %(count)s других",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Отправка %(filename)s и %(count)s другой",
+        "other": "Отправка %(filename)s и %(count)s других"
+    },
     "You must <a>register</a> to use this functionality": "Вы должны <a>зарегистрироваться</a>, чтобы использовать эту функцию",
     "New Password": "Новый пароль",
     "Something went wrong!": "Что-то пошло не так!",
@@ -258,13 +262,15 @@
     "Close": "Закрыть",
     "No display name": "Нет отображаемого имени",
     "Start authentication": "Начать аутентификацию",
-    "(~%(count)s results)|other": "(~%(count)s результатов)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s результатов)",
+        "one": "(~%(count)s результат)"
+    },
     "Decline": "Отклонить",
     "%(roomName)s does not exist.": "%(roomName)s не существует.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s на данный момент недоступна.",
     "Unnamed Room": "Комната без названия",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (уровень прав %(powerLevelNumber)s)",
-    "(~%(count)s results)|one": "(~%(count)s результат)",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не удается подключиться к домашнему серверу — проверьте подключение, убедитесь, что ваш <a>SSL-сертификат домашнего сервера</a> является доверенным и что расширение браузера не блокирует запросы.",
     "Not a valid %(brand)s keyfile": "Недействительный файл ключей %(brand)s",
     "Your browser does not support the required cryptography extensions": "Ваш браузер не поддерживает необходимые криптографические расширения",
@@ -306,7 +312,9 @@
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закреплённые сообщения в этой комнате.",
     "Unknown": "Неизвестно",
     "Unnamed room": "Комната без названия",
-    "And %(count)s more...|other": "Еще %(count)s…",
+    "And %(count)s more...": {
+        "other": "Еще %(count)s…"
+    },
     "Delete Widget": "Удалить виджет",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Удаление виджета действует для всех участников этой комнаты. Вы действительно хотите удалить этот виджет?",
     "Mirror local video feed": "Зеркально отражать видео со своей камеры",
@@ -317,56 +325,98 @@
     "Members only (since they joined)": "Только участники (с момента их входа)",
     "A text message has been sent to %(msisdn)s": "Текстовое сообщение отправлено на %(msisdn)s",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s присоединились %(count)s раз(а)",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s присоединились",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s присоединился(лась) %(count)s раз(а)",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s присоединился(лась)",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s покинули %(count)s раз(а)",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s покинули",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s покинул(а) %(count)s раз(а)",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s покинул(а)",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s присоединились и покинули %(count)s раз(а)",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s присоединились и покинули",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s присоединился(лась) и покинул(а) %(count)s раз(а)",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s присоединился(лась) и покинул(а)",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s покинули и снова присоединились %(count)s раз(а)",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s покинули и снова присоединились",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s покинул(а) и снова присоединился(лась) %(count)s раз(а)",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s покинул(а) и снова присоединился(лась)",
-    "were invited %(count)s times|other": "приглашены %(count)s раз(а)",
-    "were invited %(count)s times|one": "приглашены",
-    "was invited %(count)s times|other": "приглашен(а) %(count)s раз(а)",
-    "was invited %(count)s times|one": "приглашен(а)",
-    "were banned %(count)s times|other": "заблокированы %(count)s раз(а)",
-    "were banned %(count)s times|one": "заблокированы",
-    "was banned %(count)s times|other": "заблокирован(а) %(count)s раз(а)",
-    "was banned %(count)s times|one": "заблокирован(а)",
-    "were unbanned %(count)s times|other": "разблокированы %(count)s раз(а)",
-    "were unbanned %(count)s times|one": "разблокированы",
-    "was unbanned %(count)s times|other": "разблокирован(а) %(count)s раз(а)",
-    "was unbanned %(count)s times|one": "разблокирован(а)",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sизменили имя %(count)s раз(а)",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sизменили имя",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sизменил(а) имя %(count)s раз(а)",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sизменил(а) имя",
-    "%(items)s and %(count)s others|other": "%(items)s и ещё %(count)s участника(-ов)",
-    "%(items)s and %(count)s others|one": "%(items)s и ещё кто-то",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s присоединились %(count)s раз(а)",
+        "one": "%(severalUsers)s присоединились"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s присоединился(лась) %(count)s раз(а)",
+        "one": "%(oneUser)s присоединился(лась)"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s покинули %(count)s раз(а)",
+        "one": "%(severalUsers)s покинули"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s покинул(а) %(count)s раз(а)",
+        "one": "%(oneUser)s покинул(а)"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s присоединились и покинули %(count)s раз(а)",
+        "one": "%(severalUsers)s присоединились и покинули"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s присоединился(лась) и покинул(а) %(count)s раз(а)",
+        "one": "%(oneUser)s присоединился(лась) и покинул(а)"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s покинули и снова присоединились %(count)s раз(а)",
+        "one": "%(severalUsers)s покинули и снова присоединились"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s покинул(а) и снова присоединился(лась) %(count)s раз(а)",
+        "one": "%(oneUser)s покинул(а) и снова присоединился(лась)"
+    },
+    "were invited %(count)s times": {
+        "other": "приглашены %(count)s раз(а)",
+        "one": "приглашены"
+    },
+    "was invited %(count)s times": {
+        "other": "приглашен(а) %(count)s раз(а)",
+        "one": "приглашен(а)"
+    },
+    "were banned %(count)s times": {
+        "other": "заблокированы %(count)s раз(а)",
+        "one": "заблокированы"
+    },
+    "was banned %(count)s times": {
+        "other": "заблокирован(а) %(count)s раз(а)",
+        "one": "заблокирован(а)"
+    },
+    "were unbanned %(count)s times": {
+        "other": "разблокированы %(count)s раз(а)",
+        "one": "разблокированы"
+    },
+    "was unbanned %(count)s times": {
+        "other": "разблокирован(а) %(count)s раз(а)",
+        "one": "разблокирован(а)"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)sизменили имя %(count)s раз(а)",
+        "one": "%(severalUsers)sизменили имя"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sизменил(а) имя %(count)s раз(а)",
+        "one": "%(oneUser)sизменил(а) имя"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s и ещё %(count)s участника(-ов)",
+        "one": "%(items)s и ещё кто-то"
+    },
     "Room Notification": "Уведомления комнаты",
     "Notify the whole room": "Уведомить всю комнату",
     "Enable inline URL previews by default": "Предпросмотр ссылок по умолчанию",
     "Enable URL previews for this room (only affects you)": "Включить предпросмотр ссылок в этой комнате (влияет только на вас)",
     "Enable URL previews by default for participants in this room": "Включить предпросмотр ссылок для участников этой комнаты по умолчанию",
     "Restricted": "Ограниченный пользователь",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s отклонили приглашения %(count)s раз(а)",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sотклонили приглашения",
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s отклонили приглашения %(count)s раз(а)",
+        "one": "%(severalUsers)sотклонили приглашения"
+    },
     "URL previews are enabled by default for participants in this room.": "Предпросмотр ссылок по умолчанию включен для участников этой комнаты.",
     "URL previews are disabled by default for participants in this room.": "Предпросмотр ссылок по умолчанию выключен для участников этой комнаты.",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотклонил(а) приглашение %(count)s раз(а)",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sотклонил(а) приглашение",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sотозвали приглашения %(count)s раз(а)",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sотозвали приглашения",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sотклонил(а) приглашение %(count)s раз(а)",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sотозвал(а) приглашение",
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)sотклонил(а) приглашение %(count)s раз(а)",
+        "one": "%(oneUser)sотклонил(а) приглашение"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)sотозвали приглашения %(count)s раз(а)",
+        "one": "%(severalUsers)sотозвали приглашения"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)sотклонил(а) приглашение %(count)s раз(а)",
+        "one": "%(oneUser)sотозвал(а) приглашение"
+    },
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Обратите внимание, что вы заходите на сервер %(hs)s, а не на matrix.org.",
     "%(duration)ss": "%(duration)s сек",
     "%(duration)sm": "%(duration)s мин",
@@ -502,8 +552,10 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s установил(а) %(address)s в качестве главного адреса комнаты.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s удалил главный адрес комнаты.",
     "%(displayName)s is typing …": "%(displayName)s печатает…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s и %(count)s других печатают…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s и ещё кто-то печатают…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s и %(count)s других печатают…",
+        "one": "%(names)s и ещё кто-то печатают…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s и %(lastPerson)s печатают…",
     "This homeserver has hit its Monthly Active User limit.": "Сервер достиг ежемесячного ограничения активных пользователей.",
     "This homeserver has exceeded one of its resource limits.": "Превышен один из лимитов на ресурсы сервера.",
@@ -817,8 +869,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Этот файл <b>слишком большой</b> для загрузки. Лимит размера файла составляет %(limit)s но этот файл %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Эти файлы <b>слишком большие</b> для загрузки. Лимит размера файла составляет %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Некоторые файлы имеют <b>слишком большой размер</b>, чтобы их можно было загрузить. Лимит размера файла составляет %(limit)s.",
-    "Upload %(count)s other files|other": "Загрузка %(count)s других файлов",
-    "Upload %(count)s other files|one": "Загрузка %(count)s другого файла",
+    "Upload %(count)s other files": {
+        "other": "Загрузка %(count)s других файлов",
+        "one": "Загрузка %(count)s другого файла"
+    },
     "Cancel All": "Отменить все",
     "Upload Error": "Ошибка загрузки",
     "Remember my selection for this widget": "Запомнить мой выбор для этого виджета",
@@ -843,8 +897,10 @@
     "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам на крупнейшем общедоступном сервере",
     "Couldn't load page": "Невозможно загрузить страницу",
     "Add room": "Добавить комнату",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "У вас есть %(count)s непрочитанных уведомлений в предыдущей версии этой комнаты.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "В предыдущей версии этой комнаты у вас есть непрочитанное уведомление %(count)s.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "У вас есть %(count)s непрочитанных уведомлений в предыдущей версии этой комнаты.",
+        "one": "В предыдущей версии этой комнаты у вас есть непрочитанное уведомление %(count)s."
+    },
     "Guest": "Гость",
     "Could not load user profile": "Не удалось загрузить профиль пользователя",
     "Your password has been reset.": "Ваш пароль был сброшен.",
@@ -890,10 +946,14 @@
     "Registration Successful": "Регистрация успешно завершена",
     "Show all": "Показать все",
     "Edited at %(date)s. Click to view edits.": "Изменено %(date)s. Нажмите для посмотра истории изменений.",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sничего не изменили %(count)s раз(а)",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sне внёс изменений",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sничего не изменил(а) %(count)s раз(а)",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sне внёс изменений",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)sничего не изменили %(count)s раз(а)",
+        "one": "%(severalUsers)sне внёс изменений"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)sничего не изменил(а) %(count)s раз(а)",
+        "one": "%(oneUser)sне внёс изменений"
+    },
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Пожалуйста, расскажите нам что пошло не так, либо, ещё лучше, создайте отчёт в GitHub с описанием проблемы.",
     "Removing…": "Удаление…",
     "Clear all data": "Очистить все данные",
@@ -995,8 +1055,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Попробуйте пролистать ленту сообщений вверх, чтобы увидеть, есть ли более ранние.",
     "Remove recent messages by %(user)s": "Удалить последние сообщения от %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Для большого количества сообщений это может занять некоторое время. Пожалуйста, не обновляйте своего клиента в это время.",
-    "Remove %(count)s messages|other": "Удалить %(count)s сообщения(-й)",
-    "Remove %(count)s messages|one": "Удалить 1 сообщение",
+    "Remove %(count)s messages": {
+        "other": "Удалить %(count)s сообщения(-й)",
+        "one": "Удалить 1 сообщение"
+    },
     "Deactivate user?": "Деактивировать пользователя?",
     "Deactivate user": "Деактивировать пользователя",
     "Remove recent messages": "Удалить последние сообщения",
@@ -1004,7 +1066,10 @@
     "Italics": "Курсив",
     "Strikethrough": "Перечёркнутый",
     "Code block": "Блок кода",
-    "%(count)s unread messages.|other": "%(count)s непрочитанных сообщения(-й).",
+    "%(count)s unread messages.": {
+        "other": "%(count)s непрочитанных сообщения(-й).",
+        "one": "1 непрочитанное сообщение."
+    },
     "Show image": "Показать изображение",
     "e.g. my-room": "например, моя-комната",
     "Close dialog": "Закрыть диалог",
@@ -1024,7 +1089,10 @@
     "This invite to %(roomName)s was sent to %(email)s": "Это приглашение в %(roomName)s было отправлено на %(email)s",
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Используйте сервер идентификации в Настройках для получения приглашений непосредственно в %(brand)s.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Введите адрес эл.почты в Настройках, чтобы получать приглашения прямо в %(brand)s.",
-    "%(count)s unread messages including mentions.|other": "%(count)s непрочитанных сообщения(-й), включая упоминания.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s непрочитанных сообщения(-й), включая упоминания.",
+        "one": "1 непрочитанное упоминание."
+    },
     "Failed to deactivate user": "Не удалось деактивировать пользователя",
     "This client does not support end-to-end encryption.": "Этот клиент не поддерживает сквозное шифрование.",
     "Messages in this room are not end-to-end encrypted.": "Сообщения в этой комнате не защищены сквозным шифрованием.",
@@ -1057,8 +1125,6 @@
     "Jump to first unread room.": "Перейти в первую непрочитанную комнату.",
     "Jump to first invite.": "Перейти к первому приглашению.",
     "Trust": "Доверие",
-    "%(count)s unread messages including mentions.|one": "1 непрочитанное упоминание.",
-    "%(count)s unread messages.|one": "1 непрочитанное сообщение.",
     "Unread messages.": "Непрочитанные сообщения.",
     "Message Actions": "Сообщение действий",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Это действие требует по умолчанию доступа к серверу идентификации <server/> для подтверждения адреса электронной почты или номера телефона, но у сервера нет никакого пользовательского соглашения.",
@@ -1075,7 +1141,10 @@
     "Enable audible notifications for this session": "Звуковые уведомления для этого сеанса",
     "Manage integrations": "Управление интеграциями",
     "Direct Messages": "Личные сообщения",
-    "%(count)s sessions|other": "Сеансов: %(count)s",
+    "%(count)s sessions": {
+        "other": "Сеансов: %(count)s",
+        "one": "%(count)s сеанс"
+    },
     "Hide sessions": "Свернуть сеансы",
     "Verify this session": "Заверьте этот сеанс",
     "Verifies a user, session, and pubkey tuple": "Проверяет пользователя, сеанс и публичные ключи",
@@ -1141,10 +1210,14 @@
     "Sends a message as html, without interpreting it as markdown": "Отправить сообщение как html, не интерпретируя его как markdown",
     "Displays information about a user": "Показать информацию о пользователе",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s изменил(а) название комнаты с %(oldRoomName)s на %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s добавил(а) альтернативные адреса %(addresses)s для этой комнаты.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s добавил(а) альтернативные адреса %(addresses)s для этой комнаты.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s удалил(а) альтернативные адреса %(addresses)s для этой комнаты.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s удалил(а) альтернативные адреса %(addresses)s для этой комнаты.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s добавил(а) альтернативные адреса %(addresses)s для этой комнаты.",
+        "one": "%(senderName)s добавил(а) альтернативные адреса %(addresses)s для этой комнаты."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s удалил(а) альтернативные адреса %(addresses)s для этой комнаты.",
+        "one": "%(senderName)s удалил(а) альтернативные адреса %(addresses)s для этой комнаты."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s изменил(а) альтернативные адреса для этой комнаты.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s изменил(а) главный и альтернативные адреса для этой комнаты.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s изменил(а) адреса для этой комнаты.",
@@ -1279,10 +1352,11 @@
     "Your homeserver": "Ваш домашний сервер",
     "Trusted": "Заверенный",
     "Not trusted": "Незаверенный",
-    "%(count)s verified sessions|other": "Заверенных сеансов: %(count)s",
-    "%(count)s verified sessions|one": "1 заверенный сеанс",
+    "%(count)s verified sessions": {
+        "other": "Заверенных сеансов: %(count)s",
+        "one": "1 заверенный сеанс"
+    },
     "Hide verified sessions": "Свернуть заверенные сеансы",
-    "%(count)s sessions|one": "%(count)s сеанс",
     "Verification timed out.": "Таймаут подтверждения.",
     "You cancelled verification.": "Вы отменили подтверждение.",
     "Verification cancelled": "Подтверждение отменено",
@@ -1414,7 +1488,10 @@
     "Activity": "По активности",
     "A-Z": "А-Я",
     "List options": "Настройки списка",
-    "Show %(count)s more|other": "Показать ещё %(count)s",
+    "Show %(count)s more": {
+        "other": "Показать ещё %(count)s",
+        "one": "Показать ещё %(count)s"
+    },
     "Notification options": "Настройки уведомлений",
     "Favourited": "В избранном",
     "Room options": "Настройки комнаты",
@@ -1424,7 +1501,6 @@
     "Feedback": "Отзыв",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Appearance Settings only affect this %(brand)s session.": "Настройки внешнего вида работают только в этом сеансе %(brand)s.",
-    "Show %(count)s more|one": "Показать ещё %(count)s",
     "Forget Room": "Забыть комнату",
     "This room is public": "Это публичная комната",
     "Away": "Отошёл(ла)",
@@ -1648,7 +1724,9 @@
     "Data on this screen is shared with %(widgetDomain)s": "Данные на этом экране используются %(widgetDomain)s",
     "Modal Widget": "Модальный виджет",
     "Ignored attempt to disable encryption": "Игнорируемая попытка отключить шифрование",
-    "You can only pin up to %(count)s widgets|other": "Вы можете закрепить не более %(count)s виджетов",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Вы можете закрепить не более %(count)s виджетов"
+    },
     "Show Widgets": "Показать виджеты",
     "Hide Widgets": "Скрыть виджеты",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s изменил(а) серверные разрешения для этой комнаты.",
@@ -1699,8 +1777,10 @@
     "Got an account? <a>Sign in</a>": "Есть учётная запись? <a>Войти</a>",
     "New here? <a>Create an account</a>": "Впервые здесь? <a>Создать учётную запись</a>",
     "Render LaTeX maths in messages": "Отображать математику LaTeX в сообщениях",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Надежно кэшируйте зашифрованные сообщения локально, чтобы они отображались в результатах поиска, используя %(size)s для хранения сообщений из %(rooms)s комнаты.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Надежно кэшируйте зашифрованные сообщения локально, чтобы они отображались в результатах поиска, используя %(size)s для хранения сообщений из комнат (%(rooms)s).",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Надежно кэшируйте зашифрованные сообщения локально, чтобы они отображались в результатах поиска, используя %(size)s для хранения сообщений из %(rooms)s комнаты.",
+        "other": "Надежно кэшируйте зашифрованные сообщения локально, чтобы они отображались в результатах поиска, используя %(size)s для хранения сообщений из комнат (%(rooms)s)."
+    },
     "Unable to validate homeserver": "Невозможно проверить домашний сервер",
     "Sign into your homeserver": "Войдите на свой домашний сервер",
     "with state key %(stateKey)s": "с ключом состояния %(stateKey)s",
@@ -2122,10 +2202,14 @@
     "Caution:": "Предупреждение:",
     "Suggested": "Рекомендуется",
     "This room is suggested as a good one to join": "Эта комната рекомендуется, чтобы присоединиться",
-    "%(count)s rooms|one": "%(count)s комната",
-    "%(count)s rooms|other": "%(count)s комнат",
-    "%(count)s members|one": "%(count)s участник",
-    "%(count)s members|other": "%(count)s участников",
+    "%(count)s rooms": {
+        "one": "%(count)s комната",
+        "other": "%(count)s комнат"
+    },
+    "%(count)s members": {
+        "one": "%(count)s участник",
+        "other": "%(count)s участников"
+    },
     "You don't have permission": "У вас нет разрешения",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Уверены, что хотите покинуть пространство \"%(spaceName)s\"?",
     "This space is not public. You will not be able to rejoin without an invite.": "Это пространство не публично. Вы не сможете вновь войти без приглашения.",
@@ -2234,8 +2318,10 @@
     "Enter your Security Phrase a second time to confirm it.": "Введите секретную фразу второй раз, чтобы подтвердить ее.",
     "Space Autocomplete": "Автозаполнение пространства",
     "Verify your identity to access encrypted messages and prove your identity to others.": "Подтвердите свою личность, чтобы получить доступ к зашифрованным сообщениям и доказать свою личность другим.",
-    "Currently joining %(count)s rooms|one": "Сейчас вы состоите в %(count)s комнате",
-    "Currently joining %(count)s rooms|other": "Сейчас вы состоите в %(count)s комнатах",
+    "Currently joining %(count)s rooms": {
+        "one": "Сейчас вы состоите в %(count)s комнате",
+        "other": "Сейчас вы состоите в %(count)s комнатах"
+    },
     "You can add more later too, including already existing ones.": "Позже можно добавить и другие, в том числе уже существующие.",
     "Let's create a room for each of them.": "Давайте создадим для каждого из них отдельную комнату.",
     "What are some things you want to discuss in %(spaceName)s?": "Какие вещи вы хотите обсуждать в %(spaceName)s?",
@@ -2336,8 +2422,10 @@
     "Search for rooms": "Поиск комнат",
     "Want to add a new room instead?": "Хотите добавить новую комнату?",
     "Add existing rooms": "Добавить существующие комнаты",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Добавление комнаты…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Добавление комнат… (%(progress)s из %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Добавление комнаты…",
+        "other": "Добавление комнат… (%(progress)s из %(count)s)"
+    },
     "Not all selected were added": "Не все выбранные добавлены",
     "Search for spaces": "Поиск пространств",
     "Create a new space": "Создать новое пространство",
@@ -2345,17 +2433,25 @@
     "Add existing space": "Добавить существующее пространство",
     "You are not allowed to view this server's rooms list": "Вам не разрешено просматривать список комнат этого сервера",
     "Please provide an address": "Пожалуйста, укажите адрес",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sизменил(а) разрешения сервера",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sизменил(а) разрешения сервера %(count)s раз(а)",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sизменили разрешения сервера",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sизменили разрешения сервера %(count)s раз(а)",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sизменил(а) разрешения сервера",
+        "other": "%(oneUser)sизменил(а) разрешения сервера %(count)s раз(а)"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)sизменили разрешения сервера",
+        "other": "%(severalUsers)sизменили разрешения сервера %(count)s раз(а)"
+    },
     "Zoom in": "Увеличить",
     "Zoom out": "Уменьшить",
-    "%(count)s people you know have already joined|one": "%(count)s человек, которого вы знаете, уже присоединился",
-    "%(count)s people you know have already joined|other": "%(count)s человек(а), которых вы знаете, уже присоединились",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s человек, которого вы знаете, уже присоединился",
+        "other": "%(count)s человек(а), которых вы знаете, уже присоединились"
+    },
     "Including %(commaSeparatedMembers)s": "Включая %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Посмотреть 1 участника",
-    "View all %(count)s members|other": "Просмотреть всех %(count)s участников",
+    "View all %(count)s members": {
+        "one": "Посмотреть 1 участника",
+        "other": "Просмотреть всех %(count)s участников"
+    },
     "Share content": "Поделиться содержимым",
     "Application window": "Окно приложения",
     "Share entire screen": "Поделиться всем экраном",
@@ -2394,8 +2490,10 @@
     "End-to-end encryption isn't enabled": "Сквозное шифрование не включено",
     "Invite to just this room": "Пригласить только в эту комнату",
     "%(seconds)ss left": "%(seconds)s осталось",
-    "Show %(count)s other previews|one": "Показать %(count)s другой предварительный просмотр",
-    "Show %(count)s other previews|other": "Показать %(count)s других предварительных просмотров",
+    "Show %(count)s other previews": {
+        "one": "Показать %(count)s другой предварительный просмотр",
+        "other": "Показать %(count)s других предварительных просмотров"
+    },
     "Failed to send": "Не удалось отправить",
     "Access": "Доступ",
     "People with supported clients will be able to join the room without having a registered account.": "Люди с поддерживаемыми клиентами смогут присоединиться к комнате, не имея зарегистрированной учётной записи.",
@@ -2404,8 +2502,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Любой человек в пространстве может найти и присоединиться. Вы можете выбрать несколько пространств.",
     "Spaces with access": "Пространства с доступом",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Любой человек в пространстве может найти и присоединиться. <a>Укажите здесь, какие пространства могут получить доступ.</a>",
-    "Currently, %(count)s spaces have access|other": "В настоящее время %(count)s пространств имеют доступ",
-    "& %(count)s more|other": "и %(count)s ещё",
+    "Currently, %(count)s spaces have access": {
+        "other": "В настоящее время %(count)s пространств имеют доступ",
+        "one": "В настоящее время пространство имеет доступ"
+    },
+    "& %(count)s more": {
+        "other": "и %(count)s ещё",
+        "one": "и %(count)s еще"
+    },
     "Upgrade required": "Требуется обновление",
     "Anyone can find and join.": "Любой желающий может найти и присоединиться.",
     "Only invited people can join.": "Присоединиться могут только приглашенные люди.",
@@ -2522,8 +2626,6 @@
     "Change space name": "Изменить название пространства",
     "Change space avatar": "Изменить аватар пространства",
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Любой человек в <spaceName/> может найти и присоединиться. Вы можете выбрать и другие пространства.",
-    "Currently, %(count)s spaces have access|one": "В настоящее время пространство имеет доступ",
-    "& %(count)s more|one": "и %(count)s еще",
     "Cross-signing is ready but keys are not backed up.": "Кросс-подпись готова, но ключи не резервируются.",
     "Autoplay videos": "Автовоспроизведение видео",
     "Autoplay GIFs": "Автовоспроизведение GIF",
@@ -2589,10 +2691,14 @@
     "Thread": "Обсуждение",
     "Reply to thread…": "Ответить на обсуждение…",
     "Reply to encrypted thread…": "Ответить на зашифрованное обсуждение…",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Обновление пространства…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Обновление пространств... (%(progress)s из %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Отправка приглашения…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Отправка приглашений... (%(progress)s из %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Обновление пространства…",
+        "other": "Обновление пространств... (%(progress)s из %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Отправка приглашения…",
+        "other": "Отправка приглашений... (%(progress)s из %(count)s)"
+    },
     "Loading new room": "Загрузка новой комнаты",
     "Upgrading room": "Обновление комнаты",
     "Ban from %(roomName)s": "Заблокировать в %(roomName)s",
@@ -2610,8 +2716,10 @@
     "They'll still be able to access whatever you're not an admin of.": "Они по-прежнему смогут получить доступ ко всему, где вы не являетесь администратором.",
     "Disinvite from %(roomName)s": "Отменить приглашение из %(roomName)s",
     "Threads": "Обсуждения",
-    "%(count)s reply|one": "%(count)s ответ",
-    "%(count)s reply|other": "%(count)s ответов",
+    "%(count)s reply": {
+        "one": "%(count)s ответ",
+        "other": "%(count)s ответов"
+    },
     "View in room": "Просмотреть в комнате",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Введите свою секретную фразу или <button> используйте секретный ключ </button> для продолжения.",
     "The email address doesn't appear to be valid.": "Адрес электронной почты не является действительным.",
@@ -2718,10 +2826,14 @@
     "Sorry, the poll you tried to create was not posted.": "Не удалось отправить опрос, который вы пытались создать.",
     "Failed to post poll": "Не удалось отправить опрос",
     "Create Poll": "Создать опрос",
-    "was removed %(count)s times|one": "был удалён",
-    "was removed %(count)s times|other": "удалено %(count)s раз(а)",
-    "were removed %(count)s times|one": "были удалены",
-    "were removed %(count)s times|other": "удалены %(count)s раз(а)",
+    "was removed %(count)s times": {
+        "one": "был удалён",
+        "other": "удалено %(count)s раз(а)"
+    },
+    "were removed %(count)s times": {
+        "one": "были удалены",
+        "other": "удалены %(count)s раз(а)"
+    },
     "Including you, %(commaSeparatedMembers)s": "Включая вас, %(commaSeparatedMembers)s",
     "Backspace": "Очистить",
     "Unknown error fetching location. Please try again later.": "Неизвестная ошибка при получении местоположения. Пожалуйста, повторите попытку позже.",
@@ -2731,15 +2843,23 @@
     "Could not fetch location": "Не удалось получить местоположение",
     "Location": "Местоположение",
     "toggle event": "переключить событие",
-    "%(count)s votes|one": "%(count)s голос",
-    "%(count)s votes|other": "%(count)s голосов",
-    "Based on %(count)s votes|one": "На основании %(count)s голоса",
-    "Based on %(count)s votes|other": "На основании %(count)s голосов",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s голос. Проголосуйте, чтобы увидеть результаты",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s голосов. Проголосуйте, чтобы увидеть результаты",
+    "%(count)s votes": {
+        "one": "%(count)s голос",
+        "other": "%(count)s голосов"
+    },
+    "Based on %(count)s votes": {
+        "one": "На основании %(count)s голоса",
+        "other": "На основании %(count)s голосов"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s голос. Проголосуйте, чтобы увидеть результаты",
+        "other": "%(count)s голосов. Проголосуйте, чтобы увидеть результаты"
+    },
     "No votes cast": "Голосов нет",
-    "Final result based on %(count)s votes|one": "Окончательный результат на основе %(count)s голоса",
-    "Final result based on %(count)s votes|other": "Окончательный результат на основе %(count)s голосов",
+    "Final result based on %(count)s votes": {
+        "one": "Окончательный результат на основе %(count)s голоса",
+        "other": "Окончательный результат на основе %(count)s голосов"
+    },
     "Sorry, your vote was not registered. Please try again.": "Извините, ваш голос не был засчитан. Пожалуйста, попробуйте еще раз.",
     "Vote not registered": "Голос не засчитан",
     "Expand map": "Развернуть карту",
@@ -2821,12 +2941,18 @@
     "Rename": "Переименовать",
     "Select all": "Выбрать все",
     "Deselect all": "Отменить выбор",
-    "Sign out devices|one": "Выйти из устройства",
-    "Sign out devices|other": "Выйти из устройств",
-    "Click the button below to confirm signing out these devices.|one": "Нажмите кнопку ниже, чтобы подтвердить выход из этого устройства.",
-    "Click the button below to confirm signing out these devices.|other": "Нажмите кнопку ниже, чтобы подтвердить выход из этих устройств.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Подтвердите выход из этого устройства с помощью единого входа, чтобы подтвердить свою личность.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Подтвердите выход из этих устройств с помощью единого входа, чтобы подтвердить свою личность.",
+    "Sign out devices": {
+        "one": "Выйти из устройства",
+        "other": "Выйти из устройств"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Нажмите кнопку ниже, чтобы подтвердить выход из этого устройства.",
+        "other": "Нажмите кнопку ниже, чтобы подтвердить выход из этих устройств."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Подтвердите выход из этого устройства с помощью единого входа, чтобы подтвердить свою личность.",
+        "other": "Подтвердите выход из этих устройств с помощью единого входа, чтобы подтвердить свою личность."
+    },
     "Pin to sidebar": "Закрепить на боковой панели",
     "Quick settings": "Быстрые настройки",
     "Waiting for you to verify on your other device…": "Ожидает проверки на другом устройстве…",
@@ -2855,16 +2981,24 @@
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "Ранее вы давали согласие на передачу нам анонимных данных об использовании. Мы изменили порядок предоставления этих данных.",
     "Help improve %(analyticsOwner)s": "Помогите улучшить %(analyticsOwner)s",
     "That's fine": "Всё в порядке",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Экспортировано %(count)s событие за %(seconds)s секунд",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Экспортировано %(count)s событий за %(seconds)s секунд",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Экспортировано %(count)s событие за %(seconds)s секунд",
+        "other": "Экспортировано %(count)s событий за %(seconds)s секунд"
+    },
     "Export successful!": "Успешно экспортировано!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Получено %(count)s событие за %(seconds)sс",
-    "Fetched %(count)s events so far|one": "Получено %(count)s событие",
-    "Fetched %(count)s events out of %(total)s|one": "Извлечено %(count)s из %(total)s события",
-    "Fetched %(count)s events in %(seconds)ss|other": "Получено %(count)s событий за %(seconds)sс",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Получено %(count)s событие за %(seconds)sс",
+        "other": "Получено %(count)s событий за %(seconds)sс"
+    },
+    "Fetched %(count)s events so far": {
+        "one": "Получено %(count)s событие",
+        "other": "Получено %(count)s событий"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Извлечено %(count)s из %(total)s события",
+        "other": "Получено %(count)s из %(total)s событий"
+    },
     "Processing event %(number)s out of %(total)s": "Обработано %(number)s из %(total)s событий",
-    "Fetched %(count)s events so far|other": "Получено %(count)s событий",
-    "Fetched %(count)s events out of %(total)s|other": "Получено %(count)s из %(total)s событий",
     "Generating a ZIP": "Генерация ZIP-файла",
     "Remove, ban, or invite people to your active room, and make you leave": "Удалять, блокировать или приглашать людей в вашей активной комнате, в частности, вас",
     "Remove, ban, or invite people to this room, and make you leave": "Удалять, блокировать или приглашать людей в этой комнате, в частности, вас",
@@ -2885,8 +3019,10 @@
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Мы не смогли распознать заданную дату (%(inputDate)s). Попробуйте использовать формат ГГГГ-ММ-ДД.",
     "Command error: Unable to handle slash command.": "Ошибка команды: невозможно обработать команду slash.",
     "Command error: Unable to find rendering type (%(renderingType)s)": "Ошибка команды: невозможно найти тип рендеринга (%(renderingType)s)",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s и %(count)s другой",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s и %(count)s других",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s и %(count)s другой",
+        "other": "%(spaceName)s и %(count)s других"
+    },
     "You cannot place calls without a connection to the server.": "Вы не можете совершать вызовы без подключения к серверу.",
     "Connectivity to the server has been lost": "Соединение с сервером потеряно",
     "You cannot place calls in this browser.": "Вы не можете совершать вызовы в этом браузере.",
@@ -2904,26 +3040,40 @@
     "Feedback sent! Thanks, we appreciate it!": "Отзыв отправлен! Спасибо, мы ценим это!",
     "Export Cancelled": "Экспорт отменён",
     "<empty string>": "<пустая строка>",
-    "<%(count)s spaces>|one": "<пространство>",
-    "<%(count)s spaces>|other": "<%(count)s пространств>",
+    "<%(count)s spaces>": {
+        "one": "<пространство>",
+        "other": "<%(count)s пространств>"
+    },
     "Results are only revealed when you end the poll": "Результаты отображаются только после завершения опроса",
     "Voters see results as soon as they have voted": "Голосующие увидят результаты сразу после голосования",
     "Closed poll": "Закрытый опрос",
     "Open poll": "Открытый опрос",
     "Poll type": "Тип опроса",
     "Edit poll": "Редактировать опрос",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sотправил(а) скрытое сообщение",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sотправил(а) %(count)s скрытых сообщения(-й)",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sотправили скрытое сообщение",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sотправили %(count)s скрытых сообщения(-й)",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s удалил(а) сообщение",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sудалил(а) %(count)s сообщения(-й)",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sудалили сообщение",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sудалили %(count)s сообщения(-й)",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sизменил(а) <a>закреплённые сообщения</a> комнаты",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sизменил(а) <a>закреплённые сообщения</a> комнаты %(count)s раз(а)",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s изменили <a>закреплённые сообщения</a> комнаты",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s изменили <a>закреплённые сообщения</a> комнаты %(count)s раз(а)",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sотправил(а) скрытое сообщение",
+        "other": "%(oneUser)sотправил(а) %(count)s скрытых сообщения(-й)"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sотправили скрытое сообщение",
+        "other": "%(severalUsers)sотправили %(count)s скрытых сообщения(-й)"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s удалил(а) сообщение",
+        "other": "%(oneUser)sудалил(а) %(count)s сообщения(-й)"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sудалили сообщение",
+        "other": "%(severalUsers)sудалили %(count)s сообщения(-й)"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)sизменил(а) <a>закреплённые сообщения</a> комнаты",
+        "other": "%(oneUser)sизменил(а) <a>закреплённые сообщения</a> комнаты %(count)s раз(а)"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s изменили <a>закреплённые сообщения</a> комнаты",
+        "other": "%(severalUsers)s изменили <a>закреплённые сообщения</a> комнаты %(count)s раз(а)"
+    },
     "What location type do you want to share?": "Каким типом местоположения вы хотите поделиться?",
     "Drop a Pin": "Маркер на карте",
     "My live location": "Моё местоположение в реальном времени",
@@ -2994,8 +3144,10 @@
     "You were removed by %(memberName)s": "%(memberName)s исключил(а) вас",
     "Forget this space": "Забыть это пространство",
     "Loading preview": "Загрузка предпросмотра",
-    "Currently removing messages in %(count)s rooms|one": "Удаляются сообщения в %(count)s комнате",
-    "Currently removing messages in %(count)s rooms|other": "Удаляются сообщения в %(count)s комнатах",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Удаляются сообщения в %(count)s комнате",
+        "other": "Удаляются сообщения в %(count)s комнатах"
+    },
     "Sends the given message with hearts": "Отправляет данное сообщение с сердечками",
     "You were disconnected from the call. (Error: %(message)s)": "Вас отключили от звонка. (Ошибка: %(message)s)",
     "Next recently visited room or space": "Следующая недавно посещённая комната или пространство",
@@ -3012,8 +3164,10 @@
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или названия комнат, которые вы посетили, с какими элементами пользовательского интерфейса вы взаимодействовали в последний раз, а также имена пользователей других пользователей. Они не содержат сообщений.",
     "Deactivating your account is a permanent action — be careful!": "Деактивация вашей учётной записи является необратимым действием — будьте осторожны!",
     "Your password was successfully changed.": "Ваш пароль успешно изменён.",
-    "Confirm signing out these devices|one": "Подтвердите выход из этого устройства",
-    "Confirm signing out these devices|other": "Подтвердите выход из этих устройств",
+    "Confirm signing out these devices": {
+        "one": "Подтвердите выход из этого устройства",
+        "other": "Подтвердите выход из этих устройств"
+    },
     "Developer tools": "Инструменты разработчика",
     "Unmute microphone": "Включить микрофон",
     "Turn on camera": "Включить камеру",
@@ -3021,8 +3175,10 @@
     "Video devices": "Видеоустройства",
     "Mute microphone": "Отключить микрофон",
     "Audio devices": "Аудиоустройства",
-    "%(count)s people joined|one": "%(count)s человек присоединился",
-    "%(count)s people joined|other": "%(count)s человек(а) присоединились",
+    "%(count)s people joined": {
+        "one": "%(count)s человек присоединился",
+        "other": "%(count)s человек(а) присоединились"
+    },
     "sends hearts": "отправляет сердечки",
     "Enable hardware acceleration": "Включить аппаратное ускорение",
     "Remove from space": "Исключить из пространства",
@@ -3097,8 +3253,10 @@
     "Show spaces": "Показать пространства",
     "Show rooms": "Показать комнаты",
     "Search for": "Поиск",
-    "%(count)s Members|one": "%(count)s участник",
-    "%(count)s Members|other": "%(count)s участников",
+    "%(count)s Members": {
+        "one": "%(count)s участник",
+        "other": "%(count)s участников"
+    },
     "Check if you want to hide all current and future messages from this user.": "Выберите, хотите ли вы скрыть все текущие и будущие сообщения от этого пользователя.",
     "Ignore user": "Игнорировать пользователя",
     "When you sign out, these keys will be deleted from this device, which means you won't be able to read encrypted messages unless you have the keys for them on your other devices, or backed them up to the server.": "При выходе эти ключи будут удалены с данного устройства и вы больше не сможете прочитать зашифрованные сообщения, если у вас нет ключей для них на других устройствах или резервной копии на сервере.",
@@ -3124,8 +3282,10 @@
     "Create a video room": "Создайте видеокомнату",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Отключите, чтобы удалить системные сообщения о пользователе (изменения членства, редактирование профиля…)",
     "Preserve system messages": "Оставить системные сообщения",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Вы собираетесь удалить %(count)s сообщение от %(user)s. Это удалит его навсегда для всех в разговоре. Точно продолжить?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Вы собираетесь удалить %(count)s сообщений от %(user)s. Это удалит их навсегда для всех в разговоре. Точно продолжить?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Вы собираетесь удалить %(count)s сообщение от %(user)s. Это удалит его навсегда для всех в разговоре. Точно продолжить?",
+        "other": "Вы собираетесь удалить %(count)s сообщений от %(user)s. Это удалит их навсегда для всех в разговоре. Точно продолжить?"
+    },
     "%(featureName)s Beta feedback": "%(featureName)s — отзыв о бета-версии",
     "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Помогите нам выявить проблемы и улучшить %(analyticsOwner)s, поделившись анонимными данными об использовании. Чтобы понять, как люди используют несколько устройств, мы генерируем случайный идентификатор, общий для всех ваших устройств.",
     "Show: Matrix rooms": "Показать: комнаты Matrix",
@@ -3147,8 +3307,10 @@
     "Unban from space": "Разблокировать в пространстве",
     "Disinvite from room": "Отозвать приглашение в комнату",
     "Disinvite from space": "Отозвать приглашение в пространство",
-    "%(count)s participants|one": "1 участник",
-    "%(count)s participants|other": "%(count)s участников",
+    "%(count)s participants": {
+        "one": "1 участник",
+        "other": "%(count)s участников"
+    },
     "Joining…": "Присоединение…",
     "Video": "Видео",
     "Show Labs settings": "Показать настройки лаборатории",
@@ -3164,8 +3326,10 @@
     "You can still join here.": "Вы всё ещё можете присоединиться сюда.",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "При попытке проверить ваше приглашение была возвращена ошибка (%(errcode)s). Вы можете попытаться передать эту информацию пригласившему вас лицу.",
     "Video rooms are a beta feature": "Видеокомнаты – это бета-функция",
-    "Seen by %(count)s people|one": "Просмотрел %(count)s человек",
-    "Seen by %(count)s people|other": "Просмотрели %(count)s людей",
+    "Seen by %(count)s people": {
+        "one": "Просмотрел %(count)s человек",
+        "other": "Просмотрели %(count)s людей"
+    },
     "Upgrade this space to the recommended room version": "Обновите это пространство до рекомендуемой версии комнаты",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Если вы отправили ошибку через GitHub, журналы отладки могут помочь нам отследить проблему. ",
     "Show HTML representation of room topics": "Показать HTML-представление тем комнаты",
@@ -3199,8 +3363,10 @@
     "Mapbox logo": "Логотип Mapbox",
     "Enter fullscreen": "Перейти в полноэкранный режим",
     "Exit fullscreen": "Выйти из полноэкранного режима",
-    "In %(spaceName)s and %(count)s other spaces.|one": "В %(spaceName)s и %(count)s другом пространстве.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "В %(spaceName)s и %(count)s других пространствах.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "В %(spaceName)s и %(count)s другом пространстве.",
+        "other": "В %(spaceName)s и %(count)s других пространствах."
+    },
     "In spaces %(space1Name)s and %(space2Name)s.": "В пространствах %(space1Name)s и %(space2Name)s.",
     "Unverified": "Не заверено",
     "Verified": "Заверено",
@@ -3243,8 +3409,10 @@
     "Presence": "Присутствие",
     "Complete these to get the most out of %(brand)s": "Выполните их, чтобы получить максимальную отдачу от %(brand)s",
     "You did it!": "Вы сделали это!",
-    "Only %(count)s steps to go|one": "Осталось всего %(count)s шагов до конца",
-    "Only %(count)s steps to go|other": "Осталось всего %(count)s шагов",
+    "Only %(count)s steps to go": {
+        "one": "Осталось всего %(count)s шагов до конца",
+        "other": "Осталось всего %(count)s шагов"
+    },
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Сохраняйте право над владением и контроль над обсуждением в сообществе.\nМасштабируйте, чтобы поддерживать миллионы, с мощной модерацией и функциональной совместимостью.",
     "Community ownership": "Владение сообществом",
     "With free end-to-end encrypted messaging, and unlimited voice and video calls, %(brand)s is a great way to stay in touch.": "Благодаря бесплатному сквозному шифрованному обмену сообщениями и неограниченным голосовым и видеозвонкам, %(brand)s это отличный способ оставаться на связи.",
@@ -3279,8 +3447,10 @@
     "%(user1)s and %(user2)s": "%(user1)s и %(user2)s",
     "No unverified sessions found.": "Незаверенных сеансов не обнаружено.",
     "No verified sessions found.": "Заверенных сеансов не обнаружено.",
-    "%(user)s and %(count)s others|other": "%(user)s и ещё %(count)s",
-    "%(user)s and %(count)s others|one": "%(user)s и ещё 1",
+    "%(user)s and %(count)s others": {
+        "other": "%(user)s и ещё %(count)s",
+        "one": "%(user)s и ещё 1"
+    },
     "Verify your sessions for enhanced secure messaging or sign out from those you don't recognize or use anymore.": "Подтвердите свои сеансы для более безопасного обмена сообщениями или выйдите из тех, которые более не признаёте или не используете.",
     "For best security, sign out from any session that you don't recognize or use anymore.": "Для лучшей безопасности выйдите из всех сеансов, которые вы более не признаёте или не используете.",
     "Inactive for %(inactiveAgeDays)s days or longer": "Неактивны %(inactiveAgeDays)s дней или дольше",
@@ -3324,8 +3494,10 @@
     "Video call started in %(roomName)s. (not supported by this browser)": "Видеовызов начался в %(roomName)s. (не поддерживается этим браузером)",
     "Video call started in %(roomName)s.": "Видеовызов начался в %(roomName)s.",
     "You need to be able to kick users to do that.": "Вы должны иметь возможность пинать пользователей, чтобы сделать это.",
-    "Inviting %(user)s and %(count)s others|one": "Приглашающий %(user)s и 1 других",
-    "Inviting %(user)s and %(count)s others|other": "Приглашение %(user)s и %(count)s других",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Приглашающий %(user)s и 1 других",
+        "other": "Приглашение %(user)s и %(count)s других"
+    },
     "Inviting %(user1)s and %(user2)s": "Приглашение %(user1)s и %(user2)s",
     "Fill screen": "Заполнить экран",
     "Sorry — this call is currently full": "Извините — этот вызов в настоящее время заполнен",
@@ -3361,8 +3533,10 @@
     "Other users in direct messages and rooms that you join are able to view a full list of your sessions.": "Другие пользователи, будучи в личных сообщениях и посещаемых вами комнатах, могут видеть полный перечень ваших сеансов.",
     "Renaming sessions": "Переименование сеансов",
     "Please be aware that session names are also visible to people you communicate with.": "Пожалуйста, имейте в виду, что названия сеансов также видны людям, с которыми вы общаетесь.",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Вы уверены, что хотите выйти из %(count)s сеанса?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Вы уверены, что хотите выйти из %(count)s сеансов?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Вы уверены, что хотите выйти из %(count)s сеанса?",
+        "other": "Вы уверены, что хотите выйти из %(count)s сеансов?"
+    },
     "You have unverified sessions": "У вас есть незаверенные сеансы",
     "Rich text editor": "Наглядный текстовый редактор",
     "Search users in this room…": "Поиск пользователей в этой комнате…",
@@ -3419,12 +3593,16 @@
     "Hide formatting": "Скрыть форматирование",
     "This message could not be decrypted": "Это сообщение не удалось расшифровать",
     " in <strong>%(room)s</strong>": " в <strong>%(room)s</strong>",
-    "Sign out of %(count)s sessions|one": "Выйти из %(count)s сеанса",
-    "Sign out of %(count)s sessions|other": "Выйти из сеансов: %(count)s",
+    "Sign out of %(count)s sessions": {
+        "one": "Выйти из %(count)s сеанса",
+        "other": "Выйти из сеансов: %(count)s"
+    },
     "Show QR code": "Показать QR код",
     "Sign in with QR code": "Войти с QR кодом",
-    "%(count)s sessions selected|one": "%(count)s сеанс выбран",
-    "%(count)s sessions selected|other": "Сеансов выбрано: %(count)s",
+    "%(count)s sessions selected": {
+        "one": "%(count)s сеанс выбран",
+        "other": "Сеансов выбрано: %(count)s"
+    },
     "For best security and privacy, it is recommended to use Matrix clients that support encryption.": "Для лучшей безопасности и конфиденциальности, рекомендуется использовать клиенты Matrix с поддержкой шифрования.",
     "Hide details": "Скрыть подробности",
     "Show details": "Показать подробности",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 1397d2bc90..ac92376f81 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -116,8 +116,10 @@
     "Unmute": "Zrušiť stlmenie",
     "Mute": "Umlčať",
     "Admin Tools": "Nástroje správcu",
-    "and %(count)s others...|other": "a ďalších %(count)s…",
-    "and %(count)s others...|one": "a jeden ďalší…",
+    "and %(count)s others...": {
+        "other": "a ďalších %(count)s…",
+        "one": "a jeden ďalší…"
+    },
     "Invited": "Pozvaní",
     "Filter room members": "Filtrovať členov v miestnosti",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (oprávnenie %(powerLevelNumber)s)",
@@ -135,8 +137,10 @@
     "Unknown": "Neznámy",
     "Unnamed room": "Nepomenovaná miestnosť",
     "Save": "Uložiť",
-    "(~%(count)s results)|other": "(~%(count)s výsledkov)",
-    "(~%(count)s results)|one": "(~%(count)s výsledok)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s výsledkov)",
+        "one": "(~%(count)s výsledok)"
+    },
     "Join Room": "Vstúpiť do miestnosti",
     "Upload avatar": "Nahrať obrázok",
     "Settings": "Nastavenia",
@@ -208,52 +212,96 @@
     "No results": "Žiadne výsledky",
     "Home": "Domov",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstúpili",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)svstúpili",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s%(count)s krát vstúpil",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)svstúpil",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s krát opustili",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sopustili",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s%(count)s krát opustil",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sodišiel/a",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s%(count)s krát vstúpili a opustili",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)svstúpili a opustili",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s%(count)s krát vstúpil a opustil",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)svstúpil a opustil",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s%(count)s krát opustili a znovu vstúpili",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sopustili a znovu vstúpili",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s%(count)s krát opustil a znovu vstúpil",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sopustil a znovu vstúpil",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s%(count)s krát odmietli pozvanie",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sodmietly pozvanie",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s%(count)s krát odmietol pozvanie",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sodmietol pozvanie",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)smali %(count)s krát stiahnuté pozvanie",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)smali stiahnuté pozvanie",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)smal %(count)s krát stiahnuté pozvanie",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)smal stiahnuté pozvanie",
-    "were invited %(count)s times|other": "boli %(count)s krát pozvaní",
-    "were invited %(count)s times|one": "boli pozvaní",
-    "was invited %(count)s times|other": "bol %(count)s krát pozvaný",
-    "was invited %(count)s times|one": "bol pozvaný",
-    "were banned %(count)s times|other": "mali %(count)s krát zakázaný vstup",
-    "were banned %(count)s times|one": "mali zakázaný vstup",
-    "was banned %(count)s times|other": "mal %(count)s krát zakázaný vstup",
-    "was banned %(count)s times|one": "mal zakázaný vstup",
-    "were unbanned %(count)s times|other": "mali %(count)s krát povolený vstup",
-    "were unbanned %(count)s times|one": "mali povolený vstup",
-    "was unbanned %(count)s times|other": "mal %(count)s krát povolený vstup",
-    "was unbanned %(count)s times|one": "mal povolený vstup",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)ssi %(count)s krát zmenili meno",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)ssi zmenili meno",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)ssi %(count)s krát zmenil meno",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)ssi zmenil meno",
-    "%(items)s and %(count)s others|other": "%(items)s a %(count)s ďalší",
-    "%(items)s and %(count)s others|one": "%(items)s a jeden ďalší",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s%(count)s krát vstúpili",
+        "one": "%(severalUsers)svstúpili"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s%(count)s krát vstúpil",
+        "one": "%(oneUser)svstúpil"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s%(count)s krát opustili",
+        "one": "%(severalUsers)sopustili"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s%(count)s krát opustil",
+        "one": "%(oneUser)sodišiel/a"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s%(count)s krát vstúpili a opustili",
+        "one": "%(severalUsers)svstúpili a opustili"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s%(count)s krát vstúpil a opustil",
+        "one": "%(oneUser)svstúpil a opustil"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s%(count)s krát opustili a znovu vstúpili",
+        "one": "%(severalUsers)sopustili a znovu vstúpili"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s%(count)s krát opustil a znovu vstúpil",
+        "one": "%(oneUser)sopustil a znovu vstúpil"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s%(count)s krát odmietli pozvanie",
+        "one": "%(severalUsers)sodmietly pozvanie"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s%(count)s krát odmietol pozvanie",
+        "one": "%(oneUser)sodmietol pozvanie"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)smali %(count)s krát stiahnuté pozvanie",
+        "one": "%(severalUsers)smali stiahnuté pozvanie"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)smal %(count)s krát stiahnuté pozvanie",
+        "one": "%(oneUser)smal stiahnuté pozvanie"
+    },
+    "were invited %(count)s times": {
+        "other": "boli %(count)s krát pozvaní",
+        "one": "boli pozvaní"
+    },
+    "was invited %(count)s times": {
+        "other": "bol %(count)s krát pozvaný",
+        "one": "bol pozvaný"
+    },
+    "were banned %(count)s times": {
+        "other": "mali %(count)s krát zakázaný vstup",
+        "one": "mali zakázaný vstup"
+    },
+    "was banned %(count)s times": {
+        "other": "mal %(count)s krát zakázaný vstup",
+        "one": "mal zakázaný vstup"
+    },
+    "were unbanned %(count)s times": {
+        "other": "mali %(count)s krát povolený vstup",
+        "one": "mali povolený vstup"
+    },
+    "was unbanned %(count)s times": {
+        "other": "mal %(count)s krát povolený vstup",
+        "one": "mal povolený vstup"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)ssi %(count)s krát zmenili meno",
+        "one": "%(severalUsers)ssi zmenili meno"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)ssi %(count)s krát zmenil meno",
+        "one": "%(oneUser)ssi zmenil meno"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s a %(count)s ďalší",
+        "one": "%(items)s a jeden ďalší"
+    },
     "%(items)s and %(lastItem)s": "%(items)s a tiež %(lastItem)s",
     "Custom level": "Vlastná úroveň",
     "Start chat": "Začať konverzáciu",
-    "And %(count)s more...|other": "A %(count)s ďalších…",
+    "And %(count)s more...": {
+        "other": "A %(count)s ďalších…"
+    },
     "Confirm Removal": "Potvrdiť odstránenie",
     "Create": "Vytvoriť",
     "Unknown error": "Neznáma chyba",
@@ -294,9 +342,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Pri pokuse načítať konkrétny bod v histórii tejto miestnosti sa vyskytla chyba, nemáte povolenie na zobrazenie zodpovedajúcej správy.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Pokus o načítanie konkrétneho bodu na časovej osi tejto miestnosti, ale nepodarilo sa ho nájsť.",
     "Failed to load timeline position": "Nepodarilo sa načítať pozíciu na časovej osi",
-    "Uploading %(filename)s and %(count)s others|other": "Nahrávanie %(filename)s a %(count)s ďalších súborov",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Nahrávanie %(filename)s a %(count)s ďalších súborov",
+        "one": "Nahrávanie %(filename)s a %(count)s ďalší súbor"
+    },
     "Uploading %(filename)s": "Nahrávanie %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Nahrávanie %(filename)s a %(count)s ďalší súbor",
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detekciu jazyka pre zvýraznenie syntaxe",
@@ -599,8 +649,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s zamedzil hosťom vstúpiť do miestnosti.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s zmenil prístup hostí na %(rule)s",
     "%(displayName)s is typing …": "%(displayName)s píše …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s a %(count)s ďalší píšu …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s a jeden ďalší píše …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s a %(count)s ďalší píšu …",
+        "one": "%(names)s a jeden ďalší píše …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s a %(lastPerson)s píšu …",
     "The user must be unbanned before they can be invited.": "Tomuto používateľovi musíte pred odoslaním pozvania povoliť vstup.",
     "Render simple counters in room header": "Zobraziť jednoduchú štatistiku v záhlaví miestnosti",
@@ -928,10 +980,14 @@
     "Opens chat with the given user": "Otvorí konverzáciu s daným používateľom",
     "Sends a message to the given user": "Pošle správu danému používateľovi",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s zmenil/a meno miestnosti z %(oldRoomName)s na %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pridal/a alternatívne adresy %(addresses)s pre túto miestnosť.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pridal/a alternatívnu adresu %(addresses)s pre túto miestnosť.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odstránil/a alternatívne adresy %(addresses)s pre túto miestnosť.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odstránil/a alternatívnu adresu %(addresses)s pre túto miestnosť.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s pridal/a alternatívne adresy %(addresses)s pre túto miestnosť.",
+        "one": "%(senderName)s pridal/a alternatívnu adresu %(addresses)s pre túto miestnosť."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s odstránil/a alternatívne adresy %(addresses)s pre túto miestnosť.",
+        "one": "%(senderName)s odstránil/a alternatívnu adresu %(addresses)s pre túto miestnosť."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s zmenil/a alternatívne adresy pre túto miestnosť.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s zmenil/a hlavnú a alternatívne adresy pre túto miestnosť.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s zmenil/a adresy pre túto miestnosť.",
@@ -1494,7 +1550,10 @@
     "Invite people": "Pozvať ľudí",
     "Room options": "Možnosti miestnosti",
     "Search for spaces": "Hľadať priestory",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Aktualizácia priestoru...",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Aktualizácia priestoru...",
+        "other": "Aktualizácia priestorov... (%(progress)s z %(count)s)"
+    },
     "Spaces with access": "Priestory s prístupom",
     "Spaces": "Priestory",
     "Notification options": "Možnosti oznámenia",
@@ -1504,8 +1563,14 @@
     "You sent a verification request": "Odoslali ste žiadosť o overenie",
     "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s zmenil/a svoje meno na %(displayName)s",
     "Message": "Správa",
-    "Remove %(count)s messages|other": "Odstrániť %(count)s správ",
-    "%(count)s unread messages.|other": "%(count)s neprečítaných správ.",
+    "Remove %(count)s messages": {
+        "other": "Odstrániť %(count)s správ",
+        "one": "Odstrániť 1 správu"
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s neprečítaných správ.",
+        "one": "1 neprečítaná správa."
+    },
     "Message deleted": "Správa vymazaná",
     "Create a new space": "Vytvoriť nový priestor",
     "Create a space": "Vytvoriť priestor",
@@ -1513,16 +1578,20 @@
     "Trusted": "Dôveryhodné",
     "Edit devices": "Upraviť zariadenia",
     "Hide verified sessions": "Skryť overené relácie",
-    "%(count)s verified sessions|one": "1 overená relácia",
-    "%(count)s verified sessions|other": "%(count)s overených relácií",
+    "%(count)s verified sessions": {
+        "one": "1 overená relácia",
+        "other": "%(count)s overených relácií"
+    },
     "Messages in this room are not end-to-end encrypted.": "Správy v tejto miestnosti nie sú šifrované od vás až k príjemcovi.",
     "Messages in this room are end-to-end encrypted.": "Správy v tejto miestnosti sú šifrované od vás až k príjemcovi.",
     "Expand": "Rozbaliť",
     "Show all your rooms in Home, even if they're in a space.": "Zobrazte všetky miestnosti v časti Domov, aj keď sú v priestore.",
     "Show all rooms in Home": "Zobraziť všetky miestnosti v časti Domov",
     "Sign out and remove encryption keys?": "Odhlásiť sa a odstrániť šifrovacie kľúče?",
-    "Sign out devices|one": "Odhlásiť zariadenie",
-    "Sign out devices|other": "Odhlásené zariadenia",
+    "Sign out devices": {
+        "one": "Odhlásiť zariadenie",
+        "other": "Odhlásené zariadenia"
+    },
     "Rename": "Premenovať",
     "Image size in the timeline": "Veľkosť obrázku na časovej osi",
     "Unable to copy a link to the room to the clipboard.": "Nie je možné skopírovať odkaz na miestnosť do schránky.",
@@ -1714,8 +1783,10 @@
     "Manage & explore rooms": "Spravovať a preskúmať miestnosti",
     "Enter the name of a new server you want to explore.": "Zadajte názov nového servera, ktorý chcete preskúmať.",
     "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s prijal/a pozvanie pre %(displayName)s",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "V predchádzajúcej verzii tejto miestnosti máte %(count)s neprečítané oznámenie.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "V predchádzajúcej verzii tejto miestnosti máte %(count)s neprečítaných oznámení.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "V predchádzajúcej verzii tejto miestnosti máte %(count)s neprečítané oznámenie.",
+        "other": "V predchádzajúcej verzii tejto miestnosti máte %(count)s neprečítaných oznámení."
+    },
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Túto miestnosť aktualizujete z verzie <oldVersion /> na <newVersion />.",
     "This version of %(brand)s does not support searching encrypted messages": "Táto verzia aplikácie %(brand)s nepodporuje vyhľadávanie zašifrovaných správ",
     "This version of %(brand)s does not support viewing some encrypted files": "Táto verzia aplikácie %(brand)s nepodporuje zobrazovanie niektorých zašifrovaných súborov",
@@ -1770,8 +1841,10 @@
     "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "Toto je začiatok exportu miestnosti <roomName/>. Exportované <exporterDetails/> dňa %(exportDate)s.",
     "You created this room.": "Túto miestnosť ste vytvorili vy.",
     "Hide sessions": "Skryť relácie",
-    "%(count)s sessions|one": "%(count)s relácia",
-    "%(count)s sessions|other": "%(count)s relácie",
+    "%(count)s sessions": {
+        "one": "%(count)s relácia",
+        "other": "%(count)s relácie"
+    },
     "About homeservers": "O domovských serveroch",
     "About": "Informácie",
     "<a>Add a topic</a> to help people know what it is about.": "<a>Pridajte tému</a>, aby ľudia vedeli, o čo ide.",
@@ -1820,8 +1893,10 @@
     "Hide Widgets": "Skryť widgety",
     "Widgets": "Widgety",
     "No files visible in this room": "V tejto miestnosti nie sú viditeľné žiadne súbory",
-    "Upload %(count)s other files|one": "Nahrať %(count)s ďalší súbor",
-    "Upload %(count)s other files|other": "Nahrať %(count)s ďalších súborov",
+    "Upload %(count)s other files": {
+        "one": "Nahrať %(count)s ďalší súbor",
+        "other": "Nahrať %(count)s ďalších súborov"
+    },
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Niektoré súbory sú <b>príliš veľké</b> na to, aby sa dali nahrať. Limit veľkosti súboru je %(limit)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Tieto súbory sú <b>príliš veľké</b> na nahratie. Limit veľkosti súboru je %(limit)s.",
     "Upload files (%(current)s of %(total)s)": "Nahrať súbory (%(current)s z %(total)s)",
@@ -1848,8 +1923,10 @@
     "If disabled, messages from encrypted rooms won't appear in search results.": "Ak nie je povolené, správy zo zašifrovaných miestností sa nezobrazia vo výsledkoch vyhľadávania.",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s bezpečne ukladá zašifrované správy do lokálnej vyrovnávacej pamäte, aby sa mohli zobrazovať vo výsledkoch vyhľadávania:",
     "Indexed messages:": "Indexované správy:",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Bezpečné lokálne ukladanie zašifrovaných správ do vyrovnávacej pamäte, aby sa zobrazovali vo výsledkoch vyhľadávania, použijúc %(size)s na ukladanie správ z %(rooms)s miestnosti.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Bezpečné lokálne ukladanie zašifrovaných správ do vyrovnávacej pamäte, aby sa zobrazovali vo výsledkoch vyhľadávania, použijúc %(size)s na ukladanie správ z %(rooms)s miestností.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Bezpečné lokálne ukladanie zašifrovaných správ do vyrovnávacej pamäte, aby sa zobrazovali vo výsledkoch vyhľadávania, použijúc %(size)s na ukladanie správ z %(rooms)s miestnosti.",
+        "other": "Bezpečné lokálne ukladanie zašifrovaných správ do vyrovnávacej pamäte, aby sa zobrazovali vo výsledkoch vyhľadávania, použijúc %(size)s na ukladanie správ z %(rooms)s miestností."
+    },
     "Unable to set up secret storage": "Nie je možné nastaviť tajné úložisko",
     "Unable to query secret storage status": "Nie je možné vykonať dopyt na stav tajného úložiska",
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Nie je možné získať prístup k tajnému úložisku. Skontrolujte, či ste zadali správnu bezpečnostnú frázu.",
@@ -1869,14 +1946,19 @@
     "Use Ctrl + F to search timeline": "Na vyhľadávanie na časovej osi použite klávesovú skratku Ctrl + F",
     "To view all keyboard shortcuts, <a>click here</a>.": "Ak chcete zobraziť všetky klávesové skratky, <a>kliknite sem</a>.",
     "Keyboard shortcuts": "Klávesové skratky",
-    "View all %(count)s members|one": "Zobraziť 1 člena",
+    "View all %(count)s members": {
+        "one": "Zobraziť 1 člena",
+        "other": "Zobraziť všetkých %(count)s členov"
+    },
     "Topic: %(topic)s": "Téma: %(topic)s",
     "Server isn't responding": "Server neodpovedá",
     "Edited at %(date)s": "Upravené %(date)s",
     "Confirm Security Phrase": "Potvrdiť bezpečnostnú frázu",
     "Upgrade your encryption": "Aktualizujte svoje šifrovanie",
-    "Show %(count)s more|one": "Zobraziť %(count)s viac",
-    "Show %(count)s more|other": "Zobraziť %(count)s viac",
+    "Show %(count)s more": {
+        "one": "Zobraziť %(count)s viac",
+        "other": "Zobraziť %(count)s viac"
+    },
     "Error removing address": "Chyba pri odstraňovaní adresy",
     "Error creating address": "Chyba pri vytváraní adresy",
     "Upload a file": "Nahrať súbor",
@@ -1898,16 +1980,23 @@
     "Your user ID": "Vaše ID používateľa",
     "Your display name": "Vaše zobrazované meno",
     "You verified %(name)s": "Overili ste používateľa %(name)s",
-    "%(count)s unread messages.|one": "1 neprečítaná správa.",
-    "%(count)s unread messages including mentions.|one": "1 neprečítaná zmienka.",
+    "%(count)s unread messages including mentions.": {
+        "one": "1 neprečítaná zmienka.",
+        "other": "%(count)s neprečítaných správ vrátane zmienok."
+    },
     "Travel & Places": "Cestovanie a miesta",
     "Food & Drink": "Jedlo a nápoje",
     "Animals & Nature": "Zvieratá a príroda",
-    "Remove %(count)s messages|one": "Odstrániť 1 správu",
     "Terms of Service": "Podmienky poskytovania služby",
     "Clear all data": "Vymazať všetky údaje",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snespravil žiadne zmeny",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)snespravili žiadne zmeny",
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)snespravil žiadne zmeny",
+        "other": "%(oneUser)s nevykonal žiadne zmeny %(count)s krát"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)snespravili žiadne zmeny",
+        "other": "%(severalUsers)s nevykonali žiadne zmeny %(count)s krát"
+    },
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagoval %(shortName)s</reactedWith>",
     "Passwords don't match": "Heslá sa nezhodujú",
     "Nice, strong password!": "Pekné, silné heslo!",
@@ -2071,8 +2160,10 @@
     "Add people": "Pridať ľudí",
     "Add option": "Pridať možnosť",
     "Adding spaces has moved.": "Pridávanie priestorov bolo presunuté.",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Pridávanie miestností... (%(progress)s z %(count)s)",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Pridávanie miestnosti...",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "other": "Pridávanie miestností... (%(progress)s z %(count)s)",
+        "one": "Pridávanie miestnosti..."
+    },
     "Add existing space": "Pridať existujúci priestor",
     "Add existing rooms": "Pridať existujúce miestnosti",
     "Add existing room": "Pridať existujúcu miestnosť",
@@ -2102,8 +2193,10 @@
     "Enter your account password to confirm the upgrade:": "Na potvrdenie aktualizácie zadajte heslo svojho účtu:",
     "%(brand)s URL": "%(brand)s URL",
     "Your theme": "Váš vzhľad",
-    "Currently joining %(count)s rooms|other": "Momentálne ste pripojení k %(count)s miestnostiam",
-    "Currently joining %(count)s rooms|one": "Momentálne ste pripojení k %(count)s miestnosti",
+    "Currently joining %(count)s rooms": {
+        "other": "Momentálne ste pripojení k %(count)s miestnostiam",
+        "one": "Momentálne ste pripojení k %(count)s miestnosti"
+    },
     "Use a more compact 'Modern' layout": "Použiť kompaktnejšie \"moderné\" usporiadanie",
     "Show all rooms": "Zobraziť všetky miestnosti",
     "Forget Room": "Zabudnúť miestnosť",
@@ -2112,8 +2205,10 @@
     "Message preview": "Náhľad správy",
     "%(roomName)s can't be previewed. Do you want to join it?": "Nie je možné zobraziť náhľad miestnosti %(roomName)s. Chcete sa k nej pripojiť?",
     "You're previewing %(roomName)s. Want to join it?": "Zobrazujete náhľad %(roomName)s. Chcete sa k nej pripojiť?",
-    "Show %(count)s other previews|one": "Zobraziť %(count)s ďalší náhľad",
-    "Show %(count)s other previews|other": "Zobraziť %(count)s ďalších náhľadov",
+    "Show %(count)s other previews": {
+        "one": "Zobraziť %(count)s ďalší náhľad",
+        "other": "Zobraziť %(count)s ďalších náhľadov"
+    },
     "Allow people to preview your space before they join.": "Umožnite ľuďom prezrieť si váš priestor predtým, ako sa k vám pripoja.",
     "Preview Space": "Prehľad priestoru",
     "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Ktokoľvek bude môcť nájsť túto miestnosť a pripojiť sa k nej, nielen členovia <SpaceName/>.",
@@ -2140,11 +2235,13 @@
     "Change space name": "Zmeniť názov priestoru",
     "Change space avatar": "Zmeniť obrázok priestoru",
     "Send a sticker": "Odoslať nálepku",
-    "& %(count)s more|one": "a %(count)s viac",
+    "& %(count)s more": {
+        "one": "a %(count)s viac",
+        "other": "& %(count)s viac"
+    },
     "Unknown failure: %(reason)s": "Neznáma chyba: %(reason)s",
     "Unmute the microphone": "Zrušiť stlmenie mikrofónu",
     "Mute the microphone": "Stlmiť mikrofón",
-    "& %(count)s more|other": "& %(count)s viac",
     "Collapse reply thread": "Zbaliť vlákno odpovedí",
     "Settings - %(spaceName)s": "Nastavenia - %(spaceName)s",
     "Nothing pinned, yet": "Zatiaľ nie je nič pripnuté",
@@ -2171,9 +2268,14 @@
     "End Poll": "Ukončiť anketu",
     "Share location": "Zdieľať polohu",
     "Mentions only": "Iba zmienky",
-    "%(count)s reply|one": "%(count)s odpoveď",
-    "%(count)s reply|other": "%(count)s odpovedí",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Odosielanie pozvánky...",
+    "%(count)s reply": {
+        "one": "%(count)s odpoveď",
+        "other": "%(count)s odpovedí"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Odosielanie pozvánky...",
+        "other": "Odosielanie pozvánok... (%(progress)s z %(count)s)"
+    },
     "Upgrading room": "Aktualizácia miestnosti",
     "Export Successful": "Export úspešný",
     "Change description": "Zmeniť popis",
@@ -2223,15 +2325,16 @@
     "You can select all or individual messages to retry or delete": "Môžete vybrať všetky alebo jednotlivé správy, ktoré chcete opakovane odoslať alebo vymazať",
     "Delete all": "Vymazať všetko",
     "Some of your messages have not been sent": "Niektoré vaše správy ešte neboli odoslané",
-    "%(count)s people you know have already joined|one": "%(count)s človek, ktorého poznáte, sa už pripojil",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s človek, ktorého poznáte, sa už pripojil",
+        "other": "%(count)s ľudí, ktorých poznáte, sa už pripojilo"
+    },
     "Including %(commaSeparatedMembers)s": "Vrátane %(commaSeparatedMembers)s",
-    "View all %(count)s members|other": "Zobraziť všetkých %(count)s členov",
     "Failed to send": "Nepodarilo sa odoslať",
     "Reset everything": "Obnoviť všetko",
     "View message": "Zobraziť správu",
     "%(seconds)ss left": "%(seconds)ss ostáva",
     "We couldn't create your DM.": "Nemohli sme vytvoriť vašu priamu správu.",
-    "%(count)s people you know have already joined|other": "%(count)s ľudí, ktorých poznáte, sa už pripojilo",
     "unknown person": "neznáma osoba",
     "%(deviceId)s from %(ip)s": "%(deviceId)s z %(ip)s",
     "Just me": "Iba ja",
@@ -2241,7 +2344,10 @@
     "No results found": "Nenašli sa žiadne výsledky",
     "Mark as suggested": "Označiť ako odporúčanú",
     "This room is suggested as a good one to join": "Táto miestnosť sa odporúča ako vhodná na pripojenie",
-    "%(count)s rooms|one": "%(count)s miestnosť",
+    "%(count)s rooms": {
+        "one": "%(count)s miestnosť",
+        "other": "%(count)s miestností"
+    },
     "You don't have permission": "Nemáte povolenie",
     "Invite by username": "Pozvať podľa používateľského mena",
     "Invite your teammates": "Pozvite svojich kolegov z tímu",
@@ -2249,8 +2355,10 @@
     "Who are you working with?": "S kým spolupracujete?",
     "Skip for now": "Zatiaľ preskočiť",
     "Room name": "Názov miestnosti",
-    "%(count)s members|one": "%(count)s člen",
-    "%(count)s members|other": "%(count)s členov",
+    "%(count)s members": {
+        "one": "%(count)s člen",
+        "other": "%(count)s členov"
+    },
     "Failed to start livestream": "Nepodarilo sa spustiť livestream",
     "Unable to start audio streaming.": "Nie je možné spustiť streamovanie zvuku.",
     "Save Changes": "Uložiť zmeny",
@@ -2270,7 +2378,6 @@
     "We call the places where you can host your account 'homeservers'.": "Miesta, kde môžete hosťovať svoj účet, nazývame \" domovské servery\".",
     "Other rooms in %(spaceName)s": "Ostatné miestnosti v %(spaceName)s",
     "Other rooms": "Ostatné miestnosti",
-    "%(count)s rooms|other": "%(count)s miestností",
     "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Pri vytváraní tejto adresy došlo k chybe. Je možné, že ju server nepovoľuje alebo došlo k dočasnému zlyhaniu.",
     "Click the button below to confirm setting up encryption.": "Kliknutím na tlačidlo nižšie potvrdíte nastavenie šifrovania.",
     "Confirm encryption setup": "Potvrdiť nastavenie šifrovania",
@@ -2302,14 +2409,22 @@
     "Identity server URL does not appear to be a valid identity server": "URL adresa servera totožností sa nezdá byť platným serverom totožností",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Adresa URL domovského servera sa nezdá byť platným domovským serverom Matrixu",
     "Other users can invite you to rooms using your contact details": "Ostatní používatelia vás môžu pozývať do miestností pomocou vašich kontaktných údajov",
-    "%(count)s votes|one": "%(count)s hlas",
-    "%(count)s votes|other": "%(count)s hlasov",
-    "Based on %(count)s votes|one": "Na základe %(count)s hlasu",
-    "Based on %(count)s votes|other": "Na základe %(count)s hlasov",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s odovzdaný hlas. Hlasujte a pozrite si výsledky",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s odovzdaných hlasov. Hlasujte a pozrite si výsledky",
-    "Final result based on %(count)s votes|one": "Konečný výsledok na základe %(count)s hlasu",
-    "Final result based on %(count)s votes|other": "Konečný výsledok na základe %(count)s hlasov",
+    "%(count)s votes": {
+        "one": "%(count)s hlas",
+        "other": "%(count)s hlasov"
+    },
+    "Based on %(count)s votes": {
+        "one": "Na základe %(count)s hlasu",
+        "other": "Na základe %(count)s hlasov"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s odovzdaný hlas. Hlasujte a pozrite si výsledky",
+        "other": "%(count)s odovzdaných hlasov. Hlasujte a pozrite si výsledky"
+    },
+    "Final result based on %(count)s votes": {
+        "one": "Konečný výsledok na základe %(count)s hlasu",
+        "other": "Konečný výsledok na základe %(count)s hlasov"
+    },
     "Sorry, your vote was not registered. Please try again.": "Je nám ľúto, váš hlas nebol zaregistrovaný. Skúste to prosím znova.",
     "Vote not registered": "Hlasovanie nie je zaregistrované",
     "No votes cast": "Žiadne odovzdané hlasy",
@@ -2363,8 +2478,10 @@
     "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s odstránil svoje zobrazované meno (%(oldDisplayName)s)",
     "Converts the DM to a room": "Premení priamu správu na miestnosť",
     "Converts the room to a DM": "Premení miestnosť na priamu správu",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s a %(count)s ďalší",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s a %(count)s ďalší",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s a %(count)s ďalší",
+        "other": "%(spaceName)s a %(count)s ďalší"
+    },
     "Some invites couldn't be sent": "Niektoré pozvánky nebolo možné odoslať",
     "%(date)s at %(time)s": "%(date)s o %(time)s",
     "Page Down": "Page Down",
@@ -2418,7 +2535,6 @@
     "This client does not support end-to-end encryption.": "Tento klient nepodporuje end-to-end šifrovanie.",
     "Failed to deactivate user": "Nepodarilo sa deaktivovať používateľa",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Chýbajúci verejný kľúč captcha v konfigurácii domovského servera. Nahláste to, prosím, správcovi domovského servera.",
-    "%(count)s unread messages including mentions.|other": "%(count)s neprečítaných správ vrátane zmienok.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Prosím <newIssueLink>vytvorte nový problém</newIssueLink> na GitHube, aby sme mohli túto chybu preskúmať.",
     "To continue you need to accept the terms of this service.": "Ak chcete pokračovať, musíte prijať podmienky tejto služby.",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Pri veľkom množstve správ to môže trvať určitý čas. Medzitým prosím neobnovujte svojho klienta.",
@@ -2428,8 +2544,6 @@
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deaktivácia tohto používateľa ho odhlási a zabráni mu v opätovnom prihlásení. Okrem toho opustí všetky miestnosti, v ktorých sa nachádza. Túto akciu nie je možné vrátiť späť. Ste si istí, že chcete tohto používateľa deaktivovať?",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Na pozvanie e-mailom použite server identity. Vykonajte zmeny v <settings>Nastaveniach</settings>.",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Na pozvanie e-mailom použite server identity. <default>Použite predvolený (%(defaultIdentityServerName)s)</default> alebo spravujte v <settings>nastaveniach</settings>.",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s nevykonal žiadne zmeny %(count)s krát",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s nevykonali žiadne zmeny %(count)s krát",
     "Invalid base_url for m.identity_server": "Neplatná base_url pre m.identity_server",
     "Invalid base_url for m.homeserver": "Neplatná base_url pre m.homeserver",
     "Try to join anyway": "Skúsiť sa pripojiť aj tak",
@@ -2440,10 +2554,14 @@
     "Force complete": "Nútené dokončenie",
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Túto funkciu môžete vypnúť, ak sa miestnosť bude používať na spoluprácu s externými tímami, ktoré majú vlastný domovský server. Neskôr sa to nedá zmeniť.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s zmenil ACL servera pre túto miestnosť.",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)szmenilo ACL servera %(count)s krát",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s zmenilo ACL servera",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)szmenil ACL servera %(count)s krát",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s zmenil ACL servera",
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "other": "%(severalUsers)szmenilo ACL servera %(count)s krát",
+        "one": "%(severalUsers)s zmenilo ACL servera"
+    },
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "other": "%(oneUser)szmenil ACL servera %(count)s krát",
+        "one": "%(oneUser)s zmenil ACL servera"
+    },
     "Show all threads": "Zobraziť všetky vlákna",
     "Manage rooms in this space": "Spravovať miestnosti v tomto priestore",
     "%(senderName)s has updated the room layout": "%(senderName)s aktualizoval usporiadanie miestnosti",
@@ -2517,8 +2635,14 @@
     "The beginning of the room": "Začiatok miestnosti",
     "Jump to date": "Prejsť na dátum",
     "Pick a date to jump to": "Vyberte dátum, na ktorý chcete prejsť",
-    "were removed %(count)s times|one": "bol odstránený",
-    "was removed %(count)s times|other": "bol odstránený %(count)s krát",
+    "were removed %(count)s times": {
+        "one": "bol odstránený",
+        "other": "boli odstránení %(count)s krát"
+    },
+    "was removed %(count)s times": {
+        "other": "bol odstránený %(count)s krát",
+        "one": "bol odstránený"
+    },
     "Message pending moderation: %(reason)s": "Správa čaká na moderáciu: %(reason)s",
     "Space home": "Domov priestoru",
     "Navigate to next message in composer history": "Prejsť na ďalšiu správu v histórii editora",
@@ -2598,13 +2722,15 @@
     "Change server ACLs": "Zmeniť ACL servera",
     "There was an error loading your notification settings.": "Pri načítaní nastavení oznámení došlo k chybe.",
     "Error saving notification preferences": "Chyba pri ukladaní nastavení oznamovania",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Aktualizácia priestorov... (%(progress)s z %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Odosielanie pozvánok... (%(progress)s z %(count)s)",
     "This room is in some spaces you're not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Táto miestnosť sa nachádza v niektorých priestoroch, ktorých nie ste správcom. V týchto priestoroch bude stará miestnosť stále zobrazená, ale ľudia budú vyzvaní, aby sa pripojili k novej miestnosti.",
-    "Currently, %(count)s spaces have access|one": "V súčasnosti má priestor prístup",
-    "Currently, %(count)s spaces have access|other": "V súčasnosti má prístup %(count)s priestorov",
-    "Click the button below to confirm signing out these devices.|one": "Kliknutím na tlačidlo nižšie potvrdíte odhlásenie tohto zariadenia.",
-    "Click the button below to confirm signing out these devices.|other": "Kliknutím na tlačidlo nižšie potvrdíte odhlásenie týchto zariadení.",
+    "Currently, %(count)s spaces have access": {
+        "one": "V súčasnosti má priestor prístup",
+        "other": "V súčasnosti má prístup %(count)s priestorov"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Kliknutím na tlačidlo nižšie potvrdíte odhlásenie tohto zariadenia.",
+        "other": "Kliknutím na tlačidlo nižšie potvrdíte odhlásenie týchto zariadení."
+    },
     "not found in storage": "sa nenašiel v úložisku",
     "Failed to update the visibility of this space": "Nepodarilo sa aktualizovať viditeľnosť tohto priestoru",
     "Guests can join a space without having an account.": "Hostia sa môžu pripojiť k priestoru bez toho, aby mali konto.",
@@ -2659,7 +2785,9 @@
     "Video conference started by %(senderName)s": "Videokonferencia spustená používateľom %(senderName)s",
     "Failed to save your profile": "Nepodarilo sa uložiť váš profil",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s nastavil ACL servera pre túto miestnosť.",
-    "You can only pin up to %(count)s widgets|other": "Môžete pripnúť iba %(count)s widgetov",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Môžete pripnúť iba %(count)s widgetov"
+    },
     "No answer": "Žiadna odpoveď",
     "Cross-signing is ready but keys are not backed up.": "Krížové podpisovanie je pripravené, ale kľúče nie sú zálohované.",
     "No active call in this room": "V tejto miestnosti nie je aktívny žiadny hovor",
@@ -2690,7 +2818,6 @@
     "Sections to show": "Sekcie na zobrazenie",
     "Failed to load list of rooms.": "Nepodarilo sa načítať zoznam miestností.",
     "Now, let's help you get started": "Teraz vám pomôžeme začať",
-    "was removed %(count)s times|one": "bol odstránený",
     "Navigate to next message to edit": "Prejsť na ďalšiu správu na úpravu",
     "Navigate to previous message to edit": "Prejsť na predchádzajúcu správu na úpravu",
     "Toggle hidden event visibility": "Prepínanie viditeľnosti skrytej udalosti",
@@ -2743,8 +2870,14 @@
     "The server (%(serverName)s) took too long to respond.": "Serveru (%(serverName)s) trvalo príliš dlho, kým odpovedal.",
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Váš server neodpovedá na niektoré vaše požiadavky. Nižšie sú uvedené niektoré z najpravdepodobnejších dôvodov.",
     "Spam or propaganda": "Spam alebo propaganda",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sposlal/a skrytú správu",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sposlalo %(count)s skrytých správ",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sposlal/a skrytú správu",
+        "other": "%(oneUser)sposlal %(count)s skrytých správ"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "other": "%(severalUsers)sposlalo %(count)s skrytých správ",
+        "one": "%(severalUsers)sposlalo skrytú správu"
+    },
     "Unable to validate homeserver": "Nie je možné overiť domovský server",
     "Sends the given message with confetti": "Odošle danú správu s konfetami",
     "sends confetti": "pošle konfety",
@@ -2769,14 +2902,15 @@
     "Reply in thread": "Odpovedať vo vlákne",
     "Reply to thread…": "Odpovedať na vlákno…",
     "From a thread": "Z vlákna",
-    "were removed %(count)s times|other": "boli odstránení %(count)s krát",
     "Maximise": "Maximalizovať",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sodstránili %(count)s správ",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s odstránili správu",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s odstránil/a %(count)s správ",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sodstránil správu",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sposlalo skrytú správu",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sposlal %(count)s skrytých správ",
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "other": "%(severalUsers)sodstránili %(count)s správ",
+        "one": "%(severalUsers)s odstránili správu"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)s odstránil/a %(count)s správ",
+        "one": "%(oneUser)sodstránil správu"
+    },
     "There was an error looking up the phone number": "Pri vyhľadávaní telefónneho čísla došlo k chybe",
     "Unable to look up phone number": "Nie je možné vyhľadať telefónne číslo",
     "You cannot place calls without a connection to the server.": "Bez pripojenia k serveru nie je možné uskutočňovať hovory.",
@@ -2791,12 +2925,18 @@
     "The export was cancelled successfully": "Export bol úspešne zrušený",
     "Size can only be a number between %(min)s MB and %(max)s MB": "Veľkosť môže byť len medzi %(min)s MB a %(max)s MB",
     "<empty string>": "<prázdny reťazec>",
-    "<%(count)s spaces>|one": "<priestor>",
-    "<%(count)s spaces>|other": "<%(count)s priestorov>",
-    "Fetched %(count)s events in %(seconds)ss|one": "Načítaná %(count)s udalosť za %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "Načítaných %(count)s udalostí za %(seconds)ss",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Exportovaná %(count)s udalosť za %(seconds)s sekúnd",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Exportovaných %(count)s udalostí za %(seconds)s sekúnd",
+    "<%(count)s spaces>": {
+        "one": "<priestor>",
+        "other": "<%(count)s priestorov>"
+    },
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Načítaná %(count)s udalosť za %(seconds)ss",
+        "other": "Načítaných %(count)s udalostí za %(seconds)ss"
+    },
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Exportovaná %(count)s udalosť za %(seconds)s sekúnd",
+        "other": "Exportovaných %(count)s udalostí za %(seconds)s sekúnd"
+    },
     "File Attached": "Priložený súbor",
     "Unban from %(roomName)s": "Zrušiť zákaz vstup do %(roomName)s",
     "Ban from %(roomName)s": "Zakázať vstup do %(roomName)s",
@@ -2842,8 +2982,10 @@
     "Open thread": "Otvoriť vlákno",
     "Failed to update the join rules": "Nepodarilo sa aktualizovať pravidlá pripojenia",
     "Remove messages sent by me": "Odstrániť správy odoslané mnou",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Potvrďte odhlásenie týchto zariadení pomocou jednotného prihlásenia (SSO) na preukázanie svojej totožnosti.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Potvrďte odhlásenie tohto zariadenia pomocou jednotného prihlásenia (SSO) na preukázanie svojej totožnosti.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "other": "Potvrďte odhlásenie týchto zariadení pomocou jednotného prihlásenia (SSO) na preukázanie svojej totožnosti.",
+        "one": "Potvrďte odhlásenie tohto zariadenia pomocou jednotného prihlásenia (SSO) na preukázanie svojej totožnosti."
+    },
     "%(peerName)s held the call": "%(peerName)s podržal hovor",
     "You held the call <a>Resume</a>": "Podržali ste hovor <a>Pokračovať</a>",
     "You held the call <a>Switch</a>": "Podržali ste hovor <a>Prepnúť</a>",
@@ -2892,10 +3034,14 @@
     "Processing event %(number)s out of %(total)s": "Spracovanie udalosti %(number)s z %(total)s",
     "Media omitted": "Médium vynechané",
     "Media omitted - file size limit exceeded": "Médium vynechané - prekročený limit veľkosti súboru",
-    "Fetched %(count)s events so far|one": "Zatiaľ získaná %(count)s udalosť",
-    "Fetched %(count)s events so far|other": "Zatiaľ získané %(count)s udalosti",
-    "Fetched %(count)s events out of %(total)s|one": "Získaná %(count)s udalosť z %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Získané %(count)s udalosti z %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Zatiaľ získaná %(count)s udalosť",
+        "other": "Zatiaľ získané %(count)s udalosti"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Získaná %(count)s udalosť z %(total)s",
+        "other": "Získané %(count)s udalosti z %(total)s"
+    },
     "Command error: Unable to find rendering type (%(renderingType)s)": "Chyba príkazu: Nie je možné nájsť typ vykresľovania (%(renderingType)s)",
     "Command error: Unable to handle slash command.": "Chyba príkazu: Nie je možné spracovať lomkový príkaz.",
     "Already in call": "Hovor už prebieha",
@@ -2910,10 +3056,14 @@
     "Insert a trailing colon after user mentions at the start of a message": "Vložiť na koniec dvojbodku za zmienkou používateľa na začiatku správy",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Odpovedzte na prebiehajúce vlákno alebo použite \"%(replyInThread)s\", keď prejdete nad správu a začnete novú.",
     "Show polls button": "Zobraziť tlačidlo ankiet",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)szmenili <a>pripnuté správy</a> v miestnosti %(count)s krát",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)szmenili <a>pripnuté správy</a> v miestnosti",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)szmenil <a>pripnuté správy</a> v miestnosti %(count)s krát",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)szmenil <a>pripnuté správy</a> v miestnosti",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(severalUsers)szmenili <a>pripnuté správy</a> v miestnosti %(count)s krát",
+        "one": "%(severalUsers)szmenili <a>pripnuté správy</a> v miestnosti"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(oneUser)szmenil <a>pripnuté správy</a> v miestnosti %(count)s krát",
+        "one": "%(oneUser)szmenil <a>pripnuté správy</a> v miestnosti"
+    },
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Ostatným sme pozvánky poslali, ale nižšie uvedené osoby nemohli byť pozvané do <RoomName/>",
     "Answered Elsewhere": "Hovor prijatý inde",
     "Takes the call in the current room off hold": "Zruší podržanie hovoru v aktuálnej miestnosti",
@@ -2966,10 +3116,14 @@
     "%(displayName)s's live location": "Poloha používateľa %(displayName)s v reálnom čase",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Zrušte označenie, ak chcete odstrániť aj systémové správy o tomto používateľovi (napr. zmena členstva, zmena profilu...)",
     "Preserve system messages": "Zachovať systémové správy",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Chystáte sa odstrániť %(count)s správu od používateľa %(user)s. Týmto ju natrvalo odstránite pre všetkých účastníkov konverzácie. Chcete pokračovať?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Chystáte sa odstrániť %(count)s správ od používateľa %(user)s. Týmto ich natrvalo odstránite pre všetkých účastníkov konverzácie. Chcete pokračovať?",
-    "Currently removing messages in %(count)s rooms|one": "V súčasnosti sa odstraňujú správy v %(count)s miestnosti",
-    "Currently removing messages in %(count)s rooms|other": "V súčasnosti sa odstraňujú správy v %(count)s miestnostiach",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Chystáte sa odstrániť %(count)s správu od používateľa %(user)s. Týmto ju natrvalo odstránite pre všetkých účastníkov konverzácie. Chcete pokračovať?",
+        "other": "Chystáte sa odstrániť %(count)s správ od používateľa %(user)s. Týmto ich natrvalo odstránite pre všetkých účastníkov konverzácie. Chcete pokračovať?"
+    },
+    "Currently removing messages in %(count)s rooms": {
+        "one": "V súčasnosti sa odstraňujú správy v %(count)s miestnosti",
+        "other": "V súčasnosti sa odstraňujú správy v %(count)s miestnostiach"
+    },
     "%(value)ss": "%(value)ss",
     "%(value)sm": "%(value)sm",
     "%(value)sh": "%(value)sh",
@@ -3055,16 +3209,20 @@
     "Create room": "Vytvoriť miestnosť",
     "Create video room": "Vytvoriť video miestnosť",
     "Create a video room": "Vytvoriť video miestnosť",
-    "%(count)s participants|one": "1 účastník",
-    "%(count)s participants|other": "%(count)s účastníkov",
+    "%(count)s participants": {
+        "one": "1 účastník",
+        "other": "%(count)s účastníkov"
+    },
     "New video room": "Nová video miestnosť",
     "New room": "Nová miestnosť",
     "Threads help keep your conversations on-topic and easy to track.": "Vlákna pomáhajú udržiavať konverzácie v téme a uľahčujú ich sledovanie.",
     "%(featureName)s Beta feedback": "%(featureName)s Beta spätná väzba",
     "sends hearts": "pošle srdiečka",
     "Sends the given message with hearts": "Odošle danú správu so srdiečkami",
-    "Confirm signing out these devices|one": "Potvrďte odhlásenie z tohto zariadenia",
-    "Confirm signing out these devices|other": "Potvrdiť odhlásenie týchto zariadení",
+    "Confirm signing out these devices": {
+        "one": "Potvrďte odhlásenie z tohto zariadenia",
+        "other": "Potvrdiť odhlásenie týchto zariadení"
+    },
     "Live location ended": "Ukončenie polohy v reálnom čase",
     "View live location": "Zobraziť polohu v reálnom čase",
     "Live until %(expiryTime)s": "Poloha v reálnom čase do %(expiryTime)s",
@@ -3101,8 +3259,10 @@
     "You will not be able to reactivate your account": "Svoje konto nebudete môcť opätovne aktivovať",
     "Confirm that you would like to deactivate your account. If you proceed:": "Potvrďte, že chcete deaktivovať svoje konto. Ak budete pokračovať:",
     "To continue, please enter your account password:": "Aby ste mohli pokračovať, prosím zadajte svoje heslo:",
-    "Seen by %(count)s people|one": "Videl %(count)s človek",
-    "Seen by %(count)s people|other": "Videlo %(count)s ľudí",
+    "Seen by %(count)s people": {
+        "one": "Videl %(count)s človek",
+        "other": "Videlo %(count)s ľudí"
+    },
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Boli ste odhlásení zo všetkých zariadení a už nebudete dostávať okamžité oznámenia. Ak chcete oznámenia znovu povoliť, prihláste sa znova na každom zariadení.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Ak si chcete zachovať prístup k histórii konverzácie v zašifrovaných miestnostiach, pred pokračovaním nastavte zálohovanie kľúčov alebo exportujte kľúče správ z niektorého z vašich ďalších zariadení.",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Odhlásenie zariadení vymaže kľúče na šifrovanie správ, ktoré sú v nich uložené, čím sa história zašifrovaných konverzácií stane nečitateľnou.",
@@ -3134,8 +3294,10 @@
     "Click to read topic": "Kliknutím si prečítate tému",
     "Edit topic": "Upraviť tému",
     "Joining…": "Pripájanie…",
-    "%(count)s people joined|one": "%(count)s človek sa pripojil",
-    "%(count)s people joined|other": "%(count)s ľudí sa pripojilo",
+    "%(count)s people joined": {
+        "one": "%(count)s človek sa pripojil",
+        "other": "%(count)s ľudí sa pripojilo"
+    },
     "Check if you want to hide all current and future messages from this user.": "Označte, či chcete skryť všetky aktuálne a budúce správy od tohto používateľa.",
     "Ignore user": "Ignorovať používateľa",
     "View related event": "Zobraziť súvisiacu udalosť",
@@ -3160,7 +3322,10 @@
     "Video rooms are always-on VoIP channels embedded within a room in %(brand)s.": "Video miestnosti sú vždy zapnuté VoIP kanály zabudované do miestnosti v aplikácii %(brand)s.",
     "Video rooms": "Video miestnosti",
     "Enable hardware acceleration": "Povoliť hardvérovú akceleráciu",
-    "%(count)s Members|other": "%(count)s členov",
+    "%(count)s Members": {
+        "other": "%(count)s členov",
+        "one": "%(count)s člen"
+    },
     "Remove search filter for %(filter)s": "Odstrániť filter vyhľadávania pre %(filter)s",
     "Start a group chat": "Začať skupinovú konverzáciu",
     "Other options": "Ďalšie možnosti",
@@ -3170,7 +3335,6 @@
     "If you can't see who you're looking for, send them your invite link.": "Ak nevidíte toho, koho hľadáte, pošlite im odkaz na pozvánku.",
     "Some results may be hidden for privacy": "Niektoré výsledky môžu byť skryté kvôli ochrane súkromia",
     "Search for": "Hľadať",
-    "%(count)s Members|one": "%(count)s člen",
     "Show: Matrix rooms": "Zobraziť: Matrix miestnosti",
     "Show: %(instance)s rooms (%(server)s)": "Zobraziť: %(instance)s miestnosti (%(server)s)",
     "Add new server…": "Pridať nový server…",
@@ -3189,9 +3353,11 @@
     "Enter fullscreen": "Prejsť na celú obrazovku",
     "Map feedback": "Spätná väzba k mape",
     "Toggle attribution": "Prepínanie atribútu",
-    "In %(spaceName)s and %(count)s other spaces.|one": "V %(spaceName)s a v %(count)s ďalšom priestore.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "V %(spaceName)s a v %(count)s ďalšom priestore.",
+        "other": "V %(spaceName)s a %(count)s ďalších priestoroch."
+    },
     "In %(spaceName)s.": "V priestore %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "V %(spaceName)s a %(count)s ďalších priestoroch.",
     "In spaces %(space1Name)s and %(space2Name)s.": "V priestoroch %(space1Name)s a %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Príkaz pre vývojárov: Zruší aktuálnu reláciu odchádzajúcej skupiny a vytvorí nové relácie Olm",
     "Stop and close": "Zastaviť a zavrieť",
@@ -3210,8 +3376,10 @@
     "Spell check": "Kontrola pravopisu",
     "Complete these to get the most out of %(brand)s": "Dokončite to, aby ste získali čo najviac z aplikácie %(brand)s",
     "You did it!": "Dokázali ste to!",
-    "Only %(count)s steps to go|one": "Zostáva už len %(count)s krok",
-    "Only %(count)s steps to go|other": "Zostáva už len %(count)s krokov",
+    "Only %(count)s steps to go": {
+        "one": "Zostáva už len %(count)s krok",
+        "other": "Zostáva už len %(count)s krokov"
+    },
     "Welcome to %(brand)s": "Vitajte v aplikácii %(brand)s",
     "Find your people": "Nájdite svojich ľudí",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Zachovajte si vlastníctvo a kontrolu nad komunitnou diskusiou.\nPodpora pre milióny ľudí s výkonným moderovaním a interoperabilitou.",
@@ -3290,11 +3458,15 @@
     "Don’t miss a thing by taking %(brand)s with you": "Nezmeškáte nič, ak so sebou vezmete %(brand)s",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Neodporúča sa pridávať šifrovanie do verejných miestností.</b> Verejné miestnosti môže nájsť a pripojiť sa k nim ktokoľvek, takže si v nich môže ktokoľvek prečítať správy. Nebudete mať žiadne výhody šifrovania a neskôr ho nebudete môcť vypnúť. Šifrovanie správ vo verejnej miestnosti spomalí prijímanie a odosielanie správ.",
     "Empty room (was %(oldName)s)": "Prázdna miestnosť (bola %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Pozývanie %(user)s a 1 ďalšieho",
-    "Inviting %(user)s and %(count)s others|other": "Pozývanie %(user)s a %(count)s ďalších",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Pozývanie %(user)s a 1 ďalšieho",
+        "other": "Pozývanie %(user)s a %(count)s ďalších"
+    },
     "Inviting %(user1)s and %(user2)s": "Pozývanie %(user1)s a %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s a 1 ďalší",
-    "%(user)s and %(count)s others|other": "%(user)s a %(count)s ďalších",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s a 1 ďalší",
+        "other": "%(user)s a %(count)s ďalších"
+    },
     "%(user1)s and %(user2)s": "%(user1)s a %(user2)s",
     "Show": "Zobraziť",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s alebo %(copyButton)s",
@@ -3392,8 +3564,10 @@
     "You are already recording a voice broadcast. Please end your current voice broadcast to start a new one.": "Už nahrávate hlasové vysielanie. Ukončite aktuálne hlasové vysielanie a spustite nové.",
     "Can't start a new voice broadcast": "Nemôžete spustiť nové hlasové vysielanie",
     "play voice broadcast": "spustiť hlasové vysielanie",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Ste si istí, že sa chcete odhlásiť z %(count)s relácie?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Ste si istí, že sa chcete odhlásiť z %(count)s relácií?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Ste si istí, že sa chcete odhlásiť z %(count)s relácie?",
+        "other": "Ste si istí, že sa chcete odhlásiť z %(count)s relácií?"
+    },
     "Show formatting": "Zobraziť formátovanie",
     "Consider signing out from old sessions (%(inactiveAgeDays)s days or older) you don't use anymore.": "Zvážte odhlásenie zo starých relácií (%(inactiveAgeDays)s dní alebo starších), ktoré už nepoužívate.",
     "Removing inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.": "Odstránenie neaktívnych relácií zvyšuje bezpečnosť a výkon a uľahčuje identifikáciu podozrivých nových relácií.",
@@ -3489,8 +3663,10 @@
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Nemôžete spustiť hovor, pretože práve nahrávate živé vysielanie. Ukončite živé vysielanie, aby ste mohli začať hovor.",
     "Can’t start a call": "Nie je možné začať hovor",
     "Improve your account security by following these recommendations.": "Zlepšite zabezpečenie svojho účtu dodržiavaním týchto odporúčaní.",
-    "%(count)s sessions selected|one": "%(count)s vybraná relácia",
-    "%(count)s sessions selected|other": "%(count)s vybraných relácií",
+    "%(count)s sessions selected": {
+        "one": "%(count)s vybraná relácia",
+        "other": "%(count)s vybraných relácií"
+    },
     "Failed to read events": "Nepodarilo sa prečítať udalosť",
     "Failed to send event": "Nepodarilo sa odoslať udalosť",
     " in <strong>%(room)s</strong>": " v <strong>%(room)s</strong>",
@@ -3501,8 +3677,10 @@
     "Create a link": "Vytvoriť odkaz",
     "Link": "Odkaz",
     "Force 15s voice broadcast chunk length": "Vynútiť 15s dĺžku sekcie hlasového vysielania",
-    "Sign out of %(count)s sessions|one": "Odhlásiť sa z %(count)s relácie",
-    "Sign out of %(count)s sessions|other": "Odhlásiť sa z %(count)s relácií",
+    "Sign out of %(count)s sessions": {
+        "one": "Odhlásiť sa z %(count)s relácie",
+        "other": "Odhlásiť sa z %(count)s relácií"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Odhlásiť sa zo všetkých ostatných relácií (%(otherSessionsCount)s)",
     "Yes, end my recording": "Áno, ukončiť moje nahrávanie",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "Ak začnete počúvať toto živé vysielanie, váš aktuálny záznam živého vysielania sa ukončí.",
@@ -3606,7 +3784,9 @@
     "Room is <strong>encrypted ✅</strong>": "Miestnosť je <strong>šifrovaná ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Stav oznámenia je <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Stav neprečítaných v miestnosti: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Stav neprečítaných v miestnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Stav neprečítaných v miestnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>"
+    },
     "Ended a poll": "Ukončil anketu",
     "Due to decryption errors, some votes may not be counted": "Z dôvodu chýb v dešifrovaní sa niektoré hlasy nemusia započítať",
     "The sender has blocked you from receiving this message": "Odosielateľ vám zablokoval príjem tejto správy",
@@ -3619,10 +3799,14 @@
     "If you know a room address, try joining through that instead.": "Ak poznáte adresu miestnosti, skúste sa pripojiť prostredníctvom nej.",
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "Pokúsili ste sa pripojiť pomocou ID miestnosti bez uvedenia zoznamu serverov, cez ktoré sa môžete pripojiť. ID miestností sú interné identifikátory a bez ďalších informácií ich nemožno použiť na pripojenie k miestnosti.",
     "View poll": "Zobraziť anketu",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Za posledný deň nie sú k dispozícii žiadne minulé ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Za posledných %(count)s dní nie sú žiadne predchádzajúce ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Za uplynulý deň nie sú žiadne aktívne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Za posledných %(count)s dní nie sú aktívne žiadne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Za posledný deň nie sú k dispozícii žiadne minulé ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
+        "other": "Za posledných %(count)s dní nie sú žiadne predchádzajúce ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Za uplynulý deň nie sú žiadne aktívne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
+        "other": "Za posledných %(count)s dní nie sú aktívne žiadne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Nie sú žiadne predchádzajúce ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
     "There are no active polls. Load more polls to view polls for previous months": "Nie sú aktívne žiadne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
     "Load more polls": "Načítať ďalšie ankety",
@@ -3745,7 +3929,10 @@
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their profile picture.": "Správy sú tu end-to-end šifrované. Overte %(displayName)s v ich profile - ťuknite na ich profilový obrázok.",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Správy v tejto miestnosti sú šifrované od vás až k príjemcovi. Keď sa ľudia pridajú, môžete ich overiť v ich profile, stačí len ťuknúť na ich profilový obrázok.",
     "Your profile picture URL": "Vaša URL adresa profilového obrázka",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)ssi zmenili %(count)s-krát profilový obrázok",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)ssi zmenili %(count)s-krát profilový obrázok",
+        "one": "%(severalUsers)szmenilo svoj profilový obrázok"
+    },
     "Anyone can request to join, but admins or moderators need to grant access. You can change this later.": "O pripojenie môže požiadať ktokoľvek, ale administrátori alebo moderátori musia udeliť prístup. Toto môžete neskôr zmeniť.",
     "Thread Root ID: %(threadRootId)s": "ID koreňového vlákna: %(threadRootId)s",
     "Upgrade room": "Aktualizovať miestnosť",
@@ -3759,7 +3946,10 @@
     "Quick Actions": "Rýchle akcie",
     "Mark all messages as read": "Označiť všetky správy ako prečítané",
     "Reset to default settings": "Obnoviť predvolené nastavenia",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)s si zmenil svoj profilový obrázok %(count)s-krát",
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)s si zmenil svoj profilový obrázok %(count)s-krát",
+        "one": "%(oneUser)s zmenil/a svoj profilový obrázok"
+    },
     "User read up to (m.read.private): ": "Používateľ prečíta až do (m.read.private): ",
     "See history": "Pozrieť históriu",
     "Great! This passphrase looks strong enough": "Skvelé! Táto bezpečnostná fráza vyzerá dostatočne silná",
@@ -3777,8 +3967,6 @@
     "Failed to query public rooms": "Nepodarilo sa vyhľadať verejné miestnosti",
     "Message (optional)": "Správa (voliteľné)",
     "Your request to join is pending.": "Vaša žiadosť o pripojenie čaká na vybavenie.",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)szmenilo svoj profilový obrázok",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)s zmenil/a svoj profilový obrázok",
     "This server is using an older version of Matrix. Upgrade to Matrix %(version)s to use %(brand)s without errors.": "Tento server používa staršiu verziu systému Matrix. Ak chcete používať %(brand)s bez chýb, aktualizujte na Matrix %(version)s.",
     "Your homeserver is too old and does not support the minimum API version required. Please contact your server owner, or upgrade your server.": "Váš domovský server je príliš starý a nepodporuje minimálnu požadovanú verziu API. Obráťte sa na vlastníka servera alebo aktualizujte svoj server.",
     "Your server is unsupported": "Váš server nie je podporovaný"
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index c06d28f763..f362aad8f4 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -176,8 +176,10 @@
     "Mention": "Përmendje",
     "Invite": "Ftoje",
     "Admin Tools": "Mjete Përgjegjësi",
-    "and %(count)s others...|other": "dhe %(count)s të tjerë…",
-    "and %(count)s others...|one": "dhe një tjetër…",
+    "and %(count)s others...": {
+        "other": "dhe %(count)s të tjerë…",
+        "one": "dhe një tjetër…"
+    },
     "Filter room members": "Filtroni anëtarë dhome",
     "Attachment": "Bashkëngjitje",
     "Voice call": "Thirrje audio",
@@ -227,17 +229,34 @@
     "Create new room": "Krijoni dhomë të re",
     "No results": "S’ka përfundime",
     "Home": "Kreu",
-    "were invited %(count)s times|one": "janë ftuar",
-    "was invited %(count)s times|other": "është ftuar %(count)s herë",
-    "was invited %(count)s times|one": "është ftuar",
-    "were banned %(count)s times|one": "janë dëbuar",
-    "was banned %(count)s times|other": "është dëbuar %(count)s herë",
-    "was banned %(count)s times|one": "është dëbuar",
-    "were unbanned %(count)s times|one": "u është hequr dëbimi",
-    "was unbanned %(count)s times|other": "i është hequr dëbimi %(count)s herë",
-    "was unbanned %(count)s times|one": "i është hequr dëbimi",
-    "%(items)s and %(count)s others|other": "%(items)s dhe %(count)s të tjerë",
-    "%(items)s and %(count)s others|one": "%(items)s dhe një tjetër",
+    "were invited %(count)s times": {
+        "one": "janë ftuar",
+        "other": "janë ftuar %(count)s herë"
+    },
+    "was invited %(count)s times": {
+        "other": "është ftuar %(count)s herë",
+        "one": "është ftuar"
+    },
+    "were banned %(count)s times": {
+        "one": "janë dëbuar",
+        "other": "janë dëbuar %(count)s herë"
+    },
+    "was banned %(count)s times": {
+        "other": "është dëbuar %(count)s herë",
+        "one": "është dëbuar"
+    },
+    "were unbanned %(count)s times": {
+        "one": "u është hequr dëbimi",
+        "other": "janë dëbuar %(count)s herë"
+    },
+    "was unbanned %(count)s times": {
+        "other": "i është hequr dëbimi %(count)s herë",
+        "one": "i është hequr dëbimi"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s dhe %(count)s të tjerë",
+        "one": "%(items)s dhe një tjetër"
+    },
     "%(items)s and %(lastItem)s": "%(items)s dhe %(lastItem)s",
     "collapse": "tkurre",
     "expand": "zgjeroje",
@@ -267,9 +286,11 @@
     "Search failed": "Kërkimi shtoi",
     "No more results": "Jo më tepër përfundime",
     "Room": "Dhomë",
-    "Uploading %(filename)s and %(count)s others|other": "Po ngarkohet %(filename)s dhe %(count)s të tjera",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Po ngarkohet %(filename)s dhe %(count)s të tjera",
+        "one": "Po ngarkohet %(filename)s dhe %(count)s tjetër"
+    },
     "Uploading %(filename)s": "Po ngarkohet %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Po ngarkohet %(filename)s dhe %(count)s tjetër",
     "Sign out": "Dilni",
     "Success": "Sukses",
     "Cryptography": "Kriptografi",
@@ -340,20 +361,42 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s dërgoi një figurë.",
     "Failed to set display name": "S’u arrit të caktohej emër ekrani",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (pushtet %(powerLevelNumber)si)",
-    "(~%(count)s results)|other": "(~%(count)s përfundime)",
-    "(~%(count)s results)|one": "(~%(count)s përfundim)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s përfundime)",
+        "one": "(~%(count)s përfundim)"
+    },
     "Download %(text)s": "Shkarko %(text)s",
     "Error decrypting image": "Gabim në shfshehtëzim figure",
     "Error decrypting video": "Gabim në shfshehtëzim videoje",
     "Delete Widget": "Fshije Widget-in",
     "Delete widget": "Fshije widget-in",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)shynë dhe dolën",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)shyri dhe doli",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)shodhën poshtë ftesat e tyre",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)shodhi poshtë ftesën e tyre",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sndryshuan emrat e tyre",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sndryshoi emrin e vet",
-    "And %(count)s more...|other": "Dhe %(count)s të tjerë…",
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)shynë dhe dolën",
+        "other": "%(severalUsers)shynë dhe dolën %(count)s herë"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)shyri dhe doli",
+        "other": "%(oneUser)shyri dhe doli %(count)s herë"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)shodhën poshtë ftesat e tyre",
+        "other": "%(severalUsers)shodhën poshtë ftesat e tyre %(count)s herë"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)shodhi poshtë ftesën e tyre",
+        "other": "%(oneUser)shodhi poshtë ftesën e vet %(count)s herë"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)sndryshuan emrat e tyre",
+        "other": "%(severalUsers)sndryshuan emrat e tyre %(count)s herë"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)sndryshoi emrin e vet",
+        "other": "%(oneUser)sndryshoi emrin e vet %(count)s herë"
+    },
+    "And %(count)s more...": {
+        "other": "Dhe %(count)s të tjerë…"
+    },
     "Connectivity to the server has been lost.": "Humbi lidhja me shërbyesin.",
     "<not supported>": "<nuk mbulohet>",
     "A new password must be entered.": "Duhet dhënë një fjalëkalim i ri.",
@@ -374,31 +417,40 @@
     "Invalid file%(extra)s": "Kartelë e pavlefshme%(extra)s",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ndryshoi avatarin në %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hoqi avatarin e dhomës.",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)shynë %(count)s herë",
-    "%(severalUsers)sjoined %(count)s times|one": "Hynë %(severalUsers)s",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)shyri %(count)s herë",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)shyri",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sdolën %(count)s herë",
-    "%(severalUsers)sleft %(count)s times|one": "Dolën %(severalUsers)s",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sdoli %(count)s herë",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sdoli",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sdolën dhe rihynë",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sdoli dhe rihyri",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "U tërhoqën mbrapsht ftesat për %(severalUsers)s",
-    "were invited %(count)s times|other": "janë ftuar %(count)s herë",
-    "were banned %(count)s times|other": "janë dëbuar %(count)s herë",
-    "were unbanned %(count)s times|other": "janë dëbuar %(count)s herë",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)shynë %(count)s herë",
+        "one": "Hynë %(severalUsers)s"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)shyri %(count)s herë",
+        "one": "%(oneUser)shyri"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)sdolën %(count)s herë",
+        "one": "Dolën %(severalUsers)s"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)sdoli %(count)s herë",
+        "one": "%(oneUser)sdoli"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)sdolën dhe rihynë",
+        "other": "%(severalUsers)sdolën dhe rihynë %(count)s herë"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)sdoli dhe rihyri",
+        "other": "%(oneUser)sdoli dhe rihyri %(count)s herë"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "U tërhoqën mbrapsht ftesat për %(severalUsers)s",
+        "other": "Për %(severalUsers)s u hodhën poshtë ftesat e tyre %(count)s herë"
+    },
     "You seem to be uploading files, are you sure you want to quit?": "Duket se jeni duke ngarkuar kartela, jeni i sigurt se doni të dilet?",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s caktoi %(address)s si adresë kryesore për këtë dhomë.",
     "%(widgetName)s widget modified by %(senderName)s": "Widget-i %(widgetName)s u modifikua nga %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Widget-i %(widgetName)s u shtua nga %(senderName)s",
     "Add some now": "Shtohen ca tani",
     "Click here to see older messages.": "Klikoni këtu për të parë mesazhe më të vjetër.",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)shynë dhe dolën %(count)s herë",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sdolën dhe rihynë %(count)s herë",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sdoli dhe rihyri %(count)s herë",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sndryshuan emrat e tyre %(count)s herë",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sndryshoi emrin e vet %(count)s herë",
     "Clear cache and resync": "Spastro fshehtinën dhe rinjëkohëso",
     "Clear Storage and Sign Out": "Spastro Depon dhe Dil",
     "Permission Required": "Lypset Leje",
@@ -435,12 +487,10 @@
     "You don't currently have any stickerpacks enabled": "Hëpërhë, s’keni të aktivizuar ndonjë pako ngjitësesh",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ndryshoi avatarin e dhomës në <img/>",
     "This room is a continuation of another conversation.": "Kjo dhomë është një vazhdim i një bisede tjetër.",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)shyri dhe doli %(count)s herë",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shodhën poshtë ftesat e tyre %(count)s herë",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)shodhi poshtë ftesën e vet %(count)s herë",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "Për %(severalUsers)s u hodhën poshtë ftesat e tyre %(count)s herë",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "Për %(oneUser)s përdorues ftesa u tërhoq mbrapsht %(count)s herë",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "U tërhoq mbrapsht ftesa për %(oneUser)s",
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "Për %(oneUser)s përdorues ftesa u tërhoq mbrapsht %(count)s herë",
+        "one": "U tërhoq mbrapsht ftesa për %(oneUser)s"
+    },
     "Upgrade this room to version %(version)s": "Përmirësojeni këtë dhomë me versionin %(version)s",
     "Share Room": "Ndani Dhomë Me të Tjerë",
     "Share Room Message": "Ndani Me të Tjerë Mesazh Dhome",
@@ -586,8 +636,10 @@
     "Sets the room name": "Cakton emrin e dhomës",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s e përmirësoi këtë dhomë.",
     "%(displayName)s is typing …": "%(displayName)s po shtyp …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s dhe %(count)s të tjerë po shtypin …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s dhe një tjetër po shtypin …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s dhe %(count)s të tjerë po shtypin …",
+        "one": "%(names)s dhe një tjetër po shtypin …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s dhe %(lastPerson)s të tjerë po shtypin …",
     "Render simple counters in room header": "Vizato numëratorë të thjeshtë te kryet e dhomës",
     "Enable Emoji suggestions while typing": "Aktivizo sugjerime emoji-sh teksa shtypet",
@@ -818,8 +870,10 @@
     "Missing session data": "Mungojnë të dhëna sesioni",
     "Upload files": "Ngarko kartela",
     "Upload": "Ngarkim",
-    "Upload %(count)s other files|other": "Ngarkoni %(count)s kartela të tjera",
-    "Upload %(count)s other files|one": "Ngarkoni %(count)s kartelë tjetër",
+    "Upload %(count)s other files": {
+        "other": "Ngarkoni %(count)s kartela të tjera",
+        "one": "Ngarkoni %(count)s kartelë tjetër"
+    },
     "Cancel All": "Anuloji Krejt",
     "Upload Error": "Gabim Ngarkimi",
     "Remember my selection for this widget": "Mbaje mend përzgjedhjen time për këtë widget",
@@ -861,8 +915,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Kjo kartelë është <b>shumë e madhe</b> për ngarkim. Caku për madhësi kartelash është %(limit)s, ndërsa kjo kartelë është %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Këto kartela janë <b>shumë të mëdha</b> për ngarkim. Caku për madhësi kartelash është %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Disa kartela janë <b>shumë të mëdha</b> për ngarkim. Caku për madhësi kartelash është %(limit)s.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Keni %(count)s njoftime të palexuar në një version të mëparshëm të kësaj dhome.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Keni %(count)s njoftim të palexuar në një version të mëparshëm të kësaj dhome.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Keni %(count)s njoftime të palexuar në një version të mëparshëm të kësaj dhome.",
+        "one": "Keni %(count)s njoftim të palexuar në një version të mëparshëm të kësaj dhome."
+    },
     "Invalid base_url for m.identity_server": "Parametër base_url i i pavlefshëm për m.identity_server",
     "Identity server URL does not appear to be a valid identity server": "URL-ja e shërbyesit të identiteteve s’duket të jetë një shërbyes i vlefshëm identitetesh",
     "Uploaded sound": "U ngarkua tingull",
@@ -889,10 +945,14 @@
     "Message edits": "Përpunime mesazhi",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Përmirësimi i kësaj dhome lyp mbylljen e instancës së tanishme të dhomës dhe krijimin e një dhome të re në vend të saj. Për t’u dhënë anëtarëve të dhomës më të mirën, do të:",
     "Show all": "Shfaqi krejt",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s s’bënë ndryshime gjatë %(count)s herësh",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s s’bënë ndryshime",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)ss’bënë ndryshime gjatë %(count)s herësh",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)ss’bëri ndryshime",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s s’bënë ndryshime gjatë %(count)s herësh",
+        "one": "%(severalUsers)s s’bënë ndryshime"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)ss’bënë ndryshime gjatë %(count)s herësh",
+        "one": "%(oneUser)ss’bëri ndryshime"
+    },
     "Resend %(unsentCount)s reaction(s)": "Ridërgo %(unsentCount)s reagim(e)",
     "Your homeserver doesn't seem to support this feature.": "Shërbyesi juaj Home nuk duket se e mbulon këtë veçori.",
     "You're signed out": "Keni bërë dalje",
@@ -988,7 +1048,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Provoni të ngjiteni sipër në rrjedhën kohore, që të shihni nëse ka patur të tillë më herët.",
     "Remove recent messages by %(user)s": "Hiq mesazhe së fundi nga %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Për një sasi të madhe mesazhesh, kjo mund të dojë ca kohë. Ju lutemi, mos e rifreskoni klientin tuaj gjatë kësaj kohe.",
-    "Remove %(count)s messages|other": "Hiq %(count)s mesazhe",
+    "Remove %(count)s messages": {
+        "other": "Hiq %(count)s mesazhe",
+        "one": "Hiq 1 mesazh"
+    },
     "Remove recent messages": "Hiq mesazhe së fundi",
     "View": "Shihni",
     "Explore rooms": "Eksploroni dhoma",
@@ -1022,9 +1085,14 @@
     "Clear cache and reload": "Spastro fshehtinën dhe ringarko",
     "Your email address hasn't been verified yet": "Adresa juaj email s’është verifikuar ende",
     "Click the link in the email you received to verify and then click continue again.": "Për verifkim, klikoni lidhjen te email që morët dhe mandej vazhdoni sërish.",
-    "Remove %(count)s messages|one": "Hiq 1 mesazh",
-    "%(count)s unread messages including mentions.|other": "%(count)s mesazhe të palexuar, përfshi përmendje.",
-    "%(count)s unread messages.|other": "%(count)s mesazhe të palexuar.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s mesazhe të palexuar, përfshi përmendje.",
+        "one": "1 përmendje e palexuar."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s mesazhe të palexuar.",
+        "one": "1 mesazh i palexuar."
+    },
     "Show image": "Shfaq figurë",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Ju lutemi, <newIssueLink>krijoni një çështje të re</newIssueLink> në GitHub, që të mund ta hetojmë këtë të metë.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Mungon kyç publik captcha-je te formësimi i shërbyesit Home. Ju lutemi, njoftojani këtë përgjegjësit të shërbyesit tuaj Home.",
@@ -1038,8 +1106,6 @@
     "Trust": "Besim",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Room %(name)s": "Dhoma %(name)s",
-    "%(count)s unread messages including mentions.|one": "1 përmendje e palexuar.",
-    "%(count)s unread messages.|one": "1 mesazh i palexuar.",
     "Unread messages.": "Mesazhe të palexuar.",
     "Failed to deactivate user": "S’u arrit të çaktivizohet përdorues",
     "This client does not support end-to-end encryption.": "Ky klient nuk mbulon fshehtëzim skaj-më-skaj.",
@@ -1167,8 +1233,10 @@
     "not stored": "e padepozituar",
     "Close preview": "Mbylle paraparjen",
     "Hide verified sessions": "Fshih sesione të verifikuar",
-    "%(count)s verified sessions|other": "%(count)s sesione të verifikuar",
-    "%(count)s verified sessions|one": "1 sesion i verifikuar",
+    "%(count)s verified sessions": {
+        "other": "%(count)s sesione të verifikuar",
+        "one": "1 sesion i verifikuar"
+    },
     "Language Dropdown": "Menu Hapmbyll Gjuhësh",
     "Show more": "Shfaq më tepër",
     "Recent Conversations": "Biseda Së Fundi",
@@ -1275,8 +1343,10 @@
     "Your messages are not secure": "Mesazhet tuaj s’janë të sigurt",
     "One of the following may be compromised:": "Një nga sa vijon mund të jetë komprometuar:",
     "Your homeserver": "Shërbyesi juaj Home",
-    "%(count)s sessions|other": "%(count)s sesione",
-    "%(count)s sessions|one": "%(count)s sesion",
+    "%(count)s sessions": {
+        "other": "%(count)s sesione",
+        "one": "%(count)s sesion"
+    },
     "Hide sessions": "Fshih sesione",
     "Verify by emoji": "Verifikoje përmes emoji-t",
     "Verify by comparing unique emoji.": "Verifikoje duke krahasuar emoji unik.",
@@ -1331,10 +1401,14 @@
     "Mark all as read": "Vëru të tërave shenjë si të lexuara",
     "Not currently indexing messages for any room.": "Pa indeksuar aktualisht mesazhe nga ndonjë dhomë.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s nga %(totalRooms)s",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s shtoi adresat alternative %(addresses)s për këtë dhomë.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s shtoi adresën alternative %(addresses)s për këtë dhomë.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hoqi adresat alternative %(addresses)s për këtë dhomë.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hoqi adresën alternative %(addresses)s për këtë dhomë.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s shtoi adresat alternative %(addresses)s për këtë dhomë.",
+        "one": "%(senderName)s shtoi adresën alternative %(addresses)s për këtë dhomë."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s hoqi adresat alternative %(addresses)s për këtë dhomë.",
+        "one": "%(senderName)s hoqi adresën alternative %(addresses)s për këtë dhomë."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ndryshoi adresat alternative për këtë dhomë.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ndryshoi adresat kryesore dhe alternative për këtë dhomë.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ndryshoi emrin e dhomës nga %(oldRoomName)s në %(newRoomName)s.",
@@ -1515,8 +1589,10 @@
     "Sort by": "Renditi sipas",
     "Message preview": "Paraparje mesazhi",
     "List options": "Mundësi liste",
-    "Show %(count)s more|other": "Shfaq %(count)s të tjera",
-    "Show %(count)s more|one": "Shfaq %(count)s tjetër",
+    "Show %(count)s more": {
+        "other": "Shfaq %(count)s të tjera",
+        "one": "Shfaq %(count)s tjetër"
+    },
     "Room options": "Mundësi dhome",
     "Light": "E çelët",
     "Dark": "E errët",
@@ -1647,7 +1723,9 @@
     "Move right": "Lëvize djathtas",
     "Move left": "Lëvize majtas",
     "Revoke permissions": "Shfuqizoji lejet",
-    "You can only pin up to %(count)s widgets|other": "Mundeni të fiksoni deri në %(count)s widget-e",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Mundeni të fiksoni deri në %(count)s widget-e"
+    },
     "Show Widgets": "Shfaqi Widget-et",
     "Hide Widgets": "Fshihi Widget-et",
     "The call was answered on another device.": "Thirrjes iu përgjigj në një tjetër pajisje.",
@@ -1934,8 +2012,10 @@
     "Bangladesh": "Bangladesh",
     "Falkland Islands": "Ishujt Falkland",
     "Sweden": "Suedi",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhomë.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhoma.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhomë.",
+        "other": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhoma."
+    },
     "See emotes posted to your active room": "Shihni emotikonë postuar në dhomën tuaj aktive",
     "See emotes posted to this room": "Shihni emotikone postuar në këtë dhomë",
     "Send emotes as you in your active room": "Dërgoni emotikone si ju në këtë dhomë",
@@ -2133,8 +2213,10 @@
     "Support": "Asistencë",
     "Random": "Kuturu",
     "Welcome to <name/>": "Mirë se vini te <name/>",
-    "%(count)s members|one": "%(count)s anëtar",
-    "%(count)s members|other": "%(count)s anëtarë",
+    "%(count)s members": {
+        "one": "%(count)s anëtar",
+        "other": "%(count)s anëtarë"
+    },
     "Your server does not support showing space hierarchies.": "Shërbyesi juaj nuk mbulon shfaqje hierarkish hapësire.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Jeni i sigurt se doni të dilni nga hapësira '%(spaceName)s'?",
     "This space is not public. You will not be able to rejoin without an invite.": "Kjo hapësirë s’është publike. S’do të jeni në gjendje të rihyni në të pa një ftesë.",
@@ -2197,8 +2279,10 @@
     "Failed to remove some rooms. Try again later": "S’ua arrit të hiqen disa dhoma. Riprovoni më vonë",
     "Suggested": "E sugjeruar",
     "This room is suggested as a good one to join": "Kjo dhomë sugjerohet si një e mirë për të marrë pjesë",
-    "%(count)s rooms|one": "%(count)s dhomë",
-    "%(count)s rooms|other": "%(count)s dhoma",
+    "%(count)s rooms": {
+        "one": "%(count)s dhomë",
+        "other": "%(count)s dhoma"
+    },
     "You don't have permission": "S’keni leje",
     "Failed to start livestream": "S’u arrit të nisej transmetim i drejtpërdrejtë",
     "You're all caught up.": "Jeni në rregull.",
@@ -2218,8 +2302,10 @@
     "Invited people will be able to read old messages.": "Personat e ftuar do të jenë në gjendje të lexojnë mesazhe të vjetër.",
     "We couldn't create your DM.": "S’e krijuam dot DM-në tuaj.",
     "Add existing rooms": "Shtoni dhoma ekzistuese",
-    "%(count)s people you know have already joined|one": "%(count)s person që e njihni është bërë pjesë tashmë",
-    "%(count)s people you know have already joined|other": "%(count)s persona që i njihni janë bërë pjesë tashmë",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s person që e njihni është bërë pjesë tashmë",
+        "other": "%(count)s persona që i njihni janë bërë pjesë tashmë"
+    },
     "Invite to just this room": "Ftoje thjesht te kjo dhomë",
     "Warn before quitting": "Sinjalizo përpara daljes",
     "Manage & explore rooms": "Administroni & eksploroni dhoma",
@@ -2243,8 +2329,10 @@
     "Delete all": "Fshiji krejt",
     "Some of your messages have not been sent": "Disa nga mesazhet tuaj s’janë dërguar",
     "Including %(commaSeparatedMembers)s": "Prfshi %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Shihni 1 anëtar",
-    "View all %(count)s members|other": "Shihni krejt %(count)s anëtarët",
+    "View all %(count)s members": {
+        "one": "Shihni 1 anëtar",
+        "other": "Shihni krejt %(count)s anëtarët"
+    },
     "Failed to send": "S’u arrit të dërgohet",
     "Enter your Security Phrase a second time to confirm it.": "Jepni Frazën tuaj të Sigurisë edhe një herë, për ta ripohuar.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Zgjidhni dhoma ose biseda që të shtohen. Kjo është thjesht një hapësirë për ju, s’do ta dijë kush tjetër. Mund të shtoni të tjerë më vonë.",
@@ -2261,8 +2349,10 @@
     "To leave the beta, visit your settings.": "Që të braktisni beta-n, vizitoni rregullimet tuaja.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Platforma dhe emri juaj i përdoruesit do të mbahen shënim, për të na ndihmuar t’i përdorim përshtypjet tuaja sa më shumë që të mundemi.",
     "Want to add a new room instead?": "Doni të shtohet një dhomë e re, në vend të kësaj?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Po shtohet dhomë…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Po shtohen dhoma… (%(progress)s nga %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Po shtohet dhomë…",
+        "other": "Po shtohen dhoma… (%(progress)s nga %(count)s)"
+    },
     "Not all selected were added": "S’u shtuan të gjithë të përzgjedhurit",
     "You are not allowed to view this server's rooms list": "S’keni leje të shihni listën e dhomave të këtij shërbyesi",
     "Zoom in": "Zmadhoje",
@@ -2284,8 +2374,10 @@
     "See when people join, leave, or are invited to your active room": "Shihni kur persona vijnë, ikin ose janë ftuar në dhomën tuaj aktive",
     "See when people join, leave, or are invited to this room": "Shihni kur persona vijnë, ikin ose janë ftuar në këtë dhomë",
     "Space Autocomplete": "Vetëplotësim Hapësire",
-    "Currently joining %(count)s rooms|one": "Aktualisht duke hyrë në %(count)s dhomë",
-    "Currently joining %(count)s rooms|other": "Aktualisht duke hyrë në %(count)s dhoma",
+    "Currently joining %(count)s rooms": {
+        "one": "Aktualisht duke hyrë në %(count)s dhomë",
+        "other": "Aktualisht duke hyrë në %(count)s dhoma"
+    },
     "The user you called is busy.": "Përdoruesi që thirrët është i zënë.",
     "User Busy": "Përdoruesi Është i Zënë",
     "Or send invite link": "Ose dërgoni një lidhje ftese",
@@ -2318,10 +2410,14 @@
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Ky përdorues shfaq sjellje të paligjshme, bie fjala, duke zbuluar identitet personash ose duke kërcënuar me dhunë.\nKjo do t’u njoftohet përgjegjësve të dhomës, të cilët mund ta përshkallëzojnë punën drejt autoriteteve ligjore.",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Ajo ç’shkruan ky përdorues është gabim.\nKjo do t’u njoftohet përgjegjësve të dhomës.",
     "Please provide an address": "Ju lutemi, jepni një adresë",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sndryshoi ACL-ra shërbyesi",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sndryshoi ACL-ra shërbyesi %(count)s herë",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sndryshuan ACL-ra shërbyesi",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sndryshuan ACL-ra shërbyesi %(count)s herë",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sndryshoi ACL-ra shërbyesi",
+        "other": "%(oneUser)sndryshoi ACL-ra shërbyesi %(count)s herë"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)sndryshuan ACL-ra shërbyesi",
+        "other": "%(severalUsers)sndryshuan ACL-ra shërbyesi %(count)s herë"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "Dështoi gatitja e kërkimit në mesazhe, për më tepër hollësi, shihni <a>rregullimet tuaja</a>",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Caktoni adresa për këtë hapësirë, që kështu përdoruesit të gjejnë këtë dhomë përmes shërbyesit tuaj Home (%(localDomain)s)",
     "To publish an address, it needs to be set as a local address first.": "Që të bëni publike një adresë, lypset të ujdiset së pari si një adresë vendore.",
@@ -2371,8 +2467,10 @@
     "Forward": "Përcille",
     "Sent": "U dërgua",
     "Error processing audio message": "Gabim në përpunim mesazhi audio",
-    "Show %(count)s other previews|one": "Shfaq %(count)s paraparje tjetër",
-    "Show %(count)s other previews|other": "Shfaq %(count)s paraparje të tjera",
+    "Show %(count)s other previews": {
+        "one": "Shfaq %(count)s paraparje tjetër",
+        "other": "Shfaq %(count)s paraparje të tjera"
+    },
     "Images, GIFs and videos": "Figura, GIF-e dhe video",
     "Code blocks": "Blloqe kodi",
     "Keyboard shortcuts": "Shkurtore tastiere",
@@ -2439,8 +2537,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Mund të përzgjidhni një hapësirë që mund të gjejë dhe hyjë. Mund të përzgjidhni disa hapësira.",
     "Spaces with access": "Hapësira me hyrje",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Cilido në një hapësirë mund ta gjejë dhe hyjë. <a>Përpunoni se cilat hapësira kanë hyrje këtu.</a>",
-    "Currently, %(count)s spaces have access|other": "Deri tani, %(count)s hapësira kanë hyrje",
-    "& %(count)s more|other": "& %(count)s më tepër",
+    "Currently, %(count)s spaces have access": {
+        "other": "Deri tani, %(count)s hapësira kanë hyrje",
+        "one": "Aktualisht një hapësirë ka hyrje"
+    },
+    "& %(count)s more": {
+        "other": "& %(count)s më tepër",
+        "one": "& %(count)s më tepër"
+    },
     "Upgrade required": "Lypset domosdo përmirësim",
     "Anyone can find and join.": "Kushdo mund ta gjejë dhe hyjë në të.",
     "Only invited people can join.": "Vetëm personat e ftuar mund të hyjnë.",
@@ -2518,8 +2622,6 @@
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fiksoi <a>një mesazh</a> te kjo dhomë. Shini krejt <b>mesazhet e fiksuar</b>.",
     "Some encryption parameters have been changed.": "Janë ndryshuar disa parametra fshehtëzimi.",
     "Role in <RoomName/>": "Rol në <RoomName/>",
-    "Currently, %(count)s spaces have access|one": "Aktualisht një hapësirë ka hyrje",
-    "& %(count)s more|one": "& %(count)s më tepër",
     "Send a sticker": "Dërgoni një ngjitës",
     "Reply to thread…": "Përgjigjuni te rrjedhë…",
     "Reply to encrypted thread…": "Përgjigjuni te rrjedhë e fshehtëzuar…",
@@ -2581,10 +2683,14 @@
     "It looks like you don't have a Security Key or any other devices you can verify against.  This device will not be able to access old encrypted messages. In order to verify your identity on this device, you'll need to reset your verification keys.": "Duket sikur s’keni Kyç Sigurie ose ndonjë pajisje tjetër nga e cila mund të bëni verifikimin. Kjo pajisje s’do të jetë në gjendje të hyjë te mesazhe të dikurshëm të fshehtëzuar. Që të mund të verifikohet identiteti juaj në këtë pajisje, ju duhet të riujdisni kyçet tuaj të verifikimit.",
     "Skip verification for now": "Anashkaloje verifikimin hëpërhë",
     "Create poll": "Krijoni anketim",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Po përditësohet hapësirë…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Po përditësohen hapësira… (%(progress)s nga %(count)s) gjithsej",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Po dërgohen ftesa…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Po dërgohen ftesa… (%(progress)s nga %(count)s) gjithsej",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Po përditësohet hapësirë…",
+        "other": "Po përditësohen hapësira… (%(progress)s nga %(count)s) gjithsej"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Po dërgohen ftesa…",
+        "other": "Po dërgohen ftesa… (%(progress)s nga %(count)s) gjithsej"
+    },
     "Loading new room": "Po ngarkohet dhomë e re",
     "Upgrading room": "Përmirësim dhome",
     "Downloading": "Shkarkim",
@@ -2605,8 +2711,10 @@
     "They'll still be able to access whatever you're not an admin of.": "Do të jenë prapë në gjendje të hyjnë kudo ku nuk jeni përgjegjës.",
     "Disinvite from %(roomName)s": "Hiqja ftesën për %(roomName)s",
     "Threads": "Rrjedha",
-    "%(count)s reply|one": "%(count)s përgjigje",
-    "%(count)s reply|other": "%(count)s përgjigje",
+    "%(count)s reply": {
+        "one": "%(count)s përgjigje",
+        "other": "%(count)s përgjigje"
+    },
     "What projects are your team working on?": "Me cilat projekte po merret ekipi juaj?",
     "View in room": "Shiheni në dhomë",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Që të vazhdohet, jepni Frazën tuaj të Sigurisë, ose <button>përdorni Kyçin tuaj të Sigurisë</button>.",
@@ -2639,12 +2747,18 @@
     "Rename": "Riemërtojeni",
     "Select all": "Përzgjidhi krejt",
     "Deselect all": "Shpërzgjidhi krejt",
-    "Sign out devices|one": "Dil nga pajisje",
-    "Sign out devices|other": "Dil nga pajisje",
-    "Click the button below to confirm signing out these devices.|one": "Që të ripohoni daljen nga kjo pajisje, klikoni butonin më poshtë.",
-    "Click the button below to confirm signing out these devices.|other": "Që të ripohoni daljen nga këto pajisje, klikoni butonin më poshtë.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Ripohoni daljen nga kjo pajisje duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Ripohoni daljen nga këto pajisje duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj.",
+    "Sign out devices": {
+        "one": "Dil nga pajisje",
+        "other": "Dil nga pajisje"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Që të ripohoni daljen nga kjo pajisje, klikoni butonin më poshtë.",
+        "other": "Që të ripohoni daljen nga këto pajisje, klikoni butonin më poshtë."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Ripohoni daljen nga kjo pajisje duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj.",
+        "other": "Ripohoni daljen nga këto pajisje duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj."
+    },
     "Automatically send debug logs on any error": "Me çdo gabim, dërgo automatikisht regjistra diagnostikimi",
     "Use a more compact 'Modern' layout": "Përdorni një skemë “Moderne” më kompakte",
     "Add option": "Shtoni mundësi",
@@ -2692,14 +2806,20 @@
     "Large": "E madhe",
     "Image size in the timeline": "Madhësi figure në rrjedhën kohore",
     "%(senderName)s has updated the room layout": "%(senderName)s ka përditësuar skemën e dhomës",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s dhe %(count)s tjetër",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s dhe %(count)s të tjerë",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s dhe %(count)s tjetër",
+        "other": "%(spaceName)s dhe %(count)s të tjerë"
+    },
     "Sorry, the poll you tried to create was not posted.": "Na ndjeni, anketimi që provuat të krijoni s’u postua dot.",
     "Failed to post poll": "S’u arrit të postohej anketimi",
-    "Based on %(count)s votes|one": "Bazuar në %(count)s votë",
-    "Based on %(count)s votes|other": "Bazua në %(count)s vota",
-    "%(count)s votes|one": "%(count)s votë",
-    "%(count)s votes|other": "%(count)s vota",
+    "Based on %(count)s votes": {
+        "one": "Bazuar në %(count)s votë",
+        "other": "Bazua në %(count)s vota"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s votë",
+        "other": "%(count)s vota"
+    },
     "Sorry, your vote was not registered. Please try again.": "Na ndjeni, vota juaj s’i regjistruar. Ju lutemi, riprovoni.",
     "Vote not registered": "Votë e paregjistruar",
     "Developer": "Zhvillues",
@@ -2732,11 +2852,15 @@
     "We <Bold>don't</Bold> share information with third parties": "<Bold>Nuk</Bold> u japin hollësi palëve të treta",
     "We <Bold>don't</Bold> record or profile any account data": "<Bold>Nuk</Bold> regjistrojmë ose profilizojmë ndonjë të dhënë llogarie",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "<PrivacyPolicyUrl>Këtu</PrivacyPolicyUrl> mund të lexoni krejt kushtet tona",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s votë. Që të shihni përfundimet, votoni",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s vota. Që të shihni përfundimet, votoni",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s votë. Që të shihni përfundimet, votoni",
+        "other": "%(count)s vota. Që të shihni përfundimet, votoni"
+    },
     "No votes cast": "S’u votua gjë",
-    "Final result based on %(count)s votes|one": "Rezultati përfundimtar, bazua në %(count)s votë",
-    "Final result based on %(count)s votes|other": "Rezultati përfundimtar, bazua në %(count)s vota",
+    "Final result based on %(count)s votes": {
+        "one": "Rezultati përfundimtar, bazua në %(count)s votë",
+        "other": "Rezultati përfundimtar, bazua në %(count)s vota"
+    },
     "Share location": "Jepe vendndodhjen",
     "Manage pinned events": "Administroni veprimtari të fiksuara",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Ndani me ne të dhëna anonime, për të na ndihmuar të gjejmë problemet. Asgjë personale. Pa palë të treta.",
@@ -2763,16 +2887,24 @@
     "Open in OpenStreetMap": "Hape në OpenStreetMap",
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Kjo grupon fjalosjet tuaja me anëtarë në këtë hapësirë. Çaktivizimi i kësaj do t’i fshehë këto fjalosje prej pamjes tuaj për %(spaceName)s.",
     "Sections to show": "Ndarje për t’u shfaqur",
-    "Exported %(count)s events in %(seconds)s seconds|one": "U eksportua %(count)s veprimtari për %(seconds)s sekonda",
-    "Exported %(count)s events in %(seconds)s seconds|other": "U eksportuan %(count)s veprimtari për %(seconds)s sekonda",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "U eksportua %(count)s veprimtari për %(seconds)s sekonda",
+        "other": "U eksportuan %(count)s veprimtari për %(seconds)s sekonda"
+    },
     "Export successful!": "Eksportim i suksesshëm!",
-    "Fetched %(count)s events in %(seconds)ss|one": "U pru %(count)s veprimtari për %(seconds)ss",
-    "Fetched %(count)s events in %(seconds)ss|other": "U prunë %(count)s veprimtari për %(seconds)ss",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "U pru %(count)s veprimtari për %(seconds)ss",
+        "other": "U prunë %(count)s veprimtari për %(seconds)ss"
+    },
     "Processing event %(number)s out of %(total)s": "Po përpunohet veprimtaria %(number)s nga %(total)s gjithsej",
-    "Fetched %(count)s events so far|one": "U pru %(count)s veprimtari deri tani",
-    "Fetched %(count)s events so far|other": "U prunë %(count)s veprimtari deri tani",
-    "Fetched %(count)s events out of %(total)s|one": "U pru %(count)s veprimtari nga %(total)s gjithsej",
-    "Fetched %(count)s events out of %(total)s|other": "U prunë %(count)s veprimtari nga %(total)s gjithsej",
+    "Fetched %(count)s events so far": {
+        "one": "U pru %(count)s veprimtari deri tani",
+        "other": "U prunë %(count)s veprimtari deri tani"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "U pru %(count)s veprimtari nga %(total)s gjithsej",
+        "other": "U prunë %(count)s veprimtari nga %(total)s gjithsej"
+    },
     "Generating a ZIP": "Po prodhohet një ZIP",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "S’qemë në gjendje të kuptojmë datën e dhënë (%(inputDate)s). Provoni të përdorni formatin YYYY-MM-DD.",
     "This address had invalid server or is already in use": "Kjo adresë kishte një shërbyes të pavlefshëm ose është e përdorur tashmë",
@@ -2813,10 +2945,14 @@
     "Failed to fetch your location. Please try again later.": "S’u arrit të sillet vendndodhja juaj. Ju lutemi, riprovoni më vonë.",
     "Could not fetch location": "S’u pru dot vendndodhja",
     "Automatically send debug logs on decryption errors": "Dërgo automatikisht regjistra diagnostikimi, gjatë gabimesh shfshehtëzimi",
-    "was removed %(count)s times|one": "u hoq",
-    "was removed %(count)s times|other": "u hoq %(count)s herë",
-    "were removed %(count)s times|one": "u hoq",
-    "were removed %(count)s times|other": "u hoq %(count)s herë",
+    "was removed %(count)s times": {
+        "one": "u hoq",
+        "other": "u hoq %(count)s herë"
+    },
+    "were removed %(count)s times": {
+        "one": "u hoq",
+        "other": "u hoq %(count)s herë"
+    },
     "Remove from room": "Hiqeni prej dhome",
     "Failed to remove user": "S’u arrit të hiqej përdoruesi",
     "Remove them from specific things I'm able to": "Hiqi prej gjërash të caktuara ku mundem ta bëj këtë",
@@ -2895,18 +3031,28 @@
     "Call": "Thirrje",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Faleminderit që provoni versionin beta, ju lutemi, jepni sa më shumë hollësi, që të mund ta përmirësojmë.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s dhe %(space2Name)s",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sdërgoi një mesazh të fshehur",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s dërgoi %(count)s mesazhe të fshehur",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s dërguan një mesazh të fshehur",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s dërgoi %(count)s mesazhe të fshehur",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s hoqi një mesazh",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s hoqi %(count)s mesazhe",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s hoqi një mesazh",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s hoqi %(count)s mesazhe",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sdërgoi një mesazh të fshehur",
+        "other": "%(oneUser)s dërgoi %(count)s mesazhe të fshehur"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s dërguan një mesazh të fshehur",
+        "other": "%(severalUsers)s dërgoi %(count)s mesazhe të fshehur"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s hoqi një mesazh",
+        "other": "%(oneUser)s hoqi %(count)s mesazhe"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s hoqi një mesazh",
+        "other": "%(severalUsers)s hoqi %(count)s mesazhe"
+    },
     "Maximise": "Maksimizoje",
     "<empty string>": "<varg i zbrazët>",
-    "<%(count)s spaces>|one": "<hapësirë>",
-    "<%(count)s spaces>|other": "<%(count)s hapësira>",
+    "<%(count)s spaces>": {
+        "one": "<hapësirë>",
+        "other": "<%(count)s hapësira>"
+    },
     "Automatically send debug logs when key backup is not functioning": "Dërgo automatikisht regjistra diagnostikimi, kur kopjeruajtja e kyçeve nuk funksionon",
     "Edit poll": "Përpunoni pyetësor",
     "Sorry, you can't edit a poll after votes have been cast.": "Na ndjeni, s’mund të përpunoni një pyetësor pasi të jenë hedhur votat.",
@@ -2933,10 +3079,14 @@
     "We couldn't send your location": "S’e dërguam dot vendndodhjen tuaj",
     "Match system": "Përputhe me sistemin",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Përgjigjuni te një rrjedhë në zhvillim e sipër, ose përdorni “%(replyInThread)s”, kur kalohet kursori sipër një mesazhi për të filluar një të re.",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sndryshoi <a>mesazhet e fiksuar</a> për dhomën",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sndryshoi <a>mesazhet e fiksuar</a> për dhomën %(count)s herë",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sndryshuan <a>mesazhet e fiksuar</a> për dhomën",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sndryshuan <a>mesazhet e fiksuar</a> për dhomën %(count)s herë",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)sndryshoi <a>mesazhet e fiksuar</a> për dhomën",
+        "other": "%(oneUser)sndryshoi <a>mesazhet e fiksuar</a> për dhomën %(count)s herë"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)sndryshuan <a>mesazhet e fiksuar</a> për dhomën",
+        "other": "%(severalUsers)sndryshuan <a>mesazhet e fiksuar</a> për dhomën %(count)s herë"
+    },
     "My live location": "Vendndodhja ime drejtpërsëdrejti",
     "Show polls button": "Shfaq buton pyetësorësh",
     "Expand quotes": "Zgjeroji thonjëzat",
@@ -2957,11 +3107,15 @@
     "%(displayName)s's live location": "Vendndodhje aty për aty e %(displayName)s",
     "Preserve system messages": "Ruaji mesazhet e sistemit",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Hiqini shenjën, nëse doni të hiqni mesazhe sistemi në këtë përdorues (p.sh., ndryshime anëtarësimi, ndryshime profili…)",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Ju ndan një hap nga heqja e %(count)s mesazheve nga %(user)s. Kjo do t’i heqë përgjithnjë për këdo te biseda. Doni të vazhdohet?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Ju ndan një hap nga heqja e %(count)s mesazheve nga %(user)s. Kjo do t’i heqë përgjithnjë, për këdo në bisedë. Doni të vazhdohet?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "other": "Ju ndan një hap nga heqja e %(count)s mesazheve nga %(user)s. Kjo do t’i heqë përgjithnjë për këdo te biseda. Doni të vazhdohet?",
+        "one": "Ju ndan një hap nga heqja e %(count)s mesazheve nga %(user)s. Kjo do t’i heqë përgjithnjë, për këdo në bisedë. Doni të vazhdohet?"
+    },
     "Share for %(duration)s": "Ndaje me të tjerë për %(duration)s",
-    "Currently removing messages in %(count)s rooms|one": "Aktualisht po hiqen mesazhe në %(count)s dhomë",
-    "Currently removing messages in %(count)s rooms|other": "Aktualisht po hiqen mesazhe në %(count)s dhoma",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Aktualisht po hiqen mesazhe në %(count)s dhomë",
+        "other": "Aktualisht po hiqen mesazhe në %(count)s dhoma"
+    },
     "%(value)ss": "%(value)ss",
     "%(value)sm": "%(value)sm",
     "%(value)sh": "%(value)sh",
@@ -3052,8 +3206,10 @@
     "Create room": "Krijoje dhomën",
     "Create video room": "Krijoni dhomë me video",
     "Create a video room": "Krijoni një dhomë me video",
-    "%(count)s participants|one": "1 pjesëmarrës",
-    "%(count)s participants|other": "%(count)s pjesëmarrës",
+    "%(count)s participants": {
+        "one": "1 pjesëmarrës",
+        "other": "%(count)s pjesëmarrës"
+    },
     "New video room": "Dhomë e re me video",
     "New room": "Dhomë e re",
     "Threads help keep your conversations on-topic and easy to track.": "Rrjedhat ndihmojnë që të mbahen bisedat tuaja brenda temës dhe të ndiqen kollaj.",
@@ -3090,8 +3246,10 @@
     "Show spaces": "Shfaq hapësira",
     "Show rooms": "Shfaq dhoma",
     "Search for": "Kërkoni për",
-    "%(count)s Members|one": "%(count)s Anëtar",
-    "%(count)s Members|other": "%(count)s Anëtarë",
+    "%(count)s Members": {
+        "one": "%(count)s Anëtar",
+        "other": "%(count)s Anëtarë"
+    },
     "Check if you want to hide all current and future messages from this user.": "I vini shenjë, nëse doni të fshihen krejt mesazhet e tanishme dhe të ardhshme nga ky përdorues.",
     "Ignore user": "Shpërfille përdoruesin",
     "Open room": "Dhomë e hapët",
@@ -3126,23 +3284,29 @@
     "Video room": "Dhomë me video",
     "Video rooms are a beta feature": "Dhomat me video janë një veçori në fazë beta",
     "Read receipts": "Dëftesa leximi",
-    "Seen by %(count)s people|one": "Parë nga %(count)s person",
-    "Seen by %(count)s people|other": "Parë nga %(count)s vetë",
+    "Seen by %(count)s people": {
+        "one": "Parë nga %(count)s person",
+        "other": "Parë nga %(count)s vetë"
+    },
     "%(members)s and %(last)s": "%(members)s dhe %(last)s",
     "%(members)s and more": "%(members)s dhe më tepër",
     "Enable hardware acceleration (restart %(appName)s to take effect)": "Aktivizoni përshpejtim hardware (që kjo të hyjë në fuqi, rinisni %(appName)s)",
     "Deactivating your account is a permanent action — be careful!": "Çaktivizimi i llogarisë tuaj është një veprim i pakthyeshëm - hapni sytë!",
     "Your password was successfully changed.": "Fjalëkalimi juaj u ndryshua me sukses.",
-    "Confirm signing out these devices|one": "Ripohoni daljen nga kjo pajisje",
-    "Confirm signing out these devices|other": "Ripohoni daljen nga këto pajisje",
+    "Confirm signing out these devices": {
+        "one": "Ripohoni daljen nga kjo pajisje",
+        "other": "Ripohoni daljen nga këto pajisje"
+    },
     "Turn on camera": "Aktivizo kamerën",
     "Turn off camera": "Çaktivizo kamerën",
     "Video devices": "Pajisje video",
     "Unmute microphone": "Çheshto mikrofonin",
     "Mute microphone": "Heshtoje mikrofonin",
     "Audio devices": "Pajisje audio",
-    "%(count)s people joined|one": "Hyri %(count)s person",
-    "%(count)s people joined|other": "Hynë %(count)s vetë",
+    "%(count)s people joined": {
+        "one": "Hyri %(count)s person",
+        "other": "Hynë %(count)s vetë"
+    },
     "sends hearts": "dërgoni zemra",
     "Sends the given message with hearts": "Mesazhin e dhënë e dërgon me zemra",
     "Enable hardware acceleration": "Aktivizo përshpejtim hardware",
@@ -3192,9 +3356,11 @@
     "Find my location": "Gjej vendndodhjen time",
     "Exit fullscreen": "Dil nga mënyra “Sa krejt ekrani”",
     "Enter fullscreen": "Kalo në mënyrën “Sa krejt ekrani”",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Në %(spaceName)s dhe %(count)s hapësirë tjetër.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Në %(spaceName)s dhe %(count)s hapësirë tjetër.",
+        "other": "Në %(spaceName)s dhe %(count)s hapësira të tjera."
+    },
     "In %(spaceName)s.": "Në hapësirën %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Në %(spaceName)s dhe %(count)s hapësira të tjera.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Në hapësirat %(space1Name)s dhe %(space2Name)s.",
     "Completing set up of your new device": "Po plotësohet ujdisja e pajisjes tuaj të re",
     "Devices connected": "Pajisje të lidhura",
@@ -3220,12 +3386,19 @@
     "Video call started in %(roomName)s. (not supported by this browser)": "Nisi thirrje me video te %(roomName)s. (e pambuluar nga ky shfletues)",
     "Video call started in %(roomName)s.": "Nisi thirrje me video në %(roomName)s.",
     "Empty room (was %(oldName)s)": "Dhomë e zbrazët (qe %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Po ftohet %(user)s dhe 1 tjetër",
-    "%(user)s and %(count)s others|one": "%(user)s dhe 1 tjetër",
-    "%(user)s and %(count)s others|other": "%(user)s dhe %(count)s të tjerë",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Po ftohet %(user)s dhe 1 tjetër",
+        "other": "Po ftohet %(user)s dhe %(count)s të tjerë"
+    },
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s dhe 1 tjetër",
+        "other": "%(user)s dhe %(count)s të tjerë"
+    },
     "%(user1)s and %(user2)s": "%(user1)s dhe %(user2)s",
-    "Only %(count)s steps to go|one": "Vetëm %(count)s hap për t’u bërë",
-    "Only %(count)s steps to go|other": "Vetëm %(count)s hapa për t’u bërë",
+    "Only %(count)s steps to go": {
+        "one": "Vetëm %(count)s hap për t’u bërë",
+        "other": "Vetëm %(count)s hapa për t’u bërë"
+    },
     "play voice broadcast": "luaj transmetim zanor",
     "Waiting for device to sign in": "Po pritet që të bëhet hyrja te pajisja",
     "Review and approve the sign in": "Shqyrtoni dhe miratojeni hyrjen",
@@ -3357,7 +3530,6 @@
     "You are already recording a voice broadcast. Please end your current voice broadcast to start a new one.": "Po incizoni tashmë një transmetim zanor. Ju lutemi, që të nisni një të ri, përfundoni transmetimin tuaj zanor të tanishëm.",
     "Can't start a new voice broadcast": "S’niset dot një transmetim zanor i ri",
     "You need to be able to kick users to do that.": "Që ta bëni këtë, lypset të jeni në gjendje të përzini përdorues.",
-    "Inviting %(user)s and %(count)s others|other": "Po ftohet %(user)s dhe %(count)s të tjerë",
     "Inviting %(user1)s and %(user2)s": "Po ftohen %(user1)s dhe %(user2)s",
     "View List": "Shihni Listën",
     "View list": "Shihni listën",
@@ -3382,8 +3554,10 @@
     "%(brand)s is end-to-end encrypted, but is currently limited to smaller numbers of users.": "%(brand)s është i fshehtëzuar skaj-më-skaj, por aktualisht është i kufizuar në numra më të vegjël përdoruesish.",
     "Enable %(brand)s as an additional calling option in this room": "Aktivizojeni %(brand)s si një mundësi shtesë thirrjesh në këtë dhomë",
     "Join %(brand)s calls": "Merrni pjesë në thirrje %(brand)s",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Jeni i sigurt se doni të dilet nga %(count)s session?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Jeni i sigurt se doni të dilet nga %(count)s sessione?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Jeni i sigurt se doni të dilet nga %(count)s session?",
+        "other": "Jeni i sigurt se doni të dilet nga %(count)s sessione?"
+    },
     "Your server doesn't support disabling sending read receipts.": "Shërbyesi juaj nuk mbulon çaktivizimin e dërgimit të dëftesave të leximit.",
     "Share your activity and status with others.": "Ndani me të tjerët veprimtarinë dhe gjendjen tuaj.",
     "Turn off to disable notifications on all your devices and sessions": "Mbylleni që të çaktivizohen njoftimet në krejt pajisjet dhe sesionet tuaja",
@@ -3482,16 +3656,20 @@
     "Can’t start a call": "S’fillohet dot thirrje",
     " in <strong>%(room)s</strong>": " në <strong>%(room)s</strong>",
     "Improve your account security by following these recommendations.": "Përmirësoni sigurinë e llogarisë tuaj duke ndjekur këto rekomandime.",
-    "%(count)s sessions selected|one": "%(count)s sesion i përzgjedhur",
-    "%(count)s sessions selected|other": "%(count)s sesione të përzgjedhur",
+    "%(count)s sessions selected": {
+        "one": "%(count)s sesion i përzgjedhur",
+        "other": "%(count)s sesione të përzgjedhur"
+    },
     "Failed to read events": "S’u arrit të lexohen akte",
     "Failed to send event": "S’u arrit të dërgohet akt",
     "Mark as read": "Vëri shenjë si të lexuar",
     "Text": "Tekst",
     "Create a link": "Krijoni një lidhje",
     "Link": "Lidhje",
-    "Sign out of %(count)s sessions|one": "Dilni nga %(count)s sesion",
-    "Sign out of %(count)s sessions|other": "Dilni nga %(count)s sesione",
+    "Sign out of %(count)s sessions": {
+        "one": "Dilni nga %(count)s sesion",
+        "other": "Dilni nga %(count)s sesione"
+    },
     "Verify your current session for enhanced secure messaging.": "Verifikoni sesionin tuaj të tanishëm për shkëmbim me siguri të thelluar mesazhesh.",
     "Your current session is ready for secure messaging.": "Sesioni juaj i tanishëm është gati për shkëmbim të siguruar mesazhesh.",
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Dil nga krejt sesionet e tjerë (%(otherSessionsCount)s)",
@@ -3591,7 +3769,9 @@
     "Room is <strong>encrypted ✅</strong>": "Dhoma është <strong>e fshehtëzuar ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Gjendje njoftimi është <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Gjendje e palexuar në dhomë: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Gjendje të palexuara në dhomë: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Gjendje të palexuara në dhomë: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>"
+    },
     "Loading polls": "Po ngarkohen pyetësorë",
     "Enable '%(manageIntegrations)s' in Settings to do this.": "Që të bëni këtë, aktivizoni '%(manageIntegrations)s' te Rregullimet.",
     "Ended a poll": "Përfundoi një pyetësor",
@@ -3606,10 +3786,14 @@
     "You attempted to join using a room ID without providing a list of servers to join through. Room IDs are internal identifiers and cannot be used to join a room without additional information.": "U rrekët të hyni duke përdorur një ID dhome pa dhënë një listë shërbyesish përmes të cilëve të hyhet. ID-të e dhomave janë identifikues të brendshëm dhe s’mund të përdoren për të hyrë në një dhomë pa hollësi shtesë.",
     "Yes, it was me": "Po, unë qeshë",
     "View poll": "Shiheni pyetësorin",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "S’ka pyetësorë të kaluar për ditën e shkuar. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "S’ka pyetësorë të kaluar për %(count)s ditët e shkuara. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "S’ka pyetësorë aktivë për ditën e shkuar. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "S’ka pyetësorë aktivë për %(count)s ditët e shkuara. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "S’ka pyetësorë të kaluar për ditën e shkuar. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
+        "other": "S’ka pyetësorë të kaluar për %(count)s ditët e shkuara. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "S’ka pyetësorë aktivë për ditën e shkuar. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
+        "other": "S’ka pyetësorë aktivë për %(count)s ditët e shkuara. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "S’ka pyetësorë të kaluar. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
     "There are no active polls. Load more polls to view polls for previous months": "S’ka pyetësorë aktivë. Që të shihni pyetësorët për muajt e kaluar, ngarkoni më tepër pyetësorë",
     "Load more polls": "Ngarkoni më tepër pyetësorë",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 88d8d2ae15..1beae393f9 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -129,8 +129,10 @@
     "Unmute": "Појачај",
     "Mute": "Утишај",
     "Admin Tools": "Админ алатке",
-    "and %(count)s others...|other": "и %(count)s других...",
-    "and %(count)s others...|one": "и још један други...",
+    "and %(count)s others...": {
+        "other": "и %(count)s других...",
+        "one": "и још један други..."
+    },
     "Invited": "Позван",
     "Filter room members": "Филтрирај чланове собе",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (снага %(powerLevelNumber)s)",
@@ -159,8 +161,10 @@
     "Replying": "Одговара",
     "Unnamed room": "Неименована соба",
     "Save": "Сачувај",
-    "(~%(count)s results)|other": "(~%(count)s резултата)",
-    "(~%(count)s results)|one": "(~%(count)s резултат)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s резултата)",
+        "one": "(~%(count)s резултат)"
+    },
     "Join Room": "Приступи соби",
     "Upload avatar": "Отпреми аватар",
     "Settings": "Подешавања",
@@ -234,55 +238,99 @@
     "No results": "Нема резултата",
     "Home": "Почетна",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s су ушли %(count)s пута",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s је ушло",
-    "%(oneUser)sjoined %(count)s times|other": "Корисник %(oneUser)s је ушао %(count)s пута",
-    "%(oneUser)sjoined %(count)s times|one": "Корисник %(oneUser)s је ушао",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s је изашло %(count)s пута",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s је изашло",
-    "%(oneUser)sleft %(count)s times|other": "Корисник %(oneUser)s је изашло %(count)s пута",
-    "%(oneUser)sleft %(count)s times|one": "Корисник %(oneUser)s је изашао",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s је ушло и изашло %(count)s пута",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s је ушло и изашло",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s је ушао и изашао %(count)s пута",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s је ушао и изашао",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s је изашло и поново ушло %(count)s пута",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s је изашло и поново ушло",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s је изашао и поново ушао %(count)s пута",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s је изашао и поново ушао",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s је одбило њихове позивнице %(count)s пута",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s је одбило њихове позивнице",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s је одбио позивницу %(count)s пута",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s је одбио позивницу",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "Корисницима %(severalUsers)s су позивнице повучене %(count)s пута",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "Корисницима %(severalUsers)s су позивнице повучене",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "Кориснику %(oneUser)s је позивница повучена %(count)s пута",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "Кориснику %(oneUser)s је позивница повучена",
-    "were invited %(count)s times|other": "су позвани %(count)s пута",
-    "were invited %(count)s times|one": "су позвани",
-    "was invited %(count)s times|other": "је позван %(count)s пута",
-    "was invited %(count)s times|one": "је позван",
-    "were banned %(count)s times|other": "забрањен приступ %(count)s пута",
-    "were banned %(count)s times|one": "забрањен приступ",
-    "was banned %(count)s times|other": "забрањен приступ %(count)s пута",
-    "was banned %(count)s times|one": "забрањен приступ",
-    "were unbanned %(count)s times|other": "дозвољен приступ %(count)s пута",
-    "were unbanned %(count)s times|one": "дозвољен приступ",
-    "was unbanned %(count)s times|other": "дозвољен приступ %(count)s пута",
-    "was unbanned %(count)s times|one": "дозвољен приступ",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s промени своје име %(count)s пута",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s промени своје име",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s промени своје име %(count)s пута",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s промени своје име",
-    "%(items)s and %(count)s others|other": "%(items)s и %(count)s других",
-    "%(items)s and %(count)s others|one": "%(items)s и још један",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s су ушли %(count)s пута",
+        "one": "%(severalUsers)s је ушло"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "Корисник %(oneUser)s је ушао %(count)s пута",
+        "one": "Корисник %(oneUser)s је ушао"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s је изашло %(count)s пута",
+        "one": "%(severalUsers)s је изашло"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "Корисник %(oneUser)s је изашло %(count)s пута",
+        "one": "Корисник %(oneUser)s је изашао"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s је ушло и изашло %(count)s пута",
+        "one": "%(severalUsers)s је ушло и изашло"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s је ушао и изашао %(count)s пута",
+        "one": "%(oneUser)s је ушао и изашао"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s је изашло и поново ушло %(count)s пута",
+        "one": "%(severalUsers)s је изашло и поново ушло"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s је изашао и поново ушао %(count)s пута",
+        "one": "%(oneUser)s је изашао и поново ушао"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s је одбило њихове позивнице %(count)s пута",
+        "one": "%(severalUsers)s је одбило њихове позивнице"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s је одбио позивницу %(count)s пута",
+        "one": "%(oneUser)s је одбио позивницу"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "Корисницима %(severalUsers)s су позивнице повучене %(count)s пута",
+        "one": "Корисницима %(severalUsers)s су позивнице повучене"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "Кориснику %(oneUser)s је позивница повучена %(count)s пута",
+        "one": "Кориснику %(oneUser)s је позивница повучена"
+    },
+    "were invited %(count)s times": {
+        "other": "су позвани %(count)s пута",
+        "one": "су позвани"
+    },
+    "was invited %(count)s times": {
+        "other": "је позван %(count)s пута",
+        "one": "је позван"
+    },
+    "were banned %(count)s times": {
+        "other": "забрањен приступ %(count)s пута",
+        "one": "забрањен приступ"
+    },
+    "was banned %(count)s times": {
+        "other": "забрањен приступ %(count)s пута",
+        "one": "забрањен приступ"
+    },
+    "were unbanned %(count)s times": {
+        "other": "дозвољен приступ %(count)s пута",
+        "one": "дозвољен приступ"
+    },
+    "was unbanned %(count)s times": {
+        "other": "дозвољен приступ %(count)s пута",
+        "one": "дозвољен приступ"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s промени своје име %(count)s пута",
+        "one": "%(severalUsers)s промени своје име"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s промени своје име %(count)s пута",
+        "one": "%(oneUser)s промени своје име"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s и %(count)s других",
+        "one": "%(items)s и још један"
+    },
     "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
     "collapse": "скупи",
     "expand": "рашири",
     "Custom level": "Прилагођени ниво",
     "Quote": "Цитат",
     "Start chat": "Започни разговор",
-    "And %(count)s more...|other": "И %(count)s других...",
+    "And %(count)s more...": {
+        "other": "И %(count)s других..."
+    },
     "Confirm Removal": "Потврди уклањање",
     "Create": "Направи",
     "Unknown error": "Непозната грешка",
@@ -332,9 +380,11 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Покушао сам да учитам одређену тачку у временској линији ове собе али ви немате овлашћења за преглед наведене поруке.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Покушао сам да учитам одређену тачку у временској линији ове собе али нисам могао да је нађем.",
     "Failed to load timeline position": "Нисам могао да учитам позицију у временској линији",
-    "Uploading %(filename)s and %(count)s others|other": "Отпремам датотеку %(filename)s и још %(count)s других",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Отпремам датотеку %(filename)s и још %(count)s других",
+        "one": "Отпремам датотеку %(filename)s и %(count)s других датотека"
+    },
     "Uploading %(filename)s": "Отпремам датотеку %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Отпремам датотеку %(filename)s и %(count)s других датотека",
     "Sign out": "Одјави ме",
     "Failed to change password. Is your password correct?": "Нисам успео да променим лозинку. Да ли је ваша лозинка тачна?",
     "Success": "Успех",
@@ -553,8 +603,10 @@
     "Room Topic": "Тема собе",
     "Messages in this room are end-to-end encrypted.": "Поруке у овој соби су шифроване с краја на крај.",
     "Messages in this room are not end-to-end encrypted.": "Поруке у овој соби нису шифроване с краја на крај.",
-    "%(count)s verified sessions|other": "потврђених сесија: %(count)s",
-    "%(count)s verified sessions|one": "1 потврђена сесија",
+    "%(count)s verified sessions": {
+        "other": "потврђених сесија: %(count)s",
+        "one": "1 потврђена сесија"
+    },
     "Hide verified sessions": "Сакриј потврђене сесије",
     "Remove recent messages by %(user)s": "Уклони недавне поруке корисника %(user)s",
     "Remove recent messages": "Уклони недавне поруке",
@@ -942,7 +994,10 @@
     "Unexpected error resolving homeserver configuration": "Неочекивана грешка при откривању подешавања сервера",
     "No homeserver URL provided": "Није наведен УРЛ сервера",
     "Cannot reach homeserver": "Сервер недоступан",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s је додао алтернативну адресу %(addresses)s за ову собу.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s је додао алтернативну адресу %(addresses)s за ову собу.",
+        "one": "%(senderName)s је додао алтернативну адресу %(addresses)s за ову собу."
+    },
     "%(senderName)s removed the main address for this room.": "%(senderName)s је уклони главну адресу за ову собу.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s је постави главну адресу собе на %(address)s.",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Свим серверима је забрањено да учествују! Ова соба се више не може користити.",
@@ -996,9 +1051,10 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s је изменио адресе за ову собу.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s је изменио главну и алтернативне адресе за ову собу.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s је изменио алтернативне адресе за ову собу.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s је уклонио алтернативне адресе %(addresses)s за ову собу.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s је уклонио алтернативну адресу %(addresses)s за ову собу.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s је додао алтернативну адресу %(addresses)s за ову собу.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s је уклонио алтернативне адресе %(addresses)s за ову собу.",
+        "one": "%(senderName)s је уклонио алтернативну адресу %(addresses)s за ову собу."
+    },
     "Converts the room to a DM": "Претвара собу у директно дописивање",
     "Converts the DM to a room": "Претвара директно дописивање у собу",
     "Changes the avatar of the current room": "Мења аватар тренутне собе",
@@ -1175,8 +1231,10 @@
     "Remain on your screen when viewing another room, when running": "Останите на екрану док гледате другу собу, током рада",
     "Remain on your screen while running": "Останите на екрану током рада",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s и %(lastPerson)s куцају…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s и још један корисник куца…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s и %(count)s корисници куцају…",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s и још један корисник куца…",
+        "other": "%(names)s и %(count)s корисници куцају…"
+    },
     "%(displayName)s is typing …": "%(displayName)s куца …",
     "Couldn't load page": "Учитавање странице није успело",
     "Sign in with SSO": "Пријавите се помоћу SSO",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 0169c79d0e..057afe5f55 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -12,8 +12,10 @@
     "Always show message timestamps": "Visa alltid tidsstämplar för meddelanden",
     "Authentication": "Autentisering",
     "%(items)s and %(lastItem)s": "%(items)s och %(lastItem)s",
-    "and %(count)s others...|other": "och %(count)s andra…",
-    "and %(count)s others...|one": "och en annan…",
+    "and %(count)s others...": {
+        "other": "och %(count)s andra…",
+        "one": "och en annan…"
+    },
     "A new password must be entered.": "Ett nytt lösenord måste anges.",
     "Anyone": "Vem som helst",
     "An error has occurred.": "Ett fel har inträffat.",
@@ -288,24 +290,40 @@
     "Offline for %(duration)s": "Offline i %(duration)s",
     "Idle": "Inaktiv",
     "Offline": "Offline",
-    "(~%(count)s results)|other": "(~%(count)s resultat)",
-    "(~%(count)s results)|one": "(~%(count)s resultat)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s resultat)",
+        "one": "(~%(count)s resultat)"
+    },
     "Upload avatar": "Ladda upp avatar",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (behörighet %(powerLevelNumber)s)",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sgick med %(count)s gånger",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sgick med",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sgick med %(count)s gånger",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sgick med",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)slämnade %(count)s gånger",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)slämnade",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)slämnade %(count)s gånger",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)slämnade",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sgick med och lämnade %(count)s gånger",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sgick med och lämnade",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sgick med och lämnade %(count)s gånger",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sgick med och lämnade",
-    "And %(count)s more...|other": "Och %(count)s till…",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)sgick med %(count)s gånger",
+        "one": "%(severalUsers)sgick med"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)sgick med %(count)s gånger",
+        "one": "%(oneUser)sgick med"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)slämnade %(count)s gånger",
+        "one": "%(severalUsers)slämnade"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)slämnade %(count)s gånger",
+        "one": "%(oneUser)slämnade"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)sgick med och lämnade %(count)s gånger",
+        "one": "%(severalUsers)sgick med och lämnade"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)sgick med och lämnade %(count)s gånger",
+        "one": "%(oneUser)sgick med och lämnade"
+    },
+    "And %(count)s more...": {
+        "other": "Och %(count)s till…"
+    },
     "Preparing to send logs": "Förbereder sändning av loggar",
     "Logs sent": "Loggar skickade",
     "Failed to send logs: ": "Misslyckades att skicka loggar: ",
@@ -315,9 +333,11 @@
     "Please enter the code it contains:": "Vänligen ange koden det innehåller:",
     "Code": "Kod",
     "This server does not support authentication with a phone number.": "Denna server stöder inte autentisering via telefonnummer.",
-    "Uploading %(filename)s and %(count)s others|other": "Laddar upp %(filename)s och %(count)s till",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "Laddar upp %(filename)s och %(count)s till",
+        "one": "Laddar upp %(filename)s och %(count)s till"
+    },
     "Uploading %(filename)s": "Laddar upp %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Laddar upp %(filename)s och %(count)s till",
     "This doesn't appear to be a valid email address": "Det här verkar inte vara en giltig e-postadress",
     "Verification Pending": "Avvaktar verifiering",
     "Unable to add email address": "Kunde inte lägga till e-postadress",
@@ -403,33 +423,59 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Detta rum används för viktiga meddelanden från hemservern, så du kan inte lämna det.",
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data från en äldre version av %(brand)s has upptäckts. Detta ska ha orsakat att totalsträckskryptering inte fungerat i den äldre versionen. Krypterade meddelanden som nyligen har skickats medans den äldre versionen användes kanske inte kan avkrypteras i denna version. Detta kan även orsaka att meddelanden skickade med denna version inte fungerar. Om du upplever problem, logga ut och in igen. För att behålla meddelandehistoriken, exportera dina nycklar och importera dem igen.",
     "Confirm Removal": "Bekräfta borttagning",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)slämnade och gick med igen",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)slämnade och gick med igen",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)savböjde sina inbjudningar %(count)s gånger",
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
+        "one": "%(severalUsers)slämnade och gick med igen"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
+        "one": "%(oneUser)slämnade och gick med igen"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)savböjde sina inbjudningar %(count)s gånger",
+        "one": "%(severalUsers)savböjde sina inbjudningar"
+    },
     "Reject all %(invitedRooms)s invites": "Avböj alla %(invitedRooms)s inbjudningar",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)savböjde sina inbjudningar",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)savböjde sin inbjudan %(count)s gånger",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)savböjde sin inbjudan",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sfick sina inbjudningar tillbakadragna %(count)s gånger",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sfick sina inbjudningar tillbakadragna",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sfick sin inbjudan tillbakadragen %(count)s gånger",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sfick sin inbjudan tillbakadragen",
-    "were invited %(count)s times|other": "blev inbjudna %(count)s gånger",
-    "were invited %(count)s times|one": "blev inbjudna",
-    "was invited %(count)s times|other": "blev inbjuden %(count)s gånger",
-    "was invited %(count)s times|one": "blev inbjuden",
-    "were banned %(count)s times|other": "blev bannade %(count)s gånger",
-    "were banned %(count)s times|one": "blev bannade",
-    "was banned %(count)s times|other": "blev bannad %(count)s gånger",
-    "was banned %(count)s times|one": "blev bannad",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbytte namn %(count)s gånger",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbytte namn",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sbytte namn %(count)s gånger",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbytte namn",
-    "%(items)s and %(count)s others|other": "%(items)s och %(count)s till",
-    "%(items)s and %(count)s others|one": "%(items)s och en till",
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)savböjde sin inbjudan %(count)s gånger",
+        "one": "%(oneUser)savböjde sin inbjudan"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)sfick sina inbjudningar tillbakadragna %(count)s gånger",
+        "one": "%(severalUsers)sfick sina inbjudningar tillbakadragna"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)sfick sin inbjudan tillbakadragen %(count)s gånger",
+        "one": "%(oneUser)sfick sin inbjudan tillbakadragen"
+    },
+    "were invited %(count)s times": {
+        "other": "blev inbjudna %(count)s gånger",
+        "one": "blev inbjudna"
+    },
+    "was invited %(count)s times": {
+        "other": "blev inbjuden %(count)s gånger",
+        "one": "blev inbjuden"
+    },
+    "were banned %(count)s times": {
+        "other": "blev bannade %(count)s gånger",
+        "one": "blev bannade"
+    },
+    "was banned %(count)s times": {
+        "other": "blev bannad %(count)s gånger",
+        "one": "blev bannad"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)sbytte namn %(count)s gånger",
+        "one": "%(severalUsers)sbytte namn"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)sbytte namn %(count)s gånger",
+        "one": "%(oneUser)sbytte namn"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s och %(count)s till",
+        "one": "%(items)s och en till"
+    },
     "collapse": "fäll ihop",
     "expand": "fäll ut",
     "<a>In reply to</a> <pill>": "<a>Som svar på</a> <pill>",
@@ -456,10 +502,14 @@
     "Add an Integration": "Lägg till integration",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du kommer att skickas till en tredjepartswebbplats så att du kan autentisera ditt konto för användning med %(integrationsUrl)s. Vill du fortsätta?",
     "Popout widget": "Poppa ut widget",
-    "were unbanned %(count)s times|other": "blev avbannade %(count)s gånger",
-    "were unbanned %(count)s times|one": "blev avbannade",
-    "was unbanned %(count)s times|other": "blev avbannad %(count)s gånger",
-    "was unbanned %(count)s times|one": "blev avbannad",
+    "were unbanned %(count)s times": {
+        "other": "blev avbannade %(count)s gånger",
+        "one": "blev avbannade"
+    },
+    "was unbanned %(count)s times": {
+        "other": "blev avbannad %(count)s gånger",
+        "one": "blev avbannad"
+    },
     "Analytics": "Statistik",
     "Send analytics data": "Skicka statistik",
     "Passphrases must match": "Lösenfraser måste matcha",
@@ -527,8 +577,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s har nekat gäster att gå med i rummet.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ändrade gäståtkomst till %(rule)s",
     "%(displayName)s is typing …": "%(displayName)s skriver …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s och %(count)s andra skriver …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s och en till skriver …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s och %(count)s andra skriver …",
+        "one": "%(names)s och en till skriver …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s och %(lastPerson)s skriver …",
     "Unrecognised address": "Okänd adress",
     "You do not have permission to invite people to this room.": "Du har inte behörighet att bjuda in användare till det här rummet.",
@@ -777,8 +829,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Den här filen är <b>för stor</b> för att ladda upp. Filstorleksgränsen är %(limit)s men den här filen är %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Dessa filer är <b>för stora</b> för att laddas upp. Filstorleksgränsen är %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Vissa filer är <b>för stora</b> för att laddas upp. Filstorleksgränsen är %(limit)s.",
-    "Upload %(count)s other files|other": "Ladda upp %(count)s andra filer",
-    "Upload %(count)s other files|one": "Ladda upp %(count)s annan fil",
+    "Upload %(count)s other files": {
+        "other": "Ladda upp %(count)s andra filer",
+        "one": "Ladda upp %(count)s annan fil"
+    },
     "Cancel All": "Avbryt alla",
     "Upload Error": "Uppladdningsfel",
     "Your %(brand)s is misconfigured": "Din %(brand)s är felkonfigurerad",
@@ -844,7 +898,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Pröva att skrolla upp i tidslinjen för att se om det finns några tidigare.",
     "Remove recent messages by %(user)s": "Ta bort nyliga meddelanden från %(user)s",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "För en stor mängd meddelanden kan det ta lite tid. Vänligen ladda inte om din klient under tiden.",
-    "Remove %(count)s messages|other": "Ta bort %(count)s meddelanden",
+    "Remove %(count)s messages": {
+        "other": "Ta bort %(count)s meddelanden",
+        "one": "Ta bort 1 meddelande"
+    },
     "Deactivate user?": "Inaktivera användare?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Vid inaktivering av användare loggas den ut och förhindras från att logga in igen. Den kommer dessutom att lämna alla rum den befinner sig i. Den här åtgärden kan inte ångras. Är du säker på att du vill inaktivera den här användaren?",
     "Deactivate user": "Inaktivera användaren",
@@ -947,10 +1004,14 @@
     "Rotate Left": "Rotera vänster",
     "Rotate Right": "Rotera höger",
     "Language Dropdown": "Språkmeny",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sgjorde inga ändringar %(count)s gånger",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sgjorde inga ändringar",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sgjorde inga ändringar %(count)s gånger",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sgjorde inga ändringar",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)sgjorde inga ändringar %(count)s gånger",
+        "one": "%(severalUsers)sgjorde inga ändringar"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)sgjorde inga ändringar %(count)s gånger",
+        "one": "%(oneUser)sgjorde inga ändringar"
+    },
     "e.g. my-room": "t.ex. mitt-rum",
     "Some characters not allowed": "Vissa tecken är inte tillåtna",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Använd en identitetsserver för att bjuda in via e-post. <default>Använd förval (%(defaultIdentityServerName)s)</default> eller hantera i <settings>inställningarna</settings>.",
@@ -1047,10 +1108,14 @@
     "Opens chat with the given user": "Öppnar en chatt med den valda användaren",
     "Sends a message to the given user": "Skickar ett meddelande till den valda användaren",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s bytte rummets namn från %(oldRoomName)s till %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lade till de alternativa adresserna %(addresses)s till det här rummet.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s lade till den alternativa adressen %(addresses)s till det här rummet.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tog bort de alternativa adresserna %(addresses)s från det här rummet.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tog bort den alternativa adressen %(addresses)s från det här rummet.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s lade till de alternativa adresserna %(addresses)s till det här rummet.",
+        "one": "%(senderName)s lade till den alternativa adressen %(addresses)s till det här rummet."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s tog bort de alternativa adresserna %(addresses)s från det här rummet.",
+        "one": "%(senderName)s tog bort den alternativa adressen %(addresses)s från det här rummet."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ändrade de alternativa adresserna för det här rummet.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ändrade huvudadressen och de alternativa adresserna för det här rummet.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s ändrade adresserna för det här rummet.",
@@ -1289,16 +1354,22 @@
     "List options": "Listalternativ",
     "Jump to first unread room.": "Hoppa till första olästa rum.",
     "Jump to first invite.": "Hoppa till första inbjudan.",
-    "Show %(count)s more|other": "Visa %(count)s till",
-    "Show %(count)s more|one": "Visa %(count)s till",
+    "Show %(count)s more": {
+        "other": "Visa %(count)s till",
+        "one": "Visa %(count)s till"
+    },
     "Notification options": "Aviseringsinställningar",
     "Forget Room": "Glöm rum",
     "Favourited": "Favoritmarkerad",
     "Room options": "Rumsinställningar",
-    "%(count)s unread messages including mentions.|other": "%(count)s olästa meddelanden inklusive omnämnanden.",
-    "%(count)s unread messages including mentions.|one": "1 oläst omnämnande.",
-    "%(count)s unread messages.|other": "%(count)s olästa meddelanden.",
-    "%(count)s unread messages.|one": "1 oläst meddelande.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s olästa meddelanden inklusive omnämnanden.",
+        "one": "1 oläst omnämnande."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s olästa meddelanden.",
+        "one": "1 oläst meddelande."
+    },
     "Unread messages.": "Olästa meddelanden.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Att uppgradera det här rummet kommer att stänga den nuvarande instansen av rummet och skapa ett uppgraderat rum med samma namn.",
     "This room has already been upgraded.": "Det här rummet har redan uppgraderats.",
@@ -1336,13 +1407,16 @@
     "Your homeserver": "Din hemserver",
     "Trusted": "Betrodd",
     "Not trusted": "Inte betrodd",
-    "%(count)s verified sessions|other": "%(count)s verifierade sessioner",
-    "%(count)s verified sessions|one": "1 verifierad session",
+    "%(count)s verified sessions": {
+        "other": "%(count)s verifierade sessioner",
+        "one": "1 verifierad session"
+    },
     "Hide verified sessions": "Dölj verifierade sessioner",
-    "%(count)s sessions|other": "%(count)s sessioner",
-    "%(count)s sessions|one": "%(count)s session",
+    "%(count)s sessions": {
+        "other": "%(count)s sessioner",
+        "one": "%(count)s session"
+    },
     "Hide sessions": "Dölj sessioner",
-    "Remove %(count)s messages|one": "Ta bort 1 meddelande",
     "Failed to deactivate user": "Misslyckades att inaktivera användaren",
     "This client does not support end-to-end encryption.": "Den här klienten stöder inte totalsträckskryptering.",
     "Security": "Säkerhet",
@@ -1509,8 +1583,10 @@
     "Explore rooms": "Utforska rum",
     "%(creator)s created and configured the room.": "%(creator)s skapade och konfigurerade rummet.",
     "View": "Visa",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Du har %(count)s olästa aviseringar i en tidigare version av det här rummet.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Du har %(count)s oläst avisering i en tidigare version av det här rummet.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Du har %(count)s olästa aviseringar i en tidigare version av det här rummet.",
+        "one": "Du har %(count)s oläst avisering i en tidigare version av det här rummet."
+    },
     "All settings": "Alla inställningar",
     "Feedback": "Återkoppling",
     "Switch to light mode": "Byt till ljust läge",
@@ -1650,7 +1726,9 @@
     "Revoke permissions": "Återkalla behörigheter",
     "Data on this screen is shared with %(widgetDomain)s": "Data på den här skärmen delas med %(widgetDomain)s",
     "Modal Widget": "Dialogruta",
-    "You can only pin up to %(count)s widgets|other": "Du kan bara fästa upp till %(count)s widgets",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Du kan bara fästa upp till %(count)s widgets"
+    },
     "Show Widgets": "Visa widgets",
     "Hide Widgets": "Dölj widgets",
     "The call was answered on another device.": "Samtalet mottogs på en annan enhet.",
@@ -1975,8 +2053,10 @@
     "Continue with %(provider)s": "Fortsätt med %(provider)s",
     "Homeserver": "Hemserver",
     "Server Options": "Serveralternativ",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Cacha på ett säkert sätt krypterade meddelanden lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(rooms)s rum.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Cacha på ett säkert sätt krypterade meddelanden lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(rooms)s rum.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Cacha på ett säkert sätt krypterade meddelanden lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(rooms)s rum.",
+        "other": "Cacha på ett säkert sätt krypterade meddelanden lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(rooms)s rum."
+    },
     "Return to call": "Återgå till samtal",
     "Use Ctrl + Enter to send a message": "Använd Ctrl + Enter för att skicka ett meddelande",
     "Use Command + Enter to send a message": "Använd Kommando + Enter för att skicka ett meddelande",
@@ -2138,8 +2218,10 @@
     "Support": "Hjälp",
     "Random": "Slumpmässig",
     "Welcome to <name/>": "Välkommen till <name/>",
-    "%(count)s members|one": "%(count)s medlem",
-    "%(count)s members|other": "%(count)s medlemmar",
+    "%(count)s members": {
+        "one": "%(count)s medlem",
+        "other": "%(count)s medlemmar"
+    },
     "Your server does not support showing space hierarchies.": "Din server stöder inte att visa utrymmeshierarkier.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Är du säker på att du vill lämna utrymmet '%(spaceName)s'?",
     "This space is not public. You will not be able to rejoin without an invite.": "Det här utrymmet är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan.",
@@ -2201,8 +2283,10 @@
     "Failed to remove some rooms. Try again later": "Misslyckades att ta bort vissa rum. Försök igen senare",
     "Suggested": "Föreslaget",
     "This room is suggested as a good one to join": "Det här rummet föreslås som ett bra att gå med i",
-    "%(count)s rooms|one": "%(count)s rum",
-    "%(count)s rooms|other": "%(count)s rum",
+    "%(count)s rooms": {
+        "one": "%(count)s rum",
+        "other": "%(count)s rum"
+    },
     "You don't have permission": "Du har inte behörighet",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Detta påverkar normalt bara hur rummet hanteras på serven. Om du upplever problem med din %(brand)s, vänligen rapportera en bugg.",
     "Invite to %(roomName)s": "Bjud in till %(roomName)s",
@@ -2210,7 +2294,10 @@
     "Invite with email or username": "Bjud in med e-postadress eller användarnamn",
     "You can change these anytime.": "Du kan ändra dessa när som helst.",
     "Add some details to help people recognise it.": "Lägg till några detaljer för att hjälpa folk att känn igen det.",
-    "%(count)s people you know have already joined|other": "%(count)s personer du känner har redan gått med",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s personer du känner har redan gått med",
+        "one": "%(count)s person du känner har redan gått med"
+    },
     "What are some things you want to discuss in %(spaceName)s?": "Vad är några saker du vill diskutera i %(spaceName)s?",
     "You can add more later too, including already existing ones.": "Du kan lägga till flera senare också, inklusive redan existerande.",
     "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Tillfrågar %(transferTarget)s. <a>%(transferTarget)sÖverför till %(transferee)s</a>",
@@ -2219,7 +2306,6 @@
     "unknown person": "okänd person",
     "Warn before quitting": "Varna innan avslutning",
     "Invite to just this room": "Bjud in till bara det här rummet",
-    "%(count)s people you know have already joined|one": "%(count)s person du känner har redan gått med",
     "Add existing rooms": "Lägg till existerande rum",
     "We couldn't create your DM.": "Vi kunde inte skapa ditt DM.",
     "Reset event store": "Återställ händelselagring",
@@ -2245,8 +2331,10 @@
     "%(seconds)ss left": "%(seconds)ss kvar",
     "Change server ACLs": "Ändra server-ACLer",
     "Delete all": "Radera alla",
-    "View all %(count)s members|one": "Visa 1 medlem",
-    "View all %(count)s members|other": "Visa alla %(count)s medlemmar",
+    "View all %(count)s members": {
+        "one": "Visa 1 medlem",
+        "other": "Visa alla %(count)s medlemmar"
+    },
     "You can select all or individual messages to retry or delete": "Du kan välja alla eller individuella meddelanden att försöka igen eller radera",
     "Sending": "Skickar",
     "Retry all": "Försök alla igen",
@@ -2269,8 +2357,10 @@
     "To leave the beta, visit your settings.": "För att lämna betan, besök dina inställningar.",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Din plattform och ditt användarnamn kommer att noteras för att hjälpa oss att använda din återkoppling så mycket vi kan.",
     "Want to add a new room instead?": "Vill du lägga till ett nytt rum istället?",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Lägger till rum…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Lägger till rum… (%(progress)s av %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Lägger till rum…",
+        "other": "Lägger till rum… (%(progress)s av %(count)s)"
+    },
     "Not all selected were added": "Inte alla valda tillades",
     "You are not allowed to view this server's rooms list": "Du tillåts inte att se den här serverns rumslista",
     "Add reaction": "Lägg till reaktion",
@@ -2289,8 +2379,10 @@
     "Sends the given message with a space themed effect": "Skickar det givna meddelandet med en effekt med rymdtema",
     "See when people join, leave, or are invited to your active room": "Se när folk går med, lämnar eller bjuds in till ditt aktiva rum",
     "See when people join, leave, or are invited to this room": "Se när folk går med, lämnar eller bjuds in till det här rummet",
-    "Currently joining %(count)s rooms|one": "Går just nu med i %(count)s rum",
-    "Currently joining %(count)s rooms|other": "Går just nu med i %(count)s rum",
+    "Currently joining %(count)s rooms": {
+        "one": "Går just nu med i %(count)s rum",
+        "other": "Går just nu med i %(count)s rum"
+    },
     "The user you called is busy.": "Användaren du ringde är upptagen.",
     "User Busy": "Användare upptagen",
     "Or send invite link": "Eller skicka inbjudningslänk",
@@ -2399,8 +2491,10 @@
     "Enable guest access": "Aktivera gäståtkomst",
     "Stop recording": "Stoppa inspelning",
     "Send voice message": "Skicka röstmeddelande",
-    "Show %(count)s other previews|one": "Visa %(count)s annan förhandsgranskning",
-    "Show %(count)s other previews|other": "Visa %(count)s andra förhandsgranskningar",
+    "Show %(count)s other previews": {
+        "one": "Visa %(count)s annan förhandsgranskning",
+        "other": "Visa %(count)s andra förhandsgranskningar"
+    },
     "Access": "Åtkomst",
     "People with supported clients will be able to join the room without having a registered account.": "Personer med stödda klienter kommer kunna gå med i rummet utan ett registrerat konto.",
     "Decide who can join %(roomName)s.": "Bestäm vem som kan gå med i %(roomName)s.",
@@ -2408,8 +2502,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "Vem som helst i ett utrymme kan hitta och gå med. Du kan välja flera utrymmen.",
     "Spaces with access": "Utrymmen med åtkomst",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Vem som helst i ett utrymme kan hitta och gå med. <a>Redigera vilka utrymmen som kan komma åt här.</a>",
-    "Currently, %(count)s spaces have access|other": "Just nu har %(count)s utrymmen åtkomst",
-    "& %(count)s more|other": "& %(count)s till",
+    "Currently, %(count)s spaces have access": {
+        "other": "Just nu har %(count)s utrymmen åtkomst",
+        "one": "Just nu har ett utrymme åtkomst"
+    },
+    "& %(count)s more": {
+        "other": "& %(count)s till",
+        "one": "& %(count)s till"
+    },
     "Upgrade required": "Uppgradering krävs",
     "Anyone can find and join.": "Vem som helst kan hitta och gå med.",
     "Only invited people can join.": "Endast inbjudna personer kan gå med.",
@@ -2435,10 +2535,14 @@
     "Published addresses can be used by anyone on any server to join your room.": "Publicerade adresser kan användas av vem som helst på vilken server som helst för att gå med i ditt rum.",
     "Published addresses can be used by anyone on any server to join your space.": "Publicerade adresser kan användas av vem som helst på vilken server som helst för att gå med i ditt utrymme.",
     "Please provide an address": "Ange en adress, tack",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sändrade server-ACL:erna",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sändrade server-ACL:erna %(count)s gånger",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sändrade server-ACL:erna",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sändrade server-ACL:erna %(count)s gånger",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sändrade server-ACL:erna",
+        "other": "%(oneUser)sändrade server-ACL:erna %(count)s gånger"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)sändrade server-ACL:erna",
+        "other": "%(severalUsers)sändrade server-ACL:erna %(count)s gånger"
+    },
     "Share content": "Dela innehåll",
     "Application window": "Programfönster",
     "Share entire screen": "Dela hela skärmen",
@@ -2521,7 +2625,6 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s avfäste <a>ett meddelande</a> i det här rummet. Se alla <b>fästa meddelanden</b>.",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s fäste ett meddelande i det här rummet. Se alla fästa meddelanden.",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s fäste <a>ett meddelande</a> i det här rummet. Se alla <b>fästa meddelanden</b>.",
-    "& %(count)s more|one": "& %(count)s till",
     "Some encryption parameters have been changed.": "Vissa krypteringsparametrar har ändrats.",
     "Role in <RoomName/>": "Roll i <RoomName/>",
     "Send a sticker": "Skicka en dekal",
@@ -2535,7 +2638,6 @@
     "Change space name": "Byt utrymmesnamn",
     "Change space avatar": "Byt utrymmesavatar",
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Vem som helst i <spaceName/> kan hitta och gå med. Du kan välja andra utrymmen också.",
-    "Currently, %(count)s spaces have access|one": "Just nu har ett utrymme åtkomst",
     "%(reactors)s reacted with %(content)s": "%(reactors)s reagerade med %(content)s",
     "Message": "Meddelande",
     "Message didn't send. Click for info.": "Meddelande skickades inte. Klicka för info.",
@@ -2575,12 +2677,18 @@
     "Export chat": "Exportera chatt",
     "Threads": "Trådar",
     "Create poll": "Skapa omröstning",
-    "%(count)s reply|one": "%(count)s svar",
-    "%(count)s reply|other": "%(count)s svar",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Uppdaterar utrymme…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Uppdaterar utrymmen… (%(progress)s av %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Skickar inbjudan…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Skickar inbjudningar… (%(progress)s av %(count)s)",
+    "%(count)s reply": {
+        "one": "%(count)s svar",
+        "other": "%(count)s svar"
+    },
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Uppdaterar utrymme…",
+        "other": "Uppdaterar utrymmen… (%(progress)s av %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Skickar inbjudan…",
+        "other": "Skickar inbjudningar… (%(progress)s av %(count)s)"
+    },
     "Loading new room": "Laddar nytt rum",
     "Upgrading room": "Uppgraderar rum",
     "File Attached": "Fil bifogad",
@@ -2656,18 +2764,26 @@
     "Rename": "Döp om",
     "Select all": "Välj alla",
     "Deselect all": "Välj bort alla",
-    "Sign out devices|one": "Logga ut enhet",
-    "Sign out devices|other": "Logga ut enheter",
-    "Click the button below to confirm signing out these devices.|one": "Klicka på knappen nedan för att bekräfta utloggning av denna enhet.",
-    "Click the button below to confirm signing out these devices.|other": "Klicka på knappen nedan för att bekräfta utloggning av dessa enheter.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Bekräfta utloggning av denna enhet genom att använda samlad inloggning för att bevisa din identitet.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Bekräfta utloggning av dessa enheter genom att använda samlad inloggning för att bevisa din identitet.",
+    "Sign out devices": {
+        "one": "Logga ut enhet",
+        "other": "Logga ut enheter"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Klicka på knappen nedan för att bekräfta utloggning av denna enhet.",
+        "other": "Klicka på knappen nedan för att bekräfta utloggning av dessa enheter."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Bekräfta utloggning av denna enhet genom att använda samlad inloggning för att bevisa din identitet.",
+        "other": "Bekräfta utloggning av dessa enheter genom att använda samlad inloggning för att bevisa din identitet."
+    },
     "Someone already has that username, please try another.": "Någon annan har redan det användarnamnet, vänligen pröva ett annat.",
     "Someone already has that username. Try another or if it is you, sign in below.": "Någon annan har redan det användarnamnet. Pröva ett annat, eller om det är ditt, logga in nedan.",
     "Own your conversations.": "Äg dina konversationer.",
     "%(senderName)s has updated the room layout": "%(senderName)s har uppdaterat rummets arrangemang",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s och %(count)s till",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s och %(count)s till",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s och %(count)s till",
+        "other": "%(spaceName)s och %(count)s till"
+    },
     "Other rooms": "Andra rum",
     "You cannot place calls in this browser.": "Du kan inte ringa samtal i den här webbläsaren.",
     "Calls are unsupported": "Samtal stöds ej",
@@ -2694,16 +2810,24 @@
     "Show tray icon and minimise window to it on close": "Visa ikon i systembrickan och minimera programmet till den när fönstret stängs",
     "Large": "Stor",
     "Image size in the timeline": "Bildstorlek i tidslinjen",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Exporterade %(count)s händelse på %(seconds)s sekunder",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Exporterade %(count)s händelser på %(seconds)s sekunder",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Exporterade %(count)s händelse på %(seconds)s sekunder",
+        "other": "Exporterade %(count)s händelser på %(seconds)s sekunder"
+    },
     "Export successful!": "Export lyckades!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Hämtade %(count)s händelse på %(seconds)s s",
-    "Fetched %(count)s events in %(seconds)ss|other": "Hämtade %(count)s händelser på %(seconds)s s",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Hämtade %(count)s händelse på %(seconds)s s",
+        "other": "Hämtade %(count)s händelser på %(seconds)s s"
+    },
     "Processing event %(number)s out of %(total)s": "Hanterade händelse %(number)s av %(total)s",
-    "Fetched %(count)s events so far|one": "Hämtade %(count)s händelse än så länge",
-    "Fetched %(count)s events so far|other": "Hämtade %(count)s händelser än så länge",
-    "Fetched %(count)s events out of %(total)s|one": "Hämtade %(count)s händelse av %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Hämtade %(count)s händelser av %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Hämtade %(count)s händelse än så länge",
+        "other": "Hämtade %(count)s händelser än så länge"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Hämtade %(count)s händelse av %(total)s",
+        "other": "Hämtade %(count)s händelser av %(total)s"
+    },
     "Generating a ZIP": "Genererar en ZIP",
     "%(senderName)s has ended a poll": "%(senderName)s har avslutat en omröstning",
     "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)s har startat en omröstning - %(pollQuestion)s",
@@ -2797,10 +2921,14 @@
     "You don't have permission to view messages from before you were invited.": "Du är inte behörig att se meddelanden från innan du bjöds in.",
     "Sorry, the poll you tried to create was not posted.": "Tyvärr så lades omröstningen du försökte skapa inte upp.",
     "Failed to post poll": "Misslyckades att lägga upp omröstning",
-    "was removed %(count)s times|one": "togs bort",
-    "was removed %(count)s times|other": "togs bort %(count)s gånger",
-    "were removed %(count)s times|one": "togs bort",
-    "were removed %(count)s times|other": "togs bort %(count)s gånger",
+    "was removed %(count)s times": {
+        "one": "togs bort",
+        "other": "togs bort %(count)s gånger"
+    },
+    "were removed %(count)s times": {
+        "one": "togs bort",
+        "other": "togs bort %(count)s gånger"
+    },
     "Including you, %(commaSeparatedMembers)s": "Inklusive dig, %(commaSeparatedMembers)s",
     "Backspace": "Backsteg",
     "Unknown error fetching location. Please try again later.": "Ökänt fel när plats hämtades. Pröva igen senare.",
@@ -2810,15 +2938,23 @@
     "Could not fetch location": "Kunde inte hämta plats",
     "Location": "Plats",
     "toggle event": "växla händelse",
-    "%(count)s votes|one": "%(count)s röst",
-    "%(count)s votes|other": "%(count)s röster",
-    "Based on %(count)s votes|one": "Baserat på %(count)s röst",
-    "Based on %(count)s votes|other": "Baserat på %(count)s röster",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s röst avgiven. Rösta för att ser resultatet",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s röster avgivna. Rösta för att se resultatet",
+    "%(count)s votes": {
+        "one": "%(count)s röst",
+        "other": "%(count)s röster"
+    },
+    "Based on %(count)s votes": {
+        "one": "Baserat på %(count)s röst",
+        "other": "Baserat på %(count)s röster"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s röst avgiven. Rösta för att ser resultatet",
+        "other": "%(count)s röster avgivna. Rösta för att se resultatet"
+    },
     "No votes cast": "Inga röster avgivna",
-    "Final result based on %(count)s votes|one": "Slutgiltigt resultat baserat på %(count)s röst",
-    "Final result based on %(count)s votes|other": "Slutgiltigt resultat baserat på %(count)s röster",
+    "Final result based on %(count)s votes": {
+        "one": "Slutgiltigt resultat baserat på %(count)s röst",
+        "other": "Slutgiltigt resultat baserat på %(count)s röster"
+    },
     "Sorry, your vote was not registered. Please try again.": "Tyvärr så registrerades inte din röst. Vänligen pröva igen.",
     "You do not have permissions to add spaces to this space": "Du är inte behörig att lägga till utrymmen till det här utrymmet",
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Det här grupperar dina chattar med medlemmar i det här utrymmet. Att stänga av det kommer att dölja dessa chattar från din vy av %(spaceName)s.",
@@ -2899,18 +3035,28 @@
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Tack för att du prövar betan, vänligen ge så många detaljer du kan så att vi kan förbättra den.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s och %(space2Name)s",
     "Maximise": "Maximera",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sskickade ett dolt meddelande",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sskickade %(count)s dolda meddelanden",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sskickade ett dolt meddelande",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sskickade %(count)s dolda meddelanden",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)stog bort ett meddelande",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)stog bort %(count)s meddelanden",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)stog bort ett meddelande",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)stog bort %(count)s meddelanden",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sskickade ett dolt meddelande",
+        "other": "%(oneUser)sskickade %(count)s dolda meddelanden"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sskickade ett dolt meddelande",
+        "other": "%(severalUsers)sskickade %(count)s dolda meddelanden"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)stog bort ett meddelande",
+        "other": "%(oneUser)stog bort %(count)s meddelanden"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)stog bort ett meddelande",
+        "other": "%(severalUsers)stog bort %(count)s meddelanden"
+    },
     "Automatically send debug logs when key backup is not functioning": "Skicka automatiskt felsökningsloggar när nyckelsäkerhetskopiering inte funkar",
     "<empty string>": "<tom sträng>",
-    "<%(count)s spaces>|one": "<mellanslag>",
-    "<%(count)s spaces>|other": "<%(count)s mellanslag>",
+    "<%(count)s spaces>": {
+        "one": "<mellanslag>",
+        "other": "<%(count)s mellanslag>"
+    },
     "Join %(roomAddress)s": "Gå med i %(roomAddress)s",
     "Edit poll": "Redigera omröstning",
     "Sorry, you can't edit a poll after votes have been cast.": "Tyvärr kan du inte redigera en omröstning efter att röster har avgivits.",
@@ -2951,8 +3097,10 @@
     "Forget this space": "Glöm det här utrymmet",
     "You were removed by %(memberName)s": "Du togs bort av %(memberName)s",
     "Loading preview": "Laddar förhandsgranskning",
-    "Currently removing messages in %(count)s rooms|one": "Tar just nu bort meddelanden i %(count)s rum",
-    "Currently removing messages in %(count)s rooms|other": "Tar just nu bort meddelanden i %(count)s rum",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Tar just nu bort meddelanden i %(count)s rum",
+        "other": "Tar just nu bort meddelanden i %(count)s rum"
+    },
     "New video room": "Nytt videorum",
     "New room": "Nytt rum",
     "Busy": "Upptagen",
@@ -2975,8 +3123,10 @@
     "User is already invited to the space": "Användaren är redan inbjuden till det här utrymmet",
     "You do not have permission to invite people to this space.": "Du är inte behörig att bjuda in folk till det här utrymmet.",
     "Failed to invite users to %(roomName)s": "Misslyckades att bjuda in användare till %(roomName)s",
-    "%(count)s participants|one": "1 deltagare",
-    "%(count)s participants|other": "%(count)s deltagare",
+    "%(count)s participants": {
+        "one": "1 deltagare",
+        "other": "%(count)s deltagare"
+    },
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s returnerades vid försök att komma åt rummet eller utrymmet. Om du tror att du ser det här meddelandet felaktigt, vänligen <issueLink>skicka en buggrapport</issueLink>.",
     "Try again later, or ask a room or space admin to check if you have access.": "Pröva igen senare eller be en rums- eller utrymmesadministratör att kolla om du har åtkomst.",
     "This room or space is not accessible at this time.": "Det är rummet eller utrymmet är inte åtkomligt för tillfället.",
@@ -2992,8 +3142,10 @@
     "Can't create a thread from an event with an existing relation": "Kan inte skapa tråd från en händelse med en existerande relation",
     "sends hearts": "skicka hjärtan",
     "Sends the given message with hearts": "Skickar det givna meddelandet med hjärtan",
-    "Confirm signing out these devices|one": "Bekräfta utloggning av denna enhet",
-    "Confirm signing out these devices|other": "Bekräfta utloggning av dessa enheter",
+    "Confirm signing out these devices": {
+        "one": "Bekräfta utloggning av denna enhet",
+        "other": "Bekräfta utloggning av dessa enheter"
+    },
     "Jump to the given date in the timeline": "Hoppa till det angivna datumet i tidslinjen",
     "Unban from room": "Avbanna i rum",
     "Ban from space": "Banna från utrymme",
@@ -3071,15 +3223,21 @@
     "Create a video room": "Skapa ett videorum",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Bocka ur om du även vill ta bort systemmeddelanden för denna användaren (förändrat medlemskap, ny profilbild, m.m.)",
     "Preserve system messages": "Bevara systemmeddelanden",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Du håller på att ta bort %(count)s meddelanden från %(user)s. Detta kommer ta bort dem permanent för alla i konversationen. Vill du verkligen fortsätta?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Du håller på att ta bort %(count)s meddelanden från %(user)s. Detta kommer ta bort dem permanent för alla i konversationen. Vill du verkligen fortsätta?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Du håller på att ta bort %(count)s meddelanden från %(user)s. Detta kommer ta bort dem permanent för alla i konversationen. Vill du verkligen fortsätta?",
+        "other": "Du håller på att ta bort %(count)s meddelanden från %(user)s. Detta kommer ta bort dem permanent för alla i konversationen. Vill du verkligen fortsätta?"
+    },
     "%(featureName)s Beta feedback": "%(featureName)s Betaåterkoppling",
     "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Hjälp oss hitta fel och förbättra %(analyticsOwner)s genom att dela anonym användardata. För att förstå hur folk använder flera enheter så skapar vi en slumpmässig identifierare som delas mellan dina enheter.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Du kan använda egna serverinställningar för att logga in på andra Matrix-servrar genom att ange en URL för en annan hemserver. Då kan du använda %(brand)s med ett existerande Matrix-konto på en annan hemserver.",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s ändrade de <a>fästa meddelandena</a> för rummet",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s ändrade de <a>fästa meddelandena</a> för rummet %(count)s gånger",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s ändrade de <a>fästa meddelandena</a> för rummet",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s ändrade <a>fästa meddelanden</a> för rummet %(count)s gånger",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s ändrade de <a>fästa meddelandena</a> för rummet",
+        "other": "%(oneUser)s ändrade de <a>fästa meddelandena</a> för rummet %(count)s gånger"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s ändrade de <a>fästa meddelandena</a> för rummet",
+        "other": "%(severalUsers)s ändrade <a>fästa meddelanden</a> för rummet %(count)s gånger"
+    },
     "What location type do you want to share?": "Vilken typ av positionsdelning vill du använda?",
     "Drop a Pin": "Sätt en nål",
     "My live location": "Min realtidsposition",
@@ -3104,8 +3262,10 @@
     "You will no longer be able to log in": "Kommer du inte längre kunna logga in",
     "You will not be able to reactivate your account": "Kommer du inte kunna återaktivera ditt konto",
     "To continue, please enter your account password:": "För att fortsätta, vänligen ange ditt kontolösenord:",
-    "Seen by %(count)s people|one": "Sedd av %(count)s person",
-    "Seen by %(count)s people|other": "Sedd av %(count)s personer",
+    "Seen by %(count)s people": {
+        "one": "Sedd av %(count)s person",
+        "other": "Sedd av %(count)s personer"
+    },
     "Your password was successfully changed.": "Ditt lösenord byttes framgångsrikt.",
     "An error occurred while stopping your live location": "Ett fel inträffade vid delning av din realtidsposition",
     "Enable live location sharing": "Aktivera platsdelning i realtid",
@@ -3134,8 +3294,10 @@
     "Click to read topic": "Klicka för att läsa ämne",
     "Edit topic": "Redigera ämne",
     "Joining…": "Går med…",
-    "%(count)s people joined|other": "%(count)s personer gick med",
-    "%(count)s people joined|one": "%(count)s person gick med",
+    "%(count)s people joined": {
+        "other": "%(count)s personer gick med",
+        "one": "%(count)s person gick med"
+    },
     "View related event": "Visa relaterade händelser",
     "Check if you want to hide all current and future messages from this user.": "Bocka i om du vill dölja alla nuvarande och framtida meddelanden från den här användaren.",
     "Ignore user": "Ignorera användare",
@@ -3161,8 +3323,10 @@
     "Show spaces": "Visa utrymmen",
     "Show rooms": "Visa rum",
     "Search for": "Sök efter",
-    "%(count)s Members|one": "%(count)s medlem",
-    "%(count)s Members|other": "%(count)s medlemmar",
+    "%(count)s Members": {
+        "one": "%(count)s medlem",
+        "other": "%(count)s medlemmar"
+    },
     "When you sign out, these keys will be deleted from this device, which means you won't be able to read encrypted messages unless you have the keys for them on your other devices, or backed them up to the server.": "När du loggar ut kommer nycklarna att raderas från den här enheten, vilket betyder att du inte kommer kunna läsa krypterade meddelanden om du inte har nycklarna för dem på dina andra enheter, eller säkerhetskopierade dem till servern.",
     "Show: Matrix rooms": "Visa: Matrixrum",
     "Show: %(instance)s rooms (%(server)s)": "Visa: %(instance)s-rum (%(server)s)",
@@ -3179,9 +3343,11 @@
     "Video rooms are always-on VoIP channels embedded within a room in %(brand)s.": "Videorum är ständigt aktiva VoIP-kanaler inbäddade i ett rum i %(brand)s.",
     "A new way to chat over voice and video in %(brand)s.": "Ett nytt sätt att chatta över röst och video i %(brand)s.",
     "Video rooms": "Videorum",
-    "In %(spaceName)s and %(count)s other spaces.|one": "I %(spaceName)s och %(count)s annat utrymme.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "I %(spaceName)s och %(count)s annat utrymme.",
+        "other": "I %(spaceName)s och %(count)s andra utrymmen."
+    },
     "In %(spaceName)s.": "I utrymmet %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "I %(spaceName)s och %(count)s andra utrymmen.",
     "In spaces %(space1Name)s and %(space2Name)s.": "I utrymmena %(space1Name)s och %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Utvecklarkommando: Slänger den nuvarande utgående gruppsessionen och sätter upp nya Olm-sessioner",
     "Stop and close": "Sluta och stäng",
@@ -3211,11 +3377,15 @@
     "Video call started in %(roomName)s.": "Videosamtal startade i %(roomName)s.",
     "You need to be able to kick users to do that.": "Du behöver kunna kicka användare för att göra det.",
     "Empty room (was %(oldName)s)": "Tomt rum (var %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Bjuder in %(user)s och 1 till",
-    "Inviting %(user)s and %(count)s others|other": "Bjuder in %(user)s och %(count)s till",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Bjuder in %(user)s och 1 till",
+        "other": "Bjuder in %(user)s och %(count)s till"
+    },
     "Inviting %(user1)s and %(user2)s": "Bjuder in %(user1)s och %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s och 1 till",
-    "%(user)s and %(count)s others|other": "%(user)s och %(count)s till",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s och 1 till",
+        "other": "%(user)s och %(count)s till"
+    },
     "%(user1)s and %(user2)s": "%(user1)s och %(user2)s",
     "Stop live broadcasting?": "Avsluta livesändning?",
     "Someone else is already recording a voice broadcast. Wait for their voice broadcast to end to start a new one.": "Någon annan spelar redan in en röstsändning. Vänta på att deras röstsändning tar slut för att starta en ny.",
@@ -3275,8 +3445,10 @@
     "Voice settings": "Röstinställningar",
     "For best security, verify your sessions and sign out from any session that you don't recognize or use anymore.": "För bäst säkerhet, verifiera dina sessioner och logga ut alla sessioner du inte känner igen eller använder längre.",
     "Other sessions": "Andra sessioner",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Är du säker på att du vill logga ut %(count)s session?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Är du säker på att du vill logga ut %(count)s sessioner?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Är du säker på att du vill logga ut %(count)s session?",
+        "other": "Är du säker på att du vill logga ut %(count)s sessioner?"
+    },
     "Sessions": "Sessioner",
     "Your server doesn't support disabling sending read receipts.": "Din server stöder inte inaktivering av läskvitton.",
     "Share your activity and status with others.": "Dela din aktivitet och status med andra.",
@@ -3295,8 +3467,10 @@
     "Add privileged users": "Lägg till privilegierade användare",
     "Complete these to get the most out of %(brand)s": "Gör dessa för att få ut så mycket som möjligt av %(brand)s",
     "You did it!": "Du klarade det!",
-    "Only %(count)s steps to go|one": "Bara %(count)s steg kvar",
-    "Only %(count)s steps to go|other": "Bara %(count)s steg kvar",
+    "Only %(count)s steps to go": {
+        "one": "Bara %(count)s steg kvar",
+        "other": "Bara %(count)s steg kvar"
+    },
     "Welcome to %(brand)s": "Välkommen till %(brand)s",
     "Find your people": "Hitta ditt folk",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Håll ägandeskap och kontroll över gemenskapsdiskussioner.\nSkala för att stöda miljoner, med kraftfull moderering och interoperabilitet.",
@@ -3495,10 +3669,14 @@
     "Link": "Länk",
     " in <strong>%(room)s</strong>": " i <strong>%(room)s</strong>",
     "Improve your account security by following these recommendations.": "Förbättra din kontosäkerhet genom att följa dessa rekommendationer.",
-    "Sign out of %(count)s sessions|one": "Logga ut ur %(count)s session",
-    "Sign out of %(count)s sessions|other": "Logga ut ur %(count)s sessioner",
-    "%(count)s sessions selected|one": "%(count)s session vald",
-    "%(count)s sessions selected|other": "%(count)s sessioner valda",
+    "Sign out of %(count)s sessions": {
+        "one": "Logga ut ur %(count)s session",
+        "other": "Logga ut ur %(count)s sessioner"
+    },
+    "%(count)s sessions selected": {
+        "one": "%(count)s session vald",
+        "other": "%(count)s sessioner valda"
+    },
     "Verify your current session for enhanced secure messaging.": "Verifiera din nuvarande session för förbättrade säkra meddelanden.",
     "Your current session is ready for secure messaging.": "Din nuvarande session är redo för säkra meddelanden.",
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Logga ut ur alla andra sessioner (%(otherSessionsCount)s)",
@@ -3626,10 +3804,14 @@
     "User": "Användare",
     "Log out and back in to disable": "Logga ut och in igen för att inaktivera",
     "View poll": "Visa omröstning",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Det finns inga tidigare omröstningar för det senaste dygnet. Ladda fler omröstningar för att se omröstningar för tidigare månader",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Det finns inga tidigare omröstningar under de senaste %(count)s dagarna. Ladda fler omröstningar för att se omröstningar för tidigare månader",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "Det finns inga aktiva omröstningar det senaste dygnet. Ladda fler omröstningar för att se omröstningar för tidigare månader",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "Det finns inga aktiva omröstningar under de senaste %(count)s dagarna. Ladda fler omröstningar för att se omröstningar för tidigare månader",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Det finns inga tidigare omröstningar för det senaste dygnet. Ladda fler omröstningar för att se omröstningar för tidigare månader",
+        "other": "Det finns inga tidigare omröstningar under de senaste %(count)s dagarna. Ladda fler omröstningar för att se omröstningar för tidigare månader"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "Det finns inga aktiva omröstningar det senaste dygnet. Ladda fler omröstningar för att se omröstningar för tidigare månader",
+        "other": "Det finns inga aktiva omröstningar under de senaste %(count)s dagarna. Ladda fler omröstningar för att se omröstningar för tidigare månader"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Det finns inga tidigare omröstningar. Ladda fler omröstningar för att se omröstningar för tidigare månader",
     "There are no active polls. Load more polls to view polls for previous months": "Det finns inga aktiva omröstningar. Ladda fler omröstningar för att se omröstningar för tidigare månader",
     "Load more polls": "Ladda fler omröstningar",
@@ -3697,7 +3879,9 @@
     "Invites by email can only be sent one at a time": "Inbjudningar via e-post kan endast skickas en i taget",
     "Match default setting": "Matcha förvalsinställning",
     "Mute room": "Tysta rum",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Rummets oläst-status: <strong>%(status)s</strong>, antal: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Rummets oläst-status: <strong>%(status)s</strong>, antal: <strong>%(count)s</strong>"
+    },
     "Unable to find event at that date": "Kunde inte hitta händelse vid det datumet",
     "Enable new native OIDC flows (Under active development)": "Aktivera nya inbyggda OIDC-flöden (Under aktiv utveckling)",
     "Your server requires encryption to be disabled.": "Din server kräver att kryptering är inaktiverat.",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 9c2439d679..937744fae8 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -38,8 +38,10 @@
     "You may need to manually permit %(brand)s to access your microphone/webcam": "คุณอาจต้องให้สิทธิ์ %(brand)s เข้าถึงไมค์โครโฟนไมค์โครโฟน/กล้องเว็บแคม ด้วยตัวเอง",
     "Authentication": "การยืนยันตัวตน",
     "%(items)s and %(lastItem)s": "%(items)s และ %(lastItem)s",
-    "and %(count)s others...|one": "และอีกหนึ่งผู้ใช้...",
-    "and %(count)s others...|other": "และอีก %(count)s ผู้ใช้...",
+    "and %(count)s others...": {
+        "one": "และอีกหนึ่งผู้ใช้...",
+        "other": "และอีก %(count)s ผู้ใช้..."
+    },
     "An error has occurred.": "เกิดข้อผิดพลาด",
     "Anyone": "ทุกคน",
     "Are you sure?": "คุณแน่ใจหรือไม่?",
@@ -140,8 +142,10 @@
     "Unban": "ปลดแบน",
     "Unable to enable Notifications": "ไม่สามารถเปิดใช้งานการแจ้งเตือน",
     "Uploading %(filename)s": "กำลังอัปโหลด %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
-    "Uploading %(filename)s and %(count)s others|other": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
+        "other": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์"
+    },
     "Upload Failed": "การอัปโหลดล้มเหลว",
     "Usage": "การใช้งาน",
     "Warning!": "คำเตือน!",
@@ -189,8 +193,10 @@
     "Decline": "ปฏิเสธ",
     "Home": "เมนูหลัก",
     "Unnamed Room": "ห้องที่ยังไม่ได้ตั้งชื่อ",
-    "(~%(count)s results)|one": "(~%(count)s ผลลัพท์)",
-    "(~%(count)s results)|other": "(~%(count)s ผลลัพท์)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s ผลลัพท์)",
+        "other": "(~%(count)s ผลลัพท์)"
+    },
     "A new password must be entered.": "กรุณากรอกรหัสผ่านใหม่",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "ไม่สามารถเฃื่อมต่อไปหาเซิร์ฟเวอร์บ้านได้ - กรุณาตรวจสอบคุณภาพการเชื่อมต่อ, ตรวจสอบว่า<a>SSL certificate ของเซิร์ฟเวอร์บ้าน</a>ของคุณเชื่อถือได้, และวไม่มีส่วนขยายเบราว์เซอร์ใดบล๊อคการเชื่อมต่ออยู่",
     "Custom level": "กำหนดระดับเอง",
@@ -343,14 +349,22 @@
     "Renaming sessions": "การเปลี่ยนชื่อเซสชัน",
     "Please be aware that session names are also visible to people you communicate with.": "โปรดทราบว่าชื่อเซสชันจะปรากฏแก่บุคคลที่คุณสื่อสารด้วย.",
     "Rename session": "เปลี่ยนชื่อเซสชัน",
-    "Sign out devices|one": "ออกจากระบบอุปกรณ์",
-    "Sign out devices|other": "ออกจากระบบอุปกรณ์",
-    "Click the button below to confirm signing out these devices.|one": "คลิกปุ่มด้านล่างเพื่อยืนยันการออกจากระบบอุปกรณ์นี้.",
-    "Click the button below to confirm signing out these devices.|other": "คลิกปุ่มด้านล่างเพื่อยืนยันการออกจากระบบอุปกรณ์เหล่านี้.",
-    "Confirm signing out these devices|one": "ยืนยันการออกจากระบบอุปกรณ์นี้",
-    "Confirm signing out these devices|other": "ยืนยันการออกจากระบบอุปกรณ์เหล่านี้",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "ยืนยันการออกจากระบบอุปกรณ์นี้โดยใช้การลงชื่อเพียงครั้งเดียวเพื่อพิสูจน์ตัวตนของคุณ.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "ยืนยันการออกจากระบบอุปกรณ์เหล่านี้โดยใช้การลงชื่อเพียงครั้งเดียวเพื่อพิสูจน์ตัวตนของคุณ.",
+    "Sign out devices": {
+        "one": "ออกจากระบบอุปกรณ์",
+        "other": "ออกจากระบบอุปกรณ์"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "คลิกปุ่มด้านล่างเพื่อยืนยันการออกจากระบบอุปกรณ์นี้.",
+        "other": "คลิกปุ่มด้านล่างเพื่อยืนยันการออกจากระบบอุปกรณ์เหล่านี้."
+    },
+    "Confirm signing out these devices": {
+        "one": "ยืนยันการออกจากระบบอุปกรณ์นี้",
+        "other": "ยืนยันการออกจากระบบอุปกรณ์เหล่านี้"
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "ยืนยันการออกจากระบบอุปกรณ์นี้โดยใช้การลงชื่อเพียงครั้งเดียวเพื่อพิสูจน์ตัวตนของคุณ.",
+        "other": "ยืนยันการออกจากระบบอุปกรณ์เหล่านี้โดยใช้การลงชื่อเพียงครั้งเดียวเพื่อพิสูจน์ตัวตนของคุณ."
+    },
     "Current session": "เซสชันปัจจุบัน",
     "Your server requires encryption to be enabled in private rooms.": "เซิร์ฟเวอร์ของคุณกำหนดให้เปิดใช้งานการเข้ารหัสในห้องส่วนตัว.",
     "Encryption not enabled": "ไม่ได้เปิดใช้งานการเข้ารหัส",
@@ -394,11 +408,15 @@
     "United Kingdom": "สหราชอาณาจักร",
     "%(name)s is requesting verification": "%(name)s กำลังขอการตรวจสอบ",
     "Empty room (was %(oldName)s)": "ห้องว่าง (เดิม %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "เชิญ %(user)s และ 1 คนอื่นๆ",
-    "Inviting %(user)s and %(count)s others|other": "เชิญ %(user)s และ %(count)s คนอื่นๆ",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "เชิญ %(user)s และ 1 คนอื่นๆ",
+        "other": "เชิญ %(user)s และ %(count)s คนอื่นๆ"
+    },
     "Inviting %(user1)s and %(user2)s": "เชิญ %(user1)s และ %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s และ 1 คนอื่นๆ",
-    "%(user)s and %(count)s others|other": "%(user)s และ %(count)s คนอื่นๆ",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s และ 1 คนอื่นๆ",
+        "other": "%(user)s และ %(count)s คนอื่นๆ"
+    },
     "%(user1)s and %(user2)s": "%(user1)s และ %(user2)s",
     "Empty room": "ห้องว่าง",
     "Try again": "ลองอีกครั้ง",
@@ -428,8 +446,10 @@
     "Unable to access your microphone": "ไม่สามารถเข้าถึงไมโครโฟนของคุณ",
     "Mark all as read": "ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว",
     "Open thread": "เปิดกระทู้",
-    "%(count)s reply|one": "%(count)s ตอบ",
-    "%(count)s reply|other": "%(count)s ตอบกลับ",
+    "%(count)s reply": {
+        "one": "%(count)s ตอบ",
+        "other": "%(count)s ตอบกลับ"
+    },
     "Invited by %(sender)s": "ได้รับเชิญจาก %(sender)s",
     "Revoke invite": "ยกเลิกการเชิญ",
     "Admin Tools": "เครื่องมือผู้ดูแลระบบ",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index c307778929..9a26a4ea6e 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -15,8 +15,10 @@
     "Always show message timestamps": "Her zaman mesaj zaman dalgalarını (timestamps) gösterin",
     "Authentication": "Doğrulama",
     "%(items)s and %(lastItem)s": "%(items)s ve %(lastItem)s",
-    "and %(count)s others...|one": "ve bir diğeri...",
-    "and %(count)s others...|other": "ve %(count)s diğerleri...",
+    "and %(count)s others...": {
+        "one": "ve bir diğeri...",
+        "other": "ve %(count)s diğerleri..."
+    },
     "A new password must be entered.": "Yeni bir şifre girilmelidir.",
     "An error has occurred.": "Bir hata oluştu.",
     "Anyone": "Kimse",
@@ -174,8 +176,10 @@
     "Unmute": "Sesi aç",
     "Unnamed Room": "İsimsiz Oda",
     "Uploading %(filename)s": "%(filename)s yükleniyor",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s ve %(count)s kadarı yükleniyor",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s ve %(count)s kadarları yükleniyor",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "%(filename)s ve %(count)s kadarı yükleniyor",
+        "other": "%(filename)s ve %(count)s kadarları yükleniyor"
+    },
     "Upload avatar": "Avatar yükle",
     "Upload Failed": "Yükleme Başarısız",
     "Usage": "Kullanım",
@@ -223,8 +227,10 @@
     "Room": "Oda",
     "Connectivity to the server has been lost.": "Sunucuyla olan bağlantı kesildi.",
     "Sent messages will be stored until your connection has returned.": "Gönderilen iletiler bağlantınız geri gelene kadar saklanacak.",
-    "(~%(count)s results)|one": "(~%(count)s sonuç)",
-    "(~%(count)s results)|other": "(~%(count)s sonuçlar)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s sonuç)",
+        "other": "(~%(count)s sonuçlar)"
+    },
     "Cancel": "İptal",
     "Create new room": "Yeni Oda Oluştur",
     "Start chat": "Sohbet Başlat",
@@ -347,7 +353,10 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "Odaya misafirlerin girişini engelleyen %(senderDisplayName)s.",
     "%(senderName)s removed the main address for this room.": "Bu oda için ana adresi silen %(senderName)s.",
     "%(displayName)s is typing …": "%(displayName)s yazıyor…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ve bir diğeri yazıyor…",
+    "%(names)s and %(count)s others are typing …": {
+        "one": "%(names)s ve bir diğeri yazıyor…",
+        "other": "%(names)s ve diğer %(count)s kişi yazıyor…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ve %(lastPerson)s yazıyor…",
     "Cannot reach homeserver": "Ana sunucuya erişilemiyor",
     "Your %(brand)s is misconfigured": "%(brand)s hatalı ayarlanmış",
@@ -366,21 +375,49 @@
     "Rotate Left": "Sola Döndür",
     "Rotate Right": "Sağa Döndür",
     "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s kez katıldı",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s katıldı",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s kez katıldı",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s katıldı",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s kullanıcı ayrıldı",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ayrıldı",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s katıldı ve ayrıldı",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s katıldı ve ayrıldı",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ayrıldı ve yeniden katıldı",
-    "were invited %(count)s times|other": "%(count)s kez davet edildi",
-    "were invited %(count)s times|one": "davet edildi",
-    "was invited %(count)s times|other": "%(count)s kez davet edildi",
-    "was invited %(count)s times|one": "davet edildi",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s isimlerini değiştrtiler",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s ismini değiştirdi",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s %(count)s kez katıldı",
+        "one": "%(severalUsers)s katıldı"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s %(count)s kez katıldı",
+        "one": "%(oneUser)s katıldı"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)s kullanıcı ayrıldı",
+        "other": "%(severalUsers)s, %(count)s kez ayrıldı"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)s ayrıldı",
+        "other": "%(oneUser)s %(count)s kez ayrıldı"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)s katıldı ve ayrıldı",
+        "other": "%(severalUsers)s %(count)s kez katılıp ve ayrıldı"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)s katıldı ve ayrıldı",
+        "other": "%(oneUser)s %(count)s kez katıldı ve ayrıldı"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)s ayrıldı ve yeniden katıldı"
+    },
+    "were invited %(count)s times": {
+        "other": "%(count)s kez davet edildi",
+        "one": "davet edildi"
+    },
+    "was invited %(count)s times": {
+        "other": "%(count)s kez davet edildi",
+        "one": "davet edildi"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)s isimlerini değiştrtiler",
+        "other": "%(severalUsers)s kullanıcıları isimlerini %(count)s kez değiştirdiler"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)s ismini değiştirdi",
+        "other": "%(oneUser)s ismini %(count)s kez değiştirdi"
+    },
     "Power level": "Güç düzeyi",
     "e.g. my-room": "örn. odam",
     "Some characters not allowed": "Bazı karakterlere izin verilmiyor",
@@ -508,10 +545,11 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından düzenlendi",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından eklendi",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından silindi",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s ve diğer %(count)s kişi yazıyor…",
     "This homeserver has exceeded one of its resource limits.": "Bu anasunucu kaynak limitlerinden birini aştı.",
-    "%(items)s and %(count)s others|other": "%(items)s ve diğer %(count)s",
-    "%(items)s and %(count)s others|one": "%(items)s ve bir diğeri",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s ve diğer %(count)s",
+        "one": "%(items)s ve bir diğeri"
+    },
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Unrecognised address": "Tanınmayan adres",
     "You do not have permission to invite people to this room.": "Bu odaya kişi davet etme izniniz yok.",
@@ -692,8 +730,10 @@
     "Edit message": "Mesajı düzenle",
     "Unencrypted": "Şifrelenmemiş",
     "Close preview": "Önizlemeyi kapat",
-    "Remove %(count)s messages|other": "%(count)s mesajı sil",
-    "Remove %(count)s messages|one": "1 mesajı sil",
+    "Remove %(count)s messages": {
+        "other": "%(count)s mesajı sil",
+        "one": "1 mesajı sil"
+    },
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Düz-metin mesajına ¯\\_(ツ)_/¯ ifadesi ekler",
     "Rooster": "Horoz",
     "Cross-signing public keys:": "Çarpraz-imzalama açık anahtarları:",
@@ -739,8 +779,10 @@
     "Do you want to join %(roomName)s?": "%(roomName)s odasına katılmak ister misin?",
     "<userName/> invited you": "<userName/> davet etti",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s odasında önizleme yapılamaz. Katılmak ister misin?",
-    "%(count)s unread messages.|other": "%(count)s okunmamış mesaj.",
-    "%(count)s unread messages.|one": "1 okunmamış mesaj.",
+    "%(count)s unread messages.": {
+        "other": "%(count)s okunmamış mesaj.",
+        "one": "1 okunmamış mesaj."
+    },
     "Unread messages.": "Okunmamış mesajlar.",
     "This room has already been upgraded.": "Bu ıda zaten güncellenmiş.",
     "Only room administrators will see this warning": "Bu uyarıyı sadece oda yöneticileri görür",
@@ -754,8 +796,10 @@
     "Main address": "Ana adres",
     "Room Name": "Oda Adı",
     "Hide verified sessions": "Onaylı oturumları gizle",
-    "%(count)s verified sessions|other": "%(count)s doğrulanmış oturum",
-    "%(count)s verified sessions|one": "1 doğrulanmış oturum",
+    "%(count)s verified sessions": {
+        "other": "%(count)s doğrulanmış oturum",
+        "one": "1 doğrulanmış oturum"
+    },
     "Verify": "Doğrula",
     "Security": "Güvenlik",
     "Reply": "Cevapla",
@@ -891,35 +935,53 @@
     "Unable to revoke sharing for email address": "E-posta adresi paylaşımı kaldırılamadı",
     "Unable to revoke sharing for phone number": "Telefon numarası paylaşımı kaldırılamıyor",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Çağrıların sağlıklı bir şekide yapılabilmesi için lütfen anasunucunuzun (<code>%(homeserverDomain)s</code>) yöneticisinden bir TURN sunucusu yapılandırmasını isteyin.",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s kullanıcıları isimlerini %(count)s kez değiştirdiler",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s ismini %(count)s kez değiştirdi",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s değişiklik yapmadı",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s kez değişiklik yapmadı",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s değişiklik yapmadı",
-    "And %(count)s more...|other": "ve %(count)s kez daha...",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)s değişiklik yapmadı",
+        "other": "%(severalUsers)s %(count)s kez hiç bir değişiklik yapmadı"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s %(count)s kez değişiklik yapmadı",
+        "one": "%(oneUser)s değişiklik yapmadı"
+    },
+    "And %(count)s more...": {
+        "other": "ve %(count)s kez daha..."
+    },
     "Popout widget": "Görsel bileşeni göster",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Lütfen GitHub’da <newIssueLink>Yeni bir talep</newIssueLink> oluşturun ki bu hatayı inceleyebilelim.",
     "Language Dropdown": "Dil Listesi",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s, %(count)s kez ayrıldı",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s kez ayrıldı",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s %(count)s kez katılıp ve ayrıldı",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s kez katıldı ve ayrıldı",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s ayrıldı ve yeniden katıldı",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s %(count)s kez davetlerini reddetti",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s davetlerini reddetti",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s davetlerini reddetti",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s davetlerini geri çekti",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s davetini %(count)s kez geri çekti",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s davetini geri çekti",
-    "were banned %(count)s times|other": "%(count)s kez yasaklandı",
-    "were banned %(count)s times|one": "yasaklandı",
-    "was banned %(count)s times|other": "%(count)s kez yasaklandı",
-    "was banned %(count)s times|one": "yasaklandı",
-    "were unbanned %(count)s times|other": "%(count)s kez yasak kaldırıldı",
-    "were unbanned %(count)s times|one": "yasak kaldırıldı",
-    "was unbanned %(count)s times|other": "%(count)s kez yasak kaldırıldı",
-    "was unbanned %(count)s times|one": "yasak kaldırıldı",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s kez hiç bir değişiklik yapmadı",
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)s ayrıldı ve yeniden katıldı"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s %(count)s kez davetlerini reddetti",
+        "one": "%(severalUsers)s davetlerini reddetti"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)s davetlerini reddetti"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)s davetlerini geri çekti"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s davetini %(count)s kez geri çekti",
+        "one": "%(oneUser)s davetini geri çekti"
+    },
+    "were banned %(count)s times": {
+        "other": "%(count)s kez yasaklandı",
+        "one": "yasaklandı"
+    },
+    "was banned %(count)s times": {
+        "other": "%(count)s kez yasaklandı",
+        "one": "yasaklandı"
+    },
+    "were unbanned %(count)s times": {
+        "other": "%(count)s kez yasak kaldırıldı",
+        "one": "yasak kaldırıldı"
+    },
+    "was unbanned %(count)s times": {
+        "other": "%(count)s kez yasak kaldırıldı",
+        "one": "yasak kaldırıldı"
+    },
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "E-posta ile davet etmek için bir kimlik sunucusu kullan. <default> Varsayılanı kullan (%(defaultIdentityServerName)s</default> ya da <settings>Ayarlar</settings> kullanarak yönetin.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "E-posta ile davet için bir kimlik sunucu kullan. <settings>Ayarlar</settings> dan yönet.",
     "The following users may not exist": "Belirtilen kullanıcılar mevcut olmayabilir",
@@ -1016,8 +1078,10 @@
     "Everyone in this room is verified": "Bu odadaki herkes doğrulanmış",
     "Setting up keys": "Anahtarları ayarla",
     "Custom (%(level)s)": "Özel (%(level)s)",
-    "Upload %(count)s other files|other": "%(count)s diğer dosyaları yükle",
-    "Upload %(count)s other files|one": "%(count)s dosyayı sağla",
+    "Upload %(count)s other files": {
+        "other": "%(count)s diğer dosyaları yükle",
+        "one": "%(count)s dosyayı sağla"
+    },
     "Remember my selection for this widget": "Bu görsel bileşen işin seçimimi hatırla",
     "Indexed rooms:": "İndekslenmiş odalar:",
     "Bridges": "Köprüler",
@@ -1032,8 +1096,10 @@
     "Your messages are not secure": "Mesajlarınız korunmuyor",
     "Your homeserver": "Ana sunucunuz",
     "Not Trusted": "Güvenilmiyor",
-    "%(count)s sessions|other": "%(count)s oturum",
-    "%(count)s sessions|one": "%(count)s oturum",
+    "%(count)s sessions": {
+        "other": "%(count)s oturum",
+        "one": "%(count)s oturum"
+    },
     "%(name)s cancelled verifying": "%(name)s doğrulama iptal edildi",
     "Error encountered (%(errorDetail)s).": "Hata oluştu (%(errorDetail)s).",
     "No update available.": "Güncelleme yok.",
@@ -1087,7 +1153,10 @@
     "Encrypted by a deleted session": "Silinen bir oturumla şifrelenmiş",
     "Strikethrough": "Üstü çizili",
     "Reject & Ignore user": "Kullanıcı Reddet & Yoksay",
-    "%(count)s unread messages including mentions.|one": "1 okunmamış bahis.",
+    "%(count)s unread messages including mentions.": {
+        "one": "1 okunmamış bahis.",
+        "other": "anmalar dahil okunmayan %(count)s mesaj."
+    },
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Davet geri çekilemiyor. Sunucu geçici bir problem yaşıyor olabilir yada daveti geri çekmek için gerekli izinlere sahip değilsin.",
     "Mark all as read": "Tümünü okunmuş olarak işaretle",
     "Incoming Verification Request": "Gelen Doğrulama İsteği",
@@ -1122,7 +1191,10 @@
     "Join millions for free on the largest public server": "En büyük açık sunucu üzerindeki milyonlara ücretsiz ulaşmak için katılın",
     "This room is not public. You will not be able to rejoin without an invite.": "Bu oda açık bir oda değil. Davet almadan tekrar katılamayacaksınız.",
     "%(creator)s created and configured the room.": "%(creator)s odayı oluşturdu ve yapılandırdı.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bu odaya alternatif olarak %(addresses)s adreslerini ekledi.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s bu odaya alternatif olarak %(addresses)s adreslerini ekledi.",
+        "one": "%(senderName)s bu oda için alternatif adres %(addresses)s ekledi."
+    },
     "Something went wrong trying to invite the users.": "Kullanıcıların davet edilmesinde bir şeyler yanlış gitti.",
     "a new master key signature": "yeni bir master anahtar imzası",
     "a new cross-signing key signature": "yeni bir çapraz-imzalama anahtarı imzası",
@@ -1146,9 +1218,10 @@
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Verilen imza anahtarı %(userld)s'nin/nın %(deviceld)s oturumundan gelen anahtar ile uyumlu. Oturum doğrulanmış olarak işaretlendi.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Şifreli bir odadaki geçerli giden grup oturumunun atılmasını zorlar",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s oda ismini %(oldRoomName)s bununla değiştirdi %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s bu oda için alternatif adres %(addresses)s ekledi.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bu oda için alternatif adresleri %(addresses)s sildi.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s bu oda için alternatif adresi %(addresses)s sildi.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s bu oda için alternatif adresleri %(addresses)s sildi.",
+        "one": "%(senderName)s bu oda için alternatif adresi %(addresses)s sildi."
+    },
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s, %(targetDisplayName)s'nin odaya katılması için daveti iptal etti.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s %(glob)s ile eşleşen kullanıcıları banlama kuralını kaldırdı",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s %(glob)s ile eşleşen odaları banlama kuralını kaldırdı",
@@ -1179,7 +1252,6 @@
     "Error downloading theme information.": "Tema bilgisi indirilirken hata.",
     "Theme added!": "Tema eklendi!",
     "Add theme": "Tema ekle",
-    "%(count)s unread messages including mentions.|other": "anmalar dahil okunmayan %(count)s mesaj.",
     "Local address": "Yerel adres",
     "Local Addresses": "Yerel Adresler",
     "Trusted": "Güvenilir",
@@ -1667,8 +1739,10 @@
     "Failed to save your profile": "Profiliniz kaydedilemedi",
     "Securely cache encrypted messages locally for them to appear in search results.": "Arama sonuçlarında gozükmeleri için iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Çapraz imzalı cihazlara güvenmeden, güvenilir olarak işaretlemek için, bir kullanıcı tarafından kullanılan her bir oturumu ayrı ayrı doğrulayın.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odasından %(size)s  yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odalardan %(size)s yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odasından %(size)s  yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
+        "other": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odalardan %(size)s yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al."
+    },
     "not found in storage": "Cihazda bulunamadı",
     "This bridge was provisioned by <user />.": "Bu köprü <user /> tarafından sağlandı.",
     "Render LaTeX maths in messages": "Mesajlarda LaTex maths işleyin",
@@ -1676,8 +1750,10 @@
     "with state key %(stateKey)s": "%(stateKey)s durum anahtarı ile",
     "Verify all users in a room to ensure it's secure.": "Güvenli olduğuna emin olmak için odadaki tüm kullanıcıları onaylayın.",
     "No recent messages by %(user)s found": "%(user)s kullanıcısın hiç yeni ileti yok",
-    "Show %(count)s more|one": "%(count)s adet daha fazla göster",
-    "Show %(count)s more|other": "%(count)s adet daha fazla göster",
+    "Show %(count)s more": {
+        "one": "%(count)s adet daha fazla göster",
+        "other": "%(count)s adet daha fazla göster"
+    },
     "Activity": "Aktivite",
     "Show previews of messages": "Mesajların ön izlemelerini göster",
     "Show rooms with unread messages first": "Önce okunmamış mesajları olan odaları göster",
@@ -1941,10 +2017,14 @@
     "Session details": "Oturum detayları",
     "IP address": "IP adresi",
     "Device": "Cihaz",
-    "Click the button below to confirm signing out these devices.|one": "Bu cihazın oturumunu kapatmak için aşağıdaki butona tıkla.",
-    "Click the button below to confirm signing out these devices.|other": "Bu cihazların oturumunu kapatmak için aşağıdaki butona tıkla.",
-    "Confirm signing out these devices|one": "Bu cihazın oturumunu kapatmayı onayla",
-    "Confirm signing out these devices|other": "Şu cihazlardan oturumu kapatmayı onayla",
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Bu cihazın oturumunu kapatmak için aşağıdaki butona tıkla.",
+        "other": "Bu cihazların oturumunu kapatmak için aşağıdaki butona tıkla."
+    },
+    "Confirm signing out these devices": {
+        "one": "Bu cihazın oturumunu kapatmayı onayla",
+        "other": "Şu cihazlardan oturumu kapatmayı onayla"
+    },
     "Current session": "Şimdiki oturum",
     "Search (must be enabled)": "Arama (etkinleştirilmeli)"
 }
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index a4486837ef..090d99727d 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -35,8 +35,10 @@
     "Always show message timestamps": "Завжди показувати часові позначки повідомлень",
     "Authentication": "Автентифікація",
     "%(items)s and %(lastItem)s": "%(items)s та %(lastItem)s",
-    "and %(count)s others...|one": "і інше...",
-    "and %(count)s others...|other": "та %(count)s інші...",
+    "and %(count)s others...": {
+        "one": "і інше...",
+        "other": "та %(count)s інші..."
+    },
     "A new password must be entered.": "Має бути введений новий пароль.",
     "An error has occurred.": "Сталася помилка.",
     "Anyone": "Кожний",
@@ -309,7 +311,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Файл <b>є надто великим</b> для відвантаження. Допустимий розмір файлів — %(limit)s, але цей файл займає %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Ці файли є <b>надто великими</b> для відвантаження. Допустимий розмір файлів — %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Деякі файли є <b>надто великими</b> для відвантаження. Допустимий розмір файлів — %(limit)s.",
-    "Upload %(count)s other files|other": "Вивантажити %(count)s інших файлів",
+    "Upload %(count)s other files": {
+        "other": "Вивантажити %(count)s інших файлів",
+        "one": "Вивантажити %(count)s інший файл"
+    },
     "Upload Error": "Помилка вивантаження",
     "Upload avatar": "Вивантажити аватар",
     "For security, this session has been signed out. Please sign in again.": "З метою безпеки ваш сеанс було завершено. Увійдіть знову.",
@@ -383,8 +388,10 @@
     "No more results": "Інших результатів нема",
     "Room": "Кімната",
     "Failed to reject invite": "Не вдалось відхилити запрошення",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Ви маєте %(count)s непрочитаних сповіщень у попередній версії цієї кімнати.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "У вас %(count)s непрочитане сповіщення у попередній версії цієї кімнати.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "Ви маєте %(count)s непрочитаних сповіщень у попередній версії цієї кімнати.",
+        "one": "У вас %(count)s непрочитане сповіщення у попередній версії цієї кімнати."
+    },
     "Deactivate user?": "Деактивувати користувача?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Деактивація цього користувача виведе їх з системи й унеможливить вхід у майбутньому. До того ж вони вийдуть з усіх кімнат, у яких перебувають. Ця дія безповоротна. Ви впевнені, що хочете деактивувати цього користувача?",
     "Deactivate user": "Деактивувати користувача",
@@ -425,10 +432,14 @@
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s дозволяє гостям приєднуватися до кімнати.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s забороняє гостям приєднуватися до кімнати.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s змінює гостьовий доступ на \"%(rule)s\"",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати.",
+        "one": "%(senderName)s додає альтернативні адреси %(addresses)s для цієї кімнати."
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати.",
+        "one": "%(senderName)s вилучає альтернативні адреси %(addresses)s для цієї кімнати."
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s змінює альтернативні адреси для цієї кімнати.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s змінює головні та альтернативні адреси для цієї кімнати.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s змінює адреси для цієї кімнати.",
@@ -458,16 +469,20 @@
     "Not Trusted": "Не довірений",
     "Done": "Готово",
     "%(displayName)s is typing …": "%(displayName)s пише…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s та ще %(count)s учасників пишуть…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s та ще один учасник пишуть…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s та ще %(count)s учасників пишуть…",
+        "one": "%(names)s та ще один учасник пишуть…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s та %(lastPerson)s пишуть…",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Попросіть адміністратора %(brand)s перевірити <a>конфігураційний файл</a> на наявність неправильних або повторюваних записів.",
     "Cannot reach identity server": "Не вдається зв'язатися із сервером ідентифікаціїї",
     "No homeserver URL provided": "URL адресу домашнього сервера не вказано",
     "Unexpected error resolving homeserver configuration": "Неочікувана помилка в налаштуваннях домашнього серверу",
     "Unexpected error resolving identity server configuration": "Незрозуміла помилка при розборі параметру сервера ідентифікації",
-    "%(items)s and %(count)s others|other": "%(items)s та ще %(count)s учасників",
-    "%(items)s and %(count)s others|one": "%(items)s і ще хтось",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s та ще %(count)s учасників",
+        "one": "%(items)s і ще хтось"
+    },
     "a few seconds ago": "Декілька секунд тому",
     "about a minute ago": "близько хвилини тому",
     "%(num)s minutes ago": "%(num)s хвилин тому",
@@ -726,10 +741,14 @@
     "Notification options": "Параметри сповіщень",
     "Forget Room": "Забути кімнату",
     "Favourited": "В улюблених",
-    "%(count)s unread messages including mentions.|other": "%(count)s непрочитаних повідомлень включно зі згадками.",
-    "%(count)s unread messages including mentions.|one": "1 непрочитана згадка.",
-    "%(count)s unread messages.|other": "%(count)s непрочитаних повідомлень.",
-    "%(count)s unread messages.|one": "1 непрочитане повідомлення.",
+    "%(count)s unread messages including mentions.": {
+        "other": "%(count)s непрочитаних повідомлень включно зі згадками.",
+        "one": "1 непрочитана згадка."
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s непрочитаних повідомлень.",
+        "one": "1 непрочитане повідомлення."
+    },
     "Unread messages.": "Непрочитані повідомлення.",
     "This room is public": "Ця кімната загальнодоступна",
     "Failed to revoke invite": "Не вдалось відкликати запрошення",
@@ -836,8 +855,10 @@
     "The integration manager is offline or it cannot reach your homeserver.": "Менеджер інтеграцій не під'єднаний або не може зв'язатися з вашим домашнім сервером.",
     "Enable desktop notifications for this session": "Увімкнути стільничні сповіщення для цього сеансу",
     "Profile picture": "Зображення профілю",
-    "Show %(count)s more|other": "Показати ще %(count)s",
-    "Show %(count)s more|one": "Показати ще %(count)s",
+    "Show %(count)s more": {
+        "other": "Показати ще %(count)s",
+        "one": "Показати ще %(count)s"
+    },
     "Failed to connect to integration manager": "Не вдалось з'єднатись з менеджером інтеграцій",
     "Show image": "Показати зображення",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ви ігноруєте цього користувача, тож його повідомлення приховано. <a>Все одно показати.</a>",
@@ -1149,23 +1170,39 @@
     "A microphone and webcam are plugged in and set up correctly": "Мікрофон і вебкамера під'єднані та налаштовані правильно",
     "Call failed because webcam or microphone could not be accessed. Check that:": "Збій виклику, оскільки не вдалося отримати доступ до вебкамери або мікрофона. Перевірте, що:",
     "Unable to access webcam / microphone": "Не вдається отримати доступ до вебкамери / мікрофона",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sприєдналися й вийшли %(count)s разів",
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)sприєдналися й вийшли %(count)s разів",
+        "one": "%(severalUsers)sприєдналися й вийшли"
+    },
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Ви можете вимкнути це, якщо кімната буде використовуватися для співпраці із зовнішніми командами, які мають власний домашній сервер. Це неможливо змінити пізніше.",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sзмінює своє ім'я",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sзмінює своє ім'я %(count)s разів",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sзмінили свої імена",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sзмінили свої імена %(count)s разів",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sвиходить і повертається",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sвиходить і повертається %(count)s разів",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sвиходять і повертаються",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sвиходять і повертаються %(count)s разів",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sприєднується й виходить",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sприєднується й виходить %(count)s разів",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sприєдналися й вийшли",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sприєднується",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sприєднується %(count)s разів",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sприєдналися",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sприєдналися %(count)s разів",
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)sзмінює своє ім'я",
+        "other": "%(oneUser)sзмінює своє ім'я %(count)s разів"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)sзмінили свої імена",
+        "other": "%(severalUsers)sзмінили свої імена %(count)s разів"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)sвиходить і повертається",
+        "other": "%(oneUser)sвиходить і повертається %(count)s разів"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)sвиходять і повертаються",
+        "other": "%(severalUsers)sвиходять і повертаються %(count)s разів"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)sприєднується й виходить",
+        "other": "%(oneUser)sприєднується й виходить %(count)s разів"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)sприєднується",
+        "other": "%(oneUser)sприєднується %(count)s разів"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)sприєдналися",
+        "other": "%(severalUsers)sприєдналися %(count)s разів"
+    },
     "Members only (since they joined)": "Лише учасники (від часу приєднання)",
     "This room is not accessible by remote Matrix servers": "Ця кімната недоступна для віддалених серверів Matrix",
     "Manually verify all remote sessions": "Звірити всі сеанси власноруч",
@@ -1282,10 +1319,14 @@
     "Edited at %(date)s": "Змінено %(date)s",
     "%(senderName)s changed their profile picture": "%(senderName)s змінює зображення профілю",
     "Phone Number": "Телефонний номер",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sвиходить",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sвийшли %(count)s разів",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sвийшли",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sвийшли %(count)s разів",
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)sвиходить",
+        "other": "%(oneUser)sвийшли %(count)s разів"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)sвийшли",
+        "other": "%(severalUsers)sвийшли %(count)s разів"
+    },
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "Language Dropdown": "Спадне меню мов",
     "Information": "Відомості",
@@ -1317,14 +1358,22 @@
     "Banned by %(displayName)s": "Блокує %(displayName)s",
     "Ban users": "Блокування користувачів",
     "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s блокує вас у %(roomName)s",
-    "were banned %(count)s times|other": "заблоковані %(count)s разів",
-    "were banned %(count)s times|one": "заблоковані",
-    "was banned %(count)s times|other": "заблоковано %(count)s разів",
-    "was banned %(count)s times|one": "заблоковано",
-    "were unbanned %(count)s times|other": "розблоковані %(count)s разів",
-    "were unbanned %(count)s times|one": "розблоковані",
-    "was unbanned %(count)s times|other": "розблоковано %(count)s разів",
-    "was unbanned %(count)s times|one": "розблоковано",
+    "were banned %(count)s times": {
+        "other": "заблоковані %(count)s разів",
+        "one": "заблоковані"
+    },
+    "was banned %(count)s times": {
+        "other": "заблоковано %(count)s разів",
+        "one": "заблоковано"
+    },
+    "were unbanned %(count)s times": {
+        "other": "розблоковані %(count)s разів",
+        "one": "розблоковані"
+    },
+    "was unbanned %(count)s times": {
+        "other": "розблоковано %(count)s разів",
+        "one": "розблоковано"
+    },
     "This is the beginning of your direct message history with <displayName/>.": "Це початок історії вашого особистого спілкування з <displayName/>.",
     "Publish this room to the public in %(domain)s's room directory?": "Опублікувати цю кімнату для всіх у каталозі кімнат %(domain)s?",
     "Recently Direct Messaged": "Недавно надіслані особисті повідомлення",
@@ -1332,10 +1381,14 @@
     "Room version:": "Версія кімнати:",
     "Change topic": "Змінити тему",
     "Change the topic of this room": "Змінювати тему цієї кімнати",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sзмінює серверні права доступу",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sзмінює серверні права доступу %(count)s разів",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sзмінює серверні права доступу",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sзмінює серверні права доступу %(count)s разів",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)sзмінює серверні права доступу",
+        "other": "%(oneUser)sзмінює серверні права доступу %(count)s разів"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)sзмінює серверні права доступу",
+        "other": "%(severalUsers)sзмінює серверні права доступу %(count)s разів"
+    },
     "Change server ACLs": "Змінити серверні права доступу",
     "Change permissions": "Змінити дозволи",
     "Change room name": "Змінити назву кімнати",
@@ -1539,8 +1592,10 @@
     "Want to add a new room instead?": "Хочете додати нову кімнату натомість?",
     "Add existing rooms": "Додати наявні кімнати",
     "Space selection": "Вибір простору",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Додавання кімнат...",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Додавання кімнат... (%(progress)s з %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Додавання кімнат...",
+        "other": "Додавання кімнат... (%(progress)s з %(count)s)"
+    },
     "Not all selected were added": "Не всі вибрані додано",
     "Search for spaces": "Пошук просторів",
     "Create a new space": "Створити новий простір",
@@ -1556,7 +1611,9 @@
     "You are not allowed to view this server's rooms list": "Вам не дозволено переглядати список кімнат цього сервера",
     "Looks good": "Все добре",
     "Enter a server name": "Введіть назву сервера",
-    "And %(count)s more...|other": "І ще %(count)s...",
+    "And %(count)s more...": {
+        "other": "І ще %(count)s..."
+    },
     "Sign in with single sign-on": "Увійти за допомогою єдиного входу",
     "Continue with %(provider)s": "Продовжити з %(provider)s",
     "Join millions for free on the largest public server": "Приєднуйтесь безплатно до мільйонів інших на найбільшому загальнодоступному сервері",
@@ -1660,7 +1717,10 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Будь-хто у <spaceName/> може знайти та приєднатися. Ви можете вибрати інші простори.",
     "Spaces with access": "Простори з доступом",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Будь-хто у просторі може знайти та приєднатися. <a>Укажіть, які простори можуть отримати доступ сюди.</a>",
-    "Currently, %(count)s spaces have access|one": "На разі простір має доступ",
+    "Currently, %(count)s spaces have access": {
+        "one": "На разі простір має доступ",
+        "other": "На разі доступ мають %(count)s просторів"
+    },
     "contact the administrators of identity server <idserver />": "зв'язатися з адміністратором сервера ідентифікації <idserver />",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "перевірити плагіни браузера на наявність будь-чого, що може заблокувати сервер ідентифікації (наприклад, Privacy Badger)",
     "Disconnect from the identity server <idserver />?": "Від'єднатися від сервера ідентифікації <idserver />?",
@@ -1674,16 +1734,19 @@
     "Secret storage:": "Таємне сховище:",
     "Algorithm:": "Алгоритм:",
     "Backup version:": "Версія резервної копії:",
-    "Currently, %(count)s spaces have access|other": "На разі доступ мають %(count)s просторів",
-    "& %(count)s more|one": "і ще %(count)s",
-    "& %(count)s more|other": "і ще %(count)s",
+    "& %(count)s more": {
+        "one": "і ще %(count)s",
+        "other": "і ще %(count)s"
+    },
     "Upgrade required": "Потрібне поліпшення",
     "Anyone can find and join.": "Будь-хто може знайти та приєднатися.",
     "Only invited people can join.": "Приєднатися можуть лише запрошені люди.",
     "Private (invite only)": "Приватно (лише за запрошенням)",
     "Message search initialisation failed": "Не вдалося ініціалізувати пошук повідомлень",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Безпечно кешуйте зашифровані повідомлення локально, щоб вони з'являлися в результатах пошуку, використовуючи %(size)s для зберігання повідомлень з %(rooms)s кімнат.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Безпечно кешуйте зашифровані повідомлення локально, щоб вони з'являлися в результатах пошуку, використовуючи %(size)s для зберігання повідомлень з %(rooms)s кімнат.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "other": "Безпечно кешуйте зашифровані повідомлення локально, щоб вони з'являлися в результатах пошуку, використовуючи %(size)s для зберігання повідомлень з %(rooms)s кімнат.",
+        "one": "Безпечно кешуйте зашифровані повідомлення локально, щоб вони з'являлися в результатах пошуку, використовуючи %(size)s для зберігання повідомлень з %(rooms)s кімнат."
+    },
     "Homeserver feature support:": "Підтримка функції домашнім сервером:",
     "User signing private key:": "Приватний ключ підпису користувача:",
     "Self signing private key:": "Самопідписаний приватний ключ:",
@@ -1746,7 +1809,6 @@
     "Collapse room list section": "Згорнути розділ з переліком кімнат",
     "Go to Home View": "Перейти до домівки",
     "Cancel All": "Скасувати все",
-    "Upload %(count)s other files|one": "Вивантажити %(count)s інший файл",
     "Settings - %(spaceName)s": "Налаштування — %(spaceName)s",
     "Refresh": "Оновити",
     "Send Logs": "Надіслати журнали",
@@ -1756,10 +1818,14 @@
     "Email (optional)": "Е-пошта (необов'язково)",
     "Search spaces": "Пошук просторів",
     "Select spaces": "Вибрати простори",
-    "%(count)s rooms|one": "%(count)s кімната",
-    "%(count)s rooms|other": "%(count)s кімнат",
-    "%(count)s members|one": "%(count)s учасник",
-    "%(count)s members|other": "%(count)s учасників",
+    "%(count)s rooms": {
+        "one": "%(count)s кімната",
+        "other": "%(count)s кімнат"
+    },
+    "%(count)s members": {
+        "one": "%(count)s учасник",
+        "other": "%(count)s учасників"
+    },
     "Value in this room:": "Значення у цій кімнаті:",
     "Value:": "Значення:",
     "Level": "Рівень",
@@ -1818,9 +1884,14 @@
     "MB": "МБ",
     "Number of messages": "Кількість повідомлень",
     "In reply to <a>this message</a>": "У відповідь на <a>це повідомлення</a>",
-    "was invited %(count)s times|one": "запрошено",
-    "was invited %(count)s times|other": "запрошено %(count)s разів",
-    "were invited %(count)s times|one": "запрошені",
+    "was invited %(count)s times": {
+        "one": "запрошено",
+        "other": "запрошено %(count)s разів"
+    },
+    "were invited %(count)s times": {
+        "one": "запрошені",
+        "other": "були запрошені %(count)s разів"
+    },
     "Join": "Приєднатися",
     "Widget added by": "Вджет додано",
     "Image": "Зображення",
@@ -1832,10 +1903,14 @@
     "Retry": "Повторити спробу",
     "Got it": "Зрозуміло",
     "Message": "Повідомлення",
-    "%(count)s sessions|one": "%(count)s сеанс",
-    "%(count)s sessions|other": "Сеансів: %(count)s",
-    "%(count)s verified sessions|one": "1 звірений сеанс",
-    "%(count)s verified sessions|other": "Довірених сеансів: %(count)s",
+    "%(count)s sessions": {
+        "one": "%(count)s сеанс",
+        "other": "Сеансів: %(count)s"
+    },
+    "%(count)s verified sessions": {
+        "one": "1 звірений сеанс",
+        "other": "Довірених сеансів: %(count)s"
+    },
     "Not encrypted": "Не зашифровано",
     "Add widgets, bridges & bots": "Додати віджети, мости та ботів",
     "Edit widgets, bridges & bots": "Редагувати віджети, мости та ботів",
@@ -1866,8 +1941,10 @@
     "Hide Widgets": "Сховати віджети",
     "Forget room": "Забути кімнату",
     "Join Room": "Приєднатися до кімнати",
-    "(~%(count)s results)|one": "(~%(count)s результат)",
-    "(~%(count)s results)|other": "(~%(count)s результатів)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s результат)",
+        "other": "(~%(count)s результатів)"
+    },
     "Recently visited rooms": "Недавно відвідані кімнати",
     "Room %(name)s": "Кімната %(name)s",
     "Unknown": "Невідомо",
@@ -1900,8 +1977,10 @@
     "Invite to this space": "Запросити до цього простору",
     "Failed to send": "Не вдалося надіслати",
     "Your message was sent": "Ваше повідомлення було надіслано",
-    "%(count)s reply|one": "%(count)s відповідь",
-    "%(count)s reply|other": "%(count)s відповідей",
+    "%(count)s reply": {
+        "one": "%(count)s відповідь",
+        "other": "%(count)s відповідей"
+    },
     "Mod": "Модератор",
     "Edit message": "Редагувати повідомлення",
     "Unrecognised command: %(commandText)s": "Нерозпізнана команда: %(commandText)s",
@@ -1946,20 +2025,31 @@
     "Light high contrast": "Контрастна світла",
     "%(senderDisplayName)s changed who can join this room.": "%(senderDisplayName)s змінює, хто може приєднатися до цієї кімнати.",
     "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)s змінює, хто може приєднатися до цієї кімнати. <a>Переглянути налаштування</a>.",
-    "were invited %(count)s times|other": "були запрошені %(count)s разів",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s відкликали запрошення",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s відкликали запрошення %(count)s разів",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s відкликали запрошення",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s відкликали запрошення %(count)s разів",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s відхилили запрошення",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s відхилили запрошення %(count)s разів",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s відхилили запрошення",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s відхилили запрошення %(count)s разів",
-    "%(count)s people you know have already joined|one": "%(count)s осіб, яких ви знаєте, уже приєдналися",
-    "%(count)s people you know have already joined|other": "%(count)s людей, яких ви знаєте, уже приєдналися",
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "%(oneUser)s відкликали запрошення",
+        "other": "%(oneUser)s відкликали запрошення %(count)s разів"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)s відкликали запрошення",
+        "other": "%(severalUsers)s відкликали запрошення %(count)s разів"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)s відхилили запрошення",
+        "other": "%(oneUser)s відхилили запрошення %(count)s разів"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)s відхилили запрошення",
+        "other": "%(severalUsers)s відхилили запрошення %(count)s разів"
+    },
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s осіб, яких ви знаєте, уже приєдналися",
+        "other": "%(count)s людей, яких ви знаєте, уже приєдналися"
+    },
     "Including %(commaSeparatedMembers)s": "Включно з %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Переглянути 1 учасника",
-    "View all %(count)s members|other": "Переглянути усіх %(count)s учасників",
+    "View all %(count)s members": {
+        "one": "Переглянути 1 учасника",
+        "other": "Переглянути усіх %(count)s учасників"
+    },
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Створіть нове обговорення</newIssueLink> на GitHub, щоб ми могли розібратися з цією вадою.",
     "Popout widget": "Спливний віджет",
     "This widget may use cookies.": "Цей віджет може використовувати куки.",
@@ -1981,13 +2071,19 @@
     "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Ви раніше використовували новішу версію %(brand)s для цього сеансу. Щоб знову використовувати цю версію із наскрізним шифруванням, вам потрібно буде вийти та знову ввійти.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Налаштуйте цьому сеансу резервне копіювання, інакше при виході втратите ключі, доступні лише в цьому сеансі.",
     "Signed Out": "Виконано вихід",
-    "Sign out devices|one": "Вийти з пристрою",
-    "Sign out devices|other": "Вийти з пристроїв",
-    "Click the button below to confirm signing out these devices.|other": "Клацніть кнопку внизу, щоб підтвердити вихід із цих пристроїв.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Підтвердьте вихід із цих пристроїв за допомогою єдиного входу, щоб довести вашу справжність.",
+    "Sign out devices": {
+        "one": "Вийти з пристрою",
+        "other": "Вийти з пристроїв"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "other": "Клацніть кнопку внизу, щоб підтвердити вихід із цих пристроїв.",
+        "one": "Натисніть кнопку внизу, щоб підтвердити вихід із цього пристрою."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "other": "Підтвердьте вихід із цих пристроїв за допомогою єдиного входу, щоб довести вашу справжність.",
+        "one": "Підтвердьте вихід із цього пристрою за допомогою єдиного входу, щоб підтвердити вашу особу."
+    },
     "To continue, use Single Sign On to prove your identity.": "Щоб продовжити, скористайтеся єдиним входом для підтвердження особи.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Підтвердьте вихід із цього пристрою за допомогою єдиного входу, щоб підтвердити вашу особу.",
-    "Click the button below to confirm signing out these devices.|one": "Натисніть кнопку внизу, щоб підтвердити вихід із цього пристрою.",
     "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Ваші приватні повідомлення, зазвичай, зашифровані, але ця кімната — ні. Зазвичай це пов'язано з непідтримуваним пристроєм або використаним методом, наприклад, запрошення електронною поштою.",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Для додаткової безпеки перевірте цього користувача, звіривши одноразовий код на обох своїх пристроях.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Якщо звірити цей пристрій, його буде позначено надійним, а користувачі, які перевірили у вас, будуть довіряти цьому пристрою.",
@@ -1999,8 +2095,10 @@
     "You have no ignored users.": "Ви не маєте нехтуваних користувачів.",
     "Rename": "Перейменувати",
     "The server is offline.": "Сервер вимкнено.",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s і %(count)s інших",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s і %(count)s інших",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s і %(count)s інших",
+        "other": "%(spaceName)s і %(count)s інших"
+    },
     "Connectivity to the server has been lost": "Втрачено зʼєднання з сервером",
     "Calls are unsupported": "Виклики не підтримуються",
     "To view all keyboard shortcuts, <a>click here</a>.": "Щоб переглянути всі комбінації клавіш, <a>натисніть сюди</a>.",
@@ -2170,10 +2268,14 @@
     "Select from the options below to export chats from your timeline": "Налаштуйте параметри внизу, щоб експортувати бесіди вашої стрічки",
     "Export Chat": "Експортувати бесіду",
     "Exporting your data": "Експортування ваших даних",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Оновлення простору...",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Оновлення просторів... (%(progress)s із %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Надсилання запрошення...",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Надсилання запрошень... (%(progress)s із %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Оновлення простору...",
+        "other": "Оновлення просторів... (%(progress)s із %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Надсилання запрошення...",
+        "other": "Надсилання запрошень... (%(progress)s із %(count)s)"
+    },
     "Loading new room": "Звантаження нової кімнати",
     "Upgrading room": "Поліпшення кімнати",
     "Stop": "Припинити",
@@ -2201,7 +2303,9 @@
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "У цій розмові вас лише двоє, поки хтось із вас не запросить іще когось приєднатися.",
     "Set my room layout for everyone": "Встановити мій вигляд кімнати всім",
     "Close this widget to view it in this panel": "Закрийте віджет, щоб він зʼявився на цій панелі",
-    "You can only pin up to %(count)s widgets|other": "Закріпити можна до %(count)s віджетів",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Закріпити можна до %(count)s віджетів"
+    },
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Ваші повідомлення захищені. Лише ви з отримувачем маєте унікальні ключі їхнього розшифрування.",
     "Pinned messages": "Закріплені повідомлення",
     "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Якщо маєте дозвіл, відкрийте меню будь-якого повідомлення й натисніть <b>Закріпити</b>, щоб додати його сюди.",
@@ -2380,14 +2484,22 @@
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Ви будете спрямовані до стороннього сайту, щоб автентифікувати використання облікового запису в %(integrationsUrl)s. Продовжити?",
     "Error processing voice message": "Помилка обробки голосового повідомлення",
     "Error decrypting video": "Помилка розшифрування відео",
-    "%(count)s votes|one": "%(count)s голос",
-    "%(count)s votes|other": "%(count)s голосів",
-    "Based on %(count)s votes|one": "На підставі %(count)s голосу",
-    "Based on %(count)s votes|other": "На підставі %(count)s голосів",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s голос надісланий. Проголосуйте, щоб побачити результати",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s голосів надіслано. Проголосуйте, щоб побачити результати",
-    "Final result based on %(count)s votes|one": "Остаточний результат на підставі %(count)s голосу",
-    "Final result based on %(count)s votes|other": "Остаточний результат на підставі %(count)s голосів",
+    "%(count)s votes": {
+        "one": "%(count)s голос",
+        "other": "%(count)s голосів"
+    },
+    "Based on %(count)s votes": {
+        "one": "На підставі %(count)s голосу",
+        "other": "На підставі %(count)s голосів"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s голос надісланий. Проголосуйте, щоб побачити результати",
+        "other": "%(count)s голосів надіслано. Проголосуйте, щоб побачити результати"
+    },
+    "Final result based on %(count)s votes": {
+        "one": "Остаточний результат на підставі %(count)s голосу",
+        "other": "Остаточний результат на підставі %(count)s голосів"
+    },
     "%(name)s wants to verify": "%(name)s бажає звірити",
     "%(name)s cancelled": "%(name)s скасовує",
     "%(name)s declined": "%(name)s відхиляє",
@@ -2427,8 +2539,10 @@
     "Unban them from everything I'm able to": "Розблокувати скрізь, де маю доступ",
     "Ban from %(roomName)s": "Заблокувати в %(roomName)s",
     "Unban from %(roomName)s": "Розблокувати в %(roomName)s",
-    "Remove %(count)s messages|one": "Видалити 1 повідомлення",
-    "Remove %(count)s messages|other": "Видалити %(count)s повідомлень",
+    "Remove %(count)s messages": {
+        "one": "Видалити 1 повідомлення",
+        "other": "Видалити %(count)s повідомлень"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Залежно від кількості повідомлень, це може тривати довго. Не перезавантажуйте клієнт, поки це триває.",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Гортайте стрічку вище, щоб побачити, чи були такі раніше.",
     "No recent messages by %(user)s found": "Не знайдено недавніх повідомлень %(user)s",
@@ -2456,8 +2570,10 @@
     "<userName/> wants to chat": "<userName/> бажає поговорити",
     "Do you want to chat with %(user)s?": "Бажаєте поговорити з %(user)s?",
     "You can only join it with a working invite.": "Приєднатися можна лише за дійсним запрошенням.",
-    "Currently joining %(count)s rooms|one": "Приєднання до %(count)s кімнати",
-    "Currently joining %(count)s rooms|other": "Приєднання до %(count)s кімнат",
+    "Currently joining %(count)s rooms": {
+        "one": "Приєднання до %(count)s кімнати",
+        "other": "Приєднання до %(count)s кімнат"
+    },
     "Suggested Rooms": "Пропоновані кімнати",
     "Historical": "Історичні",
     "System Alerts": "Системні попередження",
@@ -2467,8 +2583,10 @@
     "No recently visited rooms": "Немає недавно відвіданих кімнат",
     "Recently viewed": "Недавно переглянуті",
     "Close preview": "Закрити попередній перегляд",
-    "Show %(count)s other previews|one": "Показати %(count)s інший попередній перегляд",
-    "Show %(count)s other previews|other": "Показати %(count)s інших попередніх переглядів",
+    "Show %(count)s other previews": {
+        "one": "Показати %(count)s інший попередній перегляд",
+        "other": "Показати %(count)s інших попередніх переглядів"
+    },
     "Scroll to most recent messages": "Перейти до найновіших повідомлень",
     "Unencrypted": "Не зашифроване",
     "Message Actions": "Дії з повідомленням",
@@ -2550,10 +2668,14 @@
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Нагадуємо, що ваш браузер не підтримується, тож деякі функції можуть не працювати.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Будь ласка, повідомте нам, що пішло не так; а ще краще створіть обговорення на GitHub із описом проблеми.",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Використовуйте сервер ідентифікації, щоб запрошувати через е-пошту. <default>Наприклад, типовий %(defaultIdentityServerName)s,</default> або інший у <settings>налаштуваннях</settings>.",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sнічого не змінює",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sнічого не змінює %(count)s разів",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sнічого не змінюють",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sнічого не змінюють %(count)s разів",
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)sнічого не змінює",
+        "other": "%(oneUser)sнічого не змінює %(count)s разів"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)sнічого не змінюють",
+        "other": "%(severalUsers)sнічого не змінюють %(count)s разів"
+    },
     "Unable to load commit detail: %(msg)s": "Не вдалося звантажити дані про коміт: %(msg)s",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Наведіть додатковий контекст, який може допомогти нам аналізувати проблему, наприклад що ви намагалися зробити, ID кімнат і користувачів тощо.",
     "Clear": "Очистити",
@@ -2580,9 +2702,11 @@
     "New passwords must match each other.": "Нові паролі мають збігатися.",
     "The email address linked to your account must be entered.": "Введіть е-пошту, прив'язану до вашого облікового запису.",
     "Really reset verification keys?": "Точно скинути ключі звірки?",
-    "Uploading %(filename)s and %(count)s others|one": "Вивантаження %(filename)s і ще %(count)s",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Вивантаження %(filename)s і ще %(count)s",
+        "other": "Вивантаження %(filename)s і ще %(count)s"
+    },
     "Uploading %(filename)s": "Вивантаження %(filename)s",
-    "Uploading %(filename)s and %(count)s others|other": "Вивантаження %(filename)s і ще %(count)s",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Зауважте, ви входите на сервер %(hs)s, не на matrix.org.",
     "Enter your Security Phrase a second time to confirm it.": "Введіть свою фразу безпеки ще раз для підтвердження.",
     "Go back to set it again.": "Поверніться, щоб налаштувати заново.",
@@ -2752,16 +2876,24 @@
     "Recent Conversations": "Недавні бесіди",
     "A call can only be transferred to a single user.": "Виклик можна переадресувати лише на одного користувача.",
     "Search for rooms or people": "Пошук кімнат або людей",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Експортовано %(count)s подій за %(seconds)s секунд",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Експортовано %(count)s подій за %(seconds)s секунд",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Експортовано %(count)s подій за %(seconds)s секунд",
+        "other": "Експортовано %(count)s подій за %(seconds)s секунд"
+    },
     "Export successful!": "Успішно експортовано!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Знайдено %(count)s подій за %(seconds)sс",
-    "Fetched %(count)s events in %(seconds)ss|other": "Знайдено %(count)s подій за %(seconds)sс",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Знайдено %(count)s подій за %(seconds)sс",
+        "other": "Знайдено %(count)s подій за %(seconds)sс"
+    },
     "Processing event %(number)s out of %(total)s": "Оброблено %(number)s з %(total)s подій",
-    "Fetched %(count)s events so far|one": "Знайдено %(count)s подій",
-    "Fetched %(count)s events so far|other": "Знайдено %(count)s подій",
-    "Fetched %(count)s events out of %(total)s|one": "Знайдено %(count)s з %(total)s подій",
-    "Fetched %(count)s events out of %(total)s|other": "Знайдено %(count)s з %(total)s подій",
+    "Fetched %(count)s events so far": {
+        "one": "Знайдено %(count)s подій",
+        "other": "Знайдено %(count)s подій"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Знайдено %(count)s з %(total)s подій",
+        "other": "Знайдено %(count)s з %(total)s подій"
+    },
     "Generating a ZIP": "Генерування ZIP-файлу",
     "Failed to load list of rooms.": "Не вдалося отримати список кімнат.",
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Це групує ваші бесіди з учасниками цього простору. Вимкніть, щоб сховати ці бесіди з вашого огляду %(spaceName)s.",
@@ -2817,10 +2949,14 @@
     "Failed to fetch your location. Please try again later.": "Не вдалося отримати ваше місцеперебування. Повторіть спробу пізніше.",
     "Could not fetch location": "Не вдалося отримати місцеперебування",
     "Automatically send debug logs on decryption errors": "Автоматично надсилати журнали зневадження при збоях розшифрування",
-    "was removed %(count)s times|one": "було вилучено",
-    "was removed %(count)s times|other": "було вилучено %(count)s разів",
-    "were removed %(count)s times|one": "було вилучено",
-    "were removed %(count)s times|other": "було вилучено %(count)s разів",
+    "was removed %(count)s times": {
+        "one": "було вилучено",
+        "other": "було вилучено %(count)s разів"
+    },
+    "were removed %(count)s times": {
+        "one": "було вилучено",
+        "other": "було вилучено %(count)s разів"
+    },
     "Remove from room": "Вилучити з кімнати",
     "Failed to remove user": "Не вдалося вилучити користувача",
     "Remove them from specific things I'm able to": "Вилучити їх з деяких місць, де мене на це уповноважено",
@@ -2900,18 +3036,28 @@
     "Feedback sent! Thanks, we appreciate it!": "Відгук надісланий! Дякуємо, візьмемо до уваги!",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s і %(space2Name)s",
     "Maximise": "Розгорнути",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sнадсилає приховане повідомлення",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sнадсилає %(count)s прихованих повідомлень",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sнадсилають приховане повідомлення",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sнадсилають %(count)s прихованих повідомлень",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sвидаляє повідомлення",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sвидаляє %(count)s повідомлень",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sвидаляють повідомлення",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sвидаляють %(count)s повідомлень",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)sнадсилає приховане повідомлення",
+        "other": "%(oneUser)sнадсилає %(count)s прихованих повідомлень"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sнадсилають приховане повідомлення",
+        "other": "%(severalUsers)sнадсилають %(count)s прихованих повідомлень"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)sвидаляє повідомлення",
+        "other": "%(oneUser)sвидаляє %(count)s повідомлень"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sвидаляють повідомлення",
+        "other": "%(severalUsers)sвидаляють %(count)s повідомлень"
+    },
     "Automatically send debug logs when key backup is not functioning": "Автоматично надсилати журнали зневадження при збоях резервного копіювання ключів",
     "<empty string>": "<порожній рядок>",
-    "<%(count)s spaces>|one": "<простір>",
-    "<%(count)s spaces>|other": "<%(count)s просторів>",
+    "<%(count)s spaces>": {
+        "one": "<простір>",
+        "other": "<%(count)s просторів>"
+    },
     "Edit poll": "Редагувати опитування",
     "Sorry, you can't edit a poll after votes have been cast.": "Ви не можете редагувати опитування після завершення голосування.",
     "Can't edit poll": "Неможливо редагувати опитування",
@@ -2942,10 +3088,14 @@
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Дайте відповідь у наявну гілку, або створіть нову, навівши курсор на повідомлення й натиснувши «%(replyInThread)s».",
     "Insert a trailing colon after user mentions at the start of a message": "Додавати двокрапку після згадки користувача на початку повідомлення",
     "Show polls button": "Показувати кнопку опитування",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sзмінює <a>закріплені повідомлення</a> кімнати",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sзмінює <a>закріплені повідомлення</a> кімнати %(count)s разів",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sзмінюють <a>закріплені повідомлення</a> кімнати",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sзмінюють <a>закріплені повідомлення</a> кімнати %(count)s разів",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)sзмінює <a>закріплені повідомлення</a> кімнати",
+        "other": "%(oneUser)sзмінює <a>закріплені повідомлення</a> кімнати %(count)s разів"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)sзмінюють <a>закріплені повідомлення</a> кімнати",
+        "other": "%(severalUsers)sзмінюють <a>закріплені повідомлення</a> кімнати %(count)s разів"
+    },
     "We'll create rooms for each of them.": "Ми створимо кімнати для кожного з них.",
     "Click": "Клацнути",
     "Expand quotes": "Розгорнути цитати",
@@ -2967,10 +3117,14 @@
     "%(displayName)s's live location": "Місцеперебування %(displayName)s наживо",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Вимкніть, щоб також видалити системні повідомлення про користувача (зміни членства, редагування профілю…)",
     "Preserve system messages": "Залишити системні повідомлення",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Ви збираєтеся видалити %(count)s повідомлення від %(user)s. Це видалить його назавжди для всіх у розмові. Точно продовжити?",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Ви збираєтеся видалити %(count)s повідомлень від %(user)s. Це видалить їх назавжди для всіх у розмові. Точно продовжити?",
-    "Currently removing messages in %(count)s rooms|one": "Триває видалення повідомлень в %(count)s кімнаті",
-    "Currently removing messages in %(count)s rooms|other": "Триває видалення повідомлень у %(count)s кімнатах",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "Ви збираєтеся видалити %(count)s повідомлення від %(user)s. Це видалить його назавжди для всіх у розмові. Точно продовжити?",
+        "other": "Ви збираєтеся видалити %(count)s повідомлень від %(user)s. Це видалить їх назавжди для всіх у розмові. Точно продовжити?"
+    },
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Триває видалення повідомлень в %(count)s кімнаті",
+        "other": "Триває видалення повідомлень у %(count)s кімнатах"
+    },
     "%(value)ss": "%(value)sс",
     "%(value)sm": "%(value)sхв",
     "%(value)sh": "%(value)sгод",
@@ -3056,16 +3210,20 @@
     "Create room": "Створити кімнату",
     "Create video room": "Створити відеокімнату",
     "Create a video room": "Створити відеокімнату",
-    "%(count)s participants|one": "1 учасник",
-    "%(count)s participants|other": "%(count)s учасників",
+    "%(count)s participants": {
+        "one": "1 учасник",
+        "other": "%(count)s учасників"
+    },
     "New video room": "Нова відеокімната",
     "New room": "Нова кімната",
     "Threads help keep your conversations on-topic and easy to track.": "Гілки допомагають підтримувати розмови за темою та за ними легко стежити.",
     "%(featureName)s Beta feedback": "%(featureName)s — відгук про бетаверсію",
     "sends hearts": "надсилає сердечка",
     "Sends the given message with hearts": "Надсилає це повідомлення з сердечками",
-    "Confirm signing out these devices|one": "Підтвердьте вихід із цього пристрою",
-    "Confirm signing out these devices|other": "Підтвердьте вихід із цих пристроїв",
+    "Confirm signing out these devices": {
+        "one": "Підтвердьте вихід із цього пристрою",
+        "other": "Підтвердьте вихід із цих пристроїв"
+    },
     "Live location ended": "Показ місцеперебування наживо завершено",
     "View live location": "Показувати місцеперебування наживо",
     "Jump to the given date in the timeline": "Перейти до вказаної дати в стрічці",
@@ -3101,8 +3259,10 @@
     "You will not be able to reactivate your account": "Відновити обліковий запис буде неможливо",
     "Confirm that you would like to deactivate your account. If you proceed:": "Підтвердьте, що справді бажаєте знищити обліковий запис. Якщо продовжите:",
     "To continue, please enter your account password:": "Для продовження введіть пароль облікового запису:",
-    "Seen by %(count)s people|one": "Переглянули %(count)s осіб",
-    "Seen by %(count)s people|other": "Переглянули %(count)s людей",
+    "Seen by %(count)s people": {
+        "one": "Переглянули %(count)s осіб",
+        "other": "Переглянули %(count)s людей"
+    },
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Ви виходите з усіх пристроїв, і більше не отримуватимете сповіщень. Щоб повторно ввімкнути сповіщення, увійдіть знову на кожному пристрої.",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "Якщо ви хочете зберегти доступ до історії бесіди у кімнатах з шифруванням, налаштуйте резервну копію ключа або експортуйте ключі з одного з інших пристроїв, перш ніж продовжувати.",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Вихід з ваших пристроїв, видалить ключі шифрування повідомлень, що зберігаються на них і зробить зашифровану історію бесіди нечитабельною.",
@@ -3134,8 +3294,10 @@
     "Unread email icon": "Піктограма непрочитаного електронного листа",
     "Check your email to continue": "Перегляньте свою електронну пошту, щоб продовжити",
     "Joining…": "Приєднання…",
-    "%(count)s people joined|one": "%(count)s осіб приєдналися",
-    "%(count)s people joined|other": "%(count)s людей приєдналися",
+    "%(count)s people joined": {
+        "one": "%(count)s осіб приєдналися",
+        "other": "%(count)s людей приєдналися"
+    },
     "Check if you want to hide all current and future messages from this user.": "Виберіть, чи хочете ви сховати всі поточні та майбутні повідомлення від цього користувача.",
     "Ignore user": "Нехтувати користувача",
     "View related event": "Переглянути пов'язані події",
@@ -3169,8 +3331,10 @@
     "If you can't see who you're looking for, send them your invite link.": "Якщо ви не знаходите тих, кого шукаєте, надішліть їм своє запрошення.",
     "Some results may be hidden for privacy": "Деякі результати можуть бути приховані через приватність",
     "Search for": "Пошук",
-    "%(count)s Members|one": "%(count)s учасник",
-    "%(count)s Members|other": "%(count)s учасників",
+    "%(count)s Members": {
+        "one": "%(count)s учасник",
+        "other": "%(count)s учасників"
+    },
     "Show: Matrix rooms": "Показати: кімнати Matrix",
     "Show: %(instance)s rooms (%(server)s)": "Показати: кімнати %(instance)s (%(server)s)",
     "Add new server…": "Додати новий сервер…",
@@ -3189,9 +3353,11 @@
     "Enter fullscreen": "Перейти у повноекранний режим",
     "Map feedback": "Карта відгуку",
     "Toggle attribution": "Перемкнути атрибуцію",
-    "In %(spaceName)s and %(count)s other spaces.|one": "У %(spaceName)s та %(count)s іншому просторі.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "У %(spaceName)s та %(count)s іншому просторі.",
+        "other": "У %(spaceName)s та %(count)s інших пристроях."
+    },
     "In %(spaceName)s.": "У просторі %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "У %(spaceName)s та %(count)s інших пристроях.",
     "In spaces %(space1Name)s and %(space2Name)s.": "У просторах %(space1Name)s і %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Команда розробника: відкликає поточний сеанс вихідної групи та встановлює нові сеанси Olm",
     "You don't have permission to share locations": "Ви не маєте дозволу ділитися місцем перебування",
@@ -3210,8 +3376,10 @@
     "Spell check": "Перевірка правопису",
     "Complete these to get the most out of %(brand)s": "Виконайте їх, щоб отримати максимальну віддачу від %(brand)s",
     "You did it!": "Ви це зробили!",
-    "Only %(count)s steps to go|one": "Лише %(count)s крок для налаштування",
-    "Only %(count)s steps to go|other": "Лише %(count)s кроків для налаштування",
+    "Only %(count)s steps to go": {
+        "one": "Лише %(count)s крок для налаштування",
+        "other": "Лише %(count)s кроків для налаштування"
+    },
     "Welcome to %(brand)s": "Вітаємо в %(brand)s",
     "Find your people": "Знайдіть своїх людей",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "Зберігайте право власності та контроль над обговоренням спільноти.\nМасштабуйте для підтримки мільйонів завдяки потужній модерації та сумісності.",
@@ -3290,11 +3458,15 @@
     "Don’t miss a thing by taking %(brand)s with you": "Не пропускайте нічого, взявши з собою %(brand)s",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Не варто додавати шифрування загальнодоступним кімнатам.</b> Будь-хто може знаходити загальнодоступні кімнати, приєднатись і читати повідомлення в них. Ви не отримаєте переваг від шифрування й не зможете вимкнути його пізніше. Зашифровані повідомлення в загальнодоступній кімнаті отримуватимуться й надсилатимуться повільніше.",
     "Empty room (was %(oldName)s)": "Порожня кімната (були %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Запрошення %(user)s і ще 1",
-    "Inviting %(user)s and %(count)s others|other": "Запрошення %(user)s і ще %(count)s",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Запрошення %(user)s і ще 1",
+        "other": "Запрошення %(user)s і ще %(count)s"
+    },
     "Inviting %(user1)s and %(user2)s": "Запрошення %(user1)s і %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s і ще 1",
-    "%(user)s and %(count)s others|other": "%(user)s і ще %(count)s",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s і ще 1",
+        "other": "%(user)s і ще %(count)s"
+    },
     "%(user1)s and %(user2)s": "%(user1)s і %(user2)s",
     "Show": "Показати",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s або %(copyButton)s",
@@ -3392,8 +3564,10 @@
     "Show QR code": "Показати QR-код",
     "You can use this device to sign in a new device with a QR code. You will need to scan the QR code shown on this device with your device that's signed out.": "Ви можете використовувати цей пристрій для входу на новому пристрої за допомогою QR-коду. Вам потрібно буде сканувати QR-код, показаний на цьому пристрої, своїм пристроєм, на якому ви вийшли.",
     "play voice broadcast": "відтворити голосову трансляцію",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Ви впевнені, що хочете вийти з %(count)s сеансів?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Ви впевнені, що хочете вийти з %(count)s сеансів?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Ви впевнені, що хочете вийти з %(count)s сеансів?",
+        "other": "Ви впевнені, що хочете вийти з %(count)s сеансів?"
+    },
     "Show formatting": "Показати форматування",
     "Removing inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.": "Вилучення неактивних сеансів посилює безпеку і швидкодію, а також полегшує виявлення підозрілих нових сеансів.",
     "Inactive sessions are sessions you have not used in some time, but they continue to receive encryption keys.": "Неактивні сеанси — це сеанси, які ви не використовували протягом певного часу, але вони продовжують отримувати ключі шифрування.",
@@ -3489,8 +3663,10 @@
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "Ви не можете розпочати виклик, оскільки зараз ведеться запис прямої трансляції. Будь ласка, заверште її, щоб розпочати виклик.",
     "Can’t start a call": "Не вдалося розпочати виклик",
     "Improve your account security by following these recommendations.": "Удоскональте безпеку свого облікового запису, дотримуючись цих порад.",
-    "%(count)s sessions selected|one": "%(count)s сеанс вибрано",
-    "%(count)s sessions selected|other": "Вибрано сеансів: %(count)s",
+    "%(count)s sessions selected": {
+        "one": "%(count)s сеанс вибрано",
+        "other": "Вибрано сеансів: %(count)s"
+    },
     "Failed to read events": "Не вдалося прочитати події",
     "Failed to send event": "Не вдалося надіслати подію",
     " in <strong>%(room)s</strong>": " в <strong>%(room)s</strong>",
@@ -3501,8 +3677,10 @@
     "Create a link": "Створити посилання",
     "Link": "Посилання",
     "Force 15s voice broadcast chunk length": "Примусово обмежити тривалість голосових трансляцій до 15 с",
-    "Sign out of %(count)s sessions|one": "Вийти з %(count)s сеансу",
-    "Sign out of %(count)s sessions|other": "Вийти з %(count)s сеансів",
+    "Sign out of %(count)s sessions": {
+        "one": "Вийти з %(count)s сеансу",
+        "other": "Вийти з %(count)s сеансів"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Вийти з усіх інших сеансів (%(otherSessionsCount)s)",
     "Yes, end my recording": "Так, завершити мій запис",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "Якщо ви почнете слухати цю трансляцію наживо, ваш поточний запис трансляції наживо завершиться.",
@@ -3606,7 +3784,9 @@
     "Room is <strong>encrypted ✅</strong>": "Кімната <strong>зашифрована ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Стан сповіщень <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "Стан непрочитаного в кімнаті: <strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Стан непрочитаного в кімнаті: <strong>%(status)s</strong>, кількість: <strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "Стан непрочитаного в кімнаті: <strong>%(status)s</strong>, кількість: <strong>%(count)s</strong>"
+    },
     "Ended a poll": "Завершує опитування",
     "Due to decryption errors, some votes may not be counted": "Через помилки розшифрування деякі голоси можуть бути не враховані",
     "The sender has blocked you from receiving this message": "Відправник заблокував вам отримання цього повідомлення",
@@ -3622,10 +3802,14 @@
     "Past polls": "Минулі опитування",
     "Active polls": "Активні опитування",
     "View poll in timeline": "Переглянути опитування у стрічці",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "За попередній день немає минулих опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "За останні %(count)s днів немає минулих опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "За попередній день немає активних опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "За останні %(count)s днів немає активних опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "За попередній день немає минулих опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
+        "other": "За останні %(count)s днів немає минулих опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "За попередній день немає активних опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
+        "other": "За останні %(count)s днів немає активних опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "Немає минулих опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
     "There are no active polls. Load more polls to view polls for previous months": "Немає активних опитувань. Завантажте більше опитувань, щоб переглянути опитування за попередні місяці",
     "Load more polls": "Завантажити більше опитувань",
@@ -3726,8 +3910,14 @@
     "Mark all messages as read": "Позначити всі повідомлення прочитаними",
     "Enter keywords here, or use for spelling variations or nicknames": "Введіть сюди ключові слова або використовуйте для варіацій написання чи нікнеймів",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "Повідомлення в цій кімнаті наскрізно зашифровані. Коли люди приєднуються, ви можете перевірити їх у їхньому профілі, просто торкнувшись зображення профілю.",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)sзмінює своє зображення профілю %(count)s рази",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)sзмінює своє зображення профілю %(count)s рази",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)sзмінює своє зображення профілю %(count)s рази",
+        "one": "%(severalUsers)sзмінюють зображення профілів"
+    },
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)sзмінює своє зображення профілю %(count)s рази",
+        "one": "%(oneUser)sзмінюють зображення профілів"
+    },
     "Are you sure you wish to remove (delete) this event?": "Ви впевнені, що хочете вилучити (видалити) цю подію?",
     "Thread Root ID: %(threadRootId)s": "ID кореневої гілки: %(threadRootId)s",
     "Upgrade room": "Поліпшити кімнату",
@@ -3766,8 +3956,6 @@
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a unique passphrase below, which will only be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортований файл дозволить будь-кому, хто зможе його прочитати, розшифрувати будь-які зашифровані повідомлення, які ви бачите, тому ви повинні бути обережними, щоб зберегти його в безпеці. Щоб зробити це, вам слід ввести унікальну парольну фразу нижче, яка буде використовуватися тільки для шифрування експортованих даних. Імпортувати дані можна буде лише за допомогою тієї ж самої парольної фрази.",
     "Under active development, new room header & details interface": "В активній розробці новий інтерфейс заголовка та подробиць кімнати",
     "Other spaces you know": "Інші відомі вам простори",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)sзмінюють зображення профілів",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)sзмінюють зображення профілів",
     "You need an invite to access this room.": "Для доступу до цієї кімнати потрібне запрошення.",
     "Failed to cancel": "Не вдалося скасувати",
     "Ask to join %(roomName)s?": "Надіслати запит на приєднання до %(roomName)s?",
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 03262caa5e..12ef0b80f8 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -124,8 +124,10 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget được thêm vào bởi %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget được gỡ bởi %(senderName)s",
     "%(displayName)s is typing …": "%(displayName)s đang gõ …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s và %(count)s người khác đang gõ …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s và một người khác đang gõ …",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s và %(count)s người khác đang gõ …",
+        "one": "%(names)s và một người khác đang gõ …"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s và %(lastPerson)s đang gõ …",
     "Cannot reach homeserver": "Không thể kết nối tới máy chủ",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Đảm bảo bạn có kết nối Internet ổn định, hoặc liên hệ quản trị viên để được hỗ trợ",
@@ -139,8 +141,10 @@
     "Unexpected error resolving identity server configuration": "Lỗi xảy ra khi xử lý thiết lập máy chủ định danh",
     "This homeserver has hit its Monthly Active User limit.": "Máy chủ nhà này đã đạt đến giới hạn người dùng hoạt động hàng tháng.",
     "This homeserver has exceeded one of its resource limits.": "Homeserver này đã vượt quá một trong những giới hạn tài nguyên của nó.",
-    "%(items)s and %(count)s others|other": "%(items)s và %(count)s mục khác",
-    "%(items)s and %(count)s others|one": "%(items)s và một mục khác",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s và %(count)s mục khác",
+        "one": "%(items)s và một mục khác"
+    },
     "%(items)s and %(lastItem)s": "%(items)s và %(lastItem)s",
     "Your browser does not support the required cryptography extensions": "Trình duyệt của bạn không hỗ trợ chức năng mã hóa",
     "Not a valid %(brand)s keyfile": "Tệp khóa %(brand)s không hợp lệ",
@@ -632,10 +636,14 @@
     "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Quyết định space nào có thể vào phòng này. Nếu một space được chọn, các thành viên của nó có thể tìm và tham gia <RoomName/>.",
     "Select spaces": "Chọn Không gian",
     "You're removing all spaces. Access will default to invite only": "Bạn đang xóa tất cả space. Quyền truy cập sẽ mặc định chỉ để mời",
-    "%(count)s rooms|one": "%(count)s phòng",
-    "%(count)s rooms|other": "%(count)s phòng",
-    "%(count)s members|one": "%(count)s thành viên",
-    "%(count)s members|other": "%(count)s thành viên",
+    "%(count)s rooms": {
+        "one": "%(count)s phòng",
+        "other": "%(count)s phòng"
+    },
+    "%(count)s members": {
+        "one": "%(count)s thành viên",
+        "other": "%(count)s thành viên"
+    },
     "Are you sure you want to sign out?": "Bạn có chắc mình muốn đăng xuất không?",
     "You'll lose access to your encrypted messages": "Bạn sẽ mất quyền truy cập vào các tin nhắn được mã hóa của mình",
     "Manually export keys": "Xuất các khóa thủ công",
@@ -871,8 +879,10 @@
     "Add existing rooms": "Thêm các phòng hiện có",
     "Space selection": "Lựa chọn space",
     "Direct Messages": "Tin nhắn trực tiếp",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "Đang thêm phòng…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "Đang thêm các phòng... (%(progress)s trong %(count)s)",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "Đang thêm phòng…",
+        "other": "Đang thêm các phòng... (%(progress)s trong %(count)s)"
+    },
     "Not all selected were added": "Không phải tất cả các mục đã chọn đều được thêm vào",
     "Search for spaces": "Tìm kiếm space",
     "Create a new space": "Tạo space mới",
@@ -887,7 +897,9 @@
     "You are not allowed to view this server's rooms list": "Bạn không được phép xem danh sách phòng của máy chủ này",
     "Looks good": "Có vẻ ổn",
     "Enter a server name": "Nhập tên máy chủ",
-    "And %(count)s more...|other": "Và %(count)s thêm…",
+    "And %(count)s more...": {
+        "other": "Và %(count)s thêm…"
+    },
     "Sign in with single sign-on": "Đăng nhập bằng đăng nhập một lần",
     "Continue with %(provider)s": "Tiếp tục với %(provider)s",
     "Homeserver": "Máy chủ",
@@ -905,20 +917,34 @@
     "QR Code": "Mã QR",
     "Custom level": "Cấp độ tùy chọn",
     "Power level": "Cấp độ sức mạnh",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s đã thay đổi ACLs máy chủ",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s đã thay đổi ACLs máy chủ %(count)s lần",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s đã thay đổi ACLs máy chủ",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s đã thay đổi ACLs máy chủ %(count)s lần",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s không thay đổi",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s không thay đổi %(count)s lần",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s không thay đổi",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s không thay đổi %(count)s lần",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s đã thay đổi tên của họ",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s đã thay đổi tên của họ %(count)s lần",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s đã thay đổi tên của họ",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s đã thay đổi tên của họ %(count)s lần",
-    "was unbanned %(count)s times|one": "đã được hủy cấm",
-    "was unbanned %(count)s times|other": "đã được hủy cấm %(count)s lần",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s đã thay đổi ACLs máy chủ",
+        "other": "%(oneUser)s đã thay đổi ACLs máy chủ %(count)s lần"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s đã thay đổi ACLs máy chủ",
+        "other": "%(severalUsers)s đã thay đổi ACLs máy chủ %(count)s lần"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "one": "%(oneUser)s không thay đổi",
+        "other": "%(oneUser)s không thay đổi %(count)s lần"
+    },
+    "%(severalUsers)smade no changes %(count)s times": {
+        "one": "%(severalUsers)s không thay đổi",
+        "other": "%(severalUsers)s không thay đổi %(count)s lần"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "one": "%(oneUser)s đã thay đổi tên của họ",
+        "other": "%(oneUser)s đã thay đổi tên của họ %(count)s lần"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "one": "%(severalUsers)s đã thay đổi tên của họ",
+        "other": "%(severalUsers)s đã thay đổi tên của họ %(count)s lần"
+    },
+    "was unbanned %(count)s times": {
+        "one": "đã được hủy cấm",
+        "other": "đã được hủy cấm %(count)s lần"
+    },
     "Use your Security Key to continue.": "Sử dụng Khóa bảo mật của bạn để tiếp tục.",
     "Security Key": "Chìa khóa bảo mật",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Nhập Chuỗi bảo mật hoặc <button>sử dụng Khóa bảo mật</button> của bạn để tiếp tục.",
@@ -993,32 +1019,58 @@
     "Learn more": "Tìm hiểu thêm",
     "Use your preferred Matrix homeserver if you have one, or host your own.": "Sử dụng máy chủ Matrix ưa thích của bạn nếu bạn có, hoặc tự tạo máy chủ lưu trữ của riêng bạn.",
     "Other homeserver": "Máy chủ khác",
-    "were unbanned %(count)s times|one": "đã được hủy cấm",
-    "were unbanned %(count)s times|other": "đã được hủy cấm %(count)s lần",
-    "was banned %(count)s times|one": "đã bị cấm",
-    "was banned %(count)s times|other": "đã bị cấm %(count)s lần",
-    "were banned %(count)s times|one": "đã bị cấm",
-    "were banned %(count)s times|other": "đã bị cấm %(count)s lần",
-    "was invited %(count)s times|one": "đã được mời",
-    "was invited %(count)s times|other": "đã được mời %(count)s lần",
-    "were invited %(count)s times|one": "đã được mời",
-    "were invited %(count)s times|other": "đã được mời %(count)s lần",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s đã rút lời mợi của họ",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s đã rút lời mợi của họ %(count)s lần",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s đã rút các lời mời của họ",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s đã rút các lời mời của họ %(count)s lần",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s đã từ chối lời mời của họ",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s đã từ chối lời mời của họ %(count)s lần",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s đã từ chối các lời mời của họ",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s đã từ chối các lời mời của họ %(count)s lần",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s đã rời khỏi và tham gia lại",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s đã rời khỏi và tham gia lại %(count)s lần",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s đã rời khỏi và tham gia lại",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s đã rời khỏi và tham gia lại %(count)s lần",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s đã tham gia và rời khỏi",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s đã tham gia và rời khỏi %(count)s lần",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s đã tham gia và rời khỏi",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s đã tham gia và rời khỏi %(count)s lần",
+    "were unbanned %(count)s times": {
+        "one": "đã được hủy cấm",
+        "other": "đã được hủy cấm %(count)s lần"
+    },
+    "was banned %(count)s times": {
+        "one": "đã bị cấm",
+        "other": "đã bị cấm %(count)s lần"
+    },
+    "were banned %(count)s times": {
+        "one": "đã bị cấm",
+        "other": "đã bị cấm %(count)s lần"
+    },
+    "was invited %(count)s times": {
+        "one": "đã được mời",
+        "other": "đã được mời %(count)s lần"
+    },
+    "were invited %(count)s times": {
+        "one": "đã được mời",
+        "other": "đã được mời %(count)s lần"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "one": "%(oneUser)s đã rút lời mợi của họ",
+        "other": "%(oneUser)s đã rút lời mợi của họ %(count)s lần"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "one": "%(severalUsers)s đã rút các lời mời của họ",
+        "other": "%(severalUsers)s đã rút các lời mời của họ %(count)s lần"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "one": "%(oneUser)s đã từ chối lời mời của họ",
+        "other": "%(oneUser)s đã từ chối lời mời của họ %(count)s lần"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)s đã từ chối các lời mời của họ",
+        "other": "%(severalUsers)s đã từ chối các lời mời của họ %(count)s lần"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "one": "%(oneUser)s đã rời khỏi và tham gia lại",
+        "other": "%(oneUser)s đã rời khỏi và tham gia lại %(count)s lần"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "one": "%(severalUsers)s đã rời khỏi và tham gia lại",
+        "other": "%(severalUsers)s đã rời khỏi và tham gia lại %(count)s lần"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "one": "%(oneUser)s đã tham gia và rời khỏi",
+        "other": "%(oneUser)s đã tham gia và rời khỏi %(count)s lần"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "one": "%(severalUsers)s đã tham gia và rời khỏi",
+        "other": "%(severalUsers)s đã tham gia và rời khỏi %(count)s lần"
+    },
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "Language Dropdown": "Danh sách ngôn ngữ",
     "Information": "Thông tin",
@@ -1026,11 +1078,15 @@
     "Rotate Left": "Xoay trái",
     "Zoom in": "Phóng to",
     "Zoom out": "Thu nhỏ",
-    "%(count)s people you know have already joined|one": "%(count)s người bạn đã biết vừa tham gia",
-    "%(count)s people you know have already joined|other": "%(count)s người bạn đã biết vừa tham gia",
+    "%(count)s people you know have already joined": {
+        "one": "%(count)s người bạn đã biết vừa tham gia",
+        "other": "%(count)s người bạn đã biết vừa tham gia"
+    },
     "Including %(commaSeparatedMembers)s": "Bao gồm %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "Xem một thành viên",
-    "View all %(count)s members|other": "Xem tất cả %(count)s thành viên",
+    "View all %(count)s members": {
+        "one": "Xem một thành viên",
+        "other": "Xem tất cả %(count)s thành viên"
+    },
     "expand": "mở rộng",
     "collapse": "thu hẹp",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Vui lòng <newIssueLink> tạo một vấn đề mới </newIssueLink> trên GitHub để chúng tôi có thể điều tra lỗi này.",
@@ -1205,8 +1261,10 @@
     "Ban from %(roomName)s": "Cấm từ %(roomName)s",
     "Unban from %(roomName)s": "Hủy cấm từ %(roomName)s",
     "Remove recent messages": "Bỏ các tin nhắn gần đây",
-    "Remove %(count)s messages|one": "Bỏ một tin nhắn",
-    "Remove %(count)s messages|other": "Bỏ %(count)s tin nhắn",
+    "Remove %(count)s messages": {
+        "one": "Bỏ một tin nhắn",
+        "other": "Bỏ %(count)s tin nhắn"
+    },
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Đối với một lượng lớn thư, quá trình này có thể mất một chút thời gian. Vui lòng không làm mới khách hàng của bạn trong thời gian chờ đợi.",
     "Remove recent messages by %(user)s": "Bỏ các tin nhắn gần đây bởi %(user)s",
     "Show more": "Cho xem nhiều hơn",
@@ -1257,10 +1315,14 @@
     "This room has already been upgraded.": "Phòng này đã được nâng cấp.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Việc nâng cấp phòng này sẽ đóng phiên bản hiện tại của phòng và tạo một phòng được nâng cấp có cùng tên.",
     "Unread messages.": "Các tin nhắn chưa đọc.",
-    "%(count)s unread messages.|one": "1 tin chưa đọc.",
-    "%(count)s unread messages.|other": "%(count)s tin nhắn chưa đọc.",
-    "%(count)s unread messages including mentions.|one": "1 đề cập chưa đọc.",
-    "%(count)s unread messages including mentions.|other": "%(count)s tin nhắn chưa đọc bao gồm các đề cập.",
+    "%(count)s unread messages.": {
+        "one": "1 tin chưa đọc.",
+        "other": "%(count)s tin nhắn chưa đọc."
+    },
+    "%(count)s unread messages including mentions.": {
+        "one": "1 đề cập chưa đọc.",
+        "other": "%(count)s tin nhắn chưa đọc bao gồm các đề cập."
+    },
     "Room options": "Tùy chọn phòng",
     "Settings": "Cài đặt",
     "Low Priority": "Ưu tiên thấp",
@@ -1270,8 +1332,10 @@
     "Notification options": "Tùy chọn thông báo",
     "All messages": "Tất cả tin nhắn",
     "Show less": "Hiện ít hơn",
-    "Show %(count)s more|one": "Hiển thị %(count)s thêm",
-    "Show %(count)s more|other": "Hiển thị %(count)s thêm",
+    "Show %(count)s more": {
+        "one": "Hiển thị %(count)s thêm",
+        "other": "Hiển thị %(count)s thêm"
+    },
     "List options": "Liệt kê các tùy chọn",
     "A-Z": "AZ",
     "Activity": "Hoạt động",
@@ -1326,8 +1390,10 @@
     "Hide Widgets": "Ẩn widget",
     "Forget room": "Quên phòng",
     "Join Room": "Vào phòng",
-    "(~%(count)s results)|one": "(~%(count)s kết quả)",
-    "(~%(count)s results)|other": "(~%(count)s kết quả)",
+    "(~%(count)s results)": {
+        "one": "(~%(count)s kết quả)",
+        "other": "(~%(count)s kết quả)"
+    },
     "Unnamed room": "Phòng không tên",
     "No recently visited rooms": "Không có phòng nào được truy cập gần đây",
     "Recently visited rooms": "Các phòng đã ghé thăm gần đây",
@@ -1361,14 +1427,22 @@
     "Topic: %(topic)s (<a>edit</a>)": "Chủ đề: %(topic)s (<a>edit</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Đây là phần bắt đầu của lịch sử tin nhắn trực tiếp của bạn với <displayName/>.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Chỉ có hai người trong cuộc trò chuyện này, trừ khi một trong hai người mời bất kỳ ai tham gia.",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s đã rời khỏi",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s đã rời khỏi %(count)s lần",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s đã rời khỏi",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s đã rời khỏi %(count)s lần",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s đã tham gia",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s đã tham gia %(count)s lần",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s đã tham gia",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s đã tham gia %(count)s lần",
+    "%(oneUser)sleft %(count)s times": {
+        "one": "%(oneUser)s đã rời khỏi",
+        "other": "%(oneUser)s đã rời khỏi %(count)s lần"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "one": "%(severalUsers)s đã rời khỏi",
+        "other": "%(severalUsers)s đã rời khỏi %(count)s lần"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "one": "%(oneUser)s đã tham gia",
+        "other": "%(oneUser)s đã tham gia %(count)s lần"
+    },
+    "%(severalUsers)sjoined %(count)s times": {
+        "one": "%(severalUsers)s đã tham gia",
+        "other": "%(severalUsers)s đã tham gia %(count)s lần"
+    },
     "Insert link": "Chèn liên kết",
     "Quote": "Trích",
     "Code block": "Khối mã",
@@ -1561,11 +1635,15 @@
     "Mention": "Nhắc đến",
     "Jump to read receipt": "Nhảy để đọc biên nhận",
     "Hide sessions": "Ẩn các phiên",
-    "%(count)s sessions|one": "%(count)s phiên",
-    "%(count)s sessions|other": "%(count)s phiên",
+    "%(count)s sessions": {
+        "one": "%(count)s phiên",
+        "other": "%(count)s phiên"
+    },
     "Hide verified sessions": "Ẩn các phiên đã xác thực",
-    "%(count)s verified sessions|one": "1 phiên đã xác thực",
-    "%(count)s verified sessions|other": "%(count)s phiên đã xác thực",
+    "%(count)s verified sessions": {
+        "one": "1 phiên đã xác thực",
+        "other": "%(count)s phiên đã xác thực"
+    },
     "Not trusted": "Không đáng tin cậy",
     "Trusted": "Tin cậy",
     "Room settings": "Cài đặt phòng",
@@ -1577,7 +1655,9 @@
     "Edit widgets, bridges & bots": "Chỉnh sửa tiện ích widget, cầu nối và bot",
     "Widgets": "Vật dụng",
     "Set my room layout for everyone": "Đặt bố cục phòng của tôi cho mọi người",
-    "You can only pin up to %(count)s widgets|other": "Bạn chỉ có thể ghim tối đa %(count)s widget",
+    "You can only pin up to %(count)s widgets": {
+        "other": "Bạn chỉ có thể ghim tối đa %(count)s widget"
+    },
     "Threads": "Chủ đề",
     "Pinned messages": "Tin nhắn đã ghim",
     "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Nếu bạn có quyền, hãy mở menu trên bất kỳ tin nhắn nào và chọn Ghim <b>Pin</b> để dán chúng vào đây.",
@@ -1807,11 +1887,15 @@
     "Invited": "Đã mời",
     "Invite to this space": "Mời vào space này",
     "Invite to this room": "Mời vào phòng này",
-    "and %(count)s others...|one": "và một cái khác…",
-    "and %(count)s others...|other": "và %(count)s khác…",
+    "and %(count)s others...": {
+        "one": "và một cái khác…",
+        "other": "và %(count)s khác…"
+    },
     "Close preview": "Đóng bản xem trước",
-    "Show %(count)s other previews|one": "Hiển thị %(count)s bản xem trước khác",
-    "Show %(count)s other previews|other": "Hiển thị %(count)s bản xem trước khác",
+    "Show %(count)s other previews": {
+        "one": "Hiển thị %(count)s bản xem trước khác",
+        "other": "Hiển thị %(count)s bản xem trước khác"
+    },
     "Scroll to most recent messages": "Di chuyển đến các tin nhắn gần đây nhất",
     "Failed to send": "Gửi thất bại",
     "Your message was sent": "Tin nhắn của bạn đã được gửi đi",
@@ -1820,8 +1904,10 @@
     "Unencrypted": "Không được mã hóa",
     "Encrypted by an unverified session": "Được mã hóa bởi một phiên chưa được xác thực",
     "This event could not be displayed": "Sự kiện này không thể được hiển thị",
-    "%(count)s reply|one": "%(count)s trả lời",
-    "%(count)s reply|other": "%(count)s trả lời",
+    "%(count)s reply": {
+        "one": "%(count)s trả lời",
+        "other": "%(count)s trả lời"
+    },
     "Mod": "Người quản trị",
     "Edit message": "Chỉnh sửa tin nhắn",
     "Send as message": "Gửi dưới dạng tin nhắn",
@@ -2095,10 +2181,14 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s đã thay đổi địa chỉ cho phòng này.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s đã thay đổi địa chỉ chính và địa chỉ thay thế cho phòng này.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s đã thay đổi các địa chỉ thay thế cho phòng này.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s đã bỏ địa chỉ thay thế %(addresses)s cho phòng này.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s đã bỏ các địa chỉ thay thế %(addresses)s cho phòng này.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s đã thêm địa chỉ thay thế %(addresses)s cho phòng này.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s đã thêm các địa chỉ thay thế %(addresses)s cho phòng này.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s đã bỏ địa chỉ thay thế %(addresses)s cho phòng này.",
+        "other": "%(senderName)s đã bỏ các địa chỉ thay thế %(addresses)s cho phòng này."
+    },
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "one": "%(senderName)s đã thêm địa chỉ thay thế %(addresses)s cho phòng này.",
+        "other": "%(senderName)s đã thêm các địa chỉ thay thế %(addresses)s cho phòng này."
+    },
     "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s đã gửi một sticker.",
     "Message deleted by %(name)s": "Tin nhắn đã bị %(name)s xóa",
     "Message deleted": "Tin nhắn đã xóa",
@@ -2147,10 +2237,14 @@
     "Message bubbles": "Bong bóng tin nhắn",
     "Modern": "Hiện đại",
     "Message layout": "Bố cục tin nhắn",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "Đang cập nhật space…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "Đang cập nhật space… (%(progress)s trên %(count)s)",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "Đang gửi lời mời…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "Đang gửi lời mời... (%(progress)s trên %(count)s)",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "Đang cập nhật space…",
+        "other": "Đang cập nhật space… (%(progress)s trên %(count)s)"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "Đang gửi lời mời…",
+        "other": "Đang gửi lời mời... (%(progress)s trên %(count)s)"
+    },
     "Loading new room": "Đang tải phòng mới",
     "Upgrading room": "Đang nâng cấp phòng",
     "This upgrade will allow members of selected spaces access to this room without an invite.": "Nâng cấp này sẽ cho phép các thành viên của các space đã chọn vào phòng này mà không cần lời mời.",
@@ -2159,10 +2253,14 @@
     "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Bất cứ ai trong <spaceName/> có thể tìm và tham gia. Bạn cũng có thể chọn các space khác.",
     "Spaces with access": "Các Space có quyền truy cập",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Bất kỳ ai trong một space đều có thể tìm và tham gia. Chỉnh sửa space nào có thể truy cập tại đây. <a>Edit which spaces can access here.</a>",
-    "Currently, %(count)s spaces have access|one": "Hiện tại, một space có quyền truy cập",
-    "Currently, %(count)s spaces have access|other": "Hiện tại, %(count)s spaces có quyền truy cập",
-    "& %(count)s more|one": "& %(count)s thêm",
-    "& %(count)s more|other": "& %(count)s thêm",
+    "Currently, %(count)s spaces have access": {
+        "one": "Hiện tại, một space có quyền truy cập",
+        "other": "Hiện tại, %(count)s spaces có quyền truy cập"
+    },
+    "& %(count)s more": {
+        "one": "& %(count)s thêm",
+        "other": "& %(count)s thêm"
+    },
     "Upgrade required": "Yêu cầu nâng cấp",
     "Anyone can find and join.": "Bất kỳ ai cũng có thể tìm và tham gia.",
     "Only invited people can join.": "Chỉ những người được mời mới có thể tham gia.",
@@ -2178,8 +2276,10 @@
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s thiếu một số thành phần thiết yếu để lưu trữ cục bộ an toàn các tin nhắn được mã hóa. Nếu bạn muốn thử nghiệm với tính năng này, hãy dựng một bản %(brand)s tùy chỉnh cho máy tính có thêm <nativeLink>các thành phần để tìm kiếm</nativeLink>.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Bộ nhớ cache an toàn các tin nhắn được mã hóa cục bộ để chúng xuất hiện trong kết quả tìm kiếm.",
     "Manage": "Quản lý",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Lưu trữ cục bộ an toàn các tin nhắn đã được mã hóa để chúng xuất hiện trong các kết quả tìm kiếm, sử dụng %(size)s để lưu trữ các tin nhắn từ %(rooms)s phòng.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Lưu trữ an toàn các tin nhắn đã được mã hóa trên thiết bị để chúng xuất hiện trong các kết quả tìm kiếm, sử dụng %(size)s để lưu trữ các tin nhắn từ các %(rooms)s phòng.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "Lưu trữ cục bộ an toàn các tin nhắn đã được mã hóa để chúng xuất hiện trong các kết quả tìm kiếm, sử dụng %(size)s để lưu trữ các tin nhắn từ %(rooms)s phòng.",
+        "other": "Lưu trữ an toàn các tin nhắn đã được mã hóa trên thiết bị để chúng xuất hiện trong các kết quả tìm kiếm, sử dụng %(size)s để lưu trữ các tin nhắn từ các %(rooms)s phòng."
+    },
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Xác thực riêng từng phiên được người dùng sử dụng để đánh dấu phiên đó là đáng tin cậy, không tin cậy vào các thiết bị được xác thực chéo.",
     "Encryption": "Mã hóa",
     "Failed to set display name": "Không đặt được tên hiển thị",
@@ -2601,9 +2701,11 @@
     "Skip verification for now": "Bỏ qua xác thực ngay bây giờ",
     "Really reset verification keys?": "Thực sự đặt lại các khóa xác minh?",
     "Clear": "Xoá",
-    "Uploading %(filename)s and %(count)s others|one": "Đang tải lên %(filename)s và %(count)s tập tin khác",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "Đang tải lên %(filename)s và %(count)s tập tin khác",
+        "other": "Đang tải lên %(filename)s và %(count)s tập tin khác"
+    },
     "Uploading %(filename)s": "Đang tải lên %(filename)s",
-    "Uploading %(filename)s and %(count)s others|other": "Đang tải lên %(filename)s và %(count)s tập tin khác",
     "Show all threads": "Hiển thị tất cả chủ đề",
     "Keep discussions organised with threads": "Giữ các cuộc thảo luận được tổ chức với các chủ đề này",
     "Show:": "Hiển thị:",
@@ -2616,8 +2718,10 @@
     "Results": "Kết quả",
     "Joined": "Đã tham gia",
     "Joining": "Đang tham gia",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Bạn có %(count)s thông báo chưa đọc trong phiên bản trước của phòng này.",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Bạn có %(count)s thông báo chưa đọc trong phiên bản trước của phòng này.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "one": "Bạn có %(count)s thông báo chưa đọc trong phiên bản trước của phòng này.",
+        "other": "Bạn có %(count)s thông báo chưa đọc trong phiên bản trước của phòng này."
+    },
     "You're all caught up": "Tất cả các bạn đều bị bắt",
     "Own your conversations.": "Sở hữu các cuộc trò chuyện của bạn.",
     "Someone already has that username. Try another or if it is you, sign in below.": "Ai đó đã có username đó. Hãy thử một cái khác hoặc nếu đó là bạn, hay đăng nhập bên dưới.",
@@ -2628,8 +2732,10 @@
     "Mentions only": "Chỉ tin nhắn được đề cập",
     "Forget": "Quên",
     "View in room": "Xem phòng này",
-    "Upload %(count)s other files|one": "Tải lên %(count)s tệp khác",
-    "Upload %(count)s other files|other": "Tải lên %(count)s tệp khác",
+    "Upload %(count)s other files": {
+        "one": "Tải lên %(count)s tệp khác",
+        "other": "Tải lên %(count)s tệp khác"
+    },
     "We call the places where you can host your account 'homeservers'.": "Chúng tôi gọi những nơi bạn có thể lưu trữ tài khoản của bạn là 'homeserver'.",
     "Matrix.org is the biggest public homeserver in the world, so it's a good place for many.": "Matrix.org là homeserver công cộng lớn nhất, vì vậy nó là nơi lý tưởng cho nhiều người.",
     "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Bất kỳ lý do nào khác. Xin hãy mô tả vấn đề.\nĐiều này sẽ được báo cáo cho người điều hành phòng.",
@@ -2654,12 +2760,18 @@
     "Sorry, the poll you tried to create was not posted.": "Xin lỗi, cuộc thăm dò mà bạn đã cố gắng tạo đã không được đăng.",
     "Failed to post poll": "Đăng cuộc thăm dò thất bại",
     "Create Poll": "Tạo Cuộc thăm dò ý kiến",
-    "%(count)s votes|one": "%(count)s phiếu bầu",
-    "%(count)s votes|other": "%(count)s phiếu bầu",
-    "Based on %(count)s votes|one": "Dựa theo %(count)s phiếu bầu",
-    "Based on %(count)s votes|other": "Dựa theo %(count)s phiếu bầu",
-    "%(count)s votes cast. Vote to see the results|one": "%(count)s phiếu bầu. Bỏ phiếu để xem kết quả",
-    "%(count)s votes cast. Vote to see the results|other": "%(count)s phiếu bầu. Bỏ phiếu để xem kết quả",
+    "%(count)s votes": {
+        "one": "%(count)s phiếu bầu",
+        "other": "%(count)s phiếu bầu"
+    },
+    "Based on %(count)s votes": {
+        "one": "Dựa theo %(count)s phiếu bầu",
+        "other": "Dựa theo %(count)s phiếu bầu"
+    },
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "%(count)s phiếu bầu. Bỏ phiếu để xem kết quả",
+        "other": "%(count)s phiếu bầu. Bỏ phiếu để xem kết quả"
+    },
     "No votes cast": "Không có phiếu",
     "Sorry, your vote was not registered. Please try again.": "Xin lỗi, phiếu bầu của bạn đã không được đăng ký. Vui lòng thử lại.",
     "Vote not registered": "Bỏ phiếu không đăng ký",
@@ -2673,8 +2785,10 @@
     "The homeserver the user you're verifying is connected to": "Máy chủ nhà người dùng bạn đang xác thực được kết nối đến",
     "Home options": "Các tùy chọn Home",
     "%(spaceName)s menu": "%(spaceName)s menu",
-    "Currently joining %(count)s rooms|one": "Hiện đang tham gia %(count)s phòng",
-    "Currently joining %(count)s rooms|other": "Hiện đang tham gia %(count)s phòng",
+    "Currently joining %(count)s rooms": {
+        "one": "Hiện đang tham gia %(count)s phòng",
+        "other": "Hiện đang tham gia %(count)s phòng"
+    },
     "Join public room": "Tham gia vào phòng công cộng",
     "Add people": "Thêm người",
     "You do not have permissions to invite people to this space": "Bạn không có quyền mời mọi người vào space này",
@@ -2707,12 +2821,18 @@
     "Rename": "Đặt lại tên",
     "Select all": "Chọn tất cả",
     "Deselect all": "Bỏ chọn tất cả",
-    "Sign out devices|one": "Đăng xuất thiết bị",
-    "Sign out devices|other": "Đăng xuất các thiết bị",
-    "Click the button below to confirm signing out these devices.|one": "Nhấn nút bên dưới để xác nhận đăng xuất thiết bị này.",
-    "Click the button below to confirm signing out these devices.|other": "Nhấn nút bên dưới để xác nhận đăng xuất các thiết bị này.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Xác nhận đăng xuất thiết bị này bằng cách sử dụng Single Sign On để xác thực danh tính của bạn.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Xác nhận đăng xuất các thiết bị này bằng cách sử dụng Single Sign On để xác thực danh tính.",
+    "Sign out devices": {
+        "one": "Đăng xuất thiết bị",
+        "other": "Đăng xuất các thiết bị"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "Nhấn nút bên dưới để xác nhận đăng xuất thiết bị này.",
+        "other": "Nhấn nút bên dưới để xác nhận đăng xuất các thiết bị này."
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "Xác nhận đăng xuất thiết bị này bằng cách sử dụng Single Sign On để xác thực danh tính của bạn.",
+        "other": "Xác nhận đăng xuất các thiết bị này bằng cách sử dụng Single Sign On để xác thực danh tính."
+    },
     "Pin to sidebar": "Ghim vào sidebar",
     "Quick settings": "Cài đặt nhanh",
     "sends rainfall": "gửi kiểu mưa rơi",
@@ -2735,8 +2855,10 @@
     "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)s đã thay đổi ai có thể tham gia phòng này. <a> Xem cài đặt </a>.",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Khóa đăng nhập bạn cung cấp khớp với khóa đăng nhập bạn nhận từ thiết bị %(deviceId)s của %(userId)s. Thiết bị được đánh dấu là đã được xác minh.",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Sử dụng máy chủ định danh để mời qua thư điện tử. Bấm Tiếp tục để sử dụng máy chủ định danh mặc định (%(defaultIdentityServerName)s) hoặc quản lý trong Cài đặt.",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s và %(count)s khác",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s và %(count)s khác",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s và %(count)s khác",
+        "other": "%(spaceName)s và %(count)s khác"
+    },
     "You cannot place calls without a connection to the server.": "Bạn không thể gọi khi không có kết nối tới máy chủ.",
     "Connectivity to the server has been lost": "Mất kết nối đến máy chủ",
     "You cannot place calls in this browser.": "Bạn không thể gọi trong trình duyệt này.",
@@ -2773,8 +2895,10 @@
     "Including you, %(commaSeparatedMembers)s": "Bao gồm bạn, %(commaSeparatedMembers)s",
     "Backspace": "Phím lùi",
     "toggle event": "chuyển đổi sự kiện",
-    "Final result based on %(count)s votes|one": "Kết quả cuối cùng dựa trên %(count)s phiếu bầu",
-    "Final result based on %(count)s votes|other": "Kết quả cuối cùng dựa trên %(count)s phiếu bầu",
+    "Final result based on %(count)s votes": {
+        "one": "Kết quả cuối cùng dựa trên %(count)s phiếu bầu",
+        "other": "Kết quả cuối cùng dựa trên %(count)s phiếu bầu"
+    },
     "Expand map": "Mở rộng bản đồ",
     "You cancelled verification on your other device.": "Bạn đã hủy xác thực trên thiết bị khác của bạn.",
     "Almost there! Is your other device showing the same shield?": "Sắp xong rồi! Có phải thiết bị khác của bạn hiển thị cùng một lá chắn không?",
@@ -2790,16 +2914,24 @@
     "Back to thread": "Quay lại luồng",
     "Room members": "Thành viên phòng",
     "Back to chat": "Quay lại trò chuyện",
-    "Exported %(count)s events in %(seconds)s seconds|one": "Đã xuất %(count)s sự kiện trong %(seconds)s giây",
-    "Exported %(count)s events in %(seconds)s seconds|other": "Đã xuất %(count)s sự kiện trong %(seconds)s giây",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "Đã xuất %(count)s sự kiện trong %(seconds)s giây",
+        "other": "Đã xuất %(count)s sự kiện trong %(seconds)s giây"
+    },
     "Export successful!": "Xuất thành công!",
-    "Fetched %(count)s events in %(seconds)ss|one": "Đã tìm thấy %(count)s sự kiện trong %(seconds)s giây",
-    "Fetched %(count)s events in %(seconds)ss|other": "Đã tìm thấy %(count)s sự kiện trong %(seconds)s giây",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "Đã tìm thấy %(count)s sự kiện trong %(seconds)s giây",
+        "other": "Đã tìm thấy %(count)s sự kiện trong %(seconds)s giây"
+    },
     "Processing event %(number)s out of %(total)s": "Đang sử lý %(number)s sự kiện trong %(total)s",
-    "Fetched %(count)s events so far|one": "Đã tìm thấy %(count)s sự kiện đến hiện tại",
-    "Fetched %(count)s events so far|other": "Đã tìm thấy %(count)s sự kiện đến hiện tại",
-    "Fetched %(count)s events out of %(total)s|one": "Đã tìm thấy %(count)s sự kiện trong %(total)s",
-    "Fetched %(count)s events out of %(total)s|other": "Đã tìm thấy %(count)s sự kiện trong %(total)s",
+    "Fetched %(count)s events so far": {
+        "one": "Đã tìm thấy %(count)s sự kiện đến hiện tại",
+        "other": "Đã tìm thấy %(count)s sự kiện đến hiện tại"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "Đã tìm thấy %(count)s sự kiện trong %(total)s",
+        "other": "Đã tìm thấy %(count)s sự kiện trong %(total)s"
+    },
     "Generating a ZIP": "Tạo ZIP",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Chúng tôi không thể hiểu ngày được nhập (%(inputDate)s). Hãy thử dùng định dạng YYYY-MM-DD.",
     "Command failed: Unable to find room (%(roomId)s": "Lỗi khi thực hiện lệnh: Không tìm thấy phòng (%(roomId)s)",
@@ -2853,9 +2985,11 @@
     "User is already invited to the room": "Người dùng đã được mời vào phòng",
     "User is already invited to the space": "Người dùng đã được mời vào space",
     "You do not have permission to invite people to this space.": "Bạn không có quyền để mời mọi người vào space này.",
-    "In %(spaceName)s and %(count)s other spaces.|one": "Trong %(spaceName)s và %(count)s space khác.",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "Trong %(spaceName)s và %(count)s space khác.",
+        "other": "Trong %(spaceName)s và %(count)s space khác."
+    },
     "In %(spaceName)s.": "Trong space %(spaceName)s.",
-    "In %(spaceName)s and %(count)s other spaces.|other": "Trong %(spaceName)s và %(count)s space khác.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Trong các space %(space1Name)s và %(space2Name)s.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s và %(space2Name)s",
     "Remove, ban, or invite people to your active room, and make you leave": "Xóa, cấm, hoặc mời mọi người vào phòng đang hoạt động của bạn, và bạn rời khỏi đó",
@@ -2893,11 +3027,15 @@
     "Use your account to continue.": "Dùng tài khoản của bạn để tiếp tục.",
     "%(senderName)s started a voice broadcast": "%(senderName)s đã bắt đầu phát thanh",
     "Empty room (was %(oldName)s)": "Phòng trống (trước kia là %(oldName)s)",
-    "Inviting %(user)s and %(count)s others|one": "Đang mời %(user)s và 1 người khác",
-    "Inviting %(user)s and %(count)s others|other": "Đang mời %(user)s và %(count)s người khác",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "Đang mời %(user)s và 1 người khác",
+        "other": "Đang mời %(user)s và %(count)s người khác"
+    },
     "Inviting %(user1)s and %(user2)s": "Mời %(user1)s và %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s và 1 người khác",
-    "%(user)s and %(count)s others|other": "%(user)s và %(count)s người khác",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s và 1 người khác",
+        "other": "%(user)s và %(count)s người khác"
+    },
     "%(user1)s and %(user2)s": "%(user1)s và %(user2)s",
     "Reload": "Tải lại",
     "Database unexpectedly closed": "Cơ sở dữ liệu đột nhiên bị đóng",
@@ -2918,7 +3056,10 @@
     "Device": "Thiết bị",
     "Version": "Phiên bản",
     "Rename session": "Đổi tên phiên",
-    "Confirm signing out these devices|one": "Xác nhận đăng xuất khỏi thiết bị này",
+    "Confirm signing out these devices": {
+        "one": "Xác nhận đăng xuất khỏi thiết bị này",
+        "other": "Xác nhận đăng xuất khỏi các thiết bị này"
+    },
     "Current session": "Phiên hiện tại",
     "Sign out of all other sessions (%(otherSessionsCount)s)": "Đăng xuất khỏi mọi phiên khác (%(otherSessionsCount)s)",
     "You do not have sufficient permissions to change this.": "Bạn không có đủ quyền để thay đổi cái này.",
@@ -2931,8 +3072,10 @@
     "Video settings": "Cài đặt truyền hình",
     "Voice settings": "Cài đặt âm thanh",
     "Group all your people in one place.": "Đưa tất cả mọi người vào một chỗ.",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "Bạn có muốn đăng xuất %(count)s phiên?",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "Bạn có muốn đăng xuất %(count)s phiên?",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "Bạn có muốn đăng xuất %(count)s phiên?",
+        "other": "Bạn có muốn đăng xuất %(count)s phiên?"
+    },
     "Sessions": "Các phiên",
     "Share your activity and status with others.": "Chia sẻ hoạt động và trạng thái với người khác.",
     "Early previews": "Thử trước tính năng mới",
@@ -2954,8 +3097,10 @@
     "Saving…": "Đang lưu…",
     "Creating…": "Đang tạo…",
     "Secure messaging for friends and family": "Tin nhắn bảo mật cho bạn bè và gia đình",
-    "%(count)s people joined|one": "%(count)s người đã tham gia",
-    "%(count)s people joined|other": "%(count)s người đã tham gia",
+    "%(count)s people joined": {
+        "one": "%(count)s người đã tham gia",
+        "other": "%(count)s người đã tham gia"
+    },
     "Turn on camera": "Bật máy ghi hình",
     "Turn off camera": "Tắt máy ghi hình",
     "Video devices": "Thiết bị ghi hình",
@@ -3041,15 +3186,16 @@
     "Hide details": "Ẩn chi tiết",
     "Last activity": "Hoạt động cuối",
     "Renaming sessions": "Đổi tên các phiên",
-    "Confirm signing out these devices|other": "Xác nhận đăng xuất khỏi các thiết bị này",
     "Call type": "Loại cuộc gọi",
     "Internal room ID": "Định danh riêng của phòng",
     "For best security, verify your sessions and sign out from any session that you don't recognize or use anymore.": "Để bảo mật nhất, hãy xác thực các phiên và đăng xuất khỏi phiên nào bạn không nhận ra hay dùng nữa.",
     "%(errorMessage)s (HTTP status %(httpStatus)s)": "%(errorMessage)s (Trạng thái HTTP %(httpStatus)s)",
     "Unknown password change error (%(stringifiedError)s)": "Lỗi không xác định khi đổi mật khẩu (%(stringifiedError)s)",
     "You did it!": "Hoàn thành rồi!",
-    "Only %(count)s steps to go|one": "Chỉ %(count)s bước nữa thôi",
-    "Only %(count)s steps to go|other": "Chỉ %(count)s bước nữa thôi",
+    "Only %(count)s steps to go": {
+        "one": "Chỉ %(count)s bước nữa thôi",
+        "other": "Chỉ %(count)s bước nữa thôi"
+    },
     "Ignore (%(counter)s)": "Ẩn (%(counter)s)",
     "Developer tools": "Công cụ phát triển",
     "Match system": "Theo hệ thống",
@@ -3165,7 +3311,10 @@
     "Unban from space": "Bỏ cấm trong space",
     "Re-enter email address": "Điền lại địa chỉ thư điện tử",
     "Decrypted source unavailable": "Nguồn được giải mã không khả dụng",
-    "Seen by %(count)s people|one": "Gửi bởi %(count)s người",
+    "Seen by %(count)s people": {
+        "one": "Gửi bởi %(count)s người",
+        "other": "Gửi bởi %(count)s người"
+    },
     "Search all rooms": "Tìm tất cả phòng",
     "Link": "Liên kết",
     "Rejecting invite…": "Từ chối lời mời…",
@@ -3175,7 +3324,10 @@
     "Event ID: %(eventId)s": "Định danh (ID) sự kiện: %(eventId)s",
     "Disinvite from room": "Không mời vào phòng nữa",
     "Your language": "Ngôn ngữ của bạn",
-    "%(count)s participants|one": "1 người tham gia",
+    "%(count)s participants": {
+        "one": "1 người tham gia",
+        "other": "%(count)s người tham gia"
+    },
     "You were removed from %(roomName)s by %(memberName)s": "Bạn đã bị loại khỏi %(roomName)s bởi %(memberName)s",
     "Voice Message": "Tin nhắn thoại",
     "Show formatting": "Hiện định dạng",
@@ -3223,10 +3375,8 @@
     "Did not receive it?": "Không nhận được nó?",
     "Remove from room": "Loại bỏ khỏi phòng",
     "You can't see earlier messages": "Bạn khồng thể thấy các tin nhắn trước",
-    "%(count)s participants|other": "%(count)s người tham gia",
     "Send your first message to invite <displayName/> to chat": "Gửi tin nhắn đầu tiên để mời <displayName/> vào cuộc trò chuyện",
     "%(members)s and %(last)s": "%(members)s và %(last)s",
-    "Seen by %(count)s people|other": "Gửi bởi %(count)s người",
     "Private room": "Phòng riêng tư",
     "Join the room to participate": "Tham gia phòng để tương tác",
     "Underline": "Gạch chân",
@@ -3248,8 +3398,10 @@
     "This session is ready for secure messaging.": "Phiên này sẵn sàng nhắn tin bảo mật.",
     "Verify your sessions for enhanced secure messaging or sign out from those you don't recognize or use anymore.": "Xác thực phiên để nhắn tin bảo mật tốt hơn hoặc đăng xuất khỏi các phiên mà bạn không nhận ra hay không dùng nữa.",
     "No verified sessions found.": "Không thấy phiên được xác thực nào.",
-    "%(count)s sessions selected|other": "%(count)s phiên đã chọn",
-    "%(count)s sessions selected|one": "%(count)s phiên đã chọn",
+    "%(count)s sessions selected": {
+        "other": "%(count)s phiên đã chọn",
+        "one": "%(count)s phiên đã chọn"
+    },
     "Verified session": "Phiên đã xác thực",
     "Web session": "Phiên trên trình duyệt",
     "No sessions found.": "Không thấy phiên nào.",
@@ -3280,8 +3432,10 @@
     "Improve your account security by following these recommendations.": "Tăng cường bảo mật cho tài khoản bằng cách làm theo các đề xuất này.",
     "You made it!": "Bạn làm rồi!",
     "Ready for secure messaging": "Sẵn sàng nhắn tin bảo mật",
-    "Sign out of %(count)s sessions|other": "Đăng xuất khỏi %(count)s phiên",
-    "Sign out of %(count)s sessions|one": "Đăng xuất khỏi %(count)s phiên",
+    "Sign out of %(count)s sessions": {
+        "other": "Đăng xuất khỏi %(count)s phiên",
+        "one": "Đăng xuất khỏi %(count)s phiên"
+    },
     "You don't have permission to view messages from before you joined.": "Bạn không có quyền xem tin nhắn trước lúc bạn tham gia.",
     "Encrypted messages before this point are unavailable.": "Các tin nhắn được mã hóa trước thời điểm này không có sẵn.",
     "Video call (%(brand)s)": "Cuộc gọi truyền hình (%(brand)s)",
@@ -3292,7 +3446,10 @@
     "Loading preview": "Đang tải xem trước",
     "Find your co-workers": "Tìm các đồng nghiệp của bạn",
     "This room or space is not accessible at this time.": "Phòng hoặc space này không thể truy cập được bây giờ.",
-    "Currently removing messages in %(count)s rooms|one": "Hiện đang xóa tin nhắn ở %(count)s phòng",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "Hiện đang xóa tin nhắn ở %(count)s phòng",
+        "other": "Hiện đang xóa tin nhắn ở %(count)s phòng"
+    },
     "Joining space…": "Đang tham gia space…",
     "Joining room…": "Đang tham gia phòng…",
     "Find and invite your co-workers": "Tìm và mời các đồng nghiệp của bạn",
@@ -3300,7 +3457,6 @@
     "You do not have permission to start voice calls": "Bạn không có quyền để bắt đầu cuộc gọi",
     "View chat timeline": "Xem dòng tin nhắn",
     "There's no preview, would you like to join?": "Không xem trước được, bạn có muốn tham gia?",
-    "Currently removing messages in %(count)s rooms|other": "Hiện đang xóa tin nhắn ở %(count)s phòng",
     "Disinvite from space": "Hủy lời mời vào space",
     "You can still join here.": "Bạn vẫn có thể tham gia.",
     "Verify or sign out from this session for best security and reliability.": "Xác thực hoặc đăng xuất khỏi các phiên này để bảo mật và đáng tin cậy nhất.",
@@ -3350,9 +3506,11 @@
     "Input devices": "Thiết bị đầu vào",
     "Output devices": "Thiết bị đầu ra",
     "Mark as read": "Đánh dấu đã đọc",
-    "%(count)s Members|one": "%(count)s thành viên",
+    "%(count)s Members": {
+        "one": "%(count)s thành viên",
+        "other": "%(count)s thành viên"
+    },
     "Manually verify by text": "Xác thực thủ công bằng văn bản",
-    "%(count)s Members|other": "%(count)s thành viên",
     "Show rooms": "Hiện phòng",
     "Upload custom sound": "Tải lên âm thanh tùy chỉnh",
     "Room is <strong>encrypted ✅</strong>": "Phòng <strong>được mã hóa ✅</strong>",
@@ -3416,10 +3574,22 @@
     "Download on the App Store": "Tải trên App Store",
     "Your device ID": "Định danh thiết bị của bạn",
     "Un-maximise": "Hủy thu nhỏ",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sthay đổi <a>tin nhắn đã ghim</a> cho phòng",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sthay đổi <a>tin nhắn đã ghim</a> cho phòng %(count)s lần",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sxóa %(count)s tin nhắn",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sgửi %(count)s tin nhắn ẩn",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)sthay đổi <a>tin nhắn đã ghim</a> cho phòng",
+        "other": "%(severalUsers)sthay đổi <a>tin nhắn đã ghim</a> cho phòng %(count)s lần"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "other": "%(oneUser)sthay đổi <a>tin nhắn đã ghim</a> cho phòng %(count)s lần",
+        "one": "%(oneUser)sthay đổi <a>tin nhắn đã ghim</a> cho phòng"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "other": "%(oneUser)sxóa %(count)s tin nhắn",
+        "one": "%(oneUser)sxóa một tin nhắn"
+    },
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "other": "%(oneUser)sgửi %(count)s tin nhắn ẩn",
+        "one": "%(oneUser)sgửi một tin nhắn ẩn"
+    },
     "This address does not point at this room": "Địa chỉ này không trỏ đến phòng này",
     "Edit topic": "Sửa chủ đề",
     "Choose a locale": "Chọn vùng miền",
@@ -3431,8 +3601,6 @@
     "Message pending moderation": "Tin nhắn chờ duyệt",
     "Message in %(room)s": "Tin nhắn trong %(room)s",
     "Explore room account data": "Xem thông tin tài khoản trong phòng",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sxóa một tin nhắn",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sgửi một tin nhắn ẩn",
     "Message from %(user)s": "Tin nhắn từ %(user)s",
     "Get it on F-Droid": "Tải trên F-Droid",
     "Help": "Hỗ trợ",
@@ -3441,23 +3609,30 @@
     "Show: Matrix rooms": "Hiện: Phòng Matrix",
     "Notifications debug": "Gỡ lỗi thông báo",
     "Minimise": "Thu nhỏ",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sthay đổi <a>tin nhắn đã ghim</a> cho phòng",
     "Friends and family": "Bạn bè và gia đình",
     "Adding…": "Đang thêm…",
     "No one will be able to reuse your username (MXID), including you: this username will remain unavailable": "Không ai có thể dùng lại tên người dùng của bạn (MXID), kể cả bạn: tên người dùng này sẽ trở thành không có sẵn",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sgửi một tin nhắn ẩn",
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)sgửi một tin nhắn ẩn",
+        "other": "%(severalUsers)sgửi %(count)s tin nhắn ẩn"
+    },
     "<w>WARNING:</w> <description/>": "",
     "Shared their location: ": "",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sxóa một tin nhắn",
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)sxóa một tin nhắn",
+        "other": "%(severalUsers)sxóa %(count)s tin nhắn"
+    },
     "Settings explorer": "Xem cài đặt",
     "Error downloading image": "Lỗi khi tải hình ảnh",
     "Unable to show image due to error": "Không thể hiển thị hình ảnh do lỗi",
     "Create room": "Tạo phòng",
     "To continue, please enter your account password:": "Để tiếp tục, vui lòng nhập mật khẩu tài khoản của bạn:",
-    "were removed %(count)s times|one": "",
+    "were removed %(count)s times": {
+        "one": "",
+        "other": ""
+    },
     "Closed poll": "Bỏ phiếu kín",
     "Explore account data": "Xem thông tin tài khoản",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sthay đổi <a>tin nhắn đã ghim</a> cho phòng %(count)s lần",
     "Edit poll": "Chỉnh sửa bỏ phiếu",
     "Explore room state": "Xem trạng thái phòng",
     "View servers in room": "Xem các máy chủ trong phòng",
@@ -3465,9 +3640,6 @@
     "Create a video room": "Tạo một phòng truyền hình",
     "Image view": "Xem ảnh",
     "Get it on Google Play": "Tải trên CH Play",
-    "were removed %(count)s times|other": "",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sxóa %(count)s tin nhắn",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sgửi %(count)s tin nhắn ẩn",
     "Create video room": "Tạo phòng truyền hình",
     "People cannot join unless access is granted.": "Người khác không thể tham gia khi chưa có phép.",
     "Something went wrong.": "Đã xảy ra lỗi.",
diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json
index de3076d5b0..af2a4c87f7 100644
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -125,15 +125,19 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd gewist deur %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget verwyderd gewist deur %(senderName)s",
     "%(displayName)s is typing …": "%(displayName)s es an ’t typn…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s en %(count)s anderen zyn an ’t typn…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s en nog etwien zyn an ’t typn…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s en %(count)s anderen zyn an ’t typn…",
+        "one": "%(names)s en nog etwien zyn an ’t typn…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s en %(lastPerson)s zyn an ’t typn…",
     "No homeserver URL provided": "Geen thuusserver-URL ingegeevn",
     "Unexpected error resolving homeserver configuration": "Ounverwachte foute by ’t controleern van de thuusserverconfiguroasje",
     "This homeserver has hit its Monthly Active User limit.": "Dezen thuusserver èt z’n limiet vo moandeliks actieve gebruukers bereikt.",
     "This homeserver has exceeded one of its resource limits.": "Dezen thuusserver èt één van z’n systeembronlimietn overschreedn.",
-    "%(items)s and %(count)s others|other": "%(items)s en %(count)s andere",
-    "%(items)s and %(count)s others|one": "%(items)s en één ander",
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s en %(count)s andere",
+        "one": "%(items)s en één ander"
+    },
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
     "Your browser does not support the required cryptography extensions": "Je browser oundersteunt de benodigde cryptografie-extensies nie",
     "Not a valid %(brand)s keyfile": "Geen geldig %(brand)s-sleuterbestand",
@@ -440,8 +444,10 @@
     "Mute": "Dempn",
     "Admin Tools": "Beheerdersgereedschap",
     "Close": "Sluutn",
-    "and %(count)s others...|other": "en %(count)s anderen…",
-    "and %(count)s others...|one": "en één andere…",
+    "and %(count)s others...": {
+        "other": "en %(count)s anderen…",
+        "one": "en één andere…"
+    },
     "Invite to this room": "Uutnodign in dit gesprek",
     "Invited": "Uutgenodigd",
     "Filter room members": "Gespreksleedn filtern",
@@ -471,8 +477,10 @@
     "Unknown": "Ounbekend",
     "Replying": "An ’t beantwoordn",
     "Unnamed room": "Noamloos gesprek",
-    "(~%(count)s results)|other": "(~%(count)s resultoatn)",
-    "(~%(count)s results)|one": "(~%(count)s resultoat)",
+    "(~%(count)s results)": {
+        "other": "(~%(count)s resultoatn)",
+        "one": "(~%(count)s resultoat)"
+    },
     "Join Room": "Gesprek toetreedn",
     "Settings": "Instelliengn",
     "Forget room": "Gesprek vergeetn",
@@ -580,46 +588,86 @@
     "Rotate Left": "Links droain",
     "Rotate Right": "Rechts droain",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s zyn %(count)s kis toegetreedn",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s zyn toegetreedn",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s es %(count)s kis toegetreedn",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s es toegetreedn",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s es %(count)s kis deuregegoan",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s es deuregegoan",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s es %(count)s kis deuregegoan",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s es deuregegoan",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s zyn %(count)s kis toegetreedn en deuregegoan",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s zyn toegetreedn en deuregegoan",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s es %(count)s kis toegetreedn en deuregegoan",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s es toegetreedn en deuregegoan",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s zyn %(count)s kis deuregegoan en were toegetreedn",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s zyn deuregegoan en were toegetreedn",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s es %(count)s kis deuregegoan en were toegetreedn",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s es deuregegoan en were toegetreedn",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s èn hunder uutnodigiengn %(count)s kis afgeweezn",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s èn hunder uutnodigiengn afgeweezn",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s è zyn/heur uutnodigienge %(count)s kis afgeweezn",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s è zyn/heur uutnodigienge afgeweezn",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "D’uutnodigiengn van %(severalUsers)s zyn %(count)s kis ingetrokkn gewist",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "D’uutnodigiengn van %(severalUsers)s zyn ingetrokkn gewist",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "D’uutnodigienge van %(oneUser)s es %(count)s kis ingetrokkn gewist",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "D’uutnodigienge van %(oneUser)s es ingetrokkn gewist",
-    "were invited %(count)s times|other": "zyn %(count)s kis uutgenodigd gewist",
-    "were invited %(count)s times|one": "zyn uutgenodigd gewist",
-    "was invited %(count)s times|other": "es %(count)s kis uutgenodigd gewist",
-    "was invited %(count)s times|one": "es uutgenodigd gewist",
-    "were banned %(count)s times|other": "zyn %(count)s kis verbann gewist",
-    "were banned %(count)s times|one": "zyn verbann gewist",
-    "was banned %(count)s times|other": "es %(count)s kis verbann gewist",
-    "was banned %(count)s times|one": "es verbann gewist",
-    "were unbanned %(count)s times|other": "zyn %(count)s kis ountbann gewist",
-    "were unbanned %(count)s times|one": "zyn ountbann gewist",
-    "was unbanned %(count)s times|other": "es %(count)s kis ountbann gewist",
-    "was unbanned %(count)s times|one": "es ountbann gewist",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s èn hunder noame %(count)s kis gewyzigd",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s èn hunder noame gewyzigd",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s è zyn/heur noame %(count)s kis gewyzigd",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s è zyn/heur noame gewyzigd",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s zyn %(count)s kis toegetreedn",
+        "one": "%(severalUsers)s zyn toegetreedn"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s es %(count)s kis toegetreedn",
+        "one": "%(oneUser)s es toegetreedn"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s es %(count)s kis deuregegoan",
+        "one": "%(severalUsers)s es deuregegoan"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s es %(count)s kis deuregegoan",
+        "one": "%(oneUser)s es deuregegoan"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s zyn %(count)s kis toegetreedn en deuregegoan",
+        "one": "%(severalUsers)s zyn toegetreedn en deuregegoan"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s es %(count)s kis toegetreedn en deuregegoan",
+        "one": "%(oneUser)s es toegetreedn en deuregegoan"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s zyn %(count)s kis deuregegoan en were toegetreedn",
+        "one": "%(severalUsers)s zyn deuregegoan en were toegetreedn"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s es %(count)s kis deuregegoan en were toegetreedn",
+        "one": "%(oneUser)s es deuregegoan en were toegetreedn"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s èn hunder uutnodigiengn %(count)s kis afgeweezn",
+        "one": "%(severalUsers)s èn hunder uutnodigiengn afgeweezn"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s è zyn/heur uutnodigienge %(count)s kis afgeweezn",
+        "one": "%(oneUser)s è zyn/heur uutnodigienge afgeweezn"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "D’uutnodigiengn van %(severalUsers)s zyn %(count)s kis ingetrokkn gewist",
+        "one": "D’uutnodigiengn van %(severalUsers)s zyn ingetrokkn gewist"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "D’uutnodigienge van %(oneUser)s es %(count)s kis ingetrokkn gewist",
+        "one": "D’uutnodigienge van %(oneUser)s es ingetrokkn gewist"
+    },
+    "were invited %(count)s times": {
+        "other": "zyn %(count)s kis uutgenodigd gewist",
+        "one": "zyn uutgenodigd gewist"
+    },
+    "was invited %(count)s times": {
+        "other": "es %(count)s kis uutgenodigd gewist",
+        "one": "es uutgenodigd gewist"
+    },
+    "were banned %(count)s times": {
+        "other": "zyn %(count)s kis verbann gewist",
+        "one": "zyn verbann gewist"
+    },
+    "was banned %(count)s times": {
+        "other": "es %(count)s kis verbann gewist",
+        "one": "es verbann gewist"
+    },
+    "were unbanned %(count)s times": {
+        "other": "zyn %(count)s kis ountbann gewist",
+        "one": "zyn ountbann gewist"
+    },
+    "was unbanned %(count)s times": {
+        "other": "es %(count)s kis ountbann gewist",
+        "one": "es ountbann gewist"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s èn hunder noame %(count)s kis gewyzigd",
+        "one": "%(severalUsers)s èn hunder noame gewyzigd"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s è zyn/heur noame %(count)s kis gewyzigd",
+        "one": "%(oneUser)s è zyn/heur noame gewyzigd"
+    },
     "collapse": "toeklappn",
     "expand": "uutklappn",
     "Edit message": "Bericht bewerkn",
@@ -627,7 +675,9 @@
     "Custom level": "Angepast niveau",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kostege de gebeurtenisse woarip da der gereageerd gewist was nie loadn. Allichte bestoa ze nie, of è je geen toeloatienge vo ze te bekykn.",
     "<a>In reply to</a> <pill>": "<a>As antwoord ip</a> <pill>",
-    "And %(count)s more...|other": "En %(count)s meer…",
+    "And %(count)s more...": {
+        "other": "En %(count)s meer…"
+    },
     "The following users may not exist": "De volgende gebruukers bestoan meugliks nie",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Kostege geen profieln vo de Matrix-ID’s hieroundern viendn - wil je ze algelyk uutnodign?",
     "Invite anyway and never warn me again": "Algelyk uutnodign en myn nooit nie mi woarschuwn",
@@ -711,8 +761,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Dit bestand is <b>te groot</b> vo te kunn iploadn. De bestandsgroottelimiet is %(limit)s, ma dit bestand is %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Deze bestandn zyn <b>te groot</b> vo te kunn iploadn. De bestandsgroottelimiet is %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Sommige bestandn zyn <b>te groot</b> vo te kunn iploadn. De bestandsgroottelimiet is %(limit)s.",
-    "Upload %(count)s other files|other": "%(count)s overige bestandn iploadn",
-    "Upload %(count)s other files|one": "%(count)s overig bestand iploadn",
+    "Upload %(count)s other files": {
+        "other": "%(count)s overige bestandn iploadn",
+        "one": "%(count)s overig bestand iploadn"
+    },
     "Cancel All": "Alles annuleern",
     "Upload Error": "Iploadfout",
     "Remember my selection for this widget": "Onthoudt myn keuze vo deze widget",
@@ -799,15 +851,19 @@
     "No more results": "Geen resultoatn nie mi",
     "Room": "Gesprek",
     "Failed to reject invite": "Weigern van d’uutnodigienge is mislukt",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "J’èt %(count)s oungeleezn meldiengn in e voorgoande versie van dit gesprek.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "J’èt %(count)s oungeleezn meldieng in e voorgoande versie van dit gesprek.",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "J’èt %(count)s oungeleezn meldiengn in e voorgoande versie van dit gesprek.",
+        "one": "J’èt %(count)s oungeleezn meldieng in e voorgoande versie van dit gesprek."
+    },
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "J’è geprobeerd van e gegeven punt in de tydslyn van dit gesprek te loadn, moa j’è geen toeloatienge vo ’t desbetreffend bericht te zien.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd voor e gegeven punt in de tydslyn van dit gesprek te loadn, moar kostege dit nie viendn.",
     "Failed to load timeline position": "Loadn van tydslynpositie is mislukt",
     "Guest": "Gast",
-    "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere wordn ipgeloadn",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "%(filename)s en %(count)s andere wordn ipgeloadn",
+        "one": "%(filename)s en %(count)s ander wordn ipgeloadn"
+    },
     "Uploading %(filename)s": "%(filename)s wordt ipgeloadn",
-    "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander wordn ipgeloadn",
     "Could not load user profile": "Kostege ’t gebruukersprofiel nie loadn",
     "The email address linked to your account must be entered.": "’t E-mailadresse da me joun account verboundn is moet ingegeevn wordn.",
     "A new password must be entered.": "’t Moet e nieuw paswoord ingegeevn wordn.",
@@ -895,10 +951,14 @@
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Je nieuwen account (%(newAccountId)s) is geregistreerd, mo je zyt al angemeld met een anderen account (%(loggedInUserId)s).",
     "Continue with previous account": "Verdergoan me de vorigen account",
     "Show all": "Alles toogn",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s èn %(count)s kis nietent gewyzigd",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s èn nietent gewyzigd",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s èt %(count)s kis nietent gewyzigd",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s è nietent gewyzigd",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s èn %(count)s kis nietent gewyzigd",
+        "one": "%(severalUsers)s èn nietent gewyzigd"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s èt %(count)s kis nietent gewyzigd",
+        "one": "%(oneUser)s è nietent gewyzigd"
+    },
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Vertelt uus wuk dat der verkeerd is geloopn, of nog beter, makt e foutmeldienge an ip GitHub woarin da je 't probleem beschryft.",
     "Removing…": "Bezig me te verwydern…",
     "Clear all data": "Alle gegeevns wissn",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 3aeb4b69b4..ba712f9774 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -84,8 +84,10 @@
     "Camera": "摄像头",
     "Authentication": "认证",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
-    "and %(count)s others...|other": "和其他%(count)s个人……",
-    "and %(count)s others...|one": "和其它一个...",
+    "and %(count)s others...": {
+        "other": "和其他%(count)s个人……",
+        "one": "和其它一个..."
+    },
     "Anyone": "任何人",
     "Are you sure?": "你确定吗？",
     "Are you sure you want to leave the room '%(roomName)s'?": "你确定要离开房间 “%(roomName)s” 吗？",
@@ -236,8 +238,10 @@
     "Copied!": "已复制！",
     "Failed to copy": "复制失败",
     "Sent messages will be stored until your connection has returned.": "已发送的消息会被保存直到你的连接回来。",
-    "(~%(count)s results)|one": "（~%(count)s 个结果）",
-    "(~%(count)s results)|other": "（~%(count)s 个结果）",
+    "(~%(count)s results)": {
+        "one": "（~%(count)s 个结果）",
+        "other": "（~%(count)s 个结果）"
+    },
     "Start automatically after system login": "开机自启",
     "Analytics": "统计分析服务",
     "Reject all %(invitedRooms)s invites": "拒绝所有 %(invitedRooms)s 的邀请",
@@ -289,24 +293,42 @@
     "Unnamed room": "未命名的房间",
     "A text message has been sent to %(msisdn)s": "一封短信已发送到 %(msisdn)s",
     "Delete Widget": "删除挂件",
-    "were invited %(count)s times|other": "被邀请 %(count)s 次",
-    "were invited %(count)s times|one": "被邀请",
-    "was invited %(count)s times|other": "被邀请 %(count)s 次",
-    "was invited %(count)s times|one": "被邀请",
-    "were banned %(count)s times|other": "被封禁 %(count)s 次",
-    "were banned %(count)s times|one": "被封禁",
-    "was banned %(count)s times|other": "被封禁 %(count)s 次",
-    "was banned %(count)s times|one": "被封禁",
-    "were unbanned %(count)s times|other": "被解封 %(count)s 次",
-    "were unbanned %(count)s times|one": "被解封",
-    "was unbanned %(count)s times|other": "被解封 %(count)s 次",
-    "was unbanned %(count)s times|one": "被解封",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s 修改了他们的名称 %(count)s 次",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s 修改了他们的名称",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s 修改了自己的名称 %(count)s 次",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s 修改了自己的名称",
-    "%(items)s and %(count)s others|other": "%(items)s 和其他 %(count)s 人",
-    "%(items)s and %(count)s others|one": "%(items)s 与另一个人",
+    "were invited %(count)s times": {
+        "other": "被邀请 %(count)s 次",
+        "one": "被邀请"
+    },
+    "was invited %(count)s times": {
+        "other": "被邀请 %(count)s 次",
+        "one": "被邀请"
+    },
+    "were banned %(count)s times": {
+        "other": "被封禁 %(count)s 次",
+        "one": "被封禁"
+    },
+    "was banned %(count)s times": {
+        "other": "被封禁 %(count)s 次",
+        "one": "被封禁"
+    },
+    "were unbanned %(count)s times": {
+        "other": "被解封 %(count)s 次",
+        "one": "被解封"
+    },
+    "was unbanned %(count)s times": {
+        "other": "被解封 %(count)s 次",
+        "one": "被解封"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s 修改了他们的名称 %(count)s 次",
+        "one": "%(severalUsers)s 修改了他们的名称"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s 修改了自己的名称 %(count)s 次",
+        "one": "%(oneUser)s 修改了自己的名称"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s 和其他 %(count)s 人",
+        "one": "%(items)s 与另一个人"
+    },
     "collapse": "折叠",
     "expand": "展开",
     "Leave": "离开",
@@ -345,30 +367,54 @@
     "Unknown for %(duration)s": "未知状态已持续 %(duration)s",
     "Code": "代码",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s 已加入 %(count)s 次",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s 已加入",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s 已加入 %(count)s 次",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s 已加入",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s 已离开 %(count)s 次",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s 已离开",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s 已离开 %(count)s 次",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s 已离开",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s加入并离开了%(count)s次",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s加入并离开了",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s加入并离开了%(count)s次",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s加入并离开了",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s离开并重新加入了%(count)s次",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s离开并重新加入了",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s离开并重新加入了%(count)s次",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s离开并重新加入了",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s 拒绝了他们的邀请",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s 拒绝了他们的邀请共 %(count)s 次",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s 拒绝了他们的邀请共 %(count)s 次",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s 拒绝了他们的邀请",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s 撤回了他们的邀请共 %(count)s 次",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s 撤回了他们的邀请",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s 撤回了他们的邀请共 %(count)s 次",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s 撤回了他们的邀请",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s 已加入 %(count)s 次",
+        "one": "%(severalUsers)s 已加入"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s 已加入 %(count)s 次",
+        "one": "%(oneUser)s 已加入"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s 已离开 %(count)s 次",
+        "one": "%(severalUsers)s 已离开"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s 已离开 %(count)s 次",
+        "one": "%(oneUser)s 已离开"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s加入并离开了%(count)s次",
+        "one": "%(severalUsers)s加入并离开了"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s加入并离开了%(count)s次",
+        "one": "%(oneUser)s加入并离开了"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s离开并重新加入了%(count)s次",
+        "one": "%(severalUsers)s离开并重新加入了"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s离开并重新加入了%(count)s次",
+        "one": "%(oneUser)s离开并重新加入了"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "one": "%(severalUsers)s 拒绝了他们的邀请",
+        "other": "%(severalUsers)s 拒绝了他们的邀请共 %(count)s 次"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s 拒绝了他们的邀请共 %(count)s 次",
+        "one": "%(oneUser)s 拒绝了他们的邀请"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s 撤回了他们的邀请共 %(count)s 次",
+        "one": "%(severalUsers)s 撤回了他们的邀请"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s 撤回了他们的邀请共 %(count)s 次",
+        "one": "%(oneUser)s 撤回了他们的邀请"
+    },
     "<a>In reply to</a> <pill>": "<a>答复</a> <pill>",
     "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "如果你之前使用过较新版本的 %(brand)s，则你的会话可能与当前版本不兼容。请关闭此窗口并使用最新版本。",
     "URL previews are enabled by default for participants in this room.": "已对此房间的参与者默认启用URL预览。",
@@ -377,9 +423,11 @@
     "Please enter the code it contains:": "请输入其包含的代码：",
     "Old cryptography data detected": "检测到旧的加密数据",
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "已检测到旧版%(brand)s的数据，这将导致端到端加密在旧版本中发生故障。在此版本中，使用旧版本交换的端到端加密消息可能无法解密。这也可能导致与此版本交换的消息失败。如果你遇到问题，请登出并重新登录。要保留历史消息，请先导出并在重新登录后导入你的密钥。",
-    "Uploading %(filename)s and %(count)s others|other": "正在上传 %(filename)s 与其他 %(count)s 个文件",
+    "Uploading %(filename)s and %(count)s others": {
+        "other": "正在上传 %(filename)s 与其他 %(count)s 个文件",
+        "one": "正在上传 %(filename)s 与其他 %(count)s 个文件"
+    },
     "Uploading %(filename)s": "正在上传 %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "正在上传 %(filename)s 与其他 %(count)s 个文件",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "请注意，你正在登录 %(hs)s，而非 matrix.org。",
     "Opens the Developer Tools dialog": "打开开发者工具窗口",
     "Notify the whole room": "通知房间全体成员",
@@ -451,7 +499,9 @@
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "你将被带到一个第三方网站以便验证你的账户来使用 %(integrationsUrl)s 提供的集成。你希望继续吗？",
     "Popout widget": "在弹出式窗口中打开挂件",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "无法加载被回复的事件，它可能不存在，也可能是你没有权限查看它。",
-    "And %(count)s more...|other": "和 %(count)s 个其他…",
+    "And %(count)s more...": {
+        "other": "和 %(count)s 个其他…"
+    },
     "Send analytics data": "发送统计数据",
     "Enable widget screenshots on supported widgets": "对支持的挂件启用挂件截图",
     "Demote yourself?": "是否降低你自己的权限？",
@@ -547,8 +597,10 @@
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s 将此房间改为仅限邀请。",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s 将加入规则改为 %(rule)s",
     "%(displayName)s is typing …": "%(displayName)s 正在输入…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s 与其他 %(count)s 位正在输入…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s 与另一位正在输入…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s 与其他 %(count)s 位正在输入…",
+        "one": "%(names)s 与另一位正在输入…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s和%(lastPerson)s正在输入……",
     "Unrecognised address": "无法识别地址",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "可预见的替换如将 '@' 替换为 'a' 并不会有太大效果",
@@ -798,8 +850,10 @@
     "Revoke invite": "撤销邀请",
     "Invited by %(sender)s": "被 %(sender)s 邀请",
     "Remember my selection for this widget": "记住我对此挂件的选择",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "你在此房间的先前版本中有 %(count)s 条未读通知。",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "你在此房间的先前版本中有 %(count)s 条未读通知。",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "你在此房间的先前版本中有 %(count)s 条未读通知。",
+        "one": "你在此房间的先前版本中有 %(count)s 条未读通知。"
+    },
     "Add Email Address": "添加邮箱",
     "Add Phone Number": "添加电话号码",
     "Call failed due to misconfigured server": "服务器配置错误导致通话失败",
@@ -856,10 +910,14 @@
     "Opens chat with the given user": "与指定用户发起聊天",
     "Sends a message to the given user": "向指定用户发消息",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s 将房间名称从 %(oldRoomName)s 改为 %(newRoomName)s。",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 为此房间添加备用地址 %(addresses)s。",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 为此房间添加了备用地址 %(addresses)s。",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 为此房间移除了备用地址 %(addresses)s。",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 为此房间移除了备用地址 %(addresses)s。",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s 为此房间添加备用地址 %(addresses)s。",
+        "one": "%(senderName)s 为此房间添加了备用地址 %(addresses)s。"
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s 为此房间移除了备用地址 %(addresses)s。",
+        "one": "%(senderName)s 为此房间移除了备用地址 %(addresses)s。"
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s 更改了此房间的备用地址。",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s 更改了此房间的主要地址与备用地址。",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s 更改了此房间的地址。",
@@ -1167,16 +1225,22 @@
     "Jump to first unread room.": "跳转至第一个未读房间。",
     "Jump to first invite.": "跳转至第一个邀请。",
     "Add room": "添加房间",
-    "Show %(count)s more|other": "多显示 %(count)s 个",
-    "Show %(count)s more|one": "多显示 %(count)s 个",
+    "Show %(count)s more": {
+        "other": "多显示 %(count)s 个",
+        "one": "多显示 %(count)s 个"
+    },
     "Notification options": "通知选项",
     "Forget Room": "忘记房间",
     "Favourited": "已收藏",
     "Room options": "房间选项",
-    "%(count)s unread messages including mentions.|other": "包括提及在内有 %(count)s 个未读消息。",
-    "%(count)s unread messages including mentions.|one": "1 个未读提及。",
-    "%(count)s unread messages.|other": "%(count)s 个未读消息。",
-    "%(count)s unread messages.|one": "1 个未读消息。",
+    "%(count)s unread messages including mentions.": {
+        "other": "包括提及在内有 %(count)s 个未读消息。",
+        "one": "1 个未读提及。"
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s 个未读消息。",
+        "one": "1 个未读消息。"
+    },
     "Unread messages.": "未读消息。",
     "This room is public": "此房间为公共的",
     "Away": "离开",
@@ -1215,18 +1279,24 @@
     "Your homeserver": "你的家服务器",
     "Trusted": "受信任的",
     "Not trusted": "不受信任的",
-    "%(count)s verified sessions|other": "%(count)s 个已验证的会话",
-    "%(count)s verified sessions|one": "1 个已验证的会话",
+    "%(count)s verified sessions": {
+        "other": "%(count)s 个已验证的会话",
+        "one": "1 个已验证的会话"
+    },
     "Hide verified sessions": "隐藏已验证的会话",
-    "%(count)s sessions|other": "%(count)s 个会话",
-    "%(count)s sessions|one": "%(count)s 个会话",
+    "%(count)s sessions": {
+        "other": "%(count)s 个会话",
+        "one": "%(count)s 个会话"
+    },
     "Hide sessions": "隐藏会话",
     "No recent messages by %(user)s found": "没有找到 %(user)s 最近发送的消息",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "请尝试在时间线中向上滚动以查看是否有更早的。",
     "Remove recent messages by %(user)s": "删除 %(user)s 最近发送的消息",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "对于大量消息，可能会消耗一段时间。在此期间请不要刷新你的客户端。",
-    "Remove %(count)s messages|other": "删除 %(count)s 条消息",
-    "Remove %(count)s messages|one": "删除 1 条消息",
+    "Remove %(count)s messages": {
+        "other": "删除 %(count)s 条消息",
+        "one": "删除 1 条消息"
+    },
     "Remove recent messages": "移除最近消息",
     "Deactivate user?": "停用用户吗？",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "停用此用户将会使其登出并阻止其再次登入。而且此用户也会离开其所在的所有房间。此操作不可逆。你确定要停用此用户吗？",
@@ -1427,8 +1497,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "此文件<b>过大</b>而不能上传。文件大小限制是 %(limit)s 但此文件为 %(sizeOfThisFile)s。",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "这些文件<b>过大</b>而不能上传。文件大小限制为 %(limit)s。",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "一些文件<b>过大</b>而不能上传。文件大小限制为 %(limit)s。",
-    "Upload %(count)s other files|other": "上传 %(count)s 个别的文件",
-    "Upload %(count)s other files|one": "上传 %(count)s 个别的文件",
+    "Upload %(count)s other files": {
+        "other": "上传 %(count)s 个别的文件",
+        "one": "上传 %(count)s 个别的文件"
+    },
     "Cancel All": "全部取消",
     "Upload Error": "上传错误",
     "Verification Request": "验证请求",
@@ -1575,10 +1647,14 @@
     "Explore public rooms": "探索公共房间",
     "You can only join it with a working invite.": "你只能通过有效邀请加入。",
     "Language Dropdown": "语言下拉菜单",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s 未做更改 %(count)s 次",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s 未做更改",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s 未做更改 %(count)s 次",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s 未做更改",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s 未做更改 %(count)s 次",
+        "one": "%(severalUsers)s 未做更改"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s 未做更改 %(count)s 次",
+        "one": "%(oneUser)s 未做更改"
+    },
     "Preparing to download logs": "正在准备下载日志",
     "Download logs": "下载日志",
     "%(brand)s encountered an error during upload of:": "%(brand)s 在上传此文件时出错：",
@@ -1744,8 +1820,10 @@
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s 或 %(usernamePassword)s",
     "Room name": "房间名称",
     "Random": "随机",
-    "%(count)s members|one": "%(count)s 位成员",
-    "%(count)s members|other": "%(count)s 位成员",
+    "%(count)s members": {
+        "one": "%(count)s 位成员",
+        "other": "%(count)s 位成员"
+    },
     "Welcome %(name)s": "欢迎 %(name)s",
     "Forgot password?": "忘记密码？",
     "Enter Security Key": "输入安全密钥",
@@ -1891,8 +1969,10 @@
     "Mark as not suggested": "标记为不建议",
     "Failed to remove some rooms. Try again later": "无法移除某些房间。请稍后再试",
     "Suggested": "建议",
-    "%(count)s rooms|one": "%(count)s 个房间",
-    "%(count)s rooms|other": "%(count)s 个房间",
+    "%(count)s rooms": {
+        "one": "%(count)s 个房间",
+        "other": "%(count)s 个房间"
+    },
     "You don't have permission": "你没有权限",
     "Enter phone number": "输入电话号码",
     "Enter email address": "输入邮箱地址",
@@ -2179,8 +2259,10 @@
     "Your platform and username will be noted to help us use your feedback as much as we can.": "我们将会记录你的平台及用户名，以帮助我们尽我们所能地使用你的反馈。",
     "Want to add a new room instead?": "想要添加一个新的房间吗？",
     "Add existing rooms": "添加现有房间",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "正在新增房间……",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "正在新增房间……（%(count)s 中的第 %(progress)s 个）",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "正在新增房间……",
+        "other": "正在新增房间……（%(count)s 中的第 %(progress)s 个）"
+    },
     "Not all selected were added": "并非所有选中的都被添加",
     "You are not allowed to view this server's rooms list": "你不被允许查看此服务器的房间列表",
     "Sends the given message with a space themed effect": "此消息带有空间主题化效果",
@@ -2189,17 +2271,23 @@
     "View message": "查看消息",
     "Zoom in": "放大",
     "Zoom out": "缩小",
-    "%(count)s people you know have already joined|one": "已有你所认识的 %(count)s 个人加入",
-    "%(count)s people you know have already joined|other": "已有你所认识的 %(count)s 个人加入",
+    "%(count)s people you know have already joined": {
+        "one": "已有你所认识的 %(count)s 个人加入",
+        "other": "已有你所认识的 %(count)s 个人加入"
+    },
     "Including %(commaSeparatedMembers)s": "包括 %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "查看 1 位成员",
-    "View all %(count)s members|other": "查看全部 %(count)s 位成员",
+    "View all %(count)s members": {
+        "one": "查看 1 位成员",
+        "other": "查看全部 %(count)s 位成员"
+    },
     "Use the <a>Desktop app</a> to search encrypted messages": "使用<a>桌面端英语</a>来搜索加密消息",
     "Use the <a>Desktop app</a> to see all encrypted files": "使用<a>桌面端应用</a>来查看所有加密文件",
     "Add reaction": "添加反应",
     "Error processing voice message": "处理语音消息时发生错误",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "当你将自己降级后，你将无法撤销此更改。如果你是此空间的最后一名拥有权限的用户，则无法重新获得权限。",
-    "You can only pin up to %(count)s widgets|other": "你仅能固定 %(count)s 个挂件",
+    "You can only pin up to %(count)s widgets": {
+        "other": "你仅能固定 %(count)s 个挂件"
+    },
     "We didn't find a microphone on your device. Please check your settings and try again.": "我们没能在你的设备上找到麦克风。请检查设置并重试。",
     "No microphone found": "未找到麦克风",
     "We were unable to access your microphone. Please check your browser settings and try again.": "我们无法访问你的麦克风。 请检查浏览器设置并重试。",
@@ -2217,8 +2305,10 @@
     "Your access token gives full access to your account. Do not share it with anyone.": "你的访问令牌可以完全访问你的账户。不要将其与任何人分享。",
     "Access Token": "访问令牌",
     "Message search initialisation failed": "消息搜索初始化失败",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "使用%(size)s存储%(rooms)s个房间的消息。在本地安全地缓存已加密的消息以使其出现在搜索结果中。",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "使用%(size)s存储%(rooms)s个房间的消息。在本地安全地缓存已加密的消息以使其出现在搜索结果中。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "使用%(size)s存储%(rooms)s个房间的消息。在本地安全地缓存已加密的消息以使其出现在搜索结果中。",
+        "other": "使用%(size)s存储%(rooms)s个房间的消息。在本地安全地缓存已加密的消息以使其出现在搜索结果中。"
+    },
     "Manage & explore rooms": "管理并探索房间",
     "Please enter a name for the space": "请输入空间名称",
     "Play": "播放",
@@ -2289,8 +2379,10 @@
     "Send stickers to your active room as you": "发送贴纸到你所活跃的房间",
     "See when people join, leave, or are invited to your active room": "查看人们何时加入、离开或被邀请到你所活跃的房间",
     "See when people join, leave, or are invited to this room": "查看人们加入、离开或被邀请到此房间的时间",
-    "Currently joining %(count)s rooms|one": "目前正在加入 %(count)s 个房间",
-    "Currently joining %(count)s rooms|other": "目前正在加入 %(count)s 个房间",
+    "Currently joining %(count)s rooms": {
+        "one": "目前正在加入 %(count)s 个房间",
+        "other": "目前正在加入 %(count)s 个房间"
+    },
     "The user you called is busy.": "你所呼叫的用户正忙。",
     "User Busy": "用户正忙",
     "Or send invite link": "或发送邀请链接",
@@ -2325,10 +2417,14 @@
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "此用户正在做出违法行为，如对他人施暴，或威胁使用暴力。\n这将报告给房间协管员，他们可能会将其报告给执法部门。",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "此用户所写的是错误内容。\n这将会报告给房间协管员。",
     "Please provide an address": "请提供地址",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s 已更改服务器访问控制列表",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s 已更改服务器访问控制列表 %(count)s 次",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s 已更改服务器访问控制列表",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s 已更改服务器的访问控制列表 %(count)s 此",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s 已更改服务器访问控制列表",
+        "other": "%(oneUser)s 已更改服务器访问控制列表 %(count)s 次"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s 已更改服务器访问控制列表",
+        "other": "%(severalUsers)s 已更改服务器的访问控制列表 %(count)s 此"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "消息搜索初始化失败，请检查<a>你的设置</a>以获取更多信息",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "设置此空间的地址，这样用户就能通过你的家服务器找到此空间（%(localDomain)s）",
     "To publish an address, it needs to be set as a local address first.": "要公布地址，首先需要将其设为本地地址。",
@@ -2487,8 +2583,10 @@
     "Call back": "回拨",
     "Call declined": "拒绝通话",
     "Stop recording": "停止录制",
-    "Show %(count)s other previews|one": "显示 %(count)s 个其他预览",
-    "Show %(count)s other previews|other": "显示 %(count)s 个其他预览",
+    "Show %(count)s other previews": {
+        "one": "显示 %(count)s 个其他预览",
+        "other": "显示 %(count)s 个其他预览"
+    },
     "Access": "访问",
     "People with supported clients will be able to join the room without having a registered account.": "拥有受支持客户端的人无需注册账户即可加入房间。",
     "Decide who can join %(roomName)s.": "决定谁可以加入 %(roomName)s。",
@@ -2496,8 +2594,14 @@
     "Anyone in a space can find and join. You can select multiple spaces.": "空间中的任何人都可以找到并加入。你可以选择多个空间。",
     "Spaces with access": "可访问的空间",
     "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "空间中的任何人都可以找到并加入。<a>在此处编辑哪些空间可以访问。</a>",
-    "Currently, %(count)s spaces have access|other": "目前，%(count)s 个空间可以访问",
-    "& %(count)s more|other": "以及另 %(count)s",
+    "Currently, %(count)s spaces have access": {
+        "other": "目前，%(count)s 个空间可以访问",
+        "one": "目前，一个空间有访问权限"
+    },
+    "& %(count)s more": {
+        "other": "以及另 %(count)s",
+        "one": "& 另外 %(count)s"
+    },
     "Upgrade required": "需要升级",
     "%(sharerName)s is presenting": "%(sharerName)s 正在展示",
     "You are presenting": "你正在展示",
@@ -2521,8 +2625,6 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s 从此房间中取消固定了<a>一条消息</a>。查看所有<b>固定消息</b>。",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s将一条消息固定到此房间。查看所有固定消息。",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s 将<a>一条消息</a>固定到此房间。查看所有<b>固定消息</b>。",
-    "Currently, %(count)s spaces have access|one": "目前，一个空间有访问权限",
-    "& %(count)s more|one": "& 另外 %(count)s",
     "Some encryption parameters have been changed.": "一些加密参数已更改。",
     "Role in <RoomName/>": "<RoomName/> 中的角色",
     "Send a sticker": "发送贴纸",
@@ -2589,10 +2691,14 @@
     "Skip verification for now": "暂时跳过验证",
     "Really reset verification keys?": "确实要重置验证密钥？",
     "Create poll": "创建投票",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "正在更新房间… （%(count)s 中的 %(progress)s）",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "正在更新空间…",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "正在发送邀请…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "正在发送邀请… （%(count)s 中的 %(progress)s）",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "other": "正在更新房间… （%(count)s 中的 %(progress)s）",
+        "one": "正在更新空间…"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "正在发送邀请…",
+        "other": "正在发送邀请… （%(count)s 中的 %(progress)s）"
+    },
     "Loading new room": "正在加载新房间",
     "Upgrading room": "正在升级房间",
     "Threads": "消息列",
@@ -2610,8 +2716,10 @@
     "Unban from %(roomName)s": "解除 %(roomName)s 禁令",
     "They'll still be able to access whatever you're not an admin of.": "他们仍然可以访问任何你不是管理员的地方。",
     "Downloading": "下载中",
-    "%(count)s reply|one": "%(count)s 条回复",
-    "%(count)s reply|other": "%(count)s 条回复",
+    "%(count)s reply": {
+        "one": "%(count)s 条回复",
+        "other": "%(count)s 条回复"
+    },
     "View in room": "在房间内查看",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "输入安全短语或<button>使用安全密钥</button>以继续。",
     "What projects are your team working on?": "你的团队正在进行什么项目?",
@@ -2629,12 +2737,18 @@
     "Rename": "重命名",
     "Select all": "全选",
     "Deselect all": "取消全选",
-    "Sign out devices|one": "注销设备",
-    "Sign out devices|other": "注销设备",
-    "Click the button below to confirm signing out these devices.|one": "单击下面的按钮以确认登出此设备。",
-    "Click the button below to confirm signing out these devices.|other": "单击下面的按钮以确认登出这些设备。",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "确认注销此设备需要使用单点登录来证明您的身份。",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "确认注销这些设备需要使用单点登录来证明你的身份。",
+    "Sign out devices": {
+        "one": "注销设备",
+        "other": "注销设备"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "单击下面的按钮以确认登出此设备。",
+        "other": "单击下面的按钮以确认登出这些设备。"
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "确认注销此设备需要使用单点登录来证明您的身份。",
+        "other": "确认注销这些设备需要使用单点登录来证明你的身份。"
+    },
     "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "将您的安全密钥存放在安全的地方，例如密码管理器或保险箱，因为它用于保护您的加密数据。",
     "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "我们将为您生成一个安全密钥，将其存储在安全的地方，例如密码管理器或保险箱。",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.": "重新获取账户访问权限并恢复存储在此会话中的加密密钥。 没有它们，您将无法在任何会话中阅读所有安全消息。",
@@ -2692,12 +2806,18 @@
     "Large": "大",
     "Image size in the timeline": "时间线中的图像大小",
     "%(senderName)s has updated the room layout": "%(senderName)s 更新了房间布局",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s 和其他 %(count)s 个空间",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s 和其他 %(count)s 个空间",
-    "Based on %(count)s votes|one": "基于 %(count)s 票",
-    "Based on %(count)s votes|other": "基于 %(count)s 票",
-    "%(count)s votes|one": "%(count)s 票",
-    "%(count)s votes|other": "%(count)s 票",
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s 和其他 %(count)s 个空间",
+        "other": "%(spaceName)s 和其他 %(count)s 个空间"
+    },
+    "Based on %(count)s votes": {
+        "one": "基于 %(count)s 票",
+        "other": "基于 %(count)s 票"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s 票",
+        "other": "%(count)s 票"
+    },
     "Sorry, the poll you tried to create was not posted.": "抱歉，您尝试创建的投票未被发布。",
     "Failed to post poll": "发布投票失败",
     "Sorry, your vote was not registered. Please try again.": "抱歉，你的投票未登记。请重试。",
@@ -2722,8 +2842,10 @@
     "Start new chat": "开始新的聊天",
     "Recently viewed": "最近查看",
     "To view all keyboard shortcuts, <a>click here</a>.": "要查看所有的键盘快捷键，<a>点击此处</a>。",
-    "%(count)s votes cast. Vote to see the results|one": "票数已达 %(count)s 票。要查看结果请亲自投票",
-    "%(count)s votes cast. Vote to see the results|other": "票数已达 %(count)s 票。要查看结果请亲自投票",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "票数已达 %(count)s 票。要查看结果请亲自投票",
+        "other": "票数已达 %(count)s 票。要查看结果请亲自投票"
+    },
     "No votes cast": "尚无投票",
     "You can turn this off anytime in settings": "您可以随时在设置中关闭此功能",
     "We <Bold>don't</Bold> share information with third parties": "我们<Bold>不会</Bold>与第三方共享信息",
@@ -2747,8 +2869,10 @@
     "Failed to end poll": "结束投票失败",
     "The poll has ended. Top answer: %(topAnswer)s": "投票已经结束。 得票最多答案：%(topAnswer)s",
     "The poll has ended. No votes were cast.": "投票已经结束。 没有投票。",
-    "Final result based on %(count)s votes|one": "基于 %(count)s 票数的最终结果",
-    "Final result based on %(count)s votes|other": "基于 %(count)s 票数的最终结果",
+    "Final result based on %(count)s votes": {
+        "one": "基于 %(count)s 票数的最终结果",
+        "other": "基于 %(count)s 票数的最终结果"
+    },
     "Link to room": "房间链接",
     "Recent searches": "最近的搜索",
     "To search messages, look for this icon at the top of a room <icon/>": "要搜索消息，请在房间顶部查找此图标<icon/>",
@@ -2760,18 +2884,26 @@
     "Including you, %(commaSeparatedMembers)s": "包括你，%(commaSeparatedMembers)s",
     "Copy room link": "复制房间链接",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "我们无法理解给定日期 (%(inputDate)s)。尝试使用如下格式 YYYY-MM-DD。",
-    "Fetched %(count)s events out of %(total)s|one": "已获取总共 %(total)s 事件中的 %(count)s 个",
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "已获取总共 %(total)s 事件中的 %(count)s 个",
+        "other": "已获取 %(total)s 事件中的 %(count)s 个"
+    },
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "将您与该空间的成员的聊天进行分组。关闭这个后你将无法在 %(spaceName)s 内看到这些聊天。",
     "Sections to show": "要显示的部分",
-    "Exported %(count)s events in %(seconds)s seconds|one": "在 %(seconds)s 秒内导出了 %(count)s 个事件",
-    "Exported %(count)s events in %(seconds)s seconds|other": "在 %(seconds)s 秒内导出了 %(count)s 个事件",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "在 %(seconds)s 秒内导出了 %(count)s 个事件",
+        "other": "在 %(seconds)s 秒内导出了 %(count)s 个事件"
+    },
     "Export successful!": "成功导出！",
-    "Fetched %(count)s events in %(seconds)ss|one": "%(seconds)s 秒内获取了 %(count)s 个事件",
-    "Fetched %(count)s events in %(seconds)ss|other": "%(seconds)s 秒内获取了 %(count)s 个事件",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "%(seconds)s 秒内获取了 %(count)s 个事件",
+        "other": "%(seconds)s 秒内获取了 %(count)s 个事件"
+    },
     "Processing event %(number)s out of %(total)s": "正在处理总共 %(total)s 事件中的事件 %(number)s",
-    "Fetched %(count)s events so far|one": "迄今获取了 %(count)s 事件",
-    "Fetched %(count)s events so far|other": "迄今获取了 %(count)s 事件",
-    "Fetched %(count)s events out of %(total)s|other": "已获取 %(total)s 事件中的 %(count)s 个",
+    "Fetched %(count)s events so far": {
+        "one": "迄今获取了 %(count)s 事件",
+        "other": "迄今获取了 %(count)s 事件"
+    },
     "Generating a ZIP": "生成 ZIP",
     "Failed to load list of rooms.": "加载房间列表失败。",
     "Open in OpenStreetMap": "在 OpenStreetMap 中打开",
@@ -2809,9 +2941,11 @@
     "User is already invited to the room": "用户已被邀请至房间",
     "User is already invited to the space": "用户已被邀请至空间",
     "You do not have permission to invite people to this space.": "你无权邀请他人加入此空间。",
-    "In %(spaceName)s and %(count)s other spaces.|one": "在 %(spaceName)s 和其他 %(count)s 个空间。",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "在 %(spaceName)s 和其他 %(count)s 个空间。",
+        "other": "在 %(spaceName)s 和其他 %(count)s 个空间。"
+    },
     "In %(spaceName)s.": "在 %(spaceName)s 空间。",
-    "In %(spaceName)s and %(count)s other spaces.|other": "在 %(spaceName)s 和其他 %(count)s 个空间。",
     "In spaces %(space1Name)s and %(space2Name)s.": "在 %(space1Name)s 和 %(space2Name)s 空间。",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s 与 %(space2Name)s",
     "Remove, ban, or invite people to your active room, and make you leave": "移除、封禁或邀请他人加入你的活跃房间，方可离开",
@@ -2840,8 +2974,10 @@
     "Pinned": "已固定",
     "Maximise": "最大化",
     "To proceed, please accept the verification request on your other device.": "要继续进行，请接受你另一设备上的验证请求。",
-    "%(count)s participants|other": "%(count)s 名参与者",
-    "%(count)s participants|one": "一名参与者",
+    "%(count)s participants": {
+        "other": "%(count)s 名参与者",
+        "one": "一名参与者"
+    },
     "Joining…": "加入中…",
     "Video": "视频",
     "Open thread": "打开消息列",
@@ -2880,8 +3016,10 @@
     "Video room": "视频房间",
     "Video rooms are a beta feature": "视频房间是beta功能",
     "Read receipts": "已读回执",
-    "Seen by %(count)s people|one": "已被%(count)s人查看",
-    "Seen by %(count)s people|other": "已被%(count)s人查看",
+    "Seen by %(count)s people": {
+        "one": "已被%(count)s人查看",
+        "other": "已被%(count)s人查看"
+    },
     "%(members)s and %(last)s": "%(members)s和%(last)s",
     "%(members)s and more": "%(members)s和更多",
     "Busy": "忙",
@@ -2916,8 +3054,10 @@
     "Deactivating your account is a permanent action — be careful!": "停用你的账户是永久性动作——小心！",
     "Your password was successfully changed.": "你的密码已成功更改。",
     "IRC (Experimental)": "IRC（实验性）",
-    "Confirm signing out these devices|one": "确认登出此设备",
-    "Confirm signing out these devices|other": "确认登出这些设备",
+    "Confirm signing out these devices": {
+        "one": "确认登出此设备",
+        "other": "确认登出这些设备"
+    },
     "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "空间是将房间和人分组的一种新方式。你想创建什么类型的空间？你可以在以后更改。",
     "Match system": "匹配系统",
     "Developer tools": "开发者工具",
@@ -2932,8 +3072,10 @@
     "Unmute microphone": "取消静音麦克风",
     "Mute microphone": "静音麦克风",
     "Audio devices": "音频设备",
-    "%(count)s people joined|one": "%(count)s个人已加入",
-    "%(count)s people joined|other": "%(count)s个人已加入",
+    "%(count)s people joined": {
+        "one": "%(count)s个人已加入",
+        "other": "%(count)s个人已加入"
+    },
     "Dial": "拨号",
     "Enable hardware acceleration": "启用硬件加速",
     "Automatically send debug logs when key backup is not functioning": "当密钥备份无法运作时自动发送debug日志",
@@ -2991,10 +3133,14 @@
     "Navigate to next message to edit": "导航到下条要编辑的消息",
     "Space home": "空间首页",
     "Open this settings tab": "打开此设置标签页",
-    "was removed %(count)s times|one": "被移除",
-    "was removed %(count)s times|other": "被移除%(count)s次",
-    "were removed %(count)s times|one": "被移除",
-    "were removed %(count)s times|other": "被移除了%(count)s次",
+    "was removed %(count)s times": {
+        "one": "被移除",
+        "other": "被移除%(count)s次"
+    },
+    "were removed %(count)s times": {
+        "one": "被移除",
+        "other": "被移除了%(count)s次"
+    },
     "Unknown error fetching location. Please try again later.": "获取位置时发生错误。请之后再试。",
     "Timed out trying to fetch your location. Please try again later.": "尝试获取你的位置超时。请之后再试。",
     "Failed to fetch your location. Please try again later.": "获取你的位置失败。请之后再试。",
@@ -3038,12 +3184,18 @@
     "Ban from space": "从空间封禁",
     "Remove from %(roomName)s": "从%(roomName)s移除",
     "Remove from room": "从房间移除",
-    "Currently removing messages in %(count)s rooms|one": "目前正在移除%(count)s个房间中的消息",
-    "Currently removing messages in %(count)s rooms|other": "目前正在移除%(count)s个房间中的消息",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s更改了房间的<a>固定消息</a>",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s更改了房间的<a>固定消息</a>%(count)s次",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s更改了房间的<a>固定消息</a>",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s更改了房间的<a>固定消息</a>%(count)s次",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "目前正在移除%(count)s个房间中的消息",
+        "other": "目前正在移除%(count)s个房间中的消息"
+    },
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s更改了房间的<a>固定消息</a>",
+        "other": "%(oneUser)s更改了房间的<a>固定消息</a>%(count)s次"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s更改了房间的<a>固定消息</a>",
+        "other": "%(severalUsers)s更改了房间的<a>固定消息</a>%(count)s次"
+    },
     "Minimise": "最小化",
     "Un-maximise": "取消最大化",
     "What location type do you want to share?": "你想分享什么位置类型？",
@@ -3058,7 +3210,10 @@
     "Click to move the pin": "点击以移动图钉",
     "Share for %(duration)s": "分享%(duration)s",
     "Enable live location sharing": "启用实时位置分享",
-    "%(count)s Members|one": "%(count)s个成员",
+    "%(count)s Members": {
+        "one": "%(count)s个成员",
+        "other": "%(count)s个成员"
+    },
     "Search for": "搜索",
     "Some results may be hidden for privacy": "为保护隐私，一些结果可能被隐藏",
     "If you can't see who you're looking for, send them your invite link.": "若你无法看到你正在查找的人，给他们发送你的邀请链接。",
@@ -3089,8 +3244,10 @@
     "Failed to load.": "载入失败。",
     "Send custom state event": "发送自定义状态事件",
     "<empty string>": "<空字符串>",
-    "<%(count)s spaces>|one": "<空间>",
-    "<%(count)s spaces>|other": "<%(count)s个空间>",
+    "<%(count)s spaces>": {
+        "one": "<空间>",
+        "other": "<%(count)s个空间>"
+    },
     "Failed to send event!": "发送事件失败！",
     "Doesn't look like valid JSON.": "看起来不像有效的JSON。",
     "Send custom room account data event": "发送自定义房间账户资料事件",
@@ -3122,8 +3279,10 @@
     "Find and invite your friends": "发现并邀请你的朋友",
     "Find your people": "寻找你的人",
     "Welcome to %(brand)s": "欢迎来到%(brand)s",
-    "Only %(count)s steps to go|other": "仅需%(count)s步",
-    "Only %(count)s steps to go|one": "仅需%(count)s步",
+    "Only %(count)s steps to go": {
+        "other": "仅需%(count)s步",
+        "one": "仅需%(count)s步"
+    },
     "Download %(brand)s": "下载%(brand)s",
     "Download %(brand)s Desktop": "下载%(brand)s桌面版",
     "Download on the App Store": "在App Store下载",
@@ -3143,8 +3302,10 @@
     "Other sessions": "其他会话",
     "Welcome": "欢迎",
     "Show shortcut to welcome checklist above the room list": "在房间列表上方显示欢迎清单的捷径",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s移除了1条消息",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s移除了%(count)s条消息",
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s移除了1条消息",
+        "other": "%(severalUsers)s移除了%(count)s条消息"
+    },
     "Remove them from everything I'm able to": "",
     "Inactive sessions": "不活跃的会话",
     "View all": "查看全部",
@@ -3159,8 +3320,10 @@
     "Verify or sign out from this session for best security and reliability.": "验证此会话或从之登出，以取得最佳安全性和可靠性。",
     "Unverified session": "未验证的会话",
     "This session is ready for secure messaging.": "此会话已准备好进行安全的消息传输。",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s发送了%(count)s条隐藏消息",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s发送了一条隐藏消息",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "other": "%(oneUser)s发送了%(count)s条隐藏消息",
+        "one": "%(oneUser)s发送了一条隐藏消息"
+    },
     "Remove server “%(roomServer)s”": "移除服务器“%(roomServer)s”",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "你可以使用自定义服务器选项来指定不同的家服务器URL以登录其他Matrix服务器。这让你能把%(brand)s和不同家服务器上的已有Matrix账户搭配使用。",
     "Started": "已开始",
@@ -3174,7 +3337,6 @@
     "Send custom account data event": "发送自定义账户数据事件",
     "Search Dialog": "搜索对话",
     "Join %(roomAddress)s": "加入%(roomAddress)s",
-    "%(count)s Members|other": "%(count)s个成员",
     "Ignore user": "忽略用户",
     "When you sign out, these keys will be deleted from this device, which means you won't be able to read encrypted messages unless you have the keys for them on your other devices, or backed them up to the server.": "当你登出时，这些密钥会从此设备删除。这意味着你将无法查阅已加密消息，除非你在其他设备上有那些消息的密钥，或者已将其备份到服务器。",
     "Open room": "打开房间",
@@ -3242,10 +3404,14 @@
     "Click to read topic": "点击阅读话题",
     "Edit topic": "编辑话题",
     "Edit poll": "编辑投票",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s发送了一条隐藏消息",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s发送了%(count)s条隐藏消息",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s移除了一条消息",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s移除了%(count)s条消息",
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s发送了一条隐藏消息",
+        "other": "%(severalUsers)s发送了%(count)s条隐藏消息"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s移除了一条消息",
+        "other": "%(oneUser)s移除了%(count)s条消息"
+    },
     "Don’t miss a thing by taking %(brand)s with you": "随身携带%(brand)s，不错过任何事情",
     "It’s what you’re here for, so lets get to it": "这就是你来这里的目的，所以让我们开始吧",
     "You made it!": "你做到了！",
@@ -3272,8 +3438,10 @@
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "若你也想移除关于此用户的系统消息（例如，成员更改、用户资料更改……），则取消勾选",
     "Check if you want to hide all current and future messages from this user.": "若想隐藏来自此用户的全部当前和未来的消息，请打勾。",
     "Inviting %(user1)s and %(user2)s": "正在邀请 %(user1)s 与 %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s 与 1 个人",
-    "%(user)s and %(count)s others|other": "%(user)s 与 %(count)s 个人",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s 与 1 个人",
+        "other": "%(user)s 与 %(count)s 个人"
+    },
     "Voice broadcast": "语音广播",
     "Element Call video rooms": "Element通话视频房间",
     "Voice broadcasts": "语音广播",
@@ -3287,8 +3455,10 @@
     "Video call started in %(roomName)s. (not supported by this browser)": "%(roomName)s里的视频通话开始了。（此浏览器不支持）",
     "Video call started in %(roomName)s.": "%(roomName)s里的视频通话开始了。",
     "You need to be able to kick users to do that.": "你需要能够移除用户才能做到那件事。",
-    "Inviting %(user)s and %(count)s others|one": "正在邀请%(user)s和另外1个人",
-    "Inviting %(user)s and %(count)s others|other": "正在邀请%(user)s和其他%(count)s人",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "正在邀请%(user)s和另外1个人",
+        "other": "正在邀请%(user)s和其他%(count)s人"
+    },
     "Turn off to disable notifications on all your devices and sessions": "关闭以在你全部设备和会话上停用通知",
     "Enable notifications for this account": "为此账户启用通知",
     "Enable notifications for this device": "为此设备启用通知",
@@ -3345,8 +3515,10 @@
     "Join %(brand)s calls": "加入%(brand)s呼叫",
     "Start %(brand)s calls": "开始%(brand)s呼叫",
     "Automatically adjust the microphone volume": "自动调整话筒音量",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "你确定要登出%(count)s个会话吗？",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "你确定要退出这 %(count)s 个会话吗？",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "你确定要登出%(count)s个会话吗？",
+        "other": "你确定要退出这 %(count)s 个会话吗？"
+    },
     "Presence": "在线",
     "Apply": "申请",
     "Search users in this room…": "搜索该房间内的用户……",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f2fddcde05..9726708f41 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -192,8 +192,10 @@
     "Unmute": "解除靜音",
     "Unnamed Room": "未命名的聊天室",
     "Uploading %(filename)s": "正在上傳 %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "正在上傳 %(filename)s 與另 %(count)s 個檔案",
-    "Uploading %(filename)s and %(count)s others|other": "正在上傳 %(filename)s 與另 %(count)s 個檔案",
+    "Uploading %(filename)s and %(count)s others": {
+        "one": "正在上傳 %(filename)s 與另 %(count)s 個檔案",
+        "other": "正在上傳 %(filename)s 與另 %(count)s 個檔案"
+    },
     "Upload avatar": "上傳大頭照",
     "Upload Failed": "無法上傳",
     "Usage": "使用方法",
@@ -237,8 +239,10 @@
     "Room": "聊天室",
     "Connectivity to the server has been lost.": "對伺服器的連線已中斷。",
     "Sent messages will be stored until your connection has returned.": "傳送的訊息會在您的連線恢復前先儲存起來。",
-    "(~%(count)s results)|one": "（~%(count)s 結果）",
-    "(~%(count)s results)|other": "（~%(count)s 結果）",
+    "(~%(count)s results)": {
+        "one": "（~%(count)s 結果）",
+        "other": "（~%(count)s 結果）"
+    },
     "New Password": "新密碼",
     "Start automatically after system login": "在系統登入後自動開始",
     "Analytics": "分析",
@@ -270,8 +274,10 @@
     "Do you want to set an email address?": "您想要設定電子郵件地址嗎？",
     "This will allow you to reset your password and receive notifications.": "這讓您可以重設您的密碼與接收通知。",
     "Skip": "略過",
-    "and %(count)s others...|other": "與另 %(count)s 個人…",
-    "and %(count)s others...|one": "與另 1 個人…",
+    "and %(count)s others...": {
+        "other": "與另 %(count)s 個人…",
+        "one": "與另 1 個人…"
+    },
     "Delete widget": "刪除小工具",
     "Define the power level of a user": "定義使用者的權限等級",
     "Edit": "編輯",
@@ -331,51 +337,95 @@
     "Delete Widget": "刪除小工具",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "刪除小工具會將它從此聊天室中所有使用者的收藏中移除。您確定您要刪除這個小工具嗎？",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s 加入了 %(count)s 次",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s 加入了",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s 加入了 %(count)s 次",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s 加入了",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s 離開了 %(count)s 次",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s 離開了",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s 離開了 %(count)s 次",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s 離開了",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s 加入並離開了 %(count)s 次",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s 加入並離開了",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s 加入並離開了 %(count)s 次",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s 加入並離開了",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s 離開並重新加入了 %(count)s 次",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s 離開並重新加入了",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s 離開並重新加入了 %(count)s 次",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s 離開並重新加入了",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s 回絕了他們的邀請 %(count)s 次",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s 回絕了他們的邀請",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s 回絕了他們的邀請 %(count)s 次",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s 回絕了他們的邀請",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s 撤回了他們的邀請 %(count)s 次",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s 撤回了他們的邀請",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s 撤回了他們的邀請 %(count)s 次",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s 撤回了他們的邀請",
-    "were invited %(count)s times|other": "被邀請了 %(count)s 次",
-    "were invited %(count)s times|one": "被邀請了",
-    "was invited %(count)s times|other": "被邀請了 %(count)s 次",
-    "was invited %(count)s times|one": "被邀請了",
-    "were banned %(count)s times|other": "被阻擋了 %(count)s 次",
-    "were banned %(count)s times|one": "被阻擋了",
-    "was banned %(count)s times|other": "被阻擋了 %(count)s 次",
-    "was banned %(count)s times|one": "被阻擋了",
-    "were unbanned %(count)s times|other": "被取消阻擋了 %(count)s 次",
-    "were unbanned %(count)s times|one": "被取消阻擋了",
-    "was unbanned %(count)s times|other": "被取消阻擋了 %(count)s 次",
-    "was unbanned %(count)s times|one": "被取消阻擋了",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s 變更了他們的名稱 %(count)s 次",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s 變更了他們的名稱",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s 變更了名稱 %(count)s 次",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s 變更了的名稱",
-    "%(items)s and %(count)s others|other": "%(items)s 與其他 %(count)s 個人",
-    "%(items)s and %(count)s others|one": "%(items)s 與另一個人",
+    "%(severalUsers)sjoined %(count)s times": {
+        "other": "%(severalUsers)s 加入了 %(count)s 次",
+        "one": "%(severalUsers)s 加入了"
+    },
+    "%(oneUser)sjoined %(count)s times": {
+        "other": "%(oneUser)s 加入了 %(count)s 次",
+        "one": "%(oneUser)s 加入了"
+    },
+    "%(severalUsers)sleft %(count)s times": {
+        "other": "%(severalUsers)s 離開了 %(count)s 次",
+        "one": "%(severalUsers)s 離開了"
+    },
+    "%(oneUser)sleft %(count)s times": {
+        "other": "%(oneUser)s 離開了 %(count)s 次",
+        "one": "%(oneUser)s 離開了"
+    },
+    "%(severalUsers)sjoined and left %(count)s times": {
+        "other": "%(severalUsers)s 加入並離開了 %(count)s 次",
+        "one": "%(severalUsers)s 加入並離開了"
+    },
+    "%(oneUser)sjoined and left %(count)s times": {
+        "other": "%(oneUser)s 加入並離開了 %(count)s 次",
+        "one": "%(oneUser)s 加入並離開了"
+    },
+    "%(severalUsers)sleft and rejoined %(count)s times": {
+        "other": "%(severalUsers)s 離開並重新加入了 %(count)s 次",
+        "one": "%(severalUsers)s 離開並重新加入了"
+    },
+    "%(oneUser)sleft and rejoined %(count)s times": {
+        "other": "%(oneUser)s 離開並重新加入了 %(count)s 次",
+        "one": "%(oneUser)s 離開並重新加入了"
+    },
+    "%(severalUsers)srejected their invitations %(count)s times": {
+        "other": "%(severalUsers)s 回絕了他們的邀請 %(count)s 次",
+        "one": "%(severalUsers)s 回絕了他們的邀請"
+    },
+    "%(oneUser)srejected their invitation %(count)s times": {
+        "other": "%(oneUser)s 回絕了他們的邀請 %(count)s 次",
+        "one": "%(oneUser)s 回絕了他們的邀請"
+    },
+    "%(severalUsers)shad their invitations withdrawn %(count)s times": {
+        "other": "%(severalUsers)s 撤回了他們的邀請 %(count)s 次",
+        "one": "%(severalUsers)s 撤回了他們的邀請"
+    },
+    "%(oneUser)shad their invitation withdrawn %(count)s times": {
+        "other": "%(oneUser)s 撤回了他們的邀請 %(count)s 次",
+        "one": "%(oneUser)s 撤回了他們的邀請"
+    },
+    "were invited %(count)s times": {
+        "other": "被邀請了 %(count)s 次",
+        "one": "被邀請了"
+    },
+    "was invited %(count)s times": {
+        "other": "被邀請了 %(count)s 次",
+        "one": "被邀請了"
+    },
+    "were banned %(count)s times": {
+        "other": "被阻擋了 %(count)s 次",
+        "one": "被阻擋了"
+    },
+    "was banned %(count)s times": {
+        "other": "被阻擋了 %(count)s 次",
+        "one": "被阻擋了"
+    },
+    "were unbanned %(count)s times": {
+        "other": "被取消阻擋了 %(count)s 次",
+        "one": "被取消阻擋了"
+    },
+    "was unbanned %(count)s times": {
+        "other": "被取消阻擋了 %(count)s 次",
+        "one": "被取消阻擋了"
+    },
+    "%(severalUsers)schanged their name %(count)s times": {
+        "other": "%(severalUsers)s 變更了他們的名稱 %(count)s 次",
+        "one": "%(severalUsers)s 變更了他們的名稱"
+    },
+    "%(oneUser)schanged their name %(count)s times": {
+        "other": "%(oneUser)s 變更了名稱 %(count)s 次",
+        "one": "%(oneUser)s 變更了的名稱"
+    },
+    "%(items)s and %(count)s others": {
+        "other": "%(items)s 與其他 %(count)s 個人",
+        "one": "%(items)s 與另一個人"
+    },
     "collapse": "收折",
     "expand": "展開",
-    "And %(count)s more...|other": "與更多 %(count)s 個…",
+    "And %(count)s more...": {
+        "other": "與更多 %(count)s 個…"
+    },
     "Leave": "離開",
     "Description": "描述",
     "Old cryptography data detected": "偵測到舊的加密資料",
@@ -588,8 +638,10 @@
     "Sets the room name": "設定聊天室名稱",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s 升級了此聊天室。",
     "%(displayName)s is typing …": "%(displayName)s 正在打字…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s 與其他 %(count)s 個人正在打字…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s 與另一個人正在打字…",
+    "%(names)s and %(count)s others are typing …": {
+        "other": "%(names)s 與其他 %(count)s 個人正在打字…",
+        "one": "%(names)s 與另一個人正在打字…"
+    },
     "%(names)s and %(lastPerson)s are typing …": "%(names)s 與 %(lastPerson)s 正在打字…",
     "Render simple counters in room header": "在聊天室標頭顯示簡單的計數器",
     "Enable Emoji suggestions while typing": "啟用在打字時出現表情符號建議",
@@ -798,8 +850,10 @@
     "Revoke invite": "撤銷邀請",
     "Invited by %(sender)s": "由 %(sender)s 邀請",
     "Remember my selection for this widget": "記住我對這個小工具的選擇",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "您在此聊天室的先前版本有 %(count)s 個未讀的通知。",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "您在此聊天室的先前版本有 %(count)s 個未讀的通知。",
+    "You have %(count)s unread notifications in a prior version of this room.": {
+        "other": "您在此聊天室的先前版本有 %(count)s 個未讀的通知。",
+        "one": "您在此聊天室的先前版本有 %(count)s 個未讀的通知。"
+    },
     "The file '%(fileName)s' failed to upload.": "無法上傳檔案「%(fileName)s」。",
     "GitHub issue": "GitHub 議題",
     "Notes": "註記",
@@ -815,8 +869,10 @@
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "這個檔案<b>太大了</b>，沒辦法上傳。檔案大小限制為 %(limit)s 但這個檔案大小是 %(sizeOfThisFile)s。",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "這些檔案<b>太大了</b>，沒辦法上傳。檔案大小限制為 %(limit)s。",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "某些檔案<b>太大了</b>，沒辦法上傳。檔案大小限制為 %(limit)s。",
-    "Upload %(count)s other files|other": "上傳 %(count)s 個其他檔案",
-    "Upload %(count)s other files|one": "上傳 %(count)s 個其他檔案",
+    "Upload %(count)s other files": {
+        "other": "上傳 %(count)s 個其他檔案",
+        "one": "上傳 %(count)s 個其他檔案"
+    },
     "Cancel All": "全部取消",
     "Upload Error": "上傳錯誤",
     "The server does not support the room version specified.": "伺服器不支援指定的聊天室版本。",
@@ -893,10 +949,14 @@
     "Message edits": "訊息編輯紀錄",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "升級這個聊天室需要關閉目前的執行個體並重新建立一個新的聊天室來替代。為了給予聊天室成員最佳的體驗，我們將會：",
     "Show all": "顯示全部",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s 未做出變更 %(count)s 次",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s 未做出變更",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s 未做出變更 %(count)s 次",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s 未做出變更",
+    "%(severalUsers)smade no changes %(count)s times": {
+        "other": "%(severalUsers)s 未做出變更 %(count)s 次",
+        "one": "%(severalUsers)s 未做出變更"
+    },
+    "%(oneUser)smade no changes %(count)s times": {
+        "other": "%(oneUser)s 未做出變更 %(count)s 次",
+        "one": "%(oneUser)s 未做出變更"
+    },
     "Resend %(unsentCount)s reaction(s)": "重新傳送 %(unsentCount)s 反應",
     "Your homeserver doesn't seem to support this feature.": "您的家伺服器似乎並不支援此功能。",
     "You're signed out": "您已登出",
@@ -982,7 +1042,10 @@
     "Try scrolling up in the timeline to see if there are any earlier ones.": "試著在時間軸上捲動以檢視有沒有較早的。",
     "Remove recent messages by %(user)s": "移除 %(user)s 最近的訊息",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "若有大量訊息需刪除，可能需要一些時間。請不要在此時重新整理您的客戶端。",
-    "Remove %(count)s messages|other": "移除 %(count)s 則訊息",
+    "Remove %(count)s messages": {
+        "other": "移除 %(count)s 則訊息",
+        "one": "移除 1 則訊息"
+    },
     "Remove recent messages": "移除最近的訊息",
     "Bold": "粗體",
     "Italics": "斜體",
@@ -1019,14 +1082,19 @@
     "User Autocomplete": "使用者自動完成",
     "Show previews/thumbnails for images": "顯示圖片的預覽／縮圖",
     "Clear cache and reload": "清除快取並重新載入",
-    "%(count)s unread messages including mentions.|other": "包含提及有 %(count)s 則未讀訊息。",
-    "%(count)s unread messages.|other": "%(count)s 則未讀訊息。",
+    "%(count)s unread messages including mentions.": {
+        "other": "包含提及有 %(count)s 則未讀訊息。",
+        "one": "1 則未讀的提及。"
+    },
+    "%(count)s unread messages.": {
+        "other": "%(count)s 則未讀訊息。",
+        "one": "1 則未讀的訊息。"
+    },
     "Show image": "顯示圖片",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "請在 GitHub 上<newIssueLink>建立新議題</newIssueLink>，這樣我們才能調查這個錯誤。",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "未於家伺服器設定中指定 Captcha 公鑰。請將此問題回報給您的家伺服器管理員。",
     "Your email address hasn't been verified yet": "您的電子郵件地址尚未被驗證",
     "Click the link in the email you received to verify and then click continue again.": "點擊您收到的電子郵件中的連結以驗證然後再次點擊繼續。",
-    "Remove %(count)s messages|one": "移除 1 則訊息",
     "Add Email Address": "新增電子郵件地址",
     "Add Phone Number": "新增電話號碼",
     "%(creator)s created and configured the room.": "%(creator)s 建立並設定了聊天室。",
@@ -1054,8 +1122,6 @@
     "Jump to first unread room.": "跳到第一個未讀的聊天室。",
     "Jump to first invite.": "跳到第一個邀請。",
     "Room %(name)s": "聊天室 %(name)s",
-    "%(count)s unread messages including mentions.|one": "1 則未讀的提及。",
-    "%(count)s unread messages.|one": "1 則未讀的訊息。",
     "Unread messages.": "未讀的訊息。",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "此動作需要存取預設的身分伺服器 <server /> 以驗證電子郵件或電話號碼，但伺服器沒有任何服務條款。",
     "Trust": "信任",
@@ -1169,8 +1235,10 @@
     "Cross-signing": "交叉簽署",
     "not stored": "未儲存",
     "Hide verified sessions": "隱藏已驗證的工作階段",
-    "%(count)s verified sessions|other": "%(count)s 個已驗證的工作階段",
-    "%(count)s verified sessions|one": "1 個已驗證的工作階段",
+    "%(count)s verified sessions": {
+        "other": "%(count)s 個已驗證的工作階段",
+        "one": "1 個已驗證的工作階段"
+    },
     "Unable to set up secret storage": "無法設定秘密資訊儲存空間",
     "Close preview": "關閉預覽",
     "Language Dropdown": "語言下拉式選單",
@@ -1268,8 +1336,10 @@
     "Your messages are not secure": "您的訊息不安全",
     "One of the following may be compromised:": "以下其中一項可能會受到威脅：",
     "Your homeserver": "您的家伺服器",
-    "%(count)s sessions|other": "%(count)s 個工作階段",
-    "%(count)s sessions|one": "%(count)s 個工作階段",
+    "%(count)s sessions": {
+        "other": "%(count)s 個工作階段",
+        "one": "%(count)s 個工作階段"
+    },
     "Hide sessions": "隱藏工作階段",
     "Verify by emoji": "透過表情符號驗證",
     "Verify by comparing unique emoji.": "透過比對獨特的表情符號來進行驗證。",
@@ -1334,10 +1404,14 @@
     "Mark all as read": "全部標示為已讀",
     "Not currently indexing messages for any room.": "目前未為任何聊天室編寫索引。",
     "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(doneRooms)s",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 為此聊天室新增了替代位置 %(addresses)s。",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 為此聊天室新增了替代位置 %(addresses)s。",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 為此聊天室移除了替代位置 %(addresses)s。",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 為此聊天室移除了替代位置 %(addresses)s。",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s 為此聊天室新增了替代位置 %(addresses)s。",
+        "one": "%(senderName)s 為此聊天室新增了替代位置 %(addresses)s。"
+    },
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.": {
+        "other": "%(senderName)s 為此聊天室移除了替代位置 %(addresses)s。",
+        "one": "%(senderName)s 為此聊天室移除了替代位置 %(addresses)s。"
+    },
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s 為此聊天室變更了替代位址。",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s 為此聊天室變更了主要及替代位址。",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "更新聊天室的替代位址時發生錯誤。伺服器可能不允許這麼做，或是遇到暫時性的錯誤。",
@@ -1514,8 +1588,10 @@
     "Sort by": "排序方式",
     "Message preview": "訊息預覽",
     "List options": "列表選項",
-    "Show %(count)s more|other": "再顯示 %(count)s 個",
-    "Show %(count)s more|one": "再顯示 %(count)s 個",
+    "Show %(count)s more": {
+        "other": "再顯示 %(count)s 個",
+        "one": "再顯示 %(count)s 個"
+    },
     "Room options": "聊天室選項",
     "Activity": "訊息順序",
     "A-Z": "A-Z",
@@ -1650,7 +1726,9 @@
     "Move right": "向右移動",
     "Move left": "向左移動",
     "Revoke permissions": "撤銷權限",
-    "You can only pin up to %(count)s widgets|other": "您最多只能釘選 %(count)s 個小工具",
+    "You can only pin up to %(count)s widgets": {
+        "other": "您最多只能釘選 %(count)s 個小工具"
+    },
     "Show Widgets": "顯示小工具",
     "Hide Widgets": "隱藏小工具",
     "The call was answered on another device.": "通話已在其他裝置上回應。",
@@ -1938,8 +2016,10 @@
     "Takes the call in the current room off hold": "取消目前聊天室通話等候接聽狀態",
     "Places the call in the current room on hold": "把目前聊天室通話設為等候接聽",
     "Go to Home View": "前往主畫面",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "使用 %(size)s 來儲存來自 %(rooms)s 個聊天室的訊息，在本機安全地快取已加密的訊息以使其出現在搜尋結果中。",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "使用 %(size)s 來儲存來自 %(rooms)s 個聊天室的訊息，在本機安全地快取已加密的訊息以使其出現在搜尋結果中。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.": {
+        "one": "使用 %(size)s 來儲存來自 %(rooms)s 個聊天室的訊息，在本機安全地快取已加密的訊息以使其出現在搜尋結果中。",
+        "other": "使用 %(size)s 來儲存來自 %(rooms)s 個聊天室的訊息，在本機安全地快取已加密的訊息以使其出現在搜尋結果中。"
+    },
     "Decline All": "全部拒絕",
     "Approve": "批准",
     "This widget would like to:": "這個小工具想要：",
@@ -2140,8 +2220,10 @@
     "Support": "支援",
     "Random": "隨機",
     "Welcome to <name/>": "歡迎加入 <name/>",
-    "%(count)s members|one": "%(count)s 位成員",
-    "%(count)s members|other": "%(count)s 位成員",
+    "%(count)s members": {
+        "one": "%(count)s 位成員",
+        "other": "%(count)s 位成員"
+    },
     "Your server does not support showing space hierarchies.": "您的伺服器不支援顯示空間的層次結構。",
     "Are you sure you want to leave the space '%(spaceName)s'?": "您確定您要離開聊天空間「%(spaceName)s」？",
     "This space is not public. You will not be able to rejoin without an invite.": "此聊天空間並非公開。在無邀請的情況下，您將無法重新加入。",
@@ -2203,8 +2285,10 @@
     "Failed to remove some rooms. Try again later": "無法移除某些聊天室。稍後再試",
     "Suggested": "建議",
     "This room is suggested as a good one to join": "推薦加入這個聊天室",
-    "%(count)s rooms|one": "%(count)s 個聊天室",
-    "%(count)s rooms|other": "%(count)s 個聊天室",
+    "%(count)s rooms": {
+        "one": "%(count)s 個聊天室",
+        "other": "%(count)s 個聊天室"
+    },
     "You don't have permission": "您沒有權限",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "這通常只影響伺服器如何處理聊天室。如果您的 %(brand)s 遇到問題，請回報錯誤。",
     "Invite to %(roomName)s": "邀請加入 %(roomName)s",
@@ -2222,8 +2306,10 @@
     "%(deviceId)s from %(ip)s": "從 %(ip)s 來的 %(deviceId)s",
     "Manage & explore rooms": "管理與探索聊天室",
     "Warn before quitting": "離開前警告",
-    "%(count)s people you know have already joined|other": "%(count)s 個您認識的人已加入",
-    "%(count)s people you know have already joined|one": "%(count)s 個您認識的人已加入",
+    "%(count)s people you know have already joined": {
+        "other": "%(count)s 個您認識的人已加入",
+        "one": "%(count)s 個您認識的人已加入"
+    },
     "Add existing rooms": "新增既有聊天室",
     "We couldn't create your DM.": "我們無法建立您的私人訊息。",
     "Invited people will be able to read old messages.": "被邀請的人將能閱讀舊訊息。",
@@ -2252,8 +2338,10 @@
     "Delete all": "刪除全部",
     "Some of your messages have not been sent": "您的部份訊息未傳送",
     "Including %(commaSeparatedMembers)s": "包含 %(commaSeparatedMembers)s",
-    "View all %(count)s members|one": "檢視 1 個成員",
-    "View all %(count)s members|other": "檢視全部 %(count)s 個成員",
+    "View all %(count)s members": {
+        "one": "檢視 1 個成員",
+        "other": "檢視全部 %(count)s 個成員"
+    },
     "Failed to send": "傳送失敗",
     "Enter your Security Phrase a second time to confirm it.": "再次輸入您的安全密語以確認。",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "挑選要新增的聊天室或對話。這是專屬於您的空間，不會有人被通知。您稍後可以再新增更多。",
@@ -2266,8 +2354,10 @@
     "Leave the beta": "離開 Beta 測試",
     "Beta": "Beta",
     "Want to add a new room instead?": "想要新增新聊天室嗎？",
-    "Adding rooms... (%(progress)s out of %(count)s)|one": "正在新增聊天室…",
-    "Adding rooms... (%(progress)s out of %(count)s)|other": "正在新增聊天室…（%(count)s 中的第 %(progress)s 個）",
+    "Adding rooms... (%(progress)s out of %(count)s)": {
+        "one": "正在新增聊天室…",
+        "other": "正在新增聊天室…（%(count)s 中的第 %(progress)s 個）"
+    },
     "Not all selected were added": "並非所有選定的都被新增了",
     "You are not allowed to view this server's rooms list": "您不被允許檢視此伺服器的聊天室清單",
     "Error processing voice message": "處理語音訊息時發生錯誤",
@@ -2291,8 +2381,10 @@
     "Sends the given message with a space themed effect": "與太空主題效果一起傳送指定的訊息",
     "See when people join, leave, or are invited to your active room": "檢視人們何時加入、離開或被邀請至您的活躍聊天室",
     "See when people join, leave, or are invited to this room": "檢視人們何時加入、離開或被邀請加入此聊天室",
-    "Currently joining %(count)s rooms|one": "目前正在加入 %(count)s 個聊天室",
-    "Currently joining %(count)s rooms|other": "目前正在加入 %(count)s 個聊天室",
+    "Currently joining %(count)s rooms": {
+        "one": "目前正在加入 %(count)s 個聊天室",
+        "other": "目前正在加入 %(count)s 個聊天室"
+    },
     "The user you called is busy.": "您想要通話的使用者目前忙碌中。",
     "User Busy": "使用者忙碌中",
     "Or send invite link": "或傳送邀請連結",
@@ -2326,10 +2418,14 @@
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "該使用者進行違法行為，例如洩漏他人個資，或威脅使用暴力。\n將會回報給聊天室版主，他們可能會將其回報給執法單位。",
     "What this user is writing is wrong.\nThis will be reported to the room moderators.": "該使用者所寫的內容是錯誤的。\n這將會回報給聊天室管理員。",
     "Please provide an address": "請提供位址",
-    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)s 變更了伺服器 ACL",
-    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)s 變更了伺服器 ACL %(count)s 次",
-    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)s 變更了伺服器 ACL",
-    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)s 變更了伺服器 ACL %(count)s 次",
+    "%(oneUser)schanged the server ACLs %(count)s times": {
+        "one": "%(oneUser)s 變更了伺服器 ACL",
+        "other": "%(oneUser)s 變更了伺服器 ACL %(count)s 次"
+    },
+    "%(severalUsers)schanged the server ACLs %(count)s times": {
+        "one": "%(severalUsers)s 變更了伺服器 ACL",
+        "other": "%(severalUsers)s 變更了伺服器 ACL %(count)s 次"
+    },
     "Message search initialisation failed, check <a>your settings</a> for more information": "訊息搜尋初始化失敗，請檢查<a>您的設定</a>以取得更多資訊",
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "設定此聊天空間的位址，這樣使用者就能透過您的家伺服器找到此空間（%(localDomain)s）",
     "To publish an address, it needs to be set as a local address first.": "要發佈位址，其必須先設定為本機位址。",
@@ -2378,8 +2474,10 @@
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "我們已將邀請傳送給其他人，但以下的人無法邀請加入 <RoomName/>",
     "Unnamed audio": "未命名的音訊",
     "Error processing audio message": "處理音訊訊息時出現問題",
-    "Show %(count)s other previews|one": "顯示 %(count)s 個其他預覽",
-    "Show %(count)s other previews|other": "顯示 %(count)s 個其他預覽",
+    "Show %(count)s other previews": {
+        "one": "顯示 %(count)s 個其他預覽",
+        "other": "顯示 %(count)s 個其他預覽"
+    },
     "Images, GIFs and videos": "圖片、GIF 與影片",
     "Code blocks": "程式碼區塊",
     "Displaying time": "顯示時間",
@@ -2447,8 +2545,14 @@
     "Space members": "聊天空間成員",
     "Anyone in a space can find and join. You can select multiple spaces.": "空間中的任何人都可以找到並加入。您可以選取多個空間。",
     "Spaces with access": "可存取的聊天空間",
-    "Currently, %(count)s spaces have access|other": "目前，%(count)s 個空間可存取",
-    "& %(count)s more|other": "以及 %(count)s 個",
+    "Currently, %(count)s spaces have access": {
+        "other": "目前，%(count)s 個空間可存取",
+        "one": "目前，1 個空間可存取"
+    },
+    "& %(count)s more": {
+        "other": "以及 %(count)s 個",
+        "one": "與其他 %(count)s 個"
+    },
     "Upgrade required": "必須升級",
     "Anyone can find and join.": "任何人都可以找到並加入。",
     "Only invited people can join.": "只有受邀的人才能找到並加入。",
@@ -2521,8 +2625,6 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s 從此聊天室取消釘選<a>訊息</a>。檢視所有<b>釘選的訊息</b>。",
     "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s 釘選了訊息到此聊天室。檢視所有已釘選的訊息。",
     "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s 釘選了<a>訊息</a>到此聊天室。檢視所有<b>釘選的訊息</b>。",
-    "Currently, %(count)s spaces have access|one": "目前，1 個空間可存取",
-    "& %(count)s more|one": "與其他 %(count)s 個",
     "Some encryption parameters have been changed.": "部份加密參數已變更。",
     "Role in <RoomName/>": "<RoomName/> 中的角色",
     "Send a sticker": "傳送貼圖",
@@ -2603,15 +2705,21 @@
     "They'll still be able to access whatever you're not an admin of.": "他們仍然可以存取您不是管理員的任何地方。",
     "Disinvite from %(roomName)s": "拒絕來自 %(roomName)s 的邀請",
     "Threads": "討論串",
-    "Updating spaces... (%(progress)s out of %(count)s)|one": "正在更新空間…",
-    "Updating spaces... (%(progress)s out of %(count)s)|other": "正在更新空間…（%(count)s 中的第 %(progress)s 個）",
-    "Sending invites... (%(progress)s out of %(count)s)|one": "正在傳送邀請…",
-    "Sending invites... (%(progress)s out of %(count)s)|other": "正在傳送邀請…（%(count)s 中的第 %(progress)s 個）",
+    "Updating spaces... (%(progress)s out of %(count)s)": {
+        "one": "正在更新空間…",
+        "other": "正在更新空間…（%(count)s 中的第 %(progress)s 個）"
+    },
+    "Sending invites... (%(progress)s out of %(count)s)": {
+        "one": "正在傳送邀請…",
+        "other": "正在傳送邀請…（%(count)s 中的第 %(progress)s 個）"
+    },
     "Loading new room": "正在載入新的聊天室",
     "Upgrading room": "正在升級聊天室",
     "Downloading": "正在下載",
-    "%(count)s reply|one": "%(count)s 回覆",
-    "%(count)s reply|other": "%(count)s 回覆",
+    "%(count)s reply": {
+        "one": "%(count)s 回覆",
+        "other": "%(count)s 回覆"
+    },
     "View in room": "在聊天室中檢視",
     "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "輸入您的安全密語或<button>使用您的安全金鑰</button>以繼續。",
     "The email address doesn't appear to be valid.": "電子郵件地址似乎無效。",
@@ -2628,12 +2736,18 @@
     "Rename": "重新命名",
     "Select all": "全部選取",
     "Deselect all": "取消選取",
-    "Sign out devices|one": "登出裝置",
-    "Sign out devices|other": "登出裝置",
-    "Click the button below to confirm signing out these devices.|one": "點下方按鈕，確認登出這台裝置。",
-    "Click the button below to confirm signing out these devices.|other": "點下方按鈕，確認登出這些裝置。",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "請使用「單一登入」功能證明身分，確認登出這台裝置。",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "請使用「單一登入」功能證明身分，確認登出這些裝置。",
+    "Sign out devices": {
+        "one": "登出裝置",
+        "other": "登出裝置"
+    },
+    "Click the button below to confirm signing out these devices.": {
+        "one": "點下方按鈕，確認登出這台裝置。",
+        "other": "點下方按鈕，確認登出這些裝置。"
+    },
+    "Confirm logging out these devices by using Single Sign On to prove your identity.": {
+        "one": "請使用「單一登入」功能證明身分，確認登出這台裝置。",
+        "other": "請使用「單一登入」功能證明身分，確認登出這些裝置。"
+    },
     "Automatically send debug logs on any error": "自動在發生錯誤時傳送除錯日誌",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "由於安全金鑰是用來保護您的加密資料，請將其儲存在安全的地方，例如密碼管理員或保險箱等。",
     "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "我們將為您產生一把安全金鑰。請將其儲存在安全的地方，例如密碼管理員或保險箱。",
@@ -2692,12 +2806,18 @@
     "Large": "大",
     "Image size in the timeline": "時間軸中的圖片大小",
     "%(senderName)s has updated the room layout": "%(senderName)s 已更新聊天室佈局",
-    "Based on %(count)s votes|one": "總票數 %(count)s 票",
-    "Based on %(count)s votes|other": "總票數 %(count)s 票",
-    "%(count)s votes|one": "%(count)s 個投票",
-    "%(count)s votes|other": "%(count)s 個投票",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s 與 %(count)s 個其他的",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s 與 %(count)s 個其他的",
+    "Based on %(count)s votes": {
+        "one": "總票數 %(count)s 票",
+        "other": "總票數 %(count)s 票"
+    },
+    "%(count)s votes": {
+        "one": "%(count)s 個投票",
+        "other": "%(count)s 個投票"
+    },
+    "%(spaceName)s and %(count)s others": {
+        "one": "%(spaceName)s 與 %(count)s 個其他的",
+        "other": "%(spaceName)s 與 %(count)s 個其他的"
+    },
     "Sorry, the poll you tried to create was not posted.": "抱歉，您嘗試建立的投票並未發佈。",
     "Failed to post poll": "張貼投票失敗",
     "Sorry, your vote was not registered. Please try again.": "抱歉，您的投票未計入。請再試一次。",
@@ -2726,8 +2846,10 @@
     "We <Bold>don't</Bold> share information with third parties": "我們<Bold>不會</Bold>與第三方分享這些資訊",
     "We <Bold>don't</Bold> record or profile any account data": "我們<Bold>不會</Bold>記錄或分析任何帳號資料",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "您可以<PrivacyPolicyUrl>在此</PrivacyPolicyUrl>閱讀我們的條款",
-    "%(count)s votes cast. Vote to see the results|one": "已投 %(count)s 票。投票後即可檢視結果",
-    "%(count)s votes cast. Vote to see the results|other": "已投 %(count)s 票。投票後即可檢視結果",
+    "%(count)s votes cast. Vote to see the results": {
+        "one": "已投 %(count)s 票。投票後即可檢視結果",
+        "other": "已投 %(count)s 票。投票後即可檢視結果"
+    },
     "No votes cast": "尚無投票",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "分享匿名資料以協助我們識別問題。無個人資料。無第三方。",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "分享匿名資料以協助我們識別問題。無個人資料。無第三方。<LearnMoreLink>取得更多資訊</LearnMoreLink>",
@@ -2747,8 +2869,10 @@
     "Failed to end poll": "無法結束投票",
     "The poll has ended. Top answer: %(topAnswer)s": "投票已結束。最佳答案：%(topAnswer)s",
     "The poll has ended. No votes were cast.": "投票已結束。沒有投票。",
-    "Final result based on %(count)s votes|one": "共計 %(count)s 票所獲得的投票結果",
-    "Final result based on %(count)s votes|other": "共計 %(count)s 票所獲得的投票結果",
+    "Final result based on %(count)s votes": {
+        "one": "共計 %(count)s 票所獲得的投票結果",
+        "other": "共計 %(count)s 票所獲得的投票結果"
+    },
     "Link to room": "連結到聊天室",
     "Recent searches": "近期搜尋",
     "To search messages, look for this icon at the top of a room <icon/>": "要搜尋訊息，請在聊天室頂部尋找此圖示 <icon/>",
@@ -2763,16 +2887,24 @@
     "Failed to load list of rooms.": "無法載入聊天室清單。",
     "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "將您與此空間成員的聊天進行分組。關閉此功能，將會在您的 %(spaceName)s 畫面中隱藏那些聊天室。",
     "Sections to show": "要顯示的部份",
-    "Exported %(count)s events in %(seconds)s seconds|one": "已在 %(seconds)s 秒內匯出 %(count)s 個事件",
-    "Exported %(count)s events in %(seconds)s seconds|other": "已在 %(seconds)s 秒內匯出 %(count)s 個事件",
+    "Exported %(count)s events in %(seconds)s seconds": {
+        "one": "已在 %(seconds)s 秒內匯出 %(count)s 個事件",
+        "other": "已在 %(seconds)s 秒內匯出 %(count)s 個事件"
+    },
     "Export successful!": "匯出成功！",
-    "Fetched %(count)s events in %(seconds)ss|one": "已在 %(seconds)s 秒內取得 %(count)s 個事件",
-    "Fetched %(count)s events in %(seconds)ss|other": "已在 %(seconds)s 秒內取得 %(count)s 個事件",
+    "Fetched %(count)s events in %(seconds)ss": {
+        "one": "已在 %(seconds)s 秒內取得 %(count)s 個事件",
+        "other": "已在 %(seconds)s 秒內取得 %(count)s 個事件"
+    },
     "Processing event %(number)s out of %(total)s": "正在處理 %(total)s 個事件中的第 %(number)s 個",
-    "Fetched %(count)s events so far|one": "到目前為止已取得 %(count)s 個事件",
-    "Fetched %(count)s events so far|other": "到目前為止已成功取得 %(count)s 個事件",
-    "Fetched %(count)s events out of %(total)s|one": "已取得 %(total)s 個事件中的 %(count)s 個",
-    "Fetched %(count)s events out of %(total)s|other": "從 %(total)s 個事件中取得了 %(count)s 個",
+    "Fetched %(count)s events so far": {
+        "one": "到目前為止已取得 %(count)s 個事件",
+        "other": "到目前為止已成功取得 %(count)s 個事件"
+    },
+    "Fetched %(count)s events out of %(total)s": {
+        "one": "已取得 %(total)s 個事件中的 %(count)s 個",
+        "other": "從 %(total)s 個事件中取得了 %(count)s 個"
+    },
     "Generating a ZIP": "產生 ZIP",
     "Open in OpenStreetMap": "在 OpenStreetMap 中開啟",
     "toggle event": "切換事件",
@@ -2817,10 +2949,14 @@
     "Failed to fetch your location. Please try again later.": "無法取得您的位置。請稍後再試。",
     "Could not fetch location": "無法取得位置",
     "Automatically send debug logs on decryption errors": "自動傳送關於解密錯誤的除錯紀錄檔",
-    "was removed %(count)s times|one": "被移除",
-    "was removed %(count)s times|other": "被移除 %(count)s 次",
-    "were removed %(count)s times|one": "被移除",
-    "were removed %(count)s times|other": "被移除了 %(count)s 次",
+    "was removed %(count)s times": {
+        "one": "被移除",
+        "other": "被移除 %(count)s 次"
+    },
+    "were removed %(count)s times": {
+        "one": "被移除",
+        "other": "被移除了 %(count)s 次"
+    },
     "Remove from room": "踢出此聊天室",
     "Failed to remove user": "無法移除使用者",
     "Remove them from specific things I'm able to": "從我有權限的特定地方移除",
@@ -2900,18 +3036,28 @@
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "感謝試用 Beta 版，請盡可能地詳細說明，如此我們才能改善本功能。",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s 與 %(space2Name)s",
     "Maximise": "最大化",
-    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s 傳送了 1 個隱藏的訊息",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s 傳送了 %(count)s 個隱藏的訊息",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s 傳送了 1 個隱藏的訊息",
-    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s 傳送了 %(count)s 個隱藏的訊息",
-    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s 移除了 1 個訊息",
-    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s 移除了 %(count)s 個訊息",
-    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s 移除了 1 個訊息",
-    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s 移除了 %(count)s 個訊息",
+    "%(oneUser)ssent %(count)s hidden messages": {
+        "one": "%(oneUser)s 傳送了 1 個隱藏的訊息",
+        "other": "%(oneUser)s 傳送了 %(count)s 個隱藏的訊息"
+    },
+    "%(severalUsers)ssent %(count)s hidden messages": {
+        "one": "%(severalUsers)s 傳送了 1 個隱藏的訊息",
+        "other": "%(severalUsers)s 傳送了 %(count)s 個隱藏的訊息"
+    },
+    "%(oneUser)sremoved a message %(count)s times": {
+        "one": "%(oneUser)s 移除了 1 個訊息",
+        "other": "%(oneUser)s 移除了 %(count)s 個訊息"
+    },
+    "%(severalUsers)sremoved a message %(count)s times": {
+        "one": "%(severalUsers)s 移除了 1 個訊息",
+        "other": "%(severalUsers)s 移除了 %(count)s 個訊息"
+    },
     "Automatically send debug logs when key backup is not functioning": "金鑰備份無法運作時，自動傳送除錯紀錄檔",
     "<empty string>": "<空字串>",
-    "<%(count)s spaces>|one": "<空間>",
-    "<%(count)s spaces>|other": "<%(count)s 個空間>",
+    "<%(count)s spaces>": {
+        "one": "<空間>",
+        "other": "<%(count)s 個空間>"
+    },
     "Join %(roomAddress)s": "加入 %(roomAddress)s",
     "Edit poll": "編輯投票",
     "Sorry, you can't edit a poll after votes have been cast.": "抱歉，您無法在有人投票後編輯投票。",
@@ -2940,10 +3086,14 @@
     "We couldn't send your location": "我們無法傳送您的位置",
     "Match system": "符合系統色彩",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "將滑鼠游標停留在訊息上來開始新的討論串時，回覆正在進行的討論串或使用「%(replyInThread)s」。",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a>",
-    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a>",
-    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a>",
+        "other": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次"
+    },
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times": {
+        "one": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a>",
+        "other": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次"
+    },
     "Insert a trailing colon after user mentions at the start of a message": "在使用者於訊息開頭提及之後插入跟隨冒號",
     "Show polls button": "顯示投票按鈕",
     "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "聊天空間是一種將聊天室與夥伴分組的新方式。您想要建立何種類型的聊天空間？您稍後仍可變更。",
@@ -2966,11 +3116,15 @@
     "You are sharing your live location": "您正在分享您的即時位置",
     "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "若您也想移除此使用者的系統訊息（例如成員資格變更、個人資料變更…），請取消勾選",
     "Preserve system messages": "保留系統訊息",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "您將要移除 %(user)s 的 %(count)s 則訊息。將會為對話中的所有人永久移除它們。確定要繼續嗎？",
-    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "您將要移除 %(user)s 的 %(count)s 則訊息。將會為對話中的所有人永久移除它們。確定要繼續嗎？",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?": {
+        "one": "您將要移除 %(user)s 的 %(count)s 則訊息。將會為對話中的所有人永久移除它們。確定要繼續嗎？",
+        "other": "您將要移除 %(user)s 的 %(count)s 則訊息。將會為對話中的所有人永久移除它們。確定要繼續嗎？"
+    },
     "%(displayName)s's live location": "%(displayName)s 的即時位置",
-    "Currently removing messages in %(count)s rooms|one": "目前正在移除 %(count)s 個聊天室中的訊息",
-    "Currently removing messages in %(count)s rooms|other": "目前正在移除 %(count)s 個聊天室中的訊息",
+    "Currently removing messages in %(count)s rooms": {
+        "one": "目前正在移除 %(count)s 個聊天室中的訊息",
+        "other": "目前正在移除 %(count)s 個聊天室中的訊息"
+    },
     "Share for %(duration)s": "分享 %(duration)s",
     "%(value)sm": "%(value)sm",
     "%(value)ss": "%(value)ss",
@@ -3058,16 +3212,20 @@
     "Create video room": "建立視訊聊天室",
     "Create a video room": "建立視訊聊天室",
     "%(featureName)s Beta feedback": "%(featureName)s Beta 測試回饋",
-    "%(count)s participants|one": "1 位成員",
-    "%(count)s participants|other": "%(count)s 個參與者",
+    "%(count)s participants": {
+        "one": "1 位成員",
+        "other": "%(count)s 個參與者"
+    },
     "New video room": "新視訊聊天室",
     "New room": "新聊天室",
     "sends hearts": "傳送愛心",
     "Sends the given message with hearts": "與愛心一同傳送指定的訊息",
     "Live location ended": "即時位置已結束",
     "View live location": "檢視即時位置",
-    "Confirm signing out these devices|one": "確認登出此裝置",
-    "Confirm signing out these devices|other": "確認登出這些裝置",
+    "Confirm signing out these devices": {
+        "one": "確認登出此裝置",
+        "other": "確認登出這些裝置"
+    },
     "Live location enabled": "即時位置已啟用",
     "Live location error": "即時位置錯誤",
     "Live until %(expiryTime)s": "即時分享直到 %(expiryTime)s",
@@ -3104,8 +3262,10 @@
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "您已登出所有裝置，並將不再收到推送通知。要重新啟用通知，請在每台裝置上重新登入。",
     "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "若您想在加密聊天室中保留對聊天紀錄的存取權限，請設定金鑰備份或從您的其他裝置之一匯出您的訊息金鑰，然後再繼續。",
     "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "登出您的裝置將會刪除儲存在其上的訊息加密金鑰，讓加密的聊天紀錄變為無法讀取。",
-    "Seen by %(count)s people|one": "已被 %(count)s 個人看過",
-    "Seen by %(count)s people|other": "已被 %(count)s 個人看過",
+    "Seen by %(count)s people": {
+        "one": "已被 %(count)s 個人看過",
+        "other": "已被 %(count)s 個人看過"
+    },
     "Your password was successfully changed.": "您的密碼已成功變更。",
     "An error occurred while stopping your live location": "停止您的即時位置時發生錯誤",
     "Enable live location sharing": "啟用即時位置分享",
@@ -3134,8 +3294,10 @@
     "Click to read topic": "點擊以閱讀主題",
     "Edit topic": "編輯主題",
     "Joining…": "正在加入…",
-    "%(count)s people joined|one": "%(count)s 個人已加入",
-    "%(count)s people joined|other": "%(count)s 個人已加入",
+    "%(count)s people joined": {
+        "one": "%(count)s 個人已加入",
+        "other": "%(count)s 個人已加入"
+    },
     "Check if you want to hide all current and future messages from this user.": "若想隱藏來自該使用者所有目前與未來的訊息，請打勾。",
     "Ignore user": "忽略使用者",
     "View related event": "檢視相關的事件",
@@ -3169,8 +3331,10 @@
     "If you can't see who you're looking for, send them your invite link.": "若您看不到要找的人，請將您的邀請連結傳送給他們。",
     "Some results may be hidden for privacy": "出於隱私考量，可能會隱藏一些結果",
     "Search for": "搜尋",
-    "%(count)s Members|one": "%(count)s 個成員",
-    "%(count)s Members|other": "%(count)s 個成員",
+    "%(count)s Members": {
+        "one": "%(count)s 個成員",
+        "other": "%(count)s 個成員"
+    },
     "Show: Matrix rooms": "顯示：Matrix 聊天室",
     "Show: %(instance)s rooms (%(server)s)": "顯示：%(instance)s 聊天室 (%(server)s)",
     "Add new server…": "加入新伺服器…",
@@ -3189,9 +3353,11 @@
     "Enter fullscreen": "進入全螢幕",
     "Map feedback": "地圖回饋",
     "Toggle attribution": "切換屬性",
-    "In %(spaceName)s and %(count)s other spaces.|one": "在 %(spaceName)s 與 %(count)s 個其他空間。",
+    "In %(spaceName)s and %(count)s other spaces.": {
+        "one": "在 %(spaceName)s 與 %(count)s 個其他空間。",
+        "other": "在 %(spaceName)s 與 %(count)s 個其他空間。"
+    },
     "In %(spaceName)s.": "在空間 %(spaceName)s。",
-    "In %(spaceName)s and %(count)s other spaces.|other": "在 %(spaceName)s 與 %(count)s 個其他空間。",
     "In spaces %(space1Name)s and %(space2Name)s.": "在聊天空間 %(space1Name)s 與 %(space2Name)s。",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "開發者指令：丟棄目前外傳的群組工作階段，並設定新的 Olm 工作階段",
     "Stop and close": "停止並關閉",
@@ -3210,8 +3376,10 @@
     "Spell check": "拼字檢查",
     "Complete these to get the most out of %(brand)s": "完成這些步驟以充分利用 %(brand)s",
     "You did it!": "您做到了！",
-    "Only %(count)s steps to go|one": "僅需 %(count)s 步",
-    "Only %(count)s steps to go|other": "僅需 %(count)s 步",
+    "Only %(count)s steps to go": {
+        "one": "僅需 %(count)s 步",
+        "other": "僅需 %(count)s 步"
+    },
     "Welcome to %(brand)s": "歡迎使用 %(brand)s",
     "Find your people": "尋找您的夥伴",
     "Keep ownership and control of community discussion.\nScale to support millions, with powerful moderation and interoperability.": "保持對社群討論的所有權與控制權。\n具有強大的審核工具與互操作性，可擴充至支援數百萬人。",
@@ -3291,11 +3459,15 @@
     "Show": "顯示",
     "<b>It's not recommended to add encryption to public rooms.</b> Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>不建議為公開聊天室新增加密。</b>任何人都可以找到並加入公開聊天室，所以任何人都可以閱讀其中的訊息。您將無法享受加密帶來的任何好處，且您將無法在稍後將其關閉。在公開聊天室中加密訊息將會讓接收與傳送訊息變慢。",
     "Empty room (was %(oldName)s)": "空的聊天室（曾為 %(oldName)s）",
-    "Inviting %(user)s and %(count)s others|one": "正在邀請 %(user)s 與 1 個其他人",
-    "Inviting %(user)s and %(count)s others|other": "正在邀請 %(user)s 與 %(count)s 個其他人",
+    "Inviting %(user)s and %(count)s others": {
+        "one": "正在邀請 %(user)s 與 1 個其他人",
+        "other": "正在邀請 %(user)s 與 %(count)s 個其他人"
+    },
     "Inviting %(user1)s and %(user2)s": "正在邀請 %(user1)s 與 %(user2)s",
-    "%(user)s and %(count)s others|one": "%(user)s 與 1 個其他人",
-    "%(user)s and %(count)s others|other": "%(user)s 與 %(count)s 個其他人",
+    "%(user)s and %(count)s others": {
+        "one": "%(user)s 與 1 個其他人",
+        "other": "%(user)s 與 %(count)s 個其他人"
+    },
     "%(user1)s and %(user2)s": "%(user1)s 與 %(user2)s",
     "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s 或 %(copyButton)s",
     "%(securityKey)s or %(recoveryFile)s": "%(securityKey)s 或 %(recoveryFile)s",
@@ -3402,8 +3574,10 @@
     "Other users in direct messages and rooms that you join are able to view a full list of your sessions.": "您加入的私人訊息與聊天室中其他使用者，可以檢視您工作階段的完整清單。",
     "Renaming sessions": "重新命名工作階段",
     "Please be aware that session names are also visible to people you communicate with.": "請注意，所有與您對話的人都能看到工作階段的名稱。",
-    "Are you sure you want to sign out of %(count)s sessions?|one": "您確定您想要登出 %(count)s 個工作階段嗎？",
-    "Are you sure you want to sign out of %(count)s sessions?|other": "您確定您想要登出 %(count)s 個工作階段嗎？",
+    "Are you sure you want to sign out of %(count)s sessions?": {
+        "one": "您確定您想要登出 %(count)s 個工作階段嗎？",
+        "other": "您確定您想要登出 %(count)s 個工作階段嗎？"
+    },
     "Hide formatting": "隱藏格式化",
     "Connection": "連線",
     "Voice processing": "語音處理",
@@ -3487,8 +3661,10 @@
     "%(senderName)s ended a voice broadcast": "%(senderName)s 已結束語音廣播",
     "You ended a voice broadcast": "您結束了語音廣播",
     "Improve your account security by following these recommendations.": "透過以下的建議改善您的帳號安全性。",
-    "%(count)s sessions selected|one": "已選取 %(count)s 個工作階段",
-    "%(count)s sessions selected|other": "已選取 %(count)s 個工作階段",
+    "%(count)s sessions selected": {
+        "one": "已選取 %(count)s 個工作階段",
+        "other": "已選取 %(count)s 個工作階段"
+    },
     "You can’t start a call as you are currently recording a live broadcast. Please end your live broadcast in order to start a call.": "您無法開始通話，因為您正在錄製直播。請結束您的直播以便開始通話。",
     "Can’t start a call": "無法開始通話",
     "Failed to read events": "讀取事件失敗",
@@ -3501,8 +3677,10 @@
     "Create a link": "建立連結",
     "Link": "連結",
     "Force 15s voice broadcast chunk length": "強制 15 秒語音廣播區塊長度",
-    "Sign out of %(count)s sessions|one": "登出 %(count)s 個工作階段",
-    "Sign out of %(count)s sessions|other": "登出 %(count)s 個工作階段",
+    "Sign out of %(count)s sessions": {
+        "one": "登出 %(count)s 個工作階段",
+        "other": "登出 %(count)s 個工作階段"
+    },
     "Sign out of all other sessions (%(otherSessionsCount)s)": "登出所有其他工作階段（%(otherSessionsCount)s）",
     "Yes, end my recording": "是的，結束我的錄製",
     "If you start listening to this live broadcast, your current live broadcast recording will be ended.": "若您開始收聽本次直播，您目前的直播錄製將會結束。",
@@ -3606,7 +3784,9 @@
     "Room is <strong>encrypted ✅</strong>": "聊天室<strong>已加密 ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "通知狀態為 <strong>%(notificationState)s</strong>",
     "Room unread status: <strong>%(status)s</strong>": "聊天室未讀狀態：<strong>%(status)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "聊天室未讀狀態：<strong>%(status)s</strong>，數量：<strong>%(count)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>": {
+        "other": "聊天室未讀狀態：<strong>%(status)s</strong>，數量：<strong>%(count)s</strong>"
+    },
     "Ended a poll": "投票已結束",
     "Due to decryption errors, some votes may not be counted": "因為解密錯誤，不會計算部份投票",
     "The sender has blocked you from receiving this message": "傳送者已封鎖您，因此無法接收此訊息",
@@ -3615,10 +3795,14 @@
     "Homeserver is <code>%(homeserverUrl)s</code>": "家伺服器為 <code>%(homeserverUrl)s</code>",
     "Show NSFW content": "顯示工作不宜的 NSFW 內容",
     "View poll": "檢視投票",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|one": "過去一天沒有過去的投票。載入更多投票以檢視前幾個月的投票",
-    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months|other": "過去 %(count)s 天沒有過去的投票。載入更多投票以檢視前幾個月的投票",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|one": "過去一天沒有進行中的投票。載入更多投票以檢視前幾個月的投票",
-    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months|other": "過去 %(count)s 天沒有進行中的投票。載入更多投票以檢視前幾個月的投票",
+    "There are no past polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "過去一天沒有過去的投票。載入更多投票以檢視前幾個月的投票",
+        "other": "過去 %(count)s 天沒有過去的投票。載入更多投票以檢視前幾個月的投票"
+    },
+    "There are no active polls for the past %(count)s days. Load more polls to view polls for previous months": {
+        "one": "過去一天沒有進行中的投票。載入更多投票以檢視前幾個月的投票",
+        "other": "過去 %(count)s 天沒有進行中的投票。載入更多投票以檢視前幾個月的投票"
+    },
     "There are no past polls. Load more polls to view polls for previous months": "沒有過去的投票。載入更多投票以檢視前幾個月的投票",
     "There are no active polls. Load more polls to view polls for previous months": "沒有進行中的投票。載入更多投票以檢視前幾個月的投票",
     "Load more polls": "載入更多投票",
@@ -3733,7 +3917,10 @@
     "Other things we think you might be interested in:": "我們認為您可能感興趣的其他事情：",
     "Notify when someone mentions using @room": "當有人使用 @room 提及時通知",
     "Reset to default settings": "重設為預設設定",
-    "%(oneUser)schanged their profile picture %(count)s times|other": "%(oneUser)s 變更了他們的個人檔案圖片 %(count)s 次",
+    "%(oneUser)schanged their profile picture %(count)s times": {
+        "other": "%(oneUser)s 變更了他們的個人檔案圖片 %(count)s 次",
+        "one": "%(oneUser)s 變更了他們的個人檔案圖片"
+    },
     "Anyone can request to join, but admins or moderators need to grant access. You can change this later.": "任何人都可以請求加入，但管理員或版主必須授予存取權限。您可以稍後變更此設定。",
     "Upgrade room": "升級聊天室",
     "User read up to (ignoreSynthetic): ": "使用者閱讀至 (ignoreSynthetic)： ",
@@ -3761,18 +3948,19 @@
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their profile picture.": "此處的訊息為端到端加密。請在其個人檔案中驗證 %(displayName)s - 點擊其個人檔案圖片。",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their profile picture.": "此聊天室中的訊息為端到端加密。當人們加入時，您可以在他們的個人檔案中驗證他們，點擊他們的個人檔案就可以了。",
     "Your profile picture URL": "您的個人檔案圖片 URL",
-    "%(severalUsers)schanged their profile picture %(count)s times|other": "%(severalUsers)s 變更了他們的個人檔案圖片 %(count)s 次",
+    "%(severalUsers)schanged their profile picture %(count)s times": {
+        "other": "%(severalUsers)s 變更了他們的個人檔案圖片 %(count)s 次",
+        "one": "%(severalUsers)s 變更了他們的個人檔案圖片"
+    },
     "Are you sure you wish to remove (delete) this event?": "您真的想要移除（刪除）此活動嗎？",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a unique passphrase below, which will only be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "匯出的檔案將允許任何可以讀取該檔案的人解密您可以看到的任何加密訊息，因此您應該小心確保其安全。為了協助解決此問題，您應該在下面輸入一個唯一的密碼，該密碼僅用於加密匯出的資料。只能使用相同的密碼匯入資料。",
     "Under active development, new room header & details interface": "正在積極開發中，新的聊天室標題與詳細資訊介面",
     "Other spaces you know": "您知道的其他空間",
     "You need to be granted access to this room in order to view or participate in the conversation. You can send a request to join below.": "您需要被授予存取此聊天室的權限才能檢視或參與對話。您可以在下面傳送加入請求。",
-    "%(severalUsers)schanged their profile picture %(count)s times|one": "%(severalUsers)s 變更了他們的個人檔案圖片",
     "You need an invite to access this room.": "您需要邀請才能存取此聊天室。",
     "Failed to cancel": "取消失敗",
     "Ask to join %(roomName)s?": "要求加入 %(roomName)s？",
     "Ask to join?": "要求加入？",
-    "%(oneUser)schanged their profile picture %(count)s times|one": "%(oneUser)s 變更了他們的個人檔案圖片",
     "Message (optional)": "訊息（選擇性）",
     "Request access": "請求存取權",
     "Request to join sent": "已傳送加入請求",
diff --git a/test/setup/setupLanguage.ts b/test/setup/setupLanguage.ts
index 5476cb1765..4780a97d5e 100644
--- a/test/setup/setupLanguage.ts
+++ b/test/setup/setupLanguage.ts
@@ -22,7 +22,9 @@ import de from "../../src/i18n/strings/de_DE.json";
 
 const lv = {
     "Save": "Saglabāt",
-    "Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
+    "Uploading %(filename)s and %(count)s others": {
+        one: "Качване на %(filename)s и %(count)s друг",
+    },
 };
 
 // Fake languages.json containing references to en_EN, de_DE and lv
@@ -30,34 +32,6 @@ const lv = {
 // de_DE.json
 // lv.json - mock version with few translations, used to test fallback translation
 
-type Translations = Record<string, Record<string, string> | string>;
-
-function weblateToCounterpart(inTrs: Record<string, string>): Translations {
-    const outTrs: Translations = {};
-
-    for (const key of Object.keys(inTrs)) {
-        const keyParts = key.split("|", 2);
-        if (keyParts.length === 2) {
-            let obj = outTrs[keyParts[0]];
-            if (obj === undefined) {
-                obj = outTrs[keyParts[0]] = {};
-            } else if (typeof obj === "string") {
-                // This is a transitional edge case if a string went from singular to pluralised and both still remain
-                // in the translation json file. Use the singular translation as `other` and merge pluralisation atop.
-                obj = outTrs[keyParts[0]] = {
-                    other: inTrs[key],
-                };
-                console.warn("Found entry in i18n file in both singular and pluralised form", keyParts[0]);
-            }
-            obj[keyParts[1]] = inTrs[key];
-        } else {
-            outTrs[key] = inTrs[key];
-        }
-    }
-
-    return outTrs;
-}
-
 fetchMock
     .get("/i18n/languages.json", {
         en: {
@@ -73,9 +47,9 @@ fetchMock
             label: "Latvian",
         },
     })
-    .get("end:en_EN.json", weblateToCounterpart(en))
-    .get("end:de_DE.json", weblateToCounterpart(de))
-    .get("end:lv.json", weblateToCounterpart(lv));
+    .get("end:en_EN.json", en)
+    .get("end:de_DE.json", de)
+    .get("end:lv.json", lv);
 
 languageHandler.setLanguage("en");
 languageHandler.setMissingEntryGenerator((key) => key.split("|", 2)[1]);
diff --git a/yarn.lock b/yarn.lock
index 1395edfe1b..f11ec36da0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7323,10 +7323,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-web-i18n@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-1.4.0.tgz#f383a3ebc29d3fd6eb137d38cc4c3198771cc073"
-  integrity sha512-+NP2h4zdft+2H/6oFQ0i2PBm00Ei6HpUHke8rklgpe/yCABBG5Q7gIQdZoxazi0DXWWtcvvIfgamPZmkg6oRwA==
+matrix-web-i18n@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-2.0.0.tgz#fe43c9e4061410cef4b8663527ee692296ce023b"
+  integrity sha512-bMn4MsWKnzzfQPVAfgmlMXa1rqVS1kUuTQ//d+Zsze2hGX8pTB1y3qFLYhkgAgVcx89FxiVL7Kw9dUzllvwgOg==
   dependencies:
     "@babel/parser" "^7.18.5"
     "@babel/traverse" "^7.18.5"