[Freeciv-Dev] (PR#2591) Nondenominational calendar patch
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
This patch makes all necessary changes to go fom BC/AD (Before
Christ/Anno Domini) to BCE/CE (Before Common Era/Common Era). A good
thing unless we want to assume that all Freeciv's future users will
be Christians.
If you haven't encountered this usage before, that's because it's
mostly an academic one. Other educated native speakers of English
recognize it but don't generate it spomtaneously.
My patches to the data files already use BCE/CE.
--
<a href="http://www.tuxedo.org/~esr/";>Eric S. Raymond</a>
Diffs between last version checked in and current workfile(s):
--- common/shared.c 2002/12/16 22:45:22 1.1
+++ common/shared.c 2002/12/16 22:48:38
@@ -404,15 +404,16 @@
/***************************************************************
Produce a statically allocated textual representation of the given
- year.
+ year. Use CE (Common Era) and BCE (Before Common Era) rather
+ than AD and BC, as many players will not be Christians.
***************************************************************/
const char *textyear(int year)
{
static char y[32];
if (year<0)
- my_snprintf(y, sizeof(y), _("%d BC"), -year);
+ my_snprintf(y, sizeof(y), _("%d BCE"), -year);
else
- my_snprintf(y, sizeof(y), _("%d AD"), year);
+ my_snprintf(y, sizeof(y), _("%d CE"), year);
return y;
}
--- po/da.po 2002/12/16 22:27:31 1.1
+++ po/da.po 2002/12/16 22:35:05
@@ -250,12 +250,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d f.Kr"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d e.Kr"
#: common/shared.c:760
@@ -5482,7 +5482,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Befolkning: 1234\n"
"Support: 100 %\n"
--- po/de.po 2002/12/16 22:27:31 1.1
+++ po/de.po 2002/12/16 22:35:06
@@ -276,13 +276,13 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d v.Chr."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
-msgstr "%d AD"
+msgid "%d CE"
+msgstr "%d CE"
#: common/shared.c:760
msgid "FREECIV_PATH is set but empty; using default path instead."
@@ -5828,7 +5828,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Passagiere: 1234\n"
"Lebenserhaltungssysteme: 100 %\n"
@@ -5836,7 +5836,7 @@
"Masse: 12345 tons\n"
"Reisezeit: 1234 years\n"
"Erfolgswahrscheinlichkeit: 100 %\n"
-"Ankunftsjahr: 1234 AD"
+"Ankunftsjahr: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/en_GB.po 2002/12/16 22:27:31 1.1
+++ po/en_GB.po 2002/12/16 22:35:06
@@ -240,12 +240,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr ""
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr ""
#: common/shared.c:760
@@ -5276,7 +5276,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
#: client/climisc.c:1114
--- po/es.po 2002/12/16 22:27:31 1.1
+++ po/es.po 2002/12/16 22:35:06
@@ -246,12 +246,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d A.C."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d D.C."
#: common/shared.c:760
@@ -5842,7 +5842,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Poblaci�n: 1234\n"
"Soporte: 100 %\n"
--- po/et.po 2002/12/16 22:27:31 1.1
+++ po/et.po 2002/12/16 22:35:06
@@ -243,12 +243,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d e.m.a."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d m.a.j."
#: common/shared.c:760
@@ -5311,7 +5311,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
#: client/climisc.c:1114
--- po/fi.po 2002/12/16 22:27:31 1.1
+++ po/fi.po 2002/12/16 22:35:06
@@ -253,12 +253,12 @@
# is replaced with (question of Christian counting (eKr) vs scientific
counting).
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d eKr."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d jKr."
#: common/shared.c:760
@@ -5787,7 +5787,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"V�kiluku: 1234\n"
"Yll�pito: 100 %\n"
--- po/fr.po 2002/12/16 22:27:31 1.1
+++ po/fr.po 2002/12/16 22:35:07
@@ -256,12 +256,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d av. JC"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d"
#: common/shared.c:760
@@ -5860,7 +5860,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Population: 1234\n"
"Support: 100 %\n"
@@ -5868,7 +5868,7 @@
"Production: 12345 tons\n"
"Tps de transport: 1234 ann�es\n"
"Prob. de succ�s: 100 %\n"
-"Ann�e d'arriv�e: 1234 AD"
+"Ann�e d'arriv�e: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/freeciv.pot 2002/12/16 22:16:50 1.1
+++ po/freeciv.pot 2002/12/16 23:12:33
@@ -1,7 +1,6 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation file template for the freeciv project
+# Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+# This file is distributed under the same license as the freeciv package.
#
#, fuzzy
msgid ""
@@ -242,12 +241,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d CE"
msgstr ""
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d BCE"
msgstr ""
#: common/shared.c:760
@@ -5271,7 +5270,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 BCE"
msgstr ""
#: client/climisc.c:1114
--- po/hu.po 2002/12/16 22:27:31 1.1
+++ po/hu.po 2002/12/16 22:35:07
@@ -248,12 +248,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "i.e. %d"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "i.sz. %d"
#: common/shared.c:760
@@ -5889,7 +5889,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"N,Bi(Bpess,Bi(Bg: 1234\n"
"Ell,Ba(Bt,Ba(Bs: 100 %\n"
@@ -5897,7 +5897,7 @@
"T,Bv(Bmeg: 12345 tonna\n"
",BZ(Btid,Bu(B: 1234 ,Bi(Bv\n"
"Siker es,Bi(Blye: 100 %\n"
-",BI(Brkez,Bi(Bs ,Bi(Bve: 1234 AD"
+",BI(Brkez,Bi(Bs ,Bi(Bve: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/it.po 2002/12/16 22:27:31 1.1
+++ po/it.po 2002/12/16 22:35:07
@@ -251,12 +251,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d a.C."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d d.C."
#: common/shared.c:760
@@ -5867,7 +5867,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Popolazione: 1234\n"
"Supporto: 100 %\n"
@@ -5875,7 +5875,7 @@
"Massa: 12345 tonnellate\n"
"Tempo di viaggio: 1234 anni\n"
"Prob. di successo: 100 %\n"
-"Anno di arrivo: 1234 AD"
+"Anno di arrivo: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/ja.po 2002/12/16 22:27:31 1.1
+++ po/ja.po 2002/12/16 22:35:07
@@ -260,13 +260,13 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
-msgstr "%d BC"
+msgid "%d BCE"
+msgstr "%d BCE"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
-msgstr "%d AD"
+msgid "%d CE"
+msgstr "%d CE"
#: common/shared.c:760
msgid "FREECIV_PATH is set but empty; using default path instead."
@@ -5805,7 +5805,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"$(B?M8}(B: 1234\n"
"$(B%5%]!<%H(B: 100 %\n"
--- po/nl.po 2002/12/16 22:27:31 1.1
+++ po/nl.po 2002/12/16 22:35:08
@@ -244,13 +244,13 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d VC"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
-msgstr "%d AD"
+msgid "%d CE"
+msgstr "%d CE"
#: common/shared.c:760
msgid "FREECIV_PATH is set but empty; using default path instead."
@@ -5780,7 +5780,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Bevolking: 1234\n"
"Onderhoud: 100 %\n"
@@ -5788,7 +5788,7 @@
"Massa: 12345 ton\n"
"Reistijd: 1234 jaar\n"
"Succeskans: 100 %\n"
-"Jaar van aankomst: 1234 AD"
+"Jaar van aankomst: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/no.po 2002/12/16 22:27:31 1.1
+++ po/no.po 2002/12/16 22:35:08
@@ -257,12 +257,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d f.Kr"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d e.Kr"
#: common/shared.c:760
@@ -5749,7 +5749,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Befolkning: 1234\n"
"Support: 100 %\n"
--- po/pl.po 2002/12/16 22:27:31 1.1
+++ po/pl.po 2002/12/16 22:35:08
@@ -259,12 +259,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d p.n.e."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d n.e."
#: common/shared.c:760
@@ -5776,7 +5776,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Populacja: 1234\n"
"Obs,B3(Buga: 100 %\n"
@@ -5784,7 +5784,7 @@
"Masa: 12345 ton\n"
"Czas podr,Bs?(By: 1234 years\n"
"Prawd. sukcesu: 100 %\n"
-"Rok przybycia: 1234 AD"
+"Rok przybycia: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/pt.po 2002/12/16 22:27:31 1.1
+++ po/pt.po 2002/12/16 22:35:08
@@ -247,12 +247,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d AC"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d DC"
#: common/shared.c:760
@@ -5506,7 +5506,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Popula��o: 1234\n"
"Suporte: 100 %\n"
@@ -5514,7 +5514,7 @@
"Massa: 12345 tons\n"
"Tempo de viagem: 1234 years\n"
"Prob. Successo: 100 %\n"
-"Ano de chegada: 1234 AD"
+"Ano de chegada: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/pt_BR.po 2002/12/16 22:27:31 1.1
+++ po/pt_BR.po 2002/12/16 22:35:08
@@ -248,12 +248,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d AC"
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d DC"
#: common/shared.c:760
@@ -5403,7 +5403,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
#: client/climisc.c:1114
--- po/ro.po 2002/12/16 22:27:31 1.1
+++ po/ro.po 2002/12/16 22:35:09
@@ -243,12 +243,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d ,Bn(B.e.n."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d e.n."
#: common/shared.c:760
@@ -5382,7 +5382,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Pasageri: 1234\n"
"Subsisten,B~c(B: 100 %\n"
@@ -5390,7 +5390,7 @@
"Mas,Bc(B: 12345 tons\n"
"Timp de voiaj: 1234 years\n"
"Prob. de succes: 100 %\n"
-"Anul sosirii: 1234 AD"
+"Anul sosirii: 1234 CE"
#: client/climisc.c:1114
#, c-format
--- po/ru.po 2002/12/16 22:27:31 1.1
+++ po/ru.po 2002/12/16 22:35:09
@@ -249,12 +249,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d ,LT^(B ,L](B.,Lm(B."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d ,L](B.,Lm(B."
#: common/shared.c:760
@@ -5740,7 +5740,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
",L=PaU[U]XU(B: 1234\n"
",L?^TTU`VZP(B: 100 %\n"
--- po/sv.po 2002/12/16 22:27:31 1.1
+++ po/sv.po 2002/12/16 22:35:09
@@ -244,12 +244,12 @@
#: common/shared.c:413
#, c-format
-msgid "%d BC"
+msgid "%d BCE"
msgstr "%d f. Kr."
#: common/shared.c:415
#, c-format
-msgid "%d AD"
+msgid "%d CE"
msgstr "%d e. Kr."
#: common/shared.c:760
@@ -5747,7 +5747,7 @@
"Mass: 12345 tons\n"
"Travel time: 1234 years\n"
"Success prob.: 100 %\n"
-"Year of arrival: 1234 AD"
+"Year of arrival: 1234 CE"
msgstr ""
"Befolkning: 1234\n"
"Underst�d: 100 %\n"
End of diffs.
- [Freeciv-Dev] (PR#2591) Nondenominational calendar patch,
esr@xxxxxxxxxxx via RT <=
- Message not available
|
|
