diff --git a/api/src/main/res/values-ca/strings.xml b/api/src/main/res/values-ca/strings.xml index 07d6943ab..22e7c9a28 100644 --- a/api/src/main/res/values-ca/strings.xml +++ b/api/src/main/res/values-ca/strings.xml @@ -65,7 +65,6 @@ Sincronitzar en segon pla Desactivada la sincronització en segon pla Actualment configurat en: %s - Accions Surt Esborra tota la informació de sincronització Tancar sessió / esborra la informació de sincronització? diff --git a/api/src/main/res/values-cs/strings.xml b/api/src/main/res/values-cs/strings.xml index a1eca4e2a..ca0d4f5c0 100644 --- a/api/src/main/res/values-cs/strings.xml +++ b/api/src/main/res/values-cs/strings.xml @@ -88,7 +88,6 @@ Synchronizace na pozadí Synchronizace na pozadí je zakázána Současně nastaveno na: %s - Akce Synchronizovat nyní Stavové hlášení Klepnutím odešlete zprávu týmu Tasks diff --git a/api/src/main/res/values-da/strings.xml b/api/src/main/res/values-da/strings.xml index 95e3f1552..e42025f4d 100644 --- a/api/src/main/res/values-da/strings.xml +++ b/api/src/main/res/values-da/strings.xml @@ -62,7 +62,6 @@ Indstillinger Baggrunds Synk Baggrunds synkronisering er slået fra - Handlinger Log af Sletter al synkroniserings data diff --git a/api/src/main/res/values-de/strings.xml b/api/src/main/res/values-de/strings.xml index 525c1c760..54aa6f3f7 100644 --- a/api/src/main/res/values-de/strings.xml +++ b/api/src/main/res/values-de/strings.xml @@ -87,7 +87,6 @@ Hintergrund-Synchronisierung Hintergrund-Synchronisierung ist deaktiviert Gesetzt auf: %s - Aktionen Jetzt synchronisieren Statusbericht Klicke um einen Bericht ans Tasks-Team zu senden diff --git a/api/src/main/res/values-es/strings.xml b/api/src/main/res/values-es/strings.xml index 1591bd743..f4205a241 100644 --- a/api/src/main/res/values-es/strings.xml +++ b/api/src/main/res/values-es/strings.xml @@ -89,7 +89,6 @@ Sincronización en segundo plano Sincronización en segundo plano deshabilitada Actualmente configurado a: %s - Acciones Sincronizar ahora Reporte de estado Click para enviar un reporte al equipo de Tasks diff --git a/api/src/main/res/values-it/strings.xml b/api/src/main/res/values-it/strings.xml index 6e8236108..4c900ae5e 100644 --- a/api/src/main/res/values-it/strings.xml +++ b/api/src/main/res/values-it/strings.xml @@ -88,7 +88,6 @@ Sincronizzazione eseguita in background La sincronizzazione in background è disattivata Attualmente impostata su: %s - Azioni Sincronizza ora \"Clicca per inviare un rapporto al team Tasks\" Invia rapporto diff --git a/api/src/main/res/values-iw/strings.xml b/api/src/main/res/values-iw/strings.xml index bdcccc7cf..f432ac44c 100644 --- a/api/src/main/res/values-iw/strings.xml +++ b/api/src/main/res/values-iw/strings.xml @@ -89,7 +89,6 @@ סנכרון ברקע סנכרון ברקע אינו מופעל כרגע מוגדר ל: %s - פעולות מסנכרן כעת דו\"ח מצב הקלק כדי לשלוח דוח לצוות של אסטריד diff --git a/api/src/main/res/values-ja/strings.xml b/api/src/main/res/values-ja/strings.xml index 3407f0d0b..973ed7726 100644 --- a/api/src/main/res/values-ja/strings.xml +++ b/api/src/main/res/values-ja/strings.xml @@ -76,7 +76,6 @@ バックグラウンド同期 バックグラウンド同期は無効になっています 現在の設定: %s - アクション ログアウト すべての同期データを消去します ログアウトと同期データを消去しますか? diff --git a/api/src/main/res/values-ko/strings.xml b/api/src/main/res/values-ko/strings.xml index 92e6bd537..2b6e921b9 100644 --- a/api/src/main/res/values-ko/strings.xml +++ b/api/src/main/res/values-ko/strings.xml @@ -89,7 +89,6 @@ 백그라운드 동기화 백그라운드 동기화를 사용하지 않습니다. 현재 설정: %s - 동작 지금 동기화하기 상태 보고 아스트리드 팀에게 보고서를 보내려면 클릭하세요 diff --git a/api/src/main/res/values-nb/strings.xml b/api/src/main/res/values-nb/strings.xml index be2e15127..968e2516f 100644 --- a/api/src/main/res/values-nb/strings.xml +++ b/api/src/main/res/values-nb/strings.xml @@ -76,7 +76,6 @@ Bakgrunnssynkronisering Bakgrunnssynkronisering er deaktivert Aktuell innstilling: %s - Handlinger Logg ut Sletter all synkroniseringsdata Logg ut / slett synkroniseringsdata? diff --git a/api/src/main/res/values-nl/strings.xml b/api/src/main/res/values-nl/strings.xml index be96cc7fd..ee8d354b6 100644 --- a/api/src/main/res/values-nl/strings.xml +++ b/api/src/main/res/values-nl/strings.xml @@ -87,7 +87,6 @@ Achtergrond synchronisatie Achtergrond synchronisatie uitgeschakeld Huidige instelling: %s - Acties Nu synchroniseren Statusrapport Klik om een rapport naar het Tasks team te versturen diff --git a/api/src/main/res/values-pl/strings.xml b/api/src/main/res/values-pl/strings.xml index df8c608f9..c4a8d3f9f 100644 --- a/api/src/main/res/values-pl/strings.xml +++ b/api/src/main/res/values-pl/strings.xml @@ -88,7 +88,6 @@ Synchronizacja w tle Synchronizacja w tle wyłączona Aktualnie ustawione na: %s - Działania Synchronizuj teraz Raport statusu Kliknij by wysłać raport do zespłu Tasks diff --git a/api/src/main/res/values-pt-rBR/strings.xml b/api/src/main/res/values-pt-rBR/strings.xml index e936e2daf..14f8ba870 100644 --- a/api/src/main/res/values-pt-rBR/strings.xml +++ b/api/src/main/res/values-pt-rBR/strings.xml @@ -87,7 +87,6 @@ Sincronização em segundo plano O serviço de sincronização em segundo plano está desativado Atualmente definido para: %s - Ações Sincronizar agora Relatório de status Clique para enviar um relatório para a equipe do Tasks diff --git a/api/src/main/res/values-pt/strings.xml b/api/src/main/res/values-pt/strings.xml index 0c9cebdc7..14a90796e 100644 --- a/api/src/main/res/values-pt/strings.xml +++ b/api/src/main/res/values-pt/strings.xml @@ -61,7 +61,6 @@ Sincronização Estado Opções - Acções Terminar sessão desactivar diff --git a/api/src/main/res/values-ru/strings.xml b/api/src/main/res/values-ru/strings.xml index 3c75930bd..313a55055 100644 --- a/api/src/main/res/values-ru/strings.xml +++ b/api/src/main/res/values-ru/strings.xml @@ -89,7 +89,6 @@ Фоновая синхронизация Фоновая синхронизация отключена Сейчас установлено: %s - Действия Синхронизировать Отчёт о состоянии Нажмите, чтобы отправить отчет команде Tasks diff --git a/api/src/main/res/values-sv/strings.xml b/api/src/main/res/values-sv/strings.xml index 92bcab134..9030fb228 100644 --- a/api/src/main/res/values-sv/strings.xml +++ b/api/src/main/res/values-sv/strings.xml @@ -83,7 +83,6 @@ Bakgrundssynkronisering Bakgrundssynkronisering är inaktiverad Aktuell inställning: %s - Åtgärder Synkronisera nu Status rapport Klicka för att skicka en rapport till Tasks-teamet diff --git a/api/src/main/res/values-th/strings.xml b/api/src/main/res/values-th/strings.xml index fd975b778..133c6a3a6 100644 --- a/api/src/main/res/values-th/strings.xml +++ b/api/src/main/res/values-th/strings.xml @@ -40,5 +40,4 @@ ข้อผิดพลาดในการเชื่อมต่อ! ตรวจดูการเชื่อมต่ออินเตอร์เน็ท สถานะ ตัวเลือก - การดำเนินการ \ No newline at end of file diff --git a/api/src/main/res/values-tr/strings.xml b/api/src/main/res/values-tr/strings.xml index b39c53a51..d51c52491 100644 --- a/api/src/main/res/values-tr/strings.xml +++ b/api/src/main/res/values-tr/strings.xml @@ -86,7 +86,6 @@ Arkaplanda senkronizasyon Arkaplanda senkronizasyon devre dışı Mevcut ayar: %s - Eylemler Şimdi Eşle Durum Raporu Tasks takımına bildirmek için tıklayın diff --git a/api/src/main/res/values-uk/strings.xml b/api/src/main/res/values-uk/strings.xml index e6e563027..ad8b6d496 100644 --- a/api/src/main/res/values-uk/strings.xml +++ b/api/src/main/res/values-uk/strings.xml @@ -71,7 +71,6 @@ Опції Фонова синхронізація Фонова синхронізація відключена - Дії Синхронізувати зараз Відіслати звіт Вийти diff --git a/api/src/main/res/values-zh-rCN/strings.xml b/api/src/main/res/values-zh-rCN/strings.xml index 48e2bcd83..4801c9279 100644 --- a/api/src/main/res/values-zh-rCN/strings.xml +++ b/api/src/main/res/values-zh-rCN/strings.xml @@ -88,7 +88,6 @@ 后台同步 后台同步已关闭 目前同步间隔：%s - 动作 现在同步 状态报告 点击给 Tasks 团队发送报告 diff --git a/api/src/main/res/values-zh-rTW/strings.xml b/api/src/main/res/values-zh-rTW/strings.xml index 05ff287d3..855e65e7e 100644 --- a/api/src/main/res/values-zh-rTW/strings.xml +++ b/api/src/main/res/values-zh-rTW/strings.xml @@ -88,7 +88,6 @@ 後台同步 後台同步已關閉 目前同步間隔：%s - 動作 現在同步 狀態報告 點擊給 Tasks 團隊發送報告 diff --git a/api/src/main/res/values/keys.xml b/api/src/main/res/values/keys.xml index 16f8180d2..4d7b6e884 100644 --- a/api/src/main/res/values/keys.xml +++ b/api/src/main/res/values/keys.xml @@ -24,8 +24,6 @@ sync_status - sync_sync - sync_forget sync_options diff --git a/api/src/main/res/values/strings.xml b/api/src/main/res/values/strings.xml index e13a05422..1d2a77428 100644 --- a/api/src/main/res/values/strings.xml +++ b/api/src/main/res/values/strings.xml @@ -175,10 +175,7 @@ Currently set to: %s - - Actions - - + Synchronize now diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 70b7868b1..d3118a807 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -19,7 +19,6 @@ import android.speech.RecognizerIntent; import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -64,8 +63,6 @@ import com.todoroo.astrid.files.FilesControlSet; import com.todoroo.astrid.gcal.GCalControlSet; import com.todoroo.astrid.helper.TaskEditControlSet; import com.todoroo.astrid.notes.EditNoteActivity; -import com.todoroo.astrid.opencrx.OpencrxControlSet; -import com.todoroo.astrid.opencrx.OpencrxCoreUtils; import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.repeats.RepeatControlSet; import com.todoroo.astrid.service.TaskService; @@ -456,20 +453,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { controls.add(filesControlSet); controlSetMap.put(getString(R.string.TEA_ctrl_files_pref), filesControlSet); - try { - if (OpencrxCoreUtils.INSTANCE.isLoggedIn()) { - OpencrxControlSet ocrxControl = new OpencrxControlSet( - getActivity(), R.layout.control_set_opencrx, - R.layout.control_set_opencrx_display, - R.string.opencrx_TEA_opencrx_title); - controls.add(ocrxControl); - basicControls.addView(ocrxControl.getDisplayView()); - notesEditText.setHint(R.string.opencrx_TEA_notes); - } - } catch (Exception e) { - Log.e("astrid-error", "loading-control-set", e); //$NON-NLS-1$ //$NON-NLS-2$ - } - loadEditPageOrder(false); // Load task data in background diff --git a/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxControlSet.java b/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxControlSet.java deleted file mode 100644 index 2b40e1bfd..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxControlSet.java +++ /dev/null @@ -1,423 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.opencrx; - -import android.app.Activity; -import android.util.Log; -import android.view.View; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.ArrayAdapter; -import android.widget.AutoCompleteTextView; -import android.widget.Spinner; -import android.widget.TextView; - -import com.todoroo.andlib.data.Property.LongProperty; -import com.todoroo.andlib.data.Property.StringProperty; -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.andlib.sql.Query; -import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; -import com.todoroo.astrid.dao.StoreObjectDao; -import com.todoroo.astrid.dao.StoreObjectDao.StoreObjectCriteria; -import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.data.StoreObject; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.MetadataService; -import com.todoroo.astrid.ui.PopupControlSet; - -import org.tasks.R; - -import java.util.ArrayList; - -/** - * Control Set for managing contact/creator assignments in OpenCRX - * - * @author Andrey Marchenko - * - */ -public class OpencrxControlSet extends PopupControlSet { - - /** - * Class that represents OpenCRX ActivityCreator. Duplicates some functionality of OpenCRX plugin. - * - */ - private static class OpencrxActivityCreator { - /** type*/ - public static final String TYPE = "opencrx-creator"; //$NON-NLS-1$ - - /** hashed creator id in opencrx */ - public static final LongProperty REMOTE_ID = new LongProperty(StoreObject.TABLE, - StoreObject.ITEM.name); - - /** creator name */ - public static final StringProperty NAME = new StringProperty(StoreObject.TABLE, - StoreObject.VALUE1.name); - - /** - * String ID in OpenCRX system (ActivityCreator) - */ - public static final StringProperty CRX_ID = new StringProperty(StoreObject.TABLE, - StoreObject.VALUE3.name); - - // data class-part - private final long id; - private final String name; - - private final String crxId; - - public OpencrxActivityCreator (StoreObject creatorData) { - this(creatorData.getValue(REMOTE_ID),creatorData.getValue(NAME), - creatorData.containsValue(CRX_ID) ? creatorData.getValue(CRX_ID) : ""); //$NON-NLS-1$ - } - - public OpencrxActivityCreator(long id, String name, String crxId) { - this.id = id; - this.name = name; - this.crxId = crxId; - } - public long getId() { - return id; - } - - public String getName() { - return name; - } - - public String getCrxId() { - return crxId; - } - - @Override - public String toString() { - return name; - } - } - - /** - * Class that represents OpenCRX Contact. Duplicates some functionality of OpenCRX plugin. - * - */ - private static class OpencrxContact { - public static final String TYPE = "opencrx-contacts"; //$NON-NLS-1$ - - /** hash contact id in opencrx */ - public static final LongProperty REMOTE_ID = new LongProperty(StoreObject.TABLE, - StoreObject.ITEM.name); - - /** contact first name */ - public static final StringProperty FIRST_NAME = new StringProperty(StoreObject.TABLE, - StoreObject.VALUE1.name); - - /** contact last name */ - public static final StringProperty LAST_NAME = new StringProperty(StoreObject.TABLE, - StoreObject.VALUE2.name); - - /** id in OpenCRX as string */ - public static final StringProperty CRX_ID = new StringProperty(StoreObject.TABLE, - StoreObject.VALUE3.name); - - private final long id; - - private final String email; - - private final String firstname; - - private final String lastname; - - private final String crxId; - - public OpencrxContact(long id, String email, String firstname, - String lastname, String crxId) { - this.id = id; - this.email = email; - this.firstname = firstname; - this.lastname = lastname; - this.crxId = crxId; - } - - public OpencrxContact(StoreObject userData){ - this(userData.getValue(REMOTE_ID), "", userData.getValue(FIRST_NAME), userData.getValue(LAST_NAME), userData.getValue(CRX_ID) ); //$NON-NLS-1$ - } - - public String getEmail() { - return email; - } - public String getFirstname() { - return firstname; - } - public String getLastname() { - return lastname; - } - public String getCrxId() { - return crxId; - } - public long getId() { - return id; - } - - @Override - public String toString() { - String displayString = ""; //$NON-NLS-1$ - boolean hasFirstname = false; - boolean hasLastname = false; - if (firstname != null && firstname.length() > 0) { - displayString += firstname; - hasFirstname = true; - } - if (lastname != null && lastname.length() > 0) { - hasLastname = true; - } - if (hasFirstname && hasLastname) { - displayString += " "; //$NON-NLS-1$ - } - if (hasLastname) { - displayString += lastname; - } - - if (!hasFirstname && !hasLastname && email != null - && email.length() > 0) { - displayString += email; - } - return displayString; - } - } - - - // --- instance variables - - private Spinner assignedToSelector; - private Spinner creatorSelector; - - private AutoCompleteTextView assignedToTextInput; - private AutoCompleteTextView creatorTextInput; - - private ArrayList users = null; - private ArrayList dashboards = null; - - @Autowired - private MetadataService metadataService; - - @Autowired - private StoreObjectDao storeObjectDao; - - public OpencrxControlSet(final Activity activity, int viewLayout, int displayViewLayout, int title) { - super(activity, viewLayout, displayViewLayout, title); - DependencyInjectionService.getInstance().inject(this); - } - - @Override - protected void afterInflate() { - //View view = LayoutInflater.from(activity).inflate(R.layout.opencrx_control, parent, true); - - this.assignedToSelector = (Spinner) getView().findViewById(R.id.opencrx_TEA_task_assign); - TextView emptyView = new TextView(activity); - emptyView.setText(activity.getText(R.string.opencrx_no_creator)); - assignedToSelector.setEmptyView(emptyView); - - this.creatorSelector = (Spinner) getView().findViewById(R.id.opencrx_TEA_dashboard_assign); - - this.assignedToTextInput = (AutoCompleteTextView) getView().findViewById(R.id.opencrx_TEA_contact_textinput); - this.creatorTextInput = (AutoCompleteTextView) getView().findViewById(R.id.opencrx_TEA_creator_textinput); - } - - @Override - protected void readFromTaskOnInitialize() { - - - Metadata metadata = getTaskMetadata(model.getId()); - if(metadata == null) { - metadata = OpencrxCoreUtils.INSTANCE.newMetadata(model.getId()); - } - - // Fill the dashboard-spinner and set the current dashboard - long dashboardId = OpencrxCoreUtils.INSTANCE.getDefaultCreator(); - if(metadata.containsNonNullValue(OpencrxCoreUtils.ACTIVITY_CREATOR_ID)) { - dashboardId = metadata.getValue(OpencrxCoreUtils.ACTIVITY_CREATOR_ID); - } - - StoreObject[] dashboardsData = readStoreObjects(OpencrxActivityCreator.TYPE); - dashboards = new ArrayList(dashboardsData.length); - int dashboardSpinnerIndex = -1; - - for (int i=0;i dashAdapter = new ArrayAdapter(activity, - android.R.layout.simple_spinner_item, dashboards); - dashAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - creatorSelector.setAdapter(dashAdapter); - creatorSelector.setSelection(dashboardSpinnerIndex+1); - - ArrayAdapter creatorAdapterTextInput = new ArrayAdapter(activity, - android.R.layout.simple_spinner_item, dashboards); - creatorTextInput.setAdapter(creatorAdapterTextInput); - creatorTextInput.setOnItemClickListener(new OnItemClickListener() { - - @Override - public void onItemClick(AdapterView adapter, View view, int position, - long id) { - OpencrxActivityCreator creatorInput = (OpencrxActivityCreator) adapter.getItemAtPosition(position); - - if (creatorInput == null) { - return; - } - - int selectedIndex = creatorSelector.getSelectedItemPosition(); - - for (int i = 0; i < creatorSelector.getAdapter().getCount(); ++i){ - OpencrxActivityCreator current = (OpencrxActivityCreator) creatorSelector.getAdapter().getItem(i); - if (current != null && current.getId() == creatorInput.getId()){ - selectedIndex = i; - break; - } - } - - creatorSelector.setSelection(selectedIndex); - } - }); - - // Assigned user - long responsibleId = OpencrxCoreUtils.INSTANCE.getDefaultAssignedUser(); - if (metadata.containsNonNullValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID)){ - responsibleId = metadata.getValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID); - } - - StoreObject[] usersData = readStoreObjects(OpencrxContact.TYPE); - this.users = new ArrayList(); - for (StoreObject user : usersData){ - this.users.add(new OpencrxContact(user)); - } - - ArrayAdapter usersAdapter = new ArrayAdapter(activity, - android.R.layout.simple_spinner_item, this.users); - usersAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - assignedToSelector.setAdapter(usersAdapter); - - int responsibleSpinnerIndex = 0; - - for (int i = 0; i < this.users.size() ; i++) { - if (this.users.get(i).getId() == responsibleId ) { - responsibleSpinnerIndex = i; - break; - } - } - assignedToSelector.setSelection(responsibleSpinnerIndex); - - ArrayAdapter contactAdapterTextInput = new ArrayAdapter(activity, - android.R.layout.simple_spinner_item, this.users); - - assignedToTextInput.setAdapter(contactAdapterTextInput); - assignedToTextInput.setOnItemClickListener(new OnItemClickListener() { - - @Override - public void onItemClick(AdapterView adapter, View view, int position, - long id) { - - OpencrxContact userInput = (OpencrxContact) adapter.getItemAtPosition(position); - - if (userInput == null) { - return; - } - - int selectedIndex = assignedToSelector.getSelectedItemPosition(); - - for (int i = 0; i < assignedToSelector.getAdapter().getCount(); ++i){ - OpencrxContact current = (OpencrxContact) assignedToSelector.getAdapter().getItem(i); - if (current != null && current.getId() == userInput.getId()){ - selectedIndex = i; - break; - } - } - - assignedToSelector.setSelection(selectedIndex); - - } - }); - } - - @Override - protected String writeToModelAfterInitialized(Task task) { - Metadata metadata = getTaskMetadata(task.getId()); - try { - if (metadata == null) { - metadata = OpencrxCoreUtils.INSTANCE.newMetadata(task.getId()); - } - - OpencrxActivityCreator dashboard = (OpencrxActivityCreator) creatorSelector.getSelectedItem(); - metadata.setValue(OpencrxCoreUtils.ACTIVITY_CREATOR_ID, dashboard.getId()); - - OpencrxContact responsibleUser = (OpencrxContact) assignedToSelector.getSelectedItem(); - - if(responsibleUser == null) { - metadata.setValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID, 0L); - } else { - metadata.setValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID, responsibleUser.getId()); - } - - if(metadata.getSetValues().size() > 0) { - metadataService.save(metadata); - task.setValue(Task.MODIFICATION_DATE, DateUtilities.now()); - } - } catch (Exception e) { - Log.e("opencrx-error", "Error Saving Metadata", e); //$NON-NLS-1$ //$NON-NLS-2$ - } - return null; - } - - /** - * Reads metadata out of a task - * @return null if no metadata found - */ - private Metadata getTaskMetadata(long taskId) { - TodorooCursor cursor = metadataService.query(Query.select(Metadata.PROPERTIES).where( - MetadataCriteria.byTaskAndwithKey(taskId, OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY)) - ); - try { - if(cursor.getCount() == 0) { - return null; - } - cursor.moveToFirst(); - return new Metadata(cursor); - } finally { - cursor.close(); - } - } - - private StoreObject[] readStoreObjects(String type) { - StoreObject[] ret; - TodorooCursor cursor = storeObjectDao.query(Query.select(StoreObject.PROPERTIES). - where(StoreObjectCriteria.byType(type))); - try { - ret = new StoreObject[cursor.getCount()]; - for(int i = 0; i < ret.length; i++) { - cursor.moveToNext(); - StoreObject dashboard = new StoreObject(cursor); - ret[i] = dashboard; - } - } finally { - cursor.close(); - } - - return ret; - } - - @Override - protected void refreshDisplayView() { - // Nothing to do - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java b/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java deleted file mode 100644 index 04f4e5f3c..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java +++ /dev/null @@ -1,134 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.opencrx; - -import android.content.Context; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.content.pm.PackageManager.NameNotFoundException; - -import com.todoroo.andlib.data.Property.LongProperty; -import com.todoroo.andlib.data.Property.StringProperty; -import com.todoroo.andlib.service.ContextManager; -import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.sync.SyncProviderUtilities; - -public class OpencrxCoreUtils extends SyncProviderUtilities{ - - public static final String OPENCRX_ACTIVITY_METADATA_KEY = "opencrx"; //$NON-NLS-1$ - - public static final String IDENTIFIER = "crx"; //$NON-NLS-1$ - - public static final LongProperty ACTIVITY_ID = new LongProperty(Metadata.TABLE, Metadata.VALUE1.name); - public static final LongProperty ACTIVITY_CREATOR_ID = new LongProperty(Metadata.TABLE, Metadata.VALUE2.name); - public static final LongProperty ACTIVITY_USERCREATOR_ID = new LongProperty(Metadata.TABLE, Metadata.VALUE3.name); - public static final LongProperty ACTIVITY_ASSIGNED_TO_ID = new LongProperty(Metadata.TABLE, Metadata.VALUE4.name); - public static final StringProperty ACTIVITY_CRX_ID = new StringProperty(Metadata.TABLE, Metadata.VALUE5.name); - - private static final String PREF_USER_ID = "crx_userid"; //$NON-NLS-1$ - private static final String PREF_DEFAULT_CREATOR = "opencrx_defaultcreator"; //$NON-NLS-1$ - private static final String PREFS_FILE = "crx-prefs"; //$NON-NLS-1$ - - private static final String OPENCRX_PACKAGE = "ru.otdelit.astrid.opencrx"; //$NON-NLS-1$ - - public static final long CREATOR_NO_SYNC = -1; - - public static final OpencrxCoreUtils INSTANCE = new OpencrxCoreUtils(); - - private OpencrxCoreUtils(){ - // prevent instantiation - } - - public Metadata newMetadata(long forTask) { - Metadata metadata = new Metadata(); - metadata.setValue(Metadata.KEY, OPENCRX_ACTIVITY_METADATA_KEY); - metadata.setValue(Metadata.TASK, forTask); - metadata.setValue(ACTIVITY_ID, 0L); - metadata.setValue(ACTIVITY_CREATOR_ID, getDefaultCreator()); - metadata.setValue(ACTIVITY_USERCREATOR_ID, getDefaultAssignedUser()); - metadata.setValue(ACTIVITY_ASSIGNED_TO_ID, getDefaultAssignedUser()); - metadata.setValue(ACTIVITY_CRX_ID, ""); //$NON-NLS-1$ - return metadata; - } - - @Override - public void stopOngoing() { - SharedPreferences sharedPreferences = OpencrxCoreUtils.getPrefs(); - - if (sharedPreferences != null){ - Editor editor = sharedPreferences.edit(); - editor.putBoolean(getIdentifier() + PREF_ONGOING, false); - editor.commit(); - } - } - - /** - * Gets default creator from setting - * @return CREATOR_NO_SYNC if should not sync, otherwise remote id - */ - public long getDefaultCreator() { - long defaultCreatorId = CREATOR_NO_SYNC ; - SharedPreferences sharedPreferences = OpencrxCoreUtils.getPrefs(); - - if (sharedPreferences != null){ - String defCreatorString = sharedPreferences.getString(PREF_DEFAULT_CREATOR, String.valueOf(CREATOR_NO_SYNC)); - - try{ - defaultCreatorId = Long.parseLong(defCreatorString); - }catch(Exception ex){ - defaultCreatorId = CREATOR_NO_SYNC; - } - } - - return defaultCreatorId; - } - - public long getDefaultAssignedUser(){ - SharedPreferences sharedPreferences = OpencrxCoreUtils.getPrefs(); - - if (sharedPreferences != null){ - return sharedPreferences.getLong(PREF_USER_ID, -1); - }else{ - return -1; - } - } - - protected static SharedPreferences getPrefs() { - try { - Context crxContext = ContextManager.getContext().createPackageContext(OPENCRX_PACKAGE, 0); - SharedPreferences sharedPreferences = crxContext.getSharedPreferences(PREFS_FILE, - Context.MODE_WORLD_READABLE + Context.MODE_WORLD_WRITEABLE); - return sharedPreferences; - } catch (NameNotFoundException e) { - return null; - } - } - - @Override - public boolean isLoggedIn() { - SharedPreferences sharedPreferences = OpencrxCoreUtils.getPrefs(); - - if (sharedPreferences != null) { - return sharedPreferences.getString(getIdentifier() + PREF_TOKEN, null) != null; - } else { - return false; - } - } - - @Override - public String getIdentifier() { - return IDENTIFIER; - } - @Override - public int getSyncIntervalKey() { - return 0; - } - - @Override - public String getLoggedInUserName() { - return ""; //$NON-NLS-1$ - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java b/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java index 2a8d0389e..df5e1dd59 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java @@ -48,7 +48,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gcal.CalendarStartupReceiver; import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.gtasks.sync.GtasksSyncService; -import com.todoroo.astrid.opencrx.OpencrxCoreUtils; import com.todoroo.astrid.reminders.ReengagementService; import com.todoroo.astrid.reminders.ReminderStartupReceiver; import com.todoroo.astrid.tags.TaskToTagMetadata; @@ -199,7 +198,6 @@ public class StartupService { // if sync ongoing flag was set, clear it gtasksPreferenceService.stopOngoing(); - OpencrxCoreUtils.INSTANCE.stopOngoing(); // perform initialization ReminderStartupReceiver.startReminderSchedulingService(context); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java index 33425fe31..daa34ed99 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java @@ -35,7 +35,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.gcal.GCalHelper; import com.todoroo.astrid.gtasks.GtasksMetadata; -import com.todoroo.astrid.opencrx.OpencrxCoreUtils; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.utility.TitleParser; @@ -177,9 +176,6 @@ public class TaskService { if(GtasksMetadata.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) { metadata.setValue(GtasksMetadata.ID, ""); //$NON-NLS-1$ } - if(OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) { - metadata.setValue(OpencrxCoreUtils.ACTIVITY_ID, 0L); - } metadata.setValue(Metadata.TASK, newId); metadata.clearValue(Metadata.ID); diff --git a/astrid/src/main/res/layout/control_set_opencrx.xml b/astrid/src/main/res/layout/control_set_opencrx.xml deleted file mode 100644 index 021d65545..000000000 --- a/astrid/src/main/res/layout/control_set_opencrx.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/layout/control_set_opencrx_display.xml b/astrid/src/main/res/layout/control_set_opencrx_display.xml deleted file mode 100644 index 01167ccdc..000000000 --- a/astrid/src/main/res/layout/control_set_opencrx_display.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index aa685d780..9c47e6901 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -242,11 +242,6 @@ Neteja les tasques completades S\'està autenticant... Té $NUM coincidència: $FILTER - Afegeix un comentari - Creador/a - Assignat a - Estàndard - Asigna aquesta tasca a aquesta persona: Recordatoris Tipus de So/Vibració Sona una vegada diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index fcab8a2a7..8284afcbf 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -296,14 +296,6 @@ Účet %s nebyl nalezen -- přes nastavení Google Tasks se odhlašte a znovu přihlaste. Nelze se přihlásit ke Google Tasks. Zkontrolujte prosím heslo ke svému účtu, nebo se zkuste znovu přihlásit. Máš $NUM se značkou $FILTER - Přidat komentář - Autor - (Nesynchronizovat) - \"Např.: \"domena.cz - \"Např.: \"Standard - Poskytovatel - \"Např.: \"CRX - Přiřadit úkol k této osobě: Chyba sítě! Rozpoznávání řeči vyžaduje funkční síťové připojení. Je mi líto, ale nerozuměla jsem! Zkuste to znovu. Rozpoznávání řeči narazilo na problém. Zkuste to prosím znovu. diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml index 14332483e..7a20f5c13 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/astrid/src/main/res/values-da/strings.xml @@ -164,8 +164,6 @@ Standardkalender Google Tasks (beta!) Du har $NUM der matcher: $FILTER - Tilføj en kommentar - (Synkroniser ikke) når deadline er nået når deadline er overskredet Ring en gang diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index cc20680e6..defc7b61a 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -360,22 +360,6 @@ Fehler in den Fehler bei der Hintergrunautehntifizierung. Starte eine Synchronisation in der App. Du hast $NUM Übereinstimmungen mit: $FILTER - Einen Kommentar hinzufügen - Ersteller - Zugewiesen an - (Nicht syncronisieren) - Standart Aktivitätenersteller - OpenCRX Server - OpenCRX Host - \"Zum Beispiel: \"mydomain.com - Synchronisiertes Segment - \"Zum Beispiel: \"Standard - Anbieter - OpenCRX Daten Provider - \"Zum Beispiel: \"CRX - Aufgabe dieser Person zuordnen: - Aufgabe diesem Ersteller zuordnen: - OpenCRX-Steuerung Premium und verschiedene Einstellungen Verpasste Anruf Erinnerungen, Spracheingabe und Andere Einstellungen Netzwerkfehler! Spracherkennung benötigt eine Internetverbindung um zu funktionieren. diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index 35fb9bd8b..1619e605d 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -375,25 +375,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n Error en el administrador de cuentas de tu teléfono. Por favor reinicia sesión desde la configuración de Google Tasks. Error al autenticarse en un segundo plano. Por favor, intente iniciar la sincronización mientras Tasks está ejecutándose. Tiene $NUM que coincide con: $FILTER - Añadir un comentario - Creador - Asignado a - (No sincronizar) - Creador de actividades predeterminado - servidor de OpenCRX - Servidor - Servidor OpenCRX - \"Por ejemplo: \"midominio.com - Segmento - Segmento sincronizado - \"Por ejemplo: \"\" Estándar\" - Estándar - Proveedor - Proveedor de datos OpenCRX - \"Por ejemplo: \"CRX - Asignar esta tarea a esta persona: - Asignar esta tarea a este creador: - Controles OpenCRX Premium y configuraciones varias Recordatorios de llamadas perdidas, reconocimiento de voz y ajustes varios ¡Error en la red! El reconocimiento de voz requiere una conexión de red para funcionar. diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index cedb9b0d2..f5f885a5b 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -373,23 +373,6 @@ Une erreur est apparue dans le gestionnaire de comptes de votre téléphone. Veuillez vous deconnecter de votre compte Google Task puis vous reconnecter. \"Erreur d\'authentification en arrière plan. Réessayez de vous synchroniser quand Tasks est lancé.\" Vous avez $NUM correspondant(s) : $FILTER - Ajouter un commentaire - Auteur - Assignée à - (Ne pas synchroniser) - Créateur d\'activité par default - Serveur OpenCRX - Serveur - Hôte OpenCRX - \"Par exemple: \"mondomaine.com - Segment synchronisé - \"Par exemple: \"Standard - Fournisseur - Fournisseur de données pour OpenCRX - \"Par exemple: \"CRX - Attribuer cette tâche à cette personne : - Assigner cette tâche à ce créateur: - Paramètres d\'OpenCRX Premium et réglages divers Rappel des appels manqués, commande vocale et paramètres divers Problème de connexion réseau. La reconaissance vocale demande une connexion internet pour fonctionner. diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index fc4ff2ba5..a76b41b74 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -326,23 +326,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Account non trovato--per favore fai logout e di nuovo login dalla configurazione di Google Tasks. Errore di autenticazione in background. Per favore prova ad avviare una sincronizzazione durante l\'esecuzione di Tasks. Hai $NUM corrispondenti: $FILTER - Aggiungi un Commento - Proprietario - Assegnato a - (Non Sincronizzare) - ActivityCreator Predefinito - Serever OpenCRX - Host OpenCRX - Per esempio: miodominio.com - Segmento - Segmento sincronizzato - Per esempio: Standard - Fornitore - Fornitore dati OpenCRX - Per esempio: CRX - Assegna questa attività alla persona seguente: - Assegna questo task al proprietario: - Controlli OpenCRX Impostazioni Premium e varie Promemoria chiamate mancate, comandi vocali e impostazioni varie Errore di rete! Il riconoscimento vocale richiede una connessione di rete per funzionare. diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index 3f26cfd1e..aad1153b0 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -370,25 +370,6 @@ מנהל החשבונות של הטלפון שלך נתקל בשגיאה. אנא התנתק והתחבר מתוך הגדרות ״משימות גוגל״. האימות המתבצע ברקע נכשל. אנא נסה להתחיל את הסינכרון בזמן שאסטריד פועלת. יש לך $NUM המתאימים: $FILTER - הוסף הערה - יוצר - הוטל על - (אל תסנכרני) - ברירת מחדל של יוצר פעילויות - שרת OpenCRX - שרת - שרת OpenCRX - \"לדוגמא: \"mydomain.com - מִקְטָע - מִקְטָע מסונכרן - \"לדוגמא: \"סטנדרטי - סטנדרטי - סַפָּק - סַפָּק נתונים של OpenCRX - \"לדוגמא: \"CRX - הטל משימה זו על אדם זה: - הטל משימה זו על היוצר: - הגדרות OpenCRX פרימיום והגדרות שונות תזכורת קולית הוחמצה, קלט קולי והגדרות כלליות שגיאת חיבור! זיהוי דיבור דורש חיבור לאינטרנט. diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index 778b37ea1..cfac2056a 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -384,25 +384,6 @@ 휴대폰 계정 관리자에서 에러가 발생했습니다. 로그아웃 후 구글 일정 설정에서 다시 로그인 해 주세요. 백그라운드에서 인증 에러가 발생했습니다. 아스트리드가 실행중일 때 동기화를 시작해 보세요. $NUM 개의 일정이 일치합니다: $FILTER - 댓글 쓰기 - 작성자 - 할당된 사람 - (싱크 중지) - 기본 활동내역 작성자 - OpenCRX 서버 - 호스트 - OpenCRX 호스트 - 예: mydomain.com - 세그먼트 - 동기화된 세그먼트 - 예: 표준 - 표준 - 공급자 - OpenCRX 자료 공급자 - 예: CRX - 이 일정을 다음 사람에게 할당: - 이 일정을 다음 생성자에게 할당: - OpenCRX 조절 프리미엄과 기타 설정 부재중 전화 알림, 음성 입력과 기타 설정 네트워크 에러! 음성인식이 동작하려면 네트워크 연결이 필요합니다. diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml index 0412d483a..a30cc1809 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/astrid/src/main/res/values-nb/strings.xml @@ -155,9 +155,6 @@ %s (fullført) Standardkalender Du har $NUM som matcher: $FILTER - Legg til kommentar - (Ikke synkroniser) - Tildel følgende person denne oppgaven: Minn meg på... ...når oppgaven forfaller ... når oppgaven har forfalt diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index 1015e28b9..cc06c1773 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -6,12 +6,12 @@ Maak een Foto - Maak een keuze uit de Gallerij + Kies uit de Galerij Verwijder Foto Voeg een opmerking toe Vernieuwen Lijst - Lijst afbeelding: + Lijstafbeelding Geef de lijst een naam Selecteer de Google account die je wil gebruiken: Herinneringen @@ -100,6 +100,7 @@ Omgekeerd sorteren Eenmalig Altijd + Takenlijst of Filter Snelkoppeling op bureaublad maken Snelkoppeling maken Naam snelkoppeling: @@ -372,23 +373,6 @@ Error in uw telefoon account manager. Log uit en log opnieuw in vanuit de Google Task instellingen. Error authenticatie op achtergrond bezig. Probeer alstublieft een synchronisatie te starten wanneer Tasks is gestart. Er zijn $NUM taken voor: $FILTER - Commentaar toevoegen - Auteur - Toegewezen aan - (Niet synchroniseren) - Standaard Activiteit aanmaken - Server - OpenCRX server - \"Bijvoorbeeld: \"mijndomein.nl - Gesynchroniseerd segment - \"Bijvoorbeeld: \"Standaard - Standaard - Aanbieder - OpenCRX gegevens aanbieder - \"Bijvoorbeeld: \"CRX - Taak aan deze persoon toewijzen: - Deze taak toewijzen aan deze auteur: - OpenCRX Controles Premium en diverse instellingen Gemiste oproepen herinneringen, spraakinvoer en diverse instellingen Netwerkfout! Spraakherkenning heeft een netwerkverbinding nodig. @@ -427,6 +411,7 @@ Oeps! Het ziet er naar uit dat de bestanden directory niet bestaat. Kies een directory om bestanden op te slaan in de Tasks Voorkeuren. Gebruik deze directory. Stel opnieuw in naar standaardinstellingen + Premium downloads map Taak bijlagen opgeslagen op: %s Standaard directory Bestel voor een jaar en bespaar 25%%! @@ -461,7 +446,7 @@ Een bericht van Tasks Bericht voor %s - Your Tasks digest + Uw takenoverzicht Herinneringen van Tasks Taak toevoegen @@ -692,4 +677,8 @@ Gesproken herinneringen Bij herinneringen zullen de taaknamen uitgesproken worden Er wordt een geluid weergegeven bij herinneringen + Taken + Donker thema + Donker widget thema + Verwijder taak \ No newline at end of file diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index 1aac1de53..e63b3ccad 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -368,24 +368,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Błąd w menadżerze kont Twojego telefonu. Proszę, wyloguj się i zaloguj ponownie w ustawieniach Google Zadań. Błąd uwierzytelniania w tle. Spróbuj zainicjalizować synchronizację, gdy aplikacja Tasks będzie włączone. Masz $NUM pasujących: $FILTER - Dodaj komentarz - Krator - Przypisany do - (Nie synchronizuj) - Domyślny kreator działań - Serwer OpenCRX - Host OpenCRX - \"Np.: \"mojadomena.pl - Wycinek - Zsynchronizowane segmenty - \"Np: \"Standardowy - Standardowy - Dostawca - Dane OpenCRX dostawcy - \"Np: \"CRX - Przypisz to zadanie do tej osoby: - Przydzielić to zadanie do tego twórcy: - Kontrolki OpenCRX Ustawienia Premium i inne Przypomniania nieodebranych połączeń, polecenia głosowe i inne ustawienia Błąd sieci! Rozpoznawanie mowy wymaga połączenia z siecią. diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index 4cbe48f6b..129f6829e 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -343,25 +343,6 @@ Erro no gerenciado de contas do dispositivo. Desconecte-se e conecte-se novamente pelo painel Google Tasks Erro ao autenticar em plano de fundo. Por favor tente iniciar a sincronização enquanto o Tasks estiver rodando. Você tem $NUM resultados: $FILTER - Inserir comentário - Criador - Atribuído a - (Não Sincronizar) - Criador de atividades Padrão - Servidor OpenCRX - Máquina - Máquina OpenCRX - \"Por exemplo: \"mydomain.com - Segmento - Segmento Sincronizado - \"Por exemplo: \"Standard - Qualidade - Provedor - Provedor de autenticação do OpenCRX - \"Por exemplo: \"CRX - Atribuir essa tarefa a esta pessoa: - Atribuir essa tarefa a este criador: - Controles do OpenCRX Configurações de Premium e misc. Lembretes de chamadas perdidas, entrada de voz e configurações diversas Erro de rede! Reconhecimento de fala requer uma conexão com a rede para funcionar. diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index f825584ef..d25bd5f09 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -370,25 +370,6 @@ Ошибка в менеджере аккаунтов вашего телефона, Пожалуйста выйдите и войдите снова в настройках Google Tasks Ошибка фоновой аутентификации. Пожалуйста, попробуйте синхронизироваться, когда Tasks запущен. Число соответствий $FILTER: $NUM - Добавить комментарий - Автор - Назначено на - (Не синхронизировано) - Напоминатель по умолчанию - сервер OpenCRX - Хост - хост OpenCRX - \"Например: \"mydomain.com - Сегмент - Синхронизированный сегмент - \"Для примера: \"Standard - Стандарт - Поставщик - Поставщик данных для openCRX - \"Для примера: \"CRX - Назначить эту задачу этому человеку: - Назначить задачу этому автору: - Управление openCRX Премиум и другие настройки Напоминания о пропущенных звонках, голосовой ввод и другие настройки Ошибка подключения! Для голосового распознавания требуется интернет соединение. diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index 4324566a0..6b94e6d64 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -337,22 +337,6 @@ och återställer dina aktuella uppgifter från en backup Fel i din telefons kontohantering. Logga ut och in på nytt i inställningarna för Google Uppgifter. Autentisering i bakgrunden misslyckades. Vänligen försök starta en synkronisering medan Tasks körs. Du har $NUM som matchar: $FILTER - Lägg till en kommentar - Upphovsman - Tilldelad - (synkronisera inte) - OpenCRX-server - Värddator - OpenCRX-värd - \"Till exempel: \"mindomän.com - Synkroniserat segment - \"Till exempel: \"Standard - Leverantör - Leverantör av OpenCRX-data - \"Till exempel: \"CRX - Tilldela denna uppgift följande person: - Upphovsman som ska tilldelas uppgiften: - OpenCRX-inställningar Premium och övriga inställningar Påminnelser för missade samtal, röstinmatning samt övriga inställningar Nätverksfel! Taligenkänning kräver internetaccess för att fungera. diff --git a/astrid/src/main/res/values-th/strings.xml b/astrid/src/main/res/values-th/strings.xml index acf4e8bd0..0d83ffa8a 100644 --- a/astrid/src/main/res/values-th/strings.xml +++ b/astrid/src/main/res/values-th/strings.xml @@ -119,8 +119,6 @@ Tasks might not let you know when your tasks are due.\n เปิดเหตุการณ์ปฏิทิน %s (เสร็จสิ้นแล้ว) ปฏิธินตั้งต้น - เพิ่มความคิดเห็น - มอบหมายแผนงานนี้ให้กับบุคคลนี้: เตือนความจำ! เสร็จเรียบร้อยแล้ว! หลับ.. diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index 98f932407..6b5bfc94c 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -321,25 +321,6 @@ Telefon hesap yöneticisinde hata oluştu. Lütfen çıkış yapıp Google Görevler Ayarlarından tekrar giriş yapın. Artalanda kimlik doğrulama hatası. Lütfen Tasks çalışırken bir eşlemeyi sıfırlamayı deneyin. $FILTER konumunda $NUM var - Yorum Ekle - Oluşturan - Atanan: - (Eşleştirme Yapma) - Öntanımlı EtkinlikOluşturucu - OpenCRX sunucu - Sunucu - OpenCRX sunucusu - \"Örnek: \"mydomain.com - Parça - Eşleştirilen parça - \"Örnek: \"Standard - Standart - Sağlayıcı - OpenCRX veri sağlayıcı - \"Örnek: \"CRX - Bu görevi şu kişiye ata: - Bu görevi şu sahibe ata: - OpenCRX Ayarları Çağrı hatırlatıcılar, ses girdileri ve çeşitli ayarlar Ağ hatası! Konuşmanın tanınması çalışması için bir ağ bağlantısına gerek duyar. Üzgünüm, bunu anlayamadım! Lütfen yeniden deneyin. diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 0d3abb599..d08155e0c 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -378,22 +378,6 @@ Помилка в менеджері акаунтів вашого телефону, ласка вийдіть і увійдіть знову в налаштуваннях Google Tasks Не вдалося пройти аутентифікацію у фоні. Будь ласка, попробуйте при запущеному Tasks. Число відповідностей $FILTER: $NUM - Додати коментар - Автор - Призначено на - (не синхонізувати) - Нагадувач за замовчуванням - Хост - Для пикладу: mydomain.com - Сегмент - Синхронізований сегмент - Для прикладу: Standard - Стандарт - Постачальник - Постачальник даних для openCRX - Для прикладу: CRX - Призначити завдання цій людині: - Призначити завдання цьому автору: Розширені налаштування Нагадування про пропущені дзвінки, голосове введення та інші установки Помилка підключення! Для голосового розпізнавання потрібно інтернет з\'єднання. diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index 7acda37e7..9716d72cb 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -306,25 +306,6 @@ 您手机的帐户管理器出错了。请退出，然后从 Google Tasks设置中重新登录。 后台验证出错了。请在清单小助理运行时尝试启动同步。 您有 $NUM 符合: $FILTER - 新增注释 - 创建者 - 指派给 - (不要同步) - 默认活动创建者 - OpenCRX 服务器 - 主机 - OpenCRX 主机 - \"例如 \"mydomain.com - 段 - 同步段 - \"例如： \"\" 标准 \"<i/> - 标准值 - 提供者 - OpenCRX 数据提供者 - \"例如 \"CRX - 指派任务给此人: - 指派该任务给此创建者： - 打开CRX控制面板 高级和其它设置 未接电话提醒，语音输入和其它设置 网络出错！语音识别需要网络连接才能运作。 diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index b84e080f0..23fa9a241 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -328,25 +328,6 @@ 您手機的帳戶管理器出錯了。請退出，然後從Google 工作表設置中重新登陸。 後台驗證出錯了。請在Tasks 運行時嘗試啟動同步。 您有 $NUM 符合: $FILTER - 新增註解 - 創建者 - 指派給 - 不要同步 - 默認活動創建者 - OpenCRX 服務器 - 主機 - OpenCRX 主機 - \"例如 \"mydomain.com - 段 - 同步段 - \"例如： \"\" 標準 \" - 標準值 - 提供者 - OpenCRX 數據提供者 - \"例如 \"CRX - 指派工作給此人: - 指派該任務工作給此創建者： - 打開CRX控制面板 高級和其它設置 未接電話提醒，語音輸入和其它設置 網絡出錯！語音識別需要網絡連接才能運作。 diff --git a/astrid/src/main/res/values/keys-opencrx.xml b/astrid/src/main/res/values/keys-opencrx.xml deleted file mode 100644 index f2d773785..000000000 --- a/astrid/src/main/res/values/keys-opencrx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - opencrx_sync_freq - opencrx_defaultcreator - opencrx_host - opencrx_segment - opencrx_provider - diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml index d5f13620f..f3563460e 100644 --- a/astrid/src/main/res/values/keys.xml +++ b/astrid/src/main/res/values/keys.xml @@ -322,8 +322,6 @@ sync_status - sync_sync - sync_forget sync_options diff --git a/astrid/src/main/res/values/strings-opencrx.xml b/astrid/src/main/res/values/strings-opencrx.xml deleted file mode 100644 index 25c78a610..000000000 --- a/astrid/src/main/res/values/strings-opencrx.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - Add a Comment - - Creator - - Assigned to - - - - (Do Not Synchronize) - - - Default ActivityCreator - - - OpenCRX server - - - Host - - - OpenCRX host - - - For example: mydomain.com - - - Segment - - - Synchronized segment - - - For example: Standard - - - Standard - - - Provider - - - OpenCRX data provider - - - For example: CRX - - - CRX - - - - - Assign this task to this person: - - - Assign this task to this creator: - - OpenCRX Controls - - diff --git a/astrid/src/main/res/xml/preferences_opencrx.xml b/astrid/src/main/res/xml/preferences_opencrx.xml deleted file mode 100644 index 065f3b3db..000000000 --- a/astrid/src/main/res/xml/preferences_opencrx.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -