merge default into my branch roker-linux
authorRoker <roker@pep-project.org>
Thu, 18 Aug 2016 17:01:19 +0200
branchroker-linux
changeset 103711e745d9a3d6
parent 1014 bcae7f935d40
parent 1036 a93dc4671ccb
child 1056 75047084d27d
merge default into my branch
     1.1 --- a/db/create_system_db.sql	Mon Aug 15 15:31:19 2016 +0200
     1.2 +++ b/db/create_system_db.sql	Thu Aug 18 17:01:19 2016 +0200
     1.3 @@ -42,6 +42,6 @@
     1.4  INSERT INTO i18n_token VALUES ('ca', 1000, 'Vull mostrar les trustwords en català');
     1.5  
     1.6  INSERT INTO i18n_language VALUES ('tr', 'Türkçe');
     1.7 -INSERT INTO i18n_token VALUES ('tr', 1000, 'Güvenlik kelimelerini Türk dilinde görüntülemek istiyorum');
     1.8 +INSERT INTO i18n_token VALUES ('tr', 1000, 'Güvenlik kelimelerini Türkçe görüntülemek istiyorum');
     1.9  -- add more languages here
    1.10  
     2.1 --- a/src/message_api.h	Mon Aug 15 15:31:19 2016 +0200
     2.2 +++ b/src/message_api.h	Thu Aug 18 17:01:19 2016 +0200
     2.3 @@ -47,10 +47,9 @@
     2.4          PEP_enc_format enc_format
     2.5      );
     2.6  
     2.7 -// encrypt_message_for_identity() - encrypt message for one particular identity in memory
     2.8 -//                     (to be used, for example, to save message drafts
     2.9 -//                      encrypted with owner ID)
    2.10 -//
    2.11 +// encrypt_message_for_self() - encrypt message in memory for user's identity only,
    2.12 +//                              ignoring recipients and other identities from
    2.13 +//                              the message
    2.14  //  parameters:
    2.15  //      session (in)        session handle
    2.16  //      target_id (in)      self identity this message should be encrypted for