Navigation Menu

Skip to content

Commit

Permalink
String fixes
Browse files Browse the repository at this point in the history
A couple of cosmetic fixes suggested by "scootergrisen" in
https://gitlab.com/openconnect/openconnect/-/merge_requests/72
https://gitlab.com/openconnect/openconnect/-/merge_requests/73/

Also fix up translations so that they don't get lost and need to
be re-translated.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
dwmw2 committed Mar 30, 2020
1 parent 5e87813 commit c00bdc4
Show file tree
Hide file tree
Showing 112 changed files with 173 additions and 222 deletions.
2 changes: 1 addition & 1 deletion auth-globalprotect.c
Expand Up @@ -706,7 +706,7 @@ int gpst_bye(struct openconnect_info *vpninfo, const char *reason)
if (result < 0)
vpn_progress(vpninfo, PRG_ERR, _("Logout failed.\n"));
else
vpn_progress(vpninfo, PRG_INFO, _("Logout successful\n"));
vpn_progress(vpninfo, PRG_INFO, _("Logout successful.\n"));

out:
buf_free(request_body);
Expand Down
2 changes: 1 addition & 1 deletion gnutls.c
Expand Up @@ -1635,7 +1635,7 @@ static int load_certificate(struct openconnect_info *vpninfo)
get_cert_name(issuer, name, sizeof(name));

vpn_progress(vpninfo, PRG_ERR,
_("Got next CA '%s' from PKCS11\n"), name);
_("Got next CA '%s' from PKCS#11\n"), name);
}
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion po/af.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/am.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/ar.po
Expand Up @@ -1415,7 +1415,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/as.po
Expand Up @@ -1414,7 +1414,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/ast.po
Expand Up @@ -1412,7 +1412,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/az.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/be.po
Expand Up @@ -1414,7 +1414,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/bg.po
Expand Up @@ -1415,7 +1415,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/bg_BG.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/bn.po
Expand Up @@ -1412,7 +1412,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/bn_IN.po
Expand Up @@ -1414,7 +1414,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/br.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
4 changes: 2 additions & 2 deletions po/bs.po
Expand Up @@ -1468,8 +1468,8 @@ msgstr ""

#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgstr "Dobijena sljedeća CA '%s' iz PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr "Dobijena sljedeća CA '%s' iz PKCS#11\n"

#: gnutls.c:1664
msgid "Failed to allocate memory for supporting certificates\n"
Expand Down
16 changes: 6 additions & 10 deletions po/ca.po
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: network-manager-openconnect\n"
"Report-Msgid-Bugs-To: openconnect-devel@lists.infradead.org\n"
"POT-Creation-Date: 2020-03-30 09:58+0100\n"
"POT-Creation-Date: 2020-03-30 12:13+0100\n"
"PO-Revision-Date: 2019-03-05 19:27+0100\n"
"Last-Translator: Carles Ferrando Garcia <carles.ferrando@gamil.com>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
Expand Down Expand Up @@ -144,9 +144,9 @@ msgstr "El servidor no és ni un portal GlobalProtect ni una passarel·la.\n"
msgid "Logout failed.\n"
msgstr "Sortida de sessió errònia.\n"

#: auth-globalprotect.c:709
msgid "Logout successful\n"
msgstr "Sortida de sessió amb èxit\n"
#: auth-globalprotect.c:709 oncp.c:1283
msgid "Logout successful.\n"
msgstr "Sortida de sessió amb èxit.\n"

#: auth-juniper.c:142
#, c-format
Expand Down Expand Up @@ -1503,8 +1503,8 @@ msgstr "No s'ha obtingut l'emissor de PKCS#11\n"

#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgstr "S'ha obtingut el següent CA «%s» de PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr "S'ha obtingut el següent CA «%s» de PKCS#11\n"

#: gnutls.c:1664
msgid "Failed to allocate memory for supporting certificates\n"
Expand Down Expand Up @@ -3885,10 +3885,6 @@ msgstr "Paquet de sortida:\n"
msgid "Sent ESP enable control packet\n"
msgstr "S'ha enviat habilitació ESP de control de paquets\n"

#: oncp.c:1283
msgid "Logout successful.\n"
msgstr "Sortida de sessió amb èxit.\n"

#: openconnect-internal.h:1179 openconnect-internal.h:1187
#, c-format
msgid "ERROR: %s() called with invalid UTF-8 for '%s' argument\n"
Expand Down
2 changes: 1 addition & 1 deletion po/ca@valencia.po
Expand Up @@ -1412,7 +1412,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/crh.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
16 changes: 6 additions & 10 deletions po/cs.po
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: network-manager-openconnect\n"
"Report-Msgid-Bugs-To: openconnect-devel@lists.infradead.org\n"
"POT-Creation-Date: 2020-03-30 09:58+0100\n"
"POT-Creation-Date: 2020-03-30 12:13+0100\n"
"PO-Revision-Date: 2019-03-05 16:26+0100\n"
"Last-Translator: Zdeněk Hataš <zdenek.hatas@gmail.com>\n"
"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
Expand Down Expand Up @@ -139,9 +139,9 @@ msgstr "Server není ani brána, ani portál GlobalProtect.\n"
msgid "Logout failed.\n"
msgstr "Odhlášení se nezdařilo\n"

#: auth-globalprotect.c:709
msgid "Logout successful\n"
msgstr "Úspěšně odhášeno\n"
#: auth-globalprotect.c:709 oncp.c:1283
msgid "Logout successful.\n"
msgstr "Úspěšně odhášeno.\n"

#: auth-juniper.c:142
#, c-format
Expand Down Expand Up @@ -1483,8 +1483,8 @@ msgstr "Z PKCS#11 nebyl získán žádný vydavatel\n"

#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgstr "Získána další CA „%s“ z PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr "Získána další CA „%s“ z PKCS#11\n"

#: gnutls.c:1664
msgid "Failed to allocate memory for supporting certificates\n"
Expand Down Expand Up @@ -3804,10 +3804,6 @@ msgstr "Odchoz paket:\n"
msgid "Sent ESP enable control packet\n"
msgstr "Odeslán paket povolení kontroly ESP\n"

#: oncp.c:1283
msgid "Logout successful.\n"
msgstr "Úspěšně odhášeno.\n"

#: openconnect-internal.h:1179 openconnect-internal.h:1187
#, c-format
msgid "ERROR: %s() called with invalid UTF-8 for '%s' argument\n"
Expand Down
2 changes: 1 addition & 1 deletion po/cy.po
Expand Up @@ -1414,7 +1414,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
13 changes: 4 additions & 9 deletions po/da.po
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: network-manager-openconnect\n"
"Report-Msgid-Bugs-To: openconnect-devel@lists.infradead.org\n"
"POT-Creation-Date: 2020-03-30 09:58+0100\n"
"POT-Creation-Date: 2020-03-30 12:13+0100\n"
"PO-Revision-Date: 2019-01-26 15:53+0100\n"
"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
"Language-Team: Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
Expand Down Expand Up @@ -145,9 +145,8 @@ msgstr "Serveren er hverken en GlobalProtect-portal eller -gateway.\n"
msgid "Logout failed.\n"
msgstr "Logout mislykkedes.\n"

# Punktum i den tilsvarende med "mislykkedes"
#: auth-globalprotect.c:709
msgid "Logout successful\n"
#: auth-globalprotect.c:709 oncp.c:1283
msgid "Logout successful.\n"
msgstr "Logout lykkedes.\n"

#: auth-juniper.c:142
Expand Down Expand Up @@ -1504,7 +1503,7 @@ msgstr "Fik ingen udsteder fra PKCS#11\n"
# Mangler # på engelsk
#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr "Fik næste CA “%s” fra PKCS#11\n"

#: gnutls.c:1664
Expand Down Expand Up @@ -3840,10 +3839,6 @@ msgstr "Pakke udgående:\n"
msgid "Sent ESP enable control packet\n"
msgstr "Sendte kontrolpakke til aktivering af ESP\n"

#: oncp.c:1283
msgid "Logout successful.\n"
msgstr "Logout lykkedes.\n"

#: openconnect-internal.h:1179 openconnect-internal.h:1187
#, c-format
msgid "ERROR: %s() called with invalid UTF-8 for '%s' argument\n"
Expand Down
16 changes: 6 additions & 10 deletions po/de.po
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-openconnect\n"
"Report-Msgid-Bugs-To: openconnect-devel@lists.infradead.org\n"
"POT-Creation-Date: 2020-03-30 09:58+0100\n"
"POT-Creation-Date: 2020-03-30 12:13+0100\n"
"PO-Revision-Date: 2018-08-07 14:43+0200\n"
"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
Expand Down Expand Up @@ -142,9 +142,9 @@ msgstr "Der Server ist weder ein GlobalProtect-Portal noch ein Gateway.\n"
msgid "Logout failed.\n"
msgstr "Abmelden ist fehlgeschlagen.\n"

#: auth-globalprotect.c:709
msgid "Logout successful\n"
msgstr "Abmelden war erfolgreich\n"
#: auth-globalprotect.c:709 oncp.c:1283
msgid "Logout successful.\n"
msgstr "Abmelden war erfolgreich.\n"

#: auth-juniper.c:142
#, c-format
Expand Down Expand Up @@ -1506,8 +1506,8 @@ msgstr "Kein Herausgeber von PKCS#11 erhalten\n"

#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgstr "Nächste CA »%s« von PKCS11 erhalten\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr "Nächste CA »%s« von PKCS#11 erhalten\n"

#: gnutls.c:1664
msgid "Failed to allocate memory for supporting certificates\n"
Expand Down Expand Up @@ -3860,10 +3860,6 @@ msgstr "Paket ausgehend:\n"
msgid "Sent ESP enable control packet\n"
msgstr "Steuerpaket zur ESP-Aktivierung wurde gesendet\n"

#: oncp.c:1283
msgid "Logout successful.\n"
msgstr "Abmelden war erfolgreich.\n"

#: openconnect-internal.h:1179 openconnect-internal.h:1187
#, c-format
msgid "ERROR: %s() called with invalid UTF-8 for '%s' argument\n"
Expand Down
2 changes: 1 addition & 1 deletion po/dz.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
4 changes: 2 additions & 2 deletions po/el.po
Expand Up @@ -1477,8 +1477,8 @@ msgstr ""

#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgstr "Ελήφθη επόμενο CA '%s' από το PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr "Ελήφθη επόμενο CA '%s' από το PKCS#11\n"

#: gnutls.c:1664
msgid "Failed to allocate memory for supporting certificates\n"
Expand Down
2 changes: 1 addition & 1 deletion po/en_CA.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down
2 changes: 1 addition & 1 deletion po/en_GB.po
Expand Up @@ -1464,7 +1464,7 @@ msgstr ""

#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1664
Expand Down
2 changes: 1 addition & 1 deletion po/en_US.po
Expand Up @@ -1464,7 +1464,7 @@ msgstr ""

#: gnutls.c:1638
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1664
Expand Down
2 changes: 1 addition & 1 deletion po/eo.po
Expand Up @@ -1413,7 +1413,7 @@ msgstr ""

#: gnutls.c:1657
#, c-format
msgid "Got next CA '%s' from PKCS11\n"
msgid "Got next CA '%s' from PKCS#11\n"
msgstr ""

#: gnutls.c:1683
Expand Down

0 comments on commit c00bdc4

Please sign in to comment.