1
=== modified file 'src/app/qml/AlternateActionPopover.qml'
2
--- src/app/qml/AlternateActionPopover.qml	2014-11-12 00:52:56 +0000
3
+++ src/app/qml/AlternateActionPopover.qml	2014-12-10 09:46:55 +0000
4
@@ -16,14 +16,14 @@
5
16
                right: parent.right
16
                right: parent.right
6
17
            }
17
            }
7
18
            ListItem.Standard {
18
            ListItem.Standard {
9
19
                text: "Copy"
19
                text: i18n.tr("Copy")
10
20
                onClicked: {
20
                onClicked: {
11
21
                    terminal.copyClipboard();
21
                    terminal.copyClipboard();
12
22
                    popover.hide();
22
                    popover.hide();
13
23
                }
23
                }
14
24
            }
24
            }
15
25
            ListItem.Standard {
25
            ListItem.Standard {
17
26
                text: "Paste"
26
                text: i18n.tr("Paste")
18
27
                onClicked: {
27
                onClicked: {
19
28
                    terminal.pasteClipboard();
28
                    terminal.pasteClipboard();
20
29
                    popover.hide();
29
                    popover.hide();
Status:	Merged
Merged at revision:	29
Proposed branch:	lp:~developersw/ubuntu-terminal-app/make-strings-translatable2
Merge into:	lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target:	20 lines (+2/-2) 1 file modified src/app/qml/AlternateActionPopover.qml (+2/-2)
To merge this branch:	bzr merge lp:~developersw/ubuntu-terminal-app/make-strings-translatable2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Terminal Developers		2014-12-10	Pending
Review via email: mp+244265@code.launchpad.net
1	=== modified file 'src/app/qml/AlternateActionPopover.qml'
2	--- src/app/qml/AlternateActionPopover.qml 2014-11-12 00:52:56 +0000
3	+++ src/app/qml/AlternateActionPopover.qml 2014-12-10 09:46:55 +0000
4	@@ -16,14 +16,14 @@
5	16	right: parent.right	16	right: parent.right
6	17	}	17	}
7	18	ListItem.Standard {	18	ListItem.Standard {
9	19	text: "Copy"	19	text: i18n.tr("Copy")
10	20	onClicked: {	20	onClicked: {
11	21	terminal.copyClipboard();	21	terminal.copyClipboard();
12	22	popover.hide();	22	popover.hide();
13	23	}	23	}
14	24	}	24	}
15	25	ListItem.Standard {	25	ListItem.Standard {
17	26	text: "Paste"	26	text: i18n.tr("Paste")
18	27	onClicked: {	27	onClicked: {
19	28	terminal.pasteClipboard();	28	terminal.pasteClipboard();
20	29	popover.hide();	29	popover.hide();