diff --git a/MacPass/sp.lproj/Credits.rtf b/MacPass/sp.lproj/Credits.rtf
new file mode 100644
index 00000000..1944622f
--- /dev/null
+++ b/MacPass/sp.lproj/Credits.rtf
@@ -0,0 +1,92 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf340
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;}
+\paperw11900\paperh16840\vieww25780\viewh19380\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+
+\f0\b\fs24 \cf0 Project Website:\
+{\field{\*\fldinst{HYPERLINK "https://github.com/mstarke/MacPass"}}{\fldrslt 
+\b0 MacPass}}
+\b0 \
+
+\b \
+License:\
+
+\b0 MacPass KeePass compatible client for OS X\
+Copyright (c) 2012-2016  Michael Starke, HicknHack Software GmbH\
+  \
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by\
+the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\
+\
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of\
+\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\
+\
+You should have received a copy of the GNU General Public License along with this program.  If not, see {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt http://www.gnu.org/licenses/}}.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+\cf0 \kerning1\expnd0\expndtw3
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+
+\b \cf0 \kerning1\expnd0\expndtw0 Credits:\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+
+\b0 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+\cf0 French Translation by {\field{\*\fldinst{HYPERLINK "mailto:gil@panix.com"}}{\fldrslt Gil Andr\'e9}}\
+\
+Simplified Chinese by {\field{\*\fldinst{HYPERLINK "mailto:patchao2000@gmail.com"}}{\fldrslt Zhao Peng}}\
+\
+Russian Translation by {\field{\*\fldinst{HYPERLINK "mailto:alex@mrdoggy.info"}}{\fldrslt Aliaksandr Piatkevich}}\
+\
+Italian Translation by {\field{\*\fldinst{HYPERLINK "mailto:info@francescoservida.ch"}}{\fldrslt Francesco Servida}}\
+\
+MacPass\kerning1\expnd0\expndtw3
+ \kerning1\expnd0\expndtw0 Icon by {\field{\*\fldinst{HYPERLINK "http://iiro.jappinen.me"}}{\fldrslt Iiro J\'e4ppinen}}\
+\
+Database Icons by {\field{\*\fldinst{HYPERLINK "https://github.com/JoannaOlsen"}}{\fldrslt Joanna Olsen}}\cf2 \
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt \cf2 KissXML}}\cf3 \
+Copyright \'a9 2012 Robbie Hanson. All rights reserved.\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/MiniKeePass/MiniKeePass"}}{\fldrslt \cf2 MiniKeePass}}\
+Copyright \'a9 2011 Jason Rush and John Flanagan. All rights reserved.\
+	\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/mpowrie/KeePassLib"}}{\fldrslt \cf2 KeePass Database Library}}\
+Copyright \'a9 2010 Qiang Yu. All rights reserved.\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/Perspx/PXSourceList"}}{\fldrslt \cf3 PXSourceList}}\
+Copyright \'a9 2011, Alex Rozanski. All rights reserved.\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org"}}{\fldrslt \cf3 Sparkl\kerning1\expnd0\expndtw3
+e}}\kerning1\expnd0\expndtw3
+\
+Copyright \'a9 2006 Andy Matuschak. \kerning1\expnd0\expndtw0 All rights reserved.\kerning1\expnd0\expndtw3
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+\cf3 \kerning1\expnd0\expndtw0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 NSData+Base64}}\
+Copyright \'a92013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt denis2342}}\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "http://www.cocoadev.com/index.pl?NSDataCategory"}}{\fldrslt \cf3 NSData+Gzip}}\
+Extracted from code on the CocoaDev Wiki\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\
+Code reused in HNHUIRoundedSecureTextField\
+Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/AlanQuatermain/aqtoolkit"}}{\fldrslt \cf3 NSData+CommonCrypto}}\
+Copyright \'a92008-2009 Jim Dovey, All rights reserved.\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "https://github.com/mattt/TransformerKit"}}{\fldrslt \cf3 TransformerKit}}\
+Copyright \'a92012 Mattt Thompson. All rights reseverd}
\ No newline at end of file
diff --git a/MacPass/sp.lproj/DatabaseSettingsWindow.strings b/MacPass/sp.lproj/DatabaseSettingsWindow.strings
new file mode 100644
index 00000000..1e5aeb20
--- /dev/null
+++ b/MacPass/sp.lproj/DatabaseSettingsWindow.strings
@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Ventana";
+
+/* Class = "NSTextFieldCell"; title = "Database name:"; ObjectID = "190"; */
+"190.title" = "Base:";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "257"; */
+"257.title" = "Descripción:";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
+"289.title" = "OK";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
+"358.label" = "General";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "368"; */
+"368.label" = "Avanzado";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
+"370.label" = "Seguridad";
+
+/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
+"464.title" = "Proteger Título";
+
+/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
+"477.title" = "Proteger Nombre de Usuario";
+
+/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
+"505.title" = "Proteger Contraseña";
+
+/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
+"510.title" = "Proteger URL";
+
+/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
+"514.title" = "Proteger Notas";
+
+/* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
+"532.title" = "Habilitar Consulta de Historial";
+
+/* Class = "NSButtonCell"; title = "Enable Recycle Bin"; ObjectID = "536"; */
+"536.title" = "Habilitar Papelera de Reciclaje";
+
+/* Class = "NSButtonCell"; title = "Empty Recycle Bin on Quit"; ObjectID = "540"; */
+"540.title" = "Vaciar Papelera de Reciclaje al Salir";
+
+/* Class = "NSTextFieldCell"; title = "Maximum Items:"; ObjectID = "558"; */
+"558.title" = "Entradas Máximas:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "680"; */
+"680.title" = "Otras Vistas";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
+"957.title" = "Cancelar";
+
+/* Class = "NSTextFieldCell"; title = "Maximum Size:"; ObjectID = "1269"; */
+"1269.title" = "Tamaño Máximo:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1396"; */
+"1396.title" = "Otras Vistas";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "1397"; */
+"1397.title" = "Ninguno";
+
+/* Class = "NSMenuItem"; title = "GZip"; ObjectID = "1398"; */
+"1398.title" = "GZip";
+
+/* Class = "NSTextFieldCell"; title = "Compression:"; ObjectID = "1405"; */
+"1405.title" = "Compresión:";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "1435"; */
+"1435.title" = "Color:";
+
+/* Class = "NSTextFieldCell"; title = "Template Group:"; ObjectID = "1588"; */
+"1588.title" = "Grupo de Plantillas:";
+
+/* Class = "NSTextFieldCell"; title = "Default Username:"; ObjectID = "1591"; */
+"1591.title" = "Usuario por Defecto:";
+
+/* Class = "NSTextFieldCell"; title = "Key encryption rounds:"; ObjectID = "1644"; */
+"1644.title" = "Rondas de Clave de Cifrado:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
+"1740.title" = "Otras Vistas";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
+"1741.title" = "Elemento 1";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
+"1742.title" = "Elemento 2";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
+"1743.title" = "Elemento 3";
+
+/* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
+"1775.title" = "Referencia";
diff --git a/MacPass/sp.lproj/DatePickingView.strings b/MacPass/sp.lproj/DatePickingView.strings
new file mode 100644
index 00000000..00de0f2e
--- /dev/null
+++ b/MacPass/sp.lproj/DatePickingView.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "17"; */
+"17.title" = "Otras vistas";
+
+/* Class = "NSButtonCell"; title = "Use Date"; ObjectID = "26"; */
+"26.title" = "Usar Fecha";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "30"; */
+"30.title" = "Cancelar";
diff --git a/MacPass/sp.lproj/EntryInspectorView.strings b/MacPass/sp.lproj/EntryInspectorView.strings
new file mode 100644
index 00000000..4ba7caa2
--- /dev/null
+++ b/MacPass/sp.lproj/EntryInspectorView.strings
@@ -0,0 +1,114 @@
+
+/* Class = "NSButtonCell"; title = "Generate"; ObjectID = "64"; */
+"64.title" = "Generar";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "65"; */
+"65.title" = "Contraseña";
+
+/* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "66"; */
+"66.title" = "URL";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "69"; */
+"69.title" = "Nombre de Usuario";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "71"; */
+"71.title" = "Título";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "78"; */
+"78.title" = "Expira";
+
+/* Class = "NSTextFieldCell"; title = "Tags"; ObjectID = "79"; */
+"79.title" = "Tags";
+
+/* Class = "NSTabViewItem"; label = "Fields"; ObjectID = "108"; */
+"108.label" = "Campos";
+
+/* Class = "NSTabViewItem"; label = "Attachments"; ObjectID = "109"; */
+"109.label" = "Adjuntos";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "110"; */
+"110.label" = "General";
+
+/* Class = "NSTextFieldCell"; title = "Attachments"; ObjectID = "135"; */
+"135.title" = "Adjuntos";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "142"; */
+"142.title" = "Campo de Texto";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "151"; */
+"151.title" = "Campo de Vista de Tabla";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "171"; */
+"171.title" = "Campo de Vista de Tabla";
+
+/* Class = "NSTextFieldCell"; title = "Custom Fields"; ObjectID = "190"; */
+"190.title" = "Campos Personalizados";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "197"; */
+"197.title" = "Campo de Texto";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "211"; */
+"211.placeholderString" = "Título";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "214"; */
+"214.placeholderString" = "Valor";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "225"; */
+"225.placeholderString" = "Valor";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "228"; */
+"228.placeholderString" = "Título";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[0] = "General"; ObjectID = "238"; */
+"238.ibShadowedLabels[0]" = "General";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
+"238.ibShadowedLabels[1]" = "Archivos";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
+"238.ibShadowedLabels[2]" = "Personalizado";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
+"238.ibShadowedLabels[3]" = "Autotipo";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
+"0ok-MC-QMP.title" = "Guardar";
+
+/* Class = "NSButtonCell"; title = "Enable Autotype"; ObjectID = "9Nx-mE-DK3"; */
+"9Nx-mE-DK3.title" = "Habilitar Autotipo";
+
+/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
+"NtM-y3-l4D.title" = "Vista Rápida";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Entry Sequence"; ObjectID = "R2X-Ex-c6q"; */
+"R2X-Ex-c6q.placeholderString" = "Entrada de Secuecia Personalizada";
+
+/* Class = "NSTextFieldCell"; title = "Window Sequence"; ObjectID = "RQB-bR-MC0"; */
+"RQB-bR-MC0.title" = "Secuencia de Ventana";
+
+/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
+"bQ5-0E-h3O.title" = "Secuencia Autotipo";
+
+/* Class = "NSTextFieldCell"; title = "Window Title"; ObjectID = "bkO-Bk-AuX"; */
+"bkO-Bk-AuX.title" = "Título de Ventana";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
+"bke-G2-oEf.title" = "Eliminar";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dyA-lo-PGa"; */
+"dyA-lo-PGa.title" = "Campo de Vista de Tabla View";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ep5-bQ-cfZ"; */
+"ep5-bQ-cfZ.title" = "Campo de Texto";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Window Sequence"; ObjectID = "fW9-9p-wwR"; */
+"fW9-9p-wwR.placeholderString" = "Secuencia de Ventana Personalizada";
+
+/* Class = "NSTabViewItem"; label = "Autotype"; ObjectID = "hK7-Dx-yjH"; */
+"hK7-Dx-yjH.label" = "Autotipo";
+
+/* Class = "NSTextFieldCell"; title = "Window Associations"; ObjectID = "ned-1Q-FXA"; */
+"ned-1Q-FXA.title" = "Asociaciones de Ventana";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "sNS-o1-pD7"; */
+"sNS-o1-pD7.title" = "Otras Vistas";
diff --git a/MacPass/sp.lproj/GeneralSettings.strings b/MacPass/sp.lproj/GeneralSettings.strings
new file mode 100644
index 00000000..3fb939fe
--- /dev/null
+++ b/MacPass/sp.lproj/GeneralSettings.strings
@@ -0,0 +1,63 @@
+
+/* Class = "NSMenu"; title = "ClipboardClearInterval"; ObjectID = "421"; */
+"421.title" = "Intervalo de Limpieza de Portapapeles";
+
+/* Class = "NSMenuItem"; title = "after 10 Seconds"; ObjectID = "422"; */
+"422.title" = "después de 10 Segundos";
+
+/* Class = "NSMenuItem"; title = "after 30 Seconds"; ObjectID = "423"; */
+"423.title" = "después de 30 Segundos";
+
+/* Class = "NSMenuItem"; title = "after 1 Minute"; ObjectID = "424"; */
+"424.title" = "después de 1 Minuto";
+
+/* Class = "NSMenuItem"; title = "Never"; ObjectID = "429"; */
+"429.title" = "Nunca";
+
+/* Class = "NSTextFieldCell"; title = "Clear Copied Items"; ObjectID = "432"; */
+"432.title" = "Eliminar Valores Copiados";
+
+/* Class = "NSButtonCell"; title = "Clear Clipboard on Quit"; ObjectID = "448"; */
+"448.title" = "Vaciar Portapapeles al Salir";
+
+/* Class = "NSBox"; title = "Security"; ObjectID = "465"; */
+"465.title" = "Seguridad";
+
+/* Class = "NSButtonCell"; title = "Reopen last Database after Launch"; ObjectID = "531"; */
+"531.title" = "Reabrir Base más reciente al Iniciar";
+
+/* Class = "NSBox"; title = "General"; ObjectID = "928"; */
+"928.title" = "General";
+
+/* Class = "NSButtonCell"; title = "Double-click entry URL to Launch"; ObjectID = "937"; */
+"937.title" = "Abrir URL al dar doble click";
+
+/* Class = "NSMenu"; title = "LockTimes"; ObjectID = "586"; */
+"586.title" = "Tiempos de Bloqueo";
+
+/* Class = "NSMenuItem"; title = "for 1 Minute"; ObjectID = "588"; */
+"588.title" = "por 1 Minuto";
+
+/* Class = "NSMenuItem"; title = "for 5 Minutes"; ObjectID = "589"; */
+"589.title" = "por 5 Minutos";
+
+/* Class = "NSMenuItem"; title = "for 15 Minutes"; ObjectID = "603"; */
+"603.title" = "por 15 Minutos";
+
+/* Class = "NSButtonCell"; title = "Lock after sleep"; ObjectID = "631"; */
+"631.title" = "Bloquear al hibernar";
+
+/* Class = "NSMenuItem"; title = "Never"; ObjectID = "804"; */
+"804.title" = "Nunca";
+
+/* Class = "NSTextFieldCell"; title = "Lock while idle"; ObjectID = "806"; */
+"806.title" = "Bloquear al estar inactivo";
+
+/* Class = "NSTextFieldCell"; title = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved."; ObjectID = "ACh-7H-42N"; */
+"ACh-7H-42N.title" = "Habilitando esta opción se compromete la seguridad. Si está habilitado, tus preferencias contendrán mapeos de bases al keyfile. Las ubicaciones para bases sin contraseña no serán guardadas..";
+
+/* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
+"r6q-He-nYU.title" = "Recordar el Keyfile para las Bases de Datos";
+
+/* Class = "NSButtonCell"; title = "Clear all stored locations"; ObjectID = "8Ri-2s-c39"; */
+"8Ri-2s-c39.title" = "Eliminar las ubicaciones guardadas";