Skip to content

Commit 4e57ce0

Browse files
committed
Merge remote-tracking branch 'pr/1453'
2 parents 9e09492 + 1fa9f24 commit 4e57ce0

22 files changed

+1464
-132
lines changed

assets/l10n/app_en.arb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,13 @@
377377
"@discardDraftConfirmationDialogTitle": {
378378
"description": "Title for a confirmation dialog for discarding message text that was typed into the compose box."
379379
},
380-
"discardDraftConfirmationDialogMessage": "When you edit a message, the content that was previously in the compose box is discarded.",
381-
"@discardDraftConfirmationDialogMessage": {
382-
"description": "Message for a confirmation dialog for discarding message text that was typed into the compose box."
380+
"discardDraftForEditConfirmationDialogMessage": "When you edit a message, the content that was previously in the compose box is discarded.",
381+
"@discardDraftForEditConfirmationDialogMessage": {
382+
"description": "Message for a confirmation dialog for discarding message text that was typed into the compose box, when editing a message."
383+
},
384+
"discardDraftForMessageNotSentConfirmationDialogMessage": "When you restore a message not sent, the content that was previously in the compose box is discarded.",
385+
"@discardDraftForMessageNotSentConfirmationDialogMessage": {
386+
"description": "Message for a confirmation dialog when restoring a message not sent, for discarding message text that was typed into the compose box."
383387
},
384388
"discardDraftConfirmationDialogConfirmButton": "Discard",
385389
"@discardDraftConfirmationDialogConfirmButton": {
@@ -872,6 +876,10 @@
872876
"@messageIsMovedLabel": {
873877
"description": "Label for a moved message. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)"
874878
},
879+
"messageNotSentLabel": "MESSAGE NOT SENT",
880+
"@messageNotSentLabel": {
881+
"description": "Text on a message in the message list saying that a send message request failed. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)"
882+
},
875883
"pollVoterNames": "({voterNames})",
876884
"@pollVoterNames": {
877885
"description": "The list of people who voted for a poll option, wrapped in parentheses.",

assets/l10n/app_pl.arb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,9 +1049,9 @@
10491049
"@discardDraftConfirmationDialogTitle": {
10501050
"description": "Title for a confirmation dialog for discarding message text that was typed into the compose box."
10511051
},
1052-
"discardDraftConfirmationDialogMessage": "Miej na uwadze, że przechodząc do zmiany wiadomości wyczyścisz okno nowej wiadomości.",
1053-
"@discardDraftConfirmationDialogMessage": {
1054-
"description": "Message for a confirmation dialog for discarding message text that was typed into the compose box."
1052+
"discardDraftForEditConfirmationDialogMessage": "Miej na uwadze, że przechodząc do zmiany wiadomości wyczyścisz okno nowej wiadomości.",
1053+
"@discardDraftForEditConfirmationDialogMessage": {
1054+
"description": "Message for a confirmation dialog for discarding message text that was typed into the compose box, when editing a message."
10551055
},
10561056
"discardDraftConfirmationDialogConfirmButton": "Odrzuć",
10571057
"@discardDraftConfirmationDialogConfirmButton": {

lib/generated/l10n/zulip_localizations.dart

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,11 +631,17 @@ abstract class ZulipLocalizations {
631631
/// **'Discard the message you’re writing?'**
632632
String get discardDraftConfirmationDialogTitle;
633633

634-
/// Message for a confirmation dialog for discarding message text that was typed into the compose box.
634+
/// Message for a confirmation dialog for discarding message text that was typed into the compose box, when editing a message.
635635
///
636636
/// In en, this message translates to:
637637
/// **'When you edit a message, the content that was previously in the compose box is discarded.'**
638-
String get discardDraftConfirmationDialogMessage;
638+
String get discardDraftForEditConfirmationDialogMessage;
639+
640+
/// Message for a confirmation dialog when restoring a message not sent, for discarding message text that was typed into the compose box.
641+
///
642+
/// In en, this message translates to:
643+
/// **'When you restore a message not sent, the content that was previously in the compose box is discarded.'**
644+
String get discardDraftForMessageNotSentConfirmationDialogMessage;
639645

640646
/// Label for the 'Discard' button on a confirmation dialog for discarding message text that was typed into the compose box.
641647
///
@@ -1289,6 +1295,12 @@ abstract class ZulipLocalizations {
12891295
/// **'MOVED'**
12901296
String get messageIsMovedLabel;
12911297

1298+
/// Text on a message in the message list saying that a send message request failed. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)
1299+
///
1300+
/// In en, this message translates to:
1301+
/// **'MESSAGE NOT SENT'**
1302+
String get messageNotSentLabel;
1303+
12921304
/// The list of people who voted for a poll option, wrapped in parentheses.
12931305
///
12941306
/// In en, this message translates to:

lib/generated/l10n/zulip_localizations_ar.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,13 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
318318
'Discard the message you’re writing?';
319319

320320
@override
321-
String get discardDraftConfirmationDialogMessage =>
321+
String get discardDraftForEditConfirmationDialogMessage =>
322322
'When you edit a message, the content that was previously in the compose box is discarded.';
323323

324+
@override
325+
String get discardDraftForMessageNotSentConfirmationDialogMessage =>
326+
'When you restore a message not sent, the content that was previously in the compose box is discarded.';
327+
324328
@override
325329
String get discardDraftConfirmationDialogConfirmButton => 'Discard';
326330

@@ -710,6 +714,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
710714
@override
711715
String get messageIsMovedLabel => 'MOVED';
712716

717+
@override
718+
String get messageNotSentLabel => 'MESSAGE NOT SENT';
719+
713720
@override
714721
String pollVoterNames(String voterNames) {
715722
return '($voterNames)';

lib/generated/l10n/zulip_localizations_de.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,13 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
318318
'Discard the message you’re writing?';
319319

320320
@override
321-
String get discardDraftConfirmationDialogMessage =>
321+
String get discardDraftForEditConfirmationDialogMessage =>
322322
'When you edit a message, the content that was previously in the compose box is discarded.';
323323

324+
@override
325+
String get discardDraftForMessageNotSentConfirmationDialogMessage =>
326+
'When you restore a message not sent, the content that was previously in the compose box is discarded.';
327+
324328
@override
325329
String get discardDraftConfirmationDialogConfirmButton => 'Discard';
326330

@@ -710,6 +714,9 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
710714
@override
711715
String get messageIsMovedLabel => 'MOVED';
712716

717+
@override
718+
String get messageNotSentLabel => 'MESSAGE NOT SENT';
719+
713720
@override
714721
String pollVoterNames(String voterNames) {
715722
return '($voterNames)';

lib/generated/l10n/zulip_localizations_en.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,13 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
318318
'Discard the message you’re writing?';
319319

320320
@override
321-
String get discardDraftConfirmationDialogMessage =>
321+
String get discardDraftForEditConfirmationDialogMessage =>
322322
'When you edit a message, the content that was previously in the compose box is discarded.';
323323

324+
@override
325+
String get discardDraftForMessageNotSentConfirmationDialogMessage =>
326+
'When you restore a message not sent, the content that was previously in the compose box is discarded.';
327+
324328
@override
325329
String get discardDraftConfirmationDialogConfirmButton => 'Discard';
326330

@@ -710,6 +714,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
710714
@override
711715
String get messageIsMovedLabel => 'MOVED';
712716

717+
@override
718+
String get messageNotSentLabel => 'MESSAGE NOT SENT';
719+
713720
@override
714721
String pollVoterNames(String voterNames) {
715722
return '($voterNames)';

lib/generated/l10n/zulip_localizations_ja.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,13 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
318318
'Discard the message you’re writing?';
319319

320320
@override
321-
String get discardDraftConfirmationDialogMessage =>
321+
String get discardDraftForEditConfirmationDialogMessage =>
322322
'When you edit a message, the content that was previously in the compose box is discarded.';
323323

324+
@override
325+
String get discardDraftForMessageNotSentConfirmationDialogMessage =>
326+
'When you restore a message not sent, the content that was previously in the compose box is discarded.';
327+
324328
@override
325329
String get discardDraftConfirmationDialogConfirmButton => 'Discard';
326330

@@ -710,6 +714,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
710714
@override
711715
String get messageIsMovedLabel => 'MOVED';
712716

717+
@override
718+
String get messageNotSentLabel => 'MESSAGE NOT SENT';
719+
713720
@override
714721
String pollVoterNames(String voterNames) {
715722
return '($voterNames)';

lib/generated/l10n/zulip_localizations_nb.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,13 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
318318
'Discard the message you’re writing?';
319319

320320
@override
321-
String get discardDraftConfirmationDialogMessage =>
321+
String get discardDraftForEditConfirmationDialogMessage =>
322322
'When you edit a message, the content that was previously in the compose box is discarded.';
323323

324+
@override
325+
String get discardDraftForMessageNotSentConfirmationDialogMessage =>
326+
'When you restore a message not sent, the content that was previously in the compose box is discarded.';
327+
324328
@override
325329
String get discardDraftConfirmationDialogConfirmButton => 'Discard';
326330

@@ -710,6 +714,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
710714
@override
711715
String get messageIsMovedLabel => 'MOVED';
712716

717+
@override
718+
String get messageNotSentLabel => 'MESSAGE NOT SENT';
719+
713720
@override
714721
String pollVoterNames(String voterNames) {
715722
return '($voterNames)';

lib/generated/l10n/zulip_localizations_pl.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,13 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
325325
'Czy chcesz przerwać szykowanie wpisu?';
326326

327327
@override
328-
String get discardDraftConfirmationDialogMessage =>
328+
String get discardDraftForEditConfirmationDialogMessage =>
329329
'Miej na uwadze, że przechodząc do zmiany wiadomości wyczyścisz okno nowej wiadomości.';
330330

331+
@override
332+
String get discardDraftForMessageNotSentConfirmationDialogMessage =>
333+
'When you restore a message not sent, the content that was previously in the compose box is discarded.';
334+
331335
@override
332336
String get discardDraftConfirmationDialogConfirmButton => 'Odrzuć';
333337

@@ -719,6 +723,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
719723
@override
720724
String get messageIsMovedLabel => 'PRZENIESIONO';
721725

726+
@override
727+
String get messageNotSentLabel => 'MESSAGE NOT SENT';
728+
722729
@override
723730
String pollVoterNames(String voterNames) {
724731
return '($voterNames)';

lib/generated/l10n/zulip_localizations_ru.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,13 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
326326
'Discard the message you’re writing?';
327327

328328
@override
329-
String get discardDraftConfirmationDialogMessage =>
329+
String get discardDraftForEditConfirmationDialogMessage =>
330330
'When you edit a message, the content that was previously in the compose box is discarded.';
331331

332+
@override
333+
String get discardDraftForMessageNotSentConfirmationDialogMessage =>
334+
'When you restore a message not sent, the content that was previously in the compose box is discarded.';
335+
332336
@override
333337
String get discardDraftConfirmationDialogConfirmButton => 'Discard';
334338

@@ -723,6 +727,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
723727
@override
724728
String get messageIsMovedLabel => 'ПЕРЕМЕЩЕНО';
725729

730+
@override
731+
String get messageNotSentLabel => 'MESSAGE NOT SENT';
732+
726733
@override
727734
String pollVoterNames(String voterNames) {
728735
return '($voterNames)';

0 commit comments

Comments
 (0)