diff --git a/api/src/main/java/com/todoroo/astrid/api/FilterCategory.java b/api/src/main/java/com/todoroo/astrid/api/FilterCategory.java
deleted file mode 100644
index 47b520ed2..000000000
--- a/api/src/main/java/com/todoroo/astrid/api/FilterCategory.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.api;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * A FilterCategory groups common {@link Filter}s and allows
- * a user to show/hide all of its children.
- *
- * @author Tim Su
- *
- */
-public class FilterCategory extends FilterListItem {
-
- /**
- * {@link Filter}s contained by this category
- */
- public Filter[] children;
-
- /**
- * Constructor for creating a new FilterCategory
- * @param listingTitle
- * Title of this item as displayed on the lists page, e.g. Inbox
- * @param children
- * filters belonging to this category
- */
- public FilterCategory(String listingTitle, Filter[] children) {
- this.listingTitle = listingTitle;
- this.children = children;
- }
-
- /**
- * Constructor for creating a new FilterCategory
- */
- protected FilterCategory() {
- //
- }
-
- // --- parcelable
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int describeContents() {
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
- dest.writeParcelableArray(children, 0);
- }
-
- /**
- * Parcelable creator
- */
- public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public FilterCategory createFromParcel(Parcel source) {
- FilterCategory item = new FilterCategory();
- item.readFromParcel(source);
-
- Parcelable[] parcelableChildren = source.readParcelableArray(
- FilterCategory.class.getClassLoader());
- item.children = new Filter[parcelableChildren.length];
- for(int i = 0; i < item.children.length; i++) {
- if(parcelableChildren[i] instanceof FilterListItem) {
- item.children[i] = (Filter) parcelableChildren[i];
- } else {
- item.children[i] = null;
- }
- }
-
- return item;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public FilterCategory[] newArray(int size) {
- return new FilterCategory[size];
- }
-
- };
-}
diff --git a/api/src/main/java/com/todoroo/astrid/api/FilterCategoryWithNewButton.java b/api/src/main/java/com/todoroo/astrid/api/FilterCategoryWithNewButton.java
deleted file mode 100644
index db2b79f0c..000000000
--- a/api/src/main/java/com/todoroo/astrid/api/FilterCategoryWithNewButton.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.api;
-
-import android.app.PendingIntent;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * A FilterCategoryWithNewButton has a button for new filter creation
- *
- * @author Tim Su
- *
- */
-public class FilterCategoryWithNewButton extends FilterCategory {
-
- /**
- * Intent to launch
- */
- public PendingIntent intent;
-
- /**
- * Label for new button
- */
- public String label;
-
- /**
- * Constructor for creating a new FilterCategory
- * @param listingTitle
- * Title of this item as displayed on the lists page, e.g. Inbox
- * @param children
- * filters belonging to this category
- */
- public FilterCategoryWithNewButton(String listingTitle, Filter[] children) {
- this.listingTitle = listingTitle;
- this.children = children;
- }
-
- /**
- * Constructor for creating a new FilterCategory
- */
- protected FilterCategoryWithNewButton() {
- //
- }
-
- // --- parcelable
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int describeContents() {
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
- dest.writeParcelable(intent, 0);
- dest.writeString(label);
- }
-
- /**
- * Parcelable creator
- */
- public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public FilterCategoryWithNewButton createFromParcel(Parcel source) {
- FilterCategoryWithNewButton item = new FilterCategoryWithNewButton();
- item.readFromParcel(source);
-
- Parcelable[] parcelableChildren = source.readParcelableArray(
- FilterCategoryWithNewButton.class.getClassLoader());
- item.children = new Filter[parcelableChildren.length];
- for(int i = 0; i < item.children.length; i++) {
- if(parcelableChildren[i] instanceof FilterListItem) {
- item.children[i] = (Filter) parcelableChildren[i];
- } else {
- item.children[i] = null;
- }
- }
-
- item.intent = source.readParcelable(PendingIntent.class.getClassLoader());
- item.label = source.readString();
-
- return item;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public FilterCategoryWithNewButton[] newArray(int size) {
- return new FilterCategoryWithNewButton[size];
- }
-
- };
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index 8a098fd10..21aafe7d6 100644
--- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -6,8 +6,6 @@
package com.todoroo.astrid.adapter;
import android.app.Activity;
-import android.app.PendingIntent;
-import android.app.PendingIntent.CanceledException;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -15,30 +13,23 @@ import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.Color;
-import android.os.Bundle;
import android.os.Parcelable;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
import android.widget.ArrayAdapter;
-import android.widget.Button;
import android.widget.ImageView;
import android.widget.ListView;
-import android.widget.RelativeLayout;
import android.widget.TextView;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.astrid.activity.AstridActivity;
-import com.todoroo.astrid.activity.FilterListFragment;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.AstridFilterExposer;
import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.FilterCategory;
-import com.todoroo.astrid.api.FilterCategoryWithNewButton;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.FilterWithCustomIntent;
import com.todoroo.astrid.api.FilterWithUpdate;
@@ -303,17 +294,11 @@ public class FilterAdapter extends ArrayAdapter {
for (Parcelable item : filters) {
FilterListItem filter = (FilterListItem) item;
- if(skipIntentFilters && !(filter instanceof Filter ||
- filter instanceof FilterCategory)) {
+ if(skipIntentFilters && !(filter instanceof Filter)) {
continue;
}
- if (filter instanceof FilterCategory) {
- Filter[] children = ((FilterCategory) filter).children;
- for (Filter f : children) {
- addOrLookup(f);
- }
- } else if (filter instanceof Filter){
+ if (filter instanceof Filter){
addOrLookup((Filter) filter);
}
}
@@ -377,13 +362,8 @@ public class FilterAdapter extends ArrayAdapter {
viewHolder.decoration = null;
}
- if(viewHolder.item instanceof FilterCategory) {
- viewHolder.name.setTextAppearance(activity, headerStyle);
- viewHolder.name.setShadowLayer(1, 1, 1, Color.BLACK);
- } else {
- viewHolder.name.setTextAppearance(activity, filterStyle);
- viewHolder.name.setShadowLayer(0, 0, 0, 0);
- }
+ viewHolder.name.setTextAppearance(activity, filterStyle);
+ viewHolder.name.setShadowLayer(0, 0, 0, 0);
String title = filter.listingTitle;
Matcher match = countPattern.matcher(filter.listingTitle);
@@ -429,49 +409,5 @@ public class FilterAdapter extends ArrayAdapter {
} else {
viewHolder.selected.setVisibility(View.GONE);
}
-
- if(filter instanceof FilterCategoryWithNewButton) {
- setupCustomHeader(viewHolder, (FilterCategoryWithNewButton) filter);
- }
- }
-
- private void setupCustomHeader(ViewHolder viewHolder, final FilterCategoryWithNewButton filter) {
- Button add = new Button(activity);
- add.setBackgroundResource(R.drawable.filter_btn_background);
- add.setCompoundDrawablesWithIntrinsicBounds(R.drawable.filter_new,0,0,0);
- add.setTextColor(Color.WHITE);
- add.setShadowLayer(1, 1, 1, Color.BLACK);
- add.setText(filter.label);
- add.setFocusable(false);
- RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
- (int)(32 * metrics.density));
- lp.rightMargin = (int) (4 * metrics.density);
- lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
- add.setLayoutParams(lp);
- ((ViewGroup)viewHolder.view).addView(add);
- viewHolder.decoration = add;
-
- add.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- try {
- filter.intent.send(FilterListFragment.REQUEST_NEW_BUTTON, new PendingIntent.OnFinished() {
- @Override
- public void onSendFinished(PendingIntent pendingIntent, Intent intent,
- int resultCode, String resultData, Bundle resultExtras) {
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- clear();
- }
- });
- }
- }, null);
- } catch (CanceledException e) {
- // do nothing
- log.error(e.getMessage(), e);
- }
- }
- });
}
}
diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index c3ff91f0c..8a34cb0a0 100644
--- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -5,7 +5,6 @@
*/
package com.todoroo.astrid.gtasks;
-import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.ContentValues;
import android.content.Context;
@@ -22,7 +21,6 @@ import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.AstridFilterExposer;
import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.FilterCategoryWithNewButton;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.FilterWithCustomIntent;
import com.todoroo.astrid.api.PermaSql;
@@ -107,15 +105,7 @@ public class GtasksFilterExposer extends InjectingBroadcastReceiver implements A
listFilters[i] = filterFromList(gtasksMetadata, context, lists[i]);
}
- FilterCategoryWithNewButton listsCategory = new FilterCategoryWithNewButton(context.getString(R.string.gtasks_FEx_header),
- listFilters);
- listsCategory.label = context.getString(R.string.tag_FEx_add_new);
- listsCategory.intent = PendingIntent.getActivity(context, 0, new Intent(context, GtasksListAdder.class), 0);
-
- // transmit filter list
- FilterListItem[] list = new FilterListItem[1];
- list[0] = listsCategory;
- return list;
+ return listFilters;
}
private boolean noListsToShow() {
diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListAdder.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListAdder.java
deleted file mode 100644
index 9abfe8bda..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListAdder.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.gtasks;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-
-import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.astrid.api.FilterWithCustomIntent;
-import com.todoroo.astrid.data.StoreObject;
-import com.todoroo.astrid.gtasks.api.GtasksInvoker;
-import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.tasks.R;
-import org.tasks.injection.InjectingActivity;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-
-public class GtasksListAdder extends InjectingActivity {
-
- private static final Logger log = LoggerFactory.getLogger(GtasksListAdder.class);
-
- @Inject GtasksPreferenceService gtasksPreferenceService;
- @Inject GtasksListService gtasksListService;
- @Inject GtasksTokenValidator gtasksTokenValidator;
- @Inject GtasksMetadata gtasksMetadata;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- showNewListDialog(this);
- }
-
- private void showNewListDialog(final Activity activity) {
- FrameLayout frame = new FrameLayout(activity);
- final EditText editText = new EditText(activity);
- frame.addView(editText);
- frame.setPadding(10, 0, 10, 0);
-
- DialogInterface.OnClickListener onClick = new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (gtasksPreferenceService.isLoggedIn() && ! gtasksPreferenceService.isOngoing()) {
- final ProgressDialog pd = DialogUtilities.progressDialog(GtasksListAdder.this,
- GtasksListAdder.this.getString(R.string.gtasks_FEx_creating_list));
- pd.show();
- new Thread(new Runnable() {
- @Override
- public void run() {
- String token = gtasksPreferenceService.getToken();
- try {
- token = gtasksTokenValidator.validateAuthToken(activity, token);
- GtasksInvoker service = new GtasksInvoker(gtasksTokenValidator, token);
- String title = editText.getText().toString();
- if (TextUtils.isEmpty(title)) //Don't create a list without a title
- {
- return;
- }
- StoreObject newList = gtasksListService.addNewList(service.createGtaskList(title));
- if (newList != null) {
- FilterWithCustomIntent listFilter = (FilterWithCustomIntent) GtasksFilterExposer.filterFromList(gtasksMetadata, activity, newList);
- listFilter.start(activity, 0);
- }
-
- } catch (IOException e) {
- log.error(e.getMessage(), e);
- DialogUtilities.okDialog(activity, activity.getString(R.string.gtasks_FEx_create_list_error), null);
- } finally {
- pd.dismiss();
- finish();
- }
- }
- }).start();
- }
- }
- };
-
- DialogInterface.OnClickListener onCancel = new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- };
-
- DialogUtilities.viewDialog(activity,
- activity.getString(R.string.gtasks_FEx_create_list_dialog),
- frame, onClick, onCancel);
- }
-
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
index 16d0c376c..c4861fa31 100644
--- a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -21,7 +21,6 @@ import com.todoroo.astrid.actfm.TagViewFragment;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.AstridFilterExposer;
import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.FilterCategory;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.FilterWithCustomIntent;
import com.todoroo.astrid.api.FilterWithUpdate;
@@ -123,21 +122,16 @@ public class TagFilterExposer extends InjectingBroadcastReceiver implements Astr
ArrayList list = new ArrayList<>();
- addTags(list);
+ list.addAll(filterFromTags(tagService.getTagList()));
// transmit filter list
return list.toArray(new FilterListItem[list.size()]);
}
- private void addTags(ArrayList list) {
- List tagList = tagService.getTagList();
- list.add(filterFromTags(tagList.toArray(new Tag[tagList.size()]), R.string.tag_FEx_header));
- }
-
- private FilterCategory filterFromTags(Tag[] tags, int name) {
+ private List filterFromTags(List tags) {
boolean shouldAddUntagged = preferences.getBoolean(R.string.p_show_not_in_list_filter, true);
- ArrayList filters = new ArrayList<>(tags.length);
+ List filters = new ArrayList<>();
Resources r = context.getResources();
@@ -156,7 +150,7 @@ public class TagFilterExposer extends InjectingBroadcastReceiver implements Astr
filters.add(f);
}
}
- return new FilterCategory(context.getString(name), filters.toArray(new Filter[filters.size()]));
+ return filters;
}
protected Filter constructFilter(Context context, Tag tag) {
diff --git a/astrid/src/main/java/org/tasks/injection/ActivityModule.java b/astrid/src/main/java/org/tasks/injection/ActivityModule.java
index 0589c622a..a10a63d79 100644
--- a/astrid/src/main/java/org/tasks/injection/ActivityModule.java
+++ b/astrid/src/main/java/org/tasks/injection/ActivityModule.java
@@ -22,7 +22,6 @@ import com.todoroo.astrid.files.AACRecordingActivity;
import com.todoroo.astrid.gcal.CalendarAlarmListCreator;
import com.todoroo.astrid.gcal.CalendarReminderActivity;
import com.todoroo.astrid.gtasks.GtasksFilterExposer;
-import com.todoroo.astrid.gtasks.GtasksListAdder;
import com.todoroo.astrid.gtasks.GtasksPreferences;
import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
import com.todoroo.astrid.reminders.ReminderPreferences;
@@ -50,7 +49,6 @@ import dagger.Provides;
CalendarAlarmListCreator.class,
CustomFilterExposer.DeleteActivity.class,
CalendarReminderActivity.class,
- GtasksListAdder.class,
DeleteTagActivity.class,
RenameTagActivity.class,
VoiceCommandActivity.class,
diff --git a/astrid/src/main/res/drawable/filter_btn_background.9.png b/astrid/src/main/res/drawable/filter_btn_background.9.png
deleted file mode 100644
index ca5d9159a..000000000
Binary files a/astrid/src/main/res/drawable/filter_btn_background.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/filter_new.png b/astrid/src/main/res/drawable/filter_new.png
deleted file mode 100644
index 804e10131..000000000
Binary files a/astrid/src/main/res/drawable/filter_new.png and /dev/null differ
diff --git a/astrid/src/main/res/values-ar/strings.xml b/astrid/src/main/res/values-ar/strings.xml
index 56e56318e..f75d0eab9 100644
--- a/astrid/src/main/res/values-ar/strings.xml
+++ b/astrid/src/main/res/values-ar/strings.xml
@@ -81,7 +81,6 @@
- In Two Weeks
- Next Month
- القوائم
مؤقت
حذف المهمة
\ No newline at end of file
diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml
index 6d8048a9b..c7762f27c 100644
--- a/astrid/src/main/res/values-ca/strings.xml
+++ b/astrid/src/main/res/values-ca/strings.xml
@@ -223,8 +223,6 @@
Obrir Event del Calendari
%s (completada)
Calendari per defecte
- Nom de la llista nova:
- S\'ha produït un error en crear la llista nova
S\'estan netejant les tasques completades...
Neteja les tasques completades
S\'està autenticant...
@@ -280,7 +278,6 @@
S\'ha completat la tasca recurrent «%s»
Llista nova
Llista nova
- Llistes
A cap llista
Suprimeix la llista
Voleu suprimir aquesta llista: %s? (no se suprimirà cap tasca.)
diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml
index 37a3d3846..012f794ed 100644
--- a/astrid/src/main/res/values-cs/strings.xml
+++ b/astrid/src/main/res/values-cs/strings.xml
@@ -270,11 +270,7 @@
Událost v kal.
%s (dokončeno)
Výchozí kalendář
- Google úkoly
Google úkoly: %s
- Vytvářím seznam...
- Nové jméno seznamu:
- Chyba při vytváření nového seznamu
V seznamu: ?
V seznamu Google úkolů
Mažu hotové úkoly...
@@ -376,7 +372,6 @@
$I na $D
Každý %s
%s po dokončení
- Seznamy
Nebyly provedeny žádné změny.
Settings:
Aktivní časovače pro %s!
diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml
index 6125ef04f..40c161d58 100644
--- a/astrid/src/main/res/values-da/strings.xml
+++ b/astrid/src/main/res/values-da/strings.xml
@@ -187,11 +187,7 @@
Cal-begivenhed
%s (fuldført)
Standardkalender
- Google Opgaver
Google Opgaver: %s
- Opretter liste...
- Nyt listenavn:
- Fejl ved oprettelse af ny liste
Google Tasks (beta!)
Du har $NUM der matcher: $FILTER
når deadline er nået
@@ -255,8 +251,6 @@
Ny liste
Ny liste
Start venligst med at give denne liste et navn!
- Ny
- Lister
Omdøb liste
Slet liste
Omdøb listen %s til:
diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml
index 9a3781ba2..8a9e735fa 100644
--- a/astrid/src/main/res/values-de/strings.xml
+++ b/astrid/src/main/res/values-de/strings.xml
@@ -336,9 +336,6 @@
Kalendereintrag
%s (abgeschlossen)
Standardkalender
- Liste wird erstellt …
- Neuer Listenname:
- Fehler beim Erstllen einer neuen Liste.
In der Liste: ?
In GTasks-Liste …
Erledigte Aufgaben werden entfernt …
@@ -509,8 +506,6 @@
Wähle eine Liste
Neue Liste
Bitte gib zuerst einen Namen für die Liste ein!
- Neu
- Listen
Nicht kategorisiert
Liste umbenennen
Liste löschen
diff --git a/astrid/src/main/res/values-el/strings.xml b/astrid/src/main/res/values-el/strings.xml
index f657de7d6..538be06be 100644
--- a/astrid/src/main/res/values-el/strings.xml
+++ b/astrid/src/main/res/values-el/strings.xml
@@ -257,11 +257,7 @@
Event ημερολογίου
%s (έχει ολοκληρωθεί)
Προεπιλεγμένο ημερολόγιο
- Καθήκοντα Google
Καθήκοντα Google: %s
- Δημιουργία λίστας...
- Νέο όνομα λίστας:
- Σφάλμα κατα την δημιουργία λίστας
Στην λίστα: ?
Στην λίστα του GTasks...
Καθαρισμός ολοκληρωμένων καθηκόντων...
@@ -372,8 +368,6 @@
Νέα λίστα
Νέα λίστα
Παρακαλώ εισάγετε ενα όνομα για την λίστα πρώτα!
- Νέο
- Λίστες
Μη κατηγοριοποιημένο
Μετονομασία λίστας
Διαγραφή λίστας
diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml
index 29b4403f6..9326de4d7 100644
--- a/astrid/src/main/res/values-es/strings.xml
+++ b/astrid/src/main/res/values-es/strings.xml
@@ -344,10 +344,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n
Evento de llamada
%s (completado)
Calendario predeterminado
- Tareas de Google
- Creando lista...
- Nuevo nombre de lista:
- Error al crear la nueva lista
En la Lista: ?
en la Lista GTasks...
Limpiando tareas completadas...
@@ -518,8 +514,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n
Nueva lista
Nueva lista
Por favor, ¡introduce un nombre para la primera lista!
- Nueva
- Listas
Sin Categoría
Renombrar lista
Eliminar lista
diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml
index fcc5a08a3..df051700b 100644
--- a/astrid/src/main/res/values-fr/strings.xml
+++ b/astrid/src/main/res/values-fr/strings.xml
@@ -338,11 +338,7 @@
Evènement d\'appel
%s (complété)
Agenda par défaut
- Google Tâches
Google Tâches : %s
- Création de la liste...
- Nom de la nouvelle liste :
- Impossible de créer une nouvelle liste
Dans la liste : ?
Dans la liste GTasks...
Suppression des tâches terminés
@@ -513,8 +509,6 @@
Nouvelle liste
Nouvelle liste
Veuillez d\'abord entrer un nom pour cette liste.
- Nouveau
- Listes
Non classé
Renommer la liste
Supprimer la liste
diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml
index b9b2307cd..4d48254d6 100644
--- a/astrid/src/main/res/values-it/strings.xml
+++ b/astrid/src/main/res/values-it/strings.xml
@@ -299,9 +299,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
Evento del calendario
%s (completato)
Calendario Predefinito
- Creazione della lista...
- Nome Nuova Lista:
- Errore nel creare un nuovo elenco
Nella lista: ?
Nella lista GTasks...
Pulizia task completi...
@@ -451,8 +448,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
Nuova lista
Nuova lista
Per cortesia, prima inserisci un nome per questa lista
- Nuova
- Liste
Rinomina Lista
Cancella Lista
Cancellare questa Lista: %s? (Nessuna attività sarà cancellata.)
diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml
index edd1b04be..1be6246e7 100644
--- a/astrid/src/main/res/values-iw/strings.xml
+++ b/astrid/src/main/res/values-iw/strings.xml
@@ -343,11 +343,7 @@
אירוע יומן
%s (בוצעה)
ברירת מחדל ליומן
- ״משימות גוגל״
״משימות גוגל״: %s
- יוצרת רשימה...
- שם הרשימה החדשה:
- יצירת משימה חדשה נכשלה
ברשימה: ?
ברשימה של ״משימות גוגל״
מְסִירָה משימות שבוצעו...
@@ -515,8 +511,6 @@
רשימה חדשה
רשימה חדשה
אנא הכנס שם לרשימה זו
- חדש
- רשימות
שנה שם רשימה
מַחֲקִי רשימה
למחוק את הרשימה %s? (המשימות שברשימה לא תימחקנה.)
diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml
index d84492caa..13af41db7 100644
--- a/astrid/src/main/res/values-ja/strings.xml
+++ b/astrid/src/main/res/values-ja/strings.xml
@@ -261,7 +261,6 @@
%s
完了日から %s
新しいリスト
- リスト
変更されませんでした
Settings:
サポート
diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml
index 26e0284f2..1849072bf 100644
--- a/astrid/src/main/res/values-ko/strings.xml
+++ b/astrid/src/main/res/values-ko/strings.xml
@@ -349,11 +349,7 @@
달력 이벤트
%s (완료)
기본 달력
- 구글 일정 (Goodle Tasks)
구글 일정: %s
- 목록 만들기...
- 새 목록 이름:
- 새 목록을 만드는 중 에러가 발생했습니다
목록에: ?
GTasks 목록에...
완료한 일정을 삭제하는 중...
@@ -523,8 +519,6 @@
새 목록
새 목록
이 목록의 이름을 먼저 입력하세요!
- 새로 만들기
- 목록
미분류 일정
목록 이름 바꾸기
목록 지우기
diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml
index 02bded964..0c7e7993f 100644
--- a/astrid/src/main/res/values-nb/strings.xml
+++ b/astrid/src/main/res/values-nb/strings.xml
@@ -222,8 +222,6 @@
%s etter avslutning
Ny liste
Ny liste
- Ny
- Lister
Slett liste
Ingen endringer gjort
Settings:
diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml
index 3ef342806..6e34ad107 100644
--- a/astrid/src/main/res/values-nl/strings.xml
+++ b/astrid/src/main/res/values-nl/strings.xml
@@ -339,11 +339,7 @@
Agenda-item
%s (voltooid)
Standaard agenda
- Google Taken
Google Taken: %s
- Lijst wordt gemaakt...
- Naam nieuwe lijst:
- Fout bij aanmaken nieuwe lijst
In lijst: ?
In GTasks lijst...
Verwijderen voltooide taken...
@@ -514,8 +510,6 @@
Nieuwe lijst
Nieuwe lijst
Voer a.u.b. eerst een naam in voor deze lijst!
- Nieuw
- Lijsten
Niet gecategoriseerd
Lijst hernoemen
Lijst verwijderen
diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml
index 9fa01e0a0..8ddfd9d00 100644
--- a/astrid/src/main/res/values-pl/strings.xml
+++ b/astrid/src/main/res/values-pl/strings.xml
@@ -333,11 +333,7 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g
Wydarzenie w kalendarzu
%s (ukończono)
Domyślny kalendarz
- Zadania Google
Zadania Google: %s
- Tworzenie listy
- Nowa nazwa listy:
- Błąd tworzenia nowej listy
Na liście: ?
Na liście GTasks...
Czyszczenie zakończonych zadań...
@@ -503,8 +499,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g
Nowa lista
Nowa lista
Wpisz nazwę dla tej listy najpierw!
- Nowy
- Listy
Na żadnej liście
Zmień nazwę listy
Usuń listę
diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml
index 93deff6b6..12f3f0c68 100644
--- a/astrid/src/main/res/values-pt-rBR/strings.xml
+++ b/astrid/src/main/res/values-pt-rBR/strings.xml
@@ -312,11 +312,7 @@
Evento no calendário
%s (concluído)
Calendário padrão
- Tarefas do Google
Tarefas do Google: %s
- Criando lista...
- Nova lista
- Erro ao criar nova lista
Na lista: ?
No Google Tasks...
Limpando tarefas concluídas...
@@ -475,8 +471,6 @@
Nova lista
Nova lista
Entre com o nome da lista primeiro!
- Nova
- Listas
Sem categoria
Renomear Lista
Excluir lista
diff --git a/astrid/src/main/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml
index c7e5c3689..35419838f 100644
--- a/astrid/src/main/res/values-pt/strings.xml
+++ b/astrid/src/main/res/values-pt/strings.xml
@@ -247,11 +247,7 @@
Evento de calendário
%s (terminada)
Calendário padrão
- Tarefas Google
Tarefas Google: %s
- Criação de lista...
- Nome da nova lista:
- Erro ao criar a lista
Na lista: ?
Na lista GTasks
Removendo tarefas terminadas
@@ -346,8 +342,6 @@
Nova lista
Nova lista
Introduza o nome para esta lista!
- Nova
- Listas
Sem categoria
Mudar nome da lista
Eliminar lista
diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml
index ebb7fe244..e0f5add02 100644
--- a/astrid/src/main/res/values-ru/strings.xml
+++ b/astrid/src/main/res/values-ru/strings.xml
@@ -344,11 +344,7 @@
Календарное событие
%s (выполнено)
Календарь по умолчанию
- Задачи Google
Задачи Google: %s
- Создание списка...
- Имя нового списка:
- Ошибка при создании нового списка
В Списке: ?
В GTask Список...
Очистка выполненных задач...
@@ -519,8 +515,6 @@
Новый список
Новый список
Пожалуйста, для начала введите название списка!
- Новый
- Списки
Без категории
Переименовать список
Удалить список
diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/astrid/src/main/res/values-sl-rSI/strings.xml
index 3f3b96f4e..ed5a59668 100644
--- a/astrid/src/main/res/values-sl-rSI/strings.xml
+++ b/astrid/src/main/res/values-sl-rSI/strings.xml
@@ -344,11 +344,7 @@
Kol dogodek
%s (končani)
Privzeti koledar
- Google Naloge
Google Naloge: %s
- Ustvarjam seznam
- Naziv novega seznama
- Napaka pri stvaritvi novega seznama
V seznamu: ?
Na GNaloge seznamu...
Brišem dokončane opravke...
@@ -519,8 +515,6 @@
Nov seznam
Nov seznam
Prosimo, vnesite naziv tega seznama najprej!
- Novo
- Seznami
Nerazvrščen
Preimenuj seznam
Zbriši seznam
diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml
index 010320969..ad85634c0 100644
--- a/astrid/src/main/res/values-sv/strings.xml
+++ b/astrid/src/main/res/values-sv/strings.xml
@@ -332,11 +332,7 @@ och återställer dina aktuella uppgifter från en backup
Kalenderhändelse
%s (avslutad)
Standardkalender
- Google Uppgifter
Google Uppgifter: %s
- Skapar lista...
- Nytt listnamn:
- Det gick inte att skapa en ny lista
I listan: ?
I lista på Google Uppgifter...
Rensar bort färdiga uppgifter...
@@ -505,8 +501,6 @@ och återställer dina aktuella uppgifter från en backup
Ny lista
Ny lista
Ange först ett namn på listan!
- Ny
- Listor
Ingen kategori
Byt namn på listan
Radera listan
diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml
index a0ace9423..77a3426da 100644
--- a/astrid/src/main/res/values-tr/strings.xml
+++ b/astrid/src/main/res/values-tr/strings.xml
@@ -291,11 +291,7 @@
Takvim olayı
%s (tamamlandı)
Öntanımlı Takvim
- Google Görevleri
Google Görevleri: %s
- Liste oluşturuluyor...
- Yeni Liste Adı:
- Yeni liste oluşturmada hata
Liste içinde: ?
Gtasks Listesi içinde...
Tamamlanan görevler temizleniyor...
@@ -452,8 +448,6 @@
Yeni liste
Yeni Liste
Lütfen bu liste için isim girin!
- Yeni
- Listeler
Listeyi yeniden adlandır
Listeyi Sil
Bu Listeyi Sil: %s? (Hiçbir görev silinmeyecektir.)
diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml
index d3f6bd9a4..068cfcc99 100644
--- a/astrid/src/main/res/values-uk/strings.xml
+++ b/astrid/src/main/res/values-uk/strings.xml
@@ -346,9 +346,6 @@
Кал. подія
%s (завершено)
Календар по замовчуванню
- Створення списку...
- Нове ім\'я списку:
- Помилка створення нового списку
В списку: ?
В GTasks списку...
Очищення виконаних завдань
@@ -506,8 +503,6 @@
Новий список
Новий список
Введіть назву списку спочатку!
- Новий
- Списки
Без категорії
Переіменувати список
Видалити список
diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml
index c17a9197c..4e009f5ab 100644
--- a/astrid/src/main/res/values-zh-rCN/strings.xml
+++ b/astrid/src/main/res/values-zh-rCN/strings.xml
@@ -279,9 +279,6 @@
日历事件
%s (已完成)
默认日程表
- 正在创建列表……
- 新列表名：
- 创建新列表失败
列表内容: ?
在Google任务列表中...
正在清除已完成任务……
@@ -439,8 +436,6 @@
新建列表
新建列表
请先为此列表键入一个名称！
- 添加
- 列表
重命名列表
删除列表
删除列表 %s 吗？(不会删除任务。)
diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml
index db867d005..89d55eb3c 100644
--- a/astrid/src/main/res/values-zh-rTW/strings.xml
+++ b/astrid/src/main/res/values-zh-rTW/strings.xml
@@ -318,11 +318,7 @@
日曆活動
%s （已完成）
預設行事曆
- Google 工作表
Google 工作表：%s
- 正在創建列表……
- 新列表名：
- 創建新列表失敗
列表內容: ?
在Google任務工作列表中...
正在清除已完成任務工作……
@@ -485,8 +481,6 @@
新建列表
新建列表
請先為此列表鍵入一個名稱！
- 添加
- 列表
未分類
重命名列表
刪除列表
diff --git a/astrid/src/main/res/values/strings-gtasks.xml b/astrid/src/main/res/values/strings-gtasks.xml
index 4c605ffb4..7c9958850 100644
--- a/astrid/src/main/res/values/strings-gtasks.xml
+++ b/astrid/src/main/res/values/strings-gtasks.xml
@@ -3,23 +3,9 @@
-
- Google Tasks
-
-
-
Google Tasks: %s
-
- Creating list...
-
-
- New List Name:
-
-
- Error creating new list
-
In List: ?
diff --git a/astrid/src/main/res/values/strings-tags.xml b/astrid/src/main/res/values/strings-tags.xml
index 6e4762226..d9499bdc7 100644
--- a/astrid/src/main/res/values/strings-tags.xml
+++ b/astrid/src/main/res/values/strings-tags.xml
@@ -19,12 +19,6 @@
-
- New
-
-
- Lists
-
Uncategorized