From d18607630440d0bea791fc87e866c54edd3e5f3c Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Thu, 31 May 2018 07:09:40 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=88=E3=83=AC=E3=83=B3=E3=83=89=E3=82=BF?=
 =?UTF-8?q?=E3=82=B0=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=AB=E8=AA=AC=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/jp/juggler/subwaytooter/Column.kt | 2 ++
 app/src/main/res/values-fr/strings.xml              | 1 +
 app/src/main/res/values-ja/strings.xml              | 1 +
 app/src/main/res/values/strings.xml                 | 1 +
 4 files changed, 5 insertions(+)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index 100b77d2..4892d22f 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.net.Uri
 import android.os.AsyncTask
 import android.os.SystemClock
+import android.view.Gravity
 import jp.juggler.subwaytooter.api.*
 
 import org.json.JSONException
@@ -1891,6 +1892,7 @@ class Column(
 //								if(i != 0) i else a.name.compareTo(b.name)
 //							})
 							this.list_tmp = addAll(this.list_tmp, src)
+							this.list_tmp = addOne(this.list_tmp,TootMessageHolder(context.getString(R.string.trend_tag_desc),gravity = Gravity.END))
 							return result
 							
 						}
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ad112b5f..9d26c3af 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -680,6 +680,7 @@
 	<string name="follow_follower_list_may_restrict">If remote user chooses to hide the social graph, only the followings/followers on this instance will be displayed.</string>
     <string name="trend_tag">Trending tags</string>
     <string name="people_talking">%1$d(%2$d) people talking</string>
+	<string name="trend_tag_desc">The numbers indicate \'daily(weekly)\'. Daily numbers are reset at 0:00 UTC.</string>
 
     <!--<string name="abc_action_bar_home_description">Revenir à l\'accueil</string>-->
 	<!--<string name="abc_action_bar_home_description_format">%1$s, %2$s</string>-->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 29bd4bd8..08ab7174 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -958,5 +958,6 @@
     <string name="follow_follower_list_may_restrict">もしリモートのユーザがソーシャルグラフを隠す選択をした場合、表示されるのはこのタンスのユーザだけです。</string>
     <string name="trend_tag">トレンドタグ</string>
     <string name="people_talking">%1$d(%2$d)人がトゥート</string>
+    <string name="trend_tag_desc">数字は「日毎（週毎）」を示します。 日毎の数字は0:00(UTC)にリセットされます。</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d63f5376..97630d16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -665,4 +665,5 @@
     <string name="follow_follower_list_may_restrict">If remote user chooses to hide the social graph, only the followings/followers on this instance will be displayed.</string>
     <string name="trend_tag">Trending tags</string>
     <string name="people_talking">%1$d(%2$d) people talking</string>
+    <string name="trend_tag_desc">The numbers indicate \'daily(weekly)\'. Daily numbers are reset at 0:00 UTC.</string>
 </resources>