fluffychat merge

lib/l10n/intl_en.arb

@@ -2739,15 +2739,6 @@
   "@signInWithPassword": {},
   "pleaseTryAgainLaterOrChooseDifferentServer": "Please try again later or choose a different server.",
   "@pleaseTryAgainLaterOrChooseDifferentServer": {},
-  "signInWith": "Sign in with {provider}",
-  "@signInWith": {
-    "type": "String",
-    "placeholders": {
-      "provider": {
-        "type": "String"
-      }
-    }
-  },
   "profileNotFound": "The user could not be found on the server. Maybe there is a connection problem or the user doesn't exist.",
   "@profileNotFound": {},
   "setTheme": "Set theme:",
@@ -3500,8 +3491,7 @@
   "@advancedConfigs": {},
   "advancedConfigurations": "Advanced configurations",
   "@advancedConfigurations": {},
-  "signInWith": "Sign in with:",
-  "@signInWith": {},
+  "signInWithLabel": "Sign in with:",
   "ignore": "Block",
   "ignoredUsers": "Blocked users",
   "writeAMessageLangCodes": "Type in {l1} or {l2}...",

lib/pages/homeserver_picker/homeserver_picker_view.dart

@@ -133,7 +133,7 @@ class HomeserverPickerView extends StatelessWidget {
                               hintStyle: TextStyle(
                                 color: theme.colorScheme.surfaceTint,
                               ),
-                              labelText: L10n.of(context).signInWith,
+                              labelText: L10n.of(context).signInWithLabel,
                               errorText: controller.error,
                               errorMaxLines: 4,
                               suffixIcon: IconButton(