Merge lp:~davidc3/unity-lens-photos/translation-fix into lp:unity-lens-photos

[David Callé]

Translation fixes for .application file

[David Callé (davidc3)]

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-09-12 09:53:57 +0000
+++ MANIFEST.in	2012-09-18 14:36:20 +0000
@@ -1,5 +1,5 @@
 include unity-lens-photos.service
-include unity-lens-photos.application
+include unity-lens-photos.application.in
 include unity-lens-photos.desktop
 include unity-lens-photos.png
 include photos.lens.in

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-09-10 14:03:05 +0000
+++ po/POTFILES.in	2012-09-18 14:36:20 +0000
@@ -5,3 +5,4 @@
 src/shotwell_scope.py
 src/picasa_scope.py
 [type: gettext/ini]photos.lens.in
+[type: gettext/xml]unity-lens-photos.application.in

=== modified file 'po/unity-lens-photos.pot'
--- po/unity-lens-photos.pot	2012-09-10 14:22:05 +0000
+++ po/unity-lens-photos.pot	2012-09-18 14:36:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-10 16:20+0200\n"
+"POT-Creation-Date: 2012-09-18 16:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,128 +17,145 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/facebook_scope.py:44 src/flickr_scope.py:45 src/picasa_scope.py:44
-#: src/shotwell_scope.py:36 src/shotwell_scope.py~:36
+#: ../src/unity-lens-photos:32
+msgid "My Photos"
+msgstr ""
+
+#: ../src/unity-lens-photos:33
+msgid "Friends Photos"
+msgstr ""
+
+#: ../src/unity-lens-photos:34
+msgid "Online Photos"
+msgstr ""
+
+#: ../src/unity-lens-photos:35 ../photos.lens.in.h:1
+msgid "Photos"
+msgstr ""
+
+#: ../src/unity-lens-photos:36
+msgid "Recent"
+msgstr ""
+
+#: ../src/unity-lens-photos:37
+msgid "Date"
+msgstr ""
+
+#: ../src/unity-lens-photos:38
+msgid "Last 7 days"
+msgstr ""
+
+#: ../src/unity-lens-photos:39
+msgid "Last 30 days"
+msgstr ""
+
+#: ../src/unity-lens-photos:40
+msgid "Last 6 months"
+msgstr ""
+
+#: ../src/unity-lens-photos:41
+msgid "Older"
+msgstr ""
+
+#: ../src/unity-lens-photos:42
+msgid "Sources"
+msgstr ""
+
+#: ../src/unity-lens-photos:43 ../photos.lens.in.h:2
+msgid "Search Photos"
+msgstr ""
+
+#: ../src/flickr_scope.py:45 ../src/facebook_scope.py:44
+#: ../src/shotwell_scope.py:36 ../src/picasa_scope.py:44
 msgid "Sorry, there are no photos that match your search."
 msgstr ""
 
-#: src/facebook_scope.py:425
-msgid "Location"
-msgstr ""
-
-#: src/facebook_scope.py:430 src/picasa_scope.py:359
-msgid "Album"
-msgstr ""
-
-#: src/facebook_scope.py:432
-msgid "With"
-msgstr ""
-
-#: src/facebook_scope.py:436 src/flickr_scope.py:479 src/picasa_scope.py:362
-#: src/shotwell_scope.py:173
-msgid "View"
-msgstr ""
-
-#: src/flickr_scope.py:457 src/picasa_scope.py:349
+#: ../src/flickr_scope.py:458 ../src/picasa_scope.py:349
 #, python-format
 msgid "By %s, %s"
 msgstr ""
 
-#: src/flickr_scope.py:472 src/picasa_scope.py:351
+#: ../src/flickr_scope.py:473 ../src/picasa_scope.py:351
 msgid "Camera"
 msgstr ""
 
-#: src/flickr_scope.py:474 src/picasa_scope.py:357
+#: ../src/flickr_scope.py:475 ../src/picasa_scope.py:357
 msgid "License"
 msgstr ""
 
-#: src/flickr_scope.py:476 src/shotwell_scope.py:171
+#: ../src/flickr_scope.py:477 ../src/shotwell_scope.py:179
 msgid "Tags"
 msgstr ""
 
-#: src/picasa_scope.py:353 src/shotwell_scope.py:167
-msgid "Dimensions"
-msgstr ""
-
-#: src/picasa_scope.py:355 src/shotwell_scope.py:169
-msgid "Size"
-msgstr ""
-
-#: src/shotwell_scope.py:35 src/shotwell_scope.py~:35
+#: ../src/flickr_scope.py:480 ../src/facebook_scope.py:436
+#: ../src/shotwell_scope.py:181 ../src/picasa_scope.py:362
+msgid "View"
+msgstr ""
+
+#: ../src/facebook_scope.py:425
+msgid "Location"
+msgstr ""
+
+#: ../src/facebook_scope.py:430 ../src/picasa_scope.py:359
+msgid "Album"
+msgstr ""
+
+#: ../src/facebook_scope.py:432
+msgid "With"
+msgstr ""
+
+#. Translatable strings
+#: ../src/shotwell_scope.py:35
 msgid "This Computer"
 msgstr ""
 
-#: src/shotwell_scope.py:148 src/shotwell_scope.py~:148
+#: ../src/shotwell_scope.py:157
 msgid ""
 "<b>This photo is missing.</b>\n"
 "You can open Shotwell to retrieve it or remove it from your library."
 msgstr ""
 
-#: src/shotwell_scope.py:162
+#: ../src/shotwell_scope.py:171
 #, python-format
 msgid "%s x %s pixels"
 msgstr ""
 
-#: src/shotwell_scope.py:177
+#: ../src/shotwell_scope.py:175 ../src/picasa_scope.py:353
+msgid "Dimensions"
+msgstr ""
+
+#: ../src/shotwell_scope.py:177 ../src/picasa_scope.py:355
+msgid "Size"
+msgstr ""
+
+#: ../src/shotwell_scope.py:185
 msgid "Show in Folder"
 msgstr ""
 
-#: src/shotwell_scope.py:181
+#: ../src/shotwell_scope.py:189
 msgid "Email"
 msgstr ""
 
-#: src/shotwell_scope.py:185
+#: ../src/shotwell_scope.py:193
 msgid "Print"
 msgstr ""
 
-#: src/shotwell_scope.py:189
+#: ../src/shotwell_scope.py:197
 msgid "Open Shotwell"
 msgstr ""
 
-#: src/unity-lens-photos:32
-msgid "My Photos"
-msgstr ""
-
-#: src/unity-lens-photos:33
-msgid "Friends Photos"
-msgstr ""
-
-#: src/unity-lens-photos:34
-msgid "Online Photos"
-msgstr ""
-
-#: src/unity-lens-photos:35
-msgid "Photos"
-msgstr ""
-
-#: src/unity-lens-photos:36
-msgid "Recent"
-msgstr ""
-
-#: src/unity-lens-photos:37
-msgid "Date"
-msgstr ""
-
-#: src/unity-lens-photos:38
-msgid "Last 7 days"
-msgstr ""
-
-#: src/unity-lens-photos:39
-msgid "Last 30 days"
-msgstr ""
-
-#: src/unity-lens-photos:40
-msgid "Last 6 months"
-msgstr ""
-
-#: src/unity-lens-photos:41
-msgid "Older"
-msgstr ""
-
-#: src/unity-lens-photos:42
-msgid "Sources"
-msgstr ""
-
-#: src/unity-lens-photos:43
-msgid "Search Photos"
+#: ../unity-lens-photos.application.in.h:1
+msgid "Photos search plugin"
+msgstr ""
+
+#: ../unity-lens-photos.application.in.h:2
+msgid "Search your and your friends' Flickr photos"
+msgstr ""
+
+#: ../unity-lens-photos.application.in.h:3
+msgid "Search your and your friends' Facebook photos"
+msgstr ""
+
+#: ../unity-lens-photos.application.in.h:4
+msgid "Search your Picasa photos"
 msgstr ""

=== modified file 'setup.cfg'
--- setup.cfg	2012-08-17 10:57:27 +0000
+++ setup.cfg	2012-09-18 14:36:20 +0000
@@ -3,8 +3,6 @@
 
 [build_i18n]
 domain=unity-lens-photos
-desktop_files=[	("share/unity/lenses/photos", 
-		  ("photos.lens.in",)
-		)
-		]
+desktop_files=[("share/unity/lenses/photos", ("photos.lens.in",))]
+xml_files=[("share/accounts/applications", ("unity-lens-photos.application.in",))]
 

=== modified file 'setup.py'
--- setup.py	2012-09-14 15:54:17 +0000
+++ setup.py	2012-09-18 14:36:20 +0000
@@ -16,7 +16,6 @@
     ('lib/unity-lens-photos', ['src/facebook_scope.py']),
     ('lib/unity-lens-photos', ['src/picasa_scope.py']),
     ('share/dbus-1/services', ['unity-lens-photos.service']),
-    ('share/accounts/applications', ['unity-lens-photos.application']),
     ('share/applications', ['unity-lens-photos.desktop']),
     ('share/pixmaps', ['unity-lens-photos.png']),
     ], cmdclass={"build":  build_extra.build_extra,

=== removed file 'unity-lens-photos.application'
--- unity-lens-photos.application	2012-09-13 16:26:19 +0000
+++ unity-lens-photos.application	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<application id="unity-lens-photos">
-  <description>Photos search plugin</description>
-	<translations>unity-lens-photos</translations>
-	<desktop-entry>unity-lens-photos.desktop</desktop-entry>
-
-  <services>
-		<service id="flickr-sharing">
-			<description>Search your and your friends' Flickr photos</description>
-		</service>
-		<service id="facebook-sharing">
-			<description>Search your and your friends' Facebook photos</description>
-		</service>
-		<service id="picasa">
-			<description>Search your Picasa photos</description>
-		</service>
-  </services>
-
-</application>

=== added file 'unity-lens-photos.application.in'
--- unity-lens-photos.application.in	1970-01-01 00:00:00 +0000
+++ unity-lens-photos.application.in	2012-09-18 14:36:20 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application id="unity-lens-photos">
+  <_description>Photos search plugin</_description>
+	<translations>unity-lens-photos</translations>
+	<desktop-entry>unity-lens-photos.desktop</desktop-entry>
+
+  <services>
+		<service id="flickr-sharing">
+			<_description>Search your and your friends' Flickr photos</_description>
+		</service>
+		<service id="facebook-sharing">
+			<_description>Search your and your friends' Facebook photos</_description>
+		</service>
+		<service id="picasa">
+			<_description>Search your Picasa photos</_description>
+		</service>
+  </services>
+
+</application>