Merge lp:~walterorlin/ubuntu/vivid/galculator/radian into lp:ubuntu/vivid/galculator

[Lyn Perrine]

Fix typos where radian was misspelled as radiant. radian is the proper word to describe angles they do not glow.

[ԜаӀtеr Ⅼарсһуnѕkі (wxl)]

yep, that's the lot of them. easy fix, really.

review: Approve

[ԜаӀtеr Ⅼарсһуnѕkі (wxl)]

I do suggest adding the maintainers so you can get a proper merge.

Unmerged revisions

13. By Lyn Perrine on 2015-03-17

fix more radiant instead of radian typos.

12. By Lyn Perrine on 2015-03-11

s/radiant/radian/ closes launchpad #1378042

=== modified file 'ChangeLog'
--- ChangeLog	2014-03-17 14:55:11 +0000
+++ ChangeLog	2015-03-23 15:22:52 +0000
@@ -649,7 +649,7 @@
 	Set Button group visibility ([menu]Settings->Show Buttons)
 20-11-2002 display capabilities update for DEC/HEX/OCT/BIN
 19-11-2002 char <-> double converting (dec/hex/oct/bin)
-15-11-2002 support for radiant, degree and grad
[phone] support for radian, degree and grad
 	the INV and HYP button can't be activated both at the same time (there is no asinh!)
 	added mod and lsh operation
 
 
=== modified file 'NEWS'
--- NEWS	2013-02-11 22:29:19 +0000
+++ NEWS	2015-03-23 15:22:52 +0000
@@ -120,7 +120,7 @@
 
 galculator 0.9
 	Support for decimal, hexadecimal, octal and binary numbers. 
-	Support for three different base units: radiant, degree and grad. 
+	Support for three different base units: radian, degree and grad. 
 	new operations/functions: MOD, LSH, AND, OR, XOR, CMP.
 	GUI options (button group visibility, button size, button font). 
 	command line arguments.
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-17 14:55:11 +0000
+++ debian/changelog	2015-03-23 15:22:52 +0000
@@ -1,3 +1,9 @@
+galculator (2.1.3-1ubuntu1) UNRELEASED; urgency=medium
+
+  fix typo of radiant instead of radian.* 
+
+ -- Brendan Perrine <[e-mail]>  Tue, 17 Mar 2015 15:52:23 -0700
+
 galculator (2.1.3-1) unstable; urgency=low
 
   * New upstream version [March 2014].
 
=== modified file 'doc/galculator.1'
--- doc/galculator.1	2013-02-11 22:29:19 +0000
+++ doc/galculator.1	2015-03-23 15:22:52 +0000
@@ -12,7 +12,7 @@
 \fBgalculator\fP is a GTK 2 / GTK 3 based calculator with basic and scientific modes.
 It supports algebraic notation, RPN (Reverse Polish Notation) and formula entry
 mode, different number bases (decimal, hexadecimal, octal, and binary) and angle 
-bases (radiant, degree, and grad). Further features include arithmetic operations 
+bases (radian, degree, and grad). Further features include arithmetic operations 
 plus precedence handling, trigonometric functions, power, sqare root, natural and 
 common logarithm, constants (e, PI, user defined), memory and inverse and 
 hyperbolic functions and user defined functions. 
 
=== modified file 'doc/shortcuts'
--- doc/shortcuts	2004-05-27 01:09:49 +0000
+++ doc/shortcuts	2015-03-23 15:22:52 +0000
@@ -71,7 +71,7 @@
 Ctrl-O	change to octal number base
 Ctrl-B	change to binary number base
 Ctrl-E	change to degree angle base
-Ctrl-R	change to radiant angle base
+Ctrl-R	change to radian angle base
 Ctrl-G	change to GRAD angle base
 Ctrl-A	change to (normal) algebraic notation
 Ctrl-N	change to Reverse Polish Notation (RPN)