Photos

Merge lp:~leonardolemos/pantheon-photos/fix-1378697 into lp:~pantheon-photos/pantheon-photos/trunk

  1. fix-1378697
  2. Merge into trunk
Proposed by Leonardo Lemos
Status: Merged
Approved by: Cody Garver
Approved revision: 2844
Merged at revision: 2843
Proposed branch: lp:~leonardolemos/pantheon-photos/fix-1378697
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 202 lines (+31/-26)
3 files modified
po/POTFILES.in (+1/-0)
po/shotwell.pot (+29/-25)
src/sidebar/metadata/MetadataSidebar.vala (+1/-1)
To merge this branch: bzr merge lp:~leonardolemos/pantheon-photos/fix-1378697
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+279168@code.launchpad.net

Commit message

Add MetadataSidebar.vala to translations

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/POTFILES.in'
2--- po/POTFILES.in 2014-08-31 21:28:12 +0000
3+++ po/POTFILES.in 2015-12-01 18:29:03 +0000
4@@ -170,6 +170,7 @@
5 src/sidebar/Sidebar.vala
6 src/sidebar/Tree.vala
7 src/sidebar/common.vala
8+src/sidebar/metadata/MetadataSidebar.vala
9 src/slideshow/Slideshow.vala
10 src/slideshow/TransitionEffects.vala
11 src/tags/Branch.vala
12
13=== modified file 'po/shotwell.pot'
14--- po/shotwell.pot 2015-09-07 18:31:30 +0000
15+++ po/shotwell.pot 2015-12-01 18:29:03 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: PACKAGE VERSION\n"
19 "Report-Msgid-Bugs-To: \n"
20-"POT-Creation-Date: 2015-09-07 11:31-0700\n"
21+"POT-Creation-Date: 2015-12-01 16:24-0200\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25@@ -823,12 +823,12 @@
26 msgstr ""
27
28 #: ../src/CollectionPage.vala:73 ../src/CollectionPage.vala:206
29-#: ../src/PhotoPage.vala:2421 ../src/PhotoPage.vala:2682
30+#: ../src/PhotoPage.vala:2427 ../src/PhotoPage.vala:2688
31 msgid "S_lideshow"
32 msgstr ""
33
34 #: ../src/CollectionPage.vala:74 ../src/CollectionPage.vala:207
35-#: ../src/PhotoPage.vala:2422 ../src/PhotoPage.vala:2683
36+#: ../src/PhotoPage.vala:2428 ../src/PhotoPage.vala:2689
37 msgid "Play a slideshow"
38 msgstr ""
39
40@@ -841,7 +841,7 @@
41 msgstr ""
42
43 #: ../src/CollectionPage.vala:526 ../src/Dialogs.vala:58
44-#: ../src/PhotoPage.vala:3279
45+#: ../src/PhotoPage.vala:3285
46 msgid "Export Photo"
47 msgstr ""
48
49@@ -1729,11 +1729,11 @@
50 msgid "Import to Library"
51 msgstr ""
52
53-#: ../src/Dialogs.vala:2068 ../src/PhotoPage.vala:3200
54+#: ../src/Dialogs.vala:2068 ../src/PhotoPage.vala:3206
55 msgid "Remove From Library"
56 msgstr ""
57
58-#: ../src/Dialogs.vala:2069 ../src/PhotoPage.vala:3200
59+#: ../src/Dialogs.vala:2069 ../src/PhotoPage.vala:3206
60 msgid "Removing Photo From Library"
61 msgstr ""
62
63@@ -1812,7 +1812,7 @@
64 msgid "Adjust the size of the thumbnails"
65 msgstr ""
66
67-#: ../src/MediaPage.vala:299 ../src/PhotoPage.vala:2643
68+#: ../src/MediaPage.vala:299 ../src/PhotoPage.vala:2649
69 #: ../src/direct/DirectPhotoPage.vala:181
70 msgid "Zoom _In"
71 msgstr ""
72@@ -1821,7 +1821,7 @@
73 msgid "Increase the magnification of the thumbnails"
74 msgstr ""
75
76-#: ../src/MediaPage.vala:306 ../src/PhotoPage.vala:2650
77+#: ../src/MediaPage.vala:306 ../src/PhotoPage.vala:2656
78 #: ../src/direct/DirectPhotoPage.vala:188
79 msgid "Zoom _Out"
80 msgstr ""
81@@ -1834,7 +1834,7 @@
82 msgid "Sort _Photos"
83 msgstr ""
84
85-#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2687
86+#: ../src/MediaPage.vala:345 ../src/PhotoPage.vala:2693
87 msgid "_Developer"
88 msgstr ""
89
90@@ -1950,72 +1950,72 @@
91 msgid "Next photo"
92 msgstr ""
93
94-#: ../src/PhotoPage.vala:1902
95+#: ../src/PhotoPage.vala:1908
96 #, c-format
97 msgid "Photo source file missing: %s"
98 msgstr ""
99
100-#: ../src/PhotoPage.vala:2506 ../src/direct/DirectPhotoPage.vala:171
101+#: ../src/PhotoPage.vala:2512 ../src/direct/DirectPhotoPage.vala:171
102 msgid "_View"
103 msgstr ""
104
105-#: ../src/PhotoPage.vala:2510 ../src/direct/DirectPhotoPage.vala:80
106+#: ../src/PhotoPage.vala:2516 ../src/direct/DirectPhotoPage.vala:80
107 msgid "T_ools"
108 msgstr ""
109
110-#: ../src/PhotoPage.vala:2516 ../src/direct/DirectPhotoPage.vala:86
111+#: ../src/PhotoPage.vala:2522 ../src/direct/DirectPhotoPage.vala:86
112 msgid "_Previous Photo"
113 msgstr ""
114
115-#: ../src/PhotoPage.vala:2517 ../src/direct/DirectPhotoPage.vala:87
116+#: ../src/PhotoPage.vala:2523 ../src/direct/DirectPhotoPage.vala:87
117 msgid "Previous Photo"
118 msgstr ""
119
120-#: ../src/PhotoPage.vala:2523 ../src/direct/DirectPhotoPage.vala:93
121+#: ../src/PhotoPage.vala:2529 ../src/direct/DirectPhotoPage.vala:93
122 msgid "_Next Photo"
123 msgstr ""
124
125-#: ../src/PhotoPage.vala:2524 ../src/direct/DirectPhotoPage.vala:94
126+#: ../src/PhotoPage.vala:2530 ../src/direct/DirectPhotoPage.vala:94
127 msgid "Next Photo"
128 msgstr ""
129
130-#: ../src/PhotoPage.vala:2644 ../src/direct/DirectPhotoPage.vala:182
131+#: ../src/PhotoPage.vala:2650 ../src/direct/DirectPhotoPage.vala:182
132 msgid "Increase the magnification of the photo"
133 msgstr ""
134
135-#: ../src/PhotoPage.vala:2651 ../src/direct/DirectPhotoPage.vala:189
136+#: ../src/PhotoPage.vala:2657 ../src/direct/DirectPhotoPage.vala:189
137 msgid "Decrease the magnification of the photo"
138 msgstr ""
139
140-#: ../src/PhotoPage.vala:2657 ../src/direct/DirectPhotoPage.vala:195
141+#: ../src/PhotoPage.vala:2663 ../src/direct/DirectPhotoPage.vala:195
142 msgid "Fit to _Page"
143 msgstr ""
144
145-#: ../src/PhotoPage.vala:2658 ../src/direct/DirectPhotoPage.vala:196
146+#: ../src/PhotoPage.vala:2664 ../src/direct/DirectPhotoPage.vala:196
147 msgid "Zoom the photo to fit on the screen"
148 msgstr ""
149
150-#: ../src/PhotoPage.vala:2665 ../src/direct/DirectPhotoPage.vala:203
151+#: ../src/PhotoPage.vala:2671 ../src/direct/DirectPhotoPage.vala:203
152 #, no-c-format
153 msgid "Zoom _100%"
154 msgstr ""
155
156-#: ../src/PhotoPage.vala:2667 ../src/direct/DirectPhotoPage.vala:205
157+#: ../src/PhotoPage.vala:2673 ../src/direct/DirectPhotoPage.vala:205
158 #, no-c-format
159 msgid "Zoom the photo to 100% magnification"
160 msgstr ""
161
162-#: ../src/PhotoPage.vala:2674 ../src/direct/DirectPhotoPage.vala:212
163+#: ../src/PhotoPage.vala:2680 ../src/direct/DirectPhotoPage.vala:212
164 #, no-c-format
165 msgid "Zoom _200%"
166 msgstr ""
167
168-#: ../src/PhotoPage.vala:2676 ../src/direct/DirectPhotoPage.vala:214
169+#: ../src/PhotoPage.vala:2682 ../src/direct/DirectPhotoPage.vala:214
170 #, no-c-format
171 msgid "Zoom the photo to 200% magnification"
172 msgstr ""
173
174-#: ../src/PhotoPage.vala:3299
175+#: ../src/PhotoPage.vala:3305
176 #, c-format
177 msgid "Unable to export %s: %s"
178 msgstr ""
179@@ -4013,6 +4013,10 @@
180 msgid "New _Tag..."
181 msgstr ""
182
183+#: ../src/sidebar/metadata/MetadataSidebar.vala:13
184+msgid "No items selected"
185+msgstr ""
186+
187 #: ../src/slideshow/Slideshow.vala:22
188 msgid "Slideshow Transitions"
189 msgstr ""
190
191=== modified file 'src/sidebar/metadata/MetadataSidebar.vala'
192--- src/sidebar/metadata/MetadataSidebar.vala 2015-03-09 05:05:34 +0000
193+++ src/sidebar/metadata/MetadataSidebar.vala 2015-12-01 18:29:03 +0000
194@@ -10,7 +10,7 @@
195 private Gtk.Grid grid = new Gtk.Grid ();
196 private int line_count = 0;
197 private BasicProperties colletion_page_properties = new BasicProperties ();
198- private Gtk.Label no_items_label = new Gtk.Label ("No items selected");
199+ private Gtk.Label no_items_label = new Gtk.Label (_("No items selected"));
200 public const int SIDEBAR_PADDING = 12;
201 public MetadataView () {
202 set_policy (Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);

Subscribers

People subscribed via source and target branches