From 31172a19850b0d64c9fcbb25f854b1b5f7cf5718 Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Thu, 19 Oct 2017 11:47:49 +0200
Subject: [PATCH 1/3] Correct commit message used after editing a password

---
 passKit/Models/PasswordStore.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 37e2718..945cb32 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -669,7 +669,7 @@ public class PasswordStore {
             let saveURL = storeURL.appendingPathComponent(passwordEntity.getURL()!.path)
             try self.encrypt(password: password).write(to: saveURL)
             try gitAdd(path: passwordEntity.getURL()!.path)
-            let _ = try gitCommit(message: "Edit password for \(passwordEntity.getURL()!.deletingPathExtension().path.removingPercentEncoding!) to store using Pass for iOS.")
+            let _ = try gitCommit(message: "Edit password for \(passwordEntity.getURL()!.deletingPathExtension().path.removingPercentEncoding!) using Pass for iOS.")
             newPasswordEntity = passwordEntity
             newPasswordEntity?.synced = false
         }

From 2a0822f727d9758c218edb7b453058f35e0d2eec Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Thu, 19 Oct 2017 11:28:51 +0200
Subject: [PATCH 2/3] Change "Show Folder" -> "Show Folders"

---
 pass/Controllers/GeneralSettingsTableViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift
index 209c5ed..f74375e 100644
--- a/pass/Controllers/GeneralSettingsTableViewController.swift
+++ b/pass/Controllers/GeneralSettingsTableViewController.swift
@@ -71,7 +71,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
                 [.title: "Remember Git Credential Passphrase", .action: "none",],
             ],
             [
-                [.title: "Show Folder", .action: "none",],
+                [.title: "Show Folders", .action: "none",],
                 [.title: "Hide Unknown Fields", .action: "none",],
                 [.title: "Hide OTP Fields", .action: "none",],
             ],

From 14544a6d5aab18be1ba631b5652f488d1421ba6b Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Thu, 19 Oct 2017 11:35:57 +0200
Subject: [PATCH 3/3] Fix typo in explanation of ASCII-armored keys and use
 only "-a" instead of "--armor"

---
 pass/Base.lproj/Main.storyboard | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 1d079c4..cdbb4b6 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -1272,7 +1272,7 @@ Phone Support PIN #: 84719</string>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <attributedString key="attributedText">
                                                         <fragment>
-                                                            <string key="content">GnuPG supports a command-line option --armor that that causes output to be generated in an ASCII-armored format similar to unencoded documents rather than the binary format.
+                                                            <string key="content">GnuPG supports the command-line option "-a" that causes output to be generated in an ASCII-armored format similar to unencoded documents rather than the binary format.
 
 </string>
                                                             <attributes>