Camera

Merge lp:~leonardolemos/snap-elementary/fix-1610468 into lp:snap-elementary

  1. fix-1610468
  2. Merge into snap
Proposed by Leonardo Lemos
Status: Merged
Approved by: Danielle Foré
Approved revision: 405
Merged at revision: 404
Proposed branch: lp:~leonardolemos/snap-elementary/fix-1610468
Merge into: lp:snap-elementary
Diff against target: 50 lines (+8/-8)
2 files modified
po/CMakeLists.txt (+3/-3)
po/snap-photobooth.pot (+5/-5)
To merge this branch: bzr merge lp:~leonardolemos/snap-elementary/fix-1610468
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+306031@code.launchpad.net

Commit message

* Fix data files names.
* Update Translation template.

Description of the change

This branch fixes the data filenames in the CMakeLists.txt file of the PO directory and make it build Snap again. Also updates the Translation Template to fix lp:1610468.

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/CMakeLists.txt'
2--- po/CMakeLists.txt 2016-07-30 18:16:04 +0000
3+++ po/CMakeLists.txt 2016-09-17 18:18:21 +0000
4@@ -3,8 +3,8 @@
5 add_translations_catalog (${GETTEXT_PACKAGE}
6 ../src
7 DESKTOP_FILES
8- ${CMAKE_BINARY_DIR}/data/snap-photobooth.desktop.in
9- ${CMAKE_BINARY_DIR}/data/snap-photobooth-original.desktop.in
10+ ${CMAKE_BINARY_DIR}/data/org.pantheon.snap.desktop.in
11+ ${CMAKE_BINARY_DIR}/data/org.pantheon.snap-original.desktop.in
12 APPDATA_FILES
13- ../data/snap-photobooth.appdata.xml.in
14+ ../data/org.pantheon.snap.appdata.xml.in
15 )
16
17=== modified file 'po/snap-photobooth.pot'
18--- po/snap-photobooth.pot 2016-07-30 18:16:04 +0000
19+++ po/snap-photobooth.pot 2016-09-17 18:18:21 +0000
20@@ -8,7 +8,7 @@
21 msgstr ""
22 "Project-Id-Version: PACKAGE VERSION\n"
23 "Report-Msgid-Bugs-To: \n"
24-"POT-Creation-Date: 2016-07-30 20:15+0200\n"
25+"POT-Creation-Date: 2016-09-17 15:07-0300\n"
26 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
27 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
28 "Language-Team: LANGUAGE <LL@li.org>\n"
29@@ -17,6 +17,10 @@
30 "Content-Type: text/plain; charset=UTF-8\n"
31 "Content-Transfer-Encoding: 8bit\n"
32
33+#: ../src/Widgets/LoadingView.vala:49
34+msgid "Searching for video devices…"
35+msgstr ""
36+
37 #: ../src/MainWindow.vala:80
38 msgid "No Supported Camera Found"
39 msgstr ""
40@@ -30,10 +34,6 @@
41 msgid "Connecting to \"%s\"…"
42 msgstr ""
43
44-#: ../src/Widgets/LoadingView.vala:49
45-msgid "Searching for video devices…"
46-msgstr ""
47-
48 #: ../src/Application.vala:54
49 msgid "translator-credits"
50 msgstr ""

Subscribers

People subscribed via source and target branches