diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj index 5cc727d2..88874b16 100644 --- a/damus.xcodeproj/project.pbxproj +++ b/damus.xcodeproj/project.pbxproj @@ -328,9 +328,6 @@ 3A41E559299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/InfoPlist.strings; sourceTree = ""; }; 3A41E55A299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = ""; }; 3A41E55B299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = id; path = id.lproj/Localizable.stringsdict; sourceTree = ""; }; - 3A4F3320297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/InfoPlist.strings"; sourceTree = ""; }; - 3A4F3321297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/Localizable.strings"; sourceTree = ""; }; - 3A4F3322297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "fr-FR"; path = "fr-FR.lproj/Localizable.stringsdict"; sourceTree = ""; }; 3A5C4575296A879E0032D398 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "es-419"; path = "es-419.lproj/Localizable.stringsdict"; sourceTree = ""; }; 3A5CAE1D298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/InfoPlist.strings"; sourceTree = ""; }; 3A5CAE1E298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/Localizable.strings"; sourceTree = ""; }; @@ -338,6 +335,9 @@ 3A66D927299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = ""; }; 3A66D928299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; 3A66D929299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ja; path = ja.lproj/Localizable.stringsdict; sourceTree = ""; }; + 3A821C3E29E819D500B4BCA7 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; + 3A821C3F29E819D500B4BCA7 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = ""; }; + 3A821C4029E819D500B4BCA7 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fr; path = fr.lproj/Localizable.stringsdict; sourceTree = ""; }; 3A827A18299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = ""; }; 3A827A19299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; 3A827A1A299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ru; path = ru.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -384,9 +384,6 @@ 3AD14EB829C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "sv-SE"; path = "sv-SE.lproj/Localizable.stringsdict"; sourceTree = ""; }; 3AD14EB929C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/InfoPlist.strings"; sourceTree = ""; }; 3AD14EBA29C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/Localizable.strings"; sourceTree = ""; }; - 3AD14EBB29C40F47009D2D9C /* fr-CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-CA"; path = "fr-CA.lproj/InfoPlist.strings"; sourceTree = ""; }; - 3AD14EBC29C40F47009D2D9C /* fr-CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "fr-CA"; path = "fr-CA.lproj/Localizable.stringsdict"; sourceTree = ""; }; - 3AD14EBD29C40F47009D2D9C /* fr-CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-CA"; path = "fr-CA.lproj/Localizable.strings"; sourceTree = ""; }; 3AD5662B29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/InfoPlist.strings; sourceTree = ""; }; 3AD5662C29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fa; path = fa.lproj/Localizable.stringsdict; sourceTree = ""; }; 3AD5662D29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = ""; }; @@ -1403,8 +1400,7 @@ "es-419", "es-ES", fa, - "fr-CA", - "fr-FR", + fr, "hu-HU", id, "it-IT", @@ -1775,7 +1771,6 @@ 3A5C4575296A879E0032D398 /* es-419 */, 3A2B8B0A296A8982009CC16D /* en-US */, 3AEB8005297CCEA900713A25 /* tr-TR */, - 3A4F3322297CCFEE004B5F72 /* fr-FR */, 3A185A06297F2C3800F4BDC0 /* lv-LV */, 3A929C22297F2CF80090925E /* it-IT */, 3AB5B86C2986D8A3006599D2 /* de */, @@ -1797,10 +1792,10 @@ 3AD5663229C0DA4B00BF77C5 /* ko */, 3AD14EB529C40F38009D2D9C /* hu-HU */, 3AD14EB829C40F3F009D2D9C /* sv-SE */, - 3AD14EBC29C40F47009D2D9C /* fr-CA */, 3A325AC629C9E0B8002BE7ED /* vi */, 3A325AC929C9E0CF002BE7ED /* es-ES */, 3AC59CA929CDDB78007E04A6 /* pt-BR */, + 3A821C4029E819D500B4BCA7 /* fr */, ); name = Localizable.stringsdict; sourceTree = ""; @@ -1810,7 +1805,6 @@ children = ( 3ACB685B297633BC00C46468 /* es-419 */, 3AEB8003297CCEA800713A25 /* tr-TR */, - 3A4F3320297CCFEE004B5F72 /* fr-FR */, 3A185A04297F2C3800F4BDC0 /* lv-LV */, 3A929C20297F2CF80090925E /* it-IT */, 3AB5B86A2986D8A3006599D2 /* de */, @@ -1832,10 +1826,10 @@ 3AD5663329C0DA4B00BF77C5 /* ko */, 3AD14EB629C40F38009D2D9C /* hu-HU */, 3AD14EB929C40F3F009D2D9C /* sv-SE */, - 3AD14EBB29C40F47009D2D9C /* fr-CA */, 3A325AC529C9E0B8002BE7ED /* vi */, 3A325AC829C9E0CF002BE7ED /* es-ES */, 3AC59CA829CDDB78007E04A6 /* pt-BR */, + 3A821C3F29E819D500B4BCA7 /* fr */, ); name = InfoPlist.strings; sourceTree = ""; @@ -1845,7 +1839,6 @@ children = ( 3ACB685E297633BC00C46468 /* es-419 */, 3AEB8004297CCEA800713A25 /* tr-TR */, - 3A4F3321297CCFEE004B5F72 /* fr-FR */, 3A185A05297F2C3800F4BDC0 /* lv-LV */, 3A929C21297F2CF80090925E /* it-IT */, 3AB5B86B2986D8A3006599D2 /* de */, @@ -1868,10 +1861,10 @@ 3AD5663129C0DA4B00BF77C5 /* ko */, 3AD14EB729C40F38009D2D9C /* hu-HU */, 3AD14EBA29C40F3F009D2D9C /* sv-SE */, - 3AD14EBD29C40F47009D2D9C /* fr-CA */, 3A325AC429C9E0B8002BE7ED /* vi */, 3A325AC729C9E0CF002BE7ED /* es-ES */, 3AC59CA729CDDB78007E04A6 /* pt-BR */, + 3A821C3E29E819D500B4BCA7 /* fr */, ); name = Localizable.strings; sourceTree = ""; diff --git a/damus/ContentView.swift b/damus/ContentView.swift index 22ffde65..aa8806de 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -93,7 +93,7 @@ struct ContentView: View { @Environment(\.colorScheme) var colorScheme var mystery: some View { - Text("Are you lost?") + Text("Are you lost?", comment: "Text asking the user if they are lost in the app.") .id("what") } diff --git a/damus/Views/Notifications/NotificationsView.swift b/damus/Views/Notifications/NotificationsView.swift index e7365305..406e6e40 100644 --- a/damus/Views/Notifications/NotificationsView.swift +++ b/damus/Views/Notifications/NotificationsView.swift @@ -37,8 +37,8 @@ struct NotificationsView: View { var mystery: some View { VStack(spacing: 20) { - Text("Wake up \(Profile.displayName(profile: state.profiles.lookup(id: state.pubkey), pubkey: state.pubkey).display_name)") - Text("You are dreaming...") + Text("Wake up, \(Profile.displayName(profile: state.profiles.lookup(id: state.pubkey), pubkey: state.pubkey).display_name)", comment: "Text telling the user to wake up, where the argument is their display name.") + Text("You are dreaming...", comment: "Text telling the user that they are dreaming.") } .id("what") } diff --git a/damus/ar.lproj/Localizable.strings b/damus/ar.lproj/Localizable.strings index e9677bef..15c3e995 100644 Binary files a/damus/ar.lproj/Localizable.strings and b/damus/ar.lproj/Localizable.strings differ diff --git a/damus/cs.lproj/InfoPlist.strings b/damus/cs.lproj/InfoPlist.strings index 289cf2e0..3c12faef 100644 Binary files a/damus/cs.lproj/InfoPlist.strings and b/damus/cs.lproj/InfoPlist.strings differ diff --git a/damus/cs.lproj/Localizable.strings b/damus/cs.lproj/Localizable.strings index 32fcf8f2..9f601913 100644 Binary files a/damus/cs.lproj/Localizable.strings and b/damus/cs.lproj/Localizable.strings differ diff --git a/damus/cs.lproj/Localizable.stringsdict b/damus/cs.lproj/Localizable.stringsdict index a89ab9c3..a6c8adec 100644 --- a/damus/cs.lproj/Localizable.stringsdict +++ b/damus/cs.lproj/Localizable.stringsdict @@ -39,7 +39,7 @@ many Followers other - Sledují + Sledující following_count diff --git a/damus/el-GR.lproj/Localizable.strings b/damus/el-GR.lproj/Localizable.strings index 21e3e6a5..7ea1666c 100644 Binary files a/damus/el-GR.lproj/Localizable.strings and b/damus/el-GR.lproj/Localizable.strings differ diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff index d4d5942f..56325793 100644 --- a/damus/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -190,6 +190,11 @@ Sentence composed of 2 variables to describe how many people are following a use Appearance Section header for text and appearance settings + + Are you lost? + Are you lost? + Text asking the user if they are lost in the app. + Are you sure you want to repost this? Are you sure you want to repost this? @@ -779,6 +784,11 @@ Sentence composed of 2 variables to describe how many people are following a use Nothing to see here. Check back later! Indicates that there are no notes in the timeline to view. + + Notification Dots + Notification Dots + Section header for notification indicator dot settings + Notification Preference Notification Preference @@ -1339,6 +1349,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. ARE YOU SURE YOU WANT TO CONTINUE? Alert for deleting the users account. + + Wake up, %@ + Wake up, %@ + Text telling the user to wake up, where the argument is their display name. + Wallet Wallet @@ -1374,6 +1389,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. Yes, Post with Private Key Button to proceed with posting a note even though it looks like they might be posting a private key. + + You are dreaming... + You are dreaming... + Text telling the user that they are dreaming. + You have no bookmarks yet, add them in the context menu You have no bookmarks yet, add them in the context menu diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings index 1ef61c8b..24f2be7d 100644 Binary files a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings and b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings differ diff --git a/damus/fr-CA.lproj/InfoPlist.strings b/damus/fr-CA.lproj/InfoPlist.strings deleted file mode 100644 index 7490f2e5..00000000 Binary files a/damus/fr-CA.lproj/InfoPlist.strings and /dev/null differ diff --git a/damus/fr-CA.lproj/Localizable.strings b/damus/fr-CA.lproj/Localizable.strings deleted file mode 100644 index 746ec34e..00000000 Binary files a/damus/fr-CA.lproj/Localizable.strings and /dev/null differ diff --git a/damus/fr-CA.lproj/Localizable.stringsdict b/damus/fr-CA.lproj/Localizable.stringsdict deleted file mode 100644 index 34d23236..00000000 --- a/damus/fr-CA.lproj/Localizable.stringsdict +++ /dev/null @@ -1,366 +0,0 @@ - - - - - collapsed_event_view_other_notes - - NSStringLocalizedFormatKey - %#@NOTES@ - NOTES - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - ... %d autre note ... - many - ... %d autres notes ... - other - ... %d autres notes ... - - - followers_count - - NSStringLocalizedFormatKey - %#@FOLLOWERS@ - FOLLOWERS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Abonné - many - Abonnés - other - Abonnés - - - following_count - - NSStringLocalizedFormatKey - %#@FOLLOWING@ - FOLLOWING - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Abonnement - many - Abonnements - other - Abonnements - - - reacted_tagged_in_3 - - NSStringLocalizedFormatKey - %#@REACTED@ - REACTED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont réagi à une note dans laquelle vous apparaissez - many - %2$@ et %1$d autres ont réagi à une note dans laquelle vous apparaissez - other - %2$@ et %1$d autres ont réagi à une note dans laquelle vous apparaissez - - - reacted_your_post_3 - - NSStringLocalizedFormatKey - %#@REACTED@ - REACTED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont réagi à votre note - many - %2$@ et %1$d autres ont réagi à votre note - other - %2$@ et %1$d autres ont réagi à votre note - - - reacted_your_profile_3 - - NSStringLocalizedFormatKey - %#@REACTED@ - REACTED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont réagi à votre profil - many - %2$@ et %1$d autres ont réagi à votre profil - other - %2$@ et %1$d autres ont réagi à votre profil - - - reactions_count - - NSStringLocalizedFormatKey - %#@REACTIONS@ - REACTIONS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Réaction - many - Réactions - other - Réactions - - - relays_count - - NSStringLocalizedFormatKey - %#@RELAYS@ - RELAYS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Relai - many - Relais - other - Relais - - - replying_to_two_and_others - - NSStringLocalizedFormatKey - %#@OTHERS@ - OTHERS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Réponse à %2$@, %3$@ & %1$d autre - many - Réponse à %2$@, %3$@ & %1$d autres - other - Réponse à %2$@, %3$@ & %1$d autres - - - reposted_tagged_in_3 - - NSStringLocalizedFormatKey - %#@REPOSTED@ - REPOSTED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont cité une note dans laquelle vous apparaissez - many - %2$@ et %1$d autres ont cité une note dans laquelle vous apparaissez - other - %2$@ et %1$d autres ont republié une note dans laquelle vous apparaissez - - - reposted_your_post_3 - - NSStringLocalizedFormatKey - %#@REPOSTED@ - REPOSTED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont cité votre note - many - %2$@ et %1$d autres ont cité votre note - other - %2$@ et %1$d autres ont republié votre note - - - reposted_your_profile_3 - - NSStringLocalizedFormatKey - %#@REPOSTED@ - REPOSTED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont republié votre profile - many - %2$@ et %1$d autres ont republié votre profile - other - %2$@ et %1$d autres ont republié votre profile - - - reposts_count - - NSStringLocalizedFormatKey - %#@REPOSTS@ - REPOSTS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Republication - many - Republications - other - Republications - - - sats_count - - NSStringLocalizedFormatKey - %1$#@SATS@ - SATS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - @ - one - %2$@ sat - many - %2$@ sats - other - %2$@ sats - - - zap_notification_no_message - - NSStringLocalizedFormatKey - %1$#@NOTIFICATION@ - NOTIFICATION - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - @ - one - Vous avez reçu %2$@ sat de %3$@ - many - Vous avez reçu %2$@ sats de %3$@ - other - Vous avez reçu %2$@ sats de %3$@ - - - zap_notification_with_message - - NSStringLocalizedFormatKey - %1$#@NOTIFICATION@ - NOTIFICATION - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - @ - one - You received %2$@ sat from %3$@: "%4$@" - many - You received %2$@ sats from %3$@: "%4$@" - other - You received %2$@ sats from %3$@: "%4$@" - - - zapped_tagged_in_3 - - NSStringLocalizedFormatKey - %#@ZAPPED@ - ZAPPED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont zappé une note dans laquelle vous apparaissez - many - %2$@ et %1$d autres ont zappé une note dans laquelle vous apparaissez - other - %2$@ et %1$d autres ont zappé une note dans laquelle vous apparaissez - - - zapped_your_post_3 - - NSStringLocalizedFormatKey - %#@ZAPPED@ - ZAPPED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont zappé votre note - many - %2$@ et %1$d autres ont zappé votre note - other - %2$@ et %1$d autres ont zappé votre note - - - zapped_your_profile_3 - - NSStringLocalizedFormatKey - %#@ZAPPED@ - ZAPPED - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %2$@ et %1$d autre ont zappé votre profile - many - %2$@ et %1$d autres ont zappé votre profile - other - %2$@ et %1$d autres ont zappé votre profile - - - zaps_count - - NSStringLocalizedFormatKey - %#@ZAPS@ - ZAPS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Zap - many - Zaps - other - Zaps - - - - diff --git a/damus/fr-FR.lproj/InfoPlist.strings b/damus/fr.lproj/InfoPlist.strings similarity index 100% rename from damus/fr-FR.lproj/InfoPlist.strings rename to damus/fr.lproj/InfoPlist.strings diff --git a/damus/fr-FR.lproj/Localizable.strings b/damus/fr.lproj/Localizable.strings similarity index 100% rename from damus/fr-FR.lproj/Localizable.strings rename to damus/fr.lproj/Localizable.strings diff --git a/damus/fr-FR.lproj/Localizable.stringsdict b/damus/fr.lproj/Localizable.stringsdict similarity index 100% rename from damus/fr-FR.lproj/Localizable.stringsdict rename to damus/fr.lproj/Localizable.stringsdict diff --git a/damus/nl.lproj/Localizable.strings b/damus/nl.lproj/Localizable.strings index 355be2f5..ad69a097 100644 Binary files a/damus/nl.lproj/Localizable.strings and b/damus/nl.lproj/Localizable.strings differ diff --git a/damus/sv-SE.lproj/Localizable.strings b/damus/sv-SE.lproj/Localizable.strings index 7637fba6..4fdbd139 100644 Binary files a/damus/sv-SE.lproj/Localizable.strings and b/damus/sv-SE.lproj/Localizable.strings differ diff --git a/damus/sv-SE.lproj/Localizable.stringsdict b/damus/sv-SE.lproj/Localizable.stringsdict index d19d108c..28e6919c 100644 --- a/damus/sv-SE.lproj/Localizable.stringsdict +++ b/damus/sv-SE.lproj/Localizable.stringsdict @@ -15,7 +15,7 @@ one ...%d andra inlägg... other - ...%d andra inlägg... + ...%d andra anteckningar... followers_count