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

Proposed by Lyn Perrine
Status: Needs review
Proposed branch: lp:~walterorlin/ubuntu/vivid/galculator/radian
Merge into: lp:ubuntu/vivid/galculator
Diff against target: 65 lines (+10/-4)
5 files modified
ChangeLog (+1/-1)
NEWS (+1/-1)
debian/changelog (+6/-0)
doc/galculator.1 (+1/-1)
doc/shortcuts (+1/-1)
To merge this branch: bzr merge lp:~walterorlin/ubuntu/vivid/galculator/radian
Reviewer Review Type Date Requested Status
Walter Lapchynski (community) Approve
Review via email: mp+253838@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Walter Lapchynski (wxl) wrote :

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

review: Approve
Revision history for this message
Walter Lapchynski (wxl) wrote :

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

Unmerged revisions

13. By Lyn Perrine

fix more radiant instead of radian typos.

12. By Lyn Perrine

s/radiant/radian/ closes launchpad #1378042

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2014-03-17 14:55:11 +0000
3+++ ChangeLog 2015-03-23 15:22:52 +0000
4@@ -649,7 +649,7 @@
5 Set Button group visibility ([menu]Settings->Show Buttons)
6 20-11-2002 display capabilities update for DEC/HEX/OCT/BIN
7 19-11-2002 char <-> double converting (dec/hex/oct/bin)
8-15-11-2002 support for radiant, degree and grad
9+15-11-2002 support for radian, degree and grad
10 the INV and HYP button can't be activated both at the same time (there is no asinh!)
11 added mod and lsh operation
12
13
14=== modified file 'NEWS'
15--- NEWS 2013-02-11 22:29:19 +0000
16+++ NEWS 2015-03-23 15:22:52 +0000
17@@ -120,7 +120,7 @@
18
19 galculator 0.9
20 Support for decimal, hexadecimal, octal and binary numbers.
21- Support for three different base units: radiant, degree and grad.
22+ Support for three different base units: radian, degree and grad.
23 new operations/functions: MOD, LSH, AND, OR, XOR, CMP.
24 GUI options (button group visibility, button size, button font).
25 command line arguments.
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2014-03-17 14:55:11 +0000
29+++ debian/changelog 2015-03-23 15:22:52 +0000
30@@ -1,3 +1,9 @@
31+galculator (2.1.3-1ubuntu1) UNRELEASED; urgency=medium
32+
33+ fix typo of radiant instead of radian.*
34+
35+ -- Brendan Perrine <walterorlin@gmail.com> Tue, 17 Mar 2015 15:52:23 -0700
36+
37 galculator (2.1.3-1) unstable; urgency=low
38
39 * New upstream version [March 2014].
40
41=== modified file 'doc/galculator.1'
42--- doc/galculator.1 2013-02-11 22:29:19 +0000
43+++ doc/galculator.1 2015-03-23 15:22:52 +0000
44@@ -12,7 +12,7 @@
45 \fBgalculator\fP is a GTK 2 / GTK 3 based calculator with basic and scientific modes.
46 It supports algebraic notation, RPN (Reverse Polish Notation) and formula entry
47 mode, different number bases (decimal, hexadecimal, octal, and binary) and angle
48-bases (radiant, degree, and grad). Further features include arithmetic operations
49+bases (radian, degree, and grad). Further features include arithmetic operations
50 plus precedence handling, trigonometric functions, power, sqare root, natural and
51 common logarithm, constants (e, PI, user defined), memory and inverse and
52 hyperbolic functions and user defined functions.
53
54=== modified file 'doc/shortcuts'
55--- doc/shortcuts 2004-05-27 01:09:49 +0000
56+++ doc/shortcuts 2015-03-23 15:22:52 +0000
57@@ -71,7 +71,7 @@
58 Ctrl-O change to octal number base
59 Ctrl-B change to binary number base
60 Ctrl-E change to degree angle base
61-Ctrl-R change to radiant angle base
62+Ctrl-R change to radian angle base
63 Ctrl-G change to GRAD angle base
64 Ctrl-A change to (normal) algebraic notation
65 Ctrl-N change to Reverse Polish Notation (RPN)

Subscribers

People subscribed via source and target branches

to all changes: