tTranslate cancelled/canceled - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 17b0f20c9fc1eb0270bed920c6208326b6d52c5f
(DIR) parent 5de524276e9a6892c803014d6ec7fed99f6f87ce
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Fri, 11 Dec 2020 00:47:12 -0800
Translate cancelled/canceled
Diffstat:
M po/de.po | 2 +-
M po/dopewars.pot | 2 +-
M po/en_GB.po | 4 ++--
M po/es.po | 2 +-
M po/es_ES.po | 2 +-
M po/fr.po | 2 +-
M po/fr_CA.po | 2 +-
M po/nn.po | 2 +-
M po/pl.po | 2 +-
M po/pt_BR.po | 2 +-
M src/curses_client/curses_client.c | 2 +-
M src/network.c | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/po/de.po b/po/de.po
t@@ -4001,7 +4001,7 @@ msgid "SOCKS authentication failed"
msgstr "SOCKS-Bestätigung fehlgeschlagen"
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr "SOCKS-Bestätigung vom Benutzer abgebrochen"
#. SOCKS version 4 error messages
(DIR) diff --git a/po/dopewars.pot b/po/dopewars.pot
t@@ -3821,7 +3821,7 @@ msgid "SOCKS authentication failed"
msgstr ""
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr ""
#. SOCKS version 4 error messages
(DIR) diff --git a/po/en_GB.po b/po/en_GB.po
t@@ -3890,8 +3890,8 @@ msgid "SOCKS authentication failed"
msgstr ""
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
-msgstr ""
+msgid "SOCKS authentication canceled by user"
+msgstr "SOCKS authentication cancelled by user"
#. SOCKS version 4 error messages
#: src/network.c:395
(DIR) diff --git a/po/es.po b/po/es.po
t@@ -4072,7 +4072,7 @@ msgid "SOCKS authentication failed"
msgstr "Error de autenticación SOCKS"
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr "Autenticación SOCKS cancelada por el usuario"
#. SOCKS version 4 error messages
(DIR) diff --git a/po/es_ES.po b/po/es_ES.po
t@@ -4069,7 +4069,7 @@ msgid "SOCKS authentication failed"
msgstr "Error de autenticación SOCKS"
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr "Autenticación SOCKS cancelada por el usuario"
#. SOCKS version 4 error messages
(DIR) diff --git a/po/fr.po b/po/fr.po
t@@ -3961,7 +3961,7 @@ msgid "SOCKS authentication failed"
msgstr ""
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr ""
#. SOCKS version 4 error messages
(DIR) diff --git a/po/fr_CA.po b/po/fr_CA.po
t@@ -4035,7 +4035,7 @@ msgid "SOCKS authentication failed"
msgstr "Échec d'authentification SOCKS"
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr "Authentification SOCKS annulée par l'utilisateur"
#. SOCKS version 4 error messages
(DIR) diff --git a/po/nn.po b/po/nn.po
t@@ -4022,7 +4022,7 @@ msgid "SOCKS authentication failed"
msgstr "SOCKS-autentiserer feila"
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr "SOCKS-autentisering avbroten av brukar"
#. SOCKS version 4 error messages
(DIR) diff --git a/po/pl.po b/po/pl.po
t@@ -3945,7 +3945,7 @@ msgid "SOCKS authentication failed"
msgstr ""
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr ""
#. SOCKS version 4 error messages
(DIR) diff --git a/po/pt_BR.po b/po/pt_BR.po
t@@ -3959,7 +3959,7 @@ msgid "SOCKS authentication failed"
msgstr ""
#: src/network.c:392
-msgid "SOCKS authentication cancelled by user"
+msgid "SOCKS authentication canceled by user"
msgstr ""
#. SOCKS version 4 error messages
(DIR) diff --git a/src/curses_client/curses_client.c b/src/curses_client/curses_client.c
t@@ -814,7 +814,7 @@ void display_select_list(GSList *names)
* passed in "Play".
* N.B. May set the global variable DisplayMode.
* Returns: TRUE if the user chose to jet to a new location,
- * FALSE if the action was cancelled instead.
+ * FALSE if the action was canceled instead.
*/
static gboolean jet(Player *Play, gboolean AllowReturn)
{
(DIR) diff --git a/src/network.c b/src/network.c
t@@ -389,7 +389,7 @@ static ErrTable SocksErrStr[] = {
{SEC_NOMETHODS, N_("SOCKS server rejected all offered methods")},
{SEC_ADDRTYPE, N_("Unknown SOCKS address type returned")},
{SEC_AUTHFAILED, N_("SOCKS authentication failed")},
- {SEC_USERCANCEL, N_("SOCKS authentication cancelled by user")},
+ {SEC_USERCANCEL, N_("SOCKS authentication canceled by user")},
/* SOCKS version 4 error messages */
{SEC_REJECT, N_("SOCKS: Request rejected or failed")},