Merge "Gallery2: Add "No faces" strings"

5 files changed, 8 insertions, 1 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4de380467..ccb28f423 100644..100755
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -105,6 +105,7 @@
     <string name="group_by_size" msgid="153766174950394155">"按大小分组"</string>
     <string name="untagged" msgid="7281481064509590402">"未加标签"</string>
     <string name="no_location" msgid="4043624857489331676">"无位置信息"</string>
+    <string name="no_faces">"无人物信息"</string>
     <string name="no_connectivity" msgid="7164037617297293668">"出现网络问题，系统无法识别某些位置。"</string>
     <string name="sync_album_error" msgid="1020688062900977530">"无法下载此相册中的照片，请稍后重试。"</string>
     <string name="show_images_only" msgid="7263218480867672653">"仅限图片"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 68317d582..434190b43 100644..100755
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -105,6 +105,7 @@
     <string name="group_by_size" msgid="153766174950394155">"依大小分類"</string>
     <string name="untagged" msgid="7281481064509590402">"無標記"</string>
     <string name="no_location" msgid="4043624857489331676">"無地點資訊"</string>
+    <string name="no_faces">"無人物資訊"</string>
     <string name="no_connectivity" msgid="7164037617297293668">"網絡發生問題，因此部分位置無法辨別。"</string>
     <string name="sync_album_error" msgid="1020688062900977530">"無法下載這本相簿中的相片，請稍後再試。"</string>
     <string name="show_images_only" msgid="7263218480867672653">"僅顯示相片"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index edb7f696d..de49fb45e 100644..100755
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -105,6 +105,7 @@
     <string name="group_by_size" msgid="153766174950394155">"依大小分類"</string>
     <string name="untagged" msgid="7281481064509590402">"無標記"</string>
     <string name="no_location" msgid="4043624857489331676">"無位置資訊"</string>
+    <string name="no_faces">"無人物資訊"</string>
     <string name="no_connectivity" msgid="7164037617297293668">"網路發生問題，因此無法辨識部分位置。"</string>
     <string name="sync_album_error" msgid="1020688062900977530">"無法下載這個相簿中的相片，請稍後再試。"</string>
     <string name="show_images_only" msgid="7263218480867672653">"僅顯示圖片"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 82b286b32..875a6e32d 100644..100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -236,6 +236,10 @@
          have location information in them [CHAR LIMIT=20]-->
     <string name="no_location">No location</string>
 
+    <!-- When grouping photos by peoples, the label used for photos that don't
+        have people information in them [CHAR LIMIT=20]-->
+    <string name="no_faces">No faces</string>
+
     <!-- This toast message is shown when network connection is lost while doing clustering -->
     <string name="no_connectivity">Some locations couldn\'t be identified due to network problems.</string>
 
diff --git a/src/com/android/gallery3d/data/FaceClustering.java b/src/com/android/gallery3d/data/FaceClustering.java
index 819915edb..a0d567902 100644..100755
--- a/src/com/android/gallery3d/data/FaceClustering.java
+++ b/src/com/android/gallery3d/data/FaceClustering.java
@@ -83,7 +83,7 @@ public class FaceClustering extends Clustering {
     }
 
     public FaceClustering(Context context) {
-        mUntaggedString = context.getResources().getString(R.string.untagged);
+        mUntaggedString = context.getResources().getString(R.string.no_faces);
         mContext = context;
     }