merge: all upstream changes

locales/en-US.yml

@@ -1128,6 +1128,15 @@ edited: "Edited"
 notificationRecieveConfig: "Notification Settings"
 mutualFollow: "Mutual follow"
 fileAttachedOnly: "Only notes with files"
+showRepliesToOthersInTimeline: "Show replies to others in TL"
+hideRepliesToOthersInTimeline: "Hide replies to others from TL"
+externalServices: "External Services"
+impressum: "Impressum"
+impressumUrl: "Impressum URL"
+impressumDescription: "In some countries, like germany, the inclusion of operator contact information (an Impressum) is legally required for commercial websites."
+privacyPolicy: "Privacy Policy"
+privacyPolicyUrl: "Privacy Policy URL"
+tosAndPrivacyPolicy: "Terms of Service and Privacy Policy"
 _announcement:
   forExistingUsers: "Existing users only"
   forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it."
@@ -1458,7 +1467,6 @@ _role:
     gtlAvailable: "Can view the global timeline"
     ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
-    canEditNote: "Note editing"
     canInvite: "Can create instance invite codes"
     inviteLimit: "Invite limit"
     inviteLimitCycle: "Invite limit cooldown"
@@ -1478,6 +1486,7 @@ _role:
     descriptionOfRateLimitFactor: "Lower rate limits are less restrictive, higher ones more restrictive. "
     canHideAds: "Can hide ads"
     canSearchNotes: "Usage of note search"
+    canUseTranslator: "Translator usage"
   _condition:
     isLocal: "Local user"
     isRemote: "Remote user"
@@ -1526,6 +1535,10 @@ _ad:
   reduceFrequencyOfThisAd: "Show this ad less"
   hide: "Hide"
   timezoneinfo: "The day of the week is determined from the server's timezone."
+  adsSettings: "Ad settings"
+  notesPerOneAd: "Real-time update ad placement interval (Notes per ad)"
+  setZeroToDisable: "Set this value to 0 to disable real-time update ads"
+  adsTooClose: "The current ad interval may significantly worsen the user experience due to being too low."
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
   ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
@@ -1611,11 +1624,6 @@ _wordMute:
   muteWords: "Muted words"
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
   muteWordsDescription2: "Surround keywords with slashes to use regular expressions."
-  softDescription: "Hide notes that fulfil the set conditions from the timeline."
-  hardDescription: "Prevents notes fulfilling the set conditions from being added to the timeline. In addition, these notes will not be added to the timeline even if the conditions are changed."
-  soft: "Soft"
-  hard: "Hard"
-  mutedNotes: "Muted notes"
 _instanceMute:
   instanceMuteDescription: "This will mute any notes/renotes from the listed instances, including those of users replying to a user from a muted instance."
   instanceMuteDescription2: "Separate with newlines"
@@ -1679,9 +1687,6 @@ _theme:
     infoFg: "Information text"
     infoWarnBg: "Warning background"
     infoWarnFg: "Warning text"
-    cwBg: "CW button background"
-    cwFg: "CW button text"
-    cwHoverBg: "CW button background (Hover)"
     toastBg: "Notification background"
     toastFg: "Notification text"
     buttonBg: "Button background"
@@ -1699,8 +1704,6 @@ _sfx:
   note: "New note"
   noteMy: "Own note"
   notification: "Notifications"
-  chat: "Chat"
-  chatBg: "Chat (Background)"
   antenna: "Antennas"
   channel: "Channel notifications"
 _ago:
@@ -2213,3 +2216,11 @@ _mfm:
   backgroundDescription: "Change the background color of text."
   plain: "Plain"
   plainDescription: "Deactivates the effects of all MFM contained within this MFM effect."
+_fileViewer:
+  title: "File details"
+  type: "File type"
+  size: "Filesize"
+  url: "URL"
+  uploadedAt: "Uploaded at"
+  attachedNotes: "Attached notes"
+  thisPageCanBeSeenFromTheAuthor: "This page can only be seen by the user who uploaded this file."