commit f3730630b5228dcf8be494a863351515e939a9fa
parent 3e4914462b4dfa28b738bee5da6acb90fa001363
Author: William Casarin <jb55@jb55.com>
Date: Sun, 22 Jan 2023 19:34:09 -0800
Merge tyiu/string-fixes, transifex/de_AT, transifex/de_DE
More translation stuff from Terry
Diffstat:
14 files changed, 108 insertions(+), 69 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
@@ -17,8 +17,8 @@
<note>Bundle name</note>
</trans-unit>
<trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
- <source>"Granting Damus access to your photo library allows you to save photos.</source>
- <target>“Damus Zugriff auf deine Fotomediathek zu gewähren, erlaubt dir Fotos zu sichern.</target>
+ <source>Granting Damus access to your photos allows you to save images.</source>
+ <target>Damus Zugriff auf deine Fotos zu gewähren erlaubt dir Bilder zu sichern.</target>
<note>Privacy - Photo Library Additions Usage Description</note>
</trans-unit>
@@ -50,7 +50,7 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
</trans-unit>
<trans-unit id="%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." xml:space="preserve">
<source>%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.</source>
- <target>%@. Ein Konto zu erstellen benötigt keine Telefonnummer, Emailadresse oder Name. Fang jetzt sofort ganz reibungslos an.</target>
+ <target>%@. Ein Konto zu erstellen benötigt keine Telefonnummer, Emailadresse oder Namen. Fang jetzt gleich ganz reibungslos an.</target>
<note>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.</note>
</trans-unit>
@@ -336,6 +336,18 @@ Number of profiles a user is following.</note>
<note>Navigation title for DM view, which is the English abbreviation for Direct Message.</note>
</trans-unit>
+ <trans-unit id="DM Type" xml:space="preserve">
+ <source>DM Type</source>
+ <target>PN Typ</target>
+
+ <note>DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet.</note>
+ </trans-unit>
+ <trans-unit id="DMs" xml:space="preserve">
+ <source>DMs</source>
+ <target>PNs</target>
+
+ <note>No comment provided by engineer.</note>
+ </trans-unit>
<trans-unit id="Damus" xml:space="preserve">
<source>Damus</source>
<target>Damus</target>
@@ -602,12 +614,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
<source>Private Key</source>
<target>Privater Schlüssel</target>
- <note>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.</note>
- </trans-unit>
- <trans-unit id="PrivateKey" xml:space="preserve">
- <source>PrivateKey</source>
- <target>Privater Schlüssel</target>
-
<note>Title of the secure field that holds the user's private key.</note>
</trans-unit>
<trans-unit id="Profile" xml:space="preserve">
@@ -690,17 +696,23 @@ Part of a larger sentence to describe how many profiles a user is following.</no
</trans-unit>
<trans-unit id="Repost" xml:space="preserve">
<source>Repost</source>
- <target>Teilen</target>
+ <target>Selbst teilen</target>
<note>Button to confirm reposting a post.
Title of alert for confirming to repost a post.</note>
</trans-unit>
<trans-unit id="Reposted" xml:space="preserve">
<source>Reposted</source>
- <target>Geteilt</target>
+ <target>Selbst geteilt</target>
<note>Text indicating that the post was reposted (i.e. re-shared).</note>
</trans-unit>
+ <trans-unit id="Requests" xml:space="preserve">
+ <source>Requests</source>
+ <target>Anfragen</target>
+
+ <note>No comment provided by engineer.</note>
+ </trans-unit>
<trans-unit id="Reset" xml:space="preserve">
<source>Reset</source>
<target>Zurücksetzen</target>
@@ -904,7 +916,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
</trans-unit>
<trans-unit id="Welcome to the social network %@ control." xml:space="preserve">
<source>Welcome to the social network %@ control.</source>
- <target>Willkommen bei dem soziaen Netzwerk, das %@ kontrollierst.</target>
+ <target>Willkommen in dem sozialen Netzwerk das %@ kontrollierst.</target>
<note>Welcoming message to the reader. The variable is 'you', the reader.</note>
</trans-unit>
@@ -1042,7 +1054,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
</trans-unit>
<trans-unit id="wss://some.relay.com" xml:space="preserve">
<source>wss://some.relay.com</source>
- <target>wss://irgendein.relay.at</target>
+ <target>wss://ein.relay.at</target>
<note>Placeholder example for relay server address.</note>
</trans-unit>
@@ -1183,13 +1195,13 @@ Part of a larger sentence to describe how many profiles a user is following.</no
</trans-unit>
<trans-unit id="/reposts_count:dict/REPOSTS:dict/one:dict/:string" xml:space="preserve">
<source>Repost</source>
- <target>Mal geteilt</target>
+ <target>geteilter Beitrag</target>
<note>Part of a larger sentence to describe how many reposts there are.</note>
</trans-unit>
<trans-unit id="/reposts_count:dict/REPOSTS:dict/other:dict/:string" xml:space="preserve">
<source>Reposts</source>
- <target>Mal geteilt</target>
+ <target>geteilte Beiträge</target>
<note>Part of a larger sentence to describe how many reposts there are.</note>
</trans-unit>
diff --git 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 @@
<note>Bundle name</note>
</trans-unit>
<trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
- <source>"Granting Damus access to your photo library allows you to save photos.</source>
- <target>Damus Zugriff auf deine Fotomediathek zu gewähren erlaubt dir Fotos zu sichern.</target>
+ <source>Granting Damus access to your photos allows you to save images.</source>
+ <target>Damus Zugriff auf deine Fotos zu gewähren erlaubt dir Bilder zu sichern.</target>
<note>Privacy - Photo Library Additions Usage Description</note>
</trans-unit>
@@ -336,6 +336,18 @@ Number of profiles a user is following.</note>
<note>Navigation title for DM view, which is the English abbreviation for Direct Message.</note>
</trans-unit>
+ <trans-unit id="DM Type" xml:space="preserve">
+ <source>DM Type</source>
+ <target>PN Art</target>
+
+ <note>DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet.</note>
+ </trans-unit>
+ <trans-unit id="DMs" xml:space="preserve">
+ <source>DMs</source>
+ <target>PNs</target>
+
+ <note>No comment provided by engineer.</note>
+ </trans-unit>
<trans-unit id="Damus" xml:space="preserve">
<source>Damus</source>
<target>Damus</target>
@@ -602,12 +614,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
<source>Private Key</source>
<target>Privater Schlüssel</target>
- <note>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.</note>
- </trans-unit>
- <trans-unit id="PrivateKey" xml:space="preserve">
- <source>PrivateKey</source>
- <target>Privater Schlüssel</target>
-
<note>Title of the secure field that holds the user's private key.</note>
</trans-unit>
<trans-unit id="Profile" xml:space="preserve">
@@ -701,6 +707,12 @@ Part of a larger sentence to describe how many profiles a user is following.</no
<note>Text indicating that the post was reposted (i.e. re-shared).</note>
</trans-unit>
+ <trans-unit id="Requests" xml:space="preserve">
+ <source>Requests</source>
+ <target>Anfragen</target>
+
+ <note>No comment provided by engineer.</note>
+ </trans-unit>
<trans-unit id="Reset" xml:space="preserve">
<source>Reset</source>
<target>Zurücksetzen</target>
@@ -904,7 +916,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
</trans-unit>
<trans-unit id="Welcome to the social network %@ control." xml:space="preserve">
<source>Welcome to the social network %@ control.</source>
- <target>Willkommen bei dem sozialen Netzwerk, das %@ kontrollierst.</target>
+ <target>Willkommen in dem sozialen Netzwerk das %@ kontrollierst.</target>
<note>Welcoming message to the reader. The variable is 'you', the reader.</note>
</trans-unit>
diff --git 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.</note>
<target>Add Relay</target>
<note>Label for section for adding a relay server.</note>
</trans-unit>
+ <trans-unit id="Add all" xml:space="preserve">
+ <source>Add all</source>
+ <target>Add all</target>
+ <note>Button label to re-add all original participants as profiles to reply to in a note</note>
+ </trans-unit>
<trans-unit id="Any" xml:space="preserve">
<source>Any</source>
<target>Any</target>
@@ -280,20 +285,16 @@ Number of profiles a user is following.</note>
<target>Creator(s) of Bitcoin. Absolute legend.</target>
<note>Example description about Bitcoin creator(s), Satoshi Nakamoto.</note>
</trans-unit>
- <trans-unit id="DM" xml:space="preserve">
- <source>DM</source>
- <target>DM</target>
- <note>Navigation title for DM view, which is the English abbreviation for Direct Message.</note>
- </trans-unit>
<trans-unit id="DM Type" xml:space="preserve">
<source>DM Type</source>
<target>DM Type</target>
- <note>DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet.</note>
+ <note>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.</note>
</trans-unit>
<trans-unit id="DMs" xml:space="preserve">
<source>DMs</source>
<target>DMs</target>
- <note>No comment provided by engineer.</note>
+ <note>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.</note>
</trans-unit>
<trans-unit id="Damus" xml:space="preserve">
<source>Damus</source>
@@ -335,16 +336,16 @@ Number of profiles a user is following.</note>
<target>Edit</target>
<note>Button to edit user's profile.</note>
</trans-unit>
+ <trans-unit id="Edit participants" xml:space="preserve">
+ <source>Edit participants</source>
+ <target>Edit participants</target>
+ <note>Text indicating that the view is used for editing which participants are replied to in a note.</note>
+ </trans-unit>
<trans-unit id="Encrypted" xml:space="preserve">
<source>Encrypted</source>
<target>Encrypted</target>
<note>Heading indicating that this application keeps private messaging end-to-end encrypted.</note>
</trans-unit>
- <trans-unit id="Encrypted DMs" xml:space="preserve">
- <source>Encrypted DMs</source>
- <target>Encrypted DMs</target>
- <note>Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message.</note>
- </trans-unit>
<trans-unit id="Enter your account key to login:" xml:space="preserve">
<source>Enter your account key to login:</source>
<target>Enter your account key to login:</target>
@@ -569,6 +570,11 @@ Part of a larger sentence to describe how many profiles a user is following.</no
<target>Relays</target>
<note>Sidebar menu label for Relay servers view</note>
</trans-unit>
+ <trans-unit id="Remove all" xml:space="preserve">
+ <source>Remove all</source>
+ <target>Remove all</target>
+ <note>Button label to remove all participants from a note reply.</note>
+ </trans-unit>
<trans-unit id="Reply to self" xml:space="preserve">
<source>Reply to self</source>
<target>Reply to self</target>
@@ -598,7 +604,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
<trans-unit id="Requests" xml:space="preserve">
<source>Requests</source>
<target>Requests</target>
- <note>No comment provided by engineer.</note>
+ <note>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.</note>
</trans-unit>
<trans-unit id="Reset" xml:space="preserve">
<source>Reset</source>
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
Binary files differ.
diff --git 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
@@ -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
@@ -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
@@ -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()
diff --git 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
@@ -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
@@ -113,9 +113,9 @@
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
- <string>Mal geteilt</string>
+ <string>geteilter Beitrag</string>
<key>other</key>
- <string>Mal geteilt</string>
+ <string>geteilte Beiträge</string>
</dict>
</dict>
<key>sats_count</key>
diff --git 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
@@ -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, %@!";
diff --git a/transifex.yml b/transifex.yml
@@ -7,7 +7,4 @@ git:
translation_files_expression: damus Localizations/<lang>.xcloc/Localized Contents/<lang>.xliff
settings:
- pr_branch_name: transifex/<br_unique_id>
- language_mapping:
- en_US: en-US
- es_419: es-419-
\ No newline at end of file
+ pr_branch_name: transifex/<br_unique_id>+
\ No newline at end of file
