Merge lp:~ttosttos/switchboard/fix-1004294 into lp:~elementary-pantheon/switchboard/switchboard

Proposed by ttosttos on 2012-06-07
Status: Merged
Merge reported by: Avi Romanoff
Merged at revision: not available
Proposed branch: lp:~ttosttos/switchboard/fix-1004294
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 90 lines (+26/-8)
4 files modified
CMakeLists.txt (+1/-0)
Switchboard/desktop-launcher.vala (+8/-0)
data/switchboard.desktop (+3/-2)
po/switchboard.pot (+14/-6)
To merge this branch: bzr merge lp:~ttosttos/switchboard/fix-1004294
Reviewer Review Type Date Requested Status
Avi Romanoff 2012-06-07 Approve on 2012-06-18
Review via email: mp+109076@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Avi Romanoff (aroman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-04-17 07:07:02 +0000
3+++ CMakeLists.txt 2012-06-07 06:26:20 +0000
4@@ -72,6 +72,7 @@
5 Switchboard/switchboard-app.vala
6 Switchboard/switchboard-categoryview.vala
7 Switchboard/switchboard-resources.vala
8+ Switchboard/desktop-launcher.vala
9 PACKAGES
10 granite
11 gee-1.0
12
13=== added file 'Switchboard/desktop-launcher.vala'
14--- Switchboard/desktop-launcher.vala 1970-01-01 00:00:00 +0000
15+++ Switchboard/desktop-launcher.vala 2012-06-07 06:26:20 +0000
16@@ -0,0 +1,8 @@
17+namespace DesktopLauncher {
18+ /* Translatable launcher (.desktop) strings to be added to */
19+ /* template (.pot) file. These strings MUST reflect any */
20+ /* changes in these launcher keys in .desktop file. */
21+ public const string COMMENT = N_("Change system and user settings");
22+ public const string GENERIC_NAME = N_("Settings Center");
23+
24+}
25
26=== modified file 'data/switchboard.desktop'
27--- data/switchboard.desktop 2012-01-17 04:13:54 +0000
28+++ data/switchboard.desktop 2012-06-07 06:26:20 +0000
29@@ -2,9 +2,10 @@
30 Type=Application
31 Version=0.8
32 Name=Switchboard
33-_GenericName=Settings Center
34-_Comment=Change system and user settings
35+GenericName=Settings Center
36+Comment=Change system and user settings
37 Exec=switchboard
38 Icon=preferences-desktop
39 Terminal=false
40 Categories=GTK;Administration;
41+X-GNOME-Gettext-Domain=switchboard
42
43=== modified file 'po/switchboard.pot'
44--- po/switchboard.pot 2012-06-05 05:30:28 +0000
45+++ po/switchboard.pot 2012-06-07 06:26:20 +0000
46@@ -8,7 +8,7 @@
47 msgstr ""
48 "Project-Id-Version: PACKAGE VERSION\n"
49 "Report-Msgid-Bugs-To: \n"
50-"POT-Creation-Date: 2012-06-04 22:26-0700\n"
51+"POT-Creation-Date: 2012-06-06 23:20-0700\n"
52 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
53 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
54 "Language-Team: LANGUAGE <LL@li.org>\n"
55@@ -17,22 +17,30 @@
56 "Content-Type: text/plain; charset=CHARSET\n"
57 "Content-Transfer-Encoding: 8bit\n"
58
59-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-app.vala:387
60+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//desktop-launcher.vala:5
61+msgid "Change system and user settings"
62+msgstr ""
63+
64+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//desktop-launcher.vala:6
65+msgid "Settings Center"
66+msgstr ""
67+
68+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-app.vala:387
69 msgid "Search Plugs"
70 msgstr ""
71
72-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
73+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
74 msgid "Personal"
75 msgstr ""
76
77-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
78+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
79 msgid "Hardware"
80 msgstr ""
81
82-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
83+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
84 msgid "Network and Wireless"
85 msgstr ""
86
87-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
88+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
89 msgid "System"
90 msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: