From e8a1a082555f98af40f98fd3a20ccd803ad478f8 Mon Sep 17 00:00:00 2001 From: Nils Gillmann Date: Tue, 13 Nov 2018 11:41:15 +0000 Subject: Partial application of diff send in beberking, Issue #5476 Signed-off-by: Nils Gillmann --- po/de.po | 2 +- po/sv.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- src/cadet/gnunet-service-cadet_paths.c | 6 +++--- src/cadet/gnunet-service-cadet_tunnels.c | 2 +- src/dht/gnunet-dht-get.c | 2 +- src/dht/gnunet-service-dht_clients.c | 2 +- src/fs/gnunet-service-fs.c | 2 +- src/include/gnunet_consensus_service.h | 2 +- src/include/gnunet_testbed_service.h | 4 ++-- src/my/my.c | 2 +- src/namestore/gnunet-zoneimport.c | 2 +- src/namestore/namestore_api.c | 2 +- src/testbed/testbed.h | 2 +- src/testbed/testbed_api_hosts.c | 2 +- src/transport/gnunet-transport.c | 2 +- src/util/configuration.c | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index eb6b2a4d3..d036280f7 100644 --- a/po/de.po +++ b/po/de.po @@ -7501,7 +7501,7 @@ msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" #: src/transport/gnunet-transport.c:492 #, fuzzy -msgid "Failed to list connections, timeout occured\n" +msgid "Failed to list connections, timeout occurred\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" #: src/transport/gnunet-transport.c:525 diff --git a/po/sv.po b/po/sv.po index 323f2de49..388ff2f82 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7575,7 +7575,7 @@ msgstr "Misslyckades att binda till UDP-port %d.\n" #: src/transport/gnunet-transport.c:492 #, fuzzy -msgid "Failed to list connections, timeout occured\n" +msgid "Failed to list connections, timeout occurred\n" msgstr "Misslyckades att ansluta till gnunetd.\n" #: src/transport/gnunet-transport.c:525 diff --git a/po/vi.po b/po/vi.po index 2f05f3daf..85131f055 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7638,7 +7638,7 @@ msgstr "Lỗi đóng kết đến cổng %s %d.\n" #: src/transport/gnunet-transport.c:492 #, fuzzy -msgid "Failed to list connections, timeout occured\n" +msgid "Failed to list connections, timeout occurred\n" msgstr "Không kết nối được đến trình nền gnunetd." #: src/transport/gnunet-transport.c:525 diff --git a/po/zh_CN.po b/po/zh_CN.po index cd3a10b4e..d881d0591 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7353,7 +7353,7 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n" #: src/transport/gnunet-transport.c:492 #, fuzzy -msgid "Failed to list connections, timeout occured\n" +msgid "Failed to list connections, timeout occurred\n" msgstr "初始化“%s”服务失败。\n" #: src/transport/gnunet-transport.c:525 diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c index 40f464e9b..7769a6043 100644 --- a/src/cadet/gnunet-service-cadet_paths.c +++ b/src/cadet/gnunet-service-cadet_paths.c @@ -354,7 +354,7 @@ check_match (void *cls, (off + 1 != cm_ctx->cpath_length) ) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "check_match missmatch because path %s is too long (%u vs. %u vs. %u)\n", + "check_match mismatch because path %s is too long (%u vs. %u vs. %u)\n", GCPP_2s (path), path->entries_length, off + 1, @@ -367,10 +367,10 @@ check_match (void *cls, i)) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "check_match path %s missmatches at offset %u\n", + "check_match path %s mismatches at offset %u\n", GCPP_2s (path), i); - return GNUNET_YES; /* missmatch, ignore */ + return GNUNET_YES; /* mismatch, ignore */ } LOG (GNUNET_ERROR_TYPE_DEBUG, "check_match found match with path %s\n", diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 1e7a8e086..874c7e706 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -1983,7 +1983,7 @@ GCT_handle_kx_auth (struct CadetTConnection *ct, 1, GNUNET_NO); LOG (GNUNET_ERROR_TYPE_WARNING, - "KX AUTH missmatch!\n"); + "KX AUTH mismatch!\n"); #if DEBUG_KX { struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key; diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index 3742ed739..2d9d76585 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -214,7 +214,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key); if (verbose) FPRINTF (stderr, "%s `%s' \n", - _("Issueing DHT GET with key"), + _("Issuing DHT GET with key"), GNUNET_h2s_full (&key)); GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL); tt = GNUNET_SCHEDULER_add_delayed (timeout_request, diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index 862654c83..332bc1eda 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c @@ -1018,7 +1018,7 @@ forward_reply (void *cls, (record->type != frc->type)) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Record type missmatch, not passing request for key %s to local client\n", + "Record type mismatch, not passing request for key %s to local client\n", GNUNET_h2s (key)); GNUNET_STATISTICS_update (GDS_stats, gettext_noop diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 594896c93..fea22f279 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c @@ -1232,7 +1232,7 @@ peer_init_handler (void *cls, my_identity)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Peer identity missmatch, refusing to start!\n"); + "Peer identity mismatch, refusing to start!\n"); GNUNET_SCHEDULER_shutdown (); } } diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h index eee9fc23b..c6aed298c 100644 --- a/src/include/gnunet_consensus_service.h +++ b/src/include/gnunet_consensus_service.h @@ -53,7 +53,7 @@ extern "C" /** - * Called when a new element was received from another peer, or an error occured. + * Called when a new element was received from another peer, or an error occurred. * May deliver duplicate values. * Elements given to a consensus operation by the local peer are NOT given * to this callback. diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 4b8d63ad2..302b32019 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h @@ -443,7 +443,7 @@ typedef void /** - * Starts a controller process at the given host. The given host's configration + * Starts a controller process at the given host. The given host's configuration * is used as a Template configuration to use for the remote controller; the * remote controller will be started with a slightly modified configuration * (port numbers, unix domain sockets and service home values are changed as per @@ -486,7 +486,7 @@ GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc); /** * Connect to a controller process. The configuration to use for the connection - * is retreived from the given host where a controller is started using + * is retrieved from the given host where a controller is started using * GNUNET_TESTBED_controller_start(). * * @param host host to run the controller on; This should be the same host if diff --git a/src/my/my.c b/src/my/my.c index 2f4cd3ba3..16df437b2 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -157,7 +157,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, if (mysql_stmt_field_count (stmt) != num_fields) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Number of fields missmatch between SQL result and result specification\n"); + "Number of fields mismatch between SQL result and result specification\n"); return GNUNET_SYSERR; } diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c index ddc8b483a..01706b777 100644 --- a/src/namestore/gnunet-zoneimport.c +++ b/src/namestore/gnunet-zoneimport.c @@ -1159,7 +1159,7 @@ process_result (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "DNS ID did not match request, ignoring reply\n"); GNUNET_STATISTICS_update (stats, - "# DNS ID missmatches", + "# DNS ID mismatches", 1, GNUNET_NO); return; diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index 527576718..2cc293b37 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c @@ -754,7 +754,7 @@ handle_zone_to_name_response (void *cls, { case GNUNET_SYSERR: LOG (GNUNET_ERROR_TYPE_DEBUG, - "An error occured during zone to name operation\n"); + "An error occurred during zone to name operation\n"); break; case GNUNET_NO: LOG (GNUNET_ERROR_TYPE_DEBUG, diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index b6ce7fb09..5b01a8e7f 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h @@ -101,7 +101,7 @@ struct GNUNET_TESTBED_AddHostMessage /* followed by non 0-terminated host name */ /* followed by gzip compressed configuration to start or connect to a - controller on this host. While starting the controller this configration + controller on this host. While starting the controller this configuration is used as a template */ }; diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 2c25eabcf..84296b26a 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c @@ -1041,7 +1041,7 @@ helper_exp_cb (void *cls) /** - * Starts a controller process at the given host. The given host's configration + * Starts a controller process at the given host. The given host's configuration * is used as a Template configuration to use for the remote controller; the * remote controller will be started with a slightly modified configuration * (port numbers, unix domain sockets and service home values are changed as per diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index fed509fe1..6c589307b 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -489,7 +489,7 @@ operation_timeout (void *cls) } FPRINTF (stdout, "%s", - _("Failed to list connections, timeout occured\n")); + _("Failed to list connections, timeout occurred\n")); GNUNET_SCHEDULER_shutdown (); ret = 1; return; diff --git a/src/util/configuration.c b/src/util/configuration.c index 41eb3188d..312e0acd3 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -522,7 +522,7 @@ GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_free (fn); GNUNET_free (cfg_buf); LOG (GNUNET_ERROR_TYPE_WARNING, - "Writing configration to file `%s' failed\n", + "Writing configuration to file `%s' failed\n", filename); cfg->dirty = GNUNET_SYSERR; /* last write failed */ return GNUNET_SYSERR; -- cgit v1.2.3