Merge lp:~ttosttos/eidete/fix-1004294 into lp:eidete

Proposed by ttosttos on 2012-06-07
Status: Merged
Merged at revision: 73
Proposed branch: lp:~ttosttos/eidete/fix-1004294
Merge into: lp:eidete
Diff against target: 231 lines (+54/-37)
4 files modified
CMakeLists.txt (+1/-0)
data/eidete.desktop (+1/-1)
po/eidete.pot (+44/-36)
src/desktop_launcher.vala (+8/-0)
To merge this branch: bzr merge lp:~ttosttos/eidete/fix-1004294
Reviewer Review Type Date Requested Status
Victor Martinez 2012-06-07 Approve on 2012-06-23
Review via email: mp+109065@code.launchpad.net

Description of the change

- Added gettext domain key to eidete.desktop
- created desktop_launcher.vala to have xgettext automatically add launcher strings to translation template

To post a comment you must log in.
ttosttos (ttosttos) wrote :

Earlier merge requests has been sitting for some time. I'd appreciate if someone can review and comment or otherwise merge. Thanks.

Victor Martinez (victored) wrote :

Eidete dev(s) seem to be busy. This looks fine to me.

review: Approve
ttosttos (ttosttos) wrote :

@victored, thanks for approving. Is merge still pending? Status is marked as "needs review". Thanks again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-04-28 16:44:17 +0000
+++ CMakeLists.txt 2012-06-07 05:12:20 +0000
@@ -46,6 +46,7 @@
46 src/Widgets/keyview.vala46 src/Widgets/keyview.vala
47 src/Widgets/selectionarea.vala47 src/Widgets/selectionarea.vala
48 src/Widgets/end_dialog.vala48 src/Widgets/end_dialog.vala
49 src/desktop_launcher.vala
49 ${CMAKE_BINARY_DIR}/src/Config.vala50 ${CMAKE_BINARY_DIR}/src/Config.vala
50PACKAGES51PACKAGES
51 granite52 granite
5253
=== modified file 'data/eidete.desktop'
--- data/eidete.desktop 2012-01-20 21:04:36 +0000
+++ data/eidete.desktop 2012-06-07 05:12:20 +0000
@@ -1,4 +1,3 @@
1
2[Desktop Entry]1[Desktop Entry]
3Type=Application2Type=Application
4Name=Eidete3Name=Eidete
@@ -8,6 +7,7 @@
8Icon=eidete7Icon=eidete
9Terminal=false8Terminal=false
10Categories=GNOME;GTK;Utility;9Categories=GNOME;GTK;Utility;
10X-GNOME-Gettext-Domain=eidete
1111
12X-Ayatana-Desktop-Shortcuts=Pause;Finish12X-Ayatana-Desktop-Shortcuts=Pause;Finish
1313
1414
=== modified file 'po/eidete.pot'
--- po/eidete.pot 2012-06-05 06:14:12 +0000
+++ po/eidete.pot 2012-06-07 05:12:20 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-06-04 22:56-0700\n"11"POT-Creation-Date: 2012-06-06 20:56-0700\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,133 +17,141 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:2720#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/countdown.vala:27
21msgid "Recording starts in"21msgid "Recording starts in"
22msgstr ""22msgstr ""
2323
24#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:3324#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/countdown.vala:33
25msgid "Focus Eidete to stop recording"25msgid "Focus Eidete to stop recording"
26msgstr ""26msgstr ""
2727
28#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:2428#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:24
29msgid "Recording done"29msgid "Recording done"
30msgstr ""30msgstr ""
3131
32#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:2732#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:27
33msgid "And now?"33msgid "And now?"
34msgstr ""34msgstr ""
3535
36#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:2736#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:27
37msgid "</span>"37msgid "</span>"
38msgstr ""38msgstr ""
3939
40#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:3140#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:31
41msgid "Go"41msgid "Go"
42msgstr ""42msgstr ""
4343
44#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:6444#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:64
45msgid "Could not contact Contractor. Click Save to save the file"45msgid "Could not contact Contractor. Click Save to save the file"
46msgstr ""46msgstr ""
4747
48#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:6648#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:66
49#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:10349#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/Widgets/end_dialog.vala:103
50#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/savedialog.vala:850#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/savedialog.vala:8
51msgid "Save"51msgid "Save"
52msgstr ""52msgstr ""
5353
54#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:13954#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:139
55msgid "Monitor"55msgid "Monitor"
56msgstr ""56msgstr ""
5757
58#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:15458#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:154
59msgid "Fullscreen"59msgid "Fullscreen"
60msgstr ""60msgstr ""
6161
62#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:15562#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:155
63msgid "Custom"63msgid "Custom"
64msgstr ""64msgstr ""
6565
66#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:17566#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:175
67msgid "Record"67msgid "Record"
68msgstr ""68msgstr ""
6969
70#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:18770#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:187
71msgid "Sound"71msgid "Sound"
72msgstr ""72msgstr ""
7373
74#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:18874#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:188
75msgid "Record Computer Sounds"75msgid "Record Computer Sounds"
76msgstr ""76msgstr ""
7777
78#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:19078#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:190
79msgid "Record from Microphone"79msgid "Record from Microphone"
80msgstr ""80msgstr ""
8181
82#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:19282#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:192
83msgid "Video"83msgid "Video"
84msgstr ""84msgstr ""
8585
86#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:19386#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:193
87msgid "Record from Monitor"87msgid "Record from Monitor"
88msgstr ""88msgstr ""
8989
90#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:19590#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:195
91msgid "Recording Area"91msgid "Recording Area"
92msgstr ""92msgstr ""
9393
94#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:19794#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:197
95msgid "Width"95msgid "Width"
96msgstr ""96msgstr ""
9797
98#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:19998#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:199
99msgid "Height"99msgid "Height"
100msgstr ""100msgstr ""
101101
102#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:218102#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:218
103msgid "Show pressed keys on screen"103msgid "Show pressed keys on screen"
104msgstr ""104msgstr ""
105105
106#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:220106#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:220
107msgid "Show clicks on screen"107msgid "Show clicks on screen"
108msgstr ""108msgstr ""
109109
110#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:222110#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:222
111msgid "Show circle behind mouse"111msgid "Show circle behind mouse"
112msgstr ""112msgstr ""
113113
114#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:228114#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:228
115msgid "Behaviour"115msgid "Behaviour"
116msgstr ""116msgstr ""
117117
118#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:229118#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:229
119msgid "Appearance"119msgid "Appearance"
120msgstr ""120msgstr ""
121121
122#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:424122#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:424
123msgid "Finish"123msgid "Finish"
124msgstr ""124msgstr ""
125125
126#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:425126#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:425
127msgid "Finish recording"127msgid "Finish recording"
128msgstr ""128msgstr ""
129129
130#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:427130#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:427
131msgid "Record more"131msgid "Record more"
132msgstr ""132msgstr ""
133133
134#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:441134#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:441
135#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:588135#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:588
136msgid "Recording paused"136msgid "Recording paused"
137msgstr ""137msgstr ""
138138
139#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:442139#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:442
140msgid "You can continue or finish the recording now."140msgid "You can continue or finish the recording now."
141msgstr ""141msgstr ""
142142
143#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:598143#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/eidete.vala:598
144msgid "Pause recording"144msgid "Pause recording"
145msgstr ""145msgstr ""
146146
147#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/videobin_uploader.vala:45147#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/videobin_uploader.vala:45
148msgid "Upload"148msgid "Upload"
149msgstr ""149msgstr ""
150
151#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/desktop_launcher.vala:5
152msgid "Record screencasts"
153msgstr ""
154
155#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-1004294/po/../src/desktop_launcher.vala:6
156msgid "Screencaster"
157msgstr ""
150158
=== added file 'src/desktop_launcher.vala'
--- src/desktop_launcher.vala 1970-01-01 00:00:00 +0000
+++ src/desktop_launcher.vala 2012-06-07 05:12:20 +0000
@@ -0,0 +1,8 @@
1namespace DesktopLauncher {
2 /* Translatable launcher (.desktop) strings to be added to */
3 /* template (.pot) file. These strings MUST reflect any */
4 /* changes in these launcher keys in .desktop file. */
5 public const string COMMENT = N_("Record screencasts");
6 public const string GENERIC_NAME = N_("Screencaster");
7
8}

Subscribers

People subscribed via source and target branches

to all changes: