Move alarm control set to main edit screen

pull/281/head
Alex Baker 10 years ago
parent f42d5013f3
commit 34508ab6d1

@ -51,7 +51,7 @@ public final class AlarmControlSet extends TaskEditControlSetBase {
} }
@Override @Override
protected void readFromTaskOnInitialize() { public void readFromTaskOnInitialize() {
alertsContainer.removeAllViews(); alertsContainer.removeAllViews();
alarmService.getAlarms(model.getId(), new Callback<Metadata>() { alarmService.getAlarms(model.getId(), new Callback<Metadata>() {
@Override @Override

@ -23,9 +23,6 @@ import com.todoroo.astrid.data.Task;
import org.tasks.R; import org.tasks.R;
import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.ActivityPreferences;
import java.util.ArrayList;
import java.util.List;
/** /**
* Control set dealing with reminder settings * Control set dealing with reminder settings
* *
@ -36,30 +33,17 @@ public class ReminderControlSet extends PopupControlSet {
private CheckBox during, after; private CheckBox during, after;
private Spinner mode; private Spinner mode;
private TextView modeDisplay; private TextView modeDisplay;
private LinearLayout remindersBody;
private final List<View> extraViews;
private final TextView label; private final TextView label;
private RandomReminderControlSet randomControlSet; private RandomReminderControlSet randomControlSet;
private AlarmControlSet alarmControl; private AlarmControlSet alarmControl;
private final AlarmService alarmService;
private TaskEditFragment taskEditFragment;
public ReminderControlSet(ActivityPreferences preferences, AlarmService alarmService, TaskEditFragment taskEditFragment) { public ReminderControlSet(ActivityPreferences preferences, AlarmService alarmService, TaskEditFragment taskEditFragment) {
super(preferences, taskEditFragment.getActivity(), R.layout.control_set_reminders_dialog, R.layout.control_set_reminders, R.string.TEA_reminders_group_label); super(preferences, taskEditFragment.getActivity(), R.layout.control_set_reminders_dialog, R.layout.control_set_reminders, R.string.TEA_reminders_group_label);
this.alarmService = alarmService;
this.taskEditFragment = taskEditFragment;
extraViews = new ArrayList<>();
label = (TextView) getDisplayView().findViewById(R.id.display_row_edit); label = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
} alarmControl = new AlarmControlSet(alarmService, taskEditFragment);
LinearLayout reminderRow = (LinearLayout) getDisplayView().findViewById(R.id.reminder_row);
public void addViewToBody(View v) { reminderRow.addView(alarmControl.getView());
if (remindersBody != null) {
remindersBody.addView(v, 0);
} else {
extraViews.add(v);
}
} }
public void setValue(int flags) { public void setValue(int flags) {
@ -110,14 +94,6 @@ public class ReminderControlSet extends PopupControlSet {
}); });
randomControlSet = new RandomReminderControlSet(activity, getView(), -1); randomControlSet = new RandomReminderControlSet(activity, getView(), -1);
alarmControl = new AlarmControlSet(alarmService, taskEditFragment);
alarmControl.readFromTask(model);
remindersBody = (LinearLayout) getView().findViewById(R.id.reminders_body);
remindersBody.addView(alarmControl.getView());
while (extraViews.size() > 0) {
addViewToBody(extraViews.remove(0));
}
String[] list = new String[] { String[] list = new String[] {
activity.getString(R.string.TEA_reminder_mode_once), activity.getString(R.string.TEA_reminder_mode_once),
@ -221,5 +197,7 @@ public class ReminderControlSet extends PopupControlSet {
label.setText(R.string.TEA_reminders_group_label); label.setText(R.string.TEA_reminders_group_label);
label.setTextColor(unsetColor); label.setTextColor(unsetColor);
} }
alarmControl.readFromTask(model);
} }
} }

@ -1,52 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dip" android:paddingBottom="@dimen/task_edit_padding_top_bottom"
android:paddingRight="5dip"> android:layout_marginBottom="@dimen/task_edit_padding_top_bottom" >
<LinearLayout
android:orientation="horizontal" <TextView
android:layout_width="fill_parent" style="@android:style/TextAppearance"
android:layout_height="wrap_content" android:id="@+id/alarm_string"
android:gravity="center_vertical"> android:layout_width="fill_parent"
android:layout_height="wrap_content"
<TextView android:layout_weight="100"
android:id="@+id/alarm_string" android:textColor="?attr/asTextColor" />
android:layout_width="fill_parent"
android:layout_height="wrap_content" <ImageButton
android:layout_weight="100" android:id="@+id/button1"
android:paddingTop="15dip" android:background="@drawable/btn_dismiss"
android:paddingBottom="15dip" android:layout_width="32dip"
style="@style/TextAppearance"/> android:layout_height="32dip"
android:layout_gravity="center"
<ImageButton android:id="@+id/button1" android:layout_weight="1" />
android:background="@drawable/btn_dismiss"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center"
android:layout_margin="4dip"
android:layout_weight="1"
/>
</LinearLayout>
<View
android:id="@+id/TEA_Separator"
android:layout_width="fill_parent"
android:layout_height="1px"
android:background="?android:attr/listDivider" />
</LinearLayout> </LinearLayout>

@ -1,47 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
** Copyright (c) 2012 Todoroo Inc ** Copyright (c) 2012 Todoroo Inc
** **
** See the file "LICENSE" for the full license governing this code. ** See the file "LICENSE" for the full license governing this code.
--> -->
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent">
android:layout_height="fill_parent">
<LinearLayout
android:id="@+id/alert_container"
<TextView android:id="@+id/alarms_label" android:orientation="vertical"
android:layout_marginLeft="10dip" android:layout_width="fill_parent"
android:layout_marginTop="10dip" android:layout_height="wrap_content" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" <TextView
android:text="@string/alarm_ACS_label" style="@android:style/TextAppearance"
style="@style/TextAppearance" /> android:id="@+id/alarms_add"
<LinearLayout android:id="@+id/alert_container" android:layout_width="fill_parent"
android:paddingLeft="5dip" android:layout_height="wrap_content"
android:orientation="vertical" android:text="@string/add_a_reminder"
android:layout_width="fill_parent" android:textColor="?attr/asTextColorHint"
android:layout_height="wrap_content"> android:layout_marginBottom="@dimen/task_edit_padding_top_bottom"
</LinearLayout> android:paddingBottom="@dimen/task_edit_padding_top_bottom" />
<LinearLayout
android:id="@+id/alarms_add"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<TextView
android:text="+"
android:gravity="center"
android:textSize="26sp"
android:textColor="?attr/asThemeTextColor"
android:layout_width="40dip"
android:layout_height="40dip"/>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/alarm_ACS_button"
style="@style/TextAppearance" />
</LinearLayout>
</LinearLayout> </LinearLayout>

@ -21,18 +21,31 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <LinearLayout
android:id="@+id/display_row_edit" android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start|center_vertical" android:orientation="vertical">
android:text="@string/TEA_importance_label"
android:textColor="?attr/asThemeTextColor" <TextView
android:textSize="@dimen/task_edit_text_size" android:id="@+id/display_row_edit"
android:paddingTop="@dimen/task_edit_padding_top_bottom" android:layout_width="wrap_content"
android:paddingBottom="@dimen/task_edit_padding_top_bottom" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/task_edit_padding_top_bottom" android:gravity="start|center_vertical"
android:layout_marginBottom="@dimen/task_edit_padding_top_bottom" /> android:text="@string/TEA_importance_label"
android:textColor="?attr/asThemeTextColor"
android:textSize="@dimen/task_edit_text_size"
android:paddingTop="@dimen/task_edit_padding_top_bottom"
android:paddingBottom="@dimen/task_edit_padding_top_bottom"
android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
android:layout_marginBottom="@dimen/task_edit_padding_top_bottom" />
<LinearLayout
android:id="@+id/reminder_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout>
<include layout="@layout/task_edit_divider" /> <include layout="@layout/task_edit_divider" />

@ -1,102 +1,101 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
** Copyright (c) 2012 Todoroo Inc ** Copyright (c) 2012 Todoroo Inc
** **
** See the file "LICENSE" for the full license governing this code. ** See the file "LICENSE" for the full license governing this code.
--> -->
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"
android:orientation="vertical" android:paddingLeft="5dip"
android:paddingLeft="5dip" android:paddingRight="5dip">
android:paddingRight="5dip">
<ScrollView <LinearLayout
android:layout_width="fill_parent" android:id="@+id/reminders_body"
android:layout_height="fill_parent" android:orientation="vertical"
android:layout_weight="100" android:layout_width="fill_parent"
android:minWidth="320dip"> android:layout_height="fill_parent">
<LinearLayout
android:id="@+id/reminders_body" <!-- reminders -->
android:orientation="vertical" <TextView
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="fill_parent"> android:layout_height="wrap_content"
android:paddingLeft="10dip"
<!-- reminders --> android:text="@string/TEA_reminder_label"
<TextView android:paddingTop="10dip"
android:layout_width="wrap_content" style="@style/TextAppearance" />
android:layout_height="wrap_content"
android:paddingLeft="10dip" <CheckBox
android:text="@string/TEA_reminder_label" style="@style/TextAppearance"
android:paddingTop="10dip" android:id="@+id/reminder_due"
style="@style/TextAppearance" /> android:layout_width="fill_parent"
<CheckBox android:layout_height="wrap_content"
style="@style/TextAppearance" android:layout_marginLeft="10dip"
android:id="@+id/reminder_due" android:text="@string/TEA_reminder_due" />
android:layout_width="fill_parent"
android:layout_height="wrap_content" <CheckBox
android:layout_marginLeft="10dip" style="@style/TextAppearance"
android:text="@string/TEA_reminder_due" /> android:id="@+id/reminder_overdue"
<CheckBox android:layout_width="fill_parent"
style="@style/TextAppearance" android:layout_height="wrap_content"
android:id="@+id/reminder_overdue" android:layout_marginLeft="10dip"
android:layout_width="fill_parent" android:text="@string/TEA_reminder_overdue" />
android:layout_height="wrap_content"
android:layout_marginLeft="10dip" <LinearLayout
android:text="@string/TEA_reminder_overdue" /> android:orientation="horizontal"
<LinearLayout android:layout_width="fill_parent"
android:orientation="horizontal" android:layout_height="fill_parent">
android:layout_width="fill_parent"
android:layout_height="fill_parent"> <CheckBox
<CheckBox style="@style/TextAppearance"
style="@style/TextAppearance" android:id="@+id/reminder_random"
android:id="@+id/reminder_random" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="10dip"
android:layout_marginLeft="10dip" android:text="@string/TEA_reminder_randomly" />
android:text="@string/TEA_reminder_randomly" />
<Spinner <Spinner
android:id="@+id/reminder_random_interval" android:id="@+id/reminder_random_interval"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent" <View
android:layout_height="1px" android:layout_width="fill_parent"
android:background="?android:attr/listDivider" /> android:layout_height="1px"
<LinearLayout android:background="?android:attr/listDivider" />
android:id="@+id/reminder_alarm_container"
android:layout_width="fill_parent" <LinearLayout
android:layout_height="50dip" android:id="@+id/reminder_alarm_container"
android:layout_marginLeft="10dip" android:layout_width="fill_parent"
android:layout_marginRight="10dip" android:layout_height="50dip"
android:gravity="center_vertical" android:layout_marginLeft="10dip"
android:orientation="horizontal"> android:layout_marginRight="10dip"
<TextView android:gravity="center_vertical"
android:layout_width="wrap_content" android:orientation="horizontal">
android:layout_height="wrap_content"
android:text="@string/TEA_reminder_alarm_label" <TextView
style="@style/TextAppearance" /> android:layout_width="wrap_content"
<TextView android:layout_height="wrap_content"
android:id="@+id/reminder_alarm_display" android:text="@string/TEA_reminder_alarm_label"
android:layout_width="fill_parent" style="@style/TextAppearance" />
android:layout_height="wrap_content"
android:layout_weight="1" <TextView
android:gravity="right" android:id="@+id/reminder_alarm_display"
android:paddingLeft="10dip" android:layout_width="fill_parent"
android:textColor="?attr/asThemeTextColor" /> android:layout_height="wrap_content"
<Spinner android:layout_weight="1"
android:id="@+id/reminder_alarm" android:gravity="right"
android:layout_width="0dip" android:paddingLeft="10dip"
android:layout_height="wrap_content" /> android:textColor="?attr/asThemeTextColor" />
</LinearLayout>
<View <Spinner
android:id="@+id/TEA_Separator" android:id="@+id/reminder_alarm"
android:layout_width="fill_parent" android:layout_width="0dip"
android:layout_height="1px" android:layout_height="wrap_content" />
android:background="?android:attr/listDivider" /> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
<include layout="@layout/control_dialog_ok"/> <include layout="@layout/control_dialog_ok" />
</LinearLayout> </LinearLayout>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Списък</string> <string name="actfm_TVA_tag_label">Списък</string>
<string name="actfm_TVA_tag_name_hint">Въведете името на списъка</string> <string name="actfm_TVA_tag_name_hint">Въведете името на списъка</string>
<string name="actfm_GAA_title">Изберете Google акаунт, който искате да използвате:</string> <string name="actfm_GAA_title">Изберете Google акаунт, който искате да използвате:</string>
<string name="alarm_ACS_label">Аларми</string>
<string name="alarm_ACS_button">Добави Аларма</string>
<string name="backup_BPr_header">Резервни копия</string> <string name="backup_BPr_header">Резервни копия</string>
<string name="backup_BAc_import">Импортиране на задачи</string> <string name="backup_BAc_import">Импортиране на задачи</string>
<string name="backup_BAc_export">Експортиране на задачи</string> <string name="backup_BAc_export">Експортиране на задачи</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Llista</string> <string name="actfm_TVA_tag_label">Llista</string>
<string name="actfm_TVA_tag_name_hint">Escriviu el nom de la llista</string> <string name="actfm_TVA_tag_name_hint">Escriviu el nom de la llista</string>
<string name="actfm_GAA_title">Trieu el compte de Google que vulgueu utilitzar:</string> <string name="actfm_GAA_title">Trieu el compte de Google que vulgueu utilitzar:</string>
<string name="alarm_ACS_label">Alarmes</string>
<string name="alarm_ACS_button">Afegeix una alarma</string>
<string name="backup_BPr_header">Còpies de seguretat</string> <string name="backup_BPr_header">Còpies de seguretat</string>
<string name="backup_BAc_import">Importa tasques</string> <string name="backup_BAc_import">Importa tasques</string>
<string name="backup_BAc_export">Exporta tasques</string> <string name="backup_BAc_export">Exporta tasques</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Název listu:</string> <string name="actfm_TVA_tag_label">Název listu:</string>
<string name="actfm_TVA_tag_name_hint">Název seznamu</string> <string name="actfm_TVA_tag_name_hint">Název seznamu</string>
<string name="actfm_GAA_title">Vyberte, který účet Google chcete použít:</string> <string name="actfm_GAA_title">Vyberte, který účet Google chcete použít:</string>
<string name="alarm_ACS_label">Alarmy</string>
<string name="alarm_ACS_button">Přidat alarm</string>
<string name="backup_BPr_header">Zálohy</string> <string name="backup_BPr_header">Zálohy</string>
<string name="backup_BAc_import">Importovat úkoly</string> <string name="backup_BAc_import">Importovat úkoly</string>
<string name="backup_BAc_export">Exportovat úkoly</string> <string name="backup_BAc_export">Exportovat úkoly</string>

@ -11,8 +11,6 @@
<string name="TVA_add_comment">Tilføj en kommentar</string> <string name="TVA_add_comment">Tilføj en kommentar</string>
<string name="actfm_TVA_tag_label">Listenavn</string> <string name="actfm_TVA_tag_label">Listenavn</string>
<string name="actfm_GAA_title">Vælg den Google-konto du vil anvende:</string> <string name="actfm_GAA_title">Vælg den Google-konto du vil anvende:</string>
<string name="alarm_ACS_label">Alarmer</string>
<string name="alarm_ACS_button">Tilføj en alarm</string>
<string name="backup_BPr_header">Backup</string> <string name="backup_BPr_header">Backup</string>
<string name="backup_BAc_import">Importér opgaver</string> <string name="backup_BAc_import">Importér opgaver</string>
<string name="backup_BAc_export">Eksportér opgaver</string> <string name="backup_BAc_export">Eksportér opgaver</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Liste</string> <string name="actfm_TVA_tag_label">Liste</string>
<string name="actfm_TVA_tag_name_hint">Vergebe einen Listennamen</string> <string name="actfm_TVA_tag_name_hint">Vergebe einen Listennamen</string>
<string name="actfm_GAA_title">Wählen Sie den zu verwendenden Google-Account aus:</string> <string name="actfm_GAA_title">Wählen Sie den zu verwendenden Google-Account aus:</string>
<string name="alarm_ACS_label">Alarme</string>
<string name="alarm_ACS_button">Einen Alarm hinzufügen</string>
<string name="backup_BAc_import">Aufgaben importieren</string> <string name="backup_BAc_import">Aufgaben importieren</string>
<string name="backup_BAc_export">Aufgaben exportieren</string> <string name="backup_BAc_export">Aufgaben exportieren</string>
<string name="export_toast">Gesichert von %1$s bis %2$s.</string> <string name="export_toast">Gesichert von %1$s bis %2$s.</string>

@ -11,8 +11,6 @@
<string name="actfm_TVA_tag_label">Λίστα</string> <string name="actfm_TVA_tag_label">Λίστα</string>
<string name="actfm_TVA_tag_name_hint">Εισάγετε ένα όνομα για την λίστα</string> <string name="actfm_TVA_tag_name_hint">Εισάγετε ένα όνομα για την λίστα</string>
<string name="actfm_GAA_title">Επιλέξτε τον λογαριασμό Google που θέλετε να χρησιμοποιήσετε:</string> <string name="actfm_GAA_title">Επιλέξτε τον λογαριασμό Google που θέλετε να χρησιμοποιήσετε:</string>
<string name="alarm_ACS_label">Ξυπνητήρια</string>
<string name="alarm_ACS_button">Προσθήκη ξυπνητηριού</string>
<string name="backup_BPr_header">Αντίγραφα ασφαλείας</string> <string name="backup_BPr_header">Αντίγραφα ασφαλείας</string>
<string name="backup_BAc_import">Εισαγωγή εργασιών</string> <string name="backup_BAc_import">Εισαγωγή εργασιών</string>
<string name="backup_BAc_export">Εξαγωγή εργασιών</string> <string name="backup_BAc_export">Εξαγωγή εργασιών</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Lista</string> <string name="actfm_TVA_tag_label">Lista</string>
<string name="actfm_TVA_tag_name_hint">Indique nombre de lista</string> <string name="actfm_TVA_tag_name_hint">Indique nombre de lista</string>
<string name="actfm_GAA_title">Seleccione la cuenta de Google que desea usar:</string> <string name="actfm_GAA_title">Seleccione la cuenta de Google que desea usar:</string>
<string name="alarm_ACS_label">Alarmas</string>
<string name="alarm_ACS_button">Añadir una alarma</string>
<string name="backup_BPr_header">Copias de seguridad</string> <string name="backup_BPr_header">Copias de seguridad</string>
<string name="backup_BAc_import">Importar tareas</string> <string name="backup_BAc_import">Importar tareas</string>
<string name="backup_BAc_export">Exportar tareas</string> <string name="backup_BAc_export">Exportar tareas</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Nom de la liste :</string> <string name="actfm_TVA_tag_label">Nom de la liste :</string>
<string name="actfm_TVA_tag_name_hint">Entrez un nom de liste</string> <string name="actfm_TVA_tag_name_hint">Entrez un nom de liste</string>
<string name="actfm_GAA_title">Sélectionnez le compte Google que vous voulez utiliser :</string> <string name="actfm_GAA_title">Sélectionnez le compte Google que vous voulez utiliser :</string>
<string name="alarm_ACS_label">Alarmes</string>
<string name="alarm_ACS_button">Ajouter une alarme</string>
<string name="backup_BPr_header">Sauvegardes</string> <string name="backup_BPr_header">Sauvegardes</string>
<string name="backup_BAc_import">Importer des tâches</string> <string name="backup_BAc_import">Importer des tâches</string>
<string name="backup_BAc_export">Exporter des tâches</string> <string name="backup_BAc_export">Exporter des tâches</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Lista</string> <string name="actfm_TVA_tag_label">Lista</string>
<string name="actfm_TVA_tag_name_hint">Inserisci il nome della lista</string> <string name="actfm_TVA_tag_name_hint">Inserisci il nome della lista</string>
<string name="actfm_GAA_title">Seleziona l\'account Google che vuoi utilizzare:</string> <string name="actfm_GAA_title">Seleziona l\'account Google che vuoi utilizzare:</string>
<string name="alarm_ACS_label">Promemoria</string>
<string name="alarm_ACS_button">Aggiungi un promemoria</string>
<string name="backup_BPr_header">Salvataggi</string> <string name="backup_BPr_header">Salvataggi</string>
<string name="backup_BAc_import">Importa compiti</string> <string name="backup_BAc_import">Importa compiti</string>
<string name="backup_BAc_export">Esporta compiti</string> <string name="backup_BAc_export">Esporta compiti</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">רשימה</string> <string name="actfm_TVA_tag_label">רשימה</string>
<string name="actfm_TVA_tag_name_hint">הכנס שם רשימה</string> <string name="actfm_TVA_tag_name_hint">הכנס שם רשימה</string>
<string name="actfm_GAA_title">בחר חשבון גוגל</string> <string name="actfm_GAA_title">בחר חשבון גוגל</string>
<string name="alarm_ACS_label">התראות</string>
<string name="alarm_ACS_button">הוסף התראה</string>
<string name="backup_BPr_header">גיבויים</string> <string name="backup_BPr_header">גיבויים</string>
<string name="backup_BAc_import">ייבוא משימות</string> <string name="backup_BAc_import">ייבוא משימות</string>
<string name="backup_BAc_export">ייצוא משימות</string> <string name="backup_BAc_export">ייצוא משימות</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">リスト</string> <string name="actfm_TVA_tag_label">リスト</string>
<string name="actfm_TVA_tag_name_hint">リスト名を記入してください</string> <string name="actfm_TVA_tag_name_hint">リスト名を記入してください</string>
<string name="actfm_GAA_title">使用したいGoogleアカウントを選択してください:</string> <string name="actfm_GAA_title">使用したいGoogleアカウントを選択してください:</string>
<string name="alarm_ACS_label">アラーム</string>
<string name="alarm_ACS_button">アラームを追加する</string>
<string name="backup_BPr_header">バックアップ</string> <string name="backup_BPr_header">バックアップ</string>
<string name="backup_BAc_import">タスクのインポート</string> <string name="backup_BAc_import">タスクのインポート</string>
<string name="backup_BAc_export">タスクのエクスポート</string> <string name="backup_BAc_export">タスクのエクスポート</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">목록</string> <string name="actfm_TVA_tag_label">목록</string>
<string name="actfm_TVA_tag_name_hint">목록 이름을 입력하세요</string> <string name="actfm_TVA_tag_name_hint">목록 이름을 입력하세요</string>
<string name="actfm_GAA_title">사용하려는 구글 계정을 선택해 주십시오:</string> <string name="actfm_GAA_title">사용하려는 구글 계정을 선택해 주십시오:</string>
<string name="alarm_ACS_label">알람</string>
<string name="alarm_ACS_button">알람 추가</string>
<string name="backup_BPr_header">백업</string> <string name="backup_BPr_header">백업</string>
<string name="backup_BAc_import">일정 가져오기</string> <string name="backup_BAc_import">일정 가져오기</string>
<string name="backup_BAc_export">일정 내보내기</string> <string name="backup_BAc_export">일정 내보내기</string>

@ -5,8 +5,6 @@
<!-- ******************* DO NOT MODIFY MANUALLY ******************* --> <!-- ******************* DO NOT MODIFY MANUALLY ******************* -->
<!-- ************************************************************** --> <!-- ************************************************************** -->
<resources> <resources>
<string name="alarm_ACS_label">Varsler</string>
<string name="alarm_ACS_button">Legg til nytt varsel</string>
<string name="backup_BPr_header">Sikkerhetskopier</string> <string name="backup_BPr_header">Sikkerhetskopier</string>
<string name="backup_BAc_import">Importer oppgaver</string> <string name="backup_BAc_import">Importer oppgaver</string>
<string name="backup_BAc_export">Eksporter oppgaver</string> <string name="backup_BAc_export">Eksporter oppgaver</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Lijst</string> <string name="actfm_TVA_tag_label">Lijst</string>
<string name="actfm_TVA_tag_name_hint">Geef de lijst een naam</string> <string name="actfm_TVA_tag_name_hint">Geef de lijst een naam</string>
<string name="actfm_GAA_title">Selecteer de Google account die je wil gebruiken:</string> <string name="actfm_GAA_title">Selecteer de Google account die je wil gebruiken:</string>
<string name="alarm_ACS_label">Herinneringen</string>
<string name="alarm_ACS_button">Voeg Herinnering toe</string>
<string name="backup_BPr_header">Back-ups</string> <string name="backup_BPr_header">Back-ups</string>
<string name="backup_BAc_import">Taken importeren</string> <string name="backup_BAc_import">Taken importeren</string>
<string name="backup_BAc_export">Taken exporteren</string> <string name="backup_BAc_export">Taken exporteren</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Lista</string> <string name="actfm_TVA_tag_label">Lista</string>
<string name="actfm_TVA_tag_name_hint">Podaj nazwę listy</string> <string name="actfm_TVA_tag_name_hint">Podaj nazwę listy</string>
<string name="actfm_GAA_title">Wybierz konto Google, którego chcesz użyć:</string> <string name="actfm_GAA_title">Wybierz konto Google, którego chcesz użyć:</string>
<string name="alarm_ACS_label">Alarmy</string>
<string name="alarm_ACS_button">Dodaj alarm</string>
<string name="backup_BPr_header">Kopie zapasowe</string> <string name="backup_BPr_header">Kopie zapasowe</string>
<string name="backup_BAc_import">Importuj zadania</string> <string name="backup_BAc_import">Importuj zadania</string>
<string name="backup_BAc_export">Eksportuj zadania</string> <string name="backup_BAc_export">Eksportuj zadania</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Lista</string> <string name="actfm_TVA_tag_label">Lista</string>
<string name="actfm_TVA_tag_name_hint">Entre com o nome da lista</string> <string name="actfm_TVA_tag_name_hint">Entre com o nome da lista</string>
<string name="actfm_GAA_title">Selecione a conta do Google que deseja usar:</string> <string name="actfm_GAA_title">Selecione a conta do Google que deseja usar:</string>
<string name="alarm_ACS_label">Alarmes</string>
<string name="alarm_ACS_button">Inserir alarme</string>
<string name="backup_BAc_import">Importar tarefas</string> <string name="backup_BAc_import">Importar tarefas</string>
<string name="backup_BAc_export">Exportar tarefas</string> <string name="backup_BAc_export">Exportar tarefas</string>
<string name="export_toast">Backups feitos: de %1$s para %2$s.</string> <string name="export_toast">Backups feitos: de %1$s para %2$s.</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Lista</string> <string name="actfm_TVA_tag_label">Lista</string>
<string name="actfm_TVA_tag_name_hint">Escreva o nome da lista</string> <string name="actfm_TVA_tag_name_hint">Escreva o nome da lista</string>
<string name="actfm_GAA_title">Escolha a conta Google a utilizar:</string> <string name="actfm_GAA_title">Escolha a conta Google a utilizar:</string>
<string name="alarm_ACS_label">Alarmes</string>
<string name="alarm_ACS_button">Adicionar alarme</string>
<string name="backup_BAc_import">Importar tarefas</string> <string name="backup_BAc_import">Importar tarefas</string>
<string name="backup_BAc_export">Exportar tarefas</string> <string name="backup_BAc_export">Exportar tarefas</string>
<string name="export_toast">Backup de %1$s para %2$s.</string> <string name="export_toast">Backup de %1$s para %2$s.</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Список</string> <string name="actfm_TVA_tag_label">Список</string>
<string name="actfm_TVA_tag_name_hint">Введите имя списка</string> <string name="actfm_TVA_tag_name_hint">Введите имя списка</string>
<string name="actfm_GAA_title">Выберите аккаунт Google, который вы хотите использовать:</string> <string name="actfm_GAA_title">Выберите аккаунт Google, который вы хотите использовать:</string>
<string name="alarm_ACS_label">Напоминания</string>
<string name="alarm_ACS_button">Добавить напоминание</string>
<string name="backup_BPr_header">Резервные копии</string> <string name="backup_BPr_header">Резервные копии</string>
<string name="backup_BAc_import">Импортировать задачи</string> <string name="backup_BAc_import">Импортировать задачи</string>
<string name="backup_BAc_export">Экспортировать задачи</string> <string name="backup_BAc_export">Экспортировать задачи</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Seznam</string> <string name="actfm_TVA_tag_label">Seznam</string>
<string name="actfm_TVA_tag_name_hint">Vnesi ime seznama</string> <string name="actfm_TVA_tag_name_hint">Vnesi ime seznama</string>
<string name="actfm_GAA_title">Izberite želeni Google račun:</string> <string name="actfm_GAA_title">Izberite želeni Google račun:</string>
<string name="alarm_ACS_label">Glasna opozorila</string>
<string name="alarm_ACS_button">Dodaj glasno opozorilo</string>
<string name="backup_BPr_header">Varnostne kopije</string> <string name="backup_BPr_header">Varnostne kopije</string>
<string name="backup_BAc_import">Uvozi opravke</string> <string name="backup_BAc_import">Uvozi opravke</string>
<string name="backup_BAc_export">Izvozi opravke</string> <string name="backup_BAc_export">Izvozi opravke</string>

@ -12,8 +12,6 @@
<string name="actfm_TVA_tag_label">Lista</string> <string name="actfm_TVA_tag_label">Lista</string>
<string name="actfm_TVA_tag_name_hint">Ange listnamn</string> <string name="actfm_TVA_tag_name_hint">Ange listnamn</string>
<string name="actfm_GAA_title">Välj vilket Googlekonto du vill använda:</string> <string name="actfm_GAA_title">Välj vilket Googlekonto du vill använda:</string>
<string name="alarm_ACS_label">Alarm</string>
<string name="alarm_ACS_button">Lägg till ett alarm</string>
<string name="backup_BPr_header">Säkerhetskopior</string> <string name="backup_BPr_header">Säkerhetskopior</string>
<string name="backup_BAc_import">Importera uppgifter</string> <string name="backup_BAc_import">Importera uppgifter</string>
<string name="backup_BAc_export">Exportera uppgifter</string> <string name="backup_BAc_export">Exportera uppgifter</string>

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Task Edit Activity: Container Label -->
<string name="alarm_ACS_label">Alarms</string>
<!-- Task Edit Activity: Add New Alarm -->
<string name="alarm_ACS_button">Add an Alarm</string>
</resources>

@ -93,6 +93,7 @@
<string name="select_amount">Select amount</string> <string name="select_amount">Select amount</string>
<string name="notification_actions">Notification Actions</string> <string name="notification_actions">Notification Actions</string>
<string name="notification_actions_summary">Show snooze and complete actions in notification</string> <string name="notification_actions_summary">Show snooze and complete actions in notification</string>
<string name="add_a_reminder">Add a reminder</string>
<string-array name="sync_SPr_interval_entries"> <string-array name="sync_SPr_interval_entries">
<!-- sync_SPr_interval_entries: Synchronization Intervals --> <!-- sync_SPr_interval_entries: Synchronization Intervals -->

Loading…
Cancel
Save