Merge remote-tracking branch 'github/translations'

damus/Views/ConfigView.swift

@@ -45,7 +45,7 @@ struct ConfigView: View {
                     }
                     
                     NavigationLink(destination: NotificationSettingsView(settings: settings)) {
-                        IconLabel(NSLocalizedString("Local Notifications", comment: "Section header for damus local notifications user configuration"), img_name: "bell.fill", color: .blue)
+                        IconLabel(NSLocalizedString("Notifications", comment: "Section header for Damus notifications"), img_name: "bell.fill", color: .blue)
                     }
                     
                     NavigationLink(destination: ZapSettingsView(pubkey: state.pubkey, settings: settings)) {

damus/Views/PostView.swift

@@ -262,7 +262,7 @@ struct PostView: View {
                 } onVideoPicked: { url in
                     self.mediaToUpload = .video(url)
                 }
-                .alert("Are you sure you want to upload this image?", isPresented: $image_upload_confirm) {
+                .alert(NSLocalizedString("Are you sure you want to upload this image?", comment: "Alert message asking if the user wants to upload an image."), isPresented: $image_upload_confirm) {
                     Button(NSLocalizedString("Upload", comment: "Button to proceed with uploading."), role: .none) {
                         if let mediaToUpload {
                             self.handle_upload(media: mediaToUpload)

damus/Views/Settings/AppearanceSettingsView.swift

@@ -50,7 +50,7 @@ struct AppearanceSettingsView: View {
                 
 
         }
-        .navigationTitle("Appearance")
+        .navigationTitle(NSLocalizedString("Appearance", comment: "Navigation title for text and appearance settings."))
         .onReceive(handle_notify(.switched_timeline)) { _ in
             dismiss()
         }

damus/Views/Settings/KeySettingsView.swift

@@ -100,7 +100,7 @@ struct KeySettingsView: View {
             }
             
         }
-        .navigationTitle("Keys")
+        .navigationTitle(NSLocalizedString("Keys", comment: "Navigation title for managing keys."))
         .onReceive(handle_notify(.switched_timeline)) { _ in
             dismiss()
         }

damus/Views/Settings/TranslationSettingsView.swift

@@ -76,7 +76,7 @@ struct TranslationSettingsView: View {
                 }
             }
         }
-        .navigationTitle("Translation")
+        .navigationTitle(NSLocalizedString("Translation", comment: "Navigation title for translation settings."))
         .onReceive(handle_notify(.switched_timeline)) { _ in
             dismiss()
         }

damus/Views/Settings/ZapSettingsView.swift

@@ -24,7 +24,7 @@ struct ZapSettingsView: View {
     
     var body: some View {
         Form {
-            Section("Wallet") {
+            Section(NSLocalizedString("Wallet", comment: "Title for section in zap settings that controls the Lightning wallet selection.")) {
                 
                 Toggle(NSLocalizedString("Show wallet selector", comment: "Toggle to show or hide selection of wallet."), isOn: $settings.show_wallet_selector).toggleStyle(.switch)
                 Picker(NSLocalizedString("Select default wallet", comment: "Prompt selection of user's default wallet"),
@@ -36,12 +36,12 @@ struct ZapSettingsView: View {
                 }
             }
             
-            Section("Zaps") {
+            Section(NSLocalizedString("Zaps", comment: "Title for section in zap settings that controls general zap preferences.")) {
                 Toggle(NSLocalizedString("Zap Vibration", comment: "Setting to enable vibration on zap"), isOn: $settings.zap_vibration)
                     .toggleStyle(.switch)
             }
             
-            Section("Default Zap Amount in sats") {
+            Section(NSLocalizedString("Default Zap Amount in sats", comment: "Title for section in zap settings that controls the default zap amount in sats.")) {
                 TextField(String("1000"), text: $default_zap_amount)
                     .keyboardType(.numberPad)
                     .onReceive(Just(default_zap_amount)) { newValue in
@@ -52,7 +52,7 @@ struct ZapSettingsView: View {
                     }
             }
         }
-        .navigationTitle("Zaps")
+        .navigationTitle(NSLocalizedString("Zaps", comment: "Navigation title for zap settings."))
         .onReceive(handle_notify(.switched_timeline)) { _ in
             dismiss()
         }

damus/el-GR.lproj/Localizable.stringsdict

@@ -47,7 +47,7 @@
 			<key>one</key>
 			<string>Ακόλουθος</string>
 			<key>other</key>
-			<string>Ακολουθείτε</string>
+			<string>Ακολουθεί</string>
 		</dict>
 	</dict>
 	<key>reacted_tagged_in_3</key>
@@ -127,7 +127,7 @@
 			<key>one</key>
 			<string>Διακομιστής Relay</string>
 			<key>other</key>
-			<string>Διακομιστές Relays</string>
+			<string>Relays</string>
 		</dict>
 	</dict>
 	<key>replying_to_two_and_others</key>

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

@@ -45,7 +45,7 @@
       <trans-unit id="%@" xml:space="preserve">
         <source>%@</source>
         <target>%@</target>
-        <note>No comment provided by engineer.</note>
+        <note>DM by heading in local notification</note>
       </trans-unit>
       <trans-unit id="%@ %@" xml:space="preserve">
         <source>%@ %@</source>
@@ -188,7 +188,8 @@ Sentence composed of 2 variables to describe how many people are following a use
       <trans-unit id="Appearance" xml:space="preserve">
         <source>Appearance</source>
         <target>Appearance</target>
-        <note>Section header for text and appearance settings</note>
+        <note>Navigation title for text and appearance settings.
+   Section header for text and appearance settings</note>
       </trans-unit>
       <trans-unit id="Are you lost?" xml:space="preserve">
         <source>Are you lost?</source>
@@ -200,6 +201,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Are you sure you want to repost this?</target>
         <note>Alert message to ask if user wants to repost a post.</note>
       </trans-unit>
+      <trans-unit id="Are you sure you want to upload this image?" xml:space="preserve">
+        <source>Are you sure you want to upload this image?</source>
+        <target>Are you sure you want to upload this image?</target>
+        <note>Alert message asking if the user wants to upload an image.</note>
+      </trans-unit>
       <trans-unit id="Automatically translate notes" xml:space="preserve">
         <source>Automatically translate notes</source>
         <target>Automatically translate notes</target>
@@ -251,6 +257,7 @@ Sentence composed of 2 variables to describe how many people are following a use
    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.
+   Button to cancel the upload.
    Cancel deleting the user.
    Cancel out of logging out the user.</note>
       </trans-unit>
@@ -404,11 +411,6 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Custom Zap Amount</target>
         <note>Header text to indicate that the text field below it is to enter a custom zap amount.</note>
       </trans-unit>
-      <trans-unit id="DM by %@" xml:space="preserve">
-        <source>DM by %@</source>
-        <target>DM by %@</target>
-        <note>DM by heading in local notification</note>
-      </trans-unit>
       <trans-unit id="DMs" xml:space="preserve">
         <source>DMs</source>
         <target>DMs</target>
@@ -435,7 +437,7 @@ Sentence composed of 2 variables to describe how many people are following a use
       <trans-unit id="Default Zap Amount in sats" xml:space="preserve">
         <source>Default Zap Amount in sats</source>
         <target>Default Zap Amount in sats</target>
-        <note>No comment provided by engineer.</note>
+        <note>Title for section in zap settings that controls the default zap amount in sats.</note>
       </trans-unit>
       <trans-unit id="Delete" xml:space="preserve">
         <source>Delete</source>
@@ -627,7 +629,8 @@ Sentence composed of 2 variables to describe how many people are following a use
       <trans-unit id="Keys" xml:space="preserve">
         <source>Keys</source>
         <target>Keys</target>
-        <note>Settings section for managing keys</note>
+        <note>Navigation title for managing keys.
+   Settings section for managing keys</note>
       </trans-unit>
       <trans-unit id="Left Handed" xml:space="preserve">
         <source>Left Handed</source>
@@ -759,6 +762,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>NIP-05 Verification</target>
         <note>Label for NIP-05 Verification section of user profile form.</note>
       </trans-unit>
+      <trans-unit id="New encrypted direct message" xml:space="preserve">
+        <source>New encrypted direct message</source>
+        <target>New encrypted direct message</target>
+        <note>Notification that the user has received a new direct message</note>
+      </trans-unit>
       <trans-unit id="No" xml:space="preserve">
         <source>No</source>
         <target>No</target>
@@ -802,7 +810,8 @@ Sentence composed of 2 variables to describe how many people are following a use
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Notifications</target>
-        <note>Toolbar label for Notifications view.</note>
+        <note>Section header for Damus notifications
+   Toolbar label for Notifications view.</note>
       </trans-unit>
       <trans-unit id="Nudity or explicit content" xml:space="preserve">
         <source>Nudity or explicit content</source>
@@ -1273,7 +1282,8 @@ Picker option to indicate that a zap should be sent privately and not identify t
       <trans-unit id="Translation" xml:space="preserve">
         <source>Translation</source>
         <target>Translation</target>
-        <note>Section header for text and appearance settings</note>
+        <note>Navigation title for translation settings.
+   Section header for text and appearance settings</note>
       </trans-unit>
       <trans-unit id="Translations" xml:space="preserve">
         <source>Translations</source>
@@ -1325,6 +1335,11 @@ Picker option to indicate that a zap should be sent privately and not identify t
         <target>Unmute conversation</target>
         <note>Context menu option for unmuting a conversation.</note>
       </trans-unit>
+      <trans-unit id="Upload" xml:space="preserve">
+        <source>Upload</source>
+        <target>Upload</target>
+        <note>Button to proceed with uploading.</note>
+      </trans-unit>
       <trans-unit id="User has been muted" xml:space="preserve">
         <source>User has been muted</source>
         <target>User has been muted</target>
@@ -1372,7 +1387,8 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
       <trans-unit id="Wallet" xml:space="preserve">
         <source>Wallet</source>
         <target>Wallet</target>
-        <note>Sidebar menu label for Wallet view.</note>
+        <note>Sidebar menu label for Wallet view.
+   Title for section in zap settings that controls the Lightning wallet selection.</note>
       </trans-unit>
       <trans-unit id="Website" xml:space="preserve">
         <source>Website</source>
@@ -1460,8 +1476,10 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <source>Zaps</source>
         <target>Zaps</target>
         <note>Navigation bar title for the Zaps view.
+   Navigation title for zap settings.
    Section header for zap settings
-   Setting to enable Zap Local Notification</note>
+   Setting to enable Zap Local Notification
+   Title for section in zap settings that controls general zap preferences.</note>
       </trans-unit>
       <trans-unit id="https://example.com/pic.jpg" xml:space="preserve">
         <source>https://example.com/pic.jpg</source>