Merge lp:~leonardolemos/switchboard-plug-power/fix-1574376 into lp:~elementary-apps/switchboard-plug-power/trunk

Proposed by Leonardo Lemos
Status: Merged
Approved by: Cody Garver
Approved revision: 298
Merged at revision: 299
Proposed branch: lp:~leonardolemos/switchboard-plug-power/fix-1574376
Merge into: lp:~elementary-apps/switchboard-plug-power/trunk
Diff against target: 185 lines (+90/-44)
2 files modified
po/pantheon-power-plug.pot (+69/-44)
src/Translations.vala (+21/-0)
To merge this branch: bzr merge lp:~leonardolemos/switchboard-plug-power/fix-1574376
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+294064@code.launchpad.net

Commit message

Add Translations.vala

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/pantheon-power-plug.pot'
2--- po/pantheon-power-plug.pot 2016-05-01 00:06:36 +0000
3+++ po/pantheon-power-plug.pot 2016-05-07 13:33:16 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2016-04-30 17:06-0700\n"
9+"POT-Creation-Date: 2016-05-07 17:29+0400\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -17,6 +17,63 @@
14 "Content-Type: text/plain; charset=CHARSET\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17+#. //launchpad.net/switchboard-plug-power)
18+#. *
19+#. * This program is free software; you can redistribute it and/or
20+#. * modify it under the terms of the GNU General Public
21+#. * License as published by the Free Software Foundation; either
22+#. * version 2 of the License, or (at your option) any later version.
23+#. *
24+#. * This program is distributed in the hope that it will be useful,
25+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
26+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27+#. * General Public License for more details.
28+#. *
29+#. * You should have received a copy of the GNU General Public
30+#. * License along with this program; if not, write to the
31+#. * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
32+#. * Boston, MA 02111-1307, USA.
33+#.
34+#: ../src/Translations.vala:20
35+msgid "Manage power settings "
36+msgstr ""
37+
38+#: ../src/Translations.vala:21
39+msgid "Authentication is required to manage power settings"
40+msgstr ""
41+
42+#: ../src/LidCloseActionComboBox.vala:33 ../src/ActionComboBox.vala:37
43+msgid "Suspend"
44+msgstr ""
45+
46+#: ../src/LidCloseActionComboBox.vala:34 ../src/ActionComboBox.vala:38
47+msgid "Shutdown"
48+msgstr ""
49+
50+#: ../src/LidCloseActionComboBox.vala:35
51+msgid "Lock"
52+msgstr ""
53+
54+#: ../src/LidCloseActionComboBox.vala:36
55+msgid "Halt"
56+msgstr ""
57+
58+#: ../src/LidCloseActionComboBox.vala:37 ../src/ActionComboBox.vala:41
59+msgid "Do nothing"
60+msgstr ""
61+
62+#: ../src/LidCloseActionComboBox.vala:39
63+msgid "Not supported"
64+msgstr ""
65+
66+#: ../src/ActionComboBox.vala:39
67+msgid "Hibernate"
68+msgstr ""
69+
70+#: ../src/ActionComboBox.vala:40
71+msgid "Ask me"
72+msgstr ""
73+
74 #: ../src/Plug.vala:39
75 msgid "You do not have permission to change this"
76 msgstr ""
77@@ -53,35 +110,35 @@
78 msgid "Automatically adjust brightness:"
79 msgstr ""
80
81-#: ../src/Plug.vala:225
82-msgid "Dim display when inactive:"
83-msgstr ""
84-
85-#: ../src/Plug.vala:247
86+#: ../src/Plug.vala:238
87 msgid "Turn off display when inactive for:"
88 msgstr ""
89
90-#: ../src/Plug.vala:254
91+#: ../src/Plug.vala:245
92 msgid "Sleep button:"
93 msgstr ""
94
95-#: ../src/Plug.vala:257
96+#: ../src/Plug.vala:248
97 msgid "Power button:"
98 msgstr ""
99
100-#: ../src/Plug.vala:275
101+#: ../src/Plug.vala:266
102 msgid "Sleep when inactive for:"
103 msgstr ""
104
105-#: ../src/Plug.vala:285
106+#: ../src/Plug.vala:276
107 msgid "When docked and lid is closed:"
108 msgstr ""
109
110-#: ../src/Plug.vala:286
111+#: ../src/Plug.vala:277
112 msgid "When lid is closed:"
113 msgstr ""
114
115-#: ../src/Plug.vala:289
116+#: ../src/Plug.vala:280
117+msgid "Dim display when inactive:"
118+msgstr ""
119+
120+#: ../src/Plug.vala:288
121 msgid "When power is critically low:"
122 msgstr ""
123
124@@ -116,35 +173,3 @@
125 #: ../src/TimeoutComboBox.vala:49
126 msgid "2 hours"
127 msgstr ""
128-
129-#: ../src/ActionComboBox.vala:37 ../src/LidCloseActionComboBox.vala:33
130-msgid "Suspend"
131-msgstr ""
132-
133-#: ../src/ActionComboBox.vala:38 ../src/LidCloseActionComboBox.vala:34
134-msgid "Shutdown"
135-msgstr ""
136-
137-#: ../src/ActionComboBox.vala:39
138-msgid "Hibernate"
139-msgstr ""
140-
141-#: ../src/ActionComboBox.vala:40
142-msgid "Ask me"
143-msgstr ""
144-
145-#: ../src/ActionComboBox.vala:41 ../src/LidCloseActionComboBox.vala:37
146-msgid "Do nothing"
147-msgstr ""
148-
149-#: ../src/LidCloseActionComboBox.vala:35
150-msgid "Lock"
151-msgstr ""
152-
153-#: ../src/LidCloseActionComboBox.vala:36
154-msgid "Halt"
155-msgstr ""
156-
157-#: ../src/LidCloseActionComboBox.vala:39
158-msgid "Not supported"
159-msgstr ""
160
161=== added file 'src/Translations.vala'
162--- src/Translations.vala 1970-01-01 00:00:00 +0000
163+++ src/Translations.vala 2016-05-07 13:33:16 +0000
164@@ -0,0 +1,21 @@
165+/*
166+ * Copyright (c) 2011-2016 elementary LLC. (https://launchpad.net/switchboard-plug-power)
167+ *
168+ * This program is free software; you can redistribute it and/or
169+ * modify it under the terms of the GNU General Public
170+ * License as published by the Free Software Foundation; either
171+ * version 2 of the License, or (at your option) any later version.
172+ *
173+ * This program is distributed in the hope that it will be useful,
174+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
175+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
176+ * General Public License for more details.
177+ *
178+ * You should have received a copy of the GNU General Public
179+ * License along with this program; if not, write to the
180+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
181+ * Boston, MA 02111-1307, USA.
182+ */
183+
184+_("Manage power settings ");
185+_("Authentication is required to manage power settings");

Subscribers

People subscribed via source and target branches

to all changes: