[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/kgpg
From:       Burkhard Lück <lueck () hube-lueck ! de>
Date:       2011-05-31 20:55:22
Message-ID: 20110531205522.F328AAC779 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1234364 by lueck:

port from branch r1234363: make EMailTemplate string translatable
CCBUG:272637

 M  +1 -1      Messages.sh  
 M  +12 -0     kgpg.h  
 M  +2 -15     kgpg.kcfg  


--- trunk/KDE/kdeutils/kgpg/Messages.sh #1234363:1234364
@@ -1,5 +1,5 @@
 #! /bin/sh
 $PREPARETIPS > tips.cpp
 $EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
-$XGETTEXT *.cpp core/*.cpp editor/*.cpp model/*.cpp transactions/*.cpp -o \
$podir/kgpg.pot +$XGETTEXT *.h *.cpp core/*.cpp editor/*.cpp model/*.cpp \
transactions/*.cpp -o $podir/kgpg.pot  rm -f tips.cpp
--- trunk/KDE/kdeutils/kgpg/kgpg.h #1234363:1234364
@@ -21,12 +21,24 @@
 #include <KUniqueApplication>
 #include <KShortcut>
 #include <KUrl>
+#include <klocale.h>
 
 class KCmdLineArgs;
 class KeysManager;
 class KGpgExternalActions;
 class QString;
 
+static const char * const EMailTemplateText=I18N_NOOP(
+    "Hi,\n\nplease find attached the user id '%UIDNAME%' of your key %KEYID% signed \
by me. " +    "This mail is encrypted with that key to make sure you control both the \
email address and the key.\n\n" +    "If you have multiple user ids, I sent the \
signature for each user id separately to that user id's associated email address. " + \
"You can import the signatures by running each through `gpg --import` after you have \
decrypted them with `gpg --decrypt`.\n\n" +    "If you are using KGpg store the \
attachment to disk and then import it. Just select `Import Key...` from `Keys` menu \
and open the file.\n\n" +    "Note that I did not upload your key to any keyservers. \
If you want this new signature to be available to others, please upload it yourself. \
" +    "With GnuPG this can be done using gpg --keyserver subkeys.pgp.net --send-key \
%KEYID%.\n\n"  +    "With KGpg you can right click on the key once you imported all \
user ids and choose `Export Public Key...`.\n\n" +    "If you have any questions, \
don't hesitate to ask.\n"); +
 class KGpgApp : public KUniqueApplication
 {
     Q_OBJECT
--- trunk/KDE/kdeutils/kgpg/kgpg.kcfg #1234363:1234364
@@ -5,6 +5,7 @@
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 
     <include>kglobalsettings.h</include>
+    <include>kgpg.h</include>
     <kcfgfile name="kgpgrc"/>
 
     <group name="Decryption">
@@ -250,21 +251,7 @@
 	<group name="Key Signing">
 		<entry name="EmailTemplate" type="String" key="Email_Template">
 			<label>This is the text of the email sent by the "Sign and Mail User ID" \
                action.</label>
-			<default>Hi,
-
-please find attached the user id "%UIDNAME%" of your key %KEYID% signed by me. This \
mail is encrypted with that key to make sure you control both the email address and \
                the key.
-
-If you have multiple user ids, I sent the signature for each user id separately to \
that user id's associated email address. You can import the signatures by running \
                each through `gpg --import` after you have decrypted them with `gpg \
                --decrypt`.
-
-If you are using KGpg store the attachment to disk and then import it. Just select \
                `Import Key...` from `Keys` menu and open the file.
-
-Note that I did not upload your key to any keyservers. If you want this new \
signature to be available to others, please upload it yourself. With GnuPG this can \
                be done using
-        gpg --keyserver subkeys.pgp.net --send-key %KEYID%
-
-With KGpg you can right click on the key once you imported all user ids and choose \
                `Export Public Key...`.
-
-If you have any questions, don't hesitate to ask.
-</default>
+			<default code="true">i18n(EMailTemplateText)</default>
 		</entry>
 		<entry name="MailUats" type="Enum" key="Mail_Uats">
 			<choices>


[prev in list] [next in list] [prev in thread] [next in thread]