Merge branch 'intents' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-intents

Conflicts:
	mobile/res/values/strings.xml

mobile/res/layout/activity_share.xml

@@ -0,0 +1,6 @@
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/pager"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	tools:context=".ShareActivity"/>

mobile/res/values/dimens.xml

@@ -8,4 +8,6 @@
     <dimen name="app_minimumsize_w">400dip</dimen>
     <dimen name="app_minimumsize_h">200dip</dimen>
 
+    <dimen name="icon_margin">8dp</dimen>
+
 </resources>

mobile/res/values/strings.xml

@@ -61,8 +61,14 @@
     <string name="menu_faction">Faction</string>
     <string name="menu_info">Info</string>
     <string name="menu_debug">Debug</string>
+    <string name="menu_search">Search</string>
     <string name="choose_account_to_login">Choose account to login</string>
     <string name="login_failed">Login failed.</string>
     <string name="search_hint">Search Locations</string>
-    <string name="menu_search">Search</string>
-</resources>
+    <string name="intent_error">Address could not be opened</string>
+    <string name="msg_copied">Copied to clipboard…</string>
+
+    <string name="tab_map">Map</string>
+    <string name="tab_share">Share</string>
+    <string name="tab_browser">Browser</string>
+</resources>