Merge lp:~dstansby-deactivatedaccount/ubuntu/maverick/scim-pinyin/scim-pinyin-fix-59020 into lp:ubuntu/maverick/scim-pinyin

Proposed by David Stansby
Status: Rejected
Rejected by: Andrew Starr-Bochicchio
Proposed branch: lp:~dstansby-deactivatedaccount/ubuntu/maverick/scim-pinyin/scim-pinyin-fix-59020
Merge into: lp:ubuntu/maverick/scim-pinyin
Diff against target: 83 lines (+13/-7)
3 files modified
debian/changelog (+6/-0)
src/scim_pinyin_imengine.cpp (+1/-1)
src/scim_pinyin_imengine_setup.cpp (+6/-6)
To merge this branch: bzr merge lp:~dstansby-deactivatedaccount/ubuntu/maverick/scim-pinyin/scim-pinyin-fix-59020
Reviewer Review Type Date Requested Status
David Stansby (community) Disapprove
Andrew Starr-Bochicchio Needs Fixing
Review via email: mp+27359@code.launchpad.net

Description of the change

Fixed typos

To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

See comments by Fabrice and myself in Bug #59020

review: Needs Fixing
Revision history for this message
David Stansby (dstansby-deactivatedaccount) wrote :

I've made a new branch with the requested changes

review: Disapprove

Unmerged revisions

19. By David Stansby

*Fix typos (lp: #59020)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-10-10 19:28:50 +0000
3+++ debian/changelog 2010-06-11 13:48:33 +0000
4@@ -1,3 +1,9 @@
5+scim-pinyin (0.5.91-1ubuntu3) maverick; urgency=low
6+
7+ *Fix typos (lp: #59020)
8+
9+ -- David Stansby <dstansby@gmail.com> Fri, 11 Jun 2010 14:44:51 +0100
10+
11 scim-pinyin (0.5.91-1ubuntu2) karmic; urgency=low
12
13 * Configure with --without-arts to fix build failure. LP: #445658.
14
15=== modified file 'src/scim_pinyin_imengine.cpp'
16--- src/scim_pinyin_imengine.cpp 2006-03-02 19:18:00 +0000
17+++ src/scim_pinyin_imengine.cpp 2010-06-11 13:48:33 +0000
18@@ -603,7 +603,7 @@
19 " string of the current date.\n"
20 " Input \"imath\" will give you the\n"
21 " common mathematic symbols.\n"
22- " For more informat about this mode,\n"
23+ " For more information about this mode,\n"
24 " please refer to\n"
25 " /usr/share/scim/pinyin/special_table"));
26
27
28=== modified file 'src/scim_pinyin_imengine_setup.cpp'
29--- src/scim_pinyin_imengine_setup.cpp 2006-03-02 19:18:00 +0000
30+++ src/scim_pinyin_imengine_setup.cpp 2010-06-11 13:48:33 +0000
31@@ -780,7 +780,7 @@
32
33 gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_combine_phrase,
34 _("If this option is checked, "
35- "the inputed phrases will be combined to one longer "
36+ "the inputted phrases will be combined to one longer "
37 "phrase automatically."), NULL);
38
39 gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_fill_preedit,
40@@ -790,7 +790,7 @@
41
42 gtk_tooltips_set_tip (__widget_tooltips, __widget_match_longer_phrase,
43 _("If this option is checked, "
44- "the phrases which are longer than the inputed keys "
45+ "the phrases which are longer than the inputted keys "
46 "can also be matched. "
47 "This option is valid only when "
48 "\"Auto combine phrase\" is checked."), NULL);
49@@ -802,14 +802,14 @@
50
51 gtk_tooltips_set_tip (__widget_tooltips, __widget_show_all_keys,
52 _("If this option is checked, "
53- "all inputed keys will be shown. "
54+ "all inputted keys will be shown. "
55 "This option is valid only when "
56 "\"Auto fill preedit\" is checked."), NULL);
57
58 gtk_tooltips_set_tip (__widget_tooltips, __widget_dynamic_adjust,
59 _("If this option is checked, "
60 "the phrase library will be adjusted dynamically "
61- "according to the inputed contents. "
62+ "according to the inputted contents. "
63 "The changed part of the phrase library will be "
64 "stored into local files owned by the user."), NULL);
65
66@@ -827,7 +827,7 @@
67
68 gtk_tooltips_set_tip (__widget_tooltips, __widget_burst_stack_size,
69 _("The size of the burst stack. "
70- "Newly inputed phrases will be put into the "
71+ "Newly inputted phrases will be put into the "
72 "burst stack. The phrases in this stack "
73 "have higher priority than others."), NULL);
74
75@@ -853,7 +853,7 @@
76 gtk_tooltips_set_tip (__widget_tooltips, __widget_ambiguities [0],
77 _("The following options control the ambiguous "
78 "behaviour of the pinyin matching algorithm. "
79- "Turn on them as you wish, if you can't "
80+ "Turn them on as you wish, if you can't "
81 "distinguish between them."), NULL);
82
83 for (i = 0; __config_keyboards [i].key; ++ i) {

Subscribers

People subscribed via source and target branches

to all changes: