diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index 28034bb1..5c0d6487 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -185,7 +185,7 @@ NSString *const MPHelpURLKey = @"MPHelpURL";
   if(menu == self.saveMenuItem.menu) {
     MPDocument *document = [NSDocumentController sharedDocumentController].currentDocument;
     BOOL displayDots = (document.fileURL == nil || !document.compositeKey.hasPasswordOrKeyFile);
-    NSString *saveTitle =  displayDots ? NSLocalizedString(@"SAVE_WITH_DOTS", "") : NSLocalizedString(@"SAVE", "");
+    NSString *saveTitle =  displayDots ? NSLocalizedString(@"SAVE_WITH_DOTS", "Save file menu item title when save will prompt for a location to save or ask for a password/key") : NSLocalizedString(@"SAVE", "Save file menu item title when save will just save the file");
     self.saveMenuItem.title = saveTitle;
   }
   if(menu == self.fixAutotypeMenuItem.menu) {
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 06776e3e..96bb3b7d 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -369,7 +369,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
     //self.compositeKey = key;
     NSUserNotification *notification = [[NSUserNotification alloc] init];
     notification.title = NSApp.applicationName;
-    notification.informativeText = NSLocalizedString(@"AUTO_MERGE_NOTIFICATION_TEXT", @"");
+    notification.informativeText = NSLocalizedString(@"AUTO_MERGE_NOTIFICATION_TEXT", @"Sucessfully merged external changes");
     notification.deliveryDate = NSDate.date;
     [NSUserNotificationCenter.defaultUserNotificationCenter scheduleNotification:notification];
   }
@@ -707,7 +707,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
 - (void)emptyTrash:(id)sender {
   NSAlert *alert = [[NSAlert alloc] init];
   alert.alertStyle = NSWarningAlertStyle;
-  alert.messageText = NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_TITLE", "");
+  alert.messageText = NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_TITLE", "Message text for the alert displayed when clearing the Trash");
   alert.informativeText = NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_DESCRIPTION", "Informative Text displayed when clearing the Trash");
   
   [alert addButtonWithTitle:NSLocalizedString(@"EMPTY_TRASH", "Empty Trash")];
@@ -726,7 +726,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
   
   NSAlert *alert = [[NSAlert alloc] init];
   alert.alertStyle = NSWarningAlertStyle;
-  alert.messageText = NSLocalizedString(@"WARNING_ON_DELETE_TRASHED_NODE_TITLE", "");
+  alert.messageText = NSLocalizedString(@"WARNING_ON_DELETE_TRASHED_NODE_TITLE", "Message text for the alert displayed when deleting a node");
   alert.informativeText = NSLocalizedString(@"WARNING_ON_DELETE_TRASHED_NODE_DESCRIPTION", "Informative Text displayed when clearing the Trash");
   
   NSString *okButtonText = entry ? NSLocalizedString(@"DELETE_TRASHED_ENTRY", "Empty Trash") : NSLocalizedString(@"DELETE_TRASHED_GROUP", "Empty Trash");
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 34f83c3e..f2bf9a58 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -519,10 +519,10 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
     NSAlert *alert = [[NSAlert alloc] init];
     
     alert.alertStyle = NSCriticalAlertStyle;
-    alert.messageText = NSLocalizedString(@"ENFORCE_PASSWORD_CHANGE_ALERT_TITLE", "");
-    alert.informativeText = NSLocalizedString(@"ENFORCE_PASSWORD_CHANGE_ALERT_DESCRIPTION", "");
+    alert.messageText = NSLocalizedString(@"ENFORCE_PASSWORD_CHANGE_ALERT_TITLE", "Message text for the enforce password change alert");
+    alert.informativeText = NSLocalizedString(@"ENFORCE_PASSWORD_CHANGE_ALERT_DESCRIPTION", "Informative text for the enforce password change alert");
     
-    [alert addButtonWithTitle:NSLocalizedString(@"CHANGE_PASSWORD_WITH_DOTS", "")];
+    [alert addButtonWithTitle:NSLocalizedString(@"CHANGE_PASSWORD_WITH_DOTS", "Single button to show the password change dialog")];
     
     [alert beginSheetModalForWindow:[self.document windowForSheet] completionHandler:^(NSModalResponse returnCode) {
       /* if sheet was stopped any other way, do nothing */
@@ -550,11 +550,11 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
     NSAlert *alert = [[NSAlert alloc] init];
     
     alert.alertStyle = NSInformationalAlertStyle;
-    alert.messageText = NSLocalizedString(@"RECOMMEND_PASSWORD_CHANGE_ALERT_TITLE", "");
-    alert.informativeText = NSLocalizedString(@"RECOMMEND_PASSWORD_CHANGE_ALERT_DESCRIPTION", "");
+    alert.messageText = NSLocalizedString(@"RECOMMEND_PASSWORD_CHANGE_ALERT_TITLE", "Message text for the recommend password change alert");
+    alert.informativeText = NSLocalizedString(@"RECOMMEND_PASSWORD_CHANGE_ALERT_DESCRIPTION", "Informative text for the recommend password change alert");
     
-    [alert addButtonWithTitle:NSLocalizedString(@"CHANGE_PASSWORD_WITH_DOTS", "")];
-    [alert addButtonWithTitle:NSLocalizedString(@"CANCEL", "")];
+    [alert addButtonWithTitle:NSLocalizedString(@"CHANGE_PASSWORD_WITH_DOTS", "Button to show the password change dialog")];
+    [alert addButtonWithTitle:NSLocalizedString(@"CANCEL", "Cancel button to postpone password change")];
     alert.buttons[1].keyEquivalent = [NSString stringWithFormat:@"%c", 0x1b];
     
     
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index ca3abb13..9e3ebb7e 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -180,15 +180,15 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
   modifiedColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:timeInfoModificationTimeKeyPath ascending:YES selector:@selector(compare:)];
   
   indexColumn.headerCell.stringValue = @"";
-  parentColumn.headerCell.stringValue = NSLocalizedString(@"GROUP", "");
-  titleColumn.headerCell.stringValue = NSLocalizedString(@"TITLE", "");
-  userNameColumn.headerCell.stringValue = NSLocalizedString(@"USERNAME", "");
-  passwordColumn.headerCell.stringValue = NSLocalizedString(@"PASSWORD", "");
-  urlColumn.headerCell.stringValue = NSLocalizedString(@"URL", "");
-  notesColumn.headerCell.stringValue = NSLocalizedString(@"NOTES", "");
-  attachmentsColumn.headerCell.stringValue = NSLocalizedString(@"ATTACHMENTS", "");
-  modifiedColumn.headerCell.stringValue = NSLocalizedString(@"MODIFIED", "");
-  historyColumn.headerCell.stringValue = NSLocalizedString(@"HISTORY", "");
+  parentColumn.headerCell.stringValue = NSLocalizedString(@"GROUP", "Group column title");
+  titleColumn.headerCell.stringValue = NSLocalizedString(@"TITLE", "Title column title");
+  userNameColumn.headerCell.stringValue = NSLocalizedString(@"USERNAME", "Username column title");
+  passwordColumn.headerCell.stringValue = NSLocalizedString(@"PASSWORD", "Password column title");
+  urlColumn.headerCell.stringValue = NSLocalizedString(@"URL", "Url column title");
+  notesColumn.headerCell.stringValue = NSLocalizedString(@"NOTES", "Notes column title");
+  attachmentsColumn.headerCell.stringValue = NSLocalizedString(@"ATTACHMENTS", "Attachments column title (shows counts)");
+  modifiedColumn.headerCell.stringValue = NSLocalizedString(@"MODIFIED", "Modification date column title");
+  historyColumn.headerCell.stringValue = NSLocalizedString(@"HISTORY", "History count column title");
   
   [self.entryTable bind:NSContentBinding toObject:self.entryArrayController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
   [self.entryTable bind:NSSortDescriptorsBinding toObject:self.entryArrayController withKeyPath:NSStringFromSelector(@selector(sortDescriptors)) options:nil];
diff --git a/MacPass/MPPasswordEditWindowController.m b/MacPass/MPPasswordEditWindowController.m
index 4750e4b8..f2971c75 100644
--- a/MacPass/MPPasswordEditWindowController.m
+++ b/MacPass/MPPasswordEditWindowController.m
@@ -106,8 +106,8 @@
   if(_enablePassword != enablePassword) {
     _enablePassword = enablePassword;
   }
-  NSString *passwordPlaceHolder = _enablePassword ? NSLocalizedString(@"PASSWORD_INPUT_ENTER_PASSWORD", "") : NSLocalizedString(@"PASSWORD_INPUT_NO_PASSWORD", "");
-  NSString *repeatPlaceHolder = _enablePassword ? NSLocalizedString(@"PASSWORD_INPUT_REPEAT_PASSWORD", "") : NSLocalizedString(@"PASSWORD_INPUT_NO_PASSWORD", "");
+  NSString *passwordPlaceHolder = _enablePassword ? NSLocalizedString(@"PASSWORD_INPUT_ENTER_PASSWORD", "Placeholder for the password field to aks for password") : NSLocalizedString(@"PASSWORD_INPUT_NO_PASSWORD", "Placeholder for the password input field if passwords are disabled");
+  NSString *repeatPlaceHolder = _enablePassword ? NSLocalizedString(@"PASSWORD_INPUT_REPEAT_PASSWORD", "Placeholder for the repeat password field to aks for the repeated password") : NSLocalizedString(@"PASSWORD_INPUT_NO_PASSWORD", "Placeholder for the repeat password input if passwords are disabled");
   self.passwordTextField.placeholderString = passwordPlaceHolder;
   self.passwordRepeatTextField.placeholderString = repeatPlaceHolder;
 }
@@ -136,7 +136,7 @@
     NSSavePanel *savePanel = [NSSavePanel savePanel];
     savePanel.allowedFileTypes = @[@"key", @"xml"];
     savePanel.canCreateDirectories = YES;
-    savePanel.title = NSLocalizedString(@"SAVE_KEYFILE", "");
+    savePanel.title = NSLocalizedString(@"SAVE_KEYFILE", "Button title to save the generated key file");
     [savePanel beginWithCompletionHandler:^(NSInteger result) {
       if(result == NSFileHandlingPanelOKButton) {
         NSURL *keyURL = [savePanel URL];
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index f1cf3f56..f03620a0 100644
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -473,7 +473,7 @@
 "SHOW_HISTORY" = "Show History";
 
 /* Menu item to show the reference builder in a text view's context menu */
-"SHOW_REFERENCE_BUILDER" = "";
+"SHOW_REFERENCE_BUILDER" = "Show Reference Builder";
 
 /* Displayed name when title field was copied
    Title reference item */