From 83909c8fc96944914dedcff46f03434b97647767 Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:50:28 -0500 Subject: [PATCH 1/6] Change use of DM to be consistent and add missing localization comments --- .../Localized Contents/en-US.xliff | 32 +++++++++++------- .../damus/en-US.lproj/Localizable.strings | Bin 22684 -> 22700 bytes damus/ContentView.swift | 2 +- damus/Views/DMChatView.swift | 2 +- damus/Views/DirectMessagesView.swift | 8 ++--- damus/Views/ParicipantsView.swift | 6 ++-- 6 files changed, 28 insertions(+), 22 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 c5e8c28f..7d2167f2 100644 --- a/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff @@ -131,6 +131,11 @@ Number of profiles a user is following. Add Relay Label for section for adding a relay server. + + Add all + Add all + Button label to re-add all original participants as profiles to reply to in a note + Any Any @@ -280,20 +285,16 @@ Number of profiles a user is following. Creator(s) of Bitcoin. Absolute legend. Example description about Bitcoin creator(s), Satoshi Nakamoto. - - DM - DM - Navigation title for DM view, which is the English abbreviation for Direct Message. - DM Type DM Type - DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. + 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 DMs - No comment provided by engineer. + 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 @@ -335,16 +336,16 @@ Number of profiles a user is following. Edit Button to edit user's profile. + + Edit participants + Edit participants + Text indicating that the view is used for editing which participants are replied to in a note. + Encrypted Encrypted Heading indicating that this application keeps private messaging end-to-end encrypted. - - Encrypted DMs - Encrypted DMs - Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message. - Enter your account key to login: Enter your account key to login: @@ -569,6 +570,11 @@ Part of a larger sentence to describe how many profiles a user is following.Relays Sidebar menu label for Relay servers view + + Remove all + Remove all + Button label to remove all participants from a note reply. + Reply to self Reply to self @@ -598,7 +604,7 @@ Part of a larger sentence to describe how many profiles a user is following. Requests Requests - No comment provided by engineer. + 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 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 549459eb9271fb184ad8d0dfa8e883b9d0f0c43b..557c9a909968d83b2c294e5d90c990ebcf838633 100644 GIT binary patch delta 108 zcmbQUk#WsN#tmZflb^}oV|HQiog6KnKly?})MN*F7WrZZ1%@()Oomj3at0kByPP2d z$Swk61qO)PL{=^!TVe7>M#;$!3`8btDGE&XQ*7b~$}$u)C;{bcfmmrXyV6uM0ERys AF8}}l delta 169 zcmZ3pk#WvO#tmZflO4RYCLd5>5m#U+W5{GkWhiIRVNd{)89-h#L&oIq^7*_ diff --git a/damus/ContentView.swift b/damus/ContentView.swift index a0f896e4..b0a1857f 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -181,7 +181,7 @@ struct ContentView: View { .frame(width:30,height:30) .shadow(color: Color("DamusPurple"), radius: 2) case .dms: - Text("DM", comment: "Toolbar label for DM view, which is the English abbreviation for Direct Message.") + Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.") .bold() case .notifications: Text("Notifications", comment: "Toolbar label for Notifications view.") diff --git a/damus/Views/DMChatView.swift b/damus/Views/DMChatView.swift index 905b1801..0c2f6ba6 100644 --- a/damus/Views/DMChatView.swift +++ b/damus/Views/DMChatView.swift @@ -149,7 +149,7 @@ struct DMChatView: View { .opacity(((dms.events.count == 0) ? 1.0 : 0.0)) .foregroundColor(.gray) } - .navigationTitle(NSLocalizedString("DM", comment: "Navigation title for DM view, which is the English abbreviation for Direct Message.")) + .navigationTitle(NSLocalizedString("DMs", comment: "Navigation title for DMs view, where DM is the English abbreviation for Direct Message.")) .toolbar { Header } } } diff --git a/damus/Views/DirectMessagesView.swift b/damus/Views/DirectMessagesView.swift index 0cb8122b..ff518e27 100644 --- a/damus/Views/DirectMessagesView.swift +++ b/damus/Views/DirectMessagesView.swift @@ -63,11 +63,11 @@ struct DirectMessagesView: View { var body: some View { VStack { - Picker(NSLocalizedString("DM Type", comment: "DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet."), selection: $dm_type) { - Text("DMs") + Picker(NSLocalizedString("DM Type", comment: "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."), selection: $dm_type) { + Text("DMs", comment: "Picker option for DM selector for seeing only DMs that have been responded to. DM is the English abbreviation for Direct Message.") .tag(DMType.friend) - Text("Requests") + Text("Requests", comment: "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.") .tag(DMType.rando) } @@ -84,7 +84,7 @@ struct DirectMessagesView: View { } .padding(.horizontal) .padding(.top) - .navigationTitle(NSLocalizedString("Encrypted DMs", comment: "Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message.")) + .navigationTitle(NSLocalizedString("DMs", comment: "Navigation title for view of DMs, where DM is an English abbreviation for Direct Message.")) } } diff --git a/damus/Views/ParicipantsView.swift b/damus/Views/ParicipantsView.swift index 909ca073..720a3e84 100644 --- a/damus/Views/ParicipantsView.swift +++ b/damus/Views/ParicipantsView.swift @@ -16,21 +16,21 @@ struct ParticipantsView: View { var body: some View { VStack { - Text("Edit participants") + Text("Edit participants", comment: "Text indicating that the view is used for editing which participants are replied to in a note.") HStack { Spacer() Button { // Remove all "p" refs, keep "e" refs references = originalReferences.eRefs } label: { - Text("Remove all") + Text("Remove all", comment: "Button label to remove all participants from a note reply.") } .buttonStyle(.borderedProminent) Spacer() Button { references = originalReferences } label: { - Text("Add all") + Text("Add all", comment: "Button label to re-add all original participants as profiles to reply to in a note") } .buttonStyle(.borderedProminent) Spacer() From e2e60639d9303baacc33034aa7dcc49ea6bb68bb Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:53:30 -0500 Subject: [PATCH 2/6] Remove unused language mapping from transifex.yml --- transifex.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/transifex.yml b/transifex.yml index db42867f..fe24176c 100644 --- a/transifex.yml +++ b/transifex.yml @@ -7,7 +7,4 @@ git: translation_files_expression: damus Localizations/.xcloc/Localized Contents/.xliff settings: - pr_branch_name: transifex/ - language_mapping: - en_US: en-US - es_419: es-419 \ No newline at end of file + pr_branch_name: transifex/ \ No newline at end of file From 135814737cebcfc416aa5f4ed67824ad64270004 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 02:54:20 +0000 Subject: [PATCH 3/6] Apply translations in de_DE translated for the source file '/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff' on the 'de_DE' language. --- .../Localized Contents/de_DE.xliff | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/damus Localizations/de_DE.xcloc/Localized Contents/de_DE.xliff b/damus Localizations/de_DE.xcloc/Localized Contents/de_DE.xliff index d0d8b814..48cce406 100644 --- a/damus Localizations/de_DE.xcloc/Localized Contents/de_DE.xliff +++ b/damus Localizations/de_DE.xcloc/Localized Contents/de_DE.xliff @@ -17,8 +17,8 @@ Bundle name - "Granting Damus access to your photo library allows you to save photos. - Damus Zugriff auf deine Fotomediathek zu gewähren erlaubt dir Fotos zu sichern. + Granting Damus access to your photos allows you to save images. + Damus Zugriff auf deine Fotos zu gewähren erlaubt dir Bilder zu sichern. Privacy - Photo Library Additions Usage Description @@ -336,6 +336,18 @@ Number of profiles a user is following. Navigation title for DM view, which is the English abbreviation for Direct Message. + + DM Type + PN Art + + DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. + + + DMs + PNs + + No comment provided by engineer. + Damus Damus @@ -602,12 +614,6 @@ Part of a larger sentence to describe how many profiles a user is following.Private Key Privater Schlüssel - Label to indicate that the text below is the user's private key used by only the user themself as a secret to login to access their account. - - - PrivateKey - Privater Schlüssel - Title of the secure field that holds the user's private key. @@ -701,6 +707,12 @@ Part of a larger sentence to describe how many profiles a user is following.Text indicating that the post was reposted (i.e. re-shared). + + Requests + Anfragen + + No comment provided by engineer. + Reset Zurücksetzen @@ -904,7 +916,7 @@ Part of a larger sentence to describe how many profiles a user is following. Welcome to the social network %@ control. - Willkommen bei dem sozialen Netzwerk, das %@ kontrollierst. + Willkommen in dem sozialen Netzwerk das %@ kontrollierst. Welcoming message to the reader. The variable is 'you', the reader. From a590fb099de42d9fc72aad47846e50c326b867a7 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 02:54:31 +0000 Subject: [PATCH 4/6] Apply translations in de_AT translated for the source file '/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff' on the 'de_AT' language. --- .../Localized Contents/de_AT.xliff | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/damus Localizations/de_AT.xcloc/Localized Contents/de_AT.xliff b/damus Localizations/de_AT.xcloc/Localized Contents/de_AT.xliff index 31f9bb4b..2d7f86a9 100644 --- a/damus Localizations/de_AT.xcloc/Localized Contents/de_AT.xliff +++ b/damus Localizations/de_AT.xcloc/Localized Contents/de_AT.xliff @@ -17,8 +17,8 @@ Bundle name - "Granting Damus access to your photo library allows you to save photos. - “Damus Zugriff auf deine Fotomediathek zu gewähren, erlaubt dir Fotos zu sichern. + Granting Damus access to your photos allows you to save images. + Damus Zugriff auf deine Fotos zu gewähren erlaubt dir Bilder zu sichern. Privacy - Photo Library Additions Usage Description @@ -50,7 +50,7 @@ Sentence composed of 2 variables to describe how many profiles a user is followi %@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction. - %@. Ein Konto zu erstellen benötigt keine Telefonnummer, Emailadresse oder Name. Fang jetzt sofort ganz reibungslos an. + %@. Ein Konto zu erstellen benötigt keine Telefonnummer, Emailadresse oder Namen. Fang jetzt gleich ganz reibungslos an. 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. @@ -336,6 +336,18 @@ Number of profiles a user is following. Navigation title for DM view, which is the English abbreviation for Direct Message. + + DM Type + PN Typ + + DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. + + + DMs + PNs + + No comment provided by engineer. + Damus Damus @@ -602,12 +614,6 @@ Part of a larger sentence to describe how many profiles a user is following.Private Key Privater Schlüssel - Label to indicate that the text below is the user's private key used by only the user themself as a secret to login to access their account. - - - PrivateKey - Privater Schlüssel - Title of the secure field that holds the user's private key. @@ -690,17 +696,23 @@ Part of a larger sentence to describe how many profiles a user is following. Repost - Teilen + Selbst teilen Button to confirm reposting a post. Title of alert for confirming to repost a post. Reposted - Geteilt + Selbst geteilt Text indicating that the post was reposted (i.e. re-shared). + + Requests + Anfragen + + No comment provided by engineer. + Reset Zurücksetzen @@ -904,7 +916,7 @@ Part of a larger sentence to describe how many profiles a user is following. Welcome to the social network %@ control. - Willkommen bei dem soziaen Netzwerk, das %@ kontrollierst. + Willkommen in dem sozialen Netzwerk das %@ kontrollierst. Welcoming message to the reader. The variable is 'you', the reader. @@ -1042,7 +1054,7 @@ Part of a larger sentence to describe how many profiles a user is following. wss://some.relay.com - wss://irgendein.relay.at + wss://ein.relay.at Placeholder example for relay server address. @@ -1183,13 +1195,13 @@ Part of a larger sentence to describe how many profiles a user is following. Repost - Mal geteilt + geteilter Beitrag Part of a larger sentence to describe how many reposts there are. Reposts - Mal geteilt + geteilte Beiträge Part of a larger sentence to describe how many reposts there are. From 4526ed01fe8c940a5a679503bf3cbae2dc0dccc1 Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:56:35 -0500 Subject: [PATCH 5/6] Import localization for de-DE --- damus/de-DE.lproj/InfoPlist.strings | 2 +- damus/de-DE.lproj/Localizable.strings | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/damus/de-DE.lproj/InfoPlist.strings b/damus/de-DE.lproj/InfoPlist.strings index f5a0da0b..358f5341 100644 --- a/damus/de-DE.lproj/InfoPlist.strings +++ b/damus/de-DE.lproj/InfoPlist.strings @@ -5,5 +5,5 @@ "CFBundleName" = "damus"; /* Privacy - Photo Library Additions Usage Description */ -"NSPhotoLibraryAddUsageDescription" = "Damus Zugriff auf deine Fotomediathek zu gewähren erlaubt dir Fotos zu sichern."; +"NSPhotoLibraryAddUsageDescription" = "Damus Zugriff auf deine Fotos zu gewähren erlaubt dir Bilder zu sichern."; diff --git a/damus/de-DE.lproj/Localizable.strings b/damus/de-DE.lproj/Localizable.strings index ae2fd1af..0b8748ab 100644 --- a/damus/de-DE.lproj/Localizable.strings +++ b/damus/de-DE.lproj/Localizable.strings @@ -171,6 +171,12 @@ Number of profiles a user is following. */ /* Navigation title for DM view, which is the English abbreviation for Direct Message. */ "DM" = "PN"; +/* DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. */ +"DM Type" = "PN Art"; + +/* No comment provided by engineer. */ +"DMs" = "PNs"; + /* Button to dismiss wallet selection view for paying Lightning invoice. */ "Done" = "Fertig"; @@ -310,11 +316,8 @@ Part of a larger sentence to describe how many profiles a user is following. */ /* 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" = "Privatsphäre"; -/* Label to indicate that the text below is the user's private key used by only the user themself as a secret to login to access their account. */ -"Private Key" = "Privater Schlüssel"; - /* Title of the secure field that holds the user's private key. */ -"PrivateKey" = "Privater Schlüssel"; +"Private Key" = "Privater Schlüssel"; /* Sidebar menu label for Profile view. */ "Profile" = "Profil"; @@ -362,6 +365,9 @@ Part of a larger sentence to describe how many profiles a user is following. */ /* Text indicating that the post was reposted (i.e. re-shared). */ "Reposted" = "Geteilt"; +/* No comment provided by engineer. */ +"Requests" = "Anfragen"; + /* Section title for resetting the user */ "Reset" = "Zurücksetzen"; @@ -471,7 +477,7 @@ Part of a larger sentence to describe how many profiles a user is following. */ "Website" = "Website"; /* Welcoming message to the reader. The variable is 'you', the reader. */ -"Welcome to the social network %@ control." = "Willkommen bei dem sozialen Netzwerk, das %@ kontrollierst."; +"Welcome to the social network %@ control." = "Willkommen in dem sozialen Netzwerk das %@ kontrollierst."; /* Text to welcome user. */ "Welcome, %@!" = "Willkommen, %@!"; From d5f2a172498f494d66b139940f5a93c8a938a6da Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:57:47 -0500 Subject: [PATCH 6/6] Import localization for de-AT --- damus/de-AT.lproj/InfoPlist.strings | 2 +- damus/de-AT.lproj/Localizable.strings | 24 ++++++++++++++--------- damus/de-AT.lproj/Localizable.stringsdict | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/damus/de-AT.lproj/InfoPlist.strings b/damus/de-AT.lproj/InfoPlist.strings index d5398cd6..358f5341 100644 --- a/damus/de-AT.lproj/InfoPlist.strings +++ b/damus/de-AT.lproj/InfoPlist.strings @@ -5,5 +5,5 @@ "CFBundleName" = "damus"; /* Privacy - Photo Library Additions Usage Description */ -"NSPhotoLibraryAddUsageDescription" = "“Damus Zugriff auf deine Fotomediathek zu gewähren, erlaubt dir Fotos zu sichern."; +"NSPhotoLibraryAddUsageDescription" = "Damus Zugriff auf deine Fotos zu gewähren erlaubt dir Bilder zu sichern."; diff --git a/damus/de-AT.lproj/Localizable.strings b/damus/de-AT.lproj/Localizable.strings index 1995f82e..24edc99b 100644 --- a/damus/de-AT.lproj/Localizable.strings +++ b/damus/de-AT.lproj/Localizable.strings @@ -25,7 +25,7 @@ Sentence composed of 2 variables to describe how many profiles a user is followi "%@ %@" = "%@ %@"; /* 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." = "%@. Ein Konto zu erstellen benötigt keine Telefonnummer, Emailadresse oder Name. Fang jetzt sofort ganz reibungslos an."; +"%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." = "%@. Ein Konto zu erstellen benötigt keine Telefonnummer, Emailadresse oder Namen. Fang jetzt gleich ganz reibungslos an."; /* 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" = "%@. End-zu-End verschlüsselter privater Nachrichtenaustausch. Halte Tech-Riesen aus deinen PNs heraus"; @@ -171,6 +171,12 @@ Number of profiles a user is following. */ /* Navigation title for DM view, which is the English abbreviation for Direct Message. */ "DM" = "PN"; +/* DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. */ +"DM Type" = "PN Typ"; + +/* No comment provided by engineer. */ +"DMs" = "PNs"; + /* Button to dismiss wallet selection view for paying Lightning invoice. */ "Done" = "Fertig"; @@ -310,11 +316,8 @@ Part of a larger sentence to describe how many profiles a user is following. */ /* 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" = "Privat"; -/* Label to indicate that the text below is the user's private key used by only the user themself as a secret to login to access their account. */ -"Private Key" = "Privater Schlüssel"; - /* Title of the secure field that holds the user's private key. */ -"PrivateKey" = "Privater Schlüssel"; +"Private Key" = "Privater Schlüssel"; /* Sidebar menu label for Profile view. */ "Profile" = "Profil"; @@ -357,10 +360,13 @@ Part of a larger sentence to describe how many profiles a user is following. */ /* Button to confirm reposting a post. Title of alert for confirming to repost a post. */ -"Repost" = "Teilen"; +"Repost" = "Selbst teilen"; /* Text indicating that the post was reposted (i.e. re-shared). */ -"Reposted" = "Geteilt"; +"Reposted" = "Selbst geteilt"; + +/* No comment provided by engineer. */ +"Requests" = "Anfragen"; /* Section title for resetting the user */ "Reset" = "Zurücksetzen"; @@ -471,13 +477,13 @@ Part of a larger sentence to describe how many profiles a user is following. */ "Website" = "Website"; /* Welcoming message to the reader. The variable is 'you', the reader. */ -"Welcome to the social network %@ control." = "Willkommen bei dem soziaen Netzwerk, das %@ kontrollierst."; +"Welcome to the social network %@ control." = "Willkommen in dem sozialen Netzwerk das %@ kontrollierst."; /* Text to welcome user. */ "Welcome, %@!" = "Willkommen, %@!"; /* Placeholder example for relay server address. */ -"wss://some.relay.com" = "wss://irgendein.relay.at"; +"wss://some.relay.com" = "wss://ein.relay.at"; /* 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" = "Du"; diff --git a/damus/de-AT.lproj/Localizable.stringsdict b/damus/de-AT.lproj/Localizable.stringsdict index eb7bccb1..396dfbca 100644 --- a/damus/de-AT.lproj/Localizable.stringsdict +++ b/damus/de-AT.lproj/Localizable.stringsdict @@ -113,9 +113,9 @@ NSStringFormatValueTypeKey d one - Mal geteilt + geteilter Beitrag other - Mal geteilt + geteilte Beiträge sats_count