152 changed files with 159 additions and 169 deletions
--- a/keepassx1.pro
+++ b/keepassx1.pro
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@ -1,13 +1,13 @@
 # CMake is still experimental, use qmake instead

-INSTALL(DIRECTORY keepassx1/i18n keepassx/icons
+INSTALL(DIRECTORY keepassx/i18n keepassx/icons
 	DESTINATION ${SHAREDIR}
 	PATTERN *.qm EXCLUDE
 	PATTERN *~ EXCLUDE
 	PATTERN .svn EXCLUDE
 )

-INSTALL(FILES keepassx1/license.html DESTINATION ${SHAREDIR})
+INSTALL(FILES keepassx/license.html DESTINATION ${SHAREDIR})

 IF (NOT MINGW AND NOT APPLE)
 	INSTALL(DIRECTORY applications
--- a/share/applications/keepassx1.desktop
+++ b/share/applications/keepassx1.desktop
@ -4,7 +4,7 @@ GenericName=Cross Platform Password Manager
 GenericName[de]=Passwortverwaltung
 GenericName[es]=Gestor de contraseñas multiplataforma
 GenericName[fr]=Gestionnaire de mot de passe
-Exec=keepassx1 %f
+Exec=keepassx %f
 Icon=keepassx
 Comment=Cross Platform Password Manager
 Comment[de]=Passwortverwaltung
--- a/share/keepassx1/i18n/keepassx-de_DE.qm
+++ b/share/keepassx1/i18n/keepassx-de_DE.qm
--- a/share/keepassx1/i18n/keepassx-es_ES.qm
+++ b/share/keepassx1/i18n/keepassx-es_ES.qm
--- a/share/keepassx1/i18n/keepassx-fi_FI.qm
+++ b/share/keepassx1/i18n/keepassx-fi_FI.qm
--- a/share/keepassx1/i18n/keepassx-fr_FR.qm
+++ b/share/keepassx1/i18n/keepassx-fr_FR.qm
--- a/share/keepassx1/i18n/keepassx-gl_ES.qm
+++ b/share/keepassx1/i18n/keepassx-gl_ES.qm
--- a/share/keepassx1/i18n/keepassx-hu_HU.qm
+++ b/share/keepassx1/i18n/keepassx-hu_HU.qm
--- a/share/keepassx1/i18n/keepassx-it_IT.qm
+++ b/share/keepassx1/i18n/keepassx-it_IT.qm
--- a/share/keepassx1/i18n/keepassx-ja_JP.qm
+++ b/share/keepassx1/i18n/keepassx-ja_JP.qm
--- a/share/keepassx1/i18n/keepassx-nb_NO.qm
+++ b/share/keepassx1/i18n/keepassx-nb_NO.qm
--- a/share/keepassx1/i18n/keepassx-nl_NL.qm
+++ b/share/keepassx1/i18n/keepassx-nl_NL.qm
--- a/share/keepassx1/i18n/keepassx-pl_PL.qm
+++ b/share/keepassx1/i18n/keepassx-pl_PL.qm
--- a/share/keepassx1/i18n/keepassx-pt_PT.qm
+++ b/share/keepassx1/i18n/keepassx-pt_PT.qm
--- a/share/keepassx1/i18n/keepassx-ru_RU.qm
+++ b/share/keepassx1/i18n/keepassx-ru_RU.qm
--- a/share/keepassx1/i18n/keepassx-sk_SK.qm
+++ b/share/keepassx1/i18n/keepassx-sk_SK.qm
--- a/share/keepassx1/i18n/keepassx-sr_RS.qm
+++ b/share/keepassx1/i18n/keepassx-sr_RS.qm
--- a/share/keepassx1/i18n/keepassx-tr_TR.qm
+++ b/share/keepassx1/i18n/keepassx-tr_TR.qm
--- a/share/keepassx1/i18n/keepassx-uk_UA.qm
+++ b/share/keepassx1/i18n/keepassx-uk_UA.qm
--- a/share/keepassx1/i18n/keepassx-zh_CN.qm
+++ b/share/keepassx1/i18n/keepassx-zh_CN.qm
--- a/share/keepassx1/i18n/qt_fi.qm
+++ b/share/keepassx1/i18n/qt_fi.qm
--- a/share/keepassx1/i18n/qt_gl_ES.qm
+++ b/share/keepassx1/i18n/qt_gl_ES.qm
--- a/share/keepassx1/i18n/qt_hu.qm
+++ b/share/keepassx1/i18n/qt_hu.qm
--- a/share/keepassx1/i18n/qt_it.qm
+++ b/share/keepassx1/i18n/qt_it.qm
--- a/share/keepassx1/i18n/qt_nl.qm
+++ b/share/keepassx1/i18n/qt_nl.qm
--- a/share/keepassx1/i18n/qt_sr.qm
+++ b/share/keepassx1/i18n/qt_sr.qm
--- a/share/keepassx1/i18n/qt_tr.qm
+++ b/share/keepassx1/i18n/qt_tr.qm
--- a/share/keepassx1/icons/alarmclock.png
+++ b/share/keepassx1/icons/alarmclock.png
--- a/share/keepassx1/icons/appsettings.png
+++ b/share/keepassx1/icons/appsettings.png
--- a/share/keepassx1/icons/autotype.png
+++ b/share/keepassx1/icons/autotype.png
--- a/share/keepassx1/icons/bookmark.png
+++ b/share/keepassx1/icons/bookmark.png
--- a/share/keepassx1/icons/bookmark_add.png
+++ b/share/keepassx1/icons/bookmark_add.png
--- a/share/keepassx1/icons/bookmark_del.png
+++ b/share/keepassx1/icons/bookmark_del.png
--- a/share/keepassx1/icons/bookmark_edit.png
+++ b/share/keepassx1/icons/bookmark_edit.png
--- a/share/keepassx1/icons/bookmark_folder.png
+++ b/share/keepassx1/icons/bookmark_folder.png
--- a/share/keepassx1/icons/bookmark_this.png
+++ b/share/keepassx1/icons/bookmark_this.png
--- a/share/keepassx1/icons/clientic.png
+++ b/share/keepassx1/icons/clientic.png
--- a/share/keepassx1/icons/clock.png
+++ b/share/keepassx1/icons/clock.png
--- a/share/keepassx1/icons/cloneentry.png
+++ b/share/keepassx1/icons/cloneentry.png
--- a/share/keepassx1/icons/copypwd.png
+++ b/share/keepassx1/icons/copypwd.png
--- a/share/keepassx1/icons/copyusername.png
+++ b/share/keepassx1/icons/copyusername.png
--- a/share/keepassx1/icons/dbsearch.png
+++ b/share/keepassx1/icons/dbsearch.png
--- a/share/keepassx1/icons/dbsettings.png
+++ b/share/keepassx1/icons/dbsettings.png
--- a/share/keepassx1/icons/delete.png
+++ b/share/keepassx1/icons/delete.png
--- a/share/keepassx1/icons/deleteentry.png
+++ b/share/keepassx1/icons/deleteentry.png
--- a/share/keepassx1/icons/deletegroup.png
+++ b/share/keepassx1/icons/deletegroup.png
--- a/share/keepassx1/icons/dice.png
+++ b/share/keepassx1/icons/dice.png
--- a/share/keepassx1/icons/document.png
+++ b/share/keepassx1/icons/document.png
--- a/share/keepassx1/icons/down.png
+++ b/share/keepassx1/icons/down.png
--- a/share/keepassx1/icons/editentry.png
+++ b/share/keepassx1/icons/editentry.png
--- a/share/keepassx1/icons/editgroup.png
+++ b/share/keepassx1/icons/editgroup.png
--- a/share/keepassx1/icons/exit.png
+++ b/share/keepassx1/icons/exit.png
--- a/share/keepassx1/icons/expired.png
+++ b/share/keepassx1/icons/expired.png
--- a/share/keepassx1/icons/fileclose.png
+++ b/share/keepassx1/icons/fileclose.png
--- a/share/keepassx1/icons/filedelete.png
+++ b/share/keepassx1/icons/filedelete.png
--- a/share/keepassx1/icons/filenew.png
+++ b/share/keepassx1/icons/filenew.png
--- a/share/keepassx1/icons/fileopen.png
+++ b/share/keepassx1/icons/fileopen.png
--- a/share/keepassx1/icons/filesave.png
+++ b/share/keepassx1/icons/filesave.png
--- a/share/keepassx1/icons/filesaveas.png
+++ b/share/keepassx1/icons/filesaveas.png
--- a/share/keepassx1/icons/filesavedisabled.png
+++ b/share/keepassx1/icons/filesavedisabled.png
--- a/share/keepassx1/icons/generator.png
+++ b/share/keepassx1/icons/generator.png
--- a/share/keepassx1/icons/go-home.png
+++ b/share/keepassx1/icons/go-home.png
--- a/share/keepassx1/icons/go-next.png
+++ b/share/keepassx1/icons/go-next.png
--- a/share/keepassx1/icons/go-previous.png
+++ b/share/keepassx1/icons/go-previous.png
--- a/share/keepassx1/icons/groupsearch.png
+++ b/share/keepassx1/icons/groupsearch.png
--- a/share/keepassx1/icons/help.png
+++ b/share/keepassx1/icons/help.png
--- a/share/keepassx1/icons/help_about.png
+++ b/share/keepassx1/icons/help_about.png
--- a/share/keepassx1/icons/i18n.png
+++ b/share/keepassx1/icons/i18n.png
--- a/share/keepassx1/icons/keepassx.png
+++ b/share/keepassx1/icons/keepassx.png
--- a/share/keepassx1/icons/keepassx_large.png
+++ b/share/keepassx1/icons/keepassx_large.png
--- a/share/keepassx1/icons/keepassx_locked.png
+++ b/share/keepassx1/icons/keepassx_locked.png
--- a/share/keepassx1/icons/keepassx_small.png
+++ b/share/keepassx1/icons/keepassx_small.png
--- a/share/keepassx1/icons/key.png
+++ b/share/keepassx1/icons/key.png
--- a/share/keepassx1/icons/lock.png
+++ b/share/keepassx1/icons/lock.png
--- a/share/keepassx1/icons/manual.png
+++ b/share/keepassx1/icons/manual.png
--- a/share/keepassx1/icons/newentry.png
+++ b/share/keepassx1/icons/newentry.png
--- a/share/keepassx1/icons/newgroup.png
+++ b/share/keepassx1/icons/newgroup.png
--- a/share/keepassx1/icons/ok.png
+++ b/share/keepassx1/icons/ok.png
--- a/share/keepassx1/icons/openurl.png
+++ b/share/keepassx1/icons/openurl.png
--- a/share/keepassx1/icons/pwd_hide.png
+++ b/share/keepassx1/icons/pwd_hide.png
--- a/share/keepassx1/icons/pwd_show.png
+++ b/share/keepassx1/icons/pwd_show.png
--- a/share/keepassx1/icons/restore.png
+++ b/share/keepassx1/icons/restore.png
--- a/share/keepassx1/icons/search.png
+++ b/share/keepassx1/icons/search.png
--- a/share/keepassx1/icons/swap.png
+++ b/share/keepassx1/icons/swap.png
--- a/share/keepassx1/icons/templates.png
+++ b/share/keepassx1/icons/templates.png
--- a/share/keepassx1/icons/text_block.png
+++ b/share/keepassx1/icons/text_block.png
--- a/share/keepassx1/icons/text_bold.png
+++ b/share/keepassx1/icons/text_bold.png
--- a/share/keepassx1/icons/text_center.png
+++ b/share/keepassx1/icons/text_center.png
--- a/share/keepassx1/icons/text_italic.png
+++ b/share/keepassx1/icons/text_italic.png
--- a/share/keepassx1/icons/text_left.png
+++ b/share/keepassx1/icons/text_left.png
--- a/share/keepassx1/icons/text_right.png
+++ b/share/keepassx1/icons/text_right.png
--- a/share/keepassx1/icons/text_under.png
+++ b/share/keepassx1/icons/text_under.png
--- a/share/keepassx1/icons/trashcan.png
+++ b/share/keepassx1/icons/trashcan.png
--- a/share/keepassx1/icons/up.png
+++ b/share/keepassx1/icons/up.png
--- a/share/keepassx1/license.html
+++ b/share/keepassx1/license.html
--- a/share/mime/packages/keepassx1.xml
+++ b/share/mime/packages/keepassx1.xml
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -122,22 +122,22 @@ SET(keepassx_FORMS
 SET(keepassx_RESOURCES res/resources.qrc)

 set(keepassx_TRANSLATIONS
-#	translations/keepassx1-cs_CZ.ts
-	translations/keepassx1-de_DE.ts
-	translations/keepassx1-es_ES.ts
-	translations/keepassx1-fi_FI.ts
-	translations/keepassx1-fr_FR.ts
-	translations/keepassx1-gl_ES.ts
-	translations/keepassx1-hu_HU.ts
-	translations/keepassx1-it_IT.ts
-	translations/keepassx1-ja_JP.ts
-	translations/keepassx1-nb_NO.ts
-	translations/keepassx1-nl_NL.ts
-	translations/keepassx1-pl_PL.ts
-	translations/keepassx1-ru_RU.ts
-	translations/keepassx1-tr_TR.ts
-	translations/keepassx1-uk_UA.ts
-	translations/keepassx1-zh_CN.ts
+#	translations/keepassx-cs_CZ.ts
+	translations/keepassx-de_DE.ts
+	translations/keepassx-es_ES.ts
+	translations/keepassx-fi_FI.ts
+	translations/keepassx-fr_FR.ts
+	translations/keepassx-gl_ES.ts
+	translations/keepassx-hu_HU.ts
+	translations/keepassx-it_IT.ts
+	translations/keepassx-ja_JP.ts
+	translations/keepassx-nb_NO.ts
+	translations/keepassx-nl_NL.ts
+	translations/keepassx-pl_PL.ts
+	translations/keepassx-ru_RU.ts
+	translations/keepassx-tr_TR.ts
+	translations/keepassx-uk_UA.ts
+	translations/keepassx-zh_CN.ts
 	translations/qt_fi.ts
 	translations/qt_hu.ts
 	translations/qt_it.ts
--- a/src/Kdb3Database.cpp
+++ b/src/Kdb3Database.cpp
@ -883,7 +883,7 @@ void Kdb3Database::GroupHandle::setIndex(int index){
 */

 bool Kdb3Database::convHexToBinaryKey(char* HexKey, char* dst){
-	QString hex=QString::fromLatin1(HexKey,64);
+	QString hex=QString::fromAscii(HexKey,64);
 	for(int i=0; i<64; i+=2){
 		bool err;
 		quint8 bin;
--- a/src/KpxConfig.h
+++ b/src/KpxConfig.h
@ -25,11 +25,11 @@

 #include "lib/AutoType.h"

-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
 #	define DEFAULT_MOUNT_DIR "/Volumes/"
-#elif defined(Q_OS_LINUX)
+#elif defined(Q_WS_X11)
 #	define DEFAULT_MOUNT_DIR "/media/"
-#elif defined(Q_OS_WIN32)
+#elif defined(Q_WS_WIN)
 #	define DEFAULT_MOUNT_DIR "/"
 #else
 #	define DEFAULT_MOUNT_DIR QString()
--- a/Show More
+++ b/Show More