From dc7da0baf88fb107348a2e46cd51430bea301205 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 31 Mar 2015 10:05:29 -0500
Subject: [PATCH] Update reminder control, translations

* Japanese - naofumi
* Increase padding between reminders
* Smaller remove button
* Change 'Add a reminder' to 'Add reminder'
---
 src/main/res/layout/alarm_edit_row.xml        |  9 +++++----
 src/main/res/layout/control_set_reminders.xml |  2 +-
 src/main/res/values-bg-rBG/strings.xml        |  1 -
 src/main/res/values-ja/strings.xml            | 10 +++++++++-
 src/main/res/values/dimens.xml                |  1 +
 src/main/res/values/strings.xml               |  2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/res/layout/alarm_edit_row.xml b/src/main/res/layout/alarm_edit_row.xml
index c81a199fc..0b13861bf 100644
--- a/src/main/res/layout/alarm_edit_row.xml
+++ b/src/main/res/layout/alarm_edit_row.xml
@@ -3,8 +3,8 @@
     android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/task_edit_padding_top_bottom"
-    android:layout_marginBottom="@dimen/task_edit_padding_top_bottom">
+    android:paddingBottom="@dimen/task_edit_double_padding_top_bottom"
+    android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -30,9 +30,10 @@
     <ImageView
         android:id="@+id/button1"
         android:src="?attr/ic_action_cancel"
+        android:layout_gravity="center"
         android:contentDescription="@string/remove"
-        android:layout_width="32dip"
-        android:layout_height="32dip"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
         android:layout_weight="1"
         android:paddingRight="3dp"
         android:paddingEnd="3dp" />
diff --git a/src/main/res/layout/control_set_reminders.xml b/src/main/res/layout/control_set_reminders.xml
index ca490f5dc..e4f3bd96e 100644
--- a/src/main/res/layout/control_set_reminders.xml
+++ b/src/main/res/layout/control_set_reminders.xml
@@ -54,7 +54,7 @@
                         android:id="@+id/alarms_add"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/add_a_reminder"
+                        android:text="@string/add_reminder"
                         android:textColor="?attr/asTextColorHint" />
 
                     <Spinner
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 12071b86c..9fdfe5045 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -486,7 +486,6 @@
 	<string name="select_amount">Изберете размер</string>
 	<string name="notification_actions">Уведомление - Действия</string>
 	<string name="notification_actions_summary">Покажи опция за отлагане и пълни действия в уведомлението</string>
-	<string name="add_a_reminder">Добави напомняне</string>
 	<string-array name="sync_SPr_interval_entries">
 		<item>изключено</item>
 		<item>на всеки 15 минути</item>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index ad82ce0d5..b32ce6d0d 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -329,6 +329,9 @@
 	<string name="TEA_reminder_due">何時がタスクの期限ですか？</string>
 	<string name="TEA_reminder_overdue">何時タスクが期限切れになりますか？</string>
 	<string name="TEA_reminder_randomly">ランダムに1回</string>
+	<string name="ring_once">1回通知音を鳴らす</string>
+	<string name="ring_five_times">5回通知音を鳴らす</string>
+	<string name="ring_nonstop">通知音を鳴らし続ける</string>
 	<string-array name="TEA_reminder_random">
 		<item>1時間</item>
 		<item>1日</item>
@@ -484,7 +487,12 @@
 	<string name="select_amount">金額を選択</string>
 	<string name="notification_actions">通知アクション</string>
 	<string name="notification_actions_summary">通知にスヌーズと完了アクションを表示します</string>
-	<string name="add_a_reminder">リマインダーを追加</string>
+	<string name="remove">削除</string>
+	<string name="randomly_once">1回ランダムに</string>
+	<string name="randomly">ランダムに</string>
+	<string name="pick_a_date_and_time">日付と時間を選択</string>
+	<string name="when_overdue">期限を過ぎたとき</string>
+	<string name="when_due">期限に</string>
 	<string-array name="sync_SPr_interval_entries">
 		<item>無効</item>
 		<item>15分毎</item>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 3c9872da7..4932510dd 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -5,6 +5,7 @@
 
     <dimen name="task_edit_title_padding_top_bottom">18dp</dimen>
     <dimen name="task_edit_padding_top_bottom">10dp</dimen>
+    <dimen name="task_edit_double_padding_top_bottom">20dp</dimen>
     <dimen name="task_edit_drawable_padding">15dp</dimen>
     <dimen name="task_edit_padding_left">10dp</dimen>
     <dimen name="task_edit_padding_right">10dp</dimen>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 236ee9de5..e24f0655c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -93,7 +93,7 @@
     <string name="select_amount">Select amount</string>
     <string name="notification_actions">Notification Actions</string>
     <string name="notification_actions_summary">Show snooze and complete actions in notification</string>
-    <string name="add_a_reminder">Add a reminder</string>
+    <string name="add_reminder">Add reminder</string>
     <string name="remove">Remove</string>
     <string name="randomly_once">Randomly once</string>
     <string name="randomly">Randomly</string>