Merge remote-tracking branch 'github/translations'

damus/Models/Mentions.swift

@@ -274,8 +274,8 @@ func format_msats(_ msat: Int64, locale: Locale = Locale.current) -> String {
     let sats = NSNumber(value: (Double(msat) / 1000.0))
     let formattedSats = numberFormatter.string(from: sats) ?? sats.stringValue
 
-    let bundle = bundleForLocale(locale: locale)
-    return String(format: bundle.localizedString(forKey: "sats_count", value: nil, table: nil), locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats)
+    let format = localizedStringFormat(key: "sats_count", locale: locale)
+    return String(format: format, locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats)
 }
 
 func convert_invoice_block(_ b: invoice_block) -> Block? {

damus/Util/LocalizationUtil.swift

@@ -15,3 +15,9 @@ func bundleForLocale(locale: Locale?) -> Bundle {
     let path = Bundle.main.path(forResource: locale!.identifier, ofType: "lproj")
     return path != nil ? (Bundle(path: path!) ?? Bundle.main) : Bundle.main
 }
+
+func localizedStringFormat(key: String, locale: Locale?) -> String {
+    let bundle = bundleForLocale(locale: locale)
+    let fallback = bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: key, value: nil, table: nil)
+    return bundle.localizedString(forKey: key, value: fallback, table: nil)
+}

damus/Views/ActionBar/EventDetailBar.swift

@@ -53,18 +53,18 @@ struct EventDetailBar: View {
 }
 
 func repostsCountString(_ count: Int, locale: Locale = Locale.current) -> String {
-    let bundle = bundleForLocale(locale: locale)
-    return String(format: bundle.localizedString(forKey: "reposts_count", value: nil, table: nil), locale: locale, count)
+    let format = localizedStringFormat(key: "reposts_count", locale: locale)
+    return String(format: format, locale: locale, count)
 }
 
 func reactionsCountString(_ count: Int, locale: Locale = Locale.current) -> String {
-    let bundle = bundleForLocale(locale: locale)
-    return String(format: bundle.localizedString(forKey: "reactions_count", value: nil, table: nil), locale: locale, count)
+    let format = localizedStringFormat(key: "reactions_count", locale: locale)
+    return String(format: format, locale: locale, count)
 }
 
 func zapsCountString(_ count: Int, locale: Locale = Locale.current) -> String {
-    let bundle = bundleForLocale(locale: locale)
-    return String(format: bundle.localizedString(forKey: "zaps_count", value: nil, table: nil), locale: locale, count)
+    let format = localizedStringFormat(key: "zaps_count", locale: locale)
+    return String(format: format, locale: locale, count)
 }
 
 struct EventDetailBar_Previews: PreviewProvider {

damus/Views/ActionBar/ShareAction.swift

@@ -32,7 +32,7 @@ struct ShareAction: View {
         let col = colorScheme == .light ? Color("DamusMediumGrey") : Color("DamusWhite")
         
         VStack {
-            Text("Share Note")
+            Text("Share Note", comment: "Title text to indicate that the buttons below are meant to be used to share a note with others.")
                 .padding()
                 .font(.system(size: 17, weight: .bold))
             
@@ -40,7 +40,7 @@ struct ShareAction: View {
 
             HStack(alignment: .top, spacing: 25) {
                 
-                ShareActionButton(img: "link", txt: "Copy Link", comment: "Button to copy link to note", col: col) {
+                ShareActionButton(img: "link", text: NSLocalizedString("Copy Link", comment: "Button to copy link to note"), col: col) {
                     show_share_action = false
                     UIPasteboard.general.string = "https://damus.io/" + (bech32_note_id(event.id) ?? event.id)
                 }
@@ -48,18 +48,18 @@ struct ShareAction: View {
                 let bookmarkImg = isBookmarked ? "bookmark.slash" : "bookmark"
                 let bookmarkTxt = isBookmarked ? "Remove\nBookmark" : "Bookmark"
                 let boomarkCol = isBookmarked ? Color(.red) : col
-                ShareActionButton(img: bookmarkImg, txt: bookmarkTxt, comment: "Button to bookmark to note", col: boomarkCol) {
+                ShareActionButton(img: bookmarkImg, text: NSLocalizedString(bookmarkTxt, comment: "Button to bookmark to note"), col: boomarkCol) {
                     show_share_action = false
                     self.bookmarks.updateBookmark(event)
                     isBookmarked = self.bookmarks.isBookmarked(event)
                 }
                 
-                ShareActionButton(img: "globe", txt: "Broadcast", comment: "Button to broadcast note to all your relays", col: col) {
+                ShareActionButton(img: "globe", text: NSLocalizedString("Broadcast", comment: "Button to broadcast note to all your relays"), col: col) {
                     show_share_action = false
                     NotificationCenter.default.post(name: .broadcast_event, object: event)
                 }
                 
-                ShareActionButton(img: "square.and.arrow.up", txt: "Share Via...", comment: "Button to present iOS share sheet", col: col) {
+                ShareActionButton(img: "square.and.arrow.up", text: NSLocalizedString("Share Via...", comment: "Button to present iOS share sheet"), col: col) {
                     show_share_action = false
                     show_share_sheet = true
                 }
@@ -87,7 +87,7 @@ struct ShareAction: View {
     }
 }
 
-func ShareActionButton(img: String, txt: String, comment: String, col: Color, action: @escaping () -> ()) -> some View {
+func ShareActionButton(img: String, text: String, col: Color, action: @escaping () -> ()) -> some View {
     Button(action: action) {
         VStack() {
             Image(systemName: img)
@@ -99,7 +99,7 @@ func ShareActionButton(img: String, txt: String, comment: String, col: Color, ac
                         .frame(width: 55.0, height: 55.0)
                 }
                 .frame(height: 25)
-            Text(NSLocalizedString(txt, comment: comment))
+            Text(verbatim: text)
                 .foregroundColor(col)
                 .font(.footnote)
                 .multilineTextAlignment(.center)

damus/Views/ConfigView.swift

@@ -213,7 +213,7 @@ struct ConfigView: View {
                         clear_kingfisher_cache()
                     }
                     
-                    Picker(NSLocalizedString("Select image uplodaer", comment: "Prompt selection of user's image uplodaer"),
+                    Picker(NSLocalizedString("Select image uploader", comment: "Prompt selection of user's image uploader"),
                            selection: $settings.default_image_uploader) {
                         ForEach(ImageUploader.allCases, id: \.self) { uploader in
                             Text(uploader.model.displayName)

damus/Views/Events/EventMenu.swift

@@ -18,11 +18,11 @@ struct EventMenuContext: View {
     var body: some View {
         HStack {
             Menu {
-                
+
                 MenuItems(event: event, keypair: keypair, target_pubkey: target_pubkey, bookmarks: bookmarks)
                 
             } label: {
-                Label(NSLocalizedString("", comment: "Context menu"), systemImage: "ellipsis")
+                Label("", systemImage: "ellipsis")
                     .foregroundColor(Color.gray)
             }
         }

damus/Views/Events/ReplyDescription.swift

@@ -49,7 +49,7 @@ func reply_desc(profiles: Profiles, event: NostrEvent, locale: Locale = Locale.c
         if othersCount == 0 {
             return String(format: NSLocalizedString("Replying to %@ & %@", bundle: bundle, comment: "Label to indicate that the user is replying to 2 users."), locale: locale, uniqueNames[0], uniqueNames[1])
         } else {
-            return String(format: bundle.localizedString(forKey: "replying_to_two_and_others", value: nil, table: nil), locale: locale, othersCount, uniqueNames[0], uniqueNames[1])
+            return String(format: localizedStringFormat(key: "replying_to_two_and_others", locale: locale), locale: locale, othersCount, uniqueNames[0], uniqueNames[1])
         }
     }
 

damus/Views/Events/TextEvent.swift

@@ -40,7 +40,7 @@ struct TextEvent: View {
                     let pk = is_anon ? "anon" : pubkey
                     EventProfileName(pubkey: pk, profile: profile, damus: damus, show_friend_confirmed: true, size: .normal)
                     
-                    Text("⋅")
+                    Text(verbatim: "⋅")
                         .font(.footnote)
                         .foregroundColor(.gray)
                     Text(verbatim: "\(format_relative_time(event.created_at))")

damus/Views/Notifications/EventGroupView.swift

@@ -121,28 +121,30 @@ func event_group_author_name(profiles: Profiles, ind: Int, group: EventGroupType
  "zapped_your_profile_3" - returned when 3 or more zaps occurred to the current user's profile
  */
 func reacting_to_text(profiles: Profiles, our_pubkey: String, group: EventGroupType, ev: NostrEvent?, locale: Locale? = nil) -> String {
+    if group.events.count == 0 {
+        return "??"
+    }
+
     let verb = reacting_to_verb(group: group)
     let reacting_to = determine_reacting_to(our_pubkey: our_pubkey, ev: ev)
     let localization_key = "\(verb)_\(reacting_to)_\(min(group.events.count, 3))"
-    let bundle = bundleForLocale(locale: locale)
+    let format = localizedStringFormat(key: localization_key, locale: locale)
 
     switch group.events.count {
-    case 0:
-        return "??"
     case 1:
         let display_name = event_group_author_name(profiles: profiles, ind: 0, group: group)
 
-        return String(format: bundle.localizedString(forKey: localization_key, value: bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: localization_key, value: nil, table: nil), table: nil), locale: locale, display_name)
+        return String(format: format, locale: locale, display_name)
     case 2:
         let alice_name = event_group_author_name(profiles: profiles, ind: 0, group: group)
         let bob_name = event_group_author_name(profiles: profiles, ind: 1, group: group)
 
-        return String(format: bundle.localizedString(forKey: localization_key, value: bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: localization_key, value: nil, table: nil), table: nil), locale: locale, alice_name, bob_name)
+        return String(format: format, locale: locale, alice_name, bob_name)
     default:
         let alice_name = event_group_author_name(profiles: profiles, ind: 0, group: group)
         let count = group.events.count - 1
 
-        return String(format: bundle.localizedString(forKey: localization_key, value: bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: localization_key, value: nil, table: nil), table: nil), locale: locale, count, alice_name)
+        return String(format: format, locale: locale, count, alice_name)
     }
 }
 

damus/Views/ProfileView.swift

@@ -50,18 +50,18 @@ func follow_btn_enabled_state(_ fs: FollowState) -> Bool {
 }
 
 func followersCountString(_ count: Int, locale: Locale = Locale.current) -> String {
-    let bundle = bundleForLocale(locale: locale)
-    return String(format: bundle.localizedString(forKey: "followers_count", value: nil, table: nil), locale: locale, count)
+    let format = localizedStringFormat(key: "followers_count", locale: locale)
+    return String(format: format, locale: locale, count)
 }
 
 func followingCountString(_ count: Int, locale: Locale = Locale.current) -> String {
-    let bundle = bundleForLocale(locale: locale)
-    return String(format: bundle.localizedString(forKey: "following_count", value: nil, table: nil), locale: locale, count)
+    let format = localizedStringFormat(key: "following_count", locale: locale)
+    return String(format: format, locale: locale, count)
 }
 
 func relaysCountString(_ count: Int, locale: Locale = Locale.current) -> String {
-    let bundle = bundleForLocale(locale: locale)
-    return String(format: bundle.localizedString(forKey: "relays_count", value: nil, table: nil), locale: locale, count)
+    let format = localizedStringFormat(key: "relays_count", locale: locale)
+    return String(format: format, locale: locale, count)
 }
 
 struct EditButton: View {

damus/de.lproj/Localizable.stringsdict

@@ -34,6 +34,22 @@
 			<string>Follower</string>
 		</dict>
 	</dict>
+	<key>following_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@FOLLOWING@</string>
+		<key>FOLLOWING</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Folge ich</string>
+			<key>other</key>
+			<string>Folge ich</string>
+		</dict>
+	</dict>
 	<key>reacted_tagged_in_3</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>

damus/en-US.xcloc/Localized Contents/en-US.xliff

@@ -159,6 +159,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>All</target>
         <note>Label for filter for all notifications.</note>
       </trans-unit>
+      <trans-unit id="Always show images" xml:space="preserve">
+        <source>Always show images</source>
+        <target>Always show images</target>
+        <note>Setting to always show and never blur images</note>
+      </trans-unit>
       <trans-unit id="Anonymous" xml:space="preserve">
         <source>Anonymous</source>
         <target>Anonymous</target>
@@ -255,12 +260,14 @@ Sentence composed of 2 variables to describe how many people are following a use
       <trans-unit id="Broadcast" xml:space="preserve">
         <source>Broadcast</source>
         <target>Broadcast</target>
-        <note>Context menu option for broadcasting the user's note to all of the user's connected relay servers.</note>
+        <note>Button to broadcast note to all your relays
+   Context menu option for broadcasting the user's note to all of the user's connected relay servers.</note>
       </trans-unit>
       <trans-unit id="Cancel" xml:space="preserve">
         <source>Cancel</source>
         <target>Cancel</target>
         <note>Alert button to cancel out of alert for blocking a user.
+   Button to cancel a repost.
    Button to cancel out of alert that creates a new mutelist.
    Button to cancel out of posting a note.
    Button to cancel out of reposting a post.
@@ -329,6 +336,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Copy LNURL</target>
         <note>Context menu option for copying a user's Lightning URL.</note>
       </trans-unit>
+      <trans-unit id="Copy Link" xml:space="preserve">
+        <source>Copy Link</source>
+        <target>Copy Link</target>
+        <note>Button to copy link to note</note>
+      </trans-unit>
       <trans-unit id="Copy Note ID" xml:space="preserve">
         <source>Copy Note ID</source>
         <target>Copy Note ID</target>
@@ -583,6 +595,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Images</target>
         <note>Section title for images configuration.</note>
       </trans-unit>
+      <trans-unit id="Invalid Tip Address" xml:space="preserve">
+        <source>Invalid Tip Address</source>
+        <target>Invalid Tip Address</target>
+        <note>Title of alerting as invalid tip address.</note>
+      </trans-unit>
       <trans-unit id="Invalid key" xml:space="preserve">
         <source>Invalid key</source>
         <target>Invalid key</target>
@@ -676,6 +693,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Mentions</target>
         <note>Label for filter for seeing mention notifications (replies, etc).</note>
       </trans-unit>
+      <trans-unit id="Miscellaneous" xml:space="preserve">
+        <source>Miscellaneous</source>
+        <target>Miscellaneous</target>
+        <note>Section header for miscellaneous user configuration</note>
+      </trans-unit>
       <trans-unit id="Muun" xml:space="preserve">
         <source>Muun</source>
         <target>Muun</target>
@@ -706,6 +728,16 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>No zaps are sent, only a lightning payment.</target>
         <note>Description of non-zap type where sats are sent to the user's wallet as a regular Lightning payment, not as a zap.</note>
       </trans-unit>
+      <trans-unit id="NostrBuild" xml:space="preserve">
+        <source>NostrBuild</source>
+        <target>NostrBuild</target>
+        <note>Dropdown option label for system default for NostrBuild image uploader.</note>
+      </trans-unit>
+      <trans-unit id="NostrImg" xml:space="preserve">
+        <source>NostrImg</source>
+        <target>NostrImg</target>
+        <note>Dropdown option label for system default for NostrImg image uploader.</note>
+      </trans-unit>
       <trans-unit id="Note contains &quot;nsec1&quot; private key. Are you sure?" xml:space="preserve">
         <source>Note contains "nsec1" private key. Are you sure?</source>
         <target>Note contains "nsec1" private key. Are you sure?</target>
@@ -726,6 +758,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Nudity or explicit content</target>
         <note>Button for user to report that the account or content has nudity or explicit content.</note>
       </trans-unit>
+      <trans-unit id="Ok" xml:space="preserve">
+        <source>Ok</source>
+        <target>Ok</target>
+        <note>Button to dismiss the alert.</note>
+      </trans-unit>
       <trans-unit id="Only you can see this message and who sent it." xml:space="preserve">
         <source>Only you can see this message and who sent it.</source>
         <target>Only you can see this message and who sent it.</target>
@@ -998,6 +1035,11 @@ Picker option to indicate that a zap should be sent privately and not identify t
         <target>Select default wallet</target>
         <note>Prompt selection of user's default wallet</note>
       </trans-unit>
+      <trans-unit id="Select image uploader" xml:space="preserve">
+        <source>Select image uploader</source>
+        <target>Select image uploader</target>
+        <note>Prompt selection of user's image uploader</note>
+      </trans-unit>
       <trans-unit id="Send a message to start the conversation..." xml:space="preserve">
         <source>Send a message to start the conversation...</source>
         <target>Send a message to start the conversation...</target>
@@ -1026,6 +1068,16 @@ Picker option to indicate that a zap should be sent privately and not identify t
    Button to share an image.
    Button to share the link to a profile.</note>
       </trans-unit>
+      <trans-unit id="Share Note" xml:space="preserve">
+        <source>Share Note</source>
+        <target>Share Note</target>
+        <note>Title text to indicate that the buttons below are meant to be used to share a note with others.</note>
+      </trans-unit>
+      <trans-unit id="Share Via..." xml:space="preserve">
+        <source>Share Via...</source>
+        <target>Share Via...</target>
+        <note>Button to present iOS share sheet</note>
+      </trans-unit>
       <trans-unit id="Show" xml:space="preserve">
         <source>Show</source>
         <target>Show</target>
@@ -1078,6 +1130,11 @@ Picker option to indicate that a zap should be sent privately and not identify t
         <target>Thanks!</target>
         <note>Button to close out of alert that informs that the action to block a user was successful.</note>
       </trans-unit>
+      <trans-unit id="The address should either begin with LNURL or should look like an email address." xml:space="preserve">
+        <source>The address should either begin with LNURL or should look like an email address.</source>
+        <target>The address should either begin with LNURL or should look like an email address.</target>
+        <note>Giving the description of the alert message.</note>
+      </trans-unit>
       <trans-unit id="They are impersonating someone" xml:space="preserve">
         <source>They are impersonating someone</source>
         <target>They are impersonating someone</target>
@@ -1283,6 +1340,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target>Zap Type</target>
         <note>Header text to indicate that the picker below it is to choose the type of zap to send.</note>
       </trans-unit>
+      <trans-unit id="Zap Vibration" xml:space="preserve">
+        <source>Zap Vibration</source>
+        <target>Zap Vibration</target>
+        <note>Setting to enable vibration on zap</note>
+      </trans-unit>
       <trans-unit id="Zapping..." xml:space="preserve">
         <source>Zapping...</source>
         <target>Zapping...</target>

damus/fr-CA.lproj/Localizable.stringsdict

@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>collapsed_event_view_other_notes</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@NOTES@</string>
+		<key>NOTES</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>... %d autre note ...</string>
+			<key>many</key>
+			<string>... %d autres notes ...</string>
+			<key>other</key>
+			<string>... %d autres notes ...</string>
+		</dict>
+	</dict>
+	<key>followers_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@FOLLOWERS@</string>
+		<key>FOLLOWERS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Abonné</string>
+			<key>many</key>
+			<string>Abonnés</string>
+			<key>other</key>
+			<string>Abonnés</string>
+		</dict>
+	</dict>
+	<key>following_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@FOLLOWING@</string>
+		<key>FOLLOWING</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Abonnement</string>
+			<key>many</key>
+			<string>Abonnements</string>
+			<key>other</key>
+			<string>Abonnements</string>
+		</dict>
+	</dict>
+	<key>reacted_tagged_in_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REACTED@</string>
+		<key>REACTED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont réagi à une note dans laquelle vous apparaissez</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont réagi à une note dans laquelle vous apparaissez</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont réagi à une note dans laquelle vous apparaissez</string>
+		</dict>
+	</dict>
+	<key>reacted_your_post_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REACTED@</string>
+		<key>REACTED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont réagi à votre note</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont réagi à votre note</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont réagi à votre note</string>
+		</dict>
+	</dict>
+	<key>reacted_your_profile_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REACTED@</string>
+		<key>REACTED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont réagi à votre profil</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont réagi à votre profil</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont réagi à votre profil</string>
+		</dict>
+	</dict>
+	<key>reactions_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REACTIONS@</string>
+		<key>REACTIONS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Réaction</string>
+			<key>many</key>
+			<string>Réactions</string>
+			<key>other</key>
+			<string>Réactions</string>
+		</dict>
+	</dict>
+	<key>relays_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@RELAYS@</string>
+		<key>RELAYS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Relai</string>
+			<key>many</key>
+			<string>Relais</string>
+			<key>other</key>
+			<string>Relais</string>
+		</dict>
+	</dict>
+	<key>replying_to_two_and_others</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@OTHERS@</string>
+		<key>OTHERS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Réponse à %2$@, %3$@ &amp; %1$d autre</string>
+			<key>many</key>
+			<string>Réponse à %2$@, %3$@ &amp; %1$d autres</string>
+			<key>other</key>
+			<string>Réponse à %2$@, %3$@ &amp; %1$d autres</string>
+		</dict>
+	</dict>
+	<key>reposted_tagged_in_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REPOSTED@</string>
+		<key>REPOSTED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont cité une note dans laquelle vous apparaissez</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont cité une note dans laquelle vous apparaissez</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont republié une note dans laquelle vous apparaissez</string>
+		</dict>
+	</dict>
+	<key>reposted_your_post_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REPOSTED@</string>
+		<key>REPOSTED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont cité votre note</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont cité votre note</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont republié votre note</string>
+		</dict>
+	</dict>
+	<key>reposted_your_profile_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REPOSTED@</string>
+		<key>REPOSTED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont republié votre profile</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont republié votre profile</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont republié votre profile</string>
+		</dict>
+	</dict>
+	<key>reposts_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REPOSTS@</string>
+		<key>REPOSTS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Republication</string>
+			<key>many</key>
+			<string>Republications</string>
+			<key>other</key>
+			<string>Republications</string>
+		</dict>
+	</dict>
+	<key>sats_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%1$#@SATS@</string>
+		<key>SATS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>@</string>
+			<key>one</key>
+			<string>%2$@ sat</string>
+			<key>many</key>
+			<string>%2$@ sats</string>
+			<key>other</key>
+			<string>%2$@ sats</string>
+		</dict>
+	</dict>
+	<key>zapped_tagged_in_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@ZAPPED@</string>
+		<key>ZAPPED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont zappé une note dans laquelle vous apparaissez</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont zappé une note dans laquelle vous apparaissez</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont zappé une note dans laquelle vous apparaissez</string>
+		</dict>
+	</dict>
+	<key>zapped_your_post_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@ZAPPED@</string>
+		<key>ZAPPED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont zappé votre note</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont zappé votre note</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont zappé votre note</string>
+		</dict>
+	</dict>
+	<key>zapped_your_profile_3</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@ZAPPED@</string>
+		<key>ZAPPED</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%2$@ et %1$d autre ont zappé votre profile</string>
+			<key>many</key>
+			<string>%2$@ et %1$d autres ont zappé votre profile</string>
+			<key>other</key>
+			<string>%2$@ et %1$d autres ont zappé votre profile</string>
+		</dict>
+	</dict>
+	<key>zaps_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@ZAPS@</string>
+		<key>ZAPS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Zap</string>
+			<key>many</key>
+			<string>Zaps</string>
+			<key>other</key>
+			<string>Zaps</string>
+		</dict>
+	</dict>
+</dict>
+</plist>

damus/pl-PL.lproj/Localizable.stringsdict

@@ -15,9 +15,9 @@
 			<key>one</key>
 			<string>... %d inna notatka ...</string>
 			<key>few</key>
-			<string>... %d other notes ...</string>
+			<string>... %d innych notatek ...</string>
 			<key>many</key>
-			<string>... %d other notes ...</string>
+			<string>... %d innych notatek ...</string>
 			<key>other</key>
 			<string>... %d inne notatki ...</string>
 		</dict>
@@ -155,11 +155,11 @@
 			<key>one</key>
 			<string>Przekaźnik</string>
 			<key>few</key>
-			<string>Relays</string>
+			<string>Przekaźniki</string>
 			<key>many</key>
-			<string>Relays</string>
-			<key>other</key>
 			<string>Przekaźników</string>
+			<key>other</key>
+			<string>Przekaźniki</string>
 		</dict>
 	</dict>
 	<key>replying_to_two_and_others</key>
@@ -355,11 +355,11 @@
 			<key>one</key>
 			<string>Zap</string>
 			<key>few</key>
-			<string>Zaps</string>
+			<string>Zapy</string>
 			<key>many</key>
-			<string>Zaps</string>
-			<key>other</key>
 			<string>Zapów</string>
+			<key>other</key>
+			<string>Zapy</string>
 		</dict>
 	</dict>
 </dict>