Use a unique capitalization for "Note:".

--

20 files changed, 190 insertions, 114 deletions

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 0c163e124..af9150640 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -759,7 +759,7 @@ main (int argc, char **argv )
           if (default_config)
             {
               if( parse_debug )
-                log_info (_("NOTE: no default option file '%s'\n"),
+                log_info (_("Note: no default option file '%s'\n"),
                           configname );
               /* Save the default conf file name so that
                  reread_configuration is able to test whether the
@@ -881,7 +881,7 @@ main (int argc, char **argv )
 
       for (i=0; i < argc; i++)
         if (argv[i][0] == '-' && argv[i][1] == '-')
-          log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
 #ifdef ENABLE_NLS
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 8110df235..b6892bf06 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -807,7 +807,7 @@ main (int argc, char **argv)
           if (default_config)
             {
               if( parse_debug )
-                log_info (_("NOTE: no default option file '%s'\n"),
+                log_info (_("Note: no default option file '%s'\n"),
                           configname );
 	    }
           else
@@ -925,7 +925,7 @@ main (int argc, char **argv)
 
       for (i=0; i < argc; i++)
         if (argv[i][0] == '-' && argv[i][1] == '-')
-          log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
   if (!access ("/etc/"DIRMNGR_NAME, F_OK) && !strncmp (opt.homedir, "/etc/", 5))
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index 024708b4c..574eca656 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -164,7 +164,7 @@ check_cert_policy (ksba_cert_t cert)
 
   if (!any_critical)
     {
-      log_info (_("note: non-critical certificate policy not allowed"));
+      log_info (_("Note: non-critical certificate policy not allowed"));
       err = 0;
     }
   else
diff --git a/g10/card-util.c b/g10/card-util.c
index abf234f83..b5be80ac2 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1282,7 +1282,7 @@ show_keysize_warning (void)
     return;
   shown = 1;
   tty_printf
-    (_("NOTE: There is no guarantee that the card "
+    (_("Note: There is no guarantee that the card "
        "supports the requested size.\n"
        "      If the key generation does not succeed, "
        "please check the\n"
@@ -1392,7 +1392,7 @@ generate_card_keys (ctrl_t ctrl)
        || (info.fpr3valid && !fpr_is_zero (info.fpr3)))
     {
       tty_printf ("\n");
-      log_info (_("NOTE: keys are already stored on the card!\n"));
+      log_info (_("Note: keys are already stored on the card!\n"));
       tty_printf ("\n");
       if ( !cpr_get_answer_is_yes ("cardedit.genkeys.replace_keys",
                                    _("Replace existing keys? (y/N) ")))
diff --git a/g10/gpg.c b/g10/gpg.c
index e7d6d00a8..57deb8d60 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1976,7 +1976,7 @@ get_default_configname (void)
       /* Print a warning when both config files are present.  */
       char *p = make_filename (opt.homedir, "options", NULL);
       if (! access (p, R_OK))
-	log_info (_("NOTE: old default options file '%s' ignored\n"), p);
+	log_info (_("Note: old default options file '%s' ignored\n"), p);
       xfree (p);
     }
   else
@@ -2243,7 +2243,7 @@ main (int argc, char **argv)
 	if( !configfp ) {
 	    if( default_config ) {
 		if( parse_debug )
-		    log_info(_("NOTE: no default option file '%s'\n"),
+		    log_info(_("Note: no default option file '%s'\n"),
 							    configname );
 	    }
 	    else {
@@ -2509,7 +2509,7 @@ main (int argc, char **argv)
 #endif /*!NO_TRUST_MODELS*/
 
 	  case oForceOwnertrust:
-	    log_info(_("NOTE: %s is not for normal use!\n"),
+	    log_info(_("Note: %s is not for normal use!\n"),
 		     "--force-ownertrust");
 	    opt.force_ownertrust=string_to_trust_value(pargs.r.ret_str);
 	    if(opt.force_ownertrust==-1)
@@ -3235,7 +3235,7 @@ main (int argc, char **argv)
     }
 
     if (opt.no_literal) {
-	log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
+	log_info(_("Note: %s is not for normal use!\n"), "--no-literal");
 	if (opt.textmode)
 	    log_error(_("%s not allowed with %s!\n"),
 		       "--textmode", "--no-literal" );
@@ -3247,7 +3247,7 @@ main (int argc, char **argv)
 
 
     if (opt.set_filesize)
-	log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
+	log_info(_("Note: %s is not for normal use!\n"), "--set-filesize");
     if( opt.batch )
 	tty_batchmode( 1 );
 
@@ -3268,7 +3268,7 @@ main (int argc, char **argv)
 
         for (i=0; i < argc; i++)
           if (argv[i][0] == '-' && argv[i][1] == '-')
-            log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
+            log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
       }
 
 
@@ -3353,7 +3353,7 @@ main (int argc, char **argv)
       log_error(_("invalid min-cert-level; must be 1, 2, or 3\n"));
     switch( opt.s2k_mode ) {
       case 0:
-	log_info(_("NOTE: simple S2K mode (0) is strongly discouraged\n"));
+	log_info(_("Note: simple S2K mode (0) is strongly discouraged\n"));
 	break;
       case 1: case 3: break;
       default:
diff --git a/g10/keygen.c b/g10/keygen.c
index 1c8d70e98..6079ff0b7 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4263,7 +4263,7 @@ generate_subkeypair (ctrl_t ctrl, kbnode_t keyblock)
 
   if (pri_psk->version < 4)
     {
-      log_info (_("NOTE: creating subkeys for v3 keys "
+      log_info (_("Note: creating subkeys for v3 keys "
                   "is not OpenPGP compliant\n"));
       err = gpg_error (GPG_ERR_CONFLICT);
       goto leave;
@@ -4386,7 +4386,7 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
 
   if (pri_pk->version < 4)
     {
-      log_info (_("NOTE: creating subkeys for v3 keys "
+      log_info (_("Note: creating subkeys for v3 keys "
                   "is not OpenPGP compliant\n"));
       err = gpg_error (GPG_ERR_NOT_SUPPORTED);
       goto leave;
@@ -4657,7 +4657,7 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
 
         iobuf_close (fp);
         iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0, (char*)fname);
-        log_info (_("NOTE: backup of card key saved to '%s'\n"), fname);
+        log_info (_("Note: backup of card key saved to '%s'\n"), fname);
 
         fingerprint_from_sk (sk, array, &n);
         p = fprbuf = xmalloc (MAX_FINGERPRINT_LEN*2 + 1 + 1);
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 7c699b39d..50d1d2713 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -623,7 +623,7 @@ proc_plaintext( CTX c, PACKET *pkt )
     literals_seen++;
 
     if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) )
-	log_info(_("NOTE: sender requested \"for-your-eyes-only\"\n"));
+	log_info(_("Note: sender requested \"for-your-eyes-only\"\n"));
     else if( opt.verbose )
 	log_info(_("original file name='%.*s'\n"), pt->namelen, pt->name);
     free_md_filter_context( &c->mfx );
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index 60f761130..e79199e18 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -375,14 +375,14 @@ get_it (PKT_pubkey_enc *enc, DEK *dek, PKT_public_key *sk, u32 *keyid)
           BUG ();
         if (pk->expiredate && pk->expiredate <= make_timestamp ())
           {
-            log_info (_("NOTE: secret key %s expired at %s\n"),
+            log_info (_("Note: secret key %s expired at %s\n"),
                       keystr (keyid), asctimestamp (pk->expiredate));
           }
       }
 
     if (pk && pk->flags.revoked)
       {
-        log_info (_("NOTE: key has been revoked"));
+        log_info (_("Note: key has been revoked"));
         log_printf ("\n");
         show_revocation_reason (pk, 1);
       }
diff --git a/g10/revoke.c b/g10/revoke.c
index 019c62c0a..81b5d6de5 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -113,7 +113,7 @@ export_minimal_pk(IOBUF out,KBNODE keyblock,
       rc=build_packet(out,&pkt);
       if(rc)
 	{
-	  log_error(_("build_packet failed: %s\n"), g10_errstr(rc) );
+	  log_error("build_packet failed: %s\n", g10_errstr(rc) );
 	  return rc;
 	}
     }
diff --git a/g10/sig-check.c b/g10/sig-check.c
index ad2ab5c39..f56386213 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -235,7 +235,7 @@ do_check_messages( PKT_public_key *pk, PKT_signature *sig,
     if( pk->has_expired || (pk->expiredate && pk->expiredate < cur_time)) {
         char buf[11];
         if (opt.verbose)
-	  log_info(_("NOTE: signature key %s expired %s\n"),
+	  log_info(_("Note: signature key %s expired %s\n"),
 		   keystr_from_pk(pk), asctimestamp( pk->expiredate ) );
 	sprintf(buf,"%lu",(ulong)pk->expiredate);
 	write_status_text(STATUS_KEYEXPIRED,buf);
@@ -246,7 +246,7 @@ do_check_messages( PKT_public_key *pk, PKT_signature *sig,
     if (pk->flags.revoked)
       {
         if (opt.verbose)
-	  log_info (_("NOTE: signature key %s has been revoked\n"),
+	  log_info (_("Note: signature key %s has been revoked\n"),
                     keystr_from_pk(pk));
         if (r_revoked)
           *r_revoked=1;
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 2b9d4ff55..aff565cf6 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -647,7 +647,7 @@ open_db()
       /* Take care of read-only trustdbs.  */
       db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
       if (db_fd != -1 && !opt.quiet)
-          log_info (_("NOTE: trustdb not writable\n"));
+          log_info (_("Note: trustdb not writable\n"));
   }
   if ( db_fd == -1 )
     log_fatal( _("can't open '%s': %s\n"), db_name, strerror(errno) );
diff --git a/po/de.po b/po/de.po
index 7c4dab72d..fa56dd58c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"PO-Revision-Date: 2014-10-10 14:57+0200\n"
+"PO-Revision-Date: 2014-10-10 15:27+0200\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
@@ -378,7 +378,7 @@ msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
 #, c-format
-msgid "NOTE: no default option file '%s'\n"
+msgid "Note: no default option file '%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
 #, c-format
@@ -390,7 +390,7 @@ msgid "reading options from '%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
 #, c-format
-msgid "NOTE: '%s' is not considered an option\n"
+msgid "Note: '%s' is not considered an option\n"
 msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
 
 msgid "name of socket too long\n"
@@ -1259,7 +1259,7 @@ msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
 msgid ""
-"NOTE: There is no guarantee that the card supports the requested size.\n"
+"Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
@@ -1305,8 +1305,8 @@ msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-msgid "NOTE: keys are already stored on the card!\n"
-msgstr "ACHTUNG: Auf der Karte sind bereits Schlüssel gespeichert!\n"
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
 
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
@@ -1524,7 +1524,8 @@ msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "WARNUNG: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
+msgstr ""
+"WARNUNG: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
@@ -1943,7 +1944,7 @@ msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
 #, c-format
-msgid "NOTE: old default options file '%s' ignored\n"
+msgid "Note: old default options file '%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
 #, c-format
@@ -1953,7 +1954,7 @@ msgstr ""
 "%s)\n"
 
 #, c-format
-msgid "NOTE: %s is not for normal use!\n"
+msgid "Note: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
 #, c-format
@@ -2061,7 +2062,7 @@ msgstr "WARNUNG: %s ersetzt %s\n"
 
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
+msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
 
 #, c-format
 msgid "%s makes no sense with %s!\n"
@@ -2101,7 +2102,7 @@ msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
@@ -3928,7 +3929,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Hinweis: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
 
 msgid "Secret parts of primary key are not available.\n"
@@ -3949,7 +3950,7 @@ msgid "can't create backup file '%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
 #, c-format
-msgid "NOTE: backup of card key saved to '%s'\n"
+msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
 
 msgid "never     "
@@ -4181,7 +4182,7 @@ msgstr "Passphrase aus dem Cache gelöscht.  Cache ID: %s\n"
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
@@ -4834,10 +4835,10 @@ msgstr ""
 "Empfängereinstellungen gefunden\n"
 
 #, c-format
-msgid "NOTE: secret key %s expired at %s\n"
+msgid "Note: secret key %s expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %s verfällt am %s\n"
 
-msgid "NOTE: key has been revoked"
+msgid "Note: key has been revoked"
 msgstr "Hinweis: Schlüssel wurde widerrufen"
 
 #, c-format
@@ -5004,11 +5005,11 @@ msgstr ""
 "Uhrenproblem)\n"
 
 #, c-format
-msgid "NOTE: signature key %s expired %s\n"
+msgid "Note: signature key %s expired %s\n"
 msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
 
 #, c-format
-msgid "NOTE: signature key %s has been revoked\n"
+msgid "Note: signature key %s has been revoked\n"
 msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
 
 #, c-format
@@ -5168,7 +5169,7 @@ msgstr "%s: ungültige trust-db erzeugt\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-msgid "NOTE: trustdb not writable\n"
+msgid "Note: trustdb not writable\n"
 msgstr "Hinweis: Die \"trustdb\" ist nicht schreibbar\n"
 
 #, c-format
@@ -5684,7 +5685,7 @@ msgstr "entscheidende Richtlinie ohne konfigurierte Richtlinien"
 msgid "failed to open '%s': %s\n"
 msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
 
-msgid "note: non-critical certificate policy not allowed"
+msgid "Note: non-critical certificate policy not allowed"
 msgstr "Hinweis: Die unkritische Zertifikatsrichtlinie ist nicht erlaubt"
 
 msgid "certificate policy not allowed"
@@ -6217,7 +6218,7 @@ msgstr ""
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
 
 #, c-format
-msgid "NOTE: won't be able to encrypt to '%s': %s\n"
+msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
 
 #, c-format
@@ -8355,15 +8356,15 @@ msgstr ""
 #~ msgid "key %s: secret key not found: %s\n"
 #~ msgstr "Schlüssel %s: geheimer Schlüssel nicht gefunden: %s\n"
 
-#~ msgid "NOTE: a key's S/N does not match the card's one\n"
+#~ msgid "Note: a key's S/N does not match the card's one\n"
 #~ msgstr ""
 #~ "Hinweis: Eine Schlüsselseriennr stimmt nicht mit derjenigen der Karte "
 #~ "überein\n"
 
-#~ msgid "NOTE: primary key is online and stored on card\n"
+#~ msgid "Note: primary key is online and stored on card\n"
 #~ msgstr "Hinweis: Hauptschlüssel ist online und auf der Karte gespeichert\n"
 
-#~ msgid "NOTE: secondary key is online and stored on card\n"
+#~ msgid "Note: secondary key is online and stored on card\n"
 #~ msgstr "Hinweis: Zweitschlüssel ist online und auf der Karte gespeichert\n"
 
 #~ msgid "Key is protected.\n"
@@ -8411,7 +8412,7 @@ msgstr ""
 #~ msgid "unknown protection algorithm\n"
 #~ msgstr "Unbekanntes Schutzverfahren\n"
 
-#~ msgid "NOTE: This key is not protected!\n"
+#~ msgid "Note: This key is not protected!\n"
 #~ msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
 #~ msgid "Invalid passphrase; please try again"
diff --git a/po/fr.po b/po/fr.po
index 2ba5e4625..aad9a1f39 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -398,7 +398,7 @@ msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
 
 #, c-format
-msgid "NOTE: no default option file '%s'\n"
+msgid "Note: no default option file '%s'\n"
 msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
 
 #, c-format
@@ -410,7 +410,7 @@ msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
 #, c-format
-msgid "NOTE: '%s' is not considered an option\n"
+msgid "Note: '%s' is not considered an option\n"
 msgstr "Remarque : « %s » n'est pas considéré comme une option\n"
 
 msgid "name of socket too long\n"
@@ -1282,7 +1282,7 @@ msgid "Replace existing key? (y/N) "
 msgstr "Faut-il remplacer la clef existante ? (o/N) "
 
 msgid ""
-"NOTE: There is no guarantee that the card supports the requested size.\n"
+"Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
@@ -1324,7 +1324,7 @@ msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Faut-il faire une sauvegarde hors carte de la clef de chiffrement ? (O/n) "
 
-msgid "NOTE: keys are already stored on the card!\n"
+msgid "Note: keys are already stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
 msgid "Replace existing keys? (y/N) "
@@ -1996,7 +1996,7 @@ msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
 #, c-format
-msgid "NOTE: old default options file '%s' ignored\n"
+msgid "Note: old default options file '%s' ignored\n"
 msgstr "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
 
 #, c-format
@@ -2004,7 +2004,7 @@ msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt est trop ancienne (nécessaire : %s, utilisé : %s)\n"
 
 #, c-format
-msgid "NOTE: %s is not for normal use!\n"
+msgid "Note: %s is not for normal use!\n"
 msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
 
 #, c-format
@@ -2154,7 +2154,7 @@ msgstr "« default-cert-level » incorrect ; doit être 0, 1, 2 ou 3\n"
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
 
-msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
 
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
@@ -3999,7 +3999,7 @@ msgstr ""
 "la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Remarque : la création de sous-clefs pour des clefs v3 n'est pas compatible\n"
 "           avec OpenPGP\n"
@@ -4023,7 +4023,7 @@ msgid "can't create backup file '%s': %s\n"
 msgstr "impossible de créer le fichier de sauvegarde « %s » : %s\n"
 
 #, c-format
-msgid "NOTE: backup of card key saved to '%s'\n"
+msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
 
 msgid "never     "
@@ -4044,6 +4044,10 @@ msgstr "Notation de signature critique : "
 msgid "Signature notation: "
 msgstr "Notation de signature : "
 
+#, c-format
+msgid "Warning: %lu key(s) skipped due to their large size\n"
+msgstr ""
+
 msgid "Keyring"
 msgstr "Porte-clefs"
 
@@ -4255,7 +4259,7 @@ msgstr "phrase de passe effacée mise en cache avec l'identifiant : %s\n"
 msgid "decryption failed: %s\n"
 msgstr "échec du déchiffrement : %s\n"
 
-msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Remarque : l'expéditeur a demandé « à votre seule attention »\n"
 
 #, c-format
@@ -4934,10 +4938,10 @@ msgstr ""
 "            dans les préférences du destinataire\n"
 
 #, c-format
-msgid "NOTE: secret key %s expired at %s\n"
+msgid "Note: secret key %s expired at %s\n"
 msgstr "Remarque : la clef secrète %s a expiré le %s\n"
 
-msgid "NOTE: key has been revoked"
+msgid "Note: key has been revoked"
 msgstr "Remarque : la clef a été révoquée"
 
 #, c-format
@@ -5101,11 +5105,11 @@ msgstr ""
 "(faille temporelle ou problème d'horloge)\n"
 
 #, c-format
-msgid "NOTE: signature key %s expired %s\n"
+msgid "Note: signature key %s expired %s\n"
 msgstr "Remarque : la clef de signature %s a expiré le %s\n"
 
 #, c-format
-msgid "NOTE: signature key %s has been revoked\n"
+msgid "Note: signature key %s has been revoked\n"
 msgstr "Remarque : la clef de signature %s a été révoquée\n"
 
 #, c-format
@@ -5266,7 +5270,7 @@ msgstr "%s : base de confiance incorrecte créée\n"
 msgid "%s: trustdb created\n"
 msgstr "%s : base de confiance créée\n"
 
-msgid "NOTE: trustdb not writable\n"
+msgid "Note: trustdb not writable\n"
 msgstr "Remarque : la base de confiance n'est pas accessible en écriture\n"
 
 #, c-format
@@ -5816,7 +5820,9 @@ msgstr "politique de signature marquée critique sans politiques configurées"
 msgid "failed to open '%s': %s\n"
 msgstr "échec d'ouverture de « %s » : %s\n"
 
-msgid "note: non-critical certificate policy not allowed"
+#, fuzzy
+#| msgid "note: non-critical certificate policy not allowed"
+msgid "Note: non-critical certificate policy not allowed"
 msgstr "remarque : politique de certificat non critique non autorisée"
 
 msgid "certificate policy not allowed"
@@ -6357,7 +6363,7 @@ msgstr ""
 "L'opération par défaut dépend des données entrées\n"
 
 #, c-format
-msgid "NOTE: won't be able to encrypt to '%s': %s\n"
+msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Remarque : ne sera pas capable de chiffrer à « %s » : %s\n"
 
 #, c-format
@@ -8204,6 +8210,27 @@ msgstr ""
 "Vérifier une phrase de passe donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
+#, fuzzy
+#~| msgid "Note: no default option file '%s'\n"
+#~ msgid "NOTE: no default option file '%s'\n"
+#~ msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
+
+#, fuzzy
+#~| msgid "Note: %s is not for normal use!\n"
+#~ msgid "NOTE: %s is not for normal use!\n"
+#~ msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
+
+#, fuzzy
+#~| msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#~ msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#~ msgstr ""
+#~ "Remarque : la création de sous-clefs pour des clefs v3 n'est pas "
+#~ "compatible\n"
+#~ "           avec OpenPGP\n"
+
+#~ msgid "note: non-critical certificate policy not allowed"
+#~ msgstr "remarque : politique de certificat non critique non autorisée"
+
 #~ msgid "use a standard location for the socket"
 #~ msgstr "utiliser un emplacement de socket standard"
 
@@ -8444,16 +8471,16 @@ msgstr ""
 #~ msgid "key %s: secret key not found: %s\n"
 #~ msgstr "clef %s : clef secrète introuvable : %s\n"
 
-#~ msgid "NOTE: a key's S/N does not match the card's one\n"
+#~ msgid "Note: a key's S/N does not match the card's one\n"
 #~ msgstr ""
 #~ "Remarque : le numéro de série d'une clef ne correspond pas à celui de la "
 #~ "carte\n"
 
-#~ msgid "NOTE: primary key is online and stored on card\n"
+#~ msgid "Note: primary key is online and stored on card\n"
 #~ msgstr ""
 #~ "Remarque : la clef principale est en ligne et stockée sur la carte\n"
 
-#~ msgid "NOTE: secondary key is online and stored on card\n"
+#~ msgid "Note: secondary key is online and stored on card\n"
 #~ msgstr ""
 #~ "Remarque : la clef secondaire est en ligne et stockée sur la carte\n"
 
@@ -8580,7 +8607,7 @@ msgstr ""
 #~ msgid "unknown protection algorithm\n"
 #~ msgstr "algorithme de protection inconnu\n"
 
-#~ msgid "NOTE: This key is not protected!\n"
+#~ msgid "Note: This key is not protected!\n"
 #~ msgstr "Remarque : cette clef n'est pas protégée.\n"
 
 #~ msgid "protection digest %d is not supported\n"
@@ -9030,7 +9057,7 @@ msgstr ""
 #~ msgid "         algorithms on these user IDs:\n"
 #~ msgstr "            algorithmes indisponibles pour ces identités :\n"
 
-#~ msgid "NOTE: This feature is not available in %s\n"
+#~ msgid "Note: This feature is not available in %s\n"
 #~ msgstr "Remarque : cette fonctionnalité n'est pas disponible dans %s\n"
 
 #~ msgid "Repeat passphrase\n"
diff --git a/po/ja.po b/po/ja.po
index 365365ae9..975c2ec52 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -381,7 +381,7 @@ msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
 
 #, c-format
-msgid "NOTE: no default option file '%s'\n"
+msgid "Note: no default option file '%s'\n"
 msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
 
 #, c-format
@@ -393,7 +393,7 @@ msgid "reading options from '%s'\n"
 msgstr "'%s' からオプションを読み込みます\n"
 
 #, c-format
-msgid "NOTE: '%s' is not considered an option\n"
+msgid "Note: '%s' is not considered an option\n"
 msgstr "*注意*: '%s'はオプションとは考えられません\n"
 
 msgid "name of socket too long\n"
@@ -1249,7 +1249,7 @@ msgid "Replace existing key? (y/N) "
 msgstr "既存の鍵を交換しますか? (y/N) "
 
 msgid ""
-"NOTE: There is no guarantee that the card supports the requested size.\n"
+"Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
@@ -1288,7 +1288,7 @@ msgstr "鍵%dの長さを%u bit に変更する際にエラー: %s\n"
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "暗号鍵のカード外バックアップを作成しますか? (Y/n) "
 
-msgid "NOTE: keys are already stored on the card!\n"
+msgid "Note: keys are already stored on the card!\n"
 msgstr "*注意*: 秘密鍵はもうカードに保管してあります!\n"
 
 msgid "Replace existing keys? (y/N) "
@@ -1908,7 +1908,7 @@ msgid "show expiration dates during signature listings"
 msgstr "署名の一覧に有効期限の日付を表示する"
 
 #, c-format
-msgid "NOTE: old default options file '%s' ignored\n"
+msgid "Note: old default options file '%s' ignored\n"
 msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
 
 #, c-format
@@ -1916,7 +1916,7 @@ msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt は古すぎます (必要 %s, 現在 %s)\n"
 
 #, c-format
-msgid "NOTE: %s is not for normal use!\n"
+msgid "Note: %s is not for normal use!\n"
 msgstr "*注意*: 普通%sは使いません!\n"
 
 #, c-format
@@ -2062,7 +2062,7 @@ msgstr "無効なdefault-cert-level。0か1か2か3でなければなりませ�
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
 
-msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
 
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
@@ -3838,7 +3838,7 @@ msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
 
-msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
 
 msgid "Secret parts of primary key are not available.\n"
@@ -3859,7 +3859,7 @@ msgid "can't create backup file '%s': %s\n"
 msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
 
 #, c-format
-msgid "NOTE: backup of card key saved to '%s'\n"
+msgid "Note: backup of card key saved to '%s'\n"
 msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
 
 msgid "never     "
@@ -3880,6 +3880,10 @@ msgstr "クリティカルな署名注釈: "
 msgid "Signature notation: "
 msgstr "署名注釈: "
 
+#, c-format
+msgid "Warning: %lu key(s) skipped due to their large size\n"
+msgstr ""
+
 msgid "Keyring"
 msgstr "鍵リング"
 
@@ -4080,7 +4084,7 @@ msgstr "保持したパスフレーズをクリアしました ID: %s\n"
 msgid "decryption failed: %s\n"
 msgstr "復号に失敗しました: %s\n"
 
-msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "*注意*: 送信者は\"極秘とする\"ように求めています\n"
 
 #, c-format
@@ -4693,10 +4697,10 @@ msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "*警告*: 暗号アルゴリズム%sは受取人の優先指定に入っていません\n"
 
 #, c-format
-msgid "NOTE: secret key %s expired at %s\n"
+msgid "Note: secret key %s expired at %s\n"
 msgstr "*注意*: 秘密鍵%sは%sで期限切れとなります\n"
 
-msgid "NOTE: key has been revoked"
+msgid "Note: key has been revoked"
 msgstr "*注意*: 鍵は失効済みです"
 
 #, c-format
@@ -4852,11 +4856,11 @@ msgid ""
 msgstr "鍵%sは%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
 
 #, c-format
-msgid "NOTE: signature key %s expired %s\n"
+msgid "Note: signature key %s expired %s\n"
 msgstr "*注意*: 署名鍵%sは%sに期限切れとなります\n"
 
 #, c-format
-msgid "NOTE: signature key %s has been revoked\n"
+msgid "Note: signature key %s has been revoked\n"
 msgstr "*注意*: 鍵 %s は失効済みです\n"
 
 #, c-format
@@ -5002,7 +5006,7 @@ msgstr "%s: 無効な信用データベースを作成\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: 信用データベースができました\n"
 
-msgid "NOTE: trustdb not writable\n"
+msgid "Note: trustdb not writable\n"
 msgstr "*注意*: 信用データベースが、書き込み不能です\n"
 
 #, c-format
@@ -5497,7 +5501,9 @@ msgstr "コンフィグされたポリシなしにクリティカルにマーク
 msgid "failed to open '%s': %s\n"
 msgstr "'%s'が開けません: %s\n"
 
-msgid "note: non-critical certificate policy not allowed"
+#, fuzzy
+#| msgid "note: non-critical certificate policy not allowed"
+msgid "Note: non-critical certificate policy not allowed"
 msgstr "注意: クリティカルでない証明書ポリシは認められません"
 
 msgid "certificate policy not allowed"
@@ -6017,7 +6023,7 @@ msgstr ""
 "デフォルトの操作は、入力データに依存します\n"
 
 #, c-format
-msgid "NOTE: won't be able to encrypt to '%s': %s\n"
+msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "*注意*:'%s'に対して暗号化できません: %s\n"
 
 #, c-format
@@ -7763,6 +7769,24 @@ msgstr ""
 "形式: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
+#, fuzzy
+#~| msgid "Note: no default option file '%s'\n"
+#~ msgid "NOTE: no default option file '%s'\n"
+#~ msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
+
+#, fuzzy
+#~| msgid "Note: %s is not for normal use!\n"
+#~ msgid "NOTE: %s is not for normal use!\n"
+#~ msgstr "*注意*: 普通%sは使いません!\n"
+
+#, fuzzy
+#~| msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#~ msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#~ msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
+
+#~ msgid "note: non-critical certificate policy not allowed"
+#~ msgstr "注意: クリティカルでない証明書ポリシは認められません"
+
 #~ msgid "use a standard location for the socket"
 #~ msgstr "ソケットに標準の場所を使う"
 
diff --git a/po/uk.po b/po/uk.po
index 785fae5d5..f5f3d91af 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -391,7 +391,7 @@ msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
 
 #, c-format
-msgid "NOTE: no default option file '%s'\n"
+msgid "Note: no default option file '%s'\n"
 msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
 
 #, c-format
@@ -403,7 +403,7 @@ msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
 #, c-format
-msgid "NOTE: '%s' is not considered an option\n"
+msgid "Note: '%s' is not considered an option\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
 msgid "name of socket too long\n"
@@ -1275,7 +1275,7 @@ msgid "Replace existing key? (y/N) "
 msgstr "Замінити вже створений ключ? (y/N або т/Н) "
 
 msgid ""
-"NOTE: There is no guarantee that the card supports the requested size.\n"
+"Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
@@ -1316,7 +1316,7 @@ msgstr "помилка під час спроби зміни розміру кл
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Створити резервну копію ключа шифрування поза карткою? (Y/n або Т/н) "
 
-msgid "NOTE: keys are already stored on the card!\n"
+msgid "Note: keys are already stored on the card!\n"
 msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
 
 msgid "Replace existing keys? (y/N) "
@@ -1966,7 +1966,7 @@ msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершення строків дії у списку підписів"
 
 #, c-format
-msgid "NOTE: old default options file '%s' ignored\n"
+msgid "Note: old default options file '%s' ignored\n"
 msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
 
 #, c-format
@@ -1974,7 +1974,7 @@ msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt занадто стара (потрібна — %s, маємо %s)\n"
 
 #, c-format
-msgid "NOTE: %s is not for normal use!\n"
+msgid "Note: %s is not for normal use!\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
 #, c-format
@@ -2126,7 +2126,7 @@ msgstr "некоректне значення default-cert-level; має бут�
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
 
-msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
 "S2K (0)\n"
@@ -3960,7 +3960,7 @@ msgstr ""
 "ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
 "або проблема з годинником)\n"
 
-msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
 
 msgid "Secret parts of primary key are not available.\n"
@@ -3981,7 +3981,7 @@ msgid "can't create backup file '%s': %s\n"
 msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
 
 #, c-format
-msgid "NOTE: backup of card key saved to '%s'\n"
+msgid "Note: backup of card key saved to '%s'\n"
 msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
 
 msgid "never     "
@@ -4002,6 +4002,10 @@ msgstr "Критична примітка підпису: "
 msgid "Signature notation: "
 msgstr "Примітка підпису: "
 
+#, c-format
+msgid "Warning: %lu key(s) skipped due to their large size\n"
+msgstr ""
+
 msgid "Keyring"
 msgstr "Сховище ключів"
 
@@ -4210,7 +4214,7 @@ msgstr "текстовий пароль кешовано з ідентифіка
 msgid "decryption failed: %s\n"
 msgstr "невдала спроба розшифрування: %s\n"
 
-msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАУВАЖЕННЯ: вимога відправника: «лише для Вас»\n"
 
 #, c-format
@@ -4840,10 +4844,10 @@ msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "УВАГА: не виявлено алгоритму шифрування %s у перевагах отримувача\n"
 
 #, c-format
-msgid "NOTE: secret key %s expired at %s\n"
+msgid "Note: secret key %s expired at %s\n"
 msgstr "ЗАУВАЖЕННЯ: строк дії закритого ключа %s завершився %s\n"
 
-msgid "NOTE: key has been revoked"
+msgid "Note: key has been revoked"
 msgstr "ЗАУВАЖЕННЯ: ключ було відкликано"
 
 #, c-format
@@ -5003,11 +5007,11 @@ msgstr ""
 "або проблема з годинником)\n"
 
 #, c-format
-msgid "NOTE: signature key %s expired %s\n"
+msgid "Note: signature key %s expired %s\n"
 msgstr "ЗАУВАЖЕННЯ: строк дії ключа підпису %s завершився %s\n"
 
 #, c-format
-msgid "NOTE: signature key %s has been revoked\n"
+msgid "Note: signature key %s has been revoked\n"
 msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відкликано\n"
 
 #, c-format
@@ -5162,7 +5166,7 @@ msgstr "%s: створено некоректну trustdb\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: створено trustdb\n"
 
-msgid "NOTE: trustdb not writable\n"
+msgid "Note: trustdb not writable\n"
 msgstr "ЗАУВАЖЕННЯ: запис до trustdb заборонено\n"
 
 #, c-format
@@ -5679,7 +5683,9 @@ msgstr "правила, позначені як критичні, без нал�
 msgid "failed to open '%s': %s\n"
 msgstr "не вдалося відкрити «%s»: %s\n"
 
-msgid "note: non-critical certificate policy not allowed"
+#, fuzzy
+#| msgid "note: non-critical certificate policy not allowed"
+msgid "Note: non-critical certificate policy not allowed"
 msgstr "зауваження: заборонено некритичні правила сертифікації"
 
 msgid "certificate policy not allowed"
@@ -6208,7 +6214,7 @@ msgstr ""
 "Типова дія залежатиме від вхідних даних\n"
 
 #, c-format
-msgid "NOTE: won't be able to encrypt to '%s': %s\n"
+msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "ЗАУВАЖЕННЯ: не вдасться зашифрувати до «%s»: %s\n"
 
 #, c-format
@@ -7978,6 +7984,24 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
+#, fuzzy
+#~| msgid "Note: no default option file '%s'\n"
+#~ msgid "NOTE: no default option file '%s'\n"
+#~ msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
+
+#, fuzzy
+#~| msgid "Note: %s is not for normal use!\n"
+#~ msgid "NOTE: %s is not for normal use!\n"
+#~ msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
+
+#, fuzzy
+#~| msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#~ msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#~ msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
+
+#~ msgid "note: non-critical certificate policy not allowed"
+#~ msgstr "зауваження: заборонено некритичні правила сертифікації"
+
 #~ msgid "use a standard location for the socket"
 #~ msgstr "використовувати для сокета стандартне розташування"
 
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index be99b001a..9c55297c4 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -500,7 +500,7 @@ main (int argc, char **argv )
           if (default_config)
             {
               if( parse_debug )
-                log_info (_("NOTE: no default option file '%s'\n"),
+                log_info (_("Note: no default option file '%s'\n"),
                           configname );
 	    }
           else
@@ -627,7 +627,7 @@ main (int argc, char **argv )
 
       for (i=0; i < argc; i++)
         if (argv[i][0] == '-' && argv[i][1] == '-')
-          log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
   if (atexit (cleanup))
diff --git a/sm/certchain.c b/sm/certchain.c
index 5f5fd80a5..5e632f798 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -350,7 +350,7 @@ check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist)
         {
           if (!opt.quiet)
             do_list (0, listmode, fplist,
-                     _("note: non-critical certificate policy not allowed"));
+                     _("Note: non-critical certificate policy not allowed"));
           return 0;
         }
       do_list (1, listmode, fplist,
@@ -379,7 +379,7 @@ check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist)
                   if (!any_critical)
                     {
                       do_list (0, listmode, fplist,
-                     _("note: non-critical certificate policy not allowed"));
+                     _("Note: non-critical certificate policy not allowed"));
                       return 0;
                     }
                   do_list (1, listmode, fplist,
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 2faf203dd..cc8039c30 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -756,7 +756,7 @@ do_add_recipient (ctrl_t ctrl, const char *name,
                          get_inv_recpsgnr_code (rc), name, NULL);
         }
       else
-        log_info (_("NOTE: won't be able to encrypt to '%s': %s\n"),
+        log_info (_("Note: won't be able to encrypt to '%s': %s\n"),
                   name, gpg_strerror (rc));
     }
 }
@@ -1028,7 +1028,7 @@ main ( int argc, char **argv)
         if (default_config)
           {
             if (parse_debug)
-              log_info (_("NOTE: no default option file '%s'\n"), configname);
+              log_info (_("Note: no default option file '%s'\n"), configname);
           }
         else
           {
@@ -1496,7 +1496,7 @@ main ( int argc, char **argv)
 
       for (i=0; i < argc; i++)
         if (argv[i][0] == '-' && argv[i][1] == '-')
-          log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
 /*FIXME    if (opt.batch) */
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 07c3391d3..78dea2a4b 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1219,7 +1219,7 @@ main (int argc, char **argv)
 
       for (i=0; i < argc; i++)
         if (argv[i][0] == '-' && argv[i][1] == '-')
-          log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
 
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index f63c05ed1..31804f50e 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -205,7 +205,7 @@ main (int argc, char **argv)
 
       for (i=0; i < argc; i++)
         if (argv[i][0] == '-' && argv[i][1] == '-')
-          log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
   fname = argc ? *argv : NULL;