From 0286b87a41e535caf59376c63d3bd47db48d9c6e Mon Sep 17 00:00:00 2001 From: tarek_saidi Date: Mon, 3 Jul 2006 15:41:52 +0000 Subject: [PATCH] update of french translation, TrActive will be set correctly again (display of the translation author) git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@101 b624d157-de02-0410-bad0-e51aec6abb33 --- changelog | 12 ++-- src/main.cpp | 3 +- src/translations/keepass-de_DE.ts | 69 +++++++++++++------- src/translations/keepass-es_ES.ts | 30 ++++++--- src/translations/keepass-fr_FR.ts | 104 +++++++++++++++++++----------- src/translations/keepass-ru_RU.ts | 35 +++++----- src/translations/keepass-xx_XX.ts | 35 +++++----- todo | 8 +++ 8 files changed, 189 insertions(+), 107 deletions(-) diff --git a/changelog b/changelog index a931a5b..55f0374 100644 --- a/changelog +++ b/changelog @@ -2,20 +2,20 @@ 0.2.2 --------------- -fixed crash when parsing config file under Win32 --fixed loss of entry icons when saving a database which was not created - with KeePassX (no KPX_CUSTOM_ICONS metastream) +-fixed loss of entry icons when saving a database which was not created with KeePassX (no KPX_CUSTOM_ICONS metastream) +-introduces new metastream format for custom icons -removed all old Qt3 support dependecies +-QtNetwork and QtSql are not longer requiered (when using Qt 4.1.3 or later) -implemented correct UUID management for entries -added delay of 0.3s before performing auto-type -metastreams now get valid group IDs (KeePass/Win compatibility) -fixed drawing errors when performing drag and drop operations in group view --when there is no translation installed for the system's country preference but - one for the same language the program will use it now --when canceling the file dialog for the opening of an existing database a already - openend database will not longer be closed +-when there is no translation installed for the system's country preference but one for the same language the program will use it now +-when canceling the file dialog for the opening of an existing database a already openend database will not longer be closed -same for the creation of a new database -alpha blending for banner icons -new standard banner icon +-MacOS packages: all Qt libraries are now included in the application bundle (extra installation is not longer necessary) --------------- 0.2.1 --------------- diff --git a/src/main.cpp b/src/main.cpp index 0fa8b7f..5308f30 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -117,7 +117,8 @@ qtTranslator=new QTranslator; if(loadTranslation(translator,"keepass-",loc.name(),QStringList() << app->applicationDirPath()+"/../share/keepass/i18n/" << QDir::homePath()+"/.keepass/" )) - app->installTranslator(translator); + {app->installTranslator(translator); + TrActive=true;} else{ if(loc.name()!="en_US") qWarning(QString("Kpx: No Translation found for '%1 (%2)'using 'English (UnitedStates)'") diff --git a/src/translations/keepass-de_DE.ts b/src/translations/keepass-de_DE.ts index fd92919..bb5b4b1 100644 --- a/src/translations/keepass-de_DE.ts +++ b/src/translations/keepass-de_DE.ts @@ -38,16 +38,24 @@ General Public License (GPL) Version 2. tarek.saidi@arcor.de - tarek.saidi@arcor.de + tarek.saidi@arcor.de http://keepass.berlios.de/ - http://keepass.berlios.de/ + http://keepass.berlios.de/ Credits + + http://keepassx.sourceforge.net + + + + keepassx@gmail.com + + AutoType @@ -102,7 +110,7 @@ Erlaubt ist nur eine pro Eintrag. http://keepass.berlios.de/index.php - http://keepass.berlios.de/index.php + http://keepass.berlios.de/index.php <b>Current Translation: None</b><br><br> @@ -147,7 +155,7 @@ http://keepass.berlios.de/translation-howto.html Information on how to translate KeePassX can be found under: http://keepass.berlios.de/ - Informationen über das Erstellen eine Übersetztung für KeePassX sind hier zu finden: + Informationen über das Erstellen eine Übersetztung für KeePassX sind hier zu finden: http://keepass.berlios.de @@ -186,6 +194,23 @@ http://keepass.berlios.de www.outofhanwell.com + + Information on how to translate KeePassX can be found under: +http://keepassx.sourceforge.net/ + + + + James Nicholls + + + + Main Application Icon + Anwendungssymbol + + + http://keepassx.sf.net + + CDbSettingsDlg @@ -1254,71 +1279,71 @@ die Änderungen speichern? &File - Datei + &Datei &Import from... - + &Importieren aus... &Export to... - + &Exportieren nach... &Edit - + &Bearbeiten E&xtras - + E&xtras &Help - + &Hilfe &New Database... - + &Neue Datenbank... &Open Database... - + Datenbank &öffnen... &Close Database - + Datenbank s&chließen &Save Database - + Datenbank &speichern Save Database &As... - + D&atenbank speichern unter... &Database Settings... - + &Datenbankeinstellungen... Change &Master Key... - + Hauptschlüssel &ändern... E&xit - + Beend&en &Settings... - + Ein&stellungen... &About... - + &Über... &KeePassX Handbook... - + &KeePassX Handbuch... @@ -1771,7 +1796,7 @@ Stellen Sie sicher, dass Sie Schreibzugriff auf '~/.keepass' haben. Remember last opened file - + Zuletzt geöffnete Datei merken diff --git a/src/translations/keepass-es_ES.ts b/src/translations/keepass-es_ES.ts index c8f0dda..8d7ffe8 100644 --- a/src/translations/keepass-es_ES.ts +++ b/src/translations/keepass-es_ES.ts @@ -35,15 +35,15 @@ General Public License (GPL) version 2. - tarek.saidi@arcor.de + Credits - http://keepass.berlios.de/ + http://keepassx.sourceforge.net - Credits + keepassx@gmail.com @@ -98,7 +98,7 @@ Allowed is only one per entry. http://keepass.berlios.de/index.php - http://keepass.berlios.de/index.php + http://keepass.berlios.de/index.php <b>Current Translation: None</b><br><br> @@ -136,11 +136,6 @@ http://keepass.berlios.de/translation-howto.html $TRANSLATION_AUTHOR - - Information on how to translate KeePassX can be found under: -http://keepass.berlios.de/ - - Team @@ -177,6 +172,23 @@ http://keepass.berlios.de/ www.outofhanwell.com + + Information on how to translate KeePassX can be found under: +http://keepassx.sourceforge.net/ + + + + James Nicholls + + + + Main Application Icon + + + + http://keepassx.sf.net + + CDbSettingsDlg diff --git a/src/translations/keepass-fr_FR.ts b/src/translations/keepass-fr_FR.ts index cda6424..0bb155c 100644 --- a/src/translations/keepass-fr_FR.ts +++ b/src/translations/keepass-fr_FR.ts @@ -26,27 +26,35 @@ <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">KeePassX</span> - Cross Platform Password Manager</p></body></html> - + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">KeePassX</span> - Gest. de mot de passe multiplateforme</p></body></html> Copyright (C) 2005 - 2006 Tarek Saidi KeePassX is distributed under the terms of the General Public License (GPL) version 2. - <span style=" font-size:9pt; font-weight:400;">Copyright (c) 2005 - 2006 Tarek Saidi <br> + <span style=" font-size:9pt; font-weight:400;">Copyright (c) 2005 - 2006 Tarek Saidi <br> KeePassX est distribué sous les termes de la<br> Licence Publique Générale GNU v2 (GPL v2).</span> tarek.saidi@arcor.de - tarek.saidi@arcor.de + tarek.saidi@arcor.de http://keepass.berlios.de/ - http://keepass.berlios.de/ + http://keepass.berlios.de/ Credits Crédits + + http://keepassx.sourceforge.net + http://keepassx.sourceforge.net + + + keepassx@gmail.com + keepassx@gmail.com + AutoType @@ -83,7 +91,7 @@ Seulement une par entrée est autorisée. Make sure that the program is installed correctly. - Être sûr que le programme soit correctement installé. + S'assurer que l'application est correctement installée. OK @@ -91,17 +99,17 @@ Seulement une par entrée est autorisée. Could not open file '%1' - Ne peut ouvrir le fichier '%1' + N'a pas pu ouvrir le fichier '%1' The following error occured: %1 - L'erreur suivant est survenue: + L'erreur suivante est survenue: %1 http://keepass.berlios.de/index.php - http://keepass.berlios.de/index.php + http://keepass.berlios.de/index.php <b>Current Translation: None</b><br><br> @@ -110,7 +118,7 @@ Seulement une par entrée est autorisée. <b>Author:</b> %1<br> - <b> A pour auteur:</b> %1<br> + <b> À pour auteur:</b> %1<br> $TRANSALTION_AUTHOR @@ -119,7 +127,7 @@ Seulement une par entrée est autorisée. $TRANSLATION_AUTHOR_EMAIL Here you can enter your email or homepage if you want. - <b> Courriel: </b> <br>djellel@free.fr + <b>Courriel:</b> <br> djellel@free.fr @@ -152,12 +160,12 @@ http://keepass.berlios.de/translation-howto.html Information on how to translate KeePassX can be found under: http://keepass.berlios.de/ - Toutes les informations concernant la méthode pour traduire KeePassX peuvent être obtenues à l'adresse suivante:<br> + Toutes les informations concernant la méthode pour traduire KeePassX peuvent être obtenues à l'adresse suivante:<br> <ADDRESS>http://keepass.berlios.de/<ADDRESS> Team - Equipe + Équipe Tarek Saidi @@ -191,6 +199,24 @@ http://keepass.berlios.de/ www.outofhanwell.com <ADDRESS>www.outofhanwell.com<ADDRESS> + + Information on how to translate KeePassX can be found under: +http://keepassx.sourceforge.net/ + Les informations concernant la méthode de traduction de KeePassX peuvent être trouvées à l'adresse suivante:<br> + <ADDRESS>http://keepass.berlios.de/translation-howto.html</ADDRESS> + + + James Nicholls + James Nicholls + + + Main Application Icon + Pour le logo de KeepassX + + + http://keepassx.sf.net + http://keepassx.sf.net + CDbSettingsDlg @@ -596,7 +622,7 @@ S'il vous plait, vérifier vos permissions. Ge&n. - Ge&n. + &Gen. ... @@ -666,7 +692,7 @@ S'il vous plait, vérifier vos permissions. Export_Txt Could not open file (FileError=%1) - Ne peut ouvrir le fichier (FileError=%1) + N'a pas pu ouvrir le fichier (FileError=%1) @@ -1257,75 +1283,75 @@ Désirez-vous enregistrer le changement ? &View - + &Affichage &File - + &Fichier &Import from... - + &Importer d'un... &Export to... - + &Exporter vers... &Edit - + Ed&iter E&xtras - + E&xtras &Help - + Ai&de &New Database... - + &Nouvelle BD... &Open Database... - + &Ouvrir une BD... &Close Database - + Fer&mer la BD &Save Database - + &Enregistrer la BD Save Database &As... - + Enre&gistrer la BD sous... &Database Settings... - + Paramé&trage de la BD... Change &Master Key... - + &Changer la clé maitresse... E&xit - + &Quitter &Settings... - + &Préférences... &About... - + À pr&opos... &KeePassX Handbook... - + Le manuel de &KeePassX... @@ -1403,23 +1429,23 @@ Désirez-vous enregistrer le changement ? Unexpected error: Offset is out of range. [G1] - Erreur inattendue: Le décalage est hors limites.[G1] + Erreur inattendue: Le décalage est hors limite.[G1] Unexpected error: Offset is out of range. [G2] - Erreur inattendue: Le décalage est hors limites.[G2] + Erreur inattendue: Le décalage est hors limite.[G2] Unexpected error: Offset is out of range. [E1] - Erreur inattendue: Le décalage est hors limites.[E1] + Erreur inattendue: Le décalage est hors limite.[E1] Unexpected error: Offset is out of range. [E2] - Erreur inattendue: Le décalage est hors limites.[E2] + Erreur inattendue: Le décalage est hors limite.[E2] Unexpected error: Offset is out of range. [E3] - Erreur inattendue: Le décalage est hors limites.[E3] + Erreur inattendue: Le décalage est hors limite.[E3] Hash test failed. @@ -1758,7 +1784,7 @@ Make sure you have write access to '~/.keepass'. Securi&ty - Sécuri&té + Séc&urité Alternating Row Colors @@ -1778,7 +1804,7 @@ Make sure you have write access to '~/.keepass'. Remember last opened file - + Se souvenir du dernier fichier ouvert diff --git a/src/translations/keepass-ru_RU.ts b/src/translations/keepass-ru_RU.ts index 58292d3..e44e781 100644 --- a/src/translations/keepass-ru_RU.ts +++ b/src/translations/keepass-ru_RU.ts @@ -1,7 +1,4 @@ - - - AboutDlg @@ -27,15 +24,15 @@ General Public License (GPL) version 2. - tarek.saidi@arcor.de + Credits - http://keepass.berlios.de/ + http://keepassx.sourceforge.net - Credits + keepassx@gmail.com @@ -87,10 +84,6 @@ Allowed is only one per entry. %1 - - http://keepass.berlios.de/index.php - - <b>Current Translation: None</b><br><br> Please replace 'None' with the language of your translation @@ -117,11 +110,6 @@ Allowed is only one per entry. $TRANSLATION_AUTHOR - - Information on how to translate KeePassX can be found under: -http://keepass.berlios.de/ - - Team @@ -158,6 +146,23 @@ http://keepass.berlios.de/ www.outofhanwell.com + + Information on how to translate KeePassX can be found under: +http://keepassx.sourceforge.net/ + + + + James Nicholls + + + + Main Application Icon + + + + http://keepassx.sf.net + + CDbSettingsDlg diff --git a/src/translations/keepass-xx_XX.ts b/src/translations/keepass-xx_XX.ts index 58292d3..e44e781 100644 --- a/src/translations/keepass-xx_XX.ts +++ b/src/translations/keepass-xx_XX.ts @@ -1,7 +1,4 @@ - - - AboutDlg @@ -27,15 +24,15 @@ General Public License (GPL) version 2. - tarek.saidi@arcor.de + Credits - http://keepass.berlios.de/ + http://keepassx.sourceforge.net - Credits + keepassx@gmail.com @@ -87,10 +84,6 @@ Allowed is only one per entry. %1 - - http://keepass.berlios.de/index.php - - <b>Current Translation: None</b><br><br> Please replace 'None' with the language of your translation @@ -117,11 +110,6 @@ Allowed is only one per entry. $TRANSLATION_AUTHOR - - Information on how to translate KeePassX can be found under: -http://keepass.berlios.de/ - - Team @@ -158,6 +146,23 @@ http://keepass.berlios.de/ www.outofhanwell.com + + Information on how to translate KeePassX can be found under: +http://keepassx.sourceforge.net/ + + + + James Nicholls + + + + Main Application Icon + + + + http://keepassx.sf.net + + CDbSettingsDlg diff --git a/todo b/todo index e69de29..deb35ad 100644 --- a/todo +++ b/todo @@ -0,0 +1,8 @@ +Database: + -need to change the interface of the generic Database class so that no direct references + or pointers to group or entry objects are used: + 1. approach: CEntry e=getEntry( ...by any attrib...); //get a COPY + e.Title="Blubb"; + setEntey(e); + 2. approach: EntryID id=getEntryID(...by any attrib...); //get an ID (maybe the list index) + setEntryTitle(id,"Blubb"); \ No newline at end of file