diff options
Diffstat (limited to 'app')
39 files changed, 250 insertions, 104 deletions
diff --git a/app/build.gradle b/app/build.gradle index 8301f6ba0..d349083be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,8 +41,8 @@ dependencies { // -------------------- // Butterknife - implementation 'com.jakewharton:butterknife:10.2.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' + implementation 'com.jakewharton:butterknife:10.2.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' // Glide implementation 'com.github.bumptech.glide:glide:4.10.0' diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java index 50510aaf8..86c305429 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java @@ -535,6 +535,11 @@ public class SyncManager { return updateCard(card); } + public MutableLiveData<FullBoard> archiveBoard(FullBoard board) { + // TODO implement + return null; + } + public MutableLiveData<FullCard> updateCard(FullCard card) { MutableLiveData<FullCard> liveData = new MutableLiveData<>(); doAsync(() -> { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java index 6ceafea12..c86eaf27a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java @@ -2,6 +2,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.helpers; import java.util.Date; import java.util.List; +import java.util.concurrent.CountDownLatch; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.api.IResponseCallback; @@ -76,21 +77,30 @@ public class SyncHelper { // Sync App -> Server public <T extends IRemoteEntity> void doUpSyncFor(AbstractSyncDataProvider<T> provider){ + doUpSyncFor(provider, null); + } + public <T extends IRemoteEntity> void doUpSyncFor(AbstractSyncDataProvider<T> provider, CountDownLatch countDownLatch){ List<T> allFromDB = provider.getAllChangedFromDB(dataBaseAdapter, accountId, lastSync); if (allFromDB != null && !allFromDB.isEmpty()) { for (T entity : allFromDB) { if (entity.getId()!=null) { if (entity.getStatusEnum() == DBStatus.LOCAL_DELETED) { provider.deleteOnServer(serverAdapter, accountId, getDeleteCallback(provider, entity), entity, dataBaseAdapter); + if (countDownLatch != null){ + countDownLatch.countDown(); + } } else { - provider.updateOnServer(serverAdapter, dataBaseAdapter, accountId, getUpdateCallback(provider, entity), entity); + provider.updateOnServer(serverAdapter, dataBaseAdapter, accountId, getUpdateCallback(provider, entity, countDownLatch), entity); } } else { - provider.createOnServer(serverAdapter, dataBaseAdapter, accountId, getUpdateCallback(provider, entity), entity); + provider.createOnServer(serverAdapter, dataBaseAdapter, accountId, getUpdateCallback(provider, entity, countDownLatch), entity); } } } else { provider.goDeeperForUpSync(this, serverAdapter, dataBaseAdapter, responseCallback); + if (countDownLatch != null){ + countDownLatch.countDown(); + } } } @@ -110,7 +120,7 @@ public class SyncHelper { }; } - private <T extends IRemoteEntity> IResponseCallback<T> getUpdateCallback(AbstractSyncDataProvider<T> provider, T entity) { + private <T extends IRemoteEntity> IResponseCallback<T> getUpdateCallback(AbstractSyncDataProvider<T> provider, T entity, CountDownLatch countDownLatch) { return new IResponseCallback<T>(account) { @Override public void onResponse(T response) { @@ -119,12 +129,18 @@ public class SyncHelper { update.setStatus(DBStatus.UP_TO_DATE.getId()); provider.updateInDB(dataBaseAdapter, accountId, update, false); provider.goDeeperForUpSync(SyncHelper.this, serverAdapter, dataBaseAdapter, responseCallback); + if (countDownLatch != null){ + countDownLatch.countDown(); + } } @Override public void onError(Throwable throwable) { super.onError(throwable); responseCallback.onError(throwable); + if (countDownLatch != null){ + countDownLatch.countDown(); + } } }; } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java index 5e5b071f1..bd13645d7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java @@ -6,7 +6,9 @@ import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.CountDownLatch; +import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.api.IResponseCallback; import it.niedermann.nextcloud.deck.model.AccessControl; import it.niedermann.nextcloud.deck.model.Board; @@ -100,10 +102,16 @@ public class BoardDataProvider extends AbstractSyncDataProvider<FullBoard> { public void goDeeperForUpSync(SyncHelper syncHelper, ServerAdapter serverAdapter, DataBaseAdapter dataBaseAdapter, IResponseCallback<Boolean> callback) { Long accountId = callback.getAccount().getId(); List<Label> locallyChangedLabels = dataBaseAdapter.getLocallyChangedLabels(accountId); + CountDownLatch countDownLatch = new CountDownLatch(locallyChangedLabels.size()); for (Label label : locallyChangedLabels) { Board board = dataBaseAdapter.getBoardByLocalIdDirectly(label.getBoardId()); label.setBoardId(board.getId()); - syncHelper.doUpSyncFor(new LabelDataProvider(this, board, Collections.singletonList(label))); + syncHelper.doUpSyncFor(new LabelDataProvider(this, board, Collections.singletonList(label)), countDownLatch); + } + try { + countDownLatch.await(); + } catch (InterruptedException e) { + DeckLog.logError(e); } List<Long> localBoardIDsWithChangedACL = dataBaseAdapter.getBoardIDsOfLocallyChangedAccessControl(accountId); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java index a1adbe389..e9f876451 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java @@ -192,21 +192,30 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { JoinCardWithLabel deletedLabel = dataBaseAdapter.getRemoteIdsForJoin(deletedLabelLocal.getCardId(), deletedLabelLocal.getLabelId()); if (deletedLabel.getStatusEnum() == DBStatus.LOCAL_DELETED){ - serverAdapter.unassignLabelFromCard(board.getId(), stack.getId(), deletedLabel.getCardId(), deletedLabel.getLabelId(), new IResponseCallback<Void>(account) { - @Override - public void onResponse(Void response) { - dataBaseAdapter.deleteJoinedLabelForCardPhysicallyByRemoteIDs(account.getId(), deletedLabel.getCardId(), deletedLabel.getLabelId()); - } - }); + if (deletedLabel.getLabelId() == null || deletedLabel.getCardId() == null) { + dataBaseAdapter.deleteJoinedLabelForCardPhysicallyByRemoteIDs(account.getId(), deletedLabel.getCardId(), deletedLabel.getLabelId()); + } else { + serverAdapter.unassignLabelFromCard(board.getId(), stack.getId(), deletedLabel.getCardId(), deletedLabel.getLabelId(), new IResponseCallback<Void>(account) { + @Override + public void onResponse(Void response) { + dataBaseAdapter.deleteJoinedLabelForCardPhysicallyByRemoteIDs(account.getId(), deletedLabel.getCardId(), deletedLabel.getLabelId()); + } + }); + } } else if (deletedLabel.getStatusEnum() == DBStatus.LOCAL_EDITED){ - //FIXME: card not created on server by sync yet, or maybe is, but the remote ID isn't available yet. what to do? - serverAdapter.assignLabelToCard(board.getId(), stack.getId(), deletedLabel.getCardId(), deletedLabel.getLabelId(), new IResponseCallback<Void>(account) { - @Override - public void onResponse(Void response) { - Label label = dataBaseAdapter.getLabelByRemoteIdDirectly(account.getId(), deletedLabel.getLabelId()); - dataBaseAdapter.setStatusForJoinCardWithLabel(card.getLocalId(), label.getLocalId(), DBStatus.UP_TO_DATE.getId()); - } - }); + if (deletedLabel.getLabelId() == null || deletedLabel.getCardId() == null) { + // Sync next time, the card should be available on server then. + continue; + } else { + serverAdapter.assignLabelToCard(board.getId(), stack.getId(), deletedLabel.getCardId(), deletedLabel.getLabelId(), new IResponseCallback<Void>(account) { + @Override + public void onResponse(Void response) { + Label label = dataBaseAdapter.getLabelByRemoteIdDirectly(account.getId(), deletedLabel.getLabelId()); + dataBaseAdapter.setStatusForJoinCardWithLabel(card.getLocalId(), label.getLocalId(), DBStatus.UP_TO_DATE.getId()); + } + }); + } + } } List<JoinCardWithUser> deletedUsers = dataBaseAdapter.getAllDeletedUserJoinsWithRemoteIDs(); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index f8ee3919a..46c42a128 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -320,7 +320,7 @@ public class MainActivity extends DrawerActivity implements break; case R.id.delete_board: new DeleteDialogBuilder(this) - .setTitle(R.string.delete_board) + .setTitle(getString(R.string.delete_something, board.getTitle())) .setMessage(R.string.delete_board_message) .setPositiveButton(R.string.simple_delete, (dialog, which) -> { if (board.getLocalId() == currentBoardId) { @@ -336,7 +336,7 @@ public class MainActivity extends DrawerActivity implements syncManager.deleteBoard(board); drawer.closeDrawer(GravityCompat.START); }) - .setNegativeButton(R.string.simple_cancel, (dialog, which) -> { + .setNegativeButton(android.R.string.cancel, (dialog, which) -> { }) .show(); break; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java index a3f64798c..56754ee64 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java @@ -91,7 +91,7 @@ public class EditBoardDialogFragment extends DialogFragment { return dialogBuilder .setView(view) - .setNegativeButton(R.string.simple_cancel, null) + .setNegativeButton(android.R.string.cancel, null) .create(); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java index c1a01d1db..43a895703 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java @@ -70,9 +70,9 @@ public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.At }); holder.deleteButton.setOnClickListener((v) -> { new DeleteDialogBuilder(context) - .setTitle(context.getString(R.string.delete_attachment, attachment.getFilename())) + .setTitle(context.getString(R.string.delete_something, attachment.getFilename())) .setMessage(R.string.attachment_delete_message) - .setNegativeButton(R.string.simple_cancel, null) + .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.simple_delete, (dialog, which) -> attachmentDeletedListener.onAttachmentDeleted(attachment)) .show(); }); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java index 1ad967397..9b89f071c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java @@ -20,8 +20,10 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; +import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.card.MaterialCardView; @@ -32,6 +34,7 @@ import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException; import com.nextcloud.android.sso.helper.SingleAccountHelper; import com.nextcloud.android.sso.model.SingleSignOnAccount; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -46,7 +49,9 @@ import it.niedermann.nextcloud.deck.model.Label; import it.niedermann.nextcloud.deck.model.User; import it.niedermann.nextcloud.deck.model.enums.DBStatus; import it.niedermann.nextcloud.deck.model.full.FullCard; +import it.niedermann.nextcloud.deck.model.full.FullStack; import it.niedermann.nextcloud.deck.persistence.sync.SyncManager; +import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper; import it.niedermann.nextcloud.deck.ui.EditActivity; import it.niedermann.nextcloud.deck.ui.helper.dnd.DraggedCardLocalState; import it.niedermann.nextcloud.deck.util.ColorUtil; @@ -72,6 +77,8 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder private final SyncManager syncManager; private final long boardId; private final boolean canEdit; + private LifecycleOwner lifecycleOwner; + private List<FullStack> availableStacks = new ArrayList<>(); @BindInt(R.integer.max_avatar_count) @@ -83,6 +90,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder public CardAdapter(long boardId, boolean canEdit, @NonNull SyncManager syncManager, @NonNull Fragment fragment) { ButterKnife.bind(this, Objects.requireNonNull(fragment.getActivity())); + this.lifecycleOwner = fragment; this.boardId = boardId; this.canEdit = canEdit; this.syncManager = syncManager; @@ -133,6 +141,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder DeckLog.log("onLongClickListener"); return true; }); + setupMoveMenu(card.getAccountId(), boardId); } viewHolder.cardTitle.setText(card.getCard().getTitle()); String description = card.getCard().getDescription(); @@ -194,6 +203,10 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder viewHolder.cardMenu.setOnClickListener(v -> onOverflowIconClicked(v, card)); } + private void setupMoveMenu(long accountId, long boardId) { + syncManager.getStacksForBoard(accountId, boardId).observe(lifecycleOwner, (stacks) -> availableStacks = stacks); + } + private void setupLabels(@NonNull ChipGroup labels, List<Label> labelList) { Chip chip; for (int i = 0; i < labelList.size(); i++) { @@ -351,6 +364,26 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder } return true; } + case R.id.action_card_move: { + CharSequence[] items = new CharSequence[availableStacks.size()]; + for (int i = 0; i < availableStacks.size(); i++) { + items[i] = availableStacks.get(i).getStack().getTitle(); + } + final FullCard newCard = card; + new AlertDialog.Builder(context) + .setSingleChoiceItems(items, 0, (dialog, which) -> { + dialog.cancel(); + newCard.getCard().setStackId(availableStacks.get(which).getStack().getLocalId()); + LiveDataHelper.observeOnce(syncManager.updateCard(newCard), lifecycleOwner, (c) -> { + // Nothing to do here... + }); + DeckLog.log("Moved card \"" + card.getCard().getTitle() + "\" to \"" + availableStacks.get(which).getStack().getTitle() + "\""); + }) + .setNegativeButton(android.R.string.cancel, null) + .setTitle(context.getString(R.string.action_card_move_title, card.getCard().getTitle())) + .show(); + return true; + } case R.id.action_card_archive: { syncManager.archiveCard(card); return true; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CommentDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CommentDialogFragment.java index 71010538f..af2239ab9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CommentDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CommentDialogFragment.java @@ -52,7 +52,7 @@ public class CommentDialogFragment extends DialogFragment { return new AlertDialog.Builder(getActivity(), Application.getAppTheme(getContext()) ? R.style.DialogDarkTheme : R.style.ThemeOverlay_AppCompat_Dialog_Alert) .setView(view) .setTitle(R.string.simple_comment) - .setNegativeButton(R.string.simple_cancel, (dialog, which) -> { + .setNegativeButton(android.R.string.cancel, (dialog, which) -> { // Do something else }) .setPositiveButton(R.string.simple_add, (dialog, which) -> addCommentListener.onCommentAdded(input.getText().toString())) diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java index bc1f3a5c2..a8d4c5f17 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java @@ -55,7 +55,7 @@ public class EditStackDialogFragment extends DialogFragment { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), Application.getAppTheme(getContext()) ? R.style.DialogDarkTheme : R.style.ThemeOverlay_AppCompat_Dialog_Alert) .setView(view) - .setNegativeButton(R.string.simple_cancel, (dialog, which) -> { + .setNegativeButton(android.R.string.cancel, (dialog, which) -> { // Do something else }); if (getArguments() == null) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5cb12593d..245587678 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" - app:description="@string/add_a_new_column_using_the_three_dots_menu" + app:description="@string/add_a_new_column_using_the_button" app:title="@string/no_columns" tools:visibility="visible" /> diff --git a/app/src/main/res/menu/card_menu.xml b/app/src/main/res/menu/card_menu.xml index 5f8fb409c..f7a57719c 100644 --- a/app/src/main/res/menu/card_menu.xml +++ b/app/src/main/res/menu/card_menu.xml @@ -10,6 +10,10 @@ android:title="@string/action_card_unassign" app:showAsAction="never" /> <item + android:id="@+id/action_card_move" + android:title="@string/action_card_move" + app:showAsAction="never" /> + <item android:id="@+id/action_card_archive" android:title="@string/action_card_archive" app:showAsAction="never" /> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 27da44528..dc4bafd9b 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Taulells</string> - <string name="simple_cancel">Cancel·la</string> <string name="simple_add">Afegeix</string> <string name="simple_save">Desa</string> <string name="edit_board">Edita el tauler</string> <string name="archive_board">Arxiva el tauler</string> <string name="delete_board">Suprimeix el tauler</string> + <string name="delete_something">Elimina %1$s</string> <!-- About --> <string name="about">Quant a</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">Voleu desar els canvis?</string> <string name="simple_discard">descarta</string> <string name="do_you_want_to_delete_the_current_column">Voleu suprimir la columna actual?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Afegiu una columna nova mitjançant el menú de tres punts.</string> <string name="add_a_new_card_using_the_button">Afegiu una targeta nova mitjançant el botó +.</string> <string name="update_deck">Actualitza el tauler</string> <string name="your_deck_version_is_too_old">La versió del tauler és massa antiga.</string> @@ -116,4 +115,9 @@ <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Necessiteu estar connectat a internet per tal d\'afegir un compte</string> <string name="simple_select">Selecciona</string> <string name="owner">Propietari</string> - </resources> + <string name="simple_comment">Comentari</string> + <string name="attachment_delete_message">Això eliminarà permanent l\'adjunció</string> + <string name="no_content">No hi ha contingut encara</string> + <string name="action_card_move">Mou la targeta</string> + <string name="action_card_move_title">Mou %1$s</string> +</resources> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 0e61bb6b8..66efea9e0 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Tabule</string> - <string name="simple_cancel">Storno</string> <string name="simple_add">Přidat</string> <string name="simple_save">Uložit</string> <string name="edit_board">Upravit tabuli</string> <string name="archive_board">Archivovat tabuli</string> <string name="delete_board">Smazat tabuli</string> + <string name="delete_something">Smazat %1$s</string> <!-- About --> <string name="about">O aplikaci</string> @@ -90,7 +90,7 @@ <string name="do_you_want_to_save_your_changes">Chcete vámi provedené změny uložit?</string> <string name="simple_discard">zahodit</string> <string name="do_you_want_to_delete_the_current_column">Chcete stávající sloupec vymazat?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Nové sloupce přidáte pomocí nabídky tři tečky.</string> + <string name="add_a_new_column_using_the_button">Pro přidání nového sloupce použijte tlačítko +</string> <string name="add_a_new_card_using_the_button">Pro přidání nové karty použijte tlačítko +</string> <string name="update_deck">Aktualizovat plochu</string> <string name="your_deck_version_is_too_old">Vámi používaná verze deck je příliš stará</string> @@ -118,5 +118,7 @@ <string name="owner">Vlastník</string> <string name="simple_comment">Komentář</string> <string name="attachment_delete_message">Toto tuto přílohu nadobro smaže.</string> - <string name="delete_attachment">Smazat %1$s</string> + <string name="no_content">Zatím žádný osah</string> + <string name="action_card_move">Přesunout kartu</string> + <string name="action_card_move_title">Přesunout %1$s</string> </resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4c93dd608..a8726ccde 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Boards</string> - <string name="simple_cancel">Abbrechen</string> <string name="simple_add">Hinzufügen</string> <string name="simple_save">Speichern</string> <string name="edit_board">Board bearbeiten</string> <string name="archive_board">Board archivieren</string> <string name="delete_board">Board löschen</string> + <string name="delete_something">Lösche %1$s</string> <!-- About --> <string name="about">Über</string> @@ -90,7 +90,7 @@ <string name="do_you_want_to_save_your_changes">Möchten Sie Ihre Änderungen speichern?</string> <string name="simple_discard">Verwerfen</string> <string name="do_you_want_to_delete_the_current_column">Soll die aktuelle Spalte gelöscht werden?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Neue Spalte mit dem Dreipunkt-Menü hinzufügen</string> + <string name="add_a_new_column_using_the_button">Eine neue Spalte mit der + Taste hinzufügen</string> <string name="add_a_new_card_using_the_button">Eine neue Karte mit der + Taste hinzufügen</string> <string name="update_deck">Deck aktualisieren</string> <string name="your_deck_version_is_too_old">Ihre Deck-Version ist zu alt</string> @@ -118,5 +118,7 @@ <string name="owner">Besitzer</string> <string name="simple_comment">Kommentar</string> <string name="attachment_delete_message">Damit wird dieser Anhang dauerhaft gelöscht.</string> - <string name="delete_attachment">%1$s löschen</string> + <string name="no_content">Bislang kein Inhalt</string> + <string name="action_card_move">Karte verschieben</string> + <string name="action_card_move_title">Verschiebe %1$s</string> </resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d682fb049..e55412b2c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Πίνακες</string> - <string name="simple_cancel">Ακύρωση</string> <string name="simple_add">Προσθήκη</string> <string name="simple_save">Αποθήκευση</string> <string name="edit_board">Επεξεργασία πίνακα</string> <string name="archive_board">Αρχειοθέτηση πίνακα</string> <string name="delete_board">Διαγραφή πίνακα</string> + <string name="delete_something">Διαγραφή %1$s</string> <!-- About --> <string name="about">Περί</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">Θέλετε να αποθηκεύσετε τις αλλαγές σας;</string> <string name="simple_discard">απόρριψη</string> <string name="do_you_want_to_delete_the_current_column">Θέλετε να διαγράψετε την τρέχουσα στήλη;</string> - <string name="add_a_new_column_using_the_three_dots_menu">Προσθέστε νέα στήλη μέσω του μενού των τριών τελειών.</string> <string name="add_a_new_card_using_the_button">Προσθέστε νέα κάρτα με το κουμπί +</string> <string name="update_deck">Ενημέρωση Deck</string> <string name="your_deck_version_is_too_old">Η έκδοσή σας είναι παλαιά.</string> @@ -118,5 +117,7 @@ <string name="owner">Κάτοχος</string> <string name="simple_comment">Σχόλιο</string> <string name="attachment_delete_message">Θα διαγραφεί μόνιμα το συνημμένο.</string> - <string name="delete_attachment">Διαγραφή %1$s</string> + <string name="no_content">Χωρίς περιεχόμενο ακόμα</string> + <string name="action_card_move">Μετακίνηση κάρτας</string> + <string name="action_card_move_title">Μετακίνηση %1$s</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 78e24e5b8..a5297cc10 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Tableros</string> - <string name="simple_cancel">Cancelar</string> <string name="simple_add">Añadir</string> <string name="simple_save">Guardar</string> <string name="edit_board">Editar tablero</string> <string name="archive_board">Archivar tablero</string> <string name="delete_board">Eliminar tablero</string> + <string name="delete_something">Borrar %1$s</string> <!-- About --> <string name="about">Acerca de</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">¿Desea guardar los cambios?</string> <string name="simple_discard">descartar</string> <string name="do_you_want_to_delete_the_current_column">¿Desea borrar la columna actual?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Añadir una nueva columna usando el menú con los tres puntos</string> <string name="add_a_new_card_using_the_button">Añadir una nueva tarjeta usando el botón +</string> <string name="update_deck">Actualizar el Deck</string> <string name="your_deck_version_is_too_old">Su versión del Deck es muy antigua </string> @@ -118,5 +117,7 @@ <string name="owner">Propietario</string> <string name="simple_comment">Comentario</string> <string name="attachment_delete_message">Esto borrará permanente el adjunto.</string> - <string name="delete_attachment">Borrar %1$s</string> + <string name="no_content">Aún no hay contenido</string> + <string name="action_card_move">Mover tarjeta</string> + <string name="action_card_move_title">Mover %1$s</string> </resources> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index ae840d68a..5ac2e9a28 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Mahaiak</string> - <string name="simple_cancel">Utzi</string> <string name="simple_add">Gehitu</string> <string name="simple_save">Gorde</string> <string name="edit_board">Editatu mahaia</string> <string name="archive_board">Artxibatu mahaia</string> <string name="delete_board">Ezabatu mahaia</string> + <string name="delete_something">Ezabatu %1$s</string> <!-- About --> <string name="about">Honi buruz</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">Zure aldaketak gorde nahi dituzu?</string> <string name="simple_discard">baztertu</string> <string name="do_you_want_to_delete_the_current_column">Zutabe hau ezabatu nahi duzu?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Gehitu zutabe berria hiru puntuen menua erabiliz.</string> <string name="add_a_new_card_using_the_button">Gehitu txartel berria + botoia erabiliz</string> <string name="update_deck">Eguneratu sorta</string> <string name="your_deck_version_is_too_old">Zure sorta bertsioa zaharregia da</string> @@ -118,5 +117,7 @@ <string name="owner">Jabea</string> <string name="simple_comment">Iruzkina</string> <string name="attachment_delete_message">Honek atxikitutako fitxategiak betirako ezabatuko ditu.</string> - <string name="delete_attachment">Ezabatu %1$s</string> + <string name="no_content">Oraindik ez dago edukirik</string> + <string name="action_card_move">Mugitu txartela</string> + <string name="action_card_move_title">Mugitu %1$s</string> </resources> diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 03d9611dd..50e2664b0 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -7,14 +7,12 @@ <!-- Simple values --> <string name="simple_boards">Taulut</string> - <string name="simple_cancel">Peru</string> <string name="simple_add">Lisää</string> <string name="simple_save">Tallenna</string> <string name="edit_board">Muokkaa taulua</string> <string name="archive_board">Arkistoi taulu</string> <string name="delete_board">Poista taulu</string> - <!-- About --> <string name="about">Tietoja</string> <string name="about_version_title">Versio</string> @@ -48,6 +46,8 @@ <string name="add_account">Lisää tili</string> <string name="label_menu">Valikko</string> + <string name="action_card_assign">Määritä kortti minulle</string> + <string name="action_card_unassign">Poista kortin määritys minulta</string> <string name="action_card_archive">Arkistoi kortti</string> <string name="action_card_delete">Poista kortti</string> <string name="add_board">Lisää taulu</string> @@ -66,6 +66,7 @@ <string name="card_edit_details">Tiedot</string> <string name="card_edit_attachments">Liitteet</string> + <string name="card_edit_activity">Tapahtumat</string> <string name="no_files_attached_to_this_card">Tähän korttiin ei ole liitetty tiedostoja.</string> <string name="attachments">Liitteet</string> <string name="no_cards">Ei kortteja vielä</string> @@ -76,7 +77,6 @@ <string name="do_you_want_to_save_your_changes">Haluatko tallentaa muutokset?</string> <string name="simple_discard">hylkää</string> <string name="do_you_want_to_delete_the_current_column">Haluatko poistaa nykyisen sarakkeen?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Lisää uusi sarake kolmen pisteen valikosta.</string> <string name="add_a_new_card_using_the_button">Lisää uusi kortti painamalla +</string> <string name="simple_update">Päivitä</string> <string name="simple_delete">Poista</string> @@ -94,4 +94,7 @@ <string name="simple_manage">hallitse</string> <string name="simple_share">jaa</string> <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Sinun tulee olla yhteydessä internetiin, jotta voit lisätä tilin.</string> + <string name="simple_select">Valitse</string> + <string name="owner">Omistaja</string> + <string name="simple_comment">Kommentti</string> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 53c55ff68..aebe86e37 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Tableaux</string> - <string name="simple_cancel">Annuler</string> <string name="simple_add">Ajouter</string> <string name="simple_save">Enregistrer</string> <string name="edit_board">Modifier le tableau</string> <string name="archive_board">Archiver le tableau</string> <string name="delete_board">Supprimer le tableau</string> + <string name="delete_something">Supprimer %1$s</string> <!-- About --> <string name="about">À propos de</string> @@ -90,7 +90,7 @@ <string name="do_you_want_to_save_your_changes">Souhaitez-vous enregistrer vos modifications ?</string> <string name="simple_discard">ignorer</string> <string name="do_you_want_to_delete_the_current_column">Souhaitez-vous supprimer la colonne actuelle ?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Ajouter une nouvelle colonne en utilisant le menu \"trois points\".</string> + <string name="add_a_new_column_using_the_button">Ajoutez une nouvelle colonne avec le bouton +</string> <string name="add_a_new_card_using_the_button">Ajouter une nouvelle carte en utilisant le bouton +.</string> <string name="update_deck">Mettre à jour Deck</string> <string name="your_deck_version_is_too_old">Votre version de Deck est trop ancienne</string> @@ -119,5 +119,7 @@ <string name="owner">Propriétaire</string> <string name="simple_comment">Commenter</string> <string name="attachment_delete_message">Cette action supprimera définitivement le fichier joint.</string> - <string name="delete_attachment">Supprimer %1$s</string> + <string name="no_content">Aucun contenu pour l\'instant</string> + <string name="action_card_move">Déplacer la carte</string> + <string name="action_card_move_title">Déplacer %1$s</string> </resources> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f0d847ea7..4120a659a 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Taboleiros</string> - <string name="simple_cancel">Cancelar</string> <string name="simple_add">Engadir</string> <string name="simple_save">Gardar</string> <string name="edit_board">Editar taboleiro</string> <string name="archive_board">Arquivar taboleiro</string> <string name="delete_board">Eliminar taboleiro</string> + <string name="delete_something">Eliminar %1$s</string> <!-- About --> <string name="about">Sobre</string> @@ -90,7 +90,7 @@ <string name="do_you_want_to_save_your_changes">Confirma que quere gardar os cambios?</string> <string name="simple_discard">desbotar</string> <string name="do_you_want_to_delete_the_current_column">Confirma que quere eliminar a columna actual?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Engadir unha columna nova co menú de tres puntos.</string> + <string name="add_a_new_column_using_the_button">Engadir unha nova columna co botón +</string> <string name="add_a_new_card_using_the_button">Engadir unha nova tarxeta co botón +</string> <string name="update_deck">Actualizar o Deck</string> <string name="your_deck_version_is_too_old">A versión do Deck é antiga de máis.</string> @@ -118,5 +118,7 @@ <string name="owner">Propietario</string> <string name="simple_comment">Comentario</string> <string name="attachment_delete_message">Isto eliminará este anexo de xeito permanente.</string> - <string name="delete_attachment">Eliminar %1$s</string> + <string name="no_content">Aínda non hai contido</string> + <string name="action_card_move">Mover a tarxeta</string> + <string name="action_card_move_title">Mover %1$s</string> </resources> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 473c0f09d..da6458d8a 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -10,14 +10,12 @@ <!-- Simple values --> <string name="simple_boards">Ploče</string> - <string name="simple_cancel">Odustani</string> <string name="simple_add">Dodaj</string> <string name="simple_save">Spremi</string> <string name="edit_board">Uredi ploču</string> <string name="archive_board">Arhiviraj ploču</string> <string name="delete_board">Izbriši ploču</string> - <!-- About --> <string name="about">Informacije</string> <string name="about_version_title">Inačica</string> @@ -90,7 +88,6 @@ <string name="do_you_want_to_save_your_changes">Želite li spremiti promjene?</string> <string name="simple_discard">odbaci</string> <string name="do_you_want_to_delete_the_current_column">Želite li izbrisati trenutni stupac?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Dodaj novi stupac putem izbornika označenog s tri točkice.</string> <string name="add_a_new_card_using_the_button">Dodaj novu karticu s pomoću gumba +</string> <string name="update_deck">Ažuriraj Deck</string> <string name="your_deck_version_is_too_old">Vaša inačica Decka je prestara</string> @@ -116,4 +113,5 @@ <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Trebate uspostaviti internetsku vezu za dodavanje računa.</string> <string name="simple_select">Odaberi</string> <string name="owner">Vlasnik</string> + <string name="simple_comment">Komentar</string> </resources> diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index c4e2bb670..4dccc533a 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -10,14 +10,12 @@ <!-- Simple values --> <string name="simple_boards">Táblák</string> - <string name="simple_cancel">Mégse</string> <string name="simple_add">Hozzáadás</string> <string name="simple_save">Mentés</string> <string name="edit_board">Tábla szerkesztése</string> <string name="archive_board">Tábla archiválása</string> <string name="delete_board">Tábla törlése</string> - <!-- About --> <string name="about">Névjegy</string> <string name="about_version_title">Verzió</string> @@ -90,7 +88,6 @@ <string name="do_you_want_to_save_your_changes">Biztos, hogy menti a változásokat?</string> <string name="simple_discard">elvetés</string> <string name="do_you_want_to_delete_the_current_column">Biztos, hogy törli a jelenlegi oszlopot?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Új oszlop hozzáadása a három pontos menü segítségével.</string> <string name="add_a_new_card_using_the_button">Új kártya hozzáadása a + gombbal</string> <string name="update_deck">Kártyák frissítése</string> <string name="your_deck_version_is_too_old">A Kártyák verziója túl régi</string> @@ -116,4 +113,5 @@ <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Internetkapcsolatra van szükség, hogy fiókot adjon hozzá.</string> <string name="simple_select">Kiválasztás</string> <string name="owner">Tulajdonos</string> + <string name="simple_comment">Megjegyzés</string> </resources> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 22b476034..27d782f76 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Borð</string> - <string name="simple_cancel">Hætta við</string> <string name="simple_add">Bæta við</string> <string name="simple_save">Vista</string> <string name="edit_board">Breyta borði</string> <string name="archive_board">Setja borð í geymslu</string> <string name="delete_board">Eyða borði</string> + <string name="delete_something">Eyða %1$s</string> <!-- About --> <string name="about">Um hugbúnaðinn</string> @@ -110,5 +110,4 @@ <string name="owner">Eigandi</string> <string name="simple_comment">Athugasemd</string> <string name="attachment_delete_message">Þetta mun eyða þessu viðhengi varanlega.</string> - <string name="delete_attachment">Eyða %1$s</string> -</resources> + </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6d235968c..b8df7f958 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Lavagne</string> - <string name="simple_cancel">Annulla</string> <string name="simple_add">Aggiungi</string> <string name="simple_save">Salva</string> <string name="edit_board">Modifica lavagna</string> <string name="archive_board">Archivia lavagna</string> <string name="delete_board">Elimina lavagna</string> + <string name="delete_something">Elimina %1$s</string> <!-- About --> <string name="about">Informazioni</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">Vuoi salvare le tue modifiche?</string> <string name="simple_discard">scarta</string> <string name="do_you_want_to_delete_the_current_column">Vuoi eliminare la colonna attuale?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Aggiungi una nuova colonna utilizzando il menu a tre punti.</string> <string name="add_a_new_card_using_the_button">Aggiungi una nuova scheda utilizzando il pulsante +</string> <string name="update_deck">Aggiorna Deck</string> <string name="your_deck_version_is_too_old">La tua versione di Deck è troppo datata</string> @@ -118,5 +117,7 @@ <string name="owner">Proprietario</string> <string name="simple_comment">Commento</string> <string name="attachment_delete_message">Questo eliminerà definitivamente questo allegato.</string> - <string name="delete_attachment">Elimina %1$s</string> + <string name="no_content">Ancora nessun contenuto</string> + <string name="action_card_move">Sposta scheda</string> + <string name="action_card_move_title">Sposta %1$s</string> </resources> diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 4688f731c..1afc93083 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">ボード</string> - <string name="simple_cancel">キャンセル</string> <string name="simple_add">追加</string> <string name="simple_save">保存</string> <string name="edit_board">ボードを編集</string> <string name="archive_board">ボードをアーカイブ</string> <string name="delete_board">ボードを削除</string> + <string name="delete_something">%1$sを削除</string> <!-- About --> <string name="about">バージョン情報</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">変更を保存しますか？</string> <string name="simple_discard">破棄</string> <string name="do_you_want_to_delete_the_current_column">現在の列を削除しますか？</string> - <string name="add_a_new_column_using_the_three_dots_menu">三本線メニューから新しい列を追加してください．</string> <string name="add_a_new_card_using_the_button">+ボタンで新しいカードを追加</string> <string name="update_deck">端末の更新</string> <string name="your_deck_version_is_too_old">端末のバージョンが旧すぎます</string> @@ -116,4 +115,9 @@ <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">アカウントの追加にはインターネットへの接続が必要です</string> <string name="simple_select">選択</string> <string name="owner">所有者</string> - </resources> + <string name="simple_comment">コメント</string> + <string name="attachment_delete_message">これにより、この添付ファイルは完全に削除されます。</string> + <string name="no_content">コンテンツはまだありません</string> + <string name="action_card_move">カードの移動</string> + <string name="action_card_move_title">%1$sを移動</string> +</resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 970707004..f168db1e8 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -10,14 +10,12 @@ <!-- Simple values --> <string name="simple_boards">게시판</string> - <string name="simple_cancel">취소</string> <string name="simple_add">추가</string> <string name="simple_save">저장</string> <string name="edit_board">게시판 편집</string> <string name="archive_board">게시판 보관</string> <string name="delete_board">게시판 삭제</string> - <!-- About --> <string name="about">정보</string> <string name="about_version_title">버전</string> @@ -89,11 +87,19 @@ <string name="do_you_want_to_save_your_changes">변경된 사항을 저장하시겠습니까?</string> <string name="simple_discard">무시</string> <string name="do_you_want_to_delete_the_current_column">선택된 열을 지우시겠습니까?</string> - <string name="add_a_new_column_using_the_three_dots_menu">⋮ 메뉴를 통하여 새 열을 만드십시오.</string> <string name="add_a_new_card_using_the_button">더하기 버튼을 사용하여 새 카드를 추가하십시오.</string> <string name="update_deck">덱 업데이트하기</string> <string name="your_deck_version_is_too_old">덱 버전이 너무 오래되었습니다.</string> <string name="deck_outdated_please_update">덱 버전이 너무 오래되었습니다. 안드로이드 클라이언트를 사용하기 위해서는 업데이트가 필요합니다.</string> <string name="simple_update">업데이트</string> <string name="simple_delete">삭제</string> + <string name="simple_rename">이름 바꾸기</string> + <string name="simple_settings">설정</string> + <string name="settings_theme_title">어두운 테마</string> + <string name="pref_value_theme_light">밝게</string> + <string name="simple_undo">실행 취소</string> + <string name="simple_share">공유</string> + <string name="simple_select">선택</string> + <string name="owner">Owner</string> + <string name="simple_comment">설명</string> </resources> diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index 5e038dd9a..cab14315f 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -7,13 +7,13 @@ <!-- Simple values --> <string name="simple_boards">Plokštės</string> - <string name="simple_cancel">Atsisakyti</string> <string name="simple_add">Pridėti</string> <string name="simple_save">Įrašyti</string> <string name="edit_board">Taisyti plokštę</string> <string name="archive_board">Archyvuoti plokštę</string> <string name="delete_board">Ištrinti plokštę</string> + <string name="delete_something">Ištrinti %1$s</string> <!-- About --> <string name="about">Apie</string> @@ -26,12 +26,14 @@ <string name="about_translators_transifex_label">Transifex</string> <string name="about_testers_title">Testuotojai</string> <string name="about_source_title">Pradinis kodas</string> + <string name="about_issues_title">Problemos</string> <string name="about_translate_title">Versti</string> <string name="about_app_license_title">Programėlės licencija</string> <string name="about_app_license">Ši programėlė yra licencijuota pagal GNU BENDRĄJĄ VIEŠĄJĄ LICENCIJĄ v3+.</string> <string name="about_app_license_button">Rodyti licenciją</string> <string name="about_icons_disclaimer_title">Piktogramos</string> <string name="about_credits_tab_title">Padėkos</string> + <string name="about_contribution_tab_title">Prisidėjo</string> <string name="about_license_tab_title">Licencija</string> <string name="seconds_ago">prieš keletą sekundžių</string> @@ -59,6 +61,7 @@ <string name="label_add">Pridėti %1$s</string> <string name="error">Atsirado klaida</string> + <string name="simple_copy">kopija</string> <string name="simple_exception">Išimtis</string> <string name="copied_to_clipboard">Nukopijuota į iškarpinę</string> <string name="simple_close">užverti</string> @@ -70,6 +73,7 @@ <string name="no_files_attached_to_this_card">Prie šios kortelės nėra jokių pridėtų priedų.</string> <string name="attachments">Priedai</string> <string name="no_cards">Kol kas kortelių nėra</string> + <string name="no_account">Nėra sukonfiguruotų paskyrų</string> <string name="account_already_added">Paskyra jau pridėta</string> <string name="no_columns">Kol kas stulpelių nėra</string> <string name="do_you_want_to_save_your_changes">Ar norite įrašyti savo pakeitimus?</string> @@ -85,6 +89,8 @@ <string name="simple_rename">Pervadinti</string> <string name="simple_settings">Nustatymai</string> <string name="settings_theme_title">Tamsus apipavidalinimas</string> + <string name="pref_value_wifi_and_mobile">Sinchronizuoti naudojant belaidį (Wi-Fi) ir mobiliuosius duomenis</string> + <string name="pref_value_wifi_only">Sinchronizuoti tik naudojant belaidį (Wi-Fi)</string> <string name="pref_value_theme_light">Šviesus</string> <string name="simple_undo">Atšaukti</string> <string name="rename_column">Pervadinti stulpelį</string> @@ -96,5 +102,7 @@ <string name="owner">Savininkas</string> <string name="simple_comment">Komentaras</string> <string name="attachment_delete_message">Tai negrįžtamai ištrins šį priedą.</string> - <string name="delete_attachment">Ištrinti %1$s</string> + <string name="no_content">Kol kas nėra jokio turinio</string> + <string name="action_card_move">Perkelti kortelę</string> + <string name="action_card_move_title">Perkelti %1$s</string> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d81bb7861..a3b700527 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -10,14 +10,12 @@ <!-- Simple values --> <string name="simple_boards">Bord</string> - <string name="simple_cancel">Annuleren</string> <string name="simple_add">Toevoegen</string> <string name="simple_save">Bewaren</string> <string name="edit_board">Pas canvas aan</string> <string name="archive_board">Archiveer canvas</string> <string name="delete_board">Verwijder canvas</string> - <!-- About --> <string name="about">Over</string> <string name="about_version_title">Versie</string> @@ -90,7 +88,6 @@ <string name="do_you_want_to_save_your_changes">Wil je de wijzigingen opslaan?</string> <string name="simple_discard">weggooien</string> <string name="do_you_want_to_delete_the_current_column">Wil je de huidige kolom verwijderen?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Voeg een nieuwe kolom toe via de menuknop (3 stippen)</string> <string name="add_a_new_card_using_the_button">Voeg een nieuwe kaart toe met de \'+\' knop</string> <string name="update_deck">Werk deck bij</string> <string name="your_deck_version_is_too_old">Uw deck versie is te oud</string> @@ -115,4 +112,6 @@ <string name="simple_share">deel</string> <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">U moet verbonden zijn met het Internet om een account toe te voegen.</string> <string name="simple_select">Selecteer</string> + <string name="owner">Eigenaar</string> + <string name="simple_comment">Reactie</string> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fb611792c..6a69174ab 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Tablice</string> - <string name="simple_cancel">Anuluj</string> <string name="simple_add">Dodaj</string> <string name="simple_save">Zapisz</string> <string name="edit_board">Edytuj tablicę</string> <string name="archive_board">Zarchiwizuj tablicę</string> <string name="delete_board">Usuń tablicę</string> + <string name="delete_something">Usuń %1$s</string> <!-- About --> <string name="about">O aplikacji</string> @@ -90,7 +90,7 @@ <string name="do_you_want_to_save_your_changes">Czy chcesz zachować zmiany?</string> <string name="simple_discard">odrzuć</string> <string name="do_you_want_to_delete_the_current_column">Czy chcesz usunąć bieżącą kolumnę?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Dodaj nową kolumnę za pomocą menu trzech kropek.</string> + <string name="add_a_new_column_using_the_button">Dodaj nową kolumnę za pomocą przycisku +</string> <string name="add_a_new_card_using_the_button">Dodaj nową kartę za pomocą przycisku +.</string> <string name="update_deck">Zaktualizuj deck</string> <string name="your_deck_version_is_too_old">Twoja wersja deck jest nieaktualna</string> @@ -118,5 +118,7 @@ <string name="owner">Właściciel</string> <string name="simple_comment">Komentarz</string> <string name="attachment_delete_message">Spowoduje to trwałe usunięcie tego załącznika.</string> - <string name="delete_attachment">Usuń %1$s</string> + <string name="no_content">Brak treści</string> + <string name="action_card_move">Przenieś kartę</string> + <string name="action_card_move_title">Przenieś %1$s</string> </resources> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f6b43d94f..113b20c63 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Painéis</string> - <string name="simple_cancel">Cancelar</string> <string name="simple_add">Adicionar</string> <string name="simple_save">Salvar</string> <string name="edit_board">Editar o painel</string> <string name="archive_board">Arquivar o painel</string> <string name="delete_board">Excluir o painel</string> + <string name="delete_something">Excluir %1$s</string> <!-- About --> <string name="about">Sobre</string> @@ -90,7 +90,7 @@ <string name="do_you_want_to_save_your_changes">Quer salvar suas alterações?</string> <string name="simple_discard">descartar</string> <string name="do_you_want_to_delete_the_current_column">Quer excluir a coluna atual?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Adicionar uma nova coluna usando o menu de três pontos.</string> + <string name="add_a_new_column_using_the_button">Adicione uma nova coluna usando o botão +</string> <string name="add_a_new_card_using_the_button">Adicionar um novo cartão usando o botão +</string> <string name="update_deck">Atualizar o dock</string> <string name="your_deck_version_is_too_old">Sua versão do dock é muito antiga.</string> @@ -118,5 +118,7 @@ <string name="owner">Proprietário</string> <string name="simple_comment">Comentário</string> <string name="attachment_delete_message">Isso excluirá permanentemente este anexo.</string> - <string name="delete_attachment">Excluir %1$s</string> + <string name="no_content">Sem contexto ainda</string> + <string name="action_card_move">Move cartão</string> + <string name="action_card_move_title">Mover %1$s</string> </resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 872bb3caa..90c4d886b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -10,13 +10,12 @@ <!-- Simple values --> <string name="simple_boards">Рабочие доски</string> - <string name="simple_cancel">Отмена</string> + <string name="simple_add">Добавить</string> <string name="simple_save">Сохранить</string> <string name="edit_board">Редактировать доску</string> <string name="archive_board">Переместить доску в архив</string> <string name="delete_board">Удалить доску</string> - <!-- About --> <string name="about">О программе</string> <string name="about_version_title">Версия</string> @@ -50,6 +49,9 @@ <string name="hint_assign_people">Назначить карточку пользователю</string> <string name="hint_due_date_date">Срок исполнения</string> <string name="activity">Событие</string> + <string name="add_card">Создать карточку</string> + <string name="add_column">Добавить колонку</string> + <string name="add_account">Добавить аккаунт</string> <string name="label_menu">Меню</string> @@ -74,4 +76,21 @@ <string name="card_edit_attachments">Вложения</string> <string name="card_edit_activity">События</string> <string name="about_server_app_version_text">Версия приложения на сервере:</string> + <string name="attachments">Вложения</string> + <string name="no_account">Учётная запись не настроена</string> + <string name="account_already_added">Учётная запись уже добавлена</string> + <string name="simple_update">Обновить</string> + <string name="simple_delete">Удалить</string> + <string name="simple_rename">Переименовать</string> + <string name="simple_settings">Параметры</string> + <string name="settings_theme_title">Тёмное оформление</string> + <string name="pref_value_wifi_and_mobile">Синхр. по Wi-Fi и мобильной связи</string> + <string name="pref_value_wifi_only">Синхр. только по Wi-Fi</string> + <string name="pref_value_theme_light">Светлый</string> + <string name="simple_undo">Отменить</string> + <string name="share_board">Поделиться</string> + <string name="simple_share">общий ресурс</string> + <string name="simple_select">Выбрать</string> + <string name="owner">Владелец</string> + <string name="simple_comment">Коментарий</string> </resources> diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 49f801f7c..8d2e57b77 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Zbirke</string> - <string name="simple_cancel">Prekliči</string> <string name="simple_add">Dodaj</string> <string name="simple_save">Shrani</string> <string name="edit_board">Uredi zbirko</string> <string name="archive_board">Arhiviraj zbirko</string> <string name="delete_board">Izbriši zbirko</string> + <string name="delete_something">Izbriši %1$s</string> <!-- About --> <string name="about">O programu</string> @@ -90,7 +90,7 @@ <string name="do_you_want_to_save_your_changes">Ali želite shraniti spremembe?</string> <string name="simple_discard">opusti</string> <string name="do_you_want_to_delete_the_current_column">Ali želite izbrisati trenutni paket?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Nov paket je mogoče dodati prek menija treh pik.</string> + <string name="add_a_new_column_using_the_button">Dodaj stolpec z pritiskom na gumb +</string> <string name="add_a_new_card_using_the_button">Novo nalogo je mogoče dodati z gumbom +</string> <string name="update_deck">Posodobi zbirko</string> <string name="your_deck_version_is_too_old">Različica zbirke je prestara</string> @@ -116,4 +116,9 @@ <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Za dodajanje računa mora biti vzpostavljena povezava z omrežjem.</string> <string name="simple_select">Izbor</string> <string name="owner">Lastnik</string> - </resources> + <string name="simple_comment">Opomba</string> + <string name="attachment_delete_message">S tem boste trajno izbrisali prilogo.</string> + <string name="no_content">Ni še dodane vsebine</string> + <string name="action_card_move">Premakni nalogo</string> + <string name="action_card_move_title">Premakni %1$s</string> +</resources> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 08e0ec613..dd40d4a6b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Табле</string> - <string name="simple_cancel">Поништи</string> <string name="simple_add">Додај</string> <string name="simple_save">Сачувај</string> <string name="edit_board">Измени таблу</string> <string name="archive_board">Архивирај таблу</string> <string name="delete_board">Избриши таблу</string> + <string name="delete_something">Обриши %1$s</string> <!-- About --> <string name="about">О програму</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">Да ли желите да сачувате измене?</string> <string name="simple_discard">одбаци</string> <string name="do_you_want_to_delete_the_current_column">Да ли желите да обришете тренутну колону?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Додајте нову колону користећи мени са три тачке.</string> <string name="add_a_new_card_using_the_button">Додајте нову картицу на + дугме</string> <string name="update_deck">Ажурирај шпил</string> <string name="your_deck_version_is_too_old">Верзија Ваше Deck апликације је превише стара</string> @@ -116,4 +115,9 @@ <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Морате бити повезани са интернетом да би сте додали налог.</string> <string name="simple_select">Обележи</string> <string name="owner">Власник</string> - </resources> + <string name="simple_comment">Коментар</string> + <string name="attachment_delete_message">Ово ће заувек обрисати овај прилог.</string> + <string name="no_content">Још нема садржаја</string> + <string name="action_card_move">Премести картицу</string> + <string name="action_card_move_title">Премести %1$s</string> +</resources> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 92a1e2b11..d389566fd 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -9,13 +9,13 @@ <!-- Simple values --> <string name="simple_boards">Tavlor</string> - <string name="simple_cancel">Avbryt</string> <string name="simple_add">Lägg till</string> <string name="simple_save">Spara</string> <string name="edit_board">Ändra tavla</string> <string name="archive_board">Arkivera tavla</string> <string name="delete_board">Radera tavla</string> + <string name="delete_something">Radera %1$s</string> <!-- About --> <string name="about">Om</string> @@ -88,7 +88,7 @@ <string name="do_you_want_to_save_your_changes">Vill du spara dina ändringar?</string> <string name="simple_discard">kassera</string> <string name="do_you_want_to_delete_the_current_column">Vill du ta bort den aktuella kolumnen?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Lägg till en ny kolumn med hjälp av menyn med tre punkter.</string> + <string name="add_a_new_column_using_the_button">Lägg till en ny kolumn med + knappen</string> <string name="add_a_new_card_using_the_button">Lägg till ett nytt kort med + knappen</string> <string name="update_deck">Uppdatera Deck</string> <string name="your_deck_version_is_too_old">Din version är för gammal</string> @@ -116,5 +116,7 @@ <string name="owner">Ägare</string> <string name="simple_comment">Kommentar</string> <string name="attachment_delete_message">Detta kommer att radera den här bilagan permanent.</string> - <string name="delete_attachment">Radera %1$s</string> + <string name="no_content">Inget innehåll än</string> + <string name="action_card_move">Flytta kort</string> + <string name="action_card_move_title">Flytta %1$s</string> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 14dd15703..47d0fc6cc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">Katlar</string> - <string name="simple_cancel">İptal</string> <string name="simple_add">Ekle</string> <string name="simple_save">Kaydet</string> <string name="edit_board">Panoyu düzenle</string> <string name="archive_board">Panoyu arşivle</string> <string name="delete_board">Panoyu sil</string> + <string name="delete_something">%1$s Sil</string> <!-- About --> <string name="about">Hakkında</string> @@ -90,7 +90,6 @@ <string name="do_you_want_to_save_your_changes">Değişiklikleri kaydetmek ister misiniz?</string> <string name="simple_discard">yok say</string> <string name="do_you_want_to_delete_the_current_column">Geçerli sütunu silmek istiyor musunuz?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Üç nokta menüsünü kullanarak yeni bir sütun ekleyebilirsiniz.</string> <string name="add_a_new_card_using_the_button">+ düğmesini kullanarak yeni bir kart ekleyebilirsiniz</string> <string name="update_deck">Tahtayı güncelle</string> <string name="your_deck_version_is_too_old">Tahta sürümünüz çok eski</string> @@ -118,5 +117,7 @@ <string name="owner">Sahibi</string> <string name="simple_comment">Açıklama</string> <string name="attachment_delete_message">Bu işlem bu ek dosyasını silecek.</string> - <string name="delete_attachment">%1$s sil</string> + <string name="no_content">Henüz bir içerik yok</string> + <string name="action_card_move">Kartı taşı</string> + <string name="action_card_move_title">%1$s Taşı</string> </resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a9b329ec1..eba51d96b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -10,13 +10,13 @@ <!-- Simple values --> <string name="simple_boards">面板</string> - <string name="simple_cancel">取消</string> <string name="simple_add">添加</string> <string name="simple_save">保存</string> <string name="edit_board">编辑面板</string> <string name="archive_board">归档面板</string> <string name="delete_board">删除面板</string> + <string name="delete_something">删除 %1$s</string> <!-- About --> <string name="about">关于</string> @@ -83,14 +83,14 @@ <string name="attachments">附件</string> <string name="no_cards">暂无卡片</string> <string name="no_account">没有已配置的账号</string> - <string name="account_already_added">账户已被添加</string> - <string name="account_is_getting_imported">账户已导出</string> + <string name="account_already_added">账号已被添加</string> + <string name="account_is_getting_imported">账号已被导入</string> <string name="not_synced_yet">尚未同步</string> <string name="no_columns">暂无列</string> <string name="do_you_want_to_save_your_changes">您希望保存变更吗？</string> <string name="simple_discard">丢弃</string> <string name="do_you_want_to_delete_the_current_column">您希望删除当前的栏吗？</string> - <string name="add_a_new_column_using_the_three_dots_menu">使用三点目录来添加新列</string> + <string name="add_a_new_column_using_the_button">使用 + 按钮添加新一列</string> <string name="add_a_new_card_using_the_button">使用 + 按钮来创建一张卡片</string> <string name="update_deck">更新deck</string> <string name="your_deck_version_is_too_old">您deck的版本过旧</string> @@ -118,5 +118,7 @@ <string name="owner">拥有者</string> <string name="simple_comment">注释</string> <string name="attachment_delete_message">这将永久删除此附件。</string> - <string name="delete_attachment">删除 %1$s</string> + <string name="no_content">暂无内容</string> + <string name="action_card_move">移动卡片</string> + <string name="action_card_move_title">移动%1$s</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 35d8f2eb5..1207ed33e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,6 +19,7 @@ <string name="edit_board">Edit board</string> <string name="archive_board">Archive board</string> <string name="delete_board">Delete board</string> + <string name="delete_something">Delete %1$s</string> <!-- About --> <string name="about">About</string> @@ -118,7 +119,7 @@ <string name="do_you_want_to_save_your_changes">Do you want to save your changes?</string> <string name="simple_discard">discard</string> <string name="do_you_want_to_delete_the_current_column">Do you want to delete the current column?</string> - <string name="add_a_new_column_using_the_three_dots_menu">Add a new column using the three dots menu.</string> + <string name="add_a_new_column_using_the_button">Add a new column using the + button</string> <string name="add_a_new_card_using_the_button">Add a new card using the + button</string> <string name="update_deck">Update deck</string> <string name="your_deck_version_is_too_old">Your deck version is too old</string> @@ -154,4 +155,6 @@ <string name="minutes_15">15 Minutes</string> <string name="hour_1">1 Hour</string> <string name="hours_6">6 Hours</string> + <string name="action_card_move">Move card</string> + <string name="action_card_move_title">Move %1$s</string> </resources> |