tTranslate license/licence between US/UK English - 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 10778b177bae401c9a869131728de051cf508854 (DIR) parent d5c1c4e5e14040cbe2e2e30d3ed5321890288c78 (HTM) Author: Ben Webb <ben@salilab.org> Date: Thu, 10 Dec 2020 00:06:05 -0800 Translate license/licence between US/UK English Diffstat: M README.md | 2 +- M doc/developer.html | 2 +- M po/de.po | 8 ++++---- M po/dopewars.pot | 4 ++-- M po/en_GB.po | 8 +++++--- M po/es.po | 8 ++++---- M po/es_ES.po | 8 ++++---- M po/fr.po | 6 +++--- M po/fr_CA.po | 4 ++-- M po/nn.po | 8 ++++---- M po/pl.po | 8 ++++---- M po/pt_BR.po | 8 ++++---- M src/curses_client/curses_client.c | 2 +- M src/gui_client/gtk_client.c | 2 +- 14 files changed, 40 insertions(+), 38 deletions(-) --- (DIR) diff --git a/README.md b/README.md t@@ -97,7 +97,7 @@ if I can fix 'em... of course, a [working patch](https://github.com/benmwebb/dopewars/pulls) would be even nicer! ;) -## Licence +## License dopewars is released under the GNU General Public License; see the text file LICENCE for further information. dopewars is copyright (C) Ben Webb 1998-2020. (DIR) diff --git a/doc/developer.html b/doc/developer.html t@@ -19,7 +19,7 @@ to dopewars development, and so encourage discussion of the dopewars code, documentation and concept, and particularly welcome suggested improvements.</p> <p>You are free to distribute modified versions of the code, -again subject to the licence, but I also additions to the code +again subject to the license, but I also additions to the code via <a href="https://github.com/benmwebb/dopewars/pulls">pull requests</a>. If I choose to include this code in a new dopewars version, you will of course be credited in the changelog (unless, of course, you don't want to (DIR) diff --git a/po/de.po b/po/de.po t@@ -1335,8 +1335,8 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" -msgstr "Drugwars wurde unter der GNU General Public Licence veröffentlicht" +msgid "dopewars is released under the GNU General Public License" +msgstr "Drugwars wurde unter der GNU General Public License veröffentlicht" #: src/curses_client/curses_client.c:313 msgid "Icons and Graphics Ocelot Mantis" t@@ -2479,10 +2479,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"Dopewars wurde unter der GNU General Public Licence veröffentlicht.\n" +"Dopewars wurde unter der GNU General Public License veröffentlicht.\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/po/dopewars.pot b/po/dopewars.pot t@@ -1245,7 +1245,7 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" msgstr "" #: src/curses_client/curses_client.c:313 t@@ -2369,7 +2369,7 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" #. Label at the bottom of GTK+ 'about' dialog (DIR) diff --git a/po/en_GB.po b/po/en_GB.po t@@ -1312,8 +1312,8 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" -msgstr "" +msgid "dopewars is released under the GNU General Public License" +msgstr "dopewars is released under the GNU General Public Licence" #: src/curses_client/curses_client.c:313 msgid "Icons and Graphics Ocelot Mantis" t@@ -2436,8 +2436,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" +"Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" +"dopewars is released under the GNU General Public Licence\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/po/es.po b/po/es.po t@@ -1381,8 +1381,8 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" -msgstr "dopewars está publicado bajo la GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" +msgstr "dopewars está publicado bajo la GNU General Public License" #: src/curses_client/curses_client.c:313 msgid "Icons and Graphics Ocelot Mantis" t@@ -2521,10 +2521,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Versión %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars está publicado bajo la GNU General Public Licence\n" +"dopewars está publicado bajo la GNU General Public License\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/po/es_ES.po b/po/es_ES.po t@@ -1381,8 +1381,8 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" -msgstr "dopewars está publicado bajo la GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" +msgstr "dopewars está publicado bajo la GNU General Public License" #: src/curses_client/curses_client.c:313 msgid "Icons and Graphics Ocelot Mantis" t@@ -2524,10 +2524,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Versión %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars está publicado bajo la GNU General Public Licence\n" +"dopewars está publicado bajo la GNU General Public License\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/po/fr.po b/po/fr.po t@@ -1322,7 +1322,7 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" msgstr "dopewars est distribue sous la license GPL de GNU." #: src/curses_client/curses_client.c:313 t@@ -2456,10 +2456,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars est diffuse sous la GNU General Public Licence\n" +"dopewars est diffuse sous la GNU General Public License\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/po/fr_CA.po b/po/fr_CA.po t@@ -1363,7 +1363,7 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Version·%-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" msgstr "dopewars est distribué sous la license GNU GPL." #: src/curses_client/curses_client.c:313 t@@ -2499,7 +2499,7 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" "dopewars est distribué sous la licence GNU GPL\n" (DIR) diff --git a/po/nn.po b/po/nn.po t@@ -1354,8 +1354,8 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Versjon %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" -msgstr "dopewars er tilgjengeleg under GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" +msgstr "dopewars er tilgjengeleg under GNU General Public License" #: src/curses_client/curses_client.c:313 msgid "Icons and Graphics Ocelot Mantis" t@@ -2492,10 +2492,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars er tilgjengeleg under GNU General Public Licence\n" +"dopewars er tilgjengeleg under GNU General Public License\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/po/pl.po b/po/pl.po t@@ -1313,8 +1313,8 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Wersja %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" -msgstr " dopewars są publikowane zgodnie z GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" +msgstr " dopewars są publikowane zgodnie z GNU General Public License" #: src/curses_client/curses_client.c:313 msgid "Icons and Graphics Ocelot Mantis" t@@ -2445,10 +2445,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Wersja %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars są publikowane zgodnie z GNU General Public Licence\n" +"dopewars są publikowane zgodnie z GNU General Public License\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/po/pt_BR.po b/po/pt_BR.po t@@ -1319,8 +1319,8 @@ msgid "Version %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" msgstr "Versão %-8s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net" #: src/curses_client/curses_client.c:305 -msgid "dopewars is released under the GNU General Public Licence" -msgstr "dopewars está lançado sob a GNU General Public Licence" +msgid "dopewars is released under the GNU General Public License" +msgstr "dopewars está lançado sob a GNU General Public License" #: src/curses_client/curses_client.c:313 msgid "Icons and Graphics Ocelot Mantis" t@@ -2457,10 +2457,10 @@ msgstr "" #, c-format msgid "" "Version %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars is released under the GNU General Public Licence\n" +"dopewars is released under the GNU General Public License\n" msgstr "" "Versão %s Copyright (C) 1998-2020 Ben Webb benwebb@users.sf.net\n" -"dopewars está lançado sob a GNU General Public Licence\n" +"dopewars está lançado sob a GNU General Public License\n" #. Label at the bottom of GTK+ 'about' dialog #: src/gui_client/gtk_client.c:2468 (DIR) diff --git a/src/curses_client/curses_client.c b/src/curses_client/curses_client.c t@@ -351,7 +351,7 @@ void display_intro(void) "benwebb@users.sf.net"), VERSION); mvaddcentstr(10, text->str); g_string_assign(text, _("dopewars is released under the GNU " - "General Public Licence")); + "General Public License")); mvaddcentstr(11, text->str); g_string_assign(text, _(translation)); (DIR) diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c t@@ -2438,7 +2438,7 @@ void display_intro(GtkWidget *widget, gpointer data) "Copyright (C) 1998-2020 " "Ben Webb benwebb@users.sf.net\n" "dopewars is released under the " - "GNU General Public Licence\n"), VERSION); + "GNU General Public License\n"), VERSION); label = gtk_label_new(VersionStr); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); g_free(VersionStr);