diff --git a/api/src/main/java/org/tasks/files/FileHelper.java b/api/src/main/java/org/tasks/files/FileHelper.java index e89d22e50..b4a70e7c0 100644 --- a/api/src/main/java/org/tasks/files/FileHelper.java +++ b/api/src/main/java/org/tasks/files/FileHelper.java @@ -8,10 +8,9 @@ import android.os.Environment; import android.provider.MediaStore; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.nio.channels.FileChannel; +import java.io.InputStream; public class FileHelper { public static File getExternalFilesDir(Context context, String type) { @@ -40,11 +39,13 @@ public class FileHelper { } } - public static void copyFile(String from, String to) throws IOException { - FileChannel source = new FileInputStream(from).getChannel(); - FileChannel destination = new FileOutputStream(to).getChannel(); - destination.transferFrom(source, 0, source.size()); - destination.close(); - source.close(); + public static void copyFile(InputStream inputStream, String to) throws IOException { + FileOutputStream fos = new FileOutputStream(to); + byte[] buf = new byte[1024]; + int len; + while ((len = inputStream.read(buf)) != -1) { + fos.write(buf, 0, len); + } + fos.close(); } } diff --git a/api/src/main/res/values-el/strings.xml b/api/src/main/res/values-el/strings.xml index 9dfabe2c0..7efc1ab9e 100644 --- a/api/src/main/res/values-el/strings.xml +++ b/api/src/main/res/values-el/strings.xml @@ -7,6 +7,7 @@ Σήμερα Αύριο + Χθές Κατάσταση Ρυθμίσεις \ No newline at end of file diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java index 03c60587b..e4fe5312d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java @@ -7,27 +7,30 @@ package com.todoroo.astrid.actfm; import android.app.Activity; import android.app.AlertDialog; +import android.content.ContentResolver; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.provider.MediaStore; import android.support.v4.app.Fragment; +import android.webkit.MimeTypeMap; import android.widget.ArrayAdapter; import android.widget.Toast; -import com.todoroo.andlib.utility.DateUtilities; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tasks.R; -import org.tasks.files.FileHelper; +import org.tasks.preferences.Preferences; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; +import java.util.concurrent.atomic.AtomicReference; -import static org.tasks.files.FileHelper.getPathFromUri; +import static com.todoroo.astrid.files.FileUtilities.getNewAttachmentPath; +import static org.tasks.files.FileHelper.copyFile; public class ActFmCameraModule { @@ -42,7 +45,7 @@ public class ActFmCameraModule { public void clearImage(); } - public static void showPictureLauncher(final Fragment fragment, final ClearImageCallback clearImageOption) { + public static void showPictureLauncher(final Fragment fragment, final Preferences preferences, final ClearImageCallback clearImageOption) { ArrayList options = new ArrayList<>(); final Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); @@ -65,7 +68,7 @@ public class ActFmCameraModule { @Override public void onClick(DialogInterface d, int which) { if(which == 0 && cameraAvailable) { - lastTempFile = getTempFile(fragment.getActivity()); + lastTempFile = getFilename(fragment.getActivity(), preferences, ".jpeg"); if (lastTempFile == null) { Toast.makeText(fragment.getActivity(), R.string.external_storage_unavailable, Toast.LENGTH_LONG).show(); d.dismiss(); @@ -76,8 +79,7 @@ public class ActFmCameraModule { } else if ((which == 1 && cameraAvailable) || (which == 0 && !cameraAvailable)) { Intent intent = new Intent(Intent.ACTION_GET_CONTENT); intent.setType("image/*"); - fragment.startActivityForResult(Intent.createChooser(intent, - fragment.getString(R.string.actfm_TVA_tag_picture)), REQUEST_CODE_PICTURE); + fragment.startActivityForResult(new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI), REQUEST_CODE_PICTURE); } else { if (clearImageOption != null) { clearImageOption.clearImage(); @@ -92,12 +94,19 @@ public class ActFmCameraModule { .show().setOwnerActivity(fragment.getActivity()); } - private static File getTempFile(Activity activity) { + private static File getFilename(Activity activity, Preferences preferences, String extension) { + AtomicReference nameRef = new AtomicReference<>(); + if (!extension.startsWith(".")) { + extension = "." + extension; + } try { - File path = FileHelper.getExternalFilesDir(activity, "pictures"); - if (path != null) { - return File.createTempFile(Long.toString(DateUtilities.now()), ".jpg", path); + String path = getNewAttachmentPath(preferences, activity, extension, nameRef); + File file = new File(path); + file.getParentFile().mkdirs(); + if (!file.createNewFile()) { + throw new RuntimeException("Failed to create " + file.getPath()); } + return file; } catch (IOException e) { log.error(e.getMessage(), e); } @@ -108,7 +117,7 @@ public class ActFmCameraModule { public void handleCameraResult(Uri uri); } - public static boolean activityResult(Activity activity, int requestCode, int resultCode, Intent data, + public static boolean activityResult(Activity activity, Preferences preferences, int requestCode, int resultCode, Intent data, CameraResultCallback cameraResult) { if(requestCode == ActFmCameraModule.REQUEST_CODE_CAMERA && resultCode == Activity.RESULT_OK) { if (lastTempFile != null) { @@ -120,11 +129,19 @@ public class ActFmCameraModule { return true; } else if(requestCode == ActFmCameraModule.REQUEST_CODE_PICTURE && resultCode == Activity.RESULT_OK) { Uri uri = data.getData(); - String path = getPathFromUri(activity, uri); - if (new File(path).exists()) { - activity.setResult(Activity.RESULT_OK); - cameraResult.handleCameraResult(uri); + ContentResolver contentResolver = activity.getContentResolver(); + MimeTypeMap mime = MimeTypeMap.getSingleton(); + String extension = mime.getExtensionFromMimeType(contentResolver.getType(uri)); + File tempFile = getFilename(activity, preferences, extension); + log.debug("Writing {} to {}", uri, tempFile); + try { + InputStream inputStream = activity.getContentResolver().openInputStream(uri); + copyFile(inputStream, tempFile.getPath()); + } catch (IOException e) { + throw new RuntimeException(e); } + activity.setResult(Activity.RESULT_OK); + cameraResult.handleCameraResult(Uri.fromFile(tempFile)); return true; } return false; diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index 293c54895..239e7957f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -225,7 +225,7 @@ public class TagSettingsActivity extends InjectingActionBarActivity { log.error("Not expecting this"); } }; - if (!ActFmCameraModule.activityResult(this, requestCode, resultCode, data, callback)) { + if (!ActFmCameraModule.activityResult(this, preferences, requestCode, resultCode, data, callback)) { if(requestCode == REQUEST_ACTFM_LOGIN && resultCode == Activity.RESULT_OK) { saveSettings(); } else { 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 b1e645445..bb0ce880b 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -86,6 +86,7 @@ import com.todoroo.astrid.voice.VoiceRecognizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tasks.R; +import org.tasks.injection.ForApplication; import org.tasks.injection.InjectingFragment; import org.tasks.notifications.NotificationManager; import org.tasks.preferences.ActivityPreferences; @@ -95,11 +96,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; -import static org.tasks.files.FileHelper.copyFile; import static org.tasks.files.FileHelper.getPathFromUri; /** @@ -177,6 +176,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Inject ActivityPreferences preferences; @Inject DateChangedAlerts dateChangedAlerts; @Inject TagDataDao tagDataDao; + @Inject @ForApplication Context context; // --- UI components @@ -820,7 +820,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Override public void onClick(DialogInterface d, int which) { if(which == 0) { - ActFmCameraModule.showPictureLauncher(TaskEditFragment.this, null); + ActFmCameraModule.showPictureLauncher(TaskEditFragment.this, preferences, null); } else if (which == 1) { Intent attachFile = new Intent(getActivity(), FileExplore.class); startActivityForResult(attachFile, REQUEST_CODE_ATTACH_FILE); @@ -871,13 +871,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { createNewFileAttachment(path, name, type); } - private void attachImage(String input) { - AtomicReference nameRef = new AtomicReference<>(); + private void attachImage(Uri uri) { try { - String path = FileUtilities.getNewImageAttachmentPath(preferences, getActivity(), nameRef); - copyFile(input, path); + String path = getPathFromUri(getActivity(), uri); + File file = new File(path); String extension = path.substring(path.lastIndexOf('.') + 1); - createNewFileAttachment(path, nameRef.get(), TaskAttachment.FILE_TYPE_IMAGE + extension); + createNewFileAttachment(path, file.getName(), TaskAttachment.FILE_TYPE_IMAGE + extension); } catch (Exception e) { log.error(e.getMessage(), e); Toast.makeText(getActivity(), R.string.file_err_copy, Toast.LENGTH_LONG).show(); @@ -981,10 +980,10 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { return; } - ActFmCameraModule.activityResult(getActivity(), requestCode, resultCode, data, new CameraResultCallback() { + ActFmCameraModule.activityResult(getActivity(), preferences, requestCode, resultCode, data, new CameraResultCallback() { @Override public void handleCameraResult(Uri uri) { - attachImage(getPathFromUri(getActivity(), uri)); + attachImage(uri); } }); diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java b/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java index cb0042836..90ee5d011 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java @@ -8,53 +8,26 @@ package com.todoroo.astrid.files; import android.content.Context; import android.text.TextUtils; -import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.TaskAttachment; -import org.tasks.R; +import org.joda.time.DateTime; import org.tasks.files.FileHelper; import org.tasks.preferences.Preferences; import java.io.File; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.concurrent.atomic.AtomicReference; -import static org.tasks.date.DateTimeUtils.newDate; - public class FileUtilities { - /** - * @return Date string for use with file attachment names - */ - public static String getDateStringForFilename(Context context, Date date) { - return DateUtilities.getDateStringHideYear(date) + ", " + getTimeStringForFilename(context, date); //$NON-NLS-1$ - } - - private static String getTimeStringForFilename(Context context, Date date) { - String value; - if (DateUtilities.is24HourFormat(context)) { - value = "HH.mm"; - } - else { - value = "hh.mma"; - } - return new SimpleDateFormat(value).format(date); - } - - public static String getNewImageAttachmentPath(Preferences preferences, Context context, AtomicReference nameReference) { - return getNewAttachmentPath(preferences, context, R.string.file_prefix_image, ".png", nameReference); //$NON-NLS-1$ - } - public static String getNewAudioAttachmentPath(Preferences preferences, Context context, AtomicReference nameReference) { - return getNewAttachmentPath(preferences, context, R.string.file_prefix_voice, ".m4a", nameReference); //$NON-NLS-1$ + return getNewAttachmentPath(preferences, context, ".m4a", nameReference); //$NON-NLS-1$ } - private static String getNewAttachmentPath(Preferences preferences, Context context, int prefixId, String extension, AtomicReference nameReference) { + public static String getNewAttachmentPath(Preferences preferences, Context context, String extension, AtomicReference nameReference) { String dir = getAttachmentsDirectory(preferences, context).getAbsolutePath(); - String name = getNonCollidingFileName(dir, context.getString(prefixId) + " " + getDateStringForFilename(context, newDate()), extension); + String name = getNonCollidingFileName(dir, new DateTime().toString("yyyyMMddHHmm"), extension); if (nameReference != null) { nameReference.set(name); diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java index 3094cc52d..809b907c9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java @@ -229,9 +229,9 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene @Override public void onClick(View v) { if (pendingCommentPicture != null) { - ActFmCameraModule.showPictureLauncher(fragment, clearImage); + ActFmCameraModule.showPictureLauncher(fragment, preferences, clearImage); } else { - ActFmCameraModule.showPictureLauncher(fragment, null); + ActFmCameraModule.showPictureLauncher(fragment, preferences, null); } respondToPicture = true; } @@ -492,7 +492,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene } }; - return (ActFmCameraModule.activityResult((Activity)getContext(), + return (ActFmCameraModule.activityResult((Activity)getContext(), preferences, requestCode, resultCode, data, callback)); } else { return false; diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index 9bbf3d451..4503985f0 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -11,7 +11,6 @@ Afegiu un comentari... Actualitza Llista - Imatge de la llista Escriviu el nom de la llista Trieu el compte de Google que vulgueu utilitzar: Alarmes diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index 948ad2415..3b19b10ea 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -11,7 +11,6 @@ Přidej comment... Obnovit Název listu: - Obrázek listu Název seznamu Vyberte, který účet Google chcete použít: Alarmy @@ -293,7 +292,6 @@ Chybí prohlížeč MS Office Pro tento typ souborů nebyla nalezena žádná aplikace. Chybí aplikace - Hlas O úroveň výš Chyba oprávnění! Ujistěte se prosím, že jste Tasks nezabránil v přístupu k SD kartě. Připojit obrázek diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml index a399ab4de..83c782ade 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/astrid/src/main/res/values-da/strings.xml @@ -11,7 +11,6 @@ Tilføj en kommentar Opdater Listenavn - Liste billede Vælg den Google-konto du vil anvende: Alarmer Tilføj en alarm diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index 3821406f9..1ad5e5d95 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -11,7 +11,6 @@ Kommentar hinzufügen … Aktualisieren Liste - Listenbild Vergebe einen Listennamen Wählen Sie den zu verwendenden Google-Account aus: Alarme @@ -354,8 +353,6 @@ Es wurde kein Office-Reader gefunden Tut mir leid! Dieser Dateityp kann nicht geöffnet werden. Es wurde keine Anwendung gefunden - Bild - Stimme Nach oben Wählen Sie eine Datei Wähle ein Verzeichnis diff --git a/astrid/src/main/res/values-el/strings.xml b/astrid/src/main/res/values-el/strings.xml index b0c5068f6..2f05474e0 100644 --- a/astrid/src/main/res/values-el/strings.xml +++ b/astrid/src/main/res/values-el/strings.xml @@ -272,8 +272,6 @@ Δεν βρέθηκε αναγνώστης αρχείων MS Office. Συγγνώμη! Δεν βρέθηκε εφαρμογή που να χειρίζεται τέτοιο τύπο αρχείου Δεν βρέθηκε εφαρμογή - Εικόνα - Φωνή Πάνω Επιλογή αρχείου Επιλογή φακέλου diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index 465ad2020..859f4e944 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -11,7 +11,6 @@ Añadir un comentario... Actualizar Lista - Imagen de Lista Indique nombre de lista Seleccione la cuenta de Google que desea usar: Alarmas @@ -361,8 +360,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n No se encontró lector para archivos de MS Office Lo sentimos! No se encontró ninguna aplicación para abrir este tipo de archivo. No se encontró ninguna aplicación - Imagen - Voz Arriba Elija un archivo Elija un directorio diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index 6e2698cb5..07c4c41be 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -11,7 +11,6 @@ Ajouter un commentaire Mettre à jour Nom de la liste : - Liste des Images Entrez un nom de liste Sélectionnez le compte Google que vous voulez utiliser : Alarmes @@ -357,7 +356,6 @@ Aucun lecteur MS Office n\'a été trouvé Désolé ! Aucune application n\'a été trouvé pour gérer ce type de fichier. Aucune application trouvée - Voix Remonter Choisissez un fichier Choisissez un dossier diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index 22948e193..4b0feccf7 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -11,7 +11,6 @@ Aggiungi un commento... Aggiorna Lista - Elenco Immagini Inserisci il nome della lista Seleziona l\'account Google che vuoi utilizzare: Promemoria @@ -325,8 +324,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Non è stato trovato nessun lettore di documenti MS Office Spiacente! Non è stata trovata nessuna applicazione per gestire questo tipo di file Spiacente! Non è stata trovata nessuna applicazione - Immagine - Voce Su Scegli un file Scegli una cartella diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index afdb407f2..b76e4b8fe 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -11,7 +11,6 @@ הוסף הערה רַעְנֵן רשימה - תמונת רשימה הכנס שם רשימה בחר חשבון גוגל התראות @@ -362,8 +361,6 @@ לא נמצא קורא לקבצי אופיס \"מצטערת! לא מצאתי ישום שיכול לטפל בקבצים מסוג זה\" יישום לא נמצא - תמונה - קול מעלה בחר קובץ יש לבחור תיקייה diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index af55b86b2..ced12e5df 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -11,7 +11,6 @@ コメントする 更新 リスト - リスト写真 リスト名を記入してください 使用したいGoogleアカウントを選択してください: アラーム diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index 1dbf15977..2261ba1c2 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -11,7 +11,6 @@ 댓글 쓰기... 새로고침 목록 - 목록 사진 목록 이름을 입력하세요 사용하려는 구글 계정을 선택해 주십시오: 알람 @@ -368,8 +367,6 @@ MS 오피스 리더 없음 죄송하지만 이 파일 형식을 다룰 수 있는 프로그램이 없습니다. 프로그램이 없음 - 이미지 - 음성 위로 파일 선택하기 디렉토리 선택하기 diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml index e68295cd9..fb971dd68 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/astrid/src/main/res/values-nb/strings.xml @@ -174,7 +174,6 @@ I liste: ? Du har $NUM som matcher: $FILTER Avanserte innstillinger - Tale Opp Velg en fil Minn meg på... diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index 34ff2032c..b3e4f1215 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -11,7 +11,6 @@ Voeg een opmerking toe Vernieuwen Lijst - Lijstafbeelding Geef de lijst een naam Selecteer de Google account die je wil gebruiken: Herinneringen @@ -361,8 +360,6 @@ Geen MS Office-lezer gevonden Sorry! Er is geen applicatie gevonden die dit bestandtype ondersteunt. Geen applicatie gevonden - Afbeelding - Spraak Omhoog Bestand kiezen Kies een directory diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index 84ddae36d..e8e8da49b 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -11,7 +11,6 @@ Dodaj komentarz... Odśwież Lista - Obrazek listy Podaj nazwę listy Wybierz konto Google, którego chcesz użyć: Alarmy @@ -352,8 +351,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Nie znaleziono czytnika MS Office Przepraszamy! Nie znaleziono aplikacji do obsługi tego typu pliku. Nie znaleziono aplikacji - Grafika - Głos Do góry Wybierz plik Wybierz katalog diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index 34ed198a7..ff13891e5 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -11,7 +11,6 @@ Comentar... Atualizar Lista - Imagem da lista Entre com o nome da lista Selecione a conta do Google que deseja usar: Alarmes @@ -339,8 +338,6 @@ Nenhum leitor MS Office encontrado Desculpa! Nenhuma aplicação para manipular este tipo de arquivo foi encontrada. Aplicação não encontrada - Imagem - Voz Subir Escolha um arquivo Escolha um diretório diff --git a/astrid/src/main/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml index b815c08d1..9710f3cff 100644 --- a/astrid/src/main/res/values-pt/strings.xml +++ b/astrid/src/main/res/values-pt/strings.xml @@ -11,7 +11,6 @@ Adicionar um comentário... Recarregar Lista - Imagem Escreva o nome da lista Escolha a conta Google a utilizar: Alarmes @@ -367,8 +366,6 @@ das tarefas através de um backup em Definições->Sincronização e backup-& Leitor de documentos MS Office não encontrado Não foi encontrada qualquer aplicação para gerir ficheiros deste tipo. Aplicação não encontrada - Imagem - Voz Subir Escolha um ficheiro Escolha um diretório diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index 2a9c18c0e..b843b71c2 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -11,7 +11,6 @@ Добавить комментарий... Обновить Список - Укажите фото: Введите имя списка Выберите аккаунт Google, который вы хотите использовать: Напоминания @@ -365,8 +364,6 @@ Не найдена программа для просмотра файлов MS Office. Извините! Не найдена программа для просмотра файлов этого типа. Не найдена программа для просмотра файлов этого типа. - Изображение - Голос Вверх Выбрать файл Выберите целевой каталог diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/astrid/src/main/res/values-sl-rSI/strings.xml index 2cf861859..57dd62020 100644 --- a/astrid/src/main/res/values-sl-rSI/strings.xml +++ b/astrid/src/main/res/values-sl-rSI/strings.xml @@ -11,7 +11,6 @@ Dodaj komentar... Osveži Seznam - Seznami slik Vnesi ime seznama Izberite želeni Google račun: Glasna opozorila @@ -363,8 +362,6 @@ Ne najdem bralnika MS Office Žal nobena aplikacija ne ustreza takim datotekam. Ni ustrezne aplikacije - Slika - Glas Gor Izberite datoteko Izberite mapo diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index f071be1c2..704c2cd20 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -11,7 +11,6 @@ Lägg till en kommentar... Uppdatera Lista - Listbild Ange listnamn Välj vilket Googlekonto du vill använda: Alarm @@ -351,8 +350,6 @@ och återställer dina aktuella uppgifter från en backup Ingen MS Office-läsare hittades Tyvärr hittades ingen applikation för att hantera den här filtypen Ingen passande applikation hittades - Bild - Röst Upp Välj en fil Välj sökväg diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index ea8b7098a..99ba24e91 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -11,7 +11,6 @@ Yorum Gir Yenile Liste İsmi: - Liste Resmi Liste adı girin Kullanmak istediğiniz Google hesabını seçin: Alarmlar @@ -323,8 +322,6 @@ MS Office okuyucu bulunamadı Üzgünüm! Bu dosya türünü destekleyen bir uygulama bulunamadı. Uygulama bulunamadı - Görüntü - Ses Yukarı Bir dosya seçin Bir dizin seçin diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 9d2616363..3e542c9f7 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -11,7 +11,6 @@ Додати коментар Оновити Список - Зображення Списку Введіть назву списку Виберіть обліковий запис Google для використання: Сигнали @@ -368,8 +367,6 @@ Не знайдено програма для перегляду файлів MS Office. Вибачте! Не знайдено програму для перегляду файлів цього типу. Програму не знайдено - Зображення - Голос Нагору Вибрати файл Вибрати каталог diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index 91866c17d..359e66806 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -11,7 +11,6 @@ 添加注释... 刷新 列表名称： - 列表图片 添加列表名称 选择你要使用的Google账户 闹钟 @@ -305,8 +304,6 @@ 找不到微软 Office 对不起！找不到应用程序处理这种文件类型。 找不到应用程序 - 图片 - 语音 向上 选择一个文件 选择一个目录 diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index 793ac1c36..1847379dc 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -11,7 +11,6 @@ 添加評論 重新整理 列表名稱： - 清單圖片 添加列表名稱 選擇您要使用的Google帳戶： 警示 @@ -343,8 +342,6 @@ 找不到微軟 Office 對不起！找不到應用程序處理這種文件類型。 找不到應用程序 - 圖片 - 語音 向上 選擇一個文件 選擇一個目錄 diff --git a/astrid/src/main/res/values/strings-actfm.xml b/astrid/src/main/res/values/strings-actfm.xml index 7ce4a0e04..5c2db756f 100644 --- a/astrid/src/main/res/values/strings-actfm.xml +++ b/astrid/src/main/res/values/strings-actfm.xml @@ -23,9 +23,6 @@ List - - List Picture - Enter list name diff --git a/astrid/src/main/res/values/strings-premium.xml b/astrid/src/main/res/values/strings-premium.xml index af630c60e..50e9a882f 100644 --- a/astrid/src/main/res/values/strings-premium.xml +++ b/astrid/src/main/res/values/strings-premium.xml @@ -25,8 +25,6 @@ Sorry! No application was found to handle this file type. No application found - Image - Voice Up Choose a file Choose a directory