archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove task assign from TLA

Browse Source 
* Remove unused translations
* Update Brazilian Portuguese (sfrique)
pull/46/head
Alex Baker 11 years ago
parent da795dfc5a
commit 7f56b1ce8f
24 changed files with 5 additions and 314 deletions
Show Stats Download Patch File Download Diff File

9
astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

@ -167,17 +167,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
// --- result codes
public static final int RESULT_CODE_SAVED = Activity.RESULT_FIRST_USER;
public static final int RESULT_CODE_DISCARDED = Activity.RESULT_FIRST_USER + 1;
public static final int RESULT_CODE_DELETED = Activity.RESULT_FIRST_USER + 2;
public static final String OVERRIDE_FINISH_ANIM = "finishAnim"; //$NON-NLS-1$
public static final String TOKEN_TASK_WAS_ASSIGNED = "task_assigned"; //$NON-NLS-1$
public static final String TOKEN_ASSIGNED_TO_DISPLAY = "task_assigned_to_display"; //$NON-NLS-1$
public static final String TOKEN_ASSIGNED_TO_EMAIL = "task_assigned_to_email"; //$NON-NLS-1$
public static final String TOKEN_ASSIGNED_TO_ID = "task_assigned_to_id"; //$NON-NLS-1$
public static final String TOKEN_TAGS_CHANGED = "tags_changed"; //$NON-NLS-1$
public static final String TOKEN_NEW_REPEATING_TASK = "new_repeating"; //$NON-NLS-1$

128
astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -9,12 +9,10 @@ import android.animation.LayoutTransition;
import android.app.Activity;
import android.app.SearchManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.View;
@ -28,11 +26,8 @@ import android.widget.PopupWindow.OnDismissListener;
import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.CommentsFragment;
import com.todoroo.astrid.actfm.TagSettingsActivity;
@ -43,9 +38,7 @@ import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.core.CoreFilterExposer;
import com.todoroo.astrid.core.CustomFilterExposer;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.dao.TagMetadataDao;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task;
@ -63,15 +56,10 @@ import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Flags;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.tasks.R;
public class TaskListActivity extends AstridActivity implements MainMenuListener, OnPageChangeListener {
public static final String TOKEN_SELECTED_FILTER = "selectedFilter"; //$NON-NLS-1$
/** token for indicating source of TLA launch */
public static final String TOKEN_SOURCE = "source"; //$NON-NLS-1$
@ -89,15 +77,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
public static final int FILTER_MODE_NORMAL = 0;
public static final int FILTER_MODE_FEATURED = 2;
public static final int REQUEST_CODE_RESTART = 10;
@Autowired private TagMetadataDao tagMetadataDao;
private View listsNav;
private ImageView listsNavDisclosure;
private TextView lists;
private ImageView mainMenu;
private TextView personStatus;
private int filterMode;
private FilterModeSpec filterModeSpec;
@ -127,13 +110,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
}
};
private final OnClickListener friendStatusClickListener = new OnClickListener() {
@Override
public void onClick(View v) {
TaskListFragment tlf = getTaskListFragment();
}
};
/**
* @see android.app.Activity#onCreate(Bundle)
*/
@ -141,7 +117,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
protected void onCreate(Bundle savedInstanceState) {
ThemeService.applyTheme(this);
super.onCreate(savedInstanceState);
DependencyInjectionService.getInstance().inject(this);
int contentView = getContentView();
if (contentView == R.layout.task_list_wrapper_activity) {
@ -158,12 +133,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
personStatus = (TextView) actionBar.getCustomView().findViewById(R.id.person_image);
initializeFragments(actionBar);
createMainMenuPopover();
mainMenu.setOnClickListener(mainMenuClickListener);
personStatus.setOnClickListener(friendStatusClickListener);
Bundle extras = getIntent().getExtras();
if (extras != null) {
@ -306,10 +279,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
container.setLayoutTransition(transition);
}
protected Class<? extends FilterListFragment> getFilterListClass() {
return FilterListFragment.class;
}
private void createListsPopover() {
listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
listsPopover.setOnDismissListener(new OnDismissListener() {
@ -497,10 +466,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
lists.setText(item.title);
}
public TaskListFragmentPagerAdapter getFragmentPagerAdapter() {
return tlfPagerAdapter;
}
@Override
public void onPageSelected(int position) {
if (tlfPagerAdapter != null) {
@ -576,12 +541,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
TaskListFragment tlf = getTaskListFragment();
if (tlf != null) {
if (data != null) {
if (data.getBooleanExtra(TaskEditFragment.TOKEN_TASK_WAS_ASSIGNED, false)) {
String assignedTo = data.getStringExtra(TaskEditFragment.TOKEN_ASSIGNED_TO_DISPLAY);
String assignedEmail = data.getStringExtra(TaskEditFragment.TOKEN_ASSIGNED_TO_EMAIL);
String assignedId = data.getStringExtra(TaskEditFragment.TOKEN_ASSIGNED_TO_ID);
taskAssignedTo(assignedTo, assignedEmail, assignedId);
} else if (data.getParcelableExtra(TaskEditFragment.TOKEN_NEW_REPEATING_TASK) != null) {
if (data.getParcelableExtra(TaskEditFragment.TOKEN_NEW_REPEATING_TASK) != null) {
Task repeating = data.getParcelableExtra(TaskEditFragment.TOKEN_NEW_REPEATING_TASK);
DateChangedAlerts.showRepeatChangedDialog(this, repeating);
}
@ -664,91 +624,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
}
}
public void taskAssignedTo(final String assignedDisplay, String assignedEmail, final String assignedId) {
final TaskListFragment tlf = getTaskListFragment();
if (tlf != null && tlf.isInbox()) {
DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Filter assignedFilter = CustomFilterExposer.getAssignedByMeFilter(getResources());
onFilterItemClicked(assignedFilter);
}
};
DialogUtilities.okCancelCustomDialog(this,
getString(R.string.actfm_view_task_title),
getString(R.string.actfm_view_task_text, assignedDisplay),
R.string.actfm_view_task_ok, R.string.actfm_view_task_cancel,
0, okListener, null);
} else if (tlf != null && (!TextUtils.isEmpty(assignedEmail) || Task.isRealUserId(assignedId))) {
checkAddTagMember(tlf, assignedDisplay, assignedEmail, assignedId);
}
}
private void checkAddTagMember(final TaskListFragment tlf, final String assignedDisplay, String assignedEmail, final String assignedId) {
final TagData td = tlf.getActiveTagData();
if (td != null) {
String members = td.getValue(TagData.MEMBERS);
boolean memberFound = false;
if (TextUtils.isEmpty(members)) {
memberFound = td.getValue(TagData.USER_ID).equals(assignedId) || tagMetadataDao.memberOfTagData(assignedEmail, td.getUuid(), assignedId);
} else {
JSONObject user = new JSONObject();
JSONArray membersArray = null;
try {
if (!TextUtils.isEmpty(assignedEmail)) {
user.put("email", assignedEmail); //$NON-NLS-1$
}
if (Task.isRealUserId(assignedId)) {
user.put("id", assignedId); //$NON-NLS-1$
}
membersArray = new JSONArray(members);
for (int i = 0; i < membersArray.length(); i++) {
JSONObject member = membersArray.getJSONObject(i);
String memberId = Long.toString(member.optLong("id", -3)); //$NON-NLS-1$
if (Task.isRealUserId(memberId) && memberId.equals(assignedId)) {
memberFound = true;
break;
}
}
if (!memberFound) {
String ownerString = td.getValue(TagData.USER);
if (!TextUtils.isEmpty(ownerString)) {
JSONObject owner = new JSONObject(ownerString);
String ownerId = Long.toString(owner.optLong("id", -3)); //$NON-NLS-1$
if (Task.isRealUserId(ownerId) && assignedId.equals(ownerId)) {
memberFound = true;
}
}
}
} catch (JSONException e) {
return;
}
}
if (memberFound) {
return;
}
DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface d, int which) {
tagMetadataDao.createMemberLink(td.getId(), td.getUuid(), assignedId, false);
tlf.refresh();
}
};
DialogUtilities.okCancelCustomDialog(this,
getString(R.string.actfm_EPA_add_person_to_list_title),
getString(R.string.actfm_EPA_add_person_to_list, assignedDisplay, assignedDisplay),
R.string.actfm_EPA_add_person_to_list_ok,
R.string.actfm_EPA_add_person_to_list_cancel,
android.R.drawable.ic_dialog_alert,
okListener, null);
}
}
public void incrementFilterCount(Filter filter) {
FilterListFragment flf = getFilterListFragment();
if (flf != null) {
@ -832,7 +707,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
createListsPopover();
setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
filterModeSpec.getFilterListClass(), true, true));
personStatus.setVisibility(View.GONE);
if (swipeIsEnabled()) {
setupPagerAdapter();

11
astrid/src/main/res/layout/header_nav_views.xml
Unescape Escape View File

@ -57,15 +57,4 @@
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/person_image"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:singleLine="true"
android:paddingRight="5dip"
style="@style/TextAppearance.ActionBar_ListsHeader"
android:textSize="16sp"
android:visibility="gone"/>
</LinearLayout>

6
astrid/src/main/res/values-ca/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Fes una fotografia</string>
<string name="actfm_picture_gallery">Tria una imatge de la galeria</string>
<string name="actfm_picture_clear">Neteja la selecció d\'imatge</string>
<string name="actfm_view_task_title">Voleu veure la tasca?</string>
<string name="actfm_view_task_text">La tasca s\'ha enviat a %s! Tu segueixes veient les teves pròpies tasques. Vols veure aquesta tasca i les altres que has assignat?</string>
<string name="actfm_view_task_ok">Mostra les tasques assignades</string>
<string name="actfm_view_task_cancel">Queda\'t aquí</string>
<string name="TVA_add_comment">Afegiu un comentari...</string>
<string name="actfm_TVA_menu_refresh">Actualitza</string>
<string name="actfm_TVA_tag_label">Llista</string>
@ -22,8 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Paràmetres</string>
<string name="actfm_TVA_tag_description_hint">Escriviu una descripció</string>
<string name="actfm_TVA_tag_name_hint">Escriviu el nom de la llista</string>
<string name="actfm_EPA_add_person_to_list_ok">Añadir a la lista</string>
<string name="actfm_EPA_add_person_to_list_cancel">No lo añadir</string>
<string name="actfm_GAA_title">Trieu el compte de Google que vulgueu utilitzar:</string>
<string name="actfm_feat_list_clone">Copiar la lista</string>
<string name="actfm_feat_list_suffix">(Copia)</string>

4
astrid/src/main/res/values-cs/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Vyfoť obrázek</string>
<string name="actfm_picture_gallery">Vybrat obrázek z galerie</string>
<string name="actfm_picture_clear">Odebrat obrázek</string>
<string name="actfm_view_task_title">Zobrazit úkol?</string>
<string name="actfm_view_task_text">%s se stal novým vlastníkem úkolu! Teď si prohlížíte vlastní úkoly. Chcete vidět úkoly, které jste delegoval(a)?</string>
<string name="actfm_view_task_ok">Delegované</string>
<string name="actfm_view_task_cancel">Vlastní</string>
<string name="TVA_add_comment">Přidej comment...</string>
<string name="actfm_TVA_menu_refresh">Obnovit</string>
<string name="actfm_TVA_tag_label">Název listu:</string>

4
astrid/src/main/res/values-da/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Tag et billede</string>
<string name="actfm_picture_gallery">Vælg fra galleri</string>
<string name="actfm_picture_clear">Ryd markering</string>
<string name="actfm_view_task_title">Vis opgave?</string>
<string name="actfm_view_task_text">Opgaven blev sendt til %s! Du ser lige nu dine egne opgaver. Vil du se disse og andre opgaver, du har tildelt?</string>
<string name="actfm_view_task_ok">Vis tildelte</string>
<string name="actfm_view_task_cancel">Bliv her</string>
<string name="TVA_add_comment">Tilføj en kommentar</string>
<string name="actfm_TVA_menu_refresh">Opdater</string>
<string name="actfm_TVA_tag_label">Listenavn</string>

8
astrid/src/main/res/values-de/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Bild aufnehmen</string>
<string name="actfm_picture_gallery">Aus Galerie wählen</string>
<string name="actfm_picture_clear">Bild entfernen</string>
<string name="actfm_view_task_title">Aufgabe anzeigen?</string>
<string name="actfm_view_task_text">Diese Aufgabe wurde an %s gesandt! Sie sehen momentan Ihre eigenen Aufgaben an. Möchten Sie diese und weitere Aufgaben, die Sie Anderen zugewiesen haben, ansehen?</string>
<string name="actfm_view_task_ok">Zugewiesene ansehen</string>
<string name="actfm_view_task_cancel">Hier bleiben</string>
<string name="TVA_add_comment">Kommentar hinzufügen …</string>
<string name="actfm_TVA_menu_refresh">Aktualisieren</string>
<string name="actfm_TVA_tag_label">Liste</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Einstellungen</string>
<string name="actfm_TVA_tag_description_hint">Beschreibung eingeben</string>
<string name="actfm_TVA_tag_name_hint">Vergebe einen Listennamen</string>
<string name="actfm_EPA_add_person_to_list_title">Aufgabe zugewiesen</string>
<string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Möchten Sie %2$s dieser Liste hinzufügen?</string>
<string name="actfm_EPA_add_person_to_list_ok">Zur Liste hinzufügen</string>
<string name="actfm_EPA_add_person_to_list_cancel">Nicht hinzufügen</string>
<string name="actfm_GAA_title">Wählen Sie den zu verwendenden Google-Account aus:</string>
<string name="actfm_feat_list_clone">Liste kopieren</string>
<string name="actfm_feat_list_suffix">(Kopie)</string>

8
astrid/src/main/res/values-es/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Tomar una foto</string>
<string name="actfm_picture_gallery">Elegir de la galería</string>
<string name="actfm_picture_clear">Borrar imagen</string>
<string name="actfm_view_task_title">¿Ver tarea?</string>
<string name="actfm_view_task_text">La tarea se envió a %s. Está viendo sus propias tareas. ¿Quiere ver además otras tareas que ha asignado?</string>
<string name="actfm_view_task_ok">Ver asignadas</string>
<string name="actfm_view_task_cancel">Quedarse aquí</string>
<string name="TVA_add_comment">Agregue un comentario...</string>
<string name="actfm_TVA_menu_refresh">Actualizar</string>
<string name="actfm_TVA_tag_label">Lista</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Configuración</string>
<string name="actfm_TVA_tag_description_hint">Escriba una descripción aquí</string>
<string name="actfm_TVA_tag_name_hint">Indique nombre de lista</string>
<string name="actfm_EPA_add_person_to_list_title">Tarea asignada</string>
<string name="actfm_EPA_add_person_to_list">%1$s no está compartido en esta lista. ¿Quieres añadir %2$s a esta lista?</string>
<string name="actfm_EPA_add_person_to_list_ok">Agregar a lista</string>
<string name="actfm_EPA_add_person_to_list_cancel">No agregar</string>
<string name="actfm_GAA_title">Elija la cuenta de Google que desea usar:</string>
<string name="actfm_feat_list_clone">Copiar lista</string>
<string name="actfm_feat_list_suffix">(Copiar)</string>

8
astrid/src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Prendre une photo</string>
<string name="actfm_picture_gallery">Choisir depuis la galerie</string>
<string name="actfm_picture_clear">Supprimer l\'image</string>
<string name="actfm_view_task_title">Voir la tâche ?</string>
<string name="actfm_view_task_text">La tâche a été envoyée à %s ! Vous voyez actuellement vos propres tâches. Voulez-vous également voir celle-ci et les autres tâches que vous avez envoyées ?</string>
<string name="actfm_view_task_ok">Voir les tâches attribués</string>
<string name="actfm_view_task_cancel">Rester ici</string>
<string name="TVA_add_comment">Ajouter un commentaire</string>
<string name="actfm_TVA_menu_refresh">Mettre à jour</string>
<string name="actfm_TVA_tag_label">Nom de la liste :</string>
@ -21,10 +17,6 @@
<string name="actfm_TVA_tag_settings_label">Paramètres</string>
<string name="actfm_TVA_tag_description_hint">Entrez une description ici</string>
<string name="actfm_TVA_tag_name_hint">Entrez un nom de liste</string>
<string name="actfm_EPA_add_person_to_list_title">Tâche assignée</string>
<string name="actfm_EPA_add_person_to_list">%1$s n\'est pas partagé dans cette liste. Souhaitez-vous ajouter %2$s à cette liste ? </string>
<string name="actfm_EPA_add_person_to_list_ok">Ajouter à la liste</string>
<string name="actfm_EPA_add_person_to_list_cancel">Ne pas ajouter</string>
<string name="actfm_GAA_title">Sélectionnez le compte Google que vous voulez utiliser :</string>
<string name="actfm_feat_list_clone">Copier la liste</string>
<string name="actfm_feat_list_suffix">(Copier)</string>

8
astrid/src/main/res/values-it/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Scatta una foto</string>
<string name="actfm_picture_gallery">Scegli dalla Galleria</string>
<string name="actfm_picture_clear">Deseleziona Immagine</string>
<string name="actfm_view_task_title">Mostra l\'attività?</string>
<string name="actfm_view_task_text">Attività inviata a %s! Adesso stai vedendo le tue attività . Vuoi vedere anche quelle che hai assegnato?</string>
<string name="actfm_view_task_ok">Vedi Assegnate</string>
<string name="actfm_view_task_cancel">Resta quì</string>
<string name="TVA_add_comment">Aggiungi un commento...</string>
<string name="actfm_TVA_menu_refresh">Aggiorna</string>
<string name="actfm_TVA_tag_label">Lista</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Impostazioni</string>
<string name="actfm_TVA_tag_description_hint">Digita qui una descrizione</string>
<string name="actfm_TVA_tag_name_hint">Inserisci il nome della lista</string>
<string name="actfm_EPA_add_person_to_list_title">Attività assegnata</string>
<string name="actfm_EPA_add_person_to_list">%1$s non è condiviso in questa lista. Vuoi aggiungere %2$s a questa lista?</string>
<string name="actfm_EPA_add_person_to_list_ok">Aggiungi alla lista</string>
<string name="actfm_EPA_add_person_to_list_cancel">Non aggiungere</string>
<string name="actfm_GAA_title">Seleziona l\'account Google che vuoi utilizzare:</string>
<string name="actfm_feat_list_clone">Copia lista</string>
<string name="actfm_feat_list_suffix">(Copia)</string>

8
astrid/src/main/res/values-iw/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">צַלֵּם תמונה</string>
<string name="actfm_picture_gallery">בחר מגלריה</string>
<string name="actfm_picture_clear">הסר תמונה</string>
<string name="actfm_view_task_title">להציג את המשימה?</string>
<string name="actfm_view_task_text">משימה נשלחה אל %s! הנך מביט במשימות שלך. הֲתִּרְצֶה לעיין במשימה זו ובמשימות אשר הטלת על אחרים?</string>
<string name="actfm_view_task_ok">הצג משימות שהטלת</string>
<string name="actfm_view_task_cancel">הִשָּׁאֵר כאן</string>
<string name="TVA_add_comment">הוסף הערה</string>
<string name="actfm_TVA_menu_refresh">רַעְנֵן</string>
<string name="actfm_TVA_tag_label">רשימה</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">הגדרות</string>
<string name="actfm_TVA_tag_description_hint">הכנס תיאור כאן</string>
<string name="actfm_TVA_tag_name_hint">הכנס שם רשימה</string>
<string name="actfm_EPA_add_person_to_list_title">משימה הוטלה</string>
<string name="actfm_EPA_add_person_to_list">%1$s אינו שותף ברשימה זו. הֲתִּרְצֶה להוסיף את %2$s לרשימה זו?</string>
<string name="actfm_EPA_add_person_to_list_ok">הוסף לרשימה</string>
<string name="actfm_EPA_add_person_to_list_cancel">אל תוסיף</string>
<string name="actfm_GAA_title">בחר חשבון גוגל</string>
<string name="actfm_feat_list_clone">העתקת רשימה</string>
<string name="actfm_feat_list_suffix">(העתק)</string>

7
astrid/src/main/res/values-ja/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">写真を撮る</string>
<string name="actfm_picture_gallery">ギャラリーから選択</string>
<string name="actfm_picture_clear">写真を削除</string>
<string name="actfm_view_task_title">タスクを表示しますか？</string>
<string name="actfm_view_task_text">タスクは%sに送信されました！只今あなたのタスクが表示されています。あなたが割り当ていた他のタスクもここで表示しますか？</string>
<string name="actfm_view_task_ok">表示する</string>
<string name="actfm_view_task_cancel">表示しない</string>
<string name="TVA_add_comment">コメントする</string>
<string name="actfm_TVA_menu_refresh">更新</string>
<string name="actfm_TVA_tag_label">リスト</string>
@ -22,9 +18,6 @@
<string name="actfm_TVA_tag_settings_label">設定</string>
<string name="actfm_TVA_tag_description_hint">ここに説明をタイプする</string>
<string name="actfm_TVA_tag_name_hint">リスト名を記入してください</string>
<string name="actfm_EPA_add_person_to_list_title">割り当てられたタスク</string>
<string name="actfm_EPA_add_person_to_list_ok">リストに追加する</string>
<string name="actfm_EPA_add_person_to_list_cancel">追加しないで</string>
<string name="actfm_GAA_title">使用したいGoogleアカウントを選択してください:</string>
<string name="actfm_feat_list_clone_success">成功！</string>
<string name="alarm_ACS_label">アラーム</string>

8
astrid/src/main/res/values-ko/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">사진 찍기</string>
<string name="actfm_picture_gallery">갤러리에서 가져오기</string>
<string name="actfm_picture_clear">사진 제거하기</string>
<string name="actfm_view_task_title">일정을 열람할까요?</string>
<string name="actfm_view_task_text">%s 님에게 일정을 보냈습니다! 현재 자신의 일정을 보고 있습니다. 당신이 할당한 이 일정과 다른 일정을 보시겠습니까?</string>
<string name="actfm_view_task_ok">할당 일정 보기</string>
<string name="actfm_view_task_cancel">머무르기</string>
<string name="TVA_add_comment">댓글 쓰기...</string>
<string name="actfm_TVA_menu_refresh">새로고침</string>
<string name="actfm_TVA_tag_label">목록</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">설정</string>
<string name="actfm_TVA_tag_description_hint">여기에 설명을 입력하세요</string>
<string name="actfm_TVA_tag_name_hint">목록 이름을 입력하세요</string>
<string name="actfm_EPA_add_person_to_list_title">할당한 일정</string>
<string name="actfm_EPA_add_person_to_list">%1$s 를 이 목록에 공유하지 않았습니다. %2$s 를 이 목록에 추가할까요?</string>
<string name="actfm_EPA_add_person_to_list_ok">목록에 추가하기</string>
<string name="actfm_EPA_add_person_to_list_cancel">추가하지 않기</string>
<string name="actfm_GAA_title">사용하려는 구글 계정을 선택해 주십시오:</string>
<string name="actfm_feat_list_clone">목록 복사하기</string>
<string name="actfm_feat_list_suffix">(복사)</string>

8
astrid/src/main/res/values-nl/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Maak een Foto</string>
<string name="actfm_picture_gallery">Maak een keuze uit de Gallerij</string>
<string name="actfm_picture_clear">Verwijder Foto</string>
<string name="actfm_view_task_title">Taak bekijken?</string>
<string name="actfm_view_task_text">Taak is naar %s gestuurd! Je bekijkt op dit moment je eigen taken. Wil je deze en andere taken die je hebt toegewezen bekijken?</string>
<string name="actfm_view_task_ok">Bekijk toegewezen taken</string>
<string name="actfm_view_task_cancel">Blijf Hier</string>
<string name="TVA_add_comment">Voeg een opmerking toe</string>
<string name="actfm_TVA_menu_refresh">Vernieuwen</string>
<string name="actfm_TVA_tag_label">Lijst</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Voorkeuren</string>
<string name="actfm_TVA_tag_description_hint">Type hier een beschrijving</string>
<string name="actfm_TVA_tag_name_hint">Geef de lijst een naam</string>
<string name="actfm_EPA_add_person_to_list_title">Taak toegewezen</string>
<string name="actfm_EPA_add_person_to_list">%1$s is niet gedeeld binnen deze lijst. Wil je %2$s aan deze lijst toevoegen?</string>
<string name="actfm_EPA_add_person_to_list_ok">Voeg toe aan lijst</string>
<string name="actfm_EPA_add_person_to_list_cancel">Niet toevoegen</string>
<string name="actfm_GAA_title">Selecteer de Google account die je wil gebruiken:</string>
<string name="actfm_feat_list_clone">Kopiëer lijst</string>
<string name="actfm_feat_list_suffix">(Kopiéer)</string>

8
astrid/src/main/res/values-pl/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Zrób zdjęcie</string>
<string name="actfm_picture_gallery">Wybierz z galerii</string>
<string name="actfm_picture_clear">Usuń obrazek</string>
<string name="actfm_view_task_title">Pokazać zadanie?</string>
<string name="actfm_view_task_text">Zadanie zostało wysłane do %s! Aktualnie oglądasz własne zadania. Czy chcesz zobaczyć to i inne zadania które przypisałeś?</string>
<string name="actfm_view_task_ok">Pokaż przypisane</string>
<string name="actfm_view_task_cancel">Zostań tutaj</string>
<string name="TVA_add_comment">Dodaj komentarz...</string>
<string name="actfm_TVA_menu_refresh">Odśwież</string>
<string name="actfm_TVA_tag_label">Lista</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Ustawienia</string>
<string name="actfm_TVA_tag_description_hint">Wpisz tutaj jakiś opis</string>
<string name="actfm_TVA_tag_name_hint">Podaj nazwę listy</string>
<string name="actfm_EPA_add_person_to_list_title">Zadanie przypisane</string>
<string name="actfm_EPA_add_person_to_list">%1$s nie jest współdzielony na tej liście. Czy chciałbyś dodać %2$s do tej listy?</string>
<string name="actfm_EPA_add_person_to_list_ok">Dodaj do listy</string>
<string name="actfm_EPA_add_person_to_list_cancel">Nie dodawaj</string>
<string name="actfm_GAA_title">Wybierz konto Google, którego chcesz użyć:</string>
<string name="actfm_feat_list_clone">Kopiuj listę</string>
<string name="actfm_feat_list_suffix">(Kopiuj)</string>

12
astrid/src/main/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Tirar uma foto</string>
<string name="actfm_picture_gallery">Selecionar da galeria</string>
<string name="actfm_picture_clear">Limpar imagem</string>
<string name="actfm_view_task_title">Ver tarefa?</string>
<string name="actfm_view_task_text">A tarefa foi enviada para %s! Atualmente está vendo suas próprias tarefas. Quer ver esta e as outras tarefas que você atribuiu?</string>
<string name="actfm_view_task_ok">Ver atribuídas</string>
<string name="actfm_view_task_cancel">Ficar aqui</string>
<string name="TVA_add_comment">Comentar...</string>
<string name="actfm_TVA_menu_refresh">Atualizar</string>
<string name="actfm_TVA_tag_label">Lista</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Configurações</string>
<string name="actfm_TVA_tag_description_hint">Digite uma descrição aqui</string>
<string name="actfm_TVA_tag_name_hint">Entre com o nome da lista</string>
<string name="actfm_EPA_add_person_to_list_title">Tarefa atribuída.</string>
<string name="actfm_EPA_add_person_to_list">%1$s não é partilhado nesta lista. Gostaria de adicionar %2$s nesta lista?</string>
<string name="actfm_EPA_add_person_to_list_ok">Adicionar para lista</string>
<string name="actfm_EPA_add_person_to_list_cancel">Não adicionar</string>
<string name="actfm_GAA_title">Selecione a conta do Google que deseja usar:</string>
<string name="actfm_feat_list_clone">Copiar lista</string>
<string name="actfm_feat_list_suffix">(Cópia)</string>
@ -76,6 +68,7 @@
<string name="ENA_no_user">Alguém</string>
<string name="ENA_refresh_comments">Atualizar comentários</string>
<string name="TLA_no_items">Você não tem tarefas! \n Deseja inserir alguma?</string>
<string name="TLA_menu_sort">Ordenar</string>
<string name="TLA_menu_sync">Sincronizar Agora</string>
<string name="TLA_menu_search">Buscar</string>
<string name="TLA_menu_lists">Listas</string>
@ -112,9 +105,11 @@
<string name="SSD_completed">Exibir tarefas terminadas</string>
<string name="SSD_hidden">Exibir tarefas ocultas</string>
<string name="SSD_deleted">Exibir tarefas excluídas</string>
<string name="SSD_sort_drag">Ordem manual com subtarefas</string>
<string name="SSD_sort_auto">Ordenação inteligente Tasks</string>
<string name="SSD_sort_alpha">Por título</string>
<string name="SSD_sort_due">Por data de vencimento</string>
<string name="SSD_sort_importance">Por prioridade</string>
<string name="SSD_sort_modified">Por data de modificação</string>
<string name="SSD_sort_reverse">Ordenação reversa</string>
<string name="SSD_save_temp">Somente uma vez</string>
@ -589,6 +584,7 @@
<string name="tag_no_title_error">Entre com o nome da lista primeiro!</string>
<string name="tag_FEx_add_new">Nova</string>
<string name="tag_FEx_header">Listas</string>
<string name="tag_FEx_untagged">Sem categoria</string>
<string name="tag_cm_rename">Renomear Lista</string>
<string name="tag_cm_delete">Excluir lista</string>
<string name="tag_cm_leave">Deixar lista</string>

4
astrid/src/main/res/values-pt/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Tirar uma Imagem</string>
<string name="actfm_picture_gallery">Seleccionar da Galeria</string>
<string name="actfm_picture_clear">Limpar Imagem</string>
<string name="actfm_view_task_title">Visualizar Tarefa?</string>
<string name="actfm_view_task_text">A tarefa foi enviada para %s! Está a visualizar as suas próprias tarefas. Deseja ver esta e também outras tarefas já atribuídas?</string>
<string name="actfm_view_task_ok">Ver atribuídas</string>
<string name="actfm_view_task_cancel">Ficar Aqui</string>
<string name="TVA_add_comment">Adicionar um comentário...</string>
<string name="actfm_TVA_menu_refresh">Actualizar</string>
<string name="actfm_TVA_tag_label">Lista</string>

8
astrid/src/main/res/values-ru/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Сделать снимок</string>
<string name="actfm_picture_gallery">Взять из галереи</string>
<string name="actfm_picture_clear">Убрать изображение</string>
<string name="actfm_view_task_title">Просмотреть задачу?</string>
<string name="actfm_view_task_text">Задача была отправлена %s! Сейчас вы просматриваете ваши собственные задачи. Хотите просмотреть эту и другие задачи назначенные вам?</string>
<string name="actfm_view_task_ok">Просмотреть назначенные</string>
<string name="actfm_view_task_cancel">Остаться здесь</string>
<string name="TVA_add_comment">Добавить комментарий...</string>
<string name="actfm_TVA_menu_refresh">Обновить</string>
<string name="actfm_TVA_tag_label">Список</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Настройки</string>
<string name="actfm_TVA_tag_description_hint">Введите описание здесь</string>
<string name="actfm_TVA_tag_name_hint">Введите имя списка</string>
<string name="actfm_EPA_add_person_to_list_title">Задание назначено</string>
<string name="actfm_EPA_add_person_to_list">%1$s не добавлен в этот список. Добавить %2$s в список?</string>
<string name="actfm_EPA_add_person_to_list_ok">Добавить в список</string>
<string name="actfm_EPA_add_person_to_list_cancel">Не добавлять</string>
<string name="actfm_GAA_title">Выберите аккаунт Google, который вы хотите использовать:</string>
<string name="actfm_feat_list_clone">Копировать список</string>
<string name="actfm_feat_list_suffix">(Копия)</string>

8
astrid/src/main/res/values-sv/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Ta en bild</string>
<string name="actfm_picture_gallery">Välj från galleri</string>
<string name="actfm_picture_clear">Rensa bild</string>
<string name="actfm_view_task_title">Visa uppgift?</string>
<string name="actfm_view_task_text">Uppgiften skickad till %s! Dina egna uppgifter visas. Vill du visa denna och andra uppgifter du har tilldelat?</string>
<string name="actfm_view_task_ok">Visa tilldelade</string>
<string name="actfm_view_task_cancel">Stanna här</string>
<string name="TVA_add_comment">Lägg till en kommentar...</string>
<string name="actfm_TVA_menu_refresh">Uppdatera</string>
<string name="actfm_TVA_tag_label">Lista</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Inställningar</string>
<string name="actfm_TVA_tag_description_hint">Skriv en beskrivning här</string>
<string name="actfm_TVA_tag_name_hint">Ange listnamn</string>
<string name="actfm_EPA_add_person_to_list_title">Uppgift tilldelad</string>
<string name="actfm_EPA_add_person_to_list">%1$s är inte delad på denna lista. Vill du lägga till %2$s på denna lista?</string>
<string name="actfm_EPA_add_person_to_list_ok">Lägg till på lista</string>
<string name="actfm_EPA_add_person_to_list_cancel">Lägg inte till</string>
<string name="actfm_GAA_title">Välj vilket Googlekonto du vill använda:</string>
<string name="actfm_feat_list_clone">Kopiera lista</string>
<string name="actfm_feat_list_suffix">(Kopiera)</string>

8
astrid/src/main/res/values-tr/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Resim Çek</string>
<string name="actfm_picture_gallery">Galeriden Seç</string>
<string name="actfm_picture_clear">Resmi sil</string>
<string name="actfm_view_task_title">Görevi görüntüle?</string>
<string name="actfm_view_task_text">Görev gönderildi: %s! Şu anda kendi görevlerinizi görüntülüyorsunuz. Bunu ve diğer atanmış olduğunuz görevleri görmek istiyor musunuz?</string>
<string name="actfm_view_task_ok">Atananları Göster</string>
<string name="actfm_view_task_cancel">Burada Kal</string>
<string name="TVA_add_comment">Yorum Gir</string>
<string name="actfm_TVA_menu_refresh">Yenile</string>
<string name="actfm_TVA_tag_label">Liste İsmi:</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Ayarlar</string>
<string name="actfm_TVA_tag_description_hint">Bir açıklama yazın</string>
<string name="actfm_TVA_tag_name_hint">Liste adı girin</string>
<string name="actfm_EPA_add_person_to_list_title">Görev atandı</string>
<string name="actfm_EPA_add_person_to_list">%1$s bu listede paylaşılmadı. %2$s bu listeye eklensin mi?</string>
<string name="actfm_EPA_add_person_to_list_ok">Listeye ekle</string>
<string name="actfm_EPA_add_person_to_list_cancel">Ekleme</string>
<string name="actfm_GAA_title">Kullanmak istediğiniz Google hesabını seçin:</string>
<string name="actfm_feat_list_clone">Listeyi kopyala</string>
<string name="actfm_feat_list_suffix">(Kopyala)</string>

8
astrid/src/main/res/values-uk/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">Зробити знімок</string>
<string name="actfm_picture_gallery">Завантажити з Галереї</string>
<string name="actfm_picture_clear">Очистити</string>
<string name="actfm_view_task_title">Ознайомитися із Завданням?</string>
<string name="actfm_view_task_text">Завдання було відправлена​о %s! Зараз ви переглядаєте ваші власні завдання. Хочете переглянути це та інші завдання призначені вам?</string>
<string name="actfm_view_task_ok">Подивитись призначені</string>
<string name="actfm_view_task_cancel">Залишитись тут</string>
<string name="TVA_add_comment">Додати коментар</string>
<string name="actfm_TVA_menu_refresh">Оновити</string>
<string name="actfm_TVA_tag_label">Список</string>
@ -22,10 +18,6 @@
<string name="actfm_TVA_tag_settings_label">Налаштування</string>
<string name="actfm_TVA_tag_description_hint">Введіть опис </string>
<string name="actfm_TVA_tag_name_hint">Введіть назву списку</string>
<string name="actfm_EPA_add_person_to_list_title">Завдання призначено</string>
<string name="actfm_EPA_add_person_to_list">%1$s не в цьому списку. Ви хочете додати %2$s до списку?</string>
<string name="actfm_EPA_add_person_to_list_ok">Додати до списку</string>
<string name="actfm_EPA_add_person_to_list_cancel">Не додавати</string>
<string name="actfm_GAA_title">Виберіть обліковий запис Google для використання:</string>
<string name="actfm_feat_list_clone">Копіювати список</string>
<string name="actfm_feat_list_suffix">(Копіювати)</string>

7
astrid/src/main/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">拍照</string>
<string name="actfm_picture_gallery">从相册中选取</string>
<string name="actfm_picture_clear">取消选择</string>
<string name="actfm_view_task_title">查看任务？</string>
<string name="actfm_view_task_text">任务已发送给%s！正在查看你所拥有的任务，是否查看其它被指定的任务？</string>
<string name="actfm_view_task_ok">查看被指派的任务</string>
<string name="actfm_view_task_cancel">保留在此处</string>
<string name="TVA_add_comment">添加注释...</string>
<string name="actfm_TVA_menu_refresh">刷新</string>
<string name="actfm_TVA_tag_label">列表名称：</string>
@ -22,9 +18,6 @@
<string name="actfm_TVA_tag_settings_label">设置</string>
<string name="actfm_TVA_tag_description_hint">在这里添加描述</string>
<string name="actfm_TVA_tag_name_hint">添加列表名称</string>
<string name="actfm_EPA_add_person_to_list_title">任务已分配</string>
<string name="actfm_EPA_add_person_to_list_ok">添加到列表</string>
<string name="actfm_EPA_add_person_to_list_cancel">不要添加</string>
<string name="actfm_GAA_title">选择你要使用的Google账户</string>
<string name="actfm_feat_list_clone">复制列表</string>
<string name="actfm_feat_list_suffix">（复制）</string>

7
astrid/src/main/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -9,10 +9,6 @@
<string name="actfm_picture_camera">拍下照片</string>
<string name="actfm_picture_gallery">從圖庫選擇</string>
<string name="actfm_picture_clear">清除圖片</string>
<string name="actfm_view_task_title">檢視工作？</string>
<string name="actfm_view_task_text">工作已被送到 %s！您目前正在查看自己的任務工作，你要查看你其餘被指派的工作嗎？</string>
<string name="actfm_view_task_ok">查看被指派的工作</string>
<string name="actfm_view_task_cancel">留下來吧</string>
<string name="TVA_add_comment">添加評論</string>
<string name="actfm_TVA_menu_refresh">重新整理</string>
<string name="actfm_TVA_tag_label">列表名稱：</string>
@ -22,9 +18,6 @@
<string name="actfm_TVA_tag_settings_label">設定</string>
<string name="actfm_TVA_tag_description_hint">在這裡添加描述</string>
<string name="actfm_TVA_tag_name_hint">添加列表名稱</string>
<string name="actfm_EPA_add_person_to_list_title">已被分配的工作</string>
<string name="actfm_EPA_add_person_to_list_ok">加至清單</string>
<string name="actfm_EPA_add_person_to_list_cancel">不要增加。</string>
<string name="actfm_GAA_title">選擇您要使用的Google帳戶：</string>
<string name="actfm_feat_list_clone">複製列表</string>
<string name="actfm_feat_list_suffix">（複製）</string>

24
astrid/src/main/res/values/strings-actfm.xml
Unescape Escape View File

@ -15,20 +15,6 @@
<!-- menu item to clear picture selection -->
<string name="actfm_picture_clear">Clear Picture</string>
<!-- filter list activity: refresh tags -->
<!-- Title for prompt after sharing a task -->
<string name="actfm_view_task_title">View Task?</string>
<!-- Text for prompt after sharing a task -->
<string name="actfm_view_task_text">Task was sent to %s! You\'re currently viewing your own tasks. Do you want to view this and other tasks you\'ve assigned?</string>
<!-- Ok button for task view prompt -->
<string name="actfm_view_task_ok">View Assigned</string>
<!-- Cancel button for task view prompt -->
<string name="actfm_view_task_cancel">Stay Here</string>
<!-- ================================================== TagViewActivity == -->
<!-- Tag View Activity: Add Comment hint -->
@ -58,16 +44,6 @@
<!-- slide 25d: Tag Settings: list name hint -->
<string name="actfm_TVA_tag_name_hint">Enter list name</string>
<!-- ============================================ edit people dialog == -->
<string name="actfm_EPA_add_person_to_list_title">Task assigned</string>
<string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to add %2$s to this list?</string>
<string name="actfm_EPA_add_person_to_list_ok">Add to list</string>
<string name="actfm_EPA_add_person_to_list_cancel">Don\'t add</string>
<!-- ========================================= sharing login activity == -->
<!-- share login: Google Auth title -->

Write Preview
Loading…
Cancel
Save