summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/documentation/chapters/developer.texi16
-rw-r--r--doc/documentation/chapters/user.texi4
-rw-r--r--doc/man/gnunet-revocation.12
-rw-r--r--doc/release_policy.rfc.txt2
-rw-r--r--m4/iconv.m42
-rw-r--r--m4/lib-link.m42
-rw-r--r--m4/lib-prefix.m42
-rw-r--r--po/de.po4
-rw-r--r--po/es.po2
-rw-r--r--po/fr.po2
-rw-r--r--po/sv.po2
-rw-r--r--po/vi.po2
-rw-r--r--po/zh_CN.po2
13 files changed, 22 insertions, 22 deletions
diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index 4167c3d62..1f74a8163 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -4382,7 +4382,7 @@ If you encounter problems regarding the SDP server (like the SDP server is
down) you should check out if the D-Bus daemon is running correctly and to
see if the Bluetooth daemon started correctly(use @code{bluetoothd} tool).
Also, sometimes the SDP service could work but somehow the device couldn't
-register his service. Use @code{sdptool browse [dev-address]} to see if
+register its service. Use @code{sdptool browse [dev-address]} to see if
the service is registered. There should be a service with the name of the
interface and GNUnet as provider.
@@ -5453,7 +5453,7 @@ calls: @code{GNUNET_NSE_connect} and @code{GNUNET_NSE_disconnect}.
The connect call gets a callback function as a parameter and this function
is called each time the network agrees on an estimate. This usually is
once per round, with some exceptions: if the closest peer has a late
-local clock and starts spreading his ID after everyone else agreed on a
+local clock and starts spreading its ID after everyone else agreed on a
value, the callback might be activated twice in a round, the second value
being always bigger than the first. The default round time is set to
1 hour.
@@ -5579,7 +5579,7 @@ is what we are flooding the network with right now.
At the beginning of each round the peer does the following:
@itemize @bullet
-@item calculates his own distance to the target value
+@item calculates its own distance to the target value
@item creates, signs and stores the message for the current round (unless
it has a better message in the "next round" slot which came early in the
previous round)
@@ -6215,8 +6215,8 @@ So a client has first to retrieve records, merge with existing records
and then store the result.
To perform a lookup operation, the client uses the
-@code{GNUNET_NAMESTORE_records_store} function. Here he has to pass the
-namestore handle, the private key of the zone and the label. He also has
+@code{GNUNET_NAMESTORE_records_store} function. Here it has to pass the
+namestore handle, the private key of the zone and the label. It also has
to provide a callback function which will be called with the result of
the lookup operation:
the zone for the records, the label, and the records including the
@@ -6239,7 +6239,7 @@ by NAMESTORE.
Here a client uses the @code{GNUNET_NAMESTORE_zone_iteration_start}
function and passes the namestore handle, the zone to iterate over and a
callback function to call with the result.
-If the client wants to iterate over all the, he passes NULL for the zone.
+If the client wants to iterate over all the WHAT!? FIXME, it passes NULL for the zone.
A @code{GNUNET_NAMESTORE_ZoneIterator} handle is returned to be used to
continue iteration.
@@ -6935,7 +6935,7 @@ number of iterations).
The receiver of the message removes all elements from its local set that
do not pass the Bloom filter test.
It then checks if the set size of the sender and the XOR over the keys
-match what is left of his own set. If they do, he sends a
+match what is left of its own set. If they do, it sends a
@code{GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE} back to indicate
that the latest set is the final result.
Otherwise, the receiver starts another Bloom filter exchange, except
@@ -8239,7 +8239,7 @@ When a revocation is performed, the revocation is first of all
disseminated by flooding the overlay network.
The goal is to reach every peer, so that when a peer needs to check if a
key has been revoked, this will be purely a local operation where the
-peer looks at his local revocation list. Flooding the network is also the
+peer looks at its local revocation list. Flooding the network is also the
most robust form of key revocation --- an adversary would have to control
a separator of the overlay graph to restrict the propagation of the
revocation message. Flooding is also very easy to implement --- peers that
diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi
index 4a82295c4..9c9bd8df8 100644
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -2264,7 +2264,7 @@ the configuration:
If you operate a peer permanently connected to GNUnet you can configure
your peer to act as a hostlist server, providing other peers the list of
-peers known to him.
+peers known to it.
Your server can act as a bootstrap server and peers needing to obtain a
list of peers can contact it to download this list.
@@ -2883,7 +2883,7 @@ iwconfig wlan0 channel 1
@subsection Configuring HTTP(S) reverse proxy functionality using Apache or nginx
The HTTP plugin supports data transfer using reverse proxies. A reverse
-proxy forwards the HTTP request he receives with a certain URL to another
+proxy forwards the HTTP request it receives with a certain URL to another
webserver, here a GNUnet peer.
So if you have a running Apache or nginx webserver you can configure it to
diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1
index 017b019fd..b963b2dc0 100644
--- a/doc/man/gnunet-revocation.1
+++ b/doc/man/gnunet-revocation.1
@@ -15,7 +15,7 @@ instantly revoke a key and to use a pre-generated revocation
certificate to revoke a key. Upon successful revocation, all peers
will be informed about the invalidity of the key. As this is an
expensive operation, GNUnet requires the issuer of the revocation to
-perform an expensive proof-of-work computation before he will be
+perform an expensive proof-of-work computation before they will be
allowed to perform the revocation. gnunet\-revocation will perform
this computation. The computation can be performed ahead of time,
with the resulting revocation certificate being stored in a file for
diff --git a/doc/release_policy.rfc.txt b/doc/release_policy.rfc.txt
index fd4118742..b3d72bac4 100644
--- a/doc/release_policy.rfc.txt
+++ b/doc/release_policy.rfc.txt
@@ -117,7 +117,7 @@ platforms. It also doubt it will give you the recognition you crave.
More importantly, what you describe is already happening, and
partially has contributed to the problems. Bart kept his own CADET
hacks in his personal branch for years, hence without much feedback or
-review. The SecuShare team kept their patches in their own branch,
+review. The secushare team kept their patches in their own branch,
hence revealing interesting failure modes when it was finally merged.
Martin kept some of his ABE-logic in his own branch (that one was
merged without me noticing major problems). Anyway, what you propose
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index a50364656..41aa44a56 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -29,7 +29,7 @@ AC_DEFUN([AM_ICONV_LINK],
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
dnl because if the user has installed libiconv and not disabled its use
- dnl via --without-libiconv-prefix, he wants to use it. The first
+ dnl via --without-libiconv-prefix, they want to use it. The first
dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
am_save_CPPFLAGS="$CPPFLAGS"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 073f04050..d963149b0 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -68,7 +68,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
dnl because if the user has installed lib[]Name and not disabled its use
- dnl via --without-lib[]Name-prefix, he wants to use it.
+ dnl via --without-lib[]Name-prefix, they want to use it.
ac_save_CPPFLAGS="$CPPFLAGS"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 60908e8fb..855ca9317 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -15,7 +15,7 @@ ifdef([AC_HELP_STRING],
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
+dnl a user will want packages to use other packages they previously installed
dnl with the same --prefix option.
dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
dnl libraries, but is otherwise very convenient.
diff --git a/po/de.po b/po/de.po
index f7642c20b..779cb248b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -914,8 +914,8 @@ msgstr ""
#: src/conversation/gnunet-conversation.c:720
#, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
-msgstr ""
+msgid "We are calling `%s', their phone should be ringing.\n"
+msgstr "Wir rufen `%s' an, deren Telefon sollte jetzt klingeln.\n"
#: src/conversation/gnunet-conversation.c:739
msgid "Calls waiting:\n"
diff --git a/po/es.po b/po/es.po
index 967484138..e68990fc7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -980,7 +980,7 @@ msgstr "Detectada dirección de la red interna «%s».\n"
#: src/conversation/gnunet-conversation.c:720
#, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
msgstr ""
#: src/conversation/gnunet-conversation.c:739
diff --git a/po/fr.po b/po/fr.po
index 138204d94..eb4d32303 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -899,7 +899,7 @@ msgstr ""
#: src/conversation/gnunet-conversation.c:720
#, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
msgstr ""
#: src/conversation/gnunet-conversation.c:739
diff --git a/po/sv.po b/po/sv.po
index f4ceafbc4..acb0c0197 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -924,7 +924,7 @@ msgstr ""
#: src/conversation/gnunet-conversation.c:720
#, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
msgstr ""
#: src/conversation/gnunet-conversation.c:739
diff --git a/po/vi.po b/po/vi.po
index da28c66b4..176ac4c8b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -933,7 +933,7 @@ msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
#: src/conversation/gnunet-conversation.c:720
#, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
msgstr ""
#: src/conversation/gnunet-conversation.c:739
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 80d7e1996..d27d6f0a0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -915,7 +915,7 @@ msgstr "GNUnet 现在使用 IP 地址 %s。\n"
#: src/conversation/gnunet-conversation.c:720
#, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
msgstr ""
#: src/conversation/gnunet-conversation.c:739