From fc42b73ba599211bbdeda5da42d7710eb6976f81 Mon Sep 17 00:00:00 2001
From: Brad Stewart <s+github@bradstewart.ca>
Date: Sun, 31 Mar 2013 16:47:05 -0400
Subject: View title text on images

Conflicts:

	res/values-fr/strings.xml
	res/values/strings.xml
---
 res/menu/article_content_img_context_menu.xml | 7 ++++++-
 res/values-fr/strings.xml                     | 2 ++
 res/values/strings.xml                        | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/menu/article_content_img_context_menu.xml b/res/menu/article_content_img_context_menu.xml
index 3c46c1a1..0f14dd92 100644
--- a/res/menu/article_content_img_context_menu.xml
+++ b/res/menu/article_content_img_context_menu.xml
@@ -9,10 +9,15 @@
         android:id="@+id/article_img_share"
         android:showAsAction=""
         android:title="@string/article_img_share"/>
+    
+    <item
+        android:id="@+id/article_img_view_caption"
+        android:showAsAction=""
+        android:title="@string/article_img_view_caption"/>
 
     <!--  <item
         android:id="@+id/article_img_save"
         android:showAsAction=""
         android:title="Save image to file"/> -->
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4aa9633c..388a1656 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -55,6 +55,7 @@
     <string name="download_feed_icons">Activer les icônes des flux</string>
     <string name="enable_cats">Activer les catégories des flux</string>
     <string name="no_feeds_to_display">Aucun flux à afficher</string>
+    <string name="no_caption_to_display">Aucun sous-titre trouvé</string>
     <string name="no_headlines_to_display">Aucun titre à afficher</string>
     <string name="browse_cats_like_feeds">Parcourir les catégories comme les flux</string>
     <string name="browse_cats_like_feeds_summary">Utilisez le menu contexte des catégories pour redéfinir ce paramètre.</string>
@@ -189,4 +190,5 @@
     <string name="article_img_open">Ouvrir l\'image</string>
     <string name="article_img_share">Partager l\'image</string>
     <string name="requires_api5">Nécessite la version 1.7.6</string>
+    <string name="article_img_view_caption">Montrer le sous-titre</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ff2fb2cd..4c0e8922 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,6 +56,7 @@
     <string name="enable_cats">Enable feed categories</string>
     <string name="no_feeds_to_display">No feeds to display</string>
     <string name="no_headlines_to_display">No headlines to display</string>
+    <string name="no_caption_to_display">No caption to display</string>
     <string name="browse_cats_like_feeds">Browse categories like feeds</string>
     <string name="browse_cats_like_feeds_summary">Use category context menu to override this setting</string>
     <string name="headlines_mark_as_read">Mark read</string>
@@ -190,4 +191,5 @@
     <string name="article_img_share">Share image</string>
     <string name="requires_api5">Requires version 1.7.6</string>
     <string name="labels">Labels</string>
+    <string name="article_img_view_caption">View Caption</string>
 </resources>
-- 
cgit v1.2.3-54-g00ecf