Merge lp:~bkerensa/ubuntu/raring/gelemental/fix-for-1080906 into lp:ubuntu/raring/gelemental

[Benjamin Kerensa]

Fix to address etymology

[Charlie_Smotherman (cjsmo)]

bzr merge lp:~bkerensa/ubuntu/raring/gelemental/fix-for-1080906
bzr: ERROR: There was an error parsing the changelog: Could not parse changelog: Unexpected line while looking for start of change data: [Etienne Beaule]

Did you test build the package?

review: Needs Fixing

[Charlie_Smotherman (cjsmo)]

setting to in progress, please request another review when this is fixed

Unmerged revisions

14. By Benjamin Kerensa on 2012-11-23

Fix to address etymology

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 08:29:11 +0000
+++ debian/changelog	2012-11-23 23:01:19 +0000
@@ -1,3 +1,10 @@
+gelemental (1.2.0-8ubuntu3) raring; urgency=low
+
+ [Etienne Beaule] 
+ * Fix to address etymology (LP: #1080906)
+
+ -- Benjamin Kerensa <[e-mail]>  Fri, 23 Nov 2012 14:56:45 -0800
+
 gelemental (1.2.0-8ubuntu2) raring; urgency=low
 
   * Updated Flerovium and Livermorium elements. Thx Etienne Beaule.

=== modified file 'libelemental/data.cc'
--- libelemental/data.cc	2012-11-06 08:29:11 +0000
+++ libelemental/data.cc	2012-11-23 23:01:19 +0000
@@ -72,7 +72,7 @@
 {	N_("Nickel"),	Q_NA,	"Ni",	28,	Series::TRANSITION_METAL,	10,	4,	Block::D,	8.908,	7.81,	Q_NA,	N_("Hard, malleable, silvery-white metal"),	Event (1751, N_("Sweden")),	"Axel Fredrik Cronstedt",	N_("German: kupfernickel (false copper)"),	58.6934,	6.6,	135,	121,	Q_UNK,	"69 (+2e)",	LatticeType::FCC,	225,	FL (3, 352.4, 352.4, 352.4),	FL (3, 90.0, 90.0, 90.0),	"[Ar] 3d<sup>8</sup> 4s<sup>2</sup>",	IL (3, 3, 2, 0),	1.91,	111.6,	737.1,	1728,	3186,	17.48,	377.5,	0.444,	90.9,	375,	color (0.36, 0.48, 0.76),	Q_NA,	},
 {	N_("Copper"),	"Cuprum",	"Cu",	29,	Series::TRANSITION_METAL,	11,	4,	Block::D,	8.96,	8.02,	Q_NA,	N_("Malleable, ductile, reddish-brown metal"),	Q_NA,	Q_UNK,	N_("Late Latin: cuprum, Latin: [aes] Cyprium (metal of Cyprus)"),	63.546,	7.1,	135,	138,	Q_UNK,	"72 (+2e), 96 (+1e)",	LatticeType::FCC,	225,	FL (3, 361.49, 361.49, 361.49),	FL (3, 90.0, 90.0, 90.0),	"[Ar] 3d<sup>10</sup> 4s<sup>1</sup>",	IL (2, 2, 1),	1.90,	119.24,	745.5,	1357.77,	2835,	13.26,	300.4,	0.385,	401,	315,	color (1.00, 0.48, 0.38),	Q_NA,	},
 {	N_("Zinc"),	Q_NA,	"Zn",	30,	Series::TRANSITION_METAL,	12,	4,	Block::D,	7.14,	6.57,	Q_NA,	N_("Bluish-silver, ductile metal"),	Event (1526, N_("Switzerland")),	"Paracelsus",	N_("German: zink (sharp point, prong, tooth)"),	65.409,	9.2,	135,	131,	210,	"74 (+2e)",	LatticeType::HEX,	194,	FL (3, 266.49, 266.49, 494.68),	FL (3, 90.0, 90.0, 120.0),	"[Ar] 3d<sup>10</sup> 4s<sup>2</sup>",	IL (1, 2),	1.65,	F (0, Q_EST),	906.4,	692.68,	1180,	7.32,	123.6,	0.388,	116,	234,	color (0.49, 0.50, 0.69),	Q_NA,	},
-{	N_("Gallium"),	Q_NA,	"Ga",	31,	Series::POST_TRANSITION_METAL,	13,	4,	Block::P,	5.91,	6.095,	Q_NA,	N_("Soft, blue-white metal"),	Event (1875, N_("France")),	N_("Paul &#201;mile Lecoq de Boisbaudran"),	N_("Latin: Gallia (Gaul, an ancient area including modern France)"),	69.723,	11.8,	130,	126,	210,	"62 (+3e), 81 (+1e)",	LatticeType::ORTH,	64,	FL (3, 451.97, 766.33, 452.6),	FL (3, 90.0, 90.0, 90.0),	"[Ar] 3d<sup>10</sup> 4s<sup>2</sup> 4p<sup>1</sup>",	IL (1, 3),	1.81,	41,	578.8,	302.9146,	2477,	5.59,	254,	0.371,	40.6,	240,	color (0.76, 0.56, 0.56),	Q_NA,	},
+{	N_("Gallium"),	Q_NA,	"Ga",	31,	Series::POST_TRANSITION_METAL,	13,	4,	Block::P,	5.91,	6.095,	Q_NA,	N_("Soft, blue-white metal"),	Event (1875, N_("France")),	N_("Paul &#201;mile Lecoq de Boisbaudran"),	N_("Latin: Gallia (Gaul, an ancient area including modern France), or named for the discoverer, (Gallus means Coq, which is in his name)."),	69.723,	11.8,	130,	126,	210,	"62 (+3e), 81 (+1e)",	LatticeType::ORTH,	64,	FL (3, 451.97, 766.33, 452.6),	FL (3, 90.0, 90.0, 90.0),	"[Ar] 3d<sup>10</sup> 4s<sup>2</sup> 4p<sup>1</sup>",	IL (1, 3),	1.81,	41,	578.8,	302.9146,	2477,	5.59,	254,	0.371,	40.6,	240,	color (0.76, 0.56, 0.56),	Q_NA,	},
 {	N_("Germanium"),	Q_NA,	"Ge",	32,	Series::SEMIMETAL,	14,	4,	Block::P,	5.323,	5.60,	Q_NA,	N_("Grayish-white metal"),	Event (1886, N_("Germany")),	"Clemens Winkler",	N_("Named after Germany (Latin: Germania), where it was discovered."),	72.64,	13.6,	125,	122,	210,	"53 (+4e), 73 (+2e)",	LatticeType::FCC,	225,	FL (3, 565.75, 565.75, 565.75),	FL (3, 90.0, 90.0, 90.0),	"[Ar] 3d<sup>10</sup> 4s<sup>2</sup> 4p<sup>2</sup>",	IL (1, 4),	2.01,	118.94,	762,	1211.40,	3106,	36.94,	334,	0.320,	60.2,	360,	color (0.40, 0.56, 0.56),	Q_NA,	},
 {	N_("Arsenic"),	Q_NA,	"As",	33,	Series::SEMIMETAL,	15,	4,	Block::P,	5.727,	5.22,	Q_NA,	N_("Steel gray, brittle semimetal"),	Event (1250, N_("Germany")),	"Albertus Magnus",	N_("Persian: zarnik (yellow pigment)"),	74.92160,	13.1,	115,	119,	205,	"46 (+5e), 222 (-3e)",	LatticeType::RHO,	166,	FL (3, 375.98, 375.98, 1054.75),	FL (3, 90.0, 90.0, 120.0),	"[Ar] 3d<sup>10</sup> 4s<sup>2</sup> 4p<sup>3</sup>",	IL (3, 5, 3, -2),	2.18,	78.5,	947.0,	1090,	887,	24.44,	Q_NA,	0.329,	50.2,	285,	color (0.74, 0.50, 0.89),	Q_NA,	},
 {	N_("Selenium"),	Q_NA,	"Se",	34,	Series::NONMETAL,	16,	4,	Block::P,	4.81,	3.99,	Q_NA,	N_("A soft gray solid, similar to sulfur"),	Event (1817, N_("Sweden")),	N_("J&#246;ns Jakob Berzelius"),	N_("Greek: selene (the moon)"),	78.96,	16.5,	115,	116,	190,	"42 (+6e), 191 (-2e)",	LatticeType::MONO,	14,	FL (3, 905.4, 908.3, 1160.1),	FL (3, 90.0, 90.810, 90.0),	"[Ar] 3d<sup>10</sup> 4s<sup>2</sup> 4p<sup>4</sup>",	IL (3, 6, 4, -2),	2.55,	194.97,	941.0,	494,	958,	6.69,	95.48,	0.321,	0.519,	Q_UNK,	color (1.00, 0.63, 0.00),	N_("Thermal conductivity value is for amorphous selenium. Where variable, other values are for gray selenium."),	},