diff --git a/src/assets/localization/fallback.strings b/src/assets/localization/fallback.strings
index df84dabdb..98734d4c4 100644
--- a/src/assets/localization/fallback.strings
+++ b/src/assets/localization/fallback.strings
@@ -425,7 +425,7 @@
 "SettingsSendCtrlenter" = "Send with Ctrl+Enter";
 "SettingsSendEnterDescription" = "New line by Shift + Enter";
 "SettingsSendPlusEnterDescription" = "New line by Enter";
-"SettingsTimeFormat" = "Time Format";
+"SettingsTimeFormat" = "Time format";
 "SettingsTimeFormat12" = "12-hour";
 "SettingsTimeFormat24" = "24-hour";
 "SettingsKeyboard" = "Keyboard";
@@ -1360,7 +1360,7 @@
 "StarsGiftHeader" = "Send a Gift";
 "StarsGiftHeaderSelf" = "Buy a Gift";
 "StarGiftDescription" = "Give {user} gifts that can be kept on the profile or converted to Stars.";
-"StarGiftDescriptionSelf" = "Buy yourself a gift to display on your page or reserve for later.\n\nLimited-edition gifts upgraded to collectibles can be gifted to others later.";
+"StarGiftDescriptionSelf" = "Buy yourself a gift to add to your profile or reserve for later.\n\nLimited-edition gifts upgraded to collectibles can be gifted to others.";
 "GiftLimited" = "limited";
 "GiftDiscount" = "-{percent}%";
 "GiftSoldCount" = "{count} sold";
@@ -1428,7 +1428,7 @@
 "GiftUpgradeUniqueDescription" = "Turn your gift into a unique collectible that you can transfer or auction.";
 "GiftUpgradeTransferableTitle" = "Transferable";
 "GiftUpgradeTransferableDescription" = "Send your upgraded gift to any of your friends on Telegram.";
-"GiftUpgradeTradeableTitle" = "Tradeable";
+"GiftUpgradeTradeableTitle" = "Tradable";
 "GiftUpgradeTradeableDescription" = "Sell or auction your gift on third-party NFT marketplaces.";
 "GiftUpgradeTitle" = "Make unique";
 "GiftUpgradeText" = "Let {peer} turn your gift into a unique collectible.";
@@ -1458,9 +1458,11 @@
 "PrizeCredits" = "Your prize is {count} Stars.";
 "ActionStarGiftTitle" = "{user} sent you a Gift for {count} Stars";
 "ActionStarGiftOutTitle" = "You have sent a gift for {count} Stars";
-"ActionStarGiftOutDescription" = "{user} can display this gift on their page or convert it to {count} Stars.";
-"ActionStarGiftDescription" = "Display this gift on your page or convert it to {count} Stars.";
-"ActionStarGiftDisplaying" = "You kept this gift on your page.";
+"ActionStarGiftOutDescription_one" = "{user} can display this gift on their profile or convert it to {count} Star.";
+"ActionStarGiftOutDescription_other" = "{user} can display this gift on their profile or convert it to {count} Stars.";
+"ActionStarGiftDescription_one" = "Add this gift to your profile or convert it to {count} Star.";
+"ActionStarGiftDescription_other" = "Add this gift to your profile or convert it to {count} Stars.";
+"ActionStarGiftDisplaying" = "You kept this gift on your profile.";
 "ActionStarGiftOutDescriptionUpgrade" = "{user} can turn this gift to a unique collectible.";
 "ActionStarGiftDescriptionUpgrade" = "Tap “Unpack” to turn this gift to a unique collectible.";
 "ActionStarGiftUpgraded" = "This gift was upgraded.";
@@ -1492,9 +1494,9 @@
 "BotSuggestedStatusFor" = "Do you want to set this emoji status suggested by **{bot}** for **{duration}**?";
 "BotSuggestedStatus" = "Do you want to set this emoji status suggested by **{bot}**?";
 "BotSuggestedStatusTitle" = "Set Emoji Status";
-"BotSuggestedStatusUpdated" = "Your emoji status is updated.";
+"BotSuggestedStatusUpdated" = "Emoji status updated.";
 "BotDownloadFileTitle" = "Download File";
-"BotDownloadFileDescription" = "**{bot}** suggests you to download **{filename}**";
+"BotDownloadFileDescription" = "**{bot}** offers you to download **{filename}**";
 "BotDownloadFileButton" = "Download";
 "PrivacyGifts" = "Gifts";
 "PrivacyGiftsTitle" = "Who can display gifts on my profile?";
diff --git a/src/components/middle/ActionMessage.tsx b/src/components/middle/ActionMessage.tsx
index 35571b1c2..691261b4f 100644
--- a/src/components/middle/ActionMessage.tsx
+++ b/src/components/middle/ActionMessage.tsx
@@ -446,7 +446,7 @@ const ActionMessage: FC<OwnProps & StateProps> = ({
         return lang('ActionStarGiftOutDescription', {
           user: targetUser || 'User',
           count: amountToConvert,
-        }, { withNodes: true });
+        }, { withNodes: true, pluralValue: amountToConvert });
       }
 
       if (starGift.canUpgrade) {
@@ -486,7 +486,7 @@ const ActionMessage: FC<OwnProps & StateProps> = ({
     if (amountToConvert) {
       return lang('ActionStarGiftDescription', {
         count: amountToConvert,
-      }, { withNodes: true });
+      }, { withNodes: true, pluralValue: amountToConvert });
     }
 
     if (starGift.canUpgrade) {
diff --git a/src/types/language.d.ts b/src/types/language.d.ts
index 9a3069daf..d7cf31c44 100644
--- a/src/types/language.d.ts
+++ b/src/types/language.d.ts
@@ -1713,13 +1713,6 @@ export interface LangPairWithVariables<V extends unknown = LangVariable> {
   'ActionStarGiftOutTitle': {
     'count': V;
   };
-  'ActionStarGiftOutDescription': {
-    'user': V;
-    'count': V;
-  };
-  'ActionStarGiftDescription': {
-    'count': V;
-  };
   'ActionStarGiftOutDescriptionUpgrade': {
     'user': V;
   };
@@ -1959,6 +1952,13 @@ export interface LangPairPluralWithVariables<V extends unknown = LangVariable> {
     'botName': V;
     'count': V;
   };
+  'ActionStarGiftOutDescription': {
+    'user': V;
+    'count': V;
+  };
+  'ActionStarGiftDescription': {
+    'count': V;
+  };
   'StarsSubscribeText': {
     'chat': V;
     'amount': V;