From a20fa08030fdd5641c3d9a856c47b7bde41c45d1 Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Thu, 26 Jan 2023 10:01:42 -0500 Subject: [PATCH 1/3] Remove it-CH locale as there is no difference with it-IT yet --- .../Localized Contents/it_CH.xliff | 1253 ----------------- damus.xcodeproj/project.pbxproj | 7 - damus/it-CH.lproj/InfoPlist.strings | 9 - damus/it-CH.lproj/Localizable.strings | 503 ------- damus/it-CH.lproj/Localizable.stringsdict | 154 -- 5 files changed, 1926 deletions(-) delete mode 100644 damus Localizations/it_CH.xcloc/Localized Contents/it_CH.xliff delete mode 100644 damus/it-CH.lproj/InfoPlist.strings delete mode 100644 damus/it-CH.lproj/Localizable.strings delete mode 100644 damus/it-CH.lproj/Localizable.stringsdict diff --git a/damus Localizations/it_CH.xcloc/Localized Contents/it_CH.xliff b/damus Localizations/it_CH.xcloc/Localized Contents/it_CH.xliff deleted file mode 100644 index b5940da..0000000 --- a/damus Localizations/it_CH.xcloc/Localized Contents/it_CH.xliff +++ /dev/null @@ -1,1253 +0,0 @@ - - -
- -
- - - Damus - Damus - - Bundle display name - - - damus - damus - - Bundle name - - - Granting Damus access to your photos allows you to save images. - Dai il permesso a Damus di accedere alle tue Foto per salvare immagini - - Privacy - Photo Library Additions Usage Description - - - - -
- -
- - - - 61b6edf1108e6f396680a33b02486a70_tr - Blank space to separate profile picture from profile editor form. - - - %@ - %@ - - Amount of time that has passed since reply quote event occurred. -Abbreviated version of a nostr public key. - - - %@ %@ - %@ %@ - - Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'. -Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. - - - %@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction. - %@. Per creare un account non hai bisogno di un numero di telefono, un indirizzo email o del tuo nome. Inizia ora senza impegni. - - Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string. - - - %@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs - %@. I messaggi sono criptati utilizzando la crittografia end-to-end. Mantieni i colossi della tecnologia lontani dai tuoi messaggi - - Explanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string. - - - %@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet. - %@. Paga i tuoi amici e accumula sats con Bitcoin⚡️, la moneta di internet. - - Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string. - - - %lld - %lld - - Number of reposts. -Number of profiles a user is following. - - - %lld/%lld - %lld/%lld - - Fraction of how many of the user's relay servers that are operational. - - - '%@' at '%@' will be used for verification - '%@' at '%@' sarà usato per la verifica - - Description of how the nip05 identifier would be used for verification. - - - '%@' is an invalid nip05 identifier. It should look like an email. - '%@' non è valido. Dovrebbe essere simile ad un indirizzo email. - - Description of why the nip05 identifier is invalid. - - - (Profile.displayName(profile: profile, pubkey: whos))'s Followers - Seguaci di (Profile.displayName(profile: profile, pubkey: whos))' - - Navigation bar title for view that shows who is following a user. - - - (who) following - (who) segui già - - Navigation bar title for view that shows who a user is following. - - - < e > - < e > - - Placeholder for event mention. - - - @ - @ - - Prefix character to username. - - - About - Informazioni - - Label to prompt for about text entry for user to describe about themself. - - - About Me - Io - - Label for About Me section of user profile form. - - - Absolute Boss - Capo supremo - - Placeholder text for About Me description. - - - Account ID - ID dell'account - - Label to indicate the public ID of the account. - - - Add - Aggiungi - - Button to add recommended relay server. - Button to confirm adding user inputted relay. - - - Add Relay - Aggiungi relè - - Label for section for adding a relay server. - - - Add all - Aggiungi tutto - - Button label to re-add all original participants as profiles to reply to in a note - - - Any - Qualsiasi - - Any amount of sats - - - Are you sure you want to repost this? - Sei sicuro di voler segnalare questo post? - - Alert message to ask if user wants to repost a post. - - - - Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus. - Prima di iniziare, dovrai salvare le informazioni del tuo account altrimenti non sarai in grado di accedere in futuro se dovessi disinstallare Damus. - - Reminder to user that they should save their account information. - - - Bitcoin Beach - Bitcoin Beach - - Dropdown option label for Lightning wallet, Bitcoin Beach. - - - Bitcoin Lightning Tips - Mancia con Bitcoin Lightning - - Label for Bitcoin Lightning Tips section of user profile form. - - - Blixt Wallet - Blixt Wallet - - Dropdown option label for Lightning wallet, Blixt Wallet - - - Blue Wallet - Blue Wallet - - Dropdown option label for Lightning wallet, Blue Wallet. - - - Breez - Breez - - Dropdown option label for Lightning wallet, Breez. - - - Broadcast - Trasmetti - - Context menu option for broadcasting the user's note to all of the user's connected relay servers. - - - Cancel - Annulla - - Button to cancel out of posting a note. - Button to cancel out of reposting a post. - Button to cancel out of view adding user inputted relay. - Cancel out of logging out the user. - - - Cash App - Cash App - - Dropdown option label for Lightning wallet, Cash App. - - - Chat - Chat - - Navigation bar title for Chatroom view. - - - Clear - Cancella - - Button for clearing cached data. - - - Clear Cache - Cancella cache - - Section title for clearing cached data. - - - Copied - Copiato - - Label indicating that a user's key was copied. - - - Copy - Copia - - Button to copy a relay server address. - - - Copy Account ID - Copia ID dell'Account - - Context menu option for copying the ID of the account that created the note. - - - Copy Image - Copia Immagine - - Context menu option to copy an image into clipboard. - Context menu option to copy an image to clipboard. - - - Copy Image URL - Copia URL dell'Immagine - - Context menu option to copy the URL of an image into clipboard. - - - Copy LNURL - Copia LNURL - - Context menu option for copying a user's Lightning URL. - - - Copy Note ID - Copia ID della Nota - - Context menu option for copying the ID of the note. - - - Copy Note JSON - Copia JSON della Nota - - Context menu option for copying the JSON text from the note. - - - Copy Text - Copia Testo - - Context menu option for copying the text from an note. - - - Copy User ID - Copia ID dell'Utente - - Context menu option for copying the ID of the user who created the note. - - - Copy invoice - Copia fattura - - Title of section for copying a Lightning invoice identifier. - - - Create - Crea - - Button to create account. - - - Create Account - Crea Account - - Button to create an account. - - - Creator(s) of Bitcoin. Absolute legend. - Creatore/i di Bitcoin. Leggenda assoluta - - Example description about Bitcoin creator(s), Satoshi Nakamoto. - - - DM Type - Tipo DM - - DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. DM is the English abbreviation for Direct Message. - - - DMs - DM - - Navigation title for DMs view, where DM is the English abbreviation for Direct Message. - Navigation title for view of DMs, where DM is an English abbreviation for Direct Message. - - - Damus - Damus - - Name of the app, shown on the first screen when user is not logged in. - - - Default Wallet - Portafoglio Principale - - Button to pay a Lightning invoice with the user's default Lightning wallet. - - - Delete - Cancella - - Button to delete a relay server that the user connects to. - - - Dismiss - Lascia stare - - Button to dismiss a text field alert. - - - Display Name - Nome visualizzato - - Label to prompt display name entry. - - - Done - Finito - - Button to dismiss wallet selection view for paying Lightning invoice. - - - Earn Money - Guadagna Soldi - - Heading indicating that this application allows users to earn money. - - - Edit - Modifica - - Button to edit user's profile. - - - Edit participants - Modifica partecipanti - - Text indicating that the view is used for editing which participants are replied to in a note. - - - Encrypted - Criptato - - Heading indicating that this application keeps private messaging end-to-end encrypted. - - - Enter your account key to login: - Inserisci la chiave del tuo account per accedere - - Prompt for user to enter an account key to login. - - - Error: %@ - Errore: %@ - - Error message indicating why saving keys failed. - - - Filter State - Filtra - - Filter state for seeing either only posts, or posts & replies. - - - Follow - Segui - - Button to follow a user. - - - Followers - Seguaci - - Label describing followers of a user. - - - Following - Seguiti - - Text to indicate that the button next to it is in a state that indicates that it is in the process of following a profile. -Part of a larger sentence to describe how many profiles a user is following. - - - Following... - Segui già... - - Label to indicate that the user is in the process of following another user. - - - Follows - Segui - - Text to indicate that button next to it is in a state that will follow a profile when tapped. - - - Global - Globale - - Navigation bar title for Global view where posts from all connected relay servers appear. - - - Goto post %@ - Vai al post %@ - - Navigation link to go to post referenced by hex code. - - - Goto profile %@ - Vai al profilo %@ - - Navigation link to go to profile. - - - Home - Home - - Navigation bar title for Home view where posts and replies appear from those who the user is following. - - - Invalid key - Chiave non valida - - Error message indicating that an invalid account key was entered for login. - - - LNLink - LNLink - - Dropdown option label for Lightning wallet, LNLink. - - - Left Handed - Mancino - - Moves the post button to the left side of the screen - - - Let's go! - Andiamo! - - Button to complete account creation and start using the app. - - - Lightning Address or LNURL - Indirizzo Lightning o LNURL - - Placeholder text for entry of Lightning Address or LNURL. - - - Lightning Invoice - Fattura Lightning - - Indicates that the view is for paying a Lightning invoice. - - - Local default - Predefinito - - Dropdown option label for system default for Lightning wallet. - - - Login - Entra - - Button to log into account. - Button to log into an account. - - - Logout - Esci - - Alert for logging out the user. - Button for logging out the user. - Button to logout the user. - - - Make sure your nsec account key is saved before you logout or you will lose access to this account - Assicurati di aver salvato la chiave privata (nSEC) prima di uscire o perderai l'accesso a questo account - - Reminder message in alert to get customer to verify that their private security account key is saved saved before logging out. - - - Muun - Muun - - Dropdown option label for Lightning wallet, Muun. - - - NIP-05 Verification - Verifica NIP-05 - - Label for NIP-05 Verification section of user profile form. - - - Nothing to see here. Check back later! - Niente da vedere qui. Controlla dopo! - - Indicates that there are no notes in the timeline to view. - - - Notifications - Notifiche - - Navigation title for notifications. - - - Pay - Paga - - Button to pay a Lightning invoice. - - - Pay the Lightning invoice - Paga la fattura Lightning - - Navigation bar title for view to pay Lightning invoice. - - - Phoenix - Phoenix - - Dropdown option label for Lightning wallet, Phoenix. - - - Post - Post - - Button to post a note. - - - Posts - Post - - Label for filter for seeing only posts (instead of posts and replies). - - - Posts & Replies - Post & Risposte - - Label for filter for seeing posts and replies (instead of only posts). - - - Private - Privato - - Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading. - - - Private Key - Chiave Privata - - Title of the secure field that holds the user's private key. - - - Profile - Profilo1 - - Sidebar menu label for Profile view. - - - Profile Picture - Foto Profilo - - Label for Profile Picture section of user profile form. - - - Public Account ID - ID Pubblico dell'Account - - Section title for the user's public account ID. - - - Public Key - Chiave Pubblica - - Label indicating that the text is a user's public account key. - - - Public Key? - È la chiave pubblica? - - Prompt to ask user if the key they entered is a public key. - - - Public key - Chiave Pubblica - - Label indicating that the text is a user's public account key. - - - Reactions - Reazioni - - Navigation bar title for Reactions view. - - - Recommended Relays - Relè consigliati - - Section title for recommend relay servers that could be added as part of configuration - - - Relay - Relè - - Text field for relay server. Used for testing purposes. - - - Relays - Relè - - Sidebar menu label for Relay servers view - - - Remove all - Rimuovi tutto - - Button label to remove all participants from a note reply. - - - Reply to self - Rispondi a te stesso - - Label to indicate that the user is replying to themself. - - - Replying to %1$@ & %2$@ - Rispondi a %1$@ e %2$@ - - Label to indicate that the user is replying to 2 users. - - - Replying to: - Rispondi a: - - Indicating that the user is replying to the following listed people. - - - Repost - Reposta - - Button to confirm reposting a post. - Title of alert for confirming to repost a post. - - - Reposted - Repostato - - Text indicating that the post was reposted (i.e. re-shared). - - - Requests - Richiesta - - Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message. - - - Reset - Ricomincia - - Section title for resetting the user - - - Retry - Riprova - - Button to retry completing account creation after an error occurred. - - - River - River - - Dropdown option label for Lightning wallet, River - - - Satoshi Nakamoto - Satoshi Nakamoto - - Name of Bitcoin creator(s). - - - Save - Salva - - Button for saving profile. - - - Save Image - Salva Immagine - - Context menu option to save an image. - - - Search hashtag: #%@ - Cerca hashtag: #%@ - - Navigation link to search hashtag. - - - Search... - Cerca... - - Placeholder text to prompt entry of search query. - - - Secret Account Login Key - Chiave login segreta dell'Account - - Section title for user's secret account login key. - - - Select a Lightning wallet - Seleziona un portafoglio Lightning - - Title of section for selecting a Lightning wallet to pay a Lightning invoice. - - - Select default wallet - Seleziona un wallet predefinito - - Prompt selection of user's default wallet - - - Send a message to start the conversation... - Invia un messaggio e inizia la conversazione... - - Text prompt for user to send a message to the other user. - - - Settings - Impostazioni - - Navigation title for Settings view. - Sidebar menu label for accessing the app settings - - - Share - Condividi - - Button to share an image. - - - Show - Mostra - - Toggle to show or hide user's secret account login key. - - - Show wallet selector - Mostra wallet disponibili - - Toggle to show or hide selection of wallet. - - - Sign out - Esci - - Sidebar menu label to sign out of the account. - - - Strike - Strike - - Dropdown option label for Lightning wallet, Strike. - - - This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective. - Questa è una chiave pubblica, non potrai postare o interagire in alcun modo. Puoi utilizzarla solo per vedere gli account - - Warning that the inputted account key is a public key and the result of what happens because of it. - - - This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key. - Questa è una chiave di vecchio tipo. Non siamo sicuri se si tratti di una chiave pubblica o privata. Utilizza il pulsante sottostante se si tratta di una chiave pubblica. - - Warning that the inputted account key for login is an old-style and asking user to verify if it is a public key. - - - This is your account ID, you can give this to your friends so that they can follow you. Click to copy. - Questo è l'ID del tuo account. Condividilo con i tuoi amici per farti seguire. Clicca per copiare - - Label to describe that a public key is the user's account ID and what they can do with it. - - - This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe! - Questa è la tua chiave privata. Ti serve ad accedere al tuo account. Non condividerla con nessuno! Salvala in un gestore password e tienila al sicuro - - Label to describe that a private key is the user's secret account key and what they should do with it. - - - Thread - Thread - - Navigation bar title for note thread. - Navigation bar title for threaded event detail view. - - - Type your post here... - Scrivi il tuo post qui... - - Text box prompt to ask user to type their post. - - - Unfollow - Smetti di seguire - - Button to unfollow a user. - - - Unfollowing - Smetti di seguire - - Text to indicate that the button next to it is in a state that indicates that it is in the process of unfollowing a profile. - - - Unfollowing... - Togliendo il segui... - - Label to indicate that the user is in the process of unfollowing another user. - - - Unfollows - Smetti di seguire - - Text to indicate that the button next to it is in a state that will unfollow a profile when tapped. - - - Username - Nome utente - - Label for Username section of user profile form. - Label to prompt username entry. - - - Wallet - Portafoglio - - Sidebar menu label for Wallet view. - - - Wallet Of Satoshi - Wallet Of Satoshi - - Dropdown option label for Lightning wallet, Wallet Of Satoshi. - - - Wallet Selector - Seleziona un portafoglio - - Section title for selection of wallet. - - - Website - Sito web - - Label for Website section of user profile form. - - - Welcome to the social network %@ control. - Benvenuto nel social network %@ controlla. - - Welcoming message to the reader. The variable is 'you', the reader. - - - Welcome, %@! - Benvenuto, %@! - - Text to welcome user. - - - Your Name - Nome - - Label for Your Name section of user profile form. - - - Zebedee - Zebedee - - Dropdown option label for Lightning wallet, Zebedee. - - - Zeus LN - Zeus LN - - Dropdown option label for Lightning wallet, Zeus LN. - - - collapsed_event_view_other_notes - evento compresso, visualizza altre note - - Text to indicate that the thread was collapsed and that there are other notes to view if tapped. (Key in .stringsdict) - - - followers_count - contatore seguaci - - Part of a larger sentence to describe how many people are following a user. (Key in .stringsdict) - - - https://example.com/pic.jpg - https://esempio.com/foto.jpg - - Placeholder example text for profile picture URL. - - - https://jb55.com - https://jb55.com - - Placeholder example text for website URL for user profile. - - - jb55@jb55.com - jb55@jb55.com - - Placeholder example text for identifier used for NIP-05 verification. - - - none - Nessun risultato - - No search results. - - - now - ora - - String indicating that a given timestamp just occurred - - - nsec1... - nsec1... - - Prompt for user to enter in an account key to login. This text shows the characters the key could start with if it was a private key. - - - optional - opzione1 - - Label indicating that a form input is optional. - - - reactions_count - contatore reazioni - - Part of a larger sentence to describe how many reactions there are on a post. (Key in .stringsdict) - - - relays_count - contatore relè - - Part of a larger sentence to describe how many relay servers a user is connected. (Key in .stringsdict) - - - replying_to_one_and_others - Rispondi ad uno e ad altri - - Label to indicate that the user is replying to 1 user and others. (Key in .stringsdict) - - - replying_to_two_and_others - Rispondi a due e ad altri - - Label to indicate that the user is replying to 2 users and others. (Key in .stringsdict) - - - reposts_count - contatore repost - - Part of a larger sentence to describe how many reposts there are. (Key in .stringsdict) - - - satoshi - satoshi - - Example username of Bitcoin creator(s), Satoshi Nakamoto. - - - sats_count - contatore sats - - Amount of sats. (Key in .stringsdict) - - - tips_count - contatore mance - - Part of a larger sentence to describe how many tip payments there are on a post. (Key in .stringsdict) - - - u{00A0} - u{00A0} - - Non-breaking space character to fill in blank space next to event action button icons. - - - wss://some.relay.com - wss://un.relè.com - - Placeholder example for relay server address. - - - you - tu - - You, in this context, is the person who controls their own social network. You is used in the context of a larger sentence that welcomes the reader to the social network that they control themself. - - - - -
- -
- - - %d other note - %d other note - - Text to indicate that the thread was collapsed and that there are other notes to view if tapped. - - - %d other notes - %d other notes - - Text to indicate that the thread was collapsed and that there are other notes to view if tapped. - - - ··· %#@NOTES@ ··· - ··· %#@NOTES@ ··· - - Text to indicate that the thread was collapsed and that there are other notes to view if tapped. - - - Follower - Follower - - Part of a larger sentence to describe how many people are following a user. - - - Followers - Followers - - Part of a larger sentence to describe how many people are following a user. - - - %#@FOLLOWERS@ - %#@FOLLOWERS@ - - Part of a larger sentence to describe how many people are following a user. - - - %#@REACTIONS@ - %#@REACTIONS@ - - Part of a larger sentence to describe how many reactions there are on a post. - - - Reaction - Reaction - - Part of a larger sentence to describe how many reactions there are on a post. - - - Reactions - Reactions - - Part of a larger sentence to describe how many reactions there are on a post. - - - %#@RELAYS@ - %#@RELAYS@ - - Part of a larger sentence to describe how many relay servers a user is connected. - - - Relay - Relay - - Part of a larger sentence to describe how many relay servers a user is connected. - - - Relays - Relays - - Part of a larger sentence to describe how many relay servers a user is connected. - - - Replying to %@%#@OTHERS@ - Replying to %@%#@OTHERS@ - - Label to indicate that the user is replying to 1 user and others. - - - & %d other - & %d other - - Label to indicate that the user is replying to 1 user and others. - - - & %d others - & %d others - - Label to indicate that the user is replying to 1 user and others. - - - - Label to indicate that the user is replying to 1 user and others. - - - Replying to %@, %@%#@OTHERS@ - Replying to %@, %@%#@OTHERS@ - - Label to indicate that the user is replying to 2 users and others. - - - & %d other - & %d other - - Label to indicate that the user is replying to 2 users and others. - - - & %d others - & %d others - - Label to indicate that the user is replying to 2 users and others. - - - - Label to indicate that the user is replying to 2 users and others. - - - %#@REPOSTS@ - %#@REPOSTS@ - - Part of a larger sentence to describe how many reposts there are. - - - Repost - Repost - - Part of a larger sentence to describe how many reposts there are. - - - Reposts - Reposts - - Part of a larger sentence to describe how many reposts there are. - - - %1$#@SATS@ - %1$#@SATS@ - - Amount of sats. - - - %2$@ sat - %2$@ sat - - Amount of sats. - - - %2$@ sats - %2$@ sats - - Amount of sats. - - - %#@TIPS@ - %#@TIPS@ - - Part of a larger sentence to describe how many tip payments there are on a post. - - - Tip - Tip - - Part of a larger sentence to describe how many tip payments there are on a post. - - - Tips - Tips - - Part of a larger sentence to describe how many tip payments there are on a post. - - - - \ No newline at end of file diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj index 0a7e2a8..8651118 100644 --- a/damus.xcodeproj/project.pbxproj +++ b/damus.xcodeproj/project.pbxproj @@ -227,9 +227,6 @@ 3ACB685B297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/InfoPlist.strings"; sourceTree = ""; }; 3ACB685E297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = ""; }; 3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeAgoTests.swift; sourceTree = ""; }; - 3ACD32D0297F2D1E002F68B9 /* it-CH */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-CH"; path = "it-CH.lproj/InfoPlist.strings"; sourceTree = ""; }; - 3ACD32D1297F2D1E002F68B9 /* it-CH */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-CH"; path = "it-CH.lproj/Localizable.strings"; sourceTree = ""; }; - 3ACD32D2297F2D1E002F68B9 /* it-CH */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "it-CH"; path = "it-CH.lproj/Localizable.stringsdict"; sourceTree = ""; }; 3AEABD20297CCFA8003F2975 /* de-DE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "de-DE"; path = "de-DE.lproj/InfoPlist.strings"; sourceTree = ""; }; 3AEABD21297CCFA8003F2975 /* de-DE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "de-DE"; path = "de-DE.lproj/Localizable.strings"; sourceTree = ""; }; 3AEABD22297CCFA8003F2975 /* de-DE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "de-DE"; path = "de-DE.lproj/Localizable.stringsdict"; sourceTree = ""; }; @@ -933,7 +930,6 @@ "tr-TR", "fr-FR", "lv-LV", - "it-CH", "it-IT", ); mainGroup = 4CE6DEDA27F7A08100C66700; @@ -1197,7 +1193,6 @@ 3AEB8005297CCEA900713A25 /* tr-TR */, 3A4F3322297CCFEE004B5F72 /* fr-FR */, 3A185A06297F2C3800F4BDC0 /* lv-LV */, - 3ACD32D2297F2D1E002F68B9 /* it-CH */, 3A929C22297F2CF80090925E /* it-IT */, ); name = Localizable.stringsdict; @@ -1212,7 +1207,6 @@ 3AEB8003297CCEA800713A25 /* tr-TR */, 3A4F3320297CCFEE004B5F72 /* fr-FR */, 3A185A04297F2C3800F4BDC0 /* lv-LV */, - 3ACD32D0297F2D1E002F68B9 /* it-CH */, 3A929C20297F2CF80090925E /* it-IT */, ); name = InfoPlist.strings; @@ -1227,7 +1221,6 @@ 3AEB8004297CCEA800713A25 /* tr-TR */, 3A4F3321297CCFEE004B5F72 /* fr-FR */, 3A185A05297F2C3800F4BDC0 /* lv-LV */, - 3ACD32D1297F2D1E002F68B9 /* it-CH */, 3A929C21297F2CF80090925E /* it-IT */, ); name = Localizable.strings; diff --git a/damus/it-CH.lproj/InfoPlist.strings b/damus/it-CH.lproj/InfoPlist.strings deleted file mode 100644 index fdd2912..0000000 --- a/damus/it-CH.lproj/InfoPlist.strings +++ /dev/null @@ -1,9 +0,0 @@ -/* Bundle display name */ -"CFBundleDisplayName" = "Damus"; - -/* Bundle name */ -"CFBundleName" = "damus"; - -/* Privacy - Photo Library Additions Usage Description */ -"NSPhotoLibraryAddUsageDescription" = "Dai il permesso a Damus di accedere alle tue Foto per salvare immagini"; - diff --git a/damus/it-CH.lproj/Localizable.strings b/damus/it-CH.lproj/Localizable.strings deleted file mode 100644 index d5a8612..0000000 --- a/damus/it-CH.lproj/Localizable.strings +++ /dev/null @@ -1,503 +0,0 @@ -/* Blank space to separate profile picture from profile editor form. */ -" " = "61b6edf1108e6f396680a33b02486a70_tr"; - -/* Description of how the nip05 identifier would be used for verification. */ -"'%@' at '%@' will be used for verification" = "'%@' at '%@' sarà usato per la verifica"; - -/* Description of why the nip05 identifier is invalid. */ -"'%@' is an invalid nip05 identifier. It should look like an email." = "'%@' non è valido. Dovrebbe essere simile ad un indirizzo email."; - -/* Navigation bar title for view that shows who is following a user. */ -"(Profile.displayName(profile: profile, pubkey: whos))'s Followers" = "Seguaci di (Profile.displayName(profile: profile, pubkey: whos))'"; - -/* Navigation bar title for view that shows who a user is following. */ -"(who) following" = "(who) segui già"; - -/* Prefix character to username. */ -"@" = "@"; - -/* Amount of time that has passed since reply quote event occurred. -Abbreviated version of a nostr public key. */ -"%@" = "%@"; - -/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'. -Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. */ -"%@ %@" = "%@ %@"; - -/* Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string. */ -"%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." = "%@. Per creare un account non hai bisogno di un numero di telefono, un indirizzo email o del tuo nome. Inizia ora senza impegni."; - -/* Explanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string. */ -"%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs" = "%@. I messaggi sono criptati utilizzando la crittografia end-to-end. Mantieni i colossi della tecnologia lontani dai tuoi messaggi"; - -/* Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string. */ -"%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." = "%@. Paga i tuoi amici e accumula sats con Bitcoin⚡️, la moneta di internet."; - -/* Number of reposts. -Number of profiles a user is following. */ -"%lld" = "%lld"; - -/* Fraction of how many of the user's relay servers that are operational. */ -"%lld/%lld" = "%lld/%lld"; - -/* Placeholder for event mention. */ -"< e >" = "< e >"; - -/* Label to prompt for about text entry for user to describe about themself. */ -"About" = "Informazioni"; - -/* Label for About Me section of user profile form. */ -"About Me" = "Io"; - -/* Placeholder text for About Me description. */ -"Absolute Boss" = "Capo supremo"; - -/* Label to indicate the public ID of the account. */ -"Account ID" = "ID dell'account"; - -/* Button to add recommended relay server. - Button to confirm adding user inputted relay. */ -"Add" = "Aggiungi"; - -/* Button label to re-add all original participants as profiles to reply to in a note */ -"Add all" = "Aggiungi tutto"; - -/* Label for section for adding a relay server. */ -"Add Relay" = "Aggiungi relè"; - -/* Any amount of sats */ -"Any" = "Qualsiasi"; - -/* Alert message to ask if user wants to repost a post. */ -"Are you sure you want to repost this?" = "Sei sicuro di voler segnalare questo post?"; - -/* Label for Banner Image section of user profile form. */ -"Banner Image" = "Immagine banner"; - -/* Reminder to user that they should save their account information. */ -"Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." = "Prima di iniziare, dovrai salvare le informazioni del tuo account altrimenti non sarai in grado di accedere in futuro se dovessi disinstallare Damus."; - -/* Dropdown option label for Lightning wallet, Bitcoin Beach. */ -"Bitcoin Beach" = "Bitcoin Beach"; - -/* Label for Bitcoin Lightning Tips section of user profile form. */ -"Bitcoin Lightning Tips" = "Mancia con Bitcoin Lightning"; - -/* Dropdown option label for Lightning wallet, Blixt Wallet */ -"Blixt Wallet" = "Blixt Wallet"; - -/* Dropdown option label for Lightning wallet, Blue Wallet. */ -"Blue Wallet" = "Blue Wallet"; - -/* Dropdown option label for Lightning wallet, Breez. */ -"Breez" = "Breez"; - -/* Context menu option for broadcasting the user's note to all of the user's connected relay servers. */ -"Broadcast" = "Trasmetti"; - -/* Button to cancel out of posting a note. - Button to cancel out of reposting a post. - Button to cancel out of view adding user inputted relay. - Cancel out of logging out the user. */ -"Cancel" = "Annulla"; - -/* Dropdown option label for Lightning wallet, Cash App. */ -"Cash App" = "Cash App"; - -/* Navigation bar title for Chatroom view. */ -"Chat" = "Chat"; - -/* Button for clearing cached data. */ -"Clear" = "Cancella"; - -/* Section title for clearing cached data. */ -"Clear Cache" = "Cancella cache"; - -/* Label indicating that a user's key was copied. */ -"Copied" = "Copiato"; - -/* Button to copy a relay server address. */ -"Copy" = "Copia"; - -/* Context menu option for copying the ID of the account that created the note. */ -"Copy Account ID" = "Copia ID dell'Account"; - -/* Context menu option to copy an image into clipboard. - Context menu option to copy an image to clipboard. */ -"Copy Image" = "Copia Immagine"; - -/* Context menu option to copy the URL of an image into clipboard. */ -"Copy Image URL" = "Copia URL dell'Immagine"; - -/* Title of section for copying a Lightning invoice identifier. */ -"Copy invoice" = "Copia fattura"; - -/* Context menu option for copying a user's Lightning URL. */ -"Copy LNURL" = "Copia LNURL"; - -/* Context menu option for copying the ID of the note. */ -"Copy Note ID" = "Copia ID della Nota"; - -/* Context menu option for copying the JSON text from the note. */ -"Copy Note JSON" = "Copia JSON della Nota"; - -/* Context menu option for copying the text from an note. */ -"Copy Text" = "Copia Testo"; - -/* Context menu option for copying the ID of the user who created the note. */ -"Copy User ID" = "Copia ID dell'Utente"; - -/* Button to create account. */ -"Create" = "Crea"; - -/* Button to create an account. */ -"Create Account" = "Crea Account"; - -/* Example description about Bitcoin creator(s), Satoshi Nakamoto. */ -"Creator(s) of Bitcoin. Absolute legend." = "Creatore/i di Bitcoin. Leggenda assoluta"; - -/* Name of the app, shown on the first screen when user is not logged in. */ -"Damus" = "Damus"; - -/* Button to pay a Lightning invoice with the user's default Lightning wallet. */ -"Default Wallet" = "Portafoglio Principale"; - -/* Button to delete a relay server that the user connects to. */ -"Delete" = "Cancella"; - -/* Button to dismiss a text field alert. */ -"Dismiss" = "Lascia stare"; - -/* Label to prompt display name entry. */ -"Display Name" = "Nome visualizzato"; - -/* DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. DM is the English abbreviation for Direct Message. */ -"DM Type" = "Tipo DM"; - -/* Navigation title for DMs view, where DM is the English abbreviation for Direct Message. - Navigation title for view of DMs, where DM is an English abbreviation for Direct Message. */ -"DMs" = "DM"; - -/* Button to dismiss wallet selection view for paying Lightning invoice. */ -"Done" = "Finito"; - -/* Heading indicating that this application allows users to earn money. */ -"Earn Money" = "Guadagna Soldi"; - -/* Button to edit user's profile. */ -"Edit" = "Modifica"; - -/* Text indicating that the view is used for editing which participants are replied to in a note. */ -"Edit participants" = "Modifica partecipanti"; - -/* Heading indicating that this application keeps private messaging end-to-end encrypted. */ -"Encrypted" = "Criptato"; - -/* Prompt for user to enter an account key to login. */ -"Enter your account key to login:" = "Inserisci la chiave del tuo account per accedere"; - -/* Error message indicating why saving keys failed. */ -"Error: %@" = "Errore: %@"; - -/* Filter state for seeing either only posts, or posts & replies. */ -"Filter State" = "Filtra"; - -/* Button to follow a user. */ -"Follow" = "Segui"; - -/* Label describing followers of a user. */ -"Followers" = "Seguaci"; - -/* Text to indicate that the button next to it is in a state that indicates that it is in the process of following a profile. -Part of a larger sentence to describe how many profiles a user is following. */ -"Following" = "Seguiti"; - -/* Label to indicate that the user is in the process of following another user. */ -"Following..." = "Segui già..."; - -/* Text to indicate that button next to it is in a state that will follow a profile when tapped. */ -"Follows" = "Segui"; - -/* Navigation bar title for Global view where posts from all connected relay servers appear. */ -"Global" = "Globale"; - -/* Navigation link to go to post referenced by hex code. */ -"Goto post %@" = "Vai al post %@"; - -/* Navigation link to go to profile. */ -"Goto profile %@" = "Vai al profilo %@"; - -/* Navigation bar title for Home view where posts and replies appear from those who the user is following. */ -"Home" = "Home"; - -/* Placeholder example text for profile picture URL. */ -"https://example.com/pic.jpg" = "https://esempio.com/foto.jpg"; - -/* Placeholder example text for website URL for user profile. */ -"https://jb55.com" = "https://jb55.com"; - -/* Error message indicating that an invalid account key was entered for login. */ -"Invalid key" = "Chiave non valida"; - -/* Placeholder example text for identifier used for NIP-05 verification. */ -"jb55@jb55.com" = "jb55@jb55.com"; - -/* Moves the post button to the left side of the screen */ -"Left Handed" = "Mancino"; - -/* Button to complete account creation and start using the app. */ -"Let's go!" = "Andiamo!"; - -/* Placeholder text for entry of Lightning Address or LNURL. */ -"Lightning Address or LNURL" = "Indirizzo Lightning o LNURL"; - -/* Indicates that the view is for paying a Lightning invoice. */ -"Lightning Invoice" = "Fattura Lightning"; - -/* Dropdown option label for Lightning wallet, LNLink. */ -"LNLink" = "LNLink"; - -/* Dropdown option label for system default for Lightning wallet. */ -"Local default" = "Predefinito"; - -/* Button to log into account. - Button to log into an account. */ -"Login" = "Entra"; - -/* Alert for logging out the user. - Button for logging out the user. - Button to logout the user. */ -"Logout" = "Esci"; - -/* Reminder message in alert to get customer to verify that their private security account key is saved saved before logging out. */ -"Make sure your nsec account key is saved before you logout or you will lose access to this account" = "Assicurati di aver salvato la chiave privata (nSEC) prima di uscire o perderai l'accesso a questo account"; - -/* Dropdown option label for Lightning wallet, Muun. */ -"Muun" = "Muun"; - -/* Label for NIP-05 Verification section of user profile form. */ -"NIP-05 Verification" = "Verifica NIP-05"; - -/* No search results. */ -"none" = "Nessun risultato"; - -/* Indicates that there are no notes in the timeline to view. */ -"Nothing to see here. Check back later!" = "Niente da vedere qui. Controlla dopo!"; - -/* Navigation title for notifications. */ -"Notifications" = "Notifiche"; - -/* String indicating that a given timestamp just occurred */ -"now" = "ora"; - -/* Prompt for user to enter in an account key to login. This text shows the characters the key could start with if it was a private key. */ -"nsec1..." = "nsec1..."; - -/* Label indicating that a form input is optional. */ -"optional" = "opzione1"; - -/* Button to pay a Lightning invoice. */ -"Pay" = "Paga"; - -/* Navigation bar title for view to pay Lightning invoice. */ -"Pay the Lightning invoice" = "Paga la fattura Lightning"; - -/* Dropdown option label for Lightning wallet, Phoenix. */ -"Phoenix" = "Phoenix"; - -/* Button to post a note. */ -"Post" = "Post"; - -/* Label for filter for seeing only posts (instead of posts and replies). */ -"Posts" = "Post"; - -/* Label for filter for seeing posts and replies (instead of only posts). */ -"Posts & Replies" = "Post & Risposte"; - -/* Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading. */ -"Private" = "Privato"; - -/* Title of the secure field that holds the user's private key. */ -"Private Key" = "Chiave Privata"; - -/* Sidebar menu label for Profile view. */ -"Profile" = "Profilo1"; - -/* Label for Profile Picture section of user profile form. */ -"Profile Picture" = "Foto Profilo"; - -/* Section title for the user's public account ID. */ -"Public Account ID" = "ID Pubblico dell'Account"; - -/* Label indicating that the text is a user's public account key. */ -"Public key" = "Chiave Pubblica"; - -/* Label indicating that the text is a user's public account key. */ -"Public Key" = "Chiave Pubblica"; - -/* Prompt to ask user if the key they entered is a public key. */ -"Public Key?" = "È la chiave pubblica?"; - -/* Navigation bar title for Reactions view. */ -"Reactions" = "Reazioni"; - -/* Section title for recommend relay servers that could be added as part of configuration */ -"Recommended Relays" = "Relè consigliati"; - -/* Text field for relay server. Used for testing purposes. */ -"Relay" = "Relè"; - -/* Sidebar menu label for Relay servers view */ -"Relays" = "Relè"; - -/* Button label to remove all participants from a note reply. */ -"Remove all" = "Rimuovi tutto"; - -/* Label to indicate that the user is replying to themself. */ -"Reply to self" = "Rispondi a te stesso"; - -/* Label to indicate that the user is replying to 2 users. */ -"Replying to %@ & %@" = "Rispondi a %1$@ e %2$@"; - -/* Indicating that the user is replying to the following listed people. */ -"Replying to:" = "Rispondi a:"; - -/* Button to confirm reposting a post. - Title of alert for confirming to repost a post. */ -"Repost" = "Reposta"; - -/* Text indicating that the post was reposted (i.e. re-shared). */ -"Reposted" = "Repostato"; - -/* Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message. */ -"Requests" = "Richiesta"; - -/* Section title for resetting the user */ -"Reset" = "Ricomincia"; - -/* Button to retry completing account creation after an error occurred. */ -"Retry" = "Riprova"; - -/* Dropdown option label for Lightning wallet, River */ -"River" = "River"; - -/* Example username of Bitcoin creator(s), Satoshi Nakamoto. */ -"satoshi" = "satoshi"; - -/* Name of Bitcoin creator(s). */ -"Satoshi Nakamoto" = "Satoshi Nakamoto"; - -/* Button for saving profile. */ -"Save" = "Salva"; - -/* Context menu option to save an image. */ -"Save Image" = "Salva Immagine"; - -/* Navigation link to search hashtag. */ -"Search hashtag: #%@" = "Cerca hashtag: #%@"; - -/* Placeholder text to prompt entry of search query. */ -"Search..." = "Cerca..."; - -/* Section title for user's secret account login key. */ -"Secret Account Login Key" = "Chiave login segreta dell'Account"; - -/* Title of section for selecting a Lightning wallet to pay a Lightning invoice. */ -"Select a Lightning wallet" = "Seleziona un portafoglio Lightning"; - -/* Prompt selection of user's default wallet */ -"Select default wallet" = "Seleziona un wallet predefinito"; - -/* Text prompt for user to send a message to the other user. */ -"Send a message to start the conversation..." = "Invia un messaggio e inizia la conversazione..."; - -/* Navigation title for Settings view. - Sidebar menu label for accessing the app settings */ -"Settings" = "Impostazioni"; - -/* Button to share an image. */ -"Share" = "Condividi"; - -/* Toggle to show or hide user's secret account login key. */ -"Show" = "Mostra"; - -/* Toggle to show or hide selection of wallet. */ -"Show wallet selector" = "Mostra wallet disponibili"; - -/* Sidebar menu label to sign out of the account. */ -"Sign out" = "Esci"; - -/* Dropdown option label for Lightning wallet, Strike. */ -"Strike" = "Strike"; - -/* Warning that the inputted account key is a public key and the result of what happens because of it. */ -"This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective." = "Questa è una chiave pubblica, non potrai postare o interagire in alcun modo. Puoi utilizzarla solo per vedere gli account"; - -/* Warning that the inputted account key for login is an old-style and asking user to verify if it is a public key. */ -"This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key." = "Questa è una chiave di vecchio tipo. Non siamo sicuri se si tratti di una chiave pubblica o privata. Utilizza il pulsante sottostante se si tratta di una chiave pubblica."; - -/* Label to describe that a public key is the user's account ID and what they can do with it. */ -"This is your account ID, you can give this to your friends so that they can follow you. Click to copy." = "Questo è l'ID del tuo account. Condividilo con i tuoi amici per farti seguire. Clicca per copiare"; - -/* Label to describe that a private key is the user's secret account key and what they should do with it. */ -"This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "Questa è la tua chiave privata. Ti serve ad accedere al tuo account. Non condividerla con nessuno! Salvala in un gestore password e tienila al sicuro"; - -/* Navigation bar title for note thread. - Navigation bar title for threaded event detail view. */ -"Thread" = "Thread"; - -/* Text box prompt to ask user to type their post. */ -"Type your post here..." = "Scrivi il tuo post qui..."; - -/* Non-breaking space character to fill in blank space next to event action button icons. */ -"u{00A0}" = "u{00A0}"; - -/* Button to unfollow a user. */ -"Unfollow" = "Smetti di seguire"; - -/* Text to indicate that the button next to it is in a state that indicates that it is in the process of unfollowing a profile. */ -"Unfollowing" = "Smetti di seguire"; - -/* Label to indicate that the user is in the process of unfollowing another user. */ -"Unfollowing..." = "Togliendo il segui..."; - -/* Text to indicate that the button next to it is in a state that will unfollow a profile when tapped. */ -"Unfollows" = "Smetti di seguire"; - -/* Label for Username section of user profile form. - Label to prompt username entry. */ -"Username" = "Nome utente"; - -/* Sidebar menu label for Wallet view. */ -"Wallet" = "Portafoglio"; - -/* Dropdown option label for Lightning wallet, Wallet Of Satoshi. */ -"Wallet Of Satoshi" = "Wallet Of Satoshi"; - -/* Section title for selection of wallet. */ -"Wallet Selector" = "Seleziona un portafoglio"; - -/* Label for Website section of user profile form. */ -"Website" = "Sito web"; - -/* Welcoming message to the reader. The variable is 'you', the reader. */ -"Welcome to the social network %@ control." = "Benvenuto nel social network %@ controlla."; - -/* Text to welcome user. */ -"Welcome, %@!" = "Benvenuto, %@!"; - -/* Placeholder example for relay server address. */ -"wss://some.relay.com" = "wss://un.relè.com"; - -/* You, in this context, is the person who controls their own social network. You is used in the context of a larger sentence that welcomes the reader to the social network that they control themself. */ -"you" = "tu"; - -/* Label for Your Name section of user profile form. */ -"Your Name" = "Nome"; - -/* Dropdown option label for Lightning wallet, Zebedee. */ -"Zebedee" = "Zebedee"; - -/* Dropdown option label for Lightning wallet, Zeus LN. */ -"Zeus LN" = "Zeus LN"; - diff --git a/damus/it-CH.lproj/Localizable.stringsdict b/damus/it-CH.lproj/Localizable.stringsdict deleted file mode 100644 index dd12a44..0000000 --- a/damus/it-CH.lproj/Localizable.stringsdict +++ /dev/null @@ -1,154 +0,0 @@ - - - - - collapsed_event_view_other_notes - - NOTES - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d other note - other - %d other notes - - NSStringLocalizedFormatKey - ··· %#@NOTES@ ··· - - followers_count - - FOLLOWERS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Follower - other - Followers - - NSStringLocalizedFormatKey - %#@FOLLOWERS@ - - reactions_count - - NSStringLocalizedFormatKey - %#@REACTIONS@ - REACTIONS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Reaction - other - Reactions - - - relays_count - - NSStringLocalizedFormatKey - %#@RELAYS@ - RELAYS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Relay - other - Relays - - - replying_to_one_and_others - - NSStringLocalizedFormatKey - Replying to %@%#@OTHERS@ - OTHERS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - & %d other - other - & %d others - zero - - - - replying_to_two_and_others - - NSStringLocalizedFormatKey - Replying to %@, %@%#@OTHERS@ - OTHERS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - & %d other - other - & %d others - zero - - - - reposts_count - - NSStringLocalizedFormatKey - %#@REPOSTS@ - REPOSTS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Repost - other - Reposts - - - sats_count - - NSStringLocalizedFormatKey - %1$#@SATS@ - SATS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - @ - one - %2$@ sat - other - %2$@ sats - - - tips_count - - NSStringLocalizedFormatKey - %#@TIPS@ - TIPS - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - Tip - other - Tips - - - - From 51f94cf1357c8ab80d8bdc1eb66fcf23cd80018f Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Thu, 26 Jan 2023 22:50:45 -0500 Subject: [PATCH 2/3] Add missing comments to localized strings, reorder buttons, mark destructive buttons --- .../Localized Contents/en-US.xliff | 168 +++++++++++++++++- .../damus/en-US.lproj/Localizable.strings | Bin 22700 -> 26904 bytes damus/ContentView.swift | 43 +++-- damus/Views/ConfigView.swift | 4 +- damus/Views/EULAView.swift | 8 +- damus/Views/Events/EventMenu.swift | 4 +- damus/Views/Muting/MutelistView.swift | 2 +- damus/Views/ProfileView.swift | 8 +- damus/Views/ReportView.swift | 22 +-- damus/Views/SideMenuView.swift | 4 +- 10 files changed, 207 insertions(+), 56 deletions(-) diff --git a/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff b/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff index 7d2167f..cbe377e 100644 --- a/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff @@ -41,9 +41,14 @@ Abbreviated version of a nostr public key. %@ %@ %@ %@ - Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'. + Sentence composed of 2 variables to describe how many tip payments there are on a post. In source English, the first variable is the number of tip payments, and the second variable is 'Tip' or 'Tips'. Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. + + %@ has been blocked + %@ has been blocked + Alert message that informs a user was blocked. + %@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction. %@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction. @@ -62,7 +67,7 @@ Sentence composed of 2 variables to describe how many profiles a user is followi %lld %lld - Number of reposts. + Number of tip payments on a post. Number of profiles a user is following. @@ -115,11 +120,21 @@ Number of profiles a user is following. Absolute Boss Placeholder text for About Me description. + + Accept + Accept + Button to accept the end user license agreement before being allowed into the app. + Account ID Account ID Label to indicate the public ID of the account. + + Actions + Actions + Title for confirmation dialog to either share, report, or block a profile. + Add Add @@ -171,6 +186,33 @@ Number of profiles a user is following. Blixt Wallet Dropdown option label for Lightning wallet, Blixt Wallet + + Block + Block + Alert button to block a user. + Button to block a profile. + Context menu option for blocking users. + + + Block %@? + Block %@? + Alert message prompt to ask if a user should be blocked. + + + Block User + Block User + Title of alert for blocking a user. + + + Blocked + Blocked + Sidebar menu label for Profile view. + + + Blocked Users + Blocked Users + Navigation title of view to see list of blocked users. + Blue Wallet Blue Wallet @@ -189,7 +231,9 @@ Number of profiles a user is following. Cancel Cancel - Button to cancel out of posting a note. + Alert button to cancel out of alert for blocking a user. + 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. Button to cancel out of view adding user inputted relay. Cancel out of logging out the user. @@ -255,14 +299,19 @@ Number of profiles a user is following. Copy Note JSON Context menu option for copying the JSON text from the note. + + Copy Report ID + Copy Report ID + Button to copy report ID. + Copy Text Copy Text Context menu option for copying the text from an note. - - Copy User ID - Copy User ID + + Copy User Pubkey + Copy User Pubkey Context menu option for copying the ID of the user who created the note. @@ -270,6 +319,11 @@ Number of profiles a user is following. Copy invoice Title of section for copying a Lightning invoice identifier. + + Could not find user to block... + Could not find user to block... + Alert message to indicate that the blocked user could not be found. + Create Create @@ -280,6 +334,11 @@ Number of profiles a user is following. Create Account Button to create an account. + + Create new mutelist + Create new mutelist + Title of alert prompting the user to create a new mutelist. + Creator(s) of Bitcoin. Absolute legend. Creator(s) of Bitcoin. Absolute legend. @@ -309,7 +368,8 @@ Number of profiles a user is following. Delete Delete - Button to delete a relay server that the user connects to. + Button to delete a relay server that the user connects to. + Button to remove a user from their blocklist. Dismiss @@ -326,6 +386,11 @@ Number of profiles a user is following. Done Button to dismiss wallet selection view for paying Lightning invoice. + + EULA + EULA + Label indicating that the below text is the EULA, an acronym for End User License Agreement. + Earn Money Earn Money @@ -407,11 +472,21 @@ Part of a larger sentence to describe how many profiles a user is following.Home Navigation bar title for Home view where posts and replies appear from those who the user is following. + + Illegal content + Illegal content + Button for user to report that the account or content has illegal content. + Invalid key Invalid key Error message indicating that an invalid account key was entered for login. + + It's spam + It's spam + Button for user to report that the account or content has spam. + LNLink LNLink @@ -470,6 +545,11 @@ Part of a larger sentence to describe how many profiles a user is following.NIP-05 Verification Label for NIP-05 Verification section of user profile form. + + No block list found, create a new one? This will overwrite any previous block lists. + No block list found, create a new one? This will overwrite any previous block lists. + Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. + Nothing to see here. Check back later! Nothing to see here. Check back later! @@ -480,6 +560,11 @@ Part of a larger sentence to describe how many profiles a user is following.Notifications Navigation title for notifications. + + Nudity or explicit content + Nudity or explicit content + Button for user to report that the account or content has nudity or explicit content. + Pay Pay @@ -560,6 +645,11 @@ Part of a larger sentence to describe how many profiles a user is following.Recommended Relays Section title for recommend relay servers that could be added as part of configuration + + Reject + Reject + Button to reject the end user license agreement, which disallows the user from being let into the app. + Relay Relay @@ -570,6 +660,11 @@ Part of a larger sentence to describe how many profiles a user is following.Relays Sidebar menu label for Relay servers view + + Relays have been notified and clients will be able to use this information to filter content. Thank you! + Relays have been notified and clients will be able to use this information to filter content. Thank you! + Description of what was done as a result of sending a report to relay servers. + Remove all Remove all @@ -590,6 +685,22 @@ Part of a larger sentence to describe how many profiles a user is following.Replying to: Indicating that the user is replying to the following listed people. + + Report + Report + Button to report a profile. + Context menu option for reporting content. + + + Report ID: + Report ID: + Label indicating that the text underneath is the identifier of the report that was sent to relay servers. + + + Report sent! + Report sent! + Message indicating that a report was successfully sent to relay servers. + Repost Repost @@ -601,6 +712,11 @@ Part of a larger sentence to describe how many profiles a user is following.Reposted Text indicating that the post was reposted (i.e. re-shared). + + Reposts + Reposts + Navigation bar title for Reposts view. + Requests Requests @@ -675,7 +791,8 @@ Part of a larger sentence to describe how many profiles a user is following. Share Share - Button to share an image. + Button to share an image. + Button to share the link to a profile. Show @@ -697,6 +814,16 @@ Part of a larger sentence to describe how many profiles a user is following.Strike Dropdown option label for Lightning wallet, Strike. + + Thanks! + Thanks! + Button to close out of alert that informs that the action to block a user was successful. + + + They are impersonating someone + They are impersonating someone + Button for user to report that the account is impersonating someone. + This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective. This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective. @@ -748,6 +875,16 @@ Part of a larger sentence to describe how many profiles a user is following.Unfollows Text to indicate that the button next to it is in a state that will unfollow a profile when tapped. + + User blocked + User blocked + Alert message to indicate + + + User has been blocked + User has been blocked + Alert message that informs a user was blocked. + Username Username @@ -784,11 +921,26 @@ Part of a larger sentence to describe how many profiles a user is following.Welcome, %@! Text to welcome user. + + What do you want to report? + What do you want to report? + Header text to prompt user what issue they want to report. + + + Yes, Overwrite + Yes, Overwrite + Text of button that confirms to overwrite the existing mutelist. + Your Name Your Name Label for Your Name section of user profile form. + + Your report will be sent to the relays you are connected to + Your report will be sent to the relays you are connected to + Footer text to inform user what will happen when the report is submitted. + Zebedee Zebedee diff --git a/damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings index 557c9a909968d83b2c294e5d90c990ebcf838633..76720d714094c41b42285053748966d105a1416b 100644 GIT binary patch delta 2872 zcmbtWOK%%h6uvI8lQ@1A+jWz%+i}t;5LK9xM2QH7I5bilXc7ukus~w!I;m;=sK-qR z2!-reA*8dZ*btfL8nO?`Y{#;X~0TZg?DQu35jPQ$Lk#m_g40;w% z3zc@V)AX(PLwb8MKxZR;r94EIVL}lml%TYZ6;pI5ElMLQ(j2K8rW706*+CPo8`AW% z_+r%<8FVlVh#IPG3~!`d70AG3j{lcD4oryQp)D^*G9R_nmT zVTmOBXecz)+u)&_F-R7`SS`NKn{Tw_K;E>a9)PLNaF1olV&eQkt zME_+Rmq|qTVyS`Vm#EW@7N@5NFIbC1Cp`lzkbD(6RS;Wr5RcP)n!km1FEv76Xul)N zA4jkQ{Z)8XL4H?hYd%GL+KIuARx;oeP9+9803EylcyA@OXonp#a#7OHN36Z%u7^JH zC0}I!N>I9iw}Qp#466-u?C!zE=Z3lwdn!?GnZTpb&D} zU1I7sd8s@9k`&!8!13w`_I7R{AC(pT^~6IT7uXHXm3Q#urJet0L~$qIL_YB-yN)%Z zV#;h%!^xzb`MBXEG!HbpQ*h=nPW-K!n{CPA$;G8^TkHVQq*8E2v+g|m&>MD@0Yvji zai+nOnUnr)8u2$`_)^&^Y}xcbn#xo(bA~+@DP{rV?$G z!I$M+RM@a9r>*Ks`^Pwh**sFM0;surRAeLNH%|h0 zn`S_HXe*Fa(=Nd#GzfW5amKk);!KhDp0o)$s>W_1)O^1&@mq!F^_FUUO=@JrO_6p@ zns)jueYcSA(zrN{*lILo=&Iq1Ta&tgs2dPd_@>14!XX>b`Xv?|@qZ&n#`$@$3=1~- zKZ&t2OB3?W5@h=rC%)Si$T*{=oy(YgdvJGlp55tJqrny$g?mS>jmsB$=+ugT+aC8k zJ2_~47jwd_lG(nmF@!3xYS7eBt2Kbi9p1?_?p*3JVV8t!GQ;?~8{B#Eru2yme_2j1 Uw@{}_x}2ipy(8BBD?fVv2IBf%O#lD@ delta 174 zcmbPniE+(F#tpMrCqMAen7n|kVRD1K$YwTw2@!#ZQ0Ro#BDKB8$yhL>a*JL-tCzC(0 zNKBrSDzI71IEE8!;y>F@Y?A}hxHh?cVx7Ft=h9?{xVXs<&Mcd2{Q5XI$3@%$+9ztX Yxi0nt^W+O0BAYpqJXpXCyYyR(0FdHCTmS$7 diff --git a/damus/ContentView.swift b/damus/ContentView.swift index bada26e..1df96c8 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -434,21 +434,26 @@ struct ContentView: View { .onReceive(handle_notify(.new_mutes)) { notif in home.filter_muted() } - .alert("User blocked", isPresented: $user_blocked_confirm, actions: { - Button("Thanks!") { + .alert(NSLocalizedString("User blocked", comment: "Alert message to indicate "), isPresented: $user_blocked_confirm, actions: { + Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to block a user was successful.")) { user_blocked_confirm = false } }, message: { if let pubkey = self.blocking { let profile = damus_state!.profiles.lookup(id: pubkey) let name = Profile.displayName(profile: profile, pubkey: pubkey) - Text("\(name) has been blocked") + Text("\(name) has been blocked", comment: "Alert message that informs a user was blocked.") } else { - Text("User has been blocked") + Text("User has been blocked", comment: "Alert message that informs a user was blocked.") } }) - .alert("Create new mutelist", isPresented: $confirm_overwrite_mutelist, actions: { - Button("Yes, Overwrite") { + .alert(NSLocalizedString("Create new mutelist", comment: "Title of alert prompting the user to create a new mutelist."), isPresented: $confirm_overwrite_mutelist, actions: { + Button(NSLocalizedString("Cancel", comment: "Button to cancel out of alert that creates a new mutelist.")) { + confirm_overwrite_mutelist = false + confirm_block = false + } + + Button(NSLocalizedString("Yes, Overwrite", comment: "Text of button that confirms to overwrite the existing mutelist.")) { guard let ds = damus_state else { return } @@ -472,20 +477,18 @@ struct ContentView: View { confirm_block = false user_blocked_confirm = true } - - Button("Cancel") { - confirm_overwrite_mutelist = false - confirm_block = false - } }, message: { - Text("No block list found, create a new one? This will overwrite any previous block lists.") + Text("No block list found, create a new one? This will overwrite any previous block lists.", comment: "Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists.") }) - .alert("Block User", isPresented: $confirm_block, actions: { - Button("Block") { + .alert(NSLocalizedString("Block User", comment: "Title of alert for blocking a user."), isPresented: $confirm_block, actions: { + Button(NSLocalizedString("Cancel", comment: "Alert button to cancel out of alert for blocking a user."), role: .cancel) { + confirm_block = false + } + Button(NSLocalizedString("Block", comment: "Alert button to block a user."), role: .destructive) { guard let ds = damus_state else { return } - + if ds.contacts.mutelist == nil { confirm_overwrite_mutelist = true } else { @@ -495,7 +498,7 @@ struct ContentView: View { guard let pubkey = blocking else { return } - + guard let ev = create_or_update_mutelist(keypair: keypair, mprev: ds.contacts.mutelist, to_add: pubkey) else { return } @@ -503,17 +506,13 @@ struct ContentView: View { ds.pool.send(.event(ev)) } } - - Button("Cancel") { - confirm_block = false - } }, message: { if let pubkey = blocking { let profile = damus_state?.profiles.lookup(id: pubkey) let name = Profile.displayName(profile: profile, pubkey: pubkey) - Text("Block \(name)?") + Text("Block \(name)?", comment: "Alert message prompt to ask if a user should be blocked.") } else { - Text("Could not find user to block...") + Text("Could not find user to block...", comment: "Alert message to indicate that the blocked user could not be found.") } }) } diff --git a/damus/Views/ConfigView.swift b/damus/Views/ConfigView.swift index 07d4b66..f586181 100644 --- a/damus/Views/ConfigView.swift +++ b/damus/Views/ConfigView.swift @@ -139,10 +139,10 @@ struct ConfigView: View { .navigationTitle(NSLocalizedString("Settings", comment: "Navigation title for Settings view.")) .navigationBarTitleDisplayMode(.large) .alert(NSLocalizedString("Logout", comment: "Alert for logging out the user."), isPresented: $confirm_logout) { - Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user.")) { + Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user."), role: .cancel) { confirm_logout = false } - Button(NSLocalizedString("Logout", comment: "Button for logging out the user.")) { + Button(NSLocalizedString("Logout", comment: "Button for logging out the user."), role: .destructive) { notify(.logout, ()) } } message: { diff --git a/damus/Views/EULAView.swift b/damus/Views/EULAView.swift index 3bdf1c3..eae670f 100644 --- a/damus/Views/EULAView.swift +++ b/damus/Views/EULAView.swift @@ -16,7 +16,7 @@ struct EULAView: View { DamusGradient() ScrollView { - Text("EULA") + Text("EULA", comment: "Label indicating that the below text is the EULA, an acronym for End User License Agreement.") .font(.title.bold()) .foregroundColor(.white) @@ -72,11 +72,11 @@ By using our Application, you signify your acceptance of this EULA. If you do no NavigationLink(destination: CreateAccountView(), isActive: $creating_account) { EmptyView() } - DamusWhiteButton("Accept") { + DamusWhiteButton(NSLocalizedString("Accept", comment: "Button to accept the end user license agreement before being allowed into the app.")) { creating_account = true } - - DamusWhiteButton("Reject") { + + DamusWhiteButton(NSLocalizedString("Reject", comment: "Button to reject the end user license agreement, which disallows the user from being let into the app.")) { dismiss() } } diff --git a/damus/Views/Events/EventMenu.swift b/damus/Views/Events/EventMenu.swift index 8ab2ead..dc8ec18 100644 --- a/damus/Views/Events/EventMenu.swift +++ b/damus/Views/Events/EventMenu.swift @@ -38,14 +38,14 @@ struct EventMenuContext: View { Label(NSLocalizedString("Copy Note JSON", comment: "Context menu option for copying the JSON text from the note."), systemImage: "square.on.square") } - Button { + Button(role: .destructive) { let target: ReportTarget = .note(ReportNoteTarget(pubkey: event.pubkey, note_id: event.id)) notify(.report, target) } label: { Label(NSLocalizedString("Report", comment: "Context menu option for reporting content."), systemImage: "exclamationmark.bubble") } - Button { + Button(role: .destructive) { notify(.block, event.pubkey) } label: { Label(NSLocalizedString("Block", comment: "Context menu option for blocking users."), systemImage: "exclamationmark.octagon") diff --git a/damus/Views/Muting/MutelistView.swift b/damus/Views/Muting/MutelistView.swift index c847e86..bbdc157 100644 --- a/damus/Views/Muting/MutelistView.swift +++ b/damus/Views/Muting/MutelistView.swift @@ -43,7 +43,7 @@ struct MutelistView: View { RemoveAction(pubkey: pubkey) } } - .navigationTitle("Blocked Users") + .navigationTitle(NSLocalizedString("Blocked Users", comment: "Navigation title of view to see list of blocked users.")) } } diff --git a/damus/Views/ProfileView.swift b/damus/Views/ProfileView.swift index 4bcd62c..a48412e 100644 --- a/damus/Views/ProfileView.swift +++ b/damus/Views/ProfileView.swift @@ -374,17 +374,17 @@ struct ProfileView: View { } } } - .confirmationDialog("Actions", isPresented: $action_sheet_presented) { - Button("Share") { + .confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or block a profile."), isPresented: $action_sheet_presented) { + Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) { show_share_sheet = true } - Button("Report") { + Button(NSLocalizedString("Report", comment: "Button to report a profile."), role: .destructive) { let target: ReportTarget = .user(profile.pubkey) notify(.report, target) } - Button("Block") { + Button(NSLocalizedString("Block", comment: "Button to block a profile."), role: .destructive) { notify(.block, profile.pubkey) } } diff --git a/damus/Views/ReportView.swift b/damus/Views/ReportView.swift index b3286bc..d69a287 100644 --- a/damus/Views/ReportView.swift +++ b/damus/Views/ReportView.swift @@ -25,16 +25,16 @@ struct ReportView: View { var Success: some View { VStack(alignment: .center, spacing: 20) { - Text("Report sent!") + Text("Report sent!", comment: "Message indicating that a report was successfully sent to relay servers.") .font(.headline) - Text("Relays have been notified and clients will be able to use this information to filter content. Thank you!") + Text("Relays have been notified and clients will be able to use this information to filter content. Thank you!", comment: "Description of what was done as a result of sending a report to relay servers.") - Text("Report ID:") + Text("Report ID:", comment: "Label indicating that the text underneath is the identifier of the report that was sent to relay servers.") Text(report_id) - Button("Copy Report ID") { + Button(NSLocalizedString("Copy Report ID", comment: "Button to copy report ID.")) { UIPasteboard.general.string = report_id let g = UIImpactFeedbackGenerator(style: .medium) g.impactOccurred() @@ -59,33 +59,33 @@ struct ReportView: View { var MainForm: some View { VStack { - Text("Report") + Text("Report", comment: "Label indicating that the current view is for the user to report content.") .font(.headline) .padding() Form { Section(content: { - Button("It's spam") { + Button(NSLocalizedString("It's spam", comment: "Button for user to report that the account or content has spam.")) { do_send_report(type: .spam) } - Button("Nudity or explicit content") { + Button(NSLocalizedString("Nudity or explicit content", comment: "Button for user to report that the account or content has nudity or explicit content.")) { do_send_report(type: .explicit) } - Button("Illegal content") { + Button(NSLocalizedString("Illegal content", comment: "Button for user to report that the account or content has illegal content.")) { do_send_report(type: .illegal) } if case .user = target { - Button("They are impersonating someone") { + Button(NSLocalizedString("They are impersonating someone", comment: "Button for user to report that the account is impersonating someone.")) { do_send_report(type: .impersonation) } } }, header: { - Text("What do you want to report?") + Text("What do you want to report?", comment: "Header text to prompt user what issue they want to report.") }, footer: { - Text("Your report will be sent to the relays you are connected to") + Text("Your report will be sent to the relays you are connected to", comment: "Footer text to inform user what will happen when the report is submitted.") }) } } diff --git a/damus/Views/SideMenuView.swift b/damus/Views/SideMenuView.swift index 9f9c72d..6ce48df 100644 --- a/damus/Views/SideMenuView.swift +++ b/damus/Views/SideMenuView.swift @@ -148,10 +148,10 @@ struct SideMenuView: View { isSidebarVisible.toggle() } .alert("Logout", isPresented: $confirm_logout) { - Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user.")) { + Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user."), role: .cancel) { confirm_logout = false } - Button(NSLocalizedString("Logout", comment: "Button for logging out the user.")) { + Button(NSLocalizedString("Logout", comment: "Button for logging out the user."), role: .destructive) { notify(.logout, ()) } } message: { From 3e02cc6889190f73711d41f3d18e76ada2db90fb Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Thu, 26 Jan 2023 23:34:21 -0500 Subject: [PATCH 3/3] Prevent blocking or reporting yourself --- damus/Views/ChatroomView.swift | 2 +- damus/Views/DMChatView.swift | 2 +- damus/Views/EventView.swift | 6 ++-- damus/Views/Events/EmbeddedEventView.swift | 2 +- damus/Views/Events/EventMenu.swift | 36 ++++++++++++---------- damus/Views/Events/SelectedEventView.swift | 2 +- damus/Views/ProfileView.swift | 19 +++++++----- 7 files changed, 37 insertions(+), 32 deletions(-) diff --git a/damus/Views/ChatroomView.swift b/damus/Views/ChatroomView.swift index 0ce6727..ed38f7a 100644 --- a/damus/Views/ChatroomView.swift +++ b/damus/Views/ChatroomView.swift @@ -24,7 +24,7 @@ struct ChatroomView: View { next_ev: ind == count-1 ? nil : thread.events[ind+1], damus_state: damus ) - .event_context_menu(ev, pubkey: ev.pubkey, privkey: damus.keypair.privkey) + .event_context_menu(ev, keypair: damus.keypair) .onTapGesture { if thread.initial_event.id == ev.id { //dismiss() diff --git a/damus/Views/DMChatView.swift b/damus/Views/DMChatView.swift index 0c2f6ba..f963ced 100644 --- a/damus/Views/DMChatView.swift +++ b/damus/Views/DMChatView.swift @@ -19,7 +19,7 @@ struct DMChatView: View { VStack(alignment: .leading) { ForEach(Array(zip(dms.events, dms.events.indices)), id: \.0.id) { (ev, ind) in DMView(event: dms.events[ind], damus_state: damus_state) - .event_context_menu(ev, pubkey: ev.pubkey, privkey: damus_state.keypair.privkey) + .event_context_menu(ev, keypair: damus_state.keypair) } EndBlock(height: 80) } diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index a305189..fab2e1d 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -129,7 +129,7 @@ struct EventView: View { .id(event.id) .frame(maxWidth: .infinity, minHeight: PFP_SIZE) .padding([.bottom], 2) - .event_context_menu(event, pubkey: pubkey, privkey: damus.keypair.privkey) + .event_context_menu(event, keypair: damus.keypair) } } @@ -171,9 +171,9 @@ extension View { } } - func event_context_menu(_ event: NostrEvent, pubkey: String, privkey: String?) -> some View { + func event_context_menu(_ event: NostrEvent, keypair: Keypair) -> some View { return self.contextMenu { - EventMenuContext(event: event, privkey: privkey, pubkey: pubkey) + EventMenuContext(event: event, keypair: keypair) } } diff --git a/damus/Views/Events/EmbeddedEventView.swift b/damus/Views/Events/EmbeddedEventView.swift index beaa6ee..4d75368 100644 --- a/damus/Views/Events/EmbeddedEventView.swift +++ b/damus/Views/Events/EmbeddedEventView.swift @@ -23,7 +23,7 @@ struct EmbeddedEventView: View { EventBody(damus_state: damus_state, event: event, size: .small) } - .event_context_menu(event, pubkey: pubkey, privkey: damus_state.keypair.privkey) + .event_context_menu(event, keypair: damus_state.keypair) } } diff --git a/damus/Views/Events/EventMenu.swift b/damus/Views/Events/EventMenu.swift index dc8ec18..de0f8da 100644 --- a/damus/Views/Events/EventMenu.swift +++ b/damus/Views/Events/EventMenu.swift @@ -9,19 +9,18 @@ import SwiftUI struct EventMenuContext: View { let event: NostrEvent - let privkey: String? - let pubkey: String + let keypair: Keypair var body: some View { Button { - UIPasteboard.general.string = event.get_content(privkey) + UIPasteboard.general.string = event.get_content(keypair.privkey) } label: { Label(NSLocalizedString("Copy Text", comment: "Context menu option for copying the text from an note."), systemImage: "doc.on.doc") } Button { - UIPasteboard.general.string = bech32_pubkey(pubkey) ?? pubkey + UIPasteboard.general.string = keypair.pubkey_bech32 } label: { Label(NSLocalizedString("Copy User Pubkey", comment: "Context menu option for copying the ID of the user who created the note."), systemImage: "person") } @@ -37,25 +36,28 @@ struct EventMenuContext: View { } label: { Label(NSLocalizedString("Copy Note JSON", comment: "Context menu option for copying the JSON text from the note."), systemImage: "square.on.square") } - - Button(role: .destructive) { - let target: ReportTarget = .note(ReportNoteTarget(pubkey: event.pubkey, note_id: event.id)) - notify(.report, target) - } label: { - Label(NSLocalizedString("Report", comment: "Context menu option for reporting content."), systemImage: "exclamationmark.bubble") - } - - Button(role: .destructive) { - notify(.block, event.pubkey) - } label: { - Label(NSLocalizedString("Block", comment: "Context menu option for blocking users."), systemImage: "exclamationmark.octagon") - } Button { NotificationCenter.default.post(name: .broadcast_event, object: event) } label: { Label(NSLocalizedString("Broadcast", comment: "Context menu option for broadcasting the user's note to all of the user's connected relay servers."), systemImage: "globe") } + + // Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile. + if keypair.pubkey != event.pubkey && keypair.privkey != nil { + Button(role: .destructive) { + let target: ReportTarget = .note(ReportNoteTarget(pubkey: event.pubkey, note_id: event.id)) + notify(.report, target) + } label: { + Label(NSLocalizedString("Report", comment: "Context menu option for reporting content."), systemImage: "exclamationmark.bubble") + } + + Button(role: .destructive) { + notify(.block, event.pubkey) + } label: { + Label(NSLocalizedString("Block", comment: "Context menu option for blocking users."), systemImage: "exclamationmark.octagon") + } + } } } diff --git a/damus/Views/Events/SelectedEventView.swift b/damus/Views/Events/SelectedEventView.swift index f9c7186..f8f3c83 100644 --- a/damus/Views/Events/SelectedEventView.swift +++ b/damus/Views/Events/SelectedEventView.swift @@ -49,7 +49,7 @@ struct SelectedEventView: View { .padding([.top], 4) } .padding([.leading], 2) - .event_context_menu(event, pubkey: pubkey, privkey: damus.keypair.privkey) + .event_context_menu(event, keypair: damus.keypair) } } } diff --git a/damus/Views/ProfileView.swift b/damus/Views/ProfileView.swift index a48412e..4be870a 100644 --- a/damus/Views/ProfileView.swift +++ b/damus/Views/ProfileView.swift @@ -378,14 +378,17 @@ struct ProfileView: View { Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) { show_share_sheet = true } - - Button(NSLocalizedString("Report", comment: "Button to report a profile."), role: .destructive) { - let target: ReportTarget = .user(profile.pubkey) - notify(.report, target) - } - - Button(NSLocalizedString("Block", comment: "Button to block a profile."), role: .destructive) { - notify(.block, profile.pubkey) + + // Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile. + if profile.pubkey != damus_state.pubkey && damus_state.is_privkey_user { + Button(NSLocalizedString("Report", comment: "Button to report a profile."), role: .destructive) { + let target: ReportTarget = .user(profile.pubkey) + notify(.report, target) + } + + Button(NSLocalizedString("Block", comment: "Button to block a profile."), role: .destructive) { + notify(.block, profile.pubkey) + } } } .ignoresSafeArea()