Folder Color

Merge lp:~costales/folder-color/tick-icon into lp:folder-color

  1. tick-icon
  2. Merge into trunk
Proposed by costales
Status: Merged
Approved by: costales
Approved revision: 276
Merged at revision: 273
Proposed branch: lp:~costales/folder-color/tick-icon
Merge into: lp:folder-color
Diff against target: 245 lines (+55/-41)
5 files modified
debian/changelog (+1/-1)
debian/control (+1/-1)
nautilus-extension/folder-color.py (+21/-11)
po/folder-color.pot (+30/-26)
setup.py (+2/-2)
To merge this branch: bzr merge lp:~costales/folder-color/tick-icon
Reviewer Review Type Date Requested Status
costales Pending
Review via email: mp+328357@code.launchpad.net

Description of the change

Added tick icon

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 'debian/changelog'
2--- debian/changelog 2017-07-10 19:29:01 +0000
3+++ debian/changelog 2017-08-01 13:43:54 +0000
4@@ -1,4 +1,4 @@
5-folder-color (0.0.82) xenial; urgency=low
6+folder-color (0.0.83) xenial; urgency=low
7
8 * Fixed #1703103
9 * Updated translations
10
11=== modified file 'debian/control'
12--- debian/control 2017-07-10 19:29:01 +0000
13+++ debian/control 2017-08-01 13:43:54 +0000
14@@ -1,7 +1,7 @@
15 Source: folder-color
16 Section: utils
17 Priority: extra
18-Standards-Version: 0.0.82
19+Standards-Version: 0.0.83
20 Maintainer: costales <costales.marcos@gmail.com>
21 Build-Depends: python-distutils-extra, debhelper (>=7)
22 Homepage: https://code.launchpad.net/folder-color
23
24=== modified file 'nautilus-extension/folder-color.py'
25--- nautilus-extension/folder-color.py 2017-07-10 19:29:01 +0000
26+++ nautilus-extension/folder-color.py 2017-08-01 13:43:54 +0000
27@@ -1,4 +1,4 @@
28-# Folder Color 0.0.82
29+# Folder Color 0.0.83
30 # Copyright (C) 2012-2017 Marcos Alvarez Costales https://launchpad.net/~costales
31 #
32 # Folder Color is free software; you can redistribute it and/or modify
33@@ -27,7 +27,8 @@
34 """Folder Color Class"""
35 def __init__(self):
36 # Colors
37- self.COLORS = ['black',
38+ self.COLORS = [
39+ 'black',
40 'blue',
41 'brown',
42 'cyan',
43@@ -39,8 +40,10 @@
44 'purple',
45 'red',
46 'violet',
47- 'yellow']
48- self.I18N_COLORS = {'black' : _("Black"),
49+ 'yellow'
50+ ]
51+ self.I18N_COLORS = {
52+ 'black' : _("Black"),
53 'blue' : _("Blue"),
54 'brown' : _("Brown"),
55 'cyan' : _("Cyan"),
56@@ -52,17 +55,24 @@
57 'purple' : _("Purple"),
58 'red' : _("Red"),
59 'violet' : _("Violet"),
60- 'yellow' : _("Yellow")}
61+ 'yellow' : _("Yellow")
62+ }
63
64 # Emblems
65- self.EMBLEMS = ['emblem-favorite',
66+ self.EMBLEMS = [
67 'emblem-important',
68- 'emblem-new',
69- 'emblem-urgent']
70- self.I18N_EMBLEMS = {'emblem-favorite' : _("Favorite"),
71+ 'emblem-urgent',
72+ 'emblem-favorite',
73+ 'emblem-default',
74+ 'emblem-new'
75+ ]
76+ self.I18N_EMBLEMS = {
77 'emblem-important': _("Important"),
78- 'emblem-new' : _("New"),
79- 'emblem-urgent' : _("Urgent")}
80+ 'emblem-urgent' : _("In Progress"),
81+ 'emblem-favorite' : _("Favorite"),
82+ 'emblem-default' : _("Finished"),
83+ 'emblem-new' : _("New")
84+ }
85
86 # Custom color
87 self.PATH_CUSTOM_COLOR = os.path.join(os.getenv('HOME'), '.local', 'share', 'folder-color', 'icons')
88
89=== modified file 'po/folder-color.pot'
90--- po/folder-color.pot 2017-07-02 15:49:59 +0000
91+++ po/folder-color.pot 2017-08-01 13:43:54 +0000
92@@ -8,7 +8,7 @@
93 msgstr ""
94 "Project-Id-Version: PACKAGE VERSION\n"
95 "Report-Msgid-Bugs-To: \n"
96-"POT-Creation-Date: 2017-07-01 16:07+0200\n"
97+"POT-Creation-Date: 2017-08-01 15:36+0200\n"
98 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
99 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
100 "Language-Team: LANGUAGE <LL@li.org>\n"
101@@ -17,94 +17,98 @@
102 "Content-Type: text/plain; charset=CHARSET\n"
103 "Content-Transfer-Encoding: 8bit\n"
104
105-#: nautilus-extension/folder-color.py:44
106+#: ../nautilus-extension/folder-color.py:44
107 msgid "Black"
108 msgstr ""
109
110-#: nautilus-extension/folder-color.py:45
111+#: ../nautilus-extension/folder-color.py:45
112 msgid "Blue"
113 msgstr ""
114
115-#: nautilus-extension/folder-color.py:46
116+#: ../nautilus-extension/folder-color.py:46
117 msgid "Brown"
118 msgstr ""
119
120-#: nautilus-extension/folder-color.py:47
121+#: ../nautilus-extension/folder-color.py:47
122 msgid "Cyan"
123 msgstr ""
124
125-#: nautilus-extension/folder-color.py:48
126+#: ../nautilus-extension/folder-color.py:48
127 msgid "Green"
128 msgstr ""
129
130-#: nautilus-extension/folder-color.py:49
131+#: ../nautilus-extension/folder-color.py:49
132 msgid "Grey"
133 msgstr ""
134
135-#: nautilus-extension/folder-color.py:50
136+#: ../nautilus-extension/folder-color.py:50
137 msgid "Magenta"
138 msgstr ""
139
140-#: nautilus-extension/folder-color.py:51
141+#: ../nautilus-extension/folder-color.py:51
142 msgid "Orange"
143 msgstr ""
144
145-#: nautilus-extension/folder-color.py:52
146+#: ../nautilus-extension/folder-color.py:52
147 msgid "Pink"
148 msgstr ""
149
150-#: nautilus-extension/folder-color.py:53
151+#: ../nautilus-extension/folder-color.py:53
152 msgid "Purple"
153 msgstr ""
154
155-#: nautilus-extension/folder-color.py:54
156+#: ../nautilus-extension/folder-color.py:54
157 msgid "Red"
158 msgstr ""
159
160-#: nautilus-extension/folder-color.py:55
161+#: ../nautilus-extension/folder-color.py:55
162 msgid "Violet"
163 msgstr ""
164
165-#: nautilus-extension/folder-color.py:56
166+#: ../nautilus-extension/folder-color.py:56
167 msgid "Yellow"
168 msgstr ""
169
170-#: nautilus-extension/folder-color.py:63
171+#: ../nautilus-extension/folder-color.py:66
172+msgid "Important"
173+msgstr ""
174+
175+#: ../nautilus-extension/folder-color.py:67
176 msgid "Favorite"
177 msgstr ""
178
179-#: nautilus-extension/folder-color.py:64
180-msgid "Important"
181+#: ../nautilus-extension/folder-color.py:68
182+msgid "Finished"
183 msgstr ""
184
185-#: nautilus-extension/folder-color.py:65
186+#: ../nautilus-extension/folder-color.py:69
187 msgid "New"
188 msgstr ""
189
190-#: nautilus-extension/folder-color.py:66
191-msgid "Urgent"
192+#: ../nautilus-extension/folder-color.py:70
193+msgid "In Progress"
194 msgstr ""
195
196-#: nautilus-extension/folder-color.py:186
197+#: ../nautilus-extension/folder-color.py:176
198 msgid "Folders' Color"
199 msgstr ""
200
201-#: nautilus-extension/folder-color.py:188
202+#: ../nautilus-extension/folder-color.py:178
203 msgid "Folder's Color"
204 msgstr ""
205
206-#: nautilus-extension/folder-color.py:209
207+#: ../nautilus-extension/folder-color.py:199
208 msgid "Custom"
209 msgstr ""
210
211-#: nautilus-extension/folder-color.py:215
212+#: ../nautilus-extension/folder-color.py:205
213 msgid "Restore:"
214 msgstr ""
215
216-#: nautilus-extension/folder-color.py:218
217+#: ../nautilus-extension/folder-color.py:208
218 msgid "Default"
219 msgstr ""
220
221-#: nautilus-extension/folder-color.py:229
222+#: ../nautilus-extension/folder-color.py:215
223 msgid "Categorize:"
224 msgstr ""
225
226=== modified file 'setup.py'
227--- setup.py 2017-07-10 19:29:01 +0000
228+++ setup.py 2017-08-01 13:43:54 +0000
229@@ -1,6 +1,6 @@
230 #!/usr/bin/env python3
231
232-# Folder Color 0.0.82 - http://launchpad.net/folder-color
233+# Folder Color 0.0.83 - http://launchpad.net/folder-color
234 # Copyright (C) 2012-2017 Marcos Alvarez Costales https://launchpad.net/~costales
235 #
236 # folder-color is free software; you can redistribute it and/or modify
237@@ -32,7 +32,7 @@
238 # Setup stage
239 DistUtilsExtra.auto.setup(
240 name = "folder-color",
241- version = "0.0.82",
242+ version = "0.0.83",
243 description = "Change your folder color with just a click",
244 author = "Marcos Alvarez Costales https://launchpad.net/~costales",
245 author_email = "https://launchpad.net/~costales",

Subscribers

People subscribed via source and target branches

to all changes: