Merge lp:~knitzsche/scope-aggregator/4.8-local-hints into lp:scope-aggregator

[Kyle Nitzsche]

For a 4.8 scope-aggregator release.

Enable scope-aggregator projects to display "hints" without the hints child scope. That is, quick start help (if any), no network message and no location message. Hints child scope is still supported though.

The goal of this is to duplicate the user experience but without the hints scope. With this, scope-aggregator can later add features, for example displaying quick start help dynamically depending on the child scopes that are actually available/installed, and etc.

* I did not use jsoncpp due to https://sourceforge.net/p/jsoncpp/bugs/43/ (Actually I had the implementation complete in jsoncpp and then discovered that the unity-scope-api people found this bug.)
* There's a new file that (hopefully) explains everything in detail, including how to rebase a scope on 4.8 (this MP): 4.8-rebase-local-hints-README.md. As usual, it is harder to explain than it is to do :)
* I rebased sample today-scope [1], nearby-scope [2] and photos-scope [3] for testing purposes and they all passed.

[1] https://code.launchpad.net/~knitzsche/today-scope/local-hints
[2] https://code.launchpad.net/~knitzsche/nearby-scope/local-hints
[3] https://code.launchpad.net/~knitzsche/photos-scope/local-hints

[Zhang Enwei (zhangew401)]

Only minor error in the guidance part. I verified this in china-dashboard.
thanks.

review: Needs Fixing

[lp:~knitzsche/scope-aggregator/4.8-local-hints]

173. By Kyle Nitzsche on 2016-06-27

fixed 4.8-rebase-local-hints-README.md doc per review comment.

updated make-po.sh per review comment.

[Kyle Nitzsche (knitzsche)]

Thanks Enwei. I have fixed the docs and make-pot.sh per your comments. (I also found and fixed other typos in the doc.)

Anything else?

Cheers - Kyle

[Zhang Enwei (zhangew401)]

review: Approve

=== added file '4.8-rebase-local-hints-README.md'
--- 4.8-rebase-local-hints-README.md	1970-01-01 00:00:00 +0000
+++ 4.8-rebase-local-hints-README.md	2016-06-27 15:49:40 +0000
@@ -0,0 +1,279 @@
+# 4.8 Rebasing and Local Hints Overview
+
+With the 4.8 scope-aggregator release, the hints scope is no longer needed for scope-aggregator based projects to provide:
+
+ * Quick start help (the aggregator scope's hints.json file contains the content previously in the hints child scope and the po/ dir has its translations)
+ * No network and no location messages (the aggregator scope contains the source strings in translatable.json and the po/ dir has the translations).
+
+This is called "local hints".
+
+With local hints:
+
+* Users can install the agg scope from the store and be certain that designed functionality is present. 
+* After all aggregator scopes that use hints have been updated, we can drop the hints scope from custom tarballs.
+
+New possibilities:
+
+ * Quick start help could be dynamic depending on currently available child scopes. Currently, the help displays information about a hard coded list of child scopes, which could be incorrect or incomplete depending on what is installed.
+ * The user could redisplay quick start help from a scope settings button. Currently, after the user dismisses quick start help, it cannot be displayed again.
+
+For now, the purpose is for local hints to support the exact same functionality that hints child scope provides. 
+
+Modifications are required for every aggregator scope rebasing on 4.8, even if the aggregator scope is still going to use the hints child scope (the hints.json file format changes slightly).
+
+# Samples
+
+Here are sample click-src/aggregator/hints.json files for 4.8 agg scopes that do not use the hints child scope.
+
+## Not using any hints
+
+This agg scope does not use quick start help, does not want a no network message, and does not want a no location message:
+
+    {
+        "using_hints": "false"
+    }
+
+## No quick start help, enabled no network/no location messages
+
+    {
+        "using_hints": "true",
+        "hints_source": "local",
+        "message_on_no_network": "true",
+        "message_on_no_location": "true"
+    }
+
+Note: As described below, both messages and their translations must be added to scope aggregator.
+
+## With quick start help
+
+The agg scope provides its own quick start help. 
+
+ * Quick start help is contained in hints.json's local/content/categories
+ * You can declare multiple categories each with "items"
+ * "items" contains objects for each result in the category
+
+The structure and format of the content object is identical to that used in the hints scope with these exceptions:
+
+ * layout: contains the actual category renderer json (in hints scope it was a file name that contained the renderer json)
+ * layout/template/card-background: only use a color (in hints scope you could define a background image but this caused varying layouts. The recommended way for a card to have an icon, text and action is shown here.)
+ * item/art: the value is a file name that must be in click-src/aggregator/images/ (in hints child scope it was a longer path)
+
+hinst.json:
+ 
+    {
+        "using_hints": "true",
+        "hints_source": "local",
+        "quick_start_help": "true",
+        "message_on_no_network": "true",
+        "message_on_no_location": "true",
+        "local":
+        {
+            "content":
+            {
+                "categories":
+                [
+                    {
+                        "id": "welcome",
+                        "_title": "Welcome to the Today scope",
+                        "layout":
+                        { 
+                            "schema-version": 1,
+                            "template": {
+                                "category-layout": "grid",
+                                "card-size": "large",
+                                "card-layout":"horizontal",
+                                "collapsed-rows": 0
+                             },
+                            "components": {
+                                "title": "title",
+                                "art": "art",
+                                "subtitle": "subtitle",
+                                "emblem":"emblem"
+                            }
+                        },
+                        "items": [
+                            {
+                                "_title": "Manage your day with all the essentials.",
+                                "_subtitle": "Tap here for more information.",
+                                "_description": "Today gives you a overview of your day including:<br>- events and tasks<br>- calls and messages<br>- news, weather and more.<br><br> You can customise what is shown in Today using the scope settings icon.<br><br> Some services require your log-in below or later.",
+                                "art": "welcome.png"
+                            }
+                        ]
+                    },
+                    {
+                        "id": "fitbit-account",
+                        "_title": "Track your activity with Fitbit.",
+                        "layout":
+                        {
+                            "schema-version": 1,
+                            "template": {
+                                "category-layout": "grid",
+                                "card-size": "large",
+                                "card-background":"color:///#FFFFFF",
+                                "collapsed-rows": 0
+
+                             },
+                            "components": {
+                                "title": "title",
+                                "mascot":"art"
+                            }
+                        },
+                        "items": [
+                            {
+                                "_title": "<b>   Add your account</b>",
+                                "oaccount": {
+                                    "ServiceName":  "com.canonical.scopes.fitbit_fitbit",
+                                    "ServiceType":  "fitbit-scope",
+                                    "ProviderName": "com.canonical.scopes.fitbit_fitbitaccount",
+                                    "QueryScope": "com.canonical.scopes.fitbit_fitbit",
+                                    "idontthinkweneedtoshowresultwhenloggedin_loggedin":"<b>   Successfully logged in</b>"
+                                    },
+                                "action": {
+                                    "_name": "Add account",
+                                    "uri": "settings:///system/online-accounts"
+                                 },
+                                "art":"fitbit.png"
+                            }
+                        ]
+                    },
+                    {
+                        "id": "skip",
+                        "_title": "Set up your accounts later.",
+                        "_loggedin":"Get started.",
+                        "layout":
+                        {
+                                "schema-version": 1,
+                                "template": {
+                                    "category-layout": "vertical-journal",
+                                    "card-size": "large",
+                                    "card-background":"color:///#12a3d8",
+                                    "collapsed-rows": 0
+
+                                 },
+                                "components": {
+                                    "title": "title"
+                            }
+                        },
+                        "items": [
+                            {
+                                "_title": "<b>Skip &amp; set up later</b>",
+                                "hide_hints": "true"
+                            }
+                        ]
+                    }
+                 ]
+            }
+        }
+    }
+
+
+
+# Still Using Hints Child Scope
+
+This configuration supports an agg scope that is rebased on this (or higher) versions of scope-aggregator that has not yet been modified to drop the hints child scope.
+
+    {
+        "using_hints": "true",
+        "hints_source": "hints_scope",
+        "quick_start_help": "true",
+        "message_on_no_network": "true",
+        "message_on_no_location": "true",
+        "hints_scope":
+        {
+            "hints_scope_id": "com.canonical.scopes.hints_hints",
+            "hints_this_scope": "dashboard",
+            "hints_help": "dashboard",
+            "hints_hide": "start"
+        }
+    }
+
+Note: in this case, the agg scope does not need messages or their translations: these are provided by hints child scope.
+
+# Converting Agg Scope
+
+As noted, all scope-aggregators rebasing on 4.8 or higher need to modify their hints.json. The extent of modification depends on the options used.
+
+* Modify click-src/aggregator/hints.json as shown above
+* If the agg scope uses no network or no location messages, add ubuntu.png to click-src/aggregator/images/
+* Ensure all image files referenced in hints.json are in click-src/aggregator/images/
+* Ensure all translations are merged from the hints scope source into the aggregator source (see "Translations" section)
+
+Note: All images previously provided by hints scope and now referenced in the hints.json file must be in the aggregator scope's click-src/aggregator/images/ directory.
+
+## Translations
+
+### Add new and modified translation scripts
+
+ 1. Check and remember the POT variable defined in make-pot.sh.
+ 1. Copy the following from scope-aggregator po/ into the aggregator scope po/ directory:
+  * json\_get\_i18n.py
+  * make-pot.sh
+ 1. Add json\_get\_i18n.py to bzr.
+ 1. Edit make-pot.sh and reset POT variable to what it was. For example, in the today scope, make-pot.sh should have this line near the top:
+    POT=today
+
+Why? The json2po tool used to gather translatable messages for inclusion in the pot file cannot handle json values of int (yes, really ;). So json\_get\_i18n.py creates a new (disposable) json file (i18n.json) for each json file listed in po/JSONS. This new file contains only objects whose key starts with "_". These are by definition (in our tool chain) translatable and therefore have string values only. make-pot.sh scans this generated json (instead of the original source, for example hints.json) to find strings to include in the new pot file. make-pot.sh calls json2po, which now does not encounter the int value error.
+
+### Add no network/no location strings to source
+
+If the agg scope uses no network or no location messages, these strings need to be added to the aggregator scope source, ensure they are present in the po/translatables.json file. 
+
+Notes:
+
+ * The key names must start with "_"
+ * The key name has no significance (it only needs be be unique)
+ * Do not modify the no net/no location messages (because they are already translated and are used in scope-aggregator c++ source code)
+
+translatables.json:
+
+    {
+        "_no_loc_msg": "Please enable location services. Refresh by pulling down the middle of the screen.",
+        "_no_net_msg": "Please connect to the internet. Refresh by pulling down the middle of the screen.",
+        "_1": "Recent",
+        "_2": "Today",
+        "_3": "All your info in one place",
+        "_4": "Next Holiday",
+        "_5": "Favorite Contacts",
+        "_6": "My Activity",
+        "_7": "Weather",
+        "_8": "Today's News",
+        "_9": "Trending on Twitter"
+    }
+
+Ensure the po/JSONS file includes translatables.jsoni (and hints.json if providing local hints quick start content):
+
+    $ cat po/JSONS 
+    ./translatables.json
+    ../click-src/aggregator/hints.json
+
+### Generate a New Pot File
+
+ 1. Move to po/
+ 1. Run ```./make-pot.sh```
+ 1. Verify the generated pot file has the correct (previous) filename (required for LP translations).
+ 1. Verify the generated pot file contains expected translatable strings, including those from hints.json and translatables.json.
+
+### Merge Translations from Hints scope into Aggregator Scope
+
+The hints scope source contains translations for all existing quick start help strings and for the no network and no location messages. 
+
+You can merge them into the po files in your scope aggregator source as follows:
+
+
+ 1. Update the pot file in YOUR\_AGG\_SCOPE\_DIR/po as described above
+ 1. bzr branch lp:~hanloon-team/hanloon/hints
+ 1. bzr branch lp:scope-aggregator
+ 1. cd hints/po
+ 1. cp ../../scope-aggregator/po/merge-hints-po-to-other-po.sh .
+ 1. ./merge-hints-po-to-other-po.sh YOUR\_AGG\_SCOPE\_DIR/po
+ 1. cd YOUR\_AGG\_SCOPE\_DIR/po
+ 1. ./update-pos-from-pot.sh
+
+Result: Each po file in YOUR\_AGG\_SCOPE\_DIR/po now also contains translations for all strings relating to hints, if the hints scope had translations for them, and if they are valid strings for this aggragator scope.
+
+Note: Please verify translations are correctly merged by installing the click, changing the language on the device to a langauge supportied by the hints child scope, for example French, and viewing the quick start help and the no network/no location messages. 
+
+Note: You can force an agg scope to display quick start help (if it is configured for it) by deleting the hints_is_hidden file from the scope's cache directory on the device. For dashboard:
+
+    phablet@ubuntu-phablet:~$ rm .local/share/unity-scopes/unconfined/com.canonical.scopes.dashboard_dashboard/hints_is_hidden
+

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-25 17:34:24 +0000
+++ CMakeLists.txt	2016-06-27 15:49:40 +0000
@@ -1,4 +1,4 @@
-set(VERSION "4.7")
+set(VERSION "4.8")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
@@ -71,6 +71,7 @@
 
 include_directories(
   "${CMAKE_SOURCE_DIR}/include"
+  ${JSONCPP_INCLUDE_DIRS}
 )
 
 configure_file (

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-06-03 21:19:01 +0000
+++ data/CMakeLists.txt	2016-06-27 15:49:40 +0000
@@ -30,5 +30,6 @@
 )
 
 INSTALL(DIRECTORY "images" DESTINATION "${SCOPE_INSTALLDIR}")
+INSTALL(DIRECTORY "icons" DESTINATION "${SCOPE_INSTALLDIR}")
 install(FILES "child_scopes.json" DESTINATION ${SCOPE_INSTALLDIR})
 install(FILES "hints.json" DESTINATION ${SCOPE_INSTALLDIR})

=== modified file 'data/hints.json'
--- data/hints.json	2015-06-26 17:21:32 +0000
+++ data/hints.json	2016-06-27 15:49:40 +0000
@@ -1,11 +1,146 @@
 {
-    "using_hints": "false",
-    "display_hints_on_no_location": "false",
-    "display_hints_on_no_networrk": "false",
-    "display_hints_on_firstuse": "false",
-    "hints_scope_id": "com.canonical.scopes.hints_hints",
-    "hints_this_scope": "aggregator",
-    "hints_help": "aggregator",
-    "hints_hide": "start"
+    "using_hints": "true",
+    "COMMENT_hints_source": "hints_source is either 'local' or 'hints_scope'",
+    "hints_source": "hints_scope",
+    "quick_start_help": "true",
+    "COMMENT_messages": "both of the 'message_' keys require ubuntu.png in scope_dir/images/",
+    "message_on_no_network": "true",
+    "message_on_no_location": "true",
+    "hints_scope":
+    {
+        "hints_scope_id": "com.canonical.scopes.hints_hints",
+        "hints_this_scope": "dashboard",
+        "hints_help": "dashboard",
+        "hints_hide": "start"
+    },
+    "COMMENT_local": "when 'hints_source' is 'local', the following must be completed", 
+    "local":
+    {
+        "content":
+        {
+            "categories":
+            [
+                {
+                    "id": "welcome",
+                    "_title": "NOT Welcome to the Today scope",
+                    "layout":
+                    { 
+                        "schema-version": 1,
+                        "template": {
+                            "category-layout": "grid",
+                            "card-size": "large",
+                            "card-layout":"horizontal",
+                            "collapsed-rows": 0
+                         },
+                        "components": {
+                            "title": "title",
+                            "art": "art",
+                            "subtitle": "subtitle",
+                            "emblem":"emblem"
+                        }
+                    },
+                    "items": [
+                        {
+                            "_title": "Manage your day with all the essentials.",
+                            "_subtitle": "Tap here for more information.",
+                            "_description": "Today gives you a overview of your day including:<br>- events and tasks<br>- calls and messages<br>- news, weather and more.<br><br> You can customise what is shown in Today using the scope settings icon.<br><br> Some services require your log-in below or later.",
+                            "art": "icons/today/welcome.png"
+                        }
+                    ]
+                },
+                {
+                    "id": "accounts",
+                    "_title": "See your events and more from Google.",
+                    "layout":
+                    {
+                                "schema-version": 1,
+                            "template": {
+                                "category-layout": "grid",
+                                "card-size": "large",
+                                "card-background":"color:///#FFFFFF",
+                                "collapsed-rows": 0
+
+                             },
+                            "components": {
+                                "title": "title",
+                                "mascot":"art"
+                        }
+                    },
+                    "items": [
+                        {
+                            "_title": "<b>   Review your Google sync settings</b>",
+                            "_description": "Adding your Google account will allow Today to display your events and contacts.<br><br>Press the button below to add your account (or go to accounts in the Settings app).<br><br>Remember to enable the contact and calendar sync once you have successfully added it.",
+                            "art":"icons/today/google.png",
+                            "action": {
+                                "_name": "Add account",
+                                "uri": "settings:///system/online-accounts"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "accounts2",
+                    "_title": "Track your activity with Fitbit.",
+                    "layout":
+                    {
+                        "schema-version": 1,
+                        "template": {
+                            "category-layout": "grid",
+                            "card-size": "large",
+                            "card-background":"color:///#FFFFFF",
+                            "collapsed-rows": 0
+
+                         },
+                        "components": {
+                            "title": "title",
+                            "mascot":"art"
+                        }
+                    },
+                    "items": [
+                        {
+                            "_title": "<b>   Add your account</b>",
+                            "oaccount": {
+                                "ServiceName":  "com.canonical.scopes.fitbit_fitbit",
+                                "ServiceType":  "fitbit-scope",
+                                "ProviderName": "com.canonical.scopes.fitbit_fitbitaccount",
+                                "QueryScope": "com.canonical.scopes.fitbit_fitbit",
+                                "idontthinkweneedtoshowresultwhenloggedin_loggedin":"<b>   Successfully logged in</b>"
+                                },
+                            "action": {
+                                "_name": "Add account",
+                                "uri": "settings:///system/online-accounts"
+                             },
+                            "art":"icons/today/fitbit.png"
+                        }
+                    ]
+                },
+                {
+                    "id": "skip",
+                    "_title": "Set up your accounts later.",
+                    "_loggedin":"Get started.",
+                    "layout":
+                    {
+                            "schema-version": 1,
+                            "template": {
+                                "category-layout": "vertical-journal",
+                                "card-size": "large",
+                                "card-background":"color:///#12a3d8",
+                                "collapsed-rows": 0
+
+                             },
+                            "components": {
+                                "title": "title"
+                        }
+                    },
+                    "items": [
+                        {
+                            "_title": "<b>Skip &amp; set up later</b>",
+                            "hide_hints": "true",
+                            "uri": "com.canonical.scopes.dashboard_dashboard"
+                        }
+                    ]
+                }
+            ]
+        }
+    }
 }
-

=== added directory 'data/icons'
=== added file 'data/icons/.directory'
--- data/icons/.directory	1970-01-01 00:00:00 +0000
+++ data/icons/.directory	2016-06-27 15:49:40 +0000
@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2015,7,13,13,46,49
+Version=3

=== added directory 'data/icons/bollywood'
=== added file 'data/icons/bollywood/.directory'
--- data/icons/bollywood/.directory	1970-01-01 00:00:00 +0000
+++ data/icons/bollywood/.directory	2016-06-27 15:49:40 +0000
@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2015,7,13,13,46,57
+Version=3

=== added file 'data/icons/bollywood/bollywood.png'
Binary files data/icons/bollywood/bollywood.png	1970-01-01 00:00:00 +0000 and data/icons/bollywood/bollywood.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/bollywood/cinema.png'
Binary files data/icons/bollywood/cinema.png	1970-01-01 00:00:00 +0000 and data/icons/bollywood/cinema.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/bollywood/erosnow.png'
Binary files data/icons/bollywood/erosnow.png	1970-01-01 00:00:00 +0000 and data/icons/bollywood/erosnow.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/bollywood/hotstar.png'
Binary files data/icons/bollywood/hotstar.png	1970-01-01 00:00:00 +0000 and data/icons/bollywood/hotstar.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/bollywood/shemaroo.png'
Binary files data/icons/bollywood/shemaroo.png	1970-01-01 00:00:00 +0000 and data/icons/bollywood/shemaroo.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/bollywood/toi.png'
Binary files data/icons/bollywood/toi.png	1970-01-01 00:00:00 +0000 and data/icons/bollywood/toi.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/bollywood/zeetv.png'
Binary files data/icons/bollywood/zeetv.png	1970-01-01 00:00:00 +0000 and data/icons/bollywood/zeetv.png	2016-06-27 15:49:40 +0000 differ
=== added directory 'data/icons/books'
=== added file 'data/icons/books/amazon.png'
Binary files data/icons/books/amazon.png	1970-01-01 00:00:00 +0000 and data/icons/books/amazon.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/books/books.png'
Binary files data/icons/books/books.png	1970-01-01 00:00:00 +0000 and data/icons/books/books.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/books/cm.png'
Binary files data/icons/books/cm.png	1970-01-01 00:00:00 +0000 and data/icons/books/cm.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/books/douban.png'
Binary files data/icons/books/douban.png	1970-01-01 00:00:00 +0000 and data/icons/books/douban.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/books/ebay.png'
Binary files data/icons/books/ebay.png	1970-01-01 00:00:00 +0000 and data/icons/books/ebay.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/books/open_library.png'
Binary files data/icons/books/open_library.png	1970-01-01 00:00:00 +0000 and data/icons/books/open_library.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/books/viva.png'
Binary files data/icons/books/viva.png	1970-01-01 00:00:00 +0000 and data/icons/books/viva.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/contact.svg'
--- data/icons/contact.svg	1970-01-01 00:00:00 +0000
+++ data/icons/contact.svg	2016-06-27 15:49:40 +0000
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90.000031"
+   id="svg3615"
+   version="1.1"
+   inkscape:version="0.48+devel r12221"
+   sodipodi:docname="contact.svg">
+  <defs
+     id="defs3617">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2995-6">
+      <path
+         style="color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 222,818.36215 0,54 126,0 0,-54 -43.875,0 c -0.0316,0.0521 -0.062,0.1043 -0.0937,0.15625 -2.2906,3.75334 -4.87723,7.16686 -7.875,9.875 -2.99777,2.70814 -6.52444,5 -11.125,5 -4.60056,0 -8.12214,-2.29391 -11.125,-5 -3.00286,-2.70609 -5.60728,-6.12218 -7.90625,-9.875 -0.0318,-0.0519 -0.062,-0.1042 -0.0937,-0.15625 L 222.0001,818.36215 Z"
+         id="path2997-4"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="36.190065"
+     inkscape:cy="48.918863"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4271"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="6"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="2.6171875e-06px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3620">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(1978.2857,336.49495)">
+    <g
+       id="g4271"
+       transform="translate(-2218.2857,-1106.8571)">
+      <path
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         clip-path="none"
+         d="M 30.21875 54.15625 C 11.057821 55.125058 6 61.297631 6 75 L 6 81 C 6 90 6 90 18 90 L 72 90 C 84 90 84 90 84 81 L 84 75 C 84 61.305107 78.947539 55.130228 59.8125 54.15625 C 58.661142 55.560765 57.451922 56.86076 56.15625 58.03125 C 53.15848 60.73939 49.63181 63.03125 45.03125 63.03125 C 40.43069 63.03125 36.90911 60.73734 33.90625 58.03125 C 32.605846 56.859364 31.377261 55.564123 30.21875 54.15625 z "
+         transform="translate(240,770.36215)"
+         id="rect3461-3-1" />
+      <rect
+         y="770.36218"
+         x="240"
+         height="90"
+         width="90"
+         id="rect4269"
+         style="color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:transform-center-y="21.408856"
+         inkscape:transform-center-x="-0.0067782248"
+         id="path3447-0-6"
+         d="m 285.00024,770.36215 c -14.99976,-3e-5 -20.99976,6.00003 -20.99976,21.00003 l 0,3 c 0,12 12.03506,33 21.01729,33 8.98223,0 20.98223,-21 20.98223,-33 l 0,-3 c 0,-15 -6,-21 -20.99976,-21.00003 z"
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zsszssz" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Clips"
+     sodipodi:insensitive="true"
+     style="display:none">
+    <path
+       transform="translate(-240,-770.36215)"
+       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 246,851.36218 c 0,9 0,9 12,9 l 54,0 c 12,0 12,0 12,-9 l 0,-6 c 0,-15 -6,-21 -30,-21 l -18,0 C 252,824.36218 246,830.36218 246,845.36218 Z"
+       id="rect3461-3-1-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csscccccc"
+       clip-path="url(#clipPath2995-6)" />
+    <rect
+       y="3.2134991e-05"
+       x="0"
+       height="90"
+       width="90"
+       id="rect4269-8"
+       style="color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:transform-center-y="21.408856"
+       inkscape:transform-center-x="-0.0067782248"
+       id="path3447-0-6-9"
+       d="M 45.00024,-4.8230939e-7 C 30.00048,-3.0482196e-5 24.00048,6.0000295 24.00048,21.00003 l 0,3 c 0,12 12.03506,33 21.01729,33 8.98223,0 20.98223,-21 20.98223,-33 l 0,-3 C 66,6.0000295 60,2.9517803e-5 45.00024,-4.8230939e-7 Z"
+       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zsszssz" />
+  </g>
+</svg>

=== added file 'data/icons/hint.png'
Binary files data/icons/hint.png	1970-01-01 00:00:00 +0000 and data/icons/hint.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/info.png'
Binary files data/icons/info.png	1970-01-01 00:00:00 +0000 and data/icons/info.png	2016-06-27 15:49:40 +0000 differ
=== added directory 'data/icons/nearby'
=== added directory 'data/icons/nearby-india'
=== added file 'data/icons/nearby-india/zomato.png'
Binary files data/icons/nearby-india/zomato.png	1970-01-01 00:00:00 +0000 and data/icons/nearby-india/zomato.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/Weather.png'
Binary files data/icons/nearby/Weather.png	1970-01-01 00:00:00 +0000 and data/icons/nearby/Weather.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/flikr.png'
Binary files data/icons/nearby/flikr.png	1970-01-01 00:00:00 +0000 and data/icons/nearby/flikr.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/inrix.png'
Binary files data/icons/nearby/inrix.png	1970-01-01 00:00:00 +0000 and data/icons/nearby/inrix.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/nearby.jpg'
Binary files data/icons/nearby/nearby.jpg	1970-01-01 00:00:00 +0000 and data/icons/nearby/nearby.jpg	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/osm.png'
Binary files data/icons/nearby/osm.png	1970-01-01 00:00:00 +0000 and data/icons/nearby/osm.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/sk.png'
Binary files data/icons/nearby/sk.png	1970-01-01 00:00:00 +0000 and data/icons/nearby/sk.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/timeout.jpg'
Binary files data/icons/nearby/timeout.jpg	1970-01-01 00:00:00 +0000 and data/icons/nearby/timeout.jpg	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/wiki.png'
Binary files data/icons/nearby/wiki.png	1970-01-01 00:00:00 +0000 and data/icons/nearby/wiki.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/nearby/yelp.png'
Binary files data/icons/nearby/yelp.png	1970-01-01 00:00:00 +0000 and data/icons/nearby/yelp.png	2016-06-27 15:49:40 +0000 differ
=== added directory 'data/icons/news'
=== added file 'data/icons/news/bbc.png'
Binary files data/icons/news/bbc.png	1970-01-01 00:00:00 +0000 and data/icons/news/bbc.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/news/cd.png'
Binary files data/icons/news/cd.png	1970-01-01 00:00:00 +0000 and data/icons/news/cd.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/news/cnet.png'
Binary files data/icons/news/cnet.png	1970-01-01 00:00:00 +0000 and data/icons/news/cnet.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/news/ej.png'
Binary files data/icons/news/ej.png	1970-01-01 00:00:00 +0000 and data/icons/news/ej.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/news/elpais.png'
Binary files data/icons/news/elpais.png	1970-01-01 00:00:00 +0000 and data/icons/news/elpais.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/news/engadget.png'
Binary files data/icons/news/engadget.png	1970-01-01 00:00:00 +0000 and data/icons/news/engadget.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/news/euronews.png'
Binary files data/icons/news/euronews.png	1970-01-01 00:00:00 +0000 and data/icons/news/euronews.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/news/news.png'
Binary files data/icons/news/news.png	1970-01-01 00:00:00 +0000 and data/icons/news/news.png	2016-06-27 15:49:40 +0000 differ
=== added directory 'data/icons/photos'
=== added file 'data/icons/photos/fb.png'
Binary files data/icons/photos/fb.png	1970-01-01 00:00:00 +0000 and data/icons/photos/fb.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/photos/flikr.png'
Binary files data/icons/photos/flikr.png	1970-01-01 00:00:00 +0000 and data/icons/photos/flikr.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/photos/gallery.png'
Binary files data/icons/photos/gallery.png	1970-01-01 00:00:00 +0000 and data/icons/photos/gallery.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/photos/instagram.png'
Binary files data/icons/photos/instagram.png	1970-01-01 00:00:00 +0000 and data/icons/photos/instagram.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/photos/photos.png'
Binary files data/icons/photos/photos.png	1970-01-01 00:00:00 +0000 and data/icons/photos/photos.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/properties.svg'
--- data/icons/properties.svg	1970-01-01 00:00:00 +0000
+++ data/icons/properties.svg	2016-06-27 15:49:40 +0000
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90.000015"
+   id="svg3133"
+   version="1.1"
+   inkscape:version="0.48+devel r12275"
+   sodipodi:docname="properties.svg">
+  <defs
+     id="defs3135">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#e7e5e5;stop-opacity:1;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#e2dfdf;stop-opacity:1"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3809"
+       x1="53.012165"
+       y1="-102.79017"
+       x2="53.012165"
+       y2="-66.661224"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3813"
+       gradientUnits="userSpaceOnUse"
+       x1="53.012165"
+       y1="-102.79017"
+       x2="53.012165"
+       y2="-66.661224"
+       gradientTransform="translate(-625,0)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580781"
+     inkscape:cx="49.564967"
+     inkscape:cy="55.21579"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3842"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true"
+     inkscape:snap-global="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="6"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-2.98e-06px"
+       originy="2.6171874e-06px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3138">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-2.98e-6,-962.36219)"
+     style="display:inline">
+    <g
+       transform="matrix(0.99934414,0,0,1,-106.92982,549.00002)"
+       id="g3842"
+       style="display:inline">
+      <rect
+         style="opacity:0.05;color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3844"
+         width="90.059067"
+         height="90.000015"
+         x="107"
+         y="-503.36218"
+         transform="scale(1,-1)" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#808080;stroke-width:14.78582573;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path2995"
+         sodipodi:cx="35.999996"
+         sodipodi:cy="36.500011"
+         sodipodi:rx="33"
+         sodipodi:ry="33.5"
+         d="m 68.999996,36.500011 a 33,33.5 0 1 1 -65.9999998,0 A 33,33.5 0 1 1 68.999996,36.500011 Z"
+         transform="matrix(0.8173894,0,0,0.80635659,122.60353,428.93016)" />
+      <path
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 152.02296,416.36218 c 8.3452,0 10.01313,0 10.01313,8 l 0,6 c 0,3.324 -4.45992,6 -9.99979,6 l -0.0133,0 c -5.53987,0 -9.99979,-2.676 -9.99979,-6 l 0,-6 C 142.02317,416.36218 143.67777,416.36218 152.02296,416.36218 Z"
+         id="rect840"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zcsssssz"
+         inkscape:transform-center-x="-0.00011983339"
+         inkscape:transform-center-y="-32.000003" />
+      <path
+         inkscape:transform-center-y="32.000007"
+         inkscape:transform-center-x="0.00012000848"
+         sodipodi:nodetypes="zcsssssz"
+         inkscape:connector-curvature="0"
+         id="path837"
+         d="m 152.0361,500.36219 c -8.3452,0 -10.01313,0 -10.01313,-8 l 0,-6 c 0,-3.324 4.45992,-6 9.99979,-6 l 0.0133,0 c 5.53987,0 9.99979,2.676 9.99979,6 l 0,6 C 162.03589,500.36219 160.38129,500.36219 152.0361,500.36219 Z"
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:transform-center-y="-16.340064"
+         inkscape:transform-center-x="-28.304513"
+         sodipodi:nodetypes="zcsssssz"
+         inkscape:connector-curvature="0"
+         id="path847"
+         d="m 188.42319,437.3565 c 4.1726,7.22241 5.00656,8.66593 -1.92619,12.66593 l -5.19956,3 c -2.88056,1.662 -7.42952,-0.85987 -10.19946,-5.65439 l -0.007,-0.0115 c -2.76993,-4.79452 -2.68089,-9.99239 0.19967,-11.65439 l 5.19956,-3 C 183.42329,428.7021 184.25059,430.13409 188.42319,437.3565 Z"
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 115.63587,479.36787 c -4.1726,-7.22241 -5.00656,-8.66594 1.92619,-12.66594 l 5.19956,-3 c 2.88056,-1.662 7.42952,0.85988 10.19946,5.6544 l 0.007,0.0115 c 2.76993,4.79452 2.68089,9.99239 -0.19967,11.65439 l -5.19956,3 C 120.63577,488.02226 119.80847,486.59028 115.63587,479.36787 Z"
+         id="path849"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zcsssssz"
+         inkscape:transform-center-x="28.304513"
+         inkscape:transform-center-y="16.340062" />
+      <path
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 188.42975,479.3565 c -4.17259,7.22242 -5.00656,8.66593 -11.93931,4.66593 l -5.19956,-2.99999 c -2.88056,-1.66201 -2.9696,-6.85987 -0.19967,-11.6544 l 0.006,-0.0118 c 2.76993,-4.79451 7.31889,-7.31639 10.19945,-5.65438 l 5.19956,2.99999 C 193.42965,470.7021 192.60235,472.13409 188.42975,479.3565 Z"
+         id="path851"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zcsssssz"
+         inkscape:transform-center-x="-28.30633"
+         inkscape:transform-center-y="16.338383" />
+      <path
+         inkscape:transform-center-y="-16.338383"
+         inkscape:transform-center-x="28.306331"
+         sodipodi:nodetypes="zcsssssz"
+         inkscape:connector-curvature="0"
+         id="path853"
+         d="m 115.6293,437.36786 c 4.1726,-7.22241 5.00657,-8.66593 11.93932,-4.66593 l 5.19956,3 c 2.88056,1.662 2.9696,6.85987 0.19967,11.65439 l -0.006,0.0118 c -2.76994,4.79452 -7.3189,7.31639 -10.19946,5.65439 l -5.19956,-3 C 110.62941,446.02226 111.45671,444.59028 115.6293,437.36786 Z"
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== added directory 'data/icons/today'
=== added file 'data/icons/today/Activity.png'
Binary files data/icons/today/Activity.png	1970-01-01 00:00:00 +0000 and data/icons/today/Activity.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/Events.png'
Binary files data/icons/today/Events.png	1970-01-01 00:00:00 +0000 and data/icons/today/Events.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/Evernote.png'
Binary files data/icons/today/Evernote.png	1970-01-01 00:00:00 +0000 and data/icons/today/Evernote.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/News.png'
Binary files data/icons/today/News.png	1970-01-01 00:00:00 +0000 and data/icons/today/News.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/Today.png'
Binary files data/icons/today/Today.png	1970-01-01 00:00:00 +0000 and data/icons/today/Today.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/Weather.png'
Binary files data/icons/today/Weather.png	1970-01-01 00:00:00 +0000 and data/icons/today/Weather.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/calls.png'
Binary files data/icons/today/calls.png	1970-01-01 00:00:00 +0000 and data/icons/today/calls.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/contacts.png'
Binary files data/icons/today/contacts.png	1970-01-01 00:00:00 +0000 and data/icons/today/contacts.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/day.png'
Binary files data/icons/today/day.png	1970-01-01 00:00:00 +0000 and data/icons/today/day.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/evernotebutton.png'
Binary files data/icons/today/evernotebutton.png	1970-01-01 00:00:00 +0000 and data/icons/today/evernotebutton.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/fitbit.png'
Binary files data/icons/today/fitbit.png	1970-01-01 00:00:00 +0000 and data/icons/today/fitbit.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/fitbitbutton.png'
Binary files data/icons/today/fitbitbutton.png	1970-01-01 00:00:00 +0000 and data/icons/today/fitbitbutton.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/google.png'
Binary files data/icons/today/google.png	1970-01-01 00:00:00 +0000 and data/icons/today/google.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/google_cal.png'
Binary files data/icons/today/google_cal.png	1970-01-01 00:00:00 +0000 and data/icons/today/google_cal.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/google_gmail.png'
Binary files data/icons/today/google_gmail.png	1970-01-01 00:00:00 +0000 and data/icons/today/google_gmail.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/googlebutton.png'
Binary files data/icons/today/googlebutton.png	1970-01-01 00:00:00 +0000 and data/icons/today/googlebutton.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/info.png'
Binary files data/icons/today/info.png	1970-01-01 00:00:00 +0000 and data/icons/today/info.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/messages.png'
Binary files data/icons/today/messages.png	1970-01-01 00:00:00 +0000 and data/icons/today/messages.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/reminder.png'
Binary files data/icons/today/reminder.png	1970-01-01 00:00:00 +0000 and data/icons/today/reminder.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/tasks.png'
Binary files data/icons/today/tasks.png	1970-01-01 00:00:00 +0000 and data/icons/today/tasks.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/twitter.png'
Binary files data/icons/today/twitter.png	1970-01-01 00:00:00 +0000 and data/icons/today/twitter.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/icons/today/welcome.png'
Binary files data/icons/today/welcome.png	1970-01-01 00:00:00 +0000 and data/icons/today/welcome.png	2016-06-27 15:49:40 +0000 differ
=== added file 'data/images/ubuntu.png'
Binary files data/images/ubuntu.png	1970-01-01 00:00:00 +0000 and data/images/ubuntu.png	2016-06-27 15:49:40 +0000 differ
=== modified file 'data/translatables.json'
--- data/translatables.json	2015-07-20 21:23:04 +0000
+++ data/translatables.json	2016-06-27 15:49:40 +0000
@@ -1,5 +1,5 @@
 {
     "_category_title": "Install More Sources:",
-    "_no_loc_msg": "Please enable location services. Refresh by pulling down the middle of the screen",
+    "_no_loc_msg": "Please enable location services. Refresh by pulling down the middle of the screen.",
     "_no_net_msg": "Please connect to the internet. Refresh by pulling down the middle of the screen."
 }

=== added file 'include/action.h'
--- include/action.h	1970-01-01 00:00:00 +0000
+++ include/action.h	2016-06-27 15:49:40 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * * Authored by:
+ *	Kyle Nitzsche <[e-mail]>
+ */
+
+#ifndef SCOPE_ACTION_H_
+#define SCOPE_ACTION_H_
+
+#include "scope.h"
+#include <unity/scopes/ActionMetadata.h>
+#include <unity/scopes/ActivationQueryBase.h>
+#include <unity/scopes/ActivationResponse.h>
+#include <unity/scopes/Result.h>
+
+class Action : public unity::scopes::ActivationQueryBase {
+  public:
+    Action(unity::scopes::Result const&         result,
+           unity::scopes::ActionMetadata const& metadata,
+           std::string const&                   cache_dir,
+           std::string const&                   scope_id);
+
+    virtual ~Action() = default;
+    virtual unity::scopes::ActivationResponse activate() override;
+
+  private:
+    std::string cache_dir_;
+    std::string scope_id_;
+};
+#endif

=== modified file 'include/preview.h'
--- include/preview.h	2015-01-28 09:38:14 +0000
+++ include/preview.h	2016-06-27 15:49:40 +0000
@@ -1,39 +1,18 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Scott Sweeny <[e-mail]>
- *
- */
-
-#ifndef AGGSCOPEPREVIEW_H
-#define AGGSCOPEPREVIEW_H
+#ifndef PREVIEW_H
+#define PREVIEW_H
 
 #include<unity/scopes/PreviewQueryBase.h>
+#include<unity/scopes/Result.h>
+#include<unity/scopes/ActionMetadata.h>
 
 class Preview : public unity::scopes::PreviewQueryBase
 {
 public:
-    Preview(unity::scopes::Result const& result,
-                         unity::scopes::ActionMetadata const& metadata);
+    Preview(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& metadata);
     ~Preview();
 
     virtual void cancelled() override;
     virtual void run(unity::scopes::PreviewReplyProxy const& reply) override;
-
-private:
-    std::string uri_;
 };
 
 #endif

=== modified file 'include/query.h'
--- include/query.h	2016-04-22 23:29:09 +0000
+++ include/query.h	2016-06-27 15:49:40 +0000
@@ -32,6 +32,8 @@
 #include <unity/scopes/ChildScope.h>
 #include <unity-scopes.h>
 
+#include <QJsonObject>
+
 class Query : public unity::scopes::SearchQueryBase
 {
 public:
@@ -196,18 +198,20 @@
 
     void noSources(unity::scopes::SearchReplyProxy const& reply);
 
+    bool local_hints = false;
     bool no_network_msg = false;
-    bool no_network_msg_hints = false;
     bool no_location_msg = false;
-    bool no_location_msg_hints = false;
     bool uses_hints = false;
     unity::scopes::ScopeProxy hints_scope;
     bool hints_quickstart = false;
     QString hints_file = "hints_is_hidden";
     QString firstboot = "firstboot";
+    QJsonObject root;
+    QJsonObject hints_local_json;
 
-    void load_hints();
+    void load_hints_config();
     bool hints_exists();
+    void display_local_hints_quickstart(us::SearchReplyProxy const& upstream_reply_);
     void display_hints_quickstart(us::SearchReplyProxy const& upstream_reply_);
     bool show_hints(us::SearchReplyProxy const& upstream_reply_);
     bool hints_hidden();

=== modified file 'include/scope.h'
--- include/scope.h	2015-08-18 18:35:08 +0000
+++ include/scope.h	2016-06-27 15:49:40 +0000
@@ -41,7 +41,11 @@
     virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q,
                                                         unity::scopes::SearchMetadata const&) override;
 
-     unity::scopes::ChildScopeList find_child_scopes() const override;
+    unity::scopes::ActivationQueryBase::UPtr
+    activate(unity::scopes::Result               const& result,
+                   unity::scopes::ActionMetadata const& metadata)override;
+
+    unity::scopes::ChildScopeList find_child_scopes() const override;
 
     enum class IdType {id, local_id};
 

=== modified file 'include/utils.h'
--- include/utils.h	2015-04-10 13:06:26 +0000
+++ include/utils.h	2016-06-27 15:49:40 +0000
@@ -20,9 +20,6 @@
 #ifndef UTILS_H
 #define UTILs_H
 
-#include<QString>
 
-QString qstr(std::string str);
-std::string sstr(QString str);
 
 #endif

=== modified file 'po/JSONS'
--- po/JSONS	2015-05-19 15:20:59 +0000
+++ po/JSONS	2016-06-27 15:49:40 +0000
@@ -1,1 +1,2 @@
 ../data/translatables.json
+../data/hints.json

=== modified file 'po/bg.po'
--- po/bg.po	2015-07-20 23:53:41 +0000
+++ po/bg.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,89 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  bg.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_bg.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Добавяне на акаунт"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Вижте събитията си и още от Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Преглед на настройките за синхронизиране на Google</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Добре дошли в обхвата на Today"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Управлявайте деня си с всички основни средства."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Докоснете тук за повече информация."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Добавете акаунта си</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Започнете."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Проследете активността си с Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Добавянето на акаунт в Google ще разреши на Today да показва вашите събития "
+"и контакти.<br><br>Натиснете бутона по-долу, за да добавите акаунта си (или "
+"преминете към акаунтите в приложението Settings).<br><br>Помнете, че трябва "
+"да активирате синхронизиране на контактите и календара след като го добавите "
+"успешно."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Пропусни &amp; и задай по-късно</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Today предлага преглед на деня ви, включително:<br>- събития и задачи<br>- "
+"повиквания и съобщения<br>- новини, времето и други.<br><br> Можете да "
+"персонализирате показваното в Today като използвате иконата за настройки на "
+"обхват.<br><br> Някои от услугите изискват влизане по-долу или по-късно."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Задайте акаунтите си по-късно."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Моля, активирайте услугите за местоположение. Обновете като издърпате надолу "
+"средата на екрана."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,19 +111,10 @@
 "Моля, свържете се към интернет. Обновете като издърпате надолу средата на "
 "екрана."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Моля, активирайте услугите за местоположение. Обновете като издърпате надолу "
-"средата на екрана."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -48,76 +123,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Моля, активирайте услугите за местоположение. Обновете като издърпате "
-#~ "надолу средата на екрана."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Докоснете тук за повече информация."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Управлявайте деня си с всички основни средства."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Today предлага преглед на деня ви, включително:<br>- събития и "
-#~ "задачи<br>- повиквания и съобщения<br>- новини, времето и други.<br><br> "
-#~ "Можете да персонализирате показваното в Today като използвате иконата за "
-#~ "настройки на обхват.<br><br> Някои от услугите изискват влизане по-долу "
-#~ "или по-късно."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Добре дошли в обхвата на Today"
-
-#~ msgid "Add account"
-#~ msgstr "Добавяне на акаунт"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Преглед на настройките за синхронизиране на Google</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Добавянето на акаунт в Google ще разреши на Today да показва вашите "
-#~ "събития и контакти.<br><br>Натиснете бутона по-долу, за да добавите "
-#~ "акаунта си (или преминете към акаунтите в приложението Settings)."
-#~ "<br><br>Помнете, че трябва да активирате синхронизиране на контактите и "
-#~ "календара след като го добавите успешно."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Вижте събитията си и още от Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Успешно влизане</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Добавете акаунта си</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Проследете активността си с Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Започнете."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Пропусни &amp; и задай по-късно</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Задайте акаунтите си по-късно."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Щракнете тук за повече информация."
 
@@ -227,6 +238,53 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Вижте фийда на Вашите снимки от Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Бъдете в крак с най-актуалните новини."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Новините изобразяват съдържание от разнообразни източници.<br><br>Можете "
+#~ "да използвате настройките за обхват, за да решите кои източници на новини "
+#~ "да се показват, което Ви позволява да създадете свой собствен новинарски "
+#~ "фийд, базиран на Вашите интереси."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Добре дошли в обхвата на Today"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Започнете."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Съдържание на Вашите Новини"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Намерете Вашите снимки тук"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Снимките улесняват разглеждането на Вашите снимки от Instagram, Facebook, "
+#~ "Flickr и камерата - всичко на едно място."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Добре дошли в обхвата на Today"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Съдържание на Вашите Новини"
+
 #~ msgid "Hints"
 #~ msgstr "Съвети"
 
@@ -251,6 +309,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Сега съветите ще бъдат скрити"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Моля, активирайте услугите за местоположение. Обновете като издърпате "
+#~ "надолу средата на екрана."
+
 #~ msgid "Photos"
 #~ msgstr "Снимки"
 

=== modified file 'po/ca.po'
--- po/ca.po	2015-07-20 23:53:41 +0000
+++ po/ca.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +21,88 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  ca.po (photos)  #-#-#-#-#\n"
+"#-#-#-#-#  orig_ca.po (photos)  #-#-#-#-#\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Afegeix compte"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Vegeu els vostres esdeveniments del Google i molt més."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Reviseu la vostra configuració de sincronització del Google </b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Benvinguts a l'ambit d'Avui"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Gestioneu el dia amb tots els aspectes bàsics."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Feu un toc aquí per obtenir més informació."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Afegiu el compte</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Comenceu."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Feu un seguiment de la vostra activitat amb el Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Si afegiu el compte del Google, Avui podrà mostrar els vostres esdeveniments "
+"i contactes.<br><br>Premeu el següent botó per afegir el compte (o aneu a "
+"Comptes a l'aplicació Configuració).<br><br>Recordeu-vos d'habilitar la "
+"sincronització de contactes i calendari un cop s'hagi afegit el compte "
+"correctament."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Omet i configura més endavant</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Avui ofereix un resum del dia, incloent-hi:<br>- esdeveniments i "
+"tasques<br>- trucades i missatges<br>- notícies, el temps i molt més."
+"<br><br> Podeu personalitzar el que es mostra a Avui utilitzant la icona de "
+"configuració d'àmbit.<br><br> Per a alguns serveis, és necessari que inicieu "
+"sessió abans o després."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Configureu els comptes més endavant."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Habiliteu els serveis d'ubicació. Per actualitzar, desplegueu la part "
+"central de la pantalla."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -26,19 +110,10 @@
 "Connecteu-vos a Internet. Per actualitzar, desplegueu la part central de la "
 "pantalla."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Habiliteu els serveis d'ubicació. Per actualitzar, desplegueu la part "
-"central de la pantalla."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -47,77 +122,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Habiliteu els serveis d'ubicació. Per actualitzar, desplegueu la part "
-#~ "central de la pantalla."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Feu un toc aquí per obtenir més informació."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Gestioneu el dia amb tots els aspectes bàsics."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Avui ofereix un resum del dia, incloent-hi:<br>- esdeveniments i "
-#~ "tasques<br>- trucades i missatges<br>- notícies, el temps i molt més."
-#~ "<br><br> Podeu personalitzar el que es mostra a Avui utilitzant la icona "
-#~ "de configuració d'àmbit.<br><br> Per a alguns serveis, és necessari que "
-#~ "inicieu sessió abans o després."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Benvinguts a l'ambit d'Avui"
-
-#~ msgid "Add account"
-#~ msgstr "Afegeix compte"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr ""
-#~ "<b>   Reviseu la vostra configuració de sincronització del Google </b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Si afegiu el compte del Google, Avui podrà mostrar els vostres "
-#~ "esdeveniments i contactes.<br><br>Premeu el següent botó per afegir el "
-#~ "compte (o aneu a Comptes a l'aplicació Configuració).<br><br>Recordeu-vos "
-#~ "d'habilitar la sincronització de contactes i calendari un cop s'hagi "
-#~ "afegit el compte correctament."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Vegeu els vostres esdeveniments del Google i molt més."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   S'ha iniciat sessió correctament</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Afegiu el compte</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Feu un seguiment de la vostra activitat amb el Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Comenceu."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>D'acord</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Omet i configura més endavant</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Configureu els comptes més endavant."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Feu clic aquí per obtenir més informació."
 
@@ -227,6 +237,53 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Vegeu el vostre canal de fotos de l'Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Estigueu al dia amb les notícies més recents."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Notícies mostra contingut procedent de diverses fonts.<br><br>Podeu "
+#~ "utilitzar la configuració d'àmbit per decidir les fonts de notícies que "
+#~ "voleu que es mostrin i crear els vostres propis canals de notícies segons "
+#~ "el que us interessi."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Benvinguts a l'ambit d'Avui"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Comenceu."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Contingut de l'ambit de Notícies"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Cerqueu aquí les vostres fotos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Fotos facilita la cerca de fotografies de l'Instagram, el Facebook, el "
+#~ "Flickr i la càmera. Tot al mateix lloc."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Benvinguts a l'ambit d'Avui"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Contingut de l'ambit de Notícies"
+
 #~ msgid "Hints"
 #~ msgstr "Consells"
 
@@ -253,6 +310,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "A partir d'ara, s'ocultaran els consells"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Habiliteu els serveis d'ubicació. Per actualitzar, desplegueu la part "
+#~ "central de la pantalla."
+
 #~ msgid "Photos"
 #~ msgstr "Fotos"
 

=== modified file 'po/cs.po'
--- po/cs.po	2015-07-20 23:53:41 +0000
+++ po/cs.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,25 +21,96 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  cs.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"#-#-#-#-#  orig_cs.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Přidat účet"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Podívejte se na události a další položky v Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Zkontrolujte si nastavení synchronizace Google</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Vítejte v přehledu Dnes"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Uspořádejte si den se všemi základními fakty."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Klepněte zde pro více informací."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Zadejte svůj účet</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Jděte do toho."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Sledujte svou aktivitu pomocí Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Když si přidáte účet Google, budou se zobrazovat vaše události a kontakty v "
+"přehledu Dnes.<br><br>Stisknutím tlačítka dole zadejte svůj účet (nebo "
+"přejděte na účty v aplikaci Nastavení).<br><br>Po úspěšném zadání účtu "
+"nezapomeňte zapnout synchronizaci kontaktů a kalendáře."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Přeskočit &amp; nastavit později</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"V přehledu Dnes je uveden souhrn celého dne včetně těchto položek:<br>- "
+"události a úkoly<br>- volání a zprávy<br>- novinky, počasí a další.<br><br> "
+"Obsah zobrazující se v přehledu Dnes si můžete přizpůsobit pomocí ikony "
+"nastavení přehledu.<br><br> Některé služby vyžadují, abyste se níže nyní "
+"nebo později přihlásili."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Nastavte svoje účty později."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr "Zapněte lokační služby. Obnovte stažením prostředku obrazovky dolů."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
 msgstr "Připojte se k internetu. Obnovte stažením prostředku obrazovky dolů."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr "Zapněte lokační služby. Obnovte stažením prostředku obrazovky dolů."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -44,73 +119,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr "Zapněte lokační služby. Obnovte stažením prostředku obrazovky dolů."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Klepněte zde pro více informací."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Uspořádejte si den se všemi základními fakty."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "V přehledu Dnes je uveden souhrn celého dne včetně těchto položek:<br>- "
-#~ "události a úkoly<br>- volání a zprávy<br>- novinky, počasí a další."
-#~ "<br><br> Obsah zobrazující se v přehledu Dnes si můžete přizpůsobit "
-#~ "pomocí ikony nastavení přehledu.<br><br> Některé služby vyžadují, abyste "
-#~ "se níže nyní nebo později přihlásili."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Vítejte v přehledu Dnes"
-
-#~ msgid "Add account"
-#~ msgstr "Přidat účet"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Zkontrolujte si nastavení synchronizace Google</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Když si přidáte účet Google, budou se zobrazovat vaše události a kontakty "
-#~ "v přehledu Dnes.<br><br>Stisknutím tlačítka dole zadejte svůj účet (nebo "
-#~ "přejděte na účty v aplikaci Nastavení).<br><br>Po úspěšném zadání účtu "
-#~ "nezapomeňte zapnout synchronizaci kontaktů a kalendáře."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Podívejte se na události a další položky v Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Přihlášení proběhlo úspěšně</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Zadejte svůj účet</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Sledujte svou aktivitu pomocí Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Jděte do toho."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Přeskočit &amp; nastavit později</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Nastavte svoje účty později."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Klikněte zde pro více informací."
 
@@ -219,6 +233,52 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Podívejte se na svoje fotografie z Instagramu."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Udržujte si aktuální přehled o novinkách."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Novinky zobrazují obsah z řady různých zdrojů.<br><br>Pomocí nastavení "
+#~ "rozsahu můžete rozhodnout, které zdroje novinek se budou zobrazovat a "
+#~ "vytvořit si tak vlastní náplň novinek podle svých zájmů."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Vítejte v přehledu Dnes"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Jděte do toho."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Obsah vašeho přehledu Novinky"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Zde najdete svoje fotografie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Přehled Fotografie umožňuje snadné procházení vašich obrázků z aplikací "
+#~ "Instagram, Facebook, Flickr a z fotoaparátu - vše na jednom místě."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Vítejte v přehledu Dnes"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Obsah vašeho přehledu Novinky"
+
 #~ msgid "Hints"
 #~ msgstr "Rady"
 
@@ -244,6 +304,12 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Rady budou skryté"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr "Zapněte lokační služby. Obnovte stažením prostředku obrazovky dolů."
+
 #~ msgid "Photos"
 #~ msgstr "Fotografie"
 

=== modified file 'po/da.po'
--- po/da.po	2015-07-20 23:53:41 +0000
+++ po/da.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,87 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  da.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_da.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Tilføj konto"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Se dine begivenheder med mere fra Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Kontroller dine indstillinger for Google-synkronisering</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Velkommen til området I dag"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Hold styr på din dag med alle de vigtigste ting."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Tryk her for at få flere oplysninger."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Tilføj din konto</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Kom i gang."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Spor din aktivitet med Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Når du tilføjer din Google-konto, kan I dag vise dine begivenheder og "
+"kontakter.<br><br>Tryk på knappen nedenfor for at tilføje din konto (eller "
+"gå til Konti i app'en Indstillinger).<br><br>Husk at aktivere synkronisering "
+"af kontaktpersoner og kalender, når du har tilføjet den."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Spring over, og opret senere</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"I dag giver dig en oversigt over din dag, herunder:<br>- begivenheder og "
+"opgaver<br>- opkald og beskeder<br>- nyheder, vejret med mere.<br><br> Du "
+"kan tilpasse, hvad der vises i I dag, ved hjælp af områdeindstillingsikonet."
+"<br><br> Nogle tjenester kræver, at du logger på nedenfor eller senere."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Opret dine konti senere."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Aktiver placeringstjenester. Opdater ved at trække ned fra midten af skærmen."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,18 +109,10 @@
 "Opret forbindelse til internettet. Opdater ved at trække ned fra midten af "
 "skærmen."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Aktiver placeringstjenester. Opdater ved at trække ned fra midten af skærmen."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -47,75 +121,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Aktiver placeringstjenester. Opdater ved at trække ned fra midten af "
-#~ "skærmen."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Tryk her for at få flere oplysninger."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Hold styr på din dag med alle de vigtigste ting."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "I dag giver dig en oversigt over din dag, herunder:<br>- begivenheder og "
-#~ "opgaver<br>- opkald og beskeder<br>- nyheder, vejret med mere.<br><br> Du "
-#~ "kan tilpasse, hvad der vises i I dag, ved hjælp af "
-#~ "områdeindstillingsikonet.<br><br> Nogle tjenester kræver, at du logger på "
-#~ "nedenfor eller senere."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Velkommen til området I dag"
-
-#~ msgid "Add account"
-#~ msgstr "Tilføj konto"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Kontroller dine indstillinger for Google-synkronisering</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Når du tilføjer din Google-konto, kan I dag vise dine begivenheder og "
-#~ "kontakter.<br><br>Tryk på knappen nedenfor for at tilføje din konto "
-#~ "(eller gå til Konti i app'en Indstillinger).<br><br>Husk at aktivere "
-#~ "synkronisering af kontaktpersoner og kalender, når du har tilføjet den."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Se dine begivenheder med mere fra Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Logget på</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Tilføj din konto</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Spor din aktivitet med Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Kom i gang."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Spring over, og opret senere</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Opret dine konti senere."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Klik her for at få flere oplysninger."
 
@@ -225,6 +236,53 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Se dit foto-feed fra Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Hold dig opdateret med de seneste nyheder."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Nyheder viser indhold fra en række forskellige kilder.<br><br>Du kan "
+#~ "bruge områdeindstillingerne til at vælge, hvilke nyhedskilder der skal "
+#~ "vises, så du kan oprette dit eget nyhedsfeed på grundlag af dine "
+#~ "interesser."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Velkommen til området I dag"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Kom i gang."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Indhold i dit Nyheder-område"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Find dine fotos her"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Fotos hør det nemt at finde dine billeder fra Instagram, Facebook, Flickr "
+#~ "og kameraet – det hele på ét sted."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Velkommen til området I dag"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Indhold i dit Nyheder-område"
+
 #~ msgid "Hints"
 #~ msgstr "Tip"
 
@@ -251,6 +309,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Tip vil nu blive skjult"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Aktiver placeringstjenester. Opdater ved at trække ned fra midten af "
+#~ "skærmen."
+
 #~ msgid "Photos"
 #~ msgstr "Fotos"
 

=== modified file 'po/de.po'
--- po/de.po	2015-07-20 23:53:41 +0000
+++ po/de.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,91 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  de.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_de.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Konto hinzufügen"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Zeigen Sie Ihre Ereignisse und mehr von Google an."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Überprüfen Sie Ihre Google-Synchronisierungseinstellungen</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Willkommen im Bereich \"Heute\""
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Verwalten Sie Ihren Tag mit allem was wichtig ist."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Tippen Sie hier, um mehr Informationen zu erhalten."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Ihr Konto hinzufügen</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Erste Schritte."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Verfolgen Sie Ihre Aktivität mit Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Wenn Sie Ihr Google-Konto hinzufügen, können Sie Ihre Ereignisse und "
+"Kontakte unter \"Heute\" anzeigen.<br><br>Drücken Sie die Schaltfläche "
+"unten, um Ihr Konto hinzuzufügen (oder gehen Sie in der Einstellungen-App zu "
+"\"Konten\").<br><br>Denken Sie daran, die Kontakt- und "
+"Kalendersynchronisierung zu aktivieren, sobald Sie sie erfolgreich "
+"hinzugefügt haben."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Überspringen &amp; und später einrichten</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"\"Heute\" bietet Ihnen einen Überblick über Ihren Tag, einschließlich:<br>- "
+"Ereignisse und Aufgaben<br>- Anrufe und Nachrichten<br>- Nachrichten, Wetter "
+"und mehr<br><br> Sie können mithilfe des Bereichseinstellungen-Symbols "
+"anpassen, was unter \"Heute\" angezeigt wird.<br><br> Für einige Services "
+"müssen Sie sich unten oder später anmelden."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Richten Sie Ihre Konten später ein."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Bitte aktivieren Sie Ortsdienste. Aktualisieren Sie, indem Sie die Mitte des "
+"Bildschirms nach unten ziehen."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,19 +113,10 @@
 "Bitte verbinden Sie sich mit dem Internet. Aktualisieren Sie, indem Sie die "
 "Mitte des Bildschirms nach unten ziehen."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Bitte aktivieren Sie Ortsdienste. Aktualisieren Sie, indem Sie die Mitte des "
-"Bildschirms nach unten ziehen."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -48,78 +125,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Bitte aktivieren Sie Ortsdienste. Aktualisieren Sie, indem Sie die Mitte "
-#~ "des Bildschirms nach unten ziehen."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Tippen Sie hier, um mehr Informationen zu erhalten."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Verwalten Sie Ihren Tag mit allem was wichtig ist."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "\"Heute\" bietet Ihnen einen Überblick über Ihren Tag, einschließlich:"
-#~ "<br>- Ereignisse und Aufgaben<br>- Anrufe und Nachrichten<br>- "
-#~ "Nachrichten, Wetter und mehr<br><br> Sie können mithilfe des "
-#~ "Bereichseinstellungen-Symbols anpassen, was unter \"Heute\" angezeigt "
-#~ "wird.<br><br> Für einige Services müssen Sie sich unten oder später "
-#~ "anmelden."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Willkommen im Bereich \"Heute\""
-
-#~ msgid "Add account"
-#~ msgstr "Konto hinzufügen"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Überprüfen Sie Ihre Google-Synchronisierungseinstellungen</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Wenn Sie Ihr Google-Konto hinzufügen, können Sie Ihre Ereignisse und "
-#~ "Kontakte unter \"Heute\" anzeigen.<br><br>Drücken Sie die Schaltfläche "
-#~ "unten, um Ihr Konto hinzuzufügen (oder gehen Sie in der Einstellungen-App "
-#~ "zu \"Konten\").<br><br>Denken Sie daran, die Kontakt- und "
-#~ "Kalendersynchronisierung zu aktivieren, sobald Sie sie erfolgreich "
-#~ "hinzugefügt haben."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Zeigen Sie Ihre Ereignisse und mehr von Google an."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Erfolgreich angemeldet</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Ihr Konto hinzufügen</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Verfolgen Sie Ihre Aktivität mit Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Erste Schritte."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Überspringen &amp; und später einrichten</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Richten Sie Ihre Konten später ein."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Klicken Sie hier, um mehr Informationen zu erhalten."
 
@@ -230,6 +241,53 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Zeigen Sie Ihren Foto-Feed von Instagram an."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Bei den neuesten Nachrichten auf dem neuesten Stand bleiben"
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Anzeige von Nachrichteninhalten aus einer Vielzahl verschiedener "
+#~ "Quellen<br><br>Sie können die Bereichseinstellungen verwenden, um zu "
+#~ "entscheiden, welche Nachrichtenquellen angezeigt werden, sodass Sie Ihren "
+#~ "eigenen News-Feed auf Basis Ihrer Interessen erstellen können."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Willkommen im Bereich \"Heute\""
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Erste Schritte."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Inhalt Ihres Bereichs \"Nachrichten\""
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Sie finden Ihre Fotos hier"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Fotos machen es Ihnen einfach, Ihre Bilder von Instagram, Facebook, "
+#~ "Flickr und der Kamera zu durchsuchen – alle an einem Ort."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Willkommen im Bereich \"Heute\""
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Inhalt Ihres Bereichs \"Nachrichten\""
+
 #~ msgid "Hints"
 #~ msgstr "Tipps"
 
@@ -256,6 +314,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Tipps werden jetzt ausgeblendet"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Bitte aktivieren Sie Ortsdienste. Aktualisieren Sie, indem Sie die Mitte "
+#~ "des Bildschirms nach unten ziehen."
+
 #~ msgid "Photos"
 #~ msgstr "Fotos"
 

=== modified file 'po/el.po'
--- po/el.po	2015-07-20 23:53:41 +0000
+++ po/el.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,91 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  el.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_el.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Προσθήκη λογαριασμού"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Δείτε τις εκδηλώσεις σας και ακόμη περισσότερα από την Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Ελέγξτε τις ρυθμίσεις συγχρονισμού Google</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Καλώς ορίσατε στο περιεχόμενο του στοιχείου «Σήμερα»"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Διαχειριστείτε την ημέρα σας με όλα τα βασικά στοιχεία."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Για περισσότερες πληροφορίες, πατήστε εδώ."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Προσθέστε τον λογαριασμό σας</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Ξεκινήστε."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Παρακολουθήστε τη δραστηριότητά σας με το Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Προσθέτοντας τον λογαριασμό σας Google, επιτρέπετε στην επιλογή «Σήμερα» να "
+"εμφανίζει τις εκδηλώσεις και τις επαφές σας.<br><br>Πιέστε το παρακάτω "
+"κουμπί για να προσθέσετε τον λογαριασμό σας (ή μεταβείτε στους λογαριασμούς "
+"σας στην εφαρμογή «Ρυθμίσεις»).<br><br>Θυμηθείτε να ενεργοποιήσετε τον "
+"συγχρονισμό επαφών και ημερολογίου μόλις τον προσθέσετε επιτυχώς."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Παράβλεψη και ρύθμιση αργότερα</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Η επιλογή «Σήμερα» παρέχει μια επισκόπηση της ημέρας σας, όπου "
+"συμπεριλαμβάνονται:<br>- εκδηλώσεις και εργασίες<br>- κλήσεις και "
+"μηνύματα<br>- νέα, καιρός και άλλα πολλά.<br><br> Μπορείτε να προσαρμόσετε "
+"τι θα εμφανίζεται στην επιλογή «Σήμερα» χρησιμοποιώντας το εικονίδιο "
+"ρυθμίσεων περιεχομένου.<br><br> Ορισμένες υπηρεσίες απαιτούν να συνδεθείτε "
+"παρακάτω ή αργότερα."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Ρυθμίστε τους λογαριασμούς σας αργότερα."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Ενεργοποιήστε τις υπηρεσίες τοποθεσίας. Πραγματοποιήστε ανανέωση σύροντας "
+"προς τα κάτω το μεσαίο τμήμα της οθόνης."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,19 +113,10 @@
 "Συνδεθείτε στο διαδίκτυο. Πραγματοποιήστε ανανέωση σύροντας προς τα κάτω το "
 "μεσαίο τμήμα της οθόνης."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Ενεργοποιήστε τις υπηρεσίες τοποθεσίας. Πραγματοποιήστε ανανέωση σύροντας "
-"προς τα κάτω το μεσαίο τμήμα της οθόνης."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -48,78 +125,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Ενεργοποιήστε τις υπηρεσίες τοποθεσίας. Πραγματοποιήστε ανανέωση σύροντας "
-#~ "προς τα κάτω το μεσαίο τμήμα της οθόνης."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Για περισσότερες πληροφορίες, πατήστε εδώ."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Διαχειριστείτε την ημέρα σας με όλα τα βασικά στοιχεία."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Η επιλογή «Σήμερα» παρέχει μια επισκόπηση της ημέρας σας, όπου "
-#~ "συμπεριλαμβάνονται:<br>- εκδηλώσεις και εργασίες<br>- κλήσεις και "
-#~ "μηνύματα<br>- νέα, καιρός και άλλα πολλά.<br><br> Μπορείτε να "
-#~ "προσαρμόσετε τι θα εμφανίζεται στην επιλογή «Σήμερα» χρησιμοποιώντας το "
-#~ "εικονίδιο ρυθμίσεων περιεχομένου.<br><br> Ορισμένες υπηρεσίες απαιτούν να "
-#~ "συνδεθείτε παρακάτω ή αργότερα."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Καλώς ορίσατε στο περιεχόμενο του στοιχείου «Σήμερα»"
-
-#~ msgid "Add account"
-#~ msgstr "Προσθήκη λογαριασμού"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Ελέγξτε τις ρυθμίσεις συγχρονισμού Google</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Προσθέτοντας τον λογαριασμό σας Google, επιτρέπετε στην επιλογή «Σήμερα» "
-#~ "να εμφανίζει τις εκδηλώσεις και τις επαφές σας.<br><br>Πιέστε το παρακάτω "
-#~ "κουμπί για να προσθέσετε τον λογαριασμό σας (ή μεταβείτε στους "
-#~ "λογαριασμούς σας στην εφαρμογή «Ρυθμίσεις»).<br><br>Θυμηθείτε να "
-#~ "ενεργοποιήσετε τον συγχρονισμό επαφών και ημερολογίου μόλις τον "
-#~ "προσθέσετε επιτυχώς."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Δείτε τις εκδηλώσεις σας και ακόμη περισσότερα από την Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Έγινε επιτυχώς σύνδεση σε</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Προσθέστε τον λογαριασμό σας</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Παρακολουθήστε τη δραστηριότητά σας με το Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Ξεκινήστε."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Παράβλεψη και ρύθμιση αργότερα</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Ρυθμίστε τους λογαριασμούς σας αργότερα."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Για περισσότερες πληροφορίες, κάντε κλικ εδώ."
 
@@ -231,6 +242,54 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Δείτε τις φωτογραφίες σας από το Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Μείνετε ενημερωμένοι με τα τελευταία νέα."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Στα νέα εμφανίζεται περιεχόμενο από ποικιλία διαφορετικών πηγών."
+#~ "<br><br>Μπορείτε να χρησιμοποιήσετε τις ρυθμίσεις περιεχομένου για να "
+#~ "αποφασίσετε τις πηγές ειδήσεων που θα εμφανίζονται, επιτρέποντάς σας να "
+#~ "δημιουργήσετε τη δική σας τροφοδοσία νέων με βάση τα ενδιαφέροντά σας."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Καλώς ορίσατε στο περιεχόμενο του στοιχείου «Σήμερα»"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Ξεκινήστε."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Περιεχόμενα του στοιχείου «Νέα»"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Εύρεση των φωτογραφιών σας εδώ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Το στοιχείο «Φωτογραφίες» διευκολύνει την περιήγησή σας στις φωτογραφίες "
+#~ "σας από το Instagram, το Facebook, το Flickr και την κάμερά σας - όλες σε "
+#~ "ένα μέρος."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Καλώς ορίσατε στο περιεχόμενο του στοιχείου «Σήμερα»"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Περιεχόμενα του στοιχείου «Νέα»"
+
 #~ msgid "Hints"
 #~ msgstr "Υποδείξεις"
 
@@ -259,6 +318,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Θα γίνει απόκρυψη των υποδείξεων"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Ενεργοποιήστε τις υπηρεσίες τοποθεσίας. Πραγματοποιήστε ανανέωση σύροντας "
+#~ "προς τα κάτω το μεσαίο τμήμα της οθόνης."
+
 #~ msgid "Photos"
 #~ msgstr "Φωτογραφίες"
 

=== modified file 'po/es.po'
--- po/es.po	2015-07-20 23:53:41 +0000
+++ po/es.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 #
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,90 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  es.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_es.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Añadir cuenta"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Mostrar tus eventos y más cosas de Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b> Revisar la sincronización con Google</b> "
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Bienvenido al scope Hoy"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Organiza tu día con todo lo esencial."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Toca aquí para más información"
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Añade tu cuenta</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Vamos a empezar."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Sigue tu actividad con Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Al añadir tu cuenta de Google permitirás al scope Hoy mostrar tus eventos y "
+"contactos. <br> Pulsa el botón de abajo para agregar la cuenta (o vete a "
+"Cuentas en la aplicación de Configuración del Sistema). <br> Una vez que "
+"hayas añadido la cuenta, recuerda activar la sincronización de contactos y "
+"calendario."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Continuar y configurar más tarde</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Hoy te da un resumen del día, incluyendo: <br> - eventos y tareas <br> - "
+"llamadas y mensajes <br> - noticias, el tiempo y más.<BR> Puedes "
+"personalizar lo que se muestra en Hoy mediante el icono de configuración del "
+"scope. <br> <br>Algunos servicios requieren autenticación, algo que puedes "
+"hacerlo ahora o más tarde."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Configura tus cuentas más tarde."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Por favor, activa los servicios de ubicación. Actualiza arrastrando hacia "
+"abajo la pantalla."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,19 +112,10 @@
 "Por favor, conectate a internet. Actualiza arrastrando hacia abajo la "
 "pantalla."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Por favor, activa los servicios de ubicación. Actualiza arrastrando hacia "
-"abajo la pantalla."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -48,76 +124,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Por favor, activa los servicios de ubicación. Actualiza arrastrando hacia "
-#~ "abajo la pantalla."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Toca aquí para más información"
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Organiza tu día con todo lo esencial."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Hoy te da un resumen del día, incluyendo: <br> - eventos y tareas <br> - "
-#~ "llamadas y mensajes <br> - noticias, el tiempo y más.<BR> Puedes "
-#~ "personalizar lo que se muestra en Hoy mediante el icono de configuración "
-#~ "del scope. <br> <br>Algunos servicios requieren autenticación, algo que "
-#~ "puedes hacerlo ahora o más tarde."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Bienvenido al scope Hoy"
-
-#~ msgid "Add account"
-#~ msgstr "Añadir cuenta"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b> Revisar la sincronización con Google</b> "
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Al añadir tu cuenta de Google permitirás al scope Hoy mostrar tus eventos "
-#~ "y contactos. <br> Pulsa el botón de abajo para agregar la cuenta (o vete "
-#~ "a Cuentas en la aplicación de Configuración del Sistema). <br> Una vez "
-#~ "que hayas añadido la cuenta, recuerda activar la sincronización de "
-#~ "contactos y calendario."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Mostrar tus eventos y más cosas de Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>  Sesión iniciada correctamente</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Añade tu cuenta</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Sigue tu actividad con Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Vamos a empezar."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>Aceptar</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Continuar y configurar más tarde</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Configura tus cuentas más tarde."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Pulsa aquí para más información."
 
@@ -211,6 +223,60 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Mostrar tu canal de fotos de Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Manténte al día de las últimas noticias."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Noticias muestra contenido de una variedad de fuentes.<br><br>Puedes usar "
+#~ "el icono de configuración parar seleccionar qué fuentes se muestran en "
+#~ "base a tus intereses."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Bienvenido al scope Hoy"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Vamos a empezar."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Contenidos en el scope de Noticias"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Aquí encontrarás tus fotos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Fotos reúne tus imágenes de Instagram, Facebook, Flickr y la cámara - "
+#~ "todo en el mismo sitio."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Bienvenido al scope Hoy"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Contenidos en el scope de Noticias"
+
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Por favor, activa los servicios de ubicación. Actualiza arrastrando hacia "
+#~ "abajo la pantalla."
+
 #
 #~ msgid "To refresh your scope content: pull down the middle of the screen."
 #~ msgstr ""

=== modified file 'po/eu.po'
--- po/eu.po	2015-07-20 23:53:41 +0000
+++ po/eu.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,26 +21,96 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  eu.po (photos)  #-#-#-#-#\n"
+"#-#-#-#-#  orig_eu.po (photos)  #-#-#-#-#\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Gehitu kontua"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Ikusi zure ekitaldiak eta gehiago Googletik."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Berrikus itzazu zure Google Sync ezarpenak</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Ongi etorri Gaurkoa esparrura"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Kudeatu zure eguna, funtsezko guztiekin."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Sakatu hemen, informazio gehiago eskuratzeko."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Gehitu zure kontua</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Hasi."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Egin zure jardueraren segimendua Fitbitekin."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Zure Google kontua gehituta, Gaurkoan agertu ahalko dira zure ekitaldiak eta "
+"kontaktuak.<br><br>Sakatu beheko botoia, zure kontua gehitzeko (edo joan "
+"Kontuak atalera, ezarpenen aplikazioan).<br><br>Gogoan izan kontaktuen eta "
+"egutegiaren sinkronizazioa gaitzea, behin ondo gehitu duzunean."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Saltatu, eta konfiguratu geroago</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Gaurkoak zure egunaren ikuspegi orokorra ematen dizu. Besteak beste:<br>- "
+"ekitaldiak eta zereginak<br>- deiak eta mezuak<br>- albisteak, eguraldiak "
+"eta gehiago.<br><br> Gaurkoa atalean zer agertzen den pertsonaliza dezakezu, "
+"esparru ezarpenen ikonoa erabiliz.<br><br> Zerbitzu batzuek saioa hastea "
+"eskatzen dizute, behean edo geroago."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Konfiguratu zure kontuak geroago."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Gaitu kokaleku zerbitzuak Freskatu, pantailaren erdian beherantz eraginez."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
 msgstr ""
 "Konektatu Internetera. Freskatu, pantailaren erdian beherantz eraginez."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Gaitu kokaleku zerbitzuak Freskatu, pantailaren erdian beherantz eraginez."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -45,75 +119,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Gaitu kokaleku zerbitzuak Freskatu, pantailaren erdian beherantz eraginez."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Sakatu hemen, informazio gehiago eskuratzeko."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Kudeatu zure eguna, funtsezko guztiekin."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Gaurkoak zure egunaren ikuspegi orokorra ematen dizu. Besteak beste:<br>- "
-#~ "ekitaldiak eta zereginak<br>- deiak eta mezuak<br>- albisteak, eguraldiak "
-#~ "eta gehiago.<br><br> Gaurkoa atalean zer agertzen den pertsonaliza "
-#~ "dezakezu, esparru ezarpenen ikonoa erabiliz.<br><br> Zerbitzu batzuek "
-#~ "saioa hastea eskatzen dizute, behean edo geroago."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Ongi etorri Gaurkoa esparrura"
-
-#~ msgid "Add account"
-#~ msgstr "Gehitu kontua"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Berrikus itzazu zure Google Sync ezarpenak</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Zure Google kontua gehituta, Gaurkoan agertu ahalko dira zure ekitaldiak "
-#~ "eta kontaktuak.<br><br>Sakatu beheko botoia, zure kontua gehitzeko (edo "
-#~ "joan Kontuak atalera, ezarpenen aplikazioan).<br><br>Gogoan izan "
-#~ "kontaktuen eta egutegiaren sinkronizazioa gaitzea, behin ondo gehitu "
-#~ "duzunean."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Ikusi zure ekitaldiak eta gehiago Googletik."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Saioa ondo hasita</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Gehitu zure kontua</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Egin zure jardueraren segimendua Fitbitekin."
-
-#~ msgid "Get started."
-#~ msgstr "Hasi."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>Ados</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Saltatu, eta konfiguratu geroago</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Konfiguratu zure kontuak geroago."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Klikatu hemen, informazio gehiago eskuratzeko."
 
@@ -224,6 +235,53 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Ikusi Instagrameko zure argazkiak."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Izan egunean, azken berriekin."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Albisteetan hainbat iturritako edukia azaltzen da.<br><br>Esparruko "
+#~ "ezarpenak erabiliz erabaki dezakezu ea zein albiste iturri erakusten "
+#~ "diren. Horrela, zeure albistegia sor dezakezu, zeure interesetan "
+#~ "oinarritua."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Ongi etorri Gaurkoa esparrura"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Hasi."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Zure Albiste esparruko edukiak"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Aurkitu zure argazkiak hemen"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Argazki esparruak erraztu egiten du Instagramen, Facebooken, Flickren eta "
+#~ "kameran dituzun argazkietan arakatzea, guztietan batera."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Ongi etorri Gaurkoa esparrura"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Zure Albiste esparruko edukiak"
+
 #~ msgid "Hints"
 #~ msgstr "Iradokizunak"
 
@@ -249,6 +307,13 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Iradokizunak ezkutatu egingo dira orain"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gaitu kokaleku zerbitzuak Freskatu, pantailaren erdian beherantz eraginez."
+
 #~ msgid "Photos"
 #~ msgstr "Argazkiak"
 

=== modified file 'po/fi.po'
--- po/fi.po	2015-07-20 23:53:41 +0000
+++ po/fi.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,26 +21,96 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  fi.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_fi.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Lisää tili"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Näytä omat tapahtumat ja muuta Googlesta."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Tarkista Google-synkronointiasetukset</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Tervetuloa Tänään-laajuuteen"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Hallitse päivääsi kaikella olennaisella."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Napauta tätä, kun haluat lisätietoja."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Lisää oma tilisi</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Aloita."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Seuraa aktiivisuuttasi Fitbitillä."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Kun lisäät Google-tilin, Tänään voi näyttää tapahtumasi ja yhteystietosi."
+"<br><br>Lisää tilisi painamalla alla olevaa painiketta (tai siirry tileihin "
+"Asetukset-sovelluksessa).<br><br>Muista ottaa yhteystietojen ja kalenterin "
+"synkronointikäyttöön, kun ne on lisätty."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Ohita ja määritä myöhemmin</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Tänään antaa yleiskuvauksen päivästä sisältäen:<br>- tapahtumat ja "
+"tehtävät<br>- puhelut ja viestit<br>- uutiset, sää jne.<br><br> Voit "
+"mukauttaa, mitä Tänään näyttää, käyttämällä laajuusasetuskuvaketta.<br><br> "
+"Eräät palvelut vaativat kirjautumisen alla tai myöhemmin."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Määritä tilisi myöhemmin."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Ota sijaintipalvelut käyttöön. Päivitä vetämällä alas keskeltä näyttöä."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
 msgstr "Muodosta Internet-yhteys. Päivitä vetämällä alas keskeltä näyttöä."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Ota sijaintipalvelut käyttöön. Päivitä vetämällä alas keskeltä näyttöä."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -45,73 +119,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Ota sijaintipalvelut käyttöön. Päivitä vetämällä alas keskeltä näyttöä."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Napauta tätä, kun haluat lisätietoja."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Hallitse päivääsi kaikella olennaisella."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Tänään antaa yleiskuvauksen päivästä sisältäen:<br>- tapahtumat ja "
-#~ "tehtävät<br>- puhelut ja viestit<br>- uutiset, sää jne.<br><br> Voit "
-#~ "mukauttaa, mitä Tänään näyttää, käyttämällä laajuusasetuskuvaketta."
-#~ "<br><br> Eräät palvelut vaativat kirjautumisen alla tai myöhemmin."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Tervetuloa Tänään-laajuuteen"
-
-#~ msgid "Add account"
-#~ msgstr "Lisää tili"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Tarkista Google-synkronointiasetukset</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Kun lisäät Google-tilin, Tänään voi näyttää tapahtumasi ja yhteystietosi."
-#~ "<br><br>Lisää tilisi painamalla alla olevaa painiketta (tai siirry "
-#~ "tileihin Asetukset-sovelluksessa).<br><br>Muista ottaa yhteystietojen ja "
-#~ "kalenterin synkronointikäyttöön, kun ne on lisätty."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Näytä omat tapahtumat ja muuta Googlesta."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Kirjautuminen onnistui</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Lisää oma tilisi</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Seuraa aktiivisuuttasi Fitbitillä."
-
-#~ msgid "Get started."
-#~ msgstr "Aloita."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Ohita ja määritä myöhemmin</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Määritä tilisi myöhemmin."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Napsauta tätä, kun haluat lisätietoja."
 
@@ -129,8 +142,13 @@
 #~ "<br><br>Muista, että oletusarvoisesti näytettävän sisällön lisäksi voit "
 #~ "aina etsiä muuta sisältöä käyttämällä hakupalkkia."
 
+#, fuzzy
 #~ msgid "Welcome to the NearBy scope"
-#~ msgstr "Tervetuloa NearBy-laajuuteen"
+#~ msgstr ""
+#~ "#-#-#-#-#  fi.po (photos)  #-#-#-#-#\n"
+#~ "Tervetuloa NearBy-näkymään\n"
+#~ "#-#-#-#-#  orig_fi.po (photos)  #-#-#-#-#\n"
+#~ "Tervetuloa NearBy-laajuuteen"
 
 #~ msgid "Weather"
 #~ msgstr "Sää"
@@ -220,6 +238,52 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Näytä valokuvasyötteesi Instagramista."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Pysy ajan tasalla viimeisimpien uutisten avulla."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Uutiset näyttävät sisältöä useista eri lähteistä.<br><br>Laajuusasetusten "
+#~ "avulla voit päättää näytettävät uutislähteet. Näin voit luoda oman "
+#~ "uutissyötteesi omien kiinnostustesi perusteella."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Tervetuloa Tänään-laajuuteen"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Aloita."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Uutiset-laajuutesi sisältö"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Löydä valokuvasi täältä"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Valokuvat-ominaisuus helpottaa Instagram-, Facebook-, Flickr- ja kameran "
+#~ "valokuvien selaamista – kaikki yhdessä paikassa."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Tervetuloa Tänään-laajuuteen"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Uutiset-laajuutesi sisältö"
+
 #~ msgid "Hints"
 #~ msgstr "Vihjeitä"
 
@@ -244,6 +308,13 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Vihjeet piilotetaan"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Ota sijaintipalvelut käyttöön. Päivitä vetämällä alas keskeltä näyttöä."
+
 #~ msgid "Photos"
 #~ msgstr "Valokuvat"
 

=== modified file 'po/fr.po'
--- po/fr.po	2015-07-20 23:53:41 +0000
+++ po/fr.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,91 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  fr.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"#-#-#-#-#  orig_fr.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Ajouter un compte"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Visualisez vos événements et plus depuis Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Vérifiez vos paramètres de synchronisation Google</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Bienvenue dans l'application Aujourd'hui"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Organisez votre journée avec l'essentiel."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Tapez ici pour plus d'informations."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Ajoutez votre compte</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Démarrer."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Effectuez le suivi de votre activité avec Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Ajoutez un compte Google pour afficher vos événements et vos contacts dans "
+"Aujourd'hui.<br><br>Appuyez sur le bouton ci-dessous pour ajouter votre "
+"compte (ou accédez à Comptes dans l'application Réglages).<br><br>N'oubliez "
+"pas d'activer la synchronisation du calendrier et des contacts une fois "
+"votre compte ajouté."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Ignorer et configurer ultérieurement</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"L'application Aujourd'hui vous donne un aperçu de votre journée, et vous "
+"fournit des informations telles que :<br>- événements et tâches<br>- appels "
+"et messages<br>- actualités, météo et davantage.<br><br> Vous pouvez "
+"personnaliser les informations affichées dans l'application Aujourd'hui à "
+"l'aide de l'icône de paramétrage correspondante.<br><br> Certains services "
+"vous obligent à vous connecter ci-dessous ou ultérieurement."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Configurez vos comptes ultérieurement."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Activez les services de localisation. Actualisez en faisant glisser votre "
+"doigt vers le bas à partir du centre de l'écran."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,19 +113,10 @@
 "Connectez-vous à Internet. Actualisez en faisant glisser votre doigt vers le "
 "bas à partir du centre de l'écran."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Activez les services de localisation. Actualisez en faisant glisser votre "
-"doigt vers le bas à partir du centre de l'écran."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -48,78 +125,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Activez les services de localisation. Actualisez en faisant glisser votre "
-#~ "doigt vers le bas à partir du centre de l'écran."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Tapez ici pour plus d'informations."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Organisez votre journée avec l'essentiel."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "L'application Aujourd'hui vous donne un aperçu de votre journée, et vous "
-#~ "fournit des informations telles que :<br>- événements et tâches<br>- "
-#~ "appels et messages<br>- actualités, météo et davantage.<br><br> Vous "
-#~ "pouvez personnaliser les informations affichées dans l'application "
-#~ "Aujourd'hui à l'aide de l'icône de paramétrage correspondante.<br><br> "
-#~ "Certains services vous obligent à vous connecter ci-dessous ou "
-#~ "ultérieurement."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Bienvenue dans l'application Aujourd'hui"
-
-#~ msgid "Add account"
-#~ msgstr "Ajouter un compte"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Vérifiez vos paramètres de synchronisation Google</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Ajoutez un compte Google pour afficher vos événements et vos contacts "
-#~ "dans Aujourd'hui.<br><br>Appuyez sur le bouton ci-dessous pour ajouter "
-#~ "votre compte (ou accédez à Comptes dans l'application Réglages)."
-#~ "<br><br>N'oubliez pas d'activer la synchronisation du calendrier et des "
-#~ "contacts une fois votre compte ajouté."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Visualisez vos événements et plus depuis Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Connexion réussie</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Ajoutez votre compte</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Effectuez le suivi de votre activité avec Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Démarrer."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Ignorer et configurer ultérieurement</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Configurez vos comptes ultérieurement."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Cliquez ici pour plus d'informations."
 
@@ -232,6 +243,54 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Affichez les photos de votre profil Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Restez informé en accédant aux dernières nouvelles."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Actualités provenant de diverses sources.<br><br>Vous pouvez utiliser les "
+#~ "réglages de l'application pour spécifier les sources que vous souhaitez "
+#~ "afficher afin de créer votre propre fil d'actualités en fonction de vos "
+#~ "intérêts."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Bienvenue dans l'application Aujourd'hui"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Démarrer."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Contenu de votre application Actualités"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Vos photos sont regroupées ici"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Photos vous permet de regrouper facilement vos photos d'Instagram, de "
+#~ "Facebook, de Flickr et de l'appareil photo au sein d'un emplacement "
+#~ "unique."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Bienvenue dans l'application Aujourd'hui"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Contenu de votre application Actualités"
+
 #~ msgid "Hints"
 #~ msgstr "Conseils"
 
@@ -262,6 +321,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "Les conseils seront masqués"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Activez les services de localisation. Actualisez en faisant glisser votre "
+#~ "doigt vers le bas à partir du centre de l'écran."
+
 #~ msgid "Photos"
 #~ msgstr "Photos"
 

=== modified file 'po/gl.po'
--- po/gl.po	2015-07-20 23:53:41 +0000
+++ po/gl.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +21,87 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  gl.po (photos)  #-#-#-#-#\n"
+"#-#-#-#-#  orig_gl.po (photos)  #-#-#-#-#\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Engadir conta"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Ver os seus eventos e máis desde Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Revise a súa configuración de sincronización de Google</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Benvido ao ámbito Hoxe"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Xestione a súa xornada cos elementos básicos."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Prema aquí se quere máis información."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Engadir a súa conta</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Comezar."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Seguir a súa actividade con Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Engadir a súa conta de Google permite que Hoxe mostre os seus eventos e "
+"contactos.<br><br>Prema o botón inferior para engadir a súa conta (ou vaia a "
+"contas na aplicación Configuración).<br><br>Cando a engada, lembre permitir "
+"a sincronización de contactos e calendario."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Omitir e configurar despois</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Hoxe proporciona un resumo da súa xornada que inclúe:<br>- Eventos e "
+"tarefas<br>- Chamadas e mensaxes<br>- Noticias, tempo e máis.<br><br> Pode "
+"personalizar o que se mostra en Hoxe a través da icona de configuración do "
+"ámbito.<br><br> Algúns servizos requiren que inicie sesión máis abaixo ou "
+"despois."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Configurar as súas contas despois."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Por favor, permita os servizos de localización. Actualice tirando cara "
+"abaixo desde o medio da pantalla."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -26,19 +109,10 @@
 "Por favor, conéctese a Internet. Actualice tirando cara abaixo desde o medio "
 "da pantalla."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Por favor, permita os servizos de localización. Actualice tirando cara "
-"abaixo desde o medio da pantalla."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -47,75 +121,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Por favor, permita os servizos de localización. Actualice tirando cara "
-#~ "abaixo desde o medio da pantalla."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Prema aquí se quere máis información."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Xestione a súa xornada cos elementos básicos."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Hoxe proporciona un resumo da súa xornada que inclúe:<br>- Eventos e "
-#~ "tarefas<br>- Chamadas e mensaxes<br>- Noticias, tempo e máis.<br><br> "
-#~ "Pode personalizar o que se mostra en Hoxe a través da icona de "
-#~ "configuración do ámbito.<br><br> Algúns servizos requiren que inicie "
-#~ "sesión máis abaixo ou despois."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Benvido ao ámbito Hoxe"
-
-#~ msgid "Add account"
-#~ msgstr "Engadir conta"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Revise a súa configuración de sincronización de Google</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Engadir a súa conta de Google permite que Hoxe mostre os seus eventos e "
-#~ "contactos.<br><br>Prema o botón inferior para engadir a súa conta (ou "
-#~ "vaia a contas na aplicación Configuración).<br><br>Cando a engada, lembre "
-#~ "permitir a sincronización de contactos e calendario."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Ver os seus eventos e máis desde Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Iniciou sesión correctamente</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Engadir a súa conta</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Seguir a súa actividade con Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Comezar."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Omitir e configurar despois</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Configurar as súas contas despois."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Prema aquí se quere máis información."
 
@@ -224,6 +235,52 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Ver as súas fotografías de Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Manterse actualizado coas últimas noticias."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Noticias mostra contido procedente de fontes diferentes.<br><br>Pode usar "
+#~ "a configuración de ámbito para escoller que fontes de noticias se mostran "
+#~ "e crear a súa propia baseada nos seus intereses."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Benvido ao ámbito Hoxe"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Comezar."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Contidos do seu ámbito Noticias"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Busque aquí as súas fotografías"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Fotografías simplifica a busca das súas imaxes de Instagram, Facebook, "
+#~ "Flickr e a cámara: todas nun só lugar."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Benvido ao ámbito Hoxe"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Contidos do seu ámbito Noticias"
+
 #~ msgid "Hints"
 #~ msgstr "Pistas"
 
@@ -250,6 +307,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "As pistas xa non se amosarán"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Por favor, permita os servizos de localización. Actualice tirando cara "
+#~ "abaixo desde o medio da pantalla."
+
 #~ msgid "Photos"
 #~ msgstr "Fotografías"
 

=== modified file 'po/hu.po'
--- po/hu.po	2015-07-20 23:53:41 +0000
+++ po/hu.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,90 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  hu.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_hu.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Fiók hozzáadása"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr ""
+"Tekintse meg a Google-ban megtalálható eseményeit és egyéb információit."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   A Google szinkronizálási beállításainak ellenőrzése</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Üdvözöljük a Ma munkalapon"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Szervezze meg a napját az összes szükséges információ megadásával."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "További információkért kattintson ide."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Adja hozzá a fiókját</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Kezdje meg a munkát."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Kövesse tevékenységeit a Fitbit segítségével."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"A Google-fiók hozzáadásával az eseményei és a partnerei meg fognak jelenni a "
+"Ma lapon.<br><br>Kattintson az alábbi gombra a fiók hozzáadásához (vagy a "
+"Beállítások alkalmazásban keresse meg a Fiókok lehetőséget).<br><br>A fiók "
+"hozzáadása után engedélyezze a partnerek és a naptár szinkronizálását."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Kihagyás, és beállítás később</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"A Ma lapon áttekintheti a napra vonatkozó<br>- eseményeket és feladatokat, "
+"<br>- hívásokat és üzeneteket,<br>- híreket, időjárás-előrejelzést stb."
+"<br><br> A munkalap beállítása ikon segítségével testre szabhatja, hogy mi "
+"jelenjen meg a Ma lapon.<br><br> Bizonyos szolgáltatások használatához az "
+"alábbiakban vagy később be kell jelentkeznie."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "A fiókjait később állítja be."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Engedélyezze a helyzetmeghatározási szolgáltatásokat. A frissítéshez húzza "
+"lefelé a képernyő középső részét."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,19 +112,10 @@
 "Kapcsolódjon az internethez. A frissítéshez húzza lefelé a képernyő középső "
 "részét."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Engedélyezze a helyzetmeghatározási szolgáltatásokat. A frissítéshez húzza "
-"lefelé a képernyő középső részét."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -48,78 +124,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Engedélyezze a helyzetmeghatározási szolgáltatásokat. A frissítéshez "
-#~ "húzza lefelé a képernyő középső részét."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "További információkért kattintson ide."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Szervezze meg a napját az összes szükséges információ megadásával."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "A Ma lapon áttekintheti a napra vonatkozó<br>- eseményeket és "
-#~ "feladatokat, <br>- hívásokat és üzeneteket,<br>- híreket, időjárás-"
-#~ "előrejelzést stb.<br><br> A munkalap beállítása ikon segítségével testre "
-#~ "szabhatja, hogy mi jelenjen meg a Ma lapon.<br><br> Bizonyos "
-#~ "szolgáltatások használatához az alábbiakban vagy később be kell "
-#~ "jelentkeznie."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Üdvözöljük a Ma munkalapon"
-
-#~ msgid "Add account"
-#~ msgstr "Fiók hozzáadása"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   A Google szinkronizálási beállításainak ellenőrzése</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "A Google-fiók hozzáadásával az eseményei és a partnerei meg fognak "
-#~ "jelenni a Ma lapon.<br><br>Kattintson az alábbi gombra a fiók "
-#~ "hozzáadásához (vagy a Beállítások alkalmazásban keresse meg a Fiókok "
-#~ "lehetőséget).<br><br>A fiók hozzáadása után engedélyezze a partnerek és a "
-#~ "naptár szinkronizálását."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr ""
-#~ "Tekintse meg a Google-ban megtalálható eseményeit és egyéb információit."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Sikeresen bejelentkezett</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Adja hozzá a fiókját</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Kövesse tevékenységeit a Fitbit segítségével."
-
-#~ msgid "Get started."
-#~ msgstr "Kezdje meg a munkát."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Kihagyás, és beállítás később</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "A fiókjait később állítja be."
-
 #~ msgid "Click here for more information."
 #~ msgstr "További információkért kattintson ide."
 
@@ -228,6 +238,52 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Tekintse meg az Instagramon található fényképeit."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Elolvashatja a legfrissebb híreket."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "A hírek között különböző forrásokból származó tartalmat talál.<br><br>A "
+#~ "munkalap-beállításokkal meghatározhatja, hogy mely."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Üdvözöljük a Ma munkalapon"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Kezdje meg a munkát."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "A Hírek munkalap tartalma"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Itt kereshet a fotói között"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "A Fotók munkalapon egyszerűen, egy helyen böngészhet az Instagramon, a "
+#~ "Facebookon és a Flickren található, illetve a fényképezőgépről származó "
+#~ "képek között."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Üdvözöljük a Ma munkalapon"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "A Hírek munkalap tartalma"
+
 #~ msgid "Hints"
 #~ msgstr "Tippek"
 
@@ -256,6 +312,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "A tippek nem lesznek láthatóak"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Engedélyezze a helyzetmeghatározási szolgáltatásokat. A frissítéshez "
+#~ "húzza lefelé a képernyő középső részét."
+
 #~ msgid "Photos"
 #~ msgstr "Fényképek"
 

=== modified file 'po/it.po'
--- po/it.po	2015-07-20 23:53:41 +0000
+++ po/it.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,89 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  it.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_it.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Aggiungi account"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Guarda i tuoi eventi e molto altro da Google."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Rivedi le impostazioni di sincronizzazione Google</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Benvenuto nello scope di Oggi"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Gestisci la giornata con tutto ciò che occorre."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Toccare qui per maggiori informazioni."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Aggiungi il tuo account</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Inizia ora."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Monitorizza la tua attività con Fitbit."
+
+#: ._description6
+msgid ""
+"Adding your Google account will allow Today to display your events and "
+"contacts.<br><br>Press the button below to add your account (or go to "
+"accounts in the Settings app).<br><br>Remember to enable the contact and "
+"calendar sync once you have successfully added it."
+msgstr ""
+"Aggiungendo l'account Google potrai visualizzare gli eventi e i contatti in "
+"Today.<br><br>Premi il pulsante di seguito per aggiungere il tuo account "
+"(oppure vai agli account nella app Impostazioni).<br><br>Ricorda di "
+"abilitare la sincronizzazione di contatti e calendari dopo averlo aggiunto."
+
+#: ._title13
+msgid "<b>Skip &amp; set up later</b>"
+msgstr "<b>Ignora e imposta più tardi</b>"
+
+#: ._description0
+msgid ""
+"Today gives you a overview of your day including:<br>- events and tasks<br>- "
+"calls and messages<br>- news, weather and more.<br><br> You can customise "
+"what is shown in Today using the scope settings icon.<br><br> Some services "
+"require your log-in below or later."
+msgstr ""
+"Today offre la panoramica della giornata con:<br>- eventi e task<br>- "
+"chiamate e messaggi<br>- notizie, meteo e altro ancora.<br><br> Puoi "
+"personalizzare la visualizzazione di Today usando le icone delle "
+"impostazioni degli scope.<br><br> Alcuni servizi richiedono il login di "
+"seguito o successivamente."
+
+#: ._title12
+msgid "Set up your accounts later."
+msgstr "Imposta gli account più tardi."
+
+#: ._no_loc_msg2 ../src/query.cpp:245
+msgid ""
+"Please enable location services. Refresh by pulling down the middle of the "
+"screen."
+msgstr ""
+"Abilita i servizi di localizzazione. Per aggiornare spingi verso il basso il "
+"centro dello schermo."
+
+#: ._no_net_msg0 ../src/query.cpp:207
 msgid ""
 "Please connect to the internet. Refresh by pulling down the middle of the "
 "screen."
@@ -27,19 +111,10 @@
 "Connettiti a Internet. Per aggiornare spingi verso il basso il centro dello "
 "schermo."
 
-#: ._category_title
+#: ._category_title1
 msgid "Install More Sources:"
 msgstr ""
 
-#
-#: ._no_loc_msg
-msgid ""
-"Please enable location services. Refresh by pulling down the middle of the "
-"screen"
-msgstr ""
-"Abilita i servizi di localizzazione. Per aggiornare spingi verso il basso il "
-"centro dello schermo."
-
 #: ../data/scope.ini.in.h:1
 msgid "Aggregator"
 msgstr ""
@@ -48,76 +123,12 @@
 msgid "A template for creating an aggregator scope"
 msgstr ""
 
-#~ msgid ""
-#~ "Please enable location services. Refresh by pulling down the middle of "
-#~ "the screen."
-#~ msgstr ""
-#~ "Abilita i servizi di localizzazione. Per aggiornare spingi verso il basso "
-#~ "il centro dello schermo."
-
-#~ msgid "Tap here for more information."
-#~ msgstr "Toccare qui per maggiori informazioni."
-
-#~ msgid "Manage your day with all the essentials."
-#~ msgstr "Gestisci la giornata con tutto ciò che occorre."
-
-#~ msgid ""
-#~ "Today gives you a overview of your day including:<br>- events and "
-#~ "tasks<br>- calls and messages<br>- news, weather and more.<br><br> You "
-#~ "can customise what is shown in Today using the scope settings icon."
-#~ "<br><br> Some services require your log-in below or later."
-#~ msgstr ""
-#~ "Today offre la panoramica della giornata con:<br>- eventi e task<br>- "
-#~ "chiamate e messaggi<br>- notizie, meteo e altro ancora.<br><br> Puoi "
-#~ "personalizzare la visualizzazione di Today usando le icone delle "
-#~ "impostazioni degli scope.<br><br> Alcuni servizi richiedono il login di "
-#~ "seguito o successivamente."
-
-#~ msgid "Welcome to the Today scope"
-#~ msgstr "Benvenuto nello scope di Oggi"
-
-#~ msgid "Add account"
-#~ msgstr "Aggiungi account"
-
-#~ msgid "<b>   Review your Google sync settings</b>"
-#~ msgstr "<b>   Rivedi le impostazioni di sincronizzazione Google</b>"
-
-#~ msgid ""
-#~ "Adding your Google account will allow Today to display your events and "
-#~ "contacts.<br><br>Press the button below to add your account (or go to "
-#~ "accounts in the Settings app).<br><br>Remember to enable the contact and "
-#~ "calendar sync once you have successfully added it."
-#~ msgstr ""
-#~ "Aggiungendo l'account Google potrai visualizzare gli eventi e i contatti "
-#~ "in Today.<br><br>Premi il pulsante di seguito per aggiungere il tuo "
-#~ "account (oppure vai agli account nella app Impostazioni).<br><br>Ricorda "
-#~ "di abilitare la sincronizzazione di contatti e calendari dopo averlo "
-#~ "aggiunto."
-
-#~ msgid "See your events and more from Google."
-#~ msgstr "Guarda i tuoi eventi e molto altro da Google."
-
 #~ msgid "<b>   Successfully logged in</b>"
 #~ msgstr "<b>   Login riuscito</b>"
 
-#~ msgid "<b>   Add your account</b>"
-#~ msgstr "<b>   Aggiungi il tuo account</b>"
-
-#~ msgid "Track your activity with Fitbit."
-#~ msgstr "Monitorizza la tua attività con Fitbit."
-
-#~ msgid "Get started."
-#~ msgstr "Inizia ora."
-
 #~ msgid "<b>OK</b>"
 #~ msgstr "<b>OK</b>"
 
-#~ msgid "<b>Skip &amp; set up later</b>"
-#~ msgstr "<b>Ignora e imposta più tardi</b>"
-
-#~ msgid "Set up your accounts later."
-#~ msgstr "Imposta gli account più tardi."
-
 #~ msgid "Click here for more information."
 #~ msgstr "Fare clic qui per maggiori informazioni."
 
@@ -226,6 +237,52 @@
 #~ msgid "See your photo feed from Instagram."
 #~ msgstr "Guarda il tuo feed di foto da Instagram."
 
+#, fuzzy
+#~ msgid "Stay up to date with the latest bollywood news, music, movies."
+#~ msgstr "Rimani aggiornato con le ultime notizie."
+
+#, fuzzy
+#~ msgid ""
+#~ "Book displays content from a variety of different sources.<br><br>You can "
+#~ "use the scope settings to decide which book sources are shown allowing "
+#~ "you to create your own book feed based on your interests."
+#~ msgstr ""
+#~ "Notizie visualizza contenuti da molte diverse origini.<br><br>Puoi usare "
+#~ "le impostazioni di scope per decidere le origini da visualizzare per "
+#~ "creare il tuo feed in base ai tuoi interessi."
+
+#, fuzzy
+#~ msgid "Welcome to the Bollywood scope"
+#~ msgstr "Benvenuto nello scope di Oggi"
+
+#, fuzzy
+#~ msgid "Hot star"
+#~ msgstr "Inizia ora."
+
+#, fuzzy
+#~ msgid "Contents of your Bollywood scope"
+#~ msgstr "Contenuti scope di Notizie"
+
+#, fuzzy
+#~ msgid "Find your books here."
+#~ msgstr "Trova le tue foto qui"
+
+#, fuzzy
+#~ msgid ""
+#~ "Books makes it easy to browse your books, magazines from Douban, China "
+#~ "mobile, and Viva - all in one place."
+#~ msgstr ""
+#~ "Con Foto puoi scorrere tutte le tue immagini di Instagram, Facebook, "
+#~ "Flickr e della fotocamera, in una sola posizione."
+
+#, fuzzy
+#~ msgid "Welcome to the Book scope"
+#~ msgstr "Benvenuto nello scope di Oggi"
+
+#, fuzzy
+#~ msgid "Contents of your book scope"
+#~ msgstr "Contenuti scope di Notizie"
+
 #~ msgid "Hints"
 #~ msgstr "Suggerimenti"
 
@@ -252,6 +309,14 @@
 #~ msgid "Hints will now be hidden"
 #~ msgstr "I suggerimenti ora saranno nascosti"
 
+#
+#~ msgid ""
+#~ "Please enable location services. Refresh by pulling down the middle of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Abilita i servizi di localizzazione. Per aggiornare spingi verso il basso "
+#~ "il centro dello schermo."
+
 #~ msgid "Photos"
 #~ msgstr "Foto"
 

=== added file 'po/json_get_i18n.py'
--- po/json_get_i18n.py	1970-01-01 00:00:00 +0000
+++ po/json_get_i18n.py	2016-06-27 15:49:40 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/python3
+import json
+import os
+import sys
+
+idx = -1
+trans = dict();
+
+def dolist(alist ):
+    for l in alist:
+        if type(l) is list:
+            dolist(l)
+        if type(l) is dict:
+            dodict(l)
+
+def dodict(adict):
+    for k,v in adict.items():
+        if k.startswith("_"):
+            global idx
+            idx += 1
+            global tran
+            trans[k + str(idx)] = v
+        if type(v) is list:
+            dolist(v)
+        if type(v) is dict:
+            dodict(v)
+
+if len(sys.argv) < 2:
+    print("File arg missing. Stopping")
+    sys.exit(1)
+
+if os.path.exists("i18n.json"):
+    os.remove("i18n.json")
+
+print("the filel:", sys.argv[1])
+
+with open(sys.argv[1]) as j_file:
+    j = json.load(j_file)
+
+if type(j) is list:
+    dolist(j)
+if type(j) is dict:
+    dodict(j)
+
+with open("i18n.json", "w") as outfile:
+    json.dump(trans, outfile, indent=4)
+
+#print(json.dumps(trans, indent=4))

=== modified file 'po/make-pot.sh'
--- po/make-pot.sh	2015-05-19 15:54:12 +0000
+++ po/make-pot.sh	2016-06-27 15:49:40 +0000
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 PWD=$(pwd)
 POT=aggregator
@@ -34,9 +35,10 @@
 
     echo "Processing: $json"
 
+    ./json_get_i18n.py $json
     name=$(basename $json)
     #echo "name: $name"
-    in_in_in_in="$json"
+    in_in_in_in="i18n.json"
     #echo "in_in_in_in: $in_in_in_in"
     in_in_in="/tmp/$name.pot.in.in.in"
     rm -f $in_in_in

=== added file 'po/merge-hints-po-to-other-po.sh'
--- po/merge-hints-po-to-other-po.sh	1970-01-01 00:00:00 +0000
+++ po/merge-hints-po-to-other-po.sh	2016-06-27 15:49:40 +0000
@@ -0,0 +1,35 @@
+#!/bin/bash
+REMOTE_DIR=$1
+
+function usage(){
+    echo "$0 REMOTE_PO_DIR"
+    echo "Merges current dir of po files with remote dir of po files as follows:"
+    echo "For every po file in current directory, if there is a po file in the"
+    echo "remote director, the two are mereged. If there is no po file for the"
+    echo "same language in the remote directory, the po file from here is copied"
+    echo "there."
+    echo ""
+    echo "After running this, you need to update the pot file in the remote"
+    echo "directory and then update the po files from it."
+    exit 1
+}
+
+[ -z $REMOTE_DIR ] && usage
+
+pos=$(ls *po)
+
+for po in $pos; do
+    lang=$(echo $po | cut -f 1 -d \.)
+    mergedpo="merged.${lang}.po"
+    rpo=${REMOTE_DIR}/${po}
+
+    rm -f $mergedpo
+
+    if [ ! -e $rpo ]; then
+        cp $po $rpo
+        continue
+    fi
+
+    msgcat --less-than 2 -o $mergedpo $po $rpo
+    mv $mergedpo $rpo
+done;

=== modified file 'po/nl.po'
--- po/nl.po	2015-07-20 23:53:41 +0000
+++ po/nl.po	2016-06-27 15:49:40 +0000
@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Automatically generated, 2014.
 # 
+#. #-#-#-#-#  hints.json.pot (PACKAGE VERSION)  #-#-#-#-#
+#. extracted from i18n.json
+#. #-#-#-#-#  aggregator.pot.in.pot (PACKAGE VERSION)  #-#-#-#-#
 #. #-#-#-#-#  translatables.json.pot (PACKAGE VERSION)  #-#-#-#-#
-#. extracted from ../data/translatables.json
+#. extracted from i18n.json
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: photos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-20 17:12-0400\n"
+"POT-Creation-Date: 2016-06-14 15:38+0800\n"
 "PO-Revision-Date: 2014-08-26 13:00-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +21,90 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ._no_net_msg
+"#-#-#-#-#  nl.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"#-#-#-#-#  orig_nl.po (photos)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ._name8 ._name4
+msgid "Add account"
+msgstr "Account toevoegen"
+
+#: ._title7
+msgid "See your events and more from Google."
+msgstr "Uw gebeurtenissen en meer van Google bekijken."
+
+#: ._title5
+msgid "<b>   Review your Google sync settings</b>"
+msgstr "<b>   Uw Google-synchronisatie-instellingen bekijken</b>"
+
+#: ._title3
+msgid "Welcome to the Today scope"
+msgstr "Welkom bij de Vandaag-taken"
+
+#: ._title1
+msgid "Manage your day with all the essentials."
+msgstr "Beheer uw dag met alle essentiële punten."
+
+#: ._subtitle2
+msgid "Tap here for more information."
+msgstr "Tik hier voor meer informatie."
+
+#: ._title9
+msgid "<b>   Add your account</b>"
+msgstr "<b>   Uw account toevoegen</b>"
+
+#: ._loggedin11
+msgid "Get started."
+msgstr "Aan de slag."
+
+#: ._title10
+msgid "Track your activity with Fitbit."
+msgstr "Uw activiteit volgen met Fitbit."
+