From d4183ef72e8751b4bf0c992231df461854a4fc3b Mon Sep 17 00:00:00 2001 From: Li Guanglin <60415467+guanglinn@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:04:45 +0800 Subject: [PATCH 1/7] Add Em Space special key for paragraph indent (#2400) --- .../markor/format/ActionButtonBase.java | 18 ++++---- app/src/main/res/values/arrays.xml | 11 ++--- .../res/values/string-not_translatable.xml | 44 +++++++++---------- app/src/main/res/values/strings.xml | 11 +++-- 4 files changed, 44 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java index d81443524a..13802e5164 100644 --- a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java +++ b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java @@ -966,32 +966,34 @@ public void runSpecialKeyAction() { _hlEditor.simulateKeyPress(KeyEvent.KEYCODE_MOVE_END); } else if (callbackPayload.equals(rstr(R.string.key_pos_1_document))) { _hlEditor.setSelection(0); + } else if (callbackPayload.equals(rstr(R.string.key_pos_end_document))) { + _hlEditor.setSelection(_hlEditor.length()); } else if (callbackPayload.equals(rstr(R.string.move_text_one_line_up))) { ActionButtonBase.moveLineSelectionBy1(_hlEditor, true); } else if (callbackPayload.equals(rstr(R.string.move_text_one_line_down))) { ActionButtonBase.moveLineSelectionBy1(_hlEditor, false); - } else if (callbackPayload.equals(rstr(R.string.key_pos_end_document))) { - _hlEditor.setSelection(_hlEditor.length()); + } else if (callbackPayload.equals(rstr(R.string.select_current_line))) { + selectWholeLines(_hlEditor.getText()); } else if (callbackPayload.equals(rstr(R.string.key_ctrl_a))) { _hlEditor.setSelection(0, _hlEditor.length()); } else if (callbackPayload.equals(rstr(R.string.key_tab))) { _hlEditor.insertOrReplaceTextOnCursor("\u0009"); } else if (callbackPayload.equals(rstr(R.string.zero_width_space))) { _hlEditor.insertOrReplaceTextOnCursor("\u200B"); - } else if (callbackPayload.equals(rstr(R.string.search))) { - onSearch(); + } else if (callbackPayload.equals(rstr(R.string.em_space))) { + _hlEditor.insertOrReplaceTextOnCursor("\u2003"); } else if (callbackPayload.equals(rstr(R.string.break_page_pdf_print))) { _hlEditor.insertOrReplaceTextOnCursor("
"); + } else if (callbackPayload.equals(rstr(R.string.search))) { + onSearch(); } else if (callbackPayload.equals(rstr(R.string.ohm))) { _hlEditor.insertOrReplaceTextOnCursor("Ω"); + } else if (callbackPayload.equals(rstr(R.string.char_punctation_mark_arrows))) { + _hlEditor.insertOrReplaceTextOnCursor("»«"); } else if (callbackPayload.equals(rstr(R.string.continued_overline))) { _hlEditor.insertOrReplaceTextOnCursor("‾‾‾‾‾"); } else if (callbackPayload.equals(rstr(R.string.shrug))) { _hlEditor.insertOrReplaceTextOnCursor("¯\\_(ツ)_/¯"); - } else if (callbackPayload.equals(rstr(R.string.char_punctation_mark_arrows))) { - _hlEditor.insertOrReplaceTextOnCursor("»«"); - } else if (callbackPayload.equals(rstr(R.string.select_current_line))) { - selectWholeLines(_hlEditor.getText()); } }); } diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index f50ee08d0d..5c1941b552 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -52,20 +52,21 @@ @string/key_page_down @string/key_pos_1 @string/key_pos_end - @string/move_text_one_line_up - @string/move_text_one_line_down @string/key_pos_1_document @string/key_pos_end_document + @string/move_text_one_line_up + @string/move_text_one_line_down + @string/select_current_line @string/key_ctrl_a @string/key_tab - @string/search @string/zero_width_space + @string/em_space @string/break_page_pdf_print + @string/search @string/ohm @string/char_punctation_mark_arrows - @string/shrug @string/continued_overline - @string/select_current_line + @string/shrug diff --git a/app/src/main/res/values/string-not_translatable.xml b/app/src/main/res/values/string-not_translatable.xml index d816e37b5e..c6d32d2613 100644 --- a/app/src/main/res/values/string-not_translatable.xml +++ b/app/src/main/res/values/string-not_translatable.xml @@ -35,7 +35,6 @@ work. If not, see . Front Matter MIME type - Community sans-serif-regular Start QuickNote @@ -294,38 +293,38 @@ work. If not, see . - role - underline - role - overline - role - linethrough - role - nobreak - role - nowrap - role - prewrap + role - underline + role - overline + role - linethrough + role - nobreak + role - nowrap + role - prewrap - inline - highlight + inline - highlight - inline - subscript - inline - superscript + inline - subscript + inline - superscript - block - comment - block - example - block - listing - block - literal - block - open - block - sidebar - block - table - block - pass - block - quote - - block - code + block - comment + block - example + block - listing + block - literal + block - open + block - sidebar + block - table + block - pass + block - quote + + block - code block - collapsible break - thematic - break - page + break - page abid_wikitext_h1 @@ -390,7 +389,6 @@ work. If not, see . pref_key__new_file_dialog_lastused_extension pref_key__new_file_dialog_lastused_type pref_key__file_browser_last_browsed_folder - Select current line(s) pref_key__file_description_format pref_key__wikitext_bigger_headings pref_key__asciidoc_bigger_headings diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 376e9a968f..bc1786c8ad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -191,15 +191,18 @@ work. If not, see . Special AsciiDoc Content Page Up (Page Up) Page Down (Page Down) - Move text one line up - Move text one line down - Start new line below Line Start (Pos Home) Line End (Pos End) Document Start Document End + Move line up + Move line down + Start new line + Select current line Select all (Ctrl+A) Tabulator + Zero-width space + Em space (&emsp;) Start on bottom Upon loading a document, position cursor at its end Unordered list character @@ -243,6 +246,7 @@ work. If not, see . Project License Contribute code to the project. Everybody is welcome to do so, including newcomers Project Team + Community Show contributor info. Provide it to be shown here on an opt-in basis after contributing descending @@ -274,7 +278,6 @@ work. If not, see . No calendar app is installed! Popular documents Color - Zero-width space Basic color scheme Changes background and foreground color of the text editor. Adjusts to app theme so available in light and dark theme. Syntax highlighting colors remain the same. Preset From 169664fc27a145e9feeea600ff91ecd018e11059 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Wed, 18 Sep 2024 17:39:53 -0700 Subject: [PATCH 2/7] Fix how multiple windows are launched (PR #2419) --- app/src/main/AndroidManifest.xml | 2 +- .../markor/activity/DocumentActivity.java | 24 +++++++++++-------- .../widget/WrMarkorWidgetProvider.java | 2 ++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7f5d71a89e..e92e542793 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -62,7 +62,7 @@ android:name=".activity.MainActivity" android:exported="true" android:label="@string/app_name" - android:launchMode="standard" + android:launchMode="singleTask" android:taskAffinity=".activity.MainActivity" android:windowSoftInputMode="stateUnchanged|adjustResize"> diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java b/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java index 3fe3413c7d..fd563564b9 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java @@ -90,23 +90,27 @@ private static void launch( final Intent intent; if (GsFileBrowserListAdapter.isVirtualFolder(file) || file.isDirectory()) { intent = new Intent(activity, MainActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); } else { intent = new Intent(activity, DocumentActivity.class); - } - intent.putExtra(Document.EXTRA_FILE, file); + if (!(activity instanceof DocumentActivity) && + Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && + as.isMultiWindowEnabled() + ) { + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + } - if (lineNumber != null) { - intent.putExtra(Document.EXTRA_FILE_LINE_NUMBER, lineNumber); - } + if (lineNumber != null) { + intent.putExtra(Document.EXTRA_FILE_LINE_NUMBER, lineNumber); + } - if (doPreview != null) { - intent.putExtra(Document.EXTRA_DO_PREVIEW, doPreview); + if (doPreview != null) { + intent.putExtra(Document.EXTRA_DO_PREVIEW, doPreview); + } } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && as.isMultiWindowEnabled()) { - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); - } + intent.putExtra(Document.EXTRA_FILE, file); nextLaunchTransparentBg = (activity instanceof MainActivity); GsContextUtils.instance.animateToActivity(activity, intent, false, null); diff --git a/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java b/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java index dc34e556e5..8b87567f92 100644 --- a/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java +++ b/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java @@ -65,6 +65,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a // Open Folder final Intent goToFolder = new Intent(context, MainActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) .setAction(Intent.ACTION_VIEW) .putExtra(Document.EXTRA_FILE, directoryF); views.setOnClickPendingIntent(R.id.widget_header, PendingIntent.getActivity(context, requestCode++, goToFolder, staticFlags)); @@ -87,6 +88,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a // Open Notebook final Intent goHome = new Intent(context, MainActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) .setAction(Intent.ACTION_VIEW) .putExtra(Document.EXTRA_FILE, appSettings.getNotebookDirectory()); views.setOnClickPendingIntent(R.id.widget_main, PendingIntent.getActivity(context, requestCode++, goHome, staticFlags)); From dcd77e2336b160d8550e6ce5210aeb2a15aea021 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Fri, 20 Sep 2024 16:50:59 -0700 Subject: [PATCH 3/7] Fixed checking for indices (#2421) --- .../gsantner/markor/frontend/textview/TextViewUtils.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java b/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java index 1a61946f3b..725ff3ba7a 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java +++ b/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java @@ -169,7 +169,8 @@ public static String getSelectedLines(final CharSequence seq) { **/ public static String getSelectedLines(final CharSequence seq, final int... sel) { if (sel != null && sel.length > 0 && GsTextUtils.isValidSelection(seq, sel)) { - return seq.subSequence(getLineStart(seq, sel[0]), getLineEnd(seq, sel[1])).toString(); + final int start = sel[0], end = sel.length > 1 ? sel[1] : sel[0]; + return seq.subSequence(getLineStart(seq, start), getLineEnd(seq, end)).toString(); } else { return ""; } @@ -178,9 +179,7 @@ public static String getSelectedLines(final CharSequence seq, final int... sel) /** * Convert a char index to a line index + offset from end of line * - * @param s text to parse - * @param p position in text - * @return int[2] where index 0 is line and index 1 is position from end of line + * @return int[n][2] where for each input, index 0 is line and index 1 is position from end of line */ public static int[][] getLineOffsetFromIndex(final CharSequence text, final int ... sel) { final int[][] offsets = new int[sel.length][2]; From 40932ca466a8df2df005613b30b38df6df8f422e Mon Sep 17 00:00:00 2001 From: Lyos <136118735+elyahw@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:23:38 +0100 Subject: [PATCH 4/7] Disable multi-window settings option by default (PR #2420) --- app/src/main/java/net/gsantner/markor/model/AppSettings.java | 2 +- app/src/main/res/xml/preferences_master.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/model/AppSettings.java b/app/src/main/java/net/gsantner/markor/model/AppSettings.java index e07d02a733..13a4a2a836 100644 --- a/app/src/main/java/net/gsantner/markor/model/AppSettings.java +++ b/app/src/main/java/net/gsantner/markor/model/AppSettings.java @@ -663,7 +663,7 @@ public void setEditorBasicColor(boolean forDarkMode, @ColorRes int fgColor, @Col public boolean isMultiWindowEnabled() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - return getBool(R.string.pref_key__is_multi_window_enabled, true); + return getBool(R.string.pref_key__is_multi_window_enabled, false); } else { return false; } diff --git a/app/src/main/res/xml/preferences_master.xml b/app/src/main/res/xml/preferences_master.xml index d1e91fba35..8fc6e6e26d 100644 --- a/app/src/main/res/xml/preferences_master.xml +++ b/app/src/main/res/xml/preferences_master.xml @@ -108,7 +108,7 @@ android:key="@string/pref_key__is_launcher_for_special_files_enabled" android:title="@string/special_documents" /> Date: Wed, 25 Sep 2024 00:24:22 +0200 Subject: [PATCH 5/7] Update translations (PR #2418) --- app/src/main/res/values-af/strings.xml | 1 + app/src/main/res/values-ar/strings.xml | 10 ++++++---- app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-bn/strings.xml | 1 + app/src/main/res/values-bs/strings.xml | 6 ++---- app/src/main/res/values-ca/strings.xml | 12 ++++++++---- app/src/main/res/values-ckb/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 5 +---- app/src/main/res/values-da/strings.xml | 5 +---- app/src/main/res/values-de/strings.xml | 6 ++---- app/src/main/res/values-el/strings.xml | 5 +---- app/src/main/res/values-eo/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 6 ++---- app/src/main/res/values-et/strings.xml | 6 ++---- app/src/main/res/values-fa/strings.xml | 6 ++---- app/src/main/res/values-fi/strings.xml | 5 +---- app/src/main/res/values-fil/strings.xml | 6 ++---- app/src/main/res/values-fr/strings.xml | 6 ++---- app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 6 ++---- app/src/main/res/values-in/strings.xml | 6 ++---- app/src/main/res/values-it/strings.xml | 11 +++++++---- app/src/main/res/values-iw/strings.xml | 6 ++---- app/src/main/res/values-ja/strings.xml | 5 +---- app/src/main/res/values-kab/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 5 ++--- app/src/main/res/values-mk/strings.xml | 4 +--- app/src/main/res/values-ml/strings.xml | 1 + app/src/main/res/values-nb-rNO/strings.xml | 5 +---- app/src/main/res/values-nl/strings.xml | 5 +---- app/src/main/res/values-no/strings.xml | 6 ++---- app/src/main/res/values-or/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 6 ++---- app/src/main/res/values-pt-rBR/strings.xml | 6 ++---- app/src/main/res/values-pt/strings.xml | 11 +++++++---- app/src/main/res/values-ro/strings.xml | 5 +---- app/src/main/res/values-ru/strings.xml | 6 ++---- app/src/main/res/values-sc/strings.xml | 6 ++---- app/src/main/res/values-si/strings.xml | 6 ++---- app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sq/strings.xml | 1 + app/src/main/res/values-sr-rRS/strings.xml | 1 + app/src/main/res/values-sr/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 6 ++---- app/src/main/res/values-ta/strings.xml | 6 ++---- app/src/main/res/values-tr/strings.xml | 18 +++++++++++------- app/src/main/res/values-uk/strings.xml | 11 +++++++---- app/src/main/res/values-ur/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 5 +---- app/src/main/res/values-zh-rTW/strings.xml | 6 ++---- 52 files changed, 112 insertions(+), 146 deletions(-) diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 58813d7ad6..e45805e68d 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -47,6 +47,7 @@ work. If not, see . Projeklisensie Dra kode by tot die projek. Almal is welkom om dit te doen, insluitend nuwelinge Projekspan + Gemeenskap Wys bydraerinligting. Verskaf dit om hier op \'n opt-in-basis te wys nadat dit bygedra het Geen foto gekies, geneem of gered nie. Bewerk prentjie diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b37e24bab6..3cf4c45d51 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -59,6 +59,7 @@ work. If not, see . آخر تعديل اختر هذا المجلد اختيار + تحديد الكل إنشاء تحديد الإدخال تم اختيار عنصر واحد @@ -67,9 +68,12 @@ work. If not, see . إخفاء شريط الحالة الإسم الرابط \ المسار + إدراج رابط + تنسيق الرابط إضافة صورة المساهمون حفظ المسار + تم الحفظ إلى %s اختر مجلد حفظ التراخيص سِجل التغييرات @@ -78,6 +82,7 @@ work. If not, see . إظهار تراخيص الطرف الثالث تغيير لغة التطبيق. اعد فتح التطبيق لتفعيل التغيير اللّغة + مطلوب إذن التخزين لقراءة الملفات وكتابتها فتح بواسطة فرز حسب التاريخ @@ -174,15 +179,13 @@ work. If not, see . مفتاح خاص صفحة لأعلى صفحة لأسفل - نقل النص سطر واحد لأعلى - نقل النص سطر واحد للأسفل - بدء سطر جديد أدناه بداية السطر نهاية السطر بداية المستند نهاية المستند اختيار الكل (Ctrl + A) جهاز التبويب + بدون مسافات بين الأحرف البدء في نهاية الوثيقة عند فتح وثيقة، يتم توجيه مؤشر الكتابة عند نهاية النص حرف القائمة غير مطلوب @@ -246,7 +249,6 @@ work. If not, see . لا يوجد تطبيق تقويم! المستندات الشائعة اللون - بدون مسافات بين الأحرف نظام الألوان الأساسي تغيير لون الخط والخلفية للمحرر. يتم ضبطه بالنسبة لألوان التطبيق وهو متاح في المظهر المظلم والمضئ. تبقى الوان تظليل النصوص كما هي. اعدادات جاهزة diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index feca9bb563..3795a9803d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -43,6 +43,7 @@ work. If not, see . Лиценз на проекта Допринесете с код към проекта. Всеки е добре дошъл да го направи, включително новодошлите Екип на проекта + Общност Показване на информация за сътрудника. Предоставете го, за да бъде показано тук на базата на включване, след като допринесете Няма избрана, заснета или запазена снимка. Редактиране на снимка diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 180878bd31..72d58824aa 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -119,6 +119,7 @@ work. If not, see . প্রকল্প লাইসেন্স প্রকল্পে কোড অবদান. নতুনদের সহ সবাইকে তা করতে স্বাগত জানাই প্রকল্পের দল + সমাজ অবদানকারীর তথ্য দেখান। অবদান করার পরে একটি অপ্ট-ইন ভিত্তিতে এটি এখানে দেখানোর জন্য প্রদান করুন কোনো ছবি নির্বাচিত, তোলা বা সংরক্ষণ করা হয়নি।. ছবি সম্পাদনা করুন diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index f73b6c4679..7f0afcb6e4 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -171,15 +171,13 @@ work. If not, see . Specijalni ključ Prethodna stranica (Page Up) Sljedeća stranica (Page Down) - Pomjeri tekst gore za jedan red - Pomjeri tekst dolje za jedan red - Započni novi red ispod Početak reda (Pos Home) Kraj reda (Pos End) Početak dokumenta Kraj dokumenta Označi sve (Ctrl+A) Tabulator + Bjelina nulte širine Počni na dnu Nakon otvaranja dokumenta, kursor pozicioniraj na kraj Znak za nenumerisana nabrajanja @@ -215,6 +213,7 @@ work. If not, see . Licenca projekta Doprinesite projektu vlastitim kōdom. Svačiji je doprinos dobrodošao. Tim + Zajednica Prikaži informacije o saradnicima. Priložite informacije o sebi ako želite da budu prikazane ovdje nakon Vašeg doprinosa inverzno redom @@ -242,7 +241,6 @@ work. If not, see . Nije instalirana aplikacija za upravljanje kalendarima. Popularni dokumenti Boja - Bjelina nulte širine Boje Mijenja boju pozadine i teksta u tekstnom uređivaču. Prilagođava se bojama programa kako bi odgovaralo svijetloj i tamnoj temi. Boje kojima se obilježava sintaksa ostaju nepromijenjene. Šablon diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index fba828236e..e7a0a612ac 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -180,15 +180,18 @@ work. If not, see . Contingut AsciiDoc especial Pàgina anterior (Page Up) Pàgina següent (Page Down) - Mou el text una línia cap amunt - Mou el text una línia cap avall - Comença una nova línia a continuació Inici de línia (Pos Home) Final de línia (Pos End) Inici del documento Final del document + Mou la línia cap amunt + Mou la línia cap avall + Comença una nova línia + Selecciona la línia actual Selecciona-ho tot (Ctrl+A) Tabulador + Espai d\'ample zero + Espai ema (&emsp;) Comença a la part inferior En carregar un document, ubica el cursor al final Caràcter de llista desordenada @@ -230,6 +233,7 @@ work. If not, see . Llicència del projecte Col·laboreu amb el projecte. Qualsevol pot fer-ho, fins i tot els que fan servir l\'aplicació des de fa poc L\'equip de projecte + Comunitat Mostra informació sobre els col·laboradors. Aquests poden decidir si la seva informació ha de ser inclosa amb les seves col·laboracions descendent ascendent @@ -258,7 +262,6 @@ work. If not, see . No hi ha cap aplicació de calendari instal·lada! Documents populars Color - Espai d\'ample zero Esquema de color bàsic Canvia el color secundari i primari de l\'editor de text. S\'ajusta al tema de l\'aplicació, així que està disponible el tema clar i fosc. Els colors de destacament de sintaxi segueixen sent els mateixos. Predefinit @@ -319,6 +322,7 @@ work. If not, see . Ajusta les paraules Números de línies Salt suau si el text no s\'ajusta a l\'amplada de la pantalla. En cas contrari, activeu el desplaçament horitzontal. + Cerca recursiva a %s Obre sempre amb aquesta aplicació Obre sempre els fitxers amb aquesta aplicació quan la llista conté l\'extensió del fitxer. Utilitzeu «None, .html, .css , .js» per exemple, si voleu editar fitxers web i aquells que no tinguin extensió de fitxer. Obre fitxer amb diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index abc6b41c79..b884947bc8 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -127,6 +127,7 @@ work. If not, see . گشتی سەرچاوەکان مەودای نێوان + نیو بزوێن داش (-) ئەستێرە (*) زیادکردن (+) @@ -166,7 +167,6 @@ work. If not, see . بەرنامەی ساڵنامە دانەبەزێنراوە! بەڵگەنامە گرنگەکان ڕەنگ - نیو بزوێن ڕەنگی بنەڕەتی ڕێکخستنەوە شاشەی لاوەکی diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 257f93e6cf..34d4e9922e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -178,15 +178,13 @@ work. If not, see . Speciální AsciiDoc Obsah Page Up (Page Up) Page Down (Page Down) - Přesunout text o jeden řádek nahoru - Přesunout text o jeden řádek dolů - Začít nový řádek níže Line Start (Pos Home) Line End (Pos End) Začátek dokumentace Konec Dokumentu Vyberte všechny (Ctrl+A) Tabulátor + Mezera s nulovou šířkou Začněme u dna Po načtení dokumentu umístit kurzor na konec souboru Znak nečíslovaného seznamu @@ -254,7 +252,6 @@ work. If not, see . Žádná aplikace kalendáře není nainstalována! Oblíbené dokumenty Barva - Mezera s nulovou šířkou Základní barevný režim Změní barvu pozadí a popředí textového editoru. Přizpůsobí se tématu aplikace, je tedy dostupné světlé a tmavé. Zvýraznění syntaxe zůstává stejné. Předvolba diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 19ff7d128a..cedb508bf8 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -174,15 +174,13 @@ work. If not, see . Specialtast Side op (Page Up) Side ned (Page Down) - Flyt tekst en linje op - Flyt tekst en linje ned - Start ny linje nedenfor Liniestart (Pos Home) Linieendelse (Pos End) Dokumentstart Dokumentendelse Vælg alle (Ctrl+A) Tabulator + Zero-bredde plads Start på bunden Når dokumentet er hentet, positionér cursoren ved enden Uordnet listetegn @@ -246,7 +244,6 @@ work. If not, see . Ingen kalender-app installeret Populære dokumenter Farve - Zero-bredde plads Grundlæggende farvetema Ændrer baggrunden og forgrundsfarven på teksteditoren. Justerer til app tema så tilgængelig i lys og mørk tema. Syntaksfremhævning farver forbliver den samme. Forudindstilling diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7b9e3921ac..1f2146bcaf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -180,15 +180,13 @@ work. If not, see . Spezieller AsciiDoc-Inhalt Vorherige Seite (Bild↑) Nächste Seite (Bild↓) - Text eine Zeile nach oben verschieben - Text eine Zeile nach unten verschieben - Neue Zeile unten starten Zeilen-Start (Pos 1) Zeilen-Ende (Ende) Dokumenten Beginn Dokumenten Ende Alles auswählen (Strg + A) Tabulator + Breitenloses Zeichen (Zero-width space) Unten beginnen Nachdem ein Dokument geladen wurde, den Cursor ganz unten platzieren Unsortiertes Listenzeichen @@ -230,6 +228,7 @@ work. If not, see . Projektlizenz Projekt mit Code unterstützen. Alle sind eingeladen das zu tun, auch Newcomer Projekt-Team + Community Zeige Informationen über Mitwirkende. Mitwirkende können Informationen bereitstellen, die hier angezeigt werden (Opt-in), nach der Mitwirkung. absteigend aufsteigend @@ -258,7 +257,6 @@ work. If not, see . Es ist keine Kalender-App installiert! Beliebte Dokumente Farbe - Breitenloses Zeichen (Zero-width space) Grund-Farbschema Ändert die Hintergrund- und Vordergrundfarbe des Texteditors. Passt sich an das App-Thema an, steht also im hellen und dunklen Design zur Verfügung. Die Syntax-Highlighting-Farben bleiben gleich. Voreinstellung diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 7b13739281..57cb97d7d7 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -177,15 +177,13 @@ work. If not, see . Περιεχόμενο AsciiDoc Σελίδα Επάνω (Page Up) Σελίδα Κάτω (Page Down) - Μετακίνηση κειμένου μία γραμμή πάνω - Μετακίνηση κειμένου μία γραμμή κάτω - Ξεκινήστε νέα γραμμή παρακάτω Έναρξη Γραμμής (Pos Home) Τέλος Γραμμής (Pos Τέλος) Έναρξη Εγγράφου Τέλος Εγγράφου Επιλογή όλων (Ctrl+A) Στηλοθέτης + Χώρος μηδενικού πλάτους Έναρξη στο κάτω μέρος Μετά τη φόρτωση ενός εγγράφου, του δρομέα θέσης στο τέλος του Χαρακτήρας για μη ταξινομημένη λίστα @@ -253,7 +251,6 @@ work. If not, see . Δεν υπάρχει εγκατεστημένη εφαρμογή ημερολογίου! Δημοφιλή έγγραφα Χρώμα - Χώρος μηδενικού πλάτους Σχέδιο βασικών χρωμάτων Αλλάζει το χρώμα φόντου και προσκηνίου του επεξεργαστή κειμένου. Ρυθμίζει το θέμα της εφαρμογής και είναι διαθέσιμο σε ανοιχτό και σκούρο θέμα. Τα χρώματα επισήμανσης παραμένουν τα ίδια. diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 3f6c0da088..78b7c19f1c 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -136,6 +136,7 @@ work. If not, see . Projekta permesilo Kontribuu kodon al la projekto. Ĉiuj bonvenas fari tion, inkluzive de novuloj Projekta teamo + Komunumo Montri informojn pri kontribuanto. Provizu ĝin montri ĉi tie sur elektebla bazo post kontribuado ascenda Loko diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f137121709..f28203a61c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -178,15 +178,13 @@ work. If not, see . Contenido especial AsciiDoc Página anterior (Page Up) Siguiente página (Page Down) - Mover texto una línea arriba - Mover texto una línea hacia abajo - Empezar nueva línea a continuación Inicio de línea (Pos Home) Fin de línea (Pos End) Inicio de documento Fin de documento Seleccionar todo (Ctrl + A) Tabulador + Espacio de ancho cero Iniciar desde abajo Al abrir un documento, posicionar el cursor al final del documento Carácter para lista desordenada @@ -227,6 +225,7 @@ work. If not, see . Licencia del proyecto Colabora con el proyecto. Cualquiera puede hacerlo, incluso los que usan la aplicación desde hace poco El equipo tras el proyecto + Comunidad Muestra información pública sobre los colaboradores. Estos pueden decidir si su información debe ser incluida con sus colaboraciones descendente ascendente @@ -255,7 +254,6 @@ work. If not, see . ¡No hay una aplicación de calendario instalada! Documentos populares Color - Espacio de ancho cero Esquema básico de color Cambia el color de fondo y el primer plano del editor de texto. Se ajusta al tema de la aplicación y está disponible para el tema claro y oscuro. Los colores de resaltado de la sintaxis permanecen iguales. Preajuste diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index ee3999145b..48dd933077 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -180,15 +180,13 @@ work. If not, see . Eriline AsciiDoc sisu Eelmine lehekülg(Page Up) Järgmine lehekülg (Page Down) - Liiguta tekstirida ülesse - Liiguta tekstirida alla - Alusta uue reaga all Rea algus(Pos Home) Rea lõpp(Pos End) Kirjutise algus Kirjutise lõpp Vali kõik (Ctrl+A) Tabeldaja + Ruumi raiskamata Alusta lõpus Kirjutist laadides jääb osuti selle lõppu Korrastamata nimekirja tähis @@ -229,6 +227,7 @@ work. If not, see . Projekti litsents Lisage projekti kood. Kõik on oodatud seda tegema, ka uued tulijad Projekti tiim + Kogukond Kuva kaastöötajateave. Esitage see, et see kuvatakse siin pärast panuse andmist, kui soovite kahanev suurenev @@ -257,7 +256,6 @@ work. If not, see . Kalendrirakendust pole! Nõutavad dokumendid Värv - Ruumi raiskamata Põhilised värvid Muudab tekstiredaktori tausta ja esiplaani värvi. Kohandub rakenduse teemaga, nii et see on saadaval heledas ja tumedas teemas. Süntaksi esiletõstmise värvid jäävad samaks. Eelseadistus diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 8bfcf0e854..997ad553f7 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -176,15 +176,13 @@ work. If not, see . محتوای خاص اَسکیداک بالا بردن صفحه (Page Up) پایین بردن صفحه (Page Down) - یک خط بالا بردن متن - یک خط پایین بردن متن - باز کردن خط جدید زیر نشانگر ابتدای خط (کلید Home) انتهای خط (کلید End) آغاز پرونده پایان پرونده انتخاب همه (Ctrl + A) Tabulator + نیم‌فاصله شروع از پایین بعد از اینکه پرونده بارگزاری شد، موقعیت مکان‌نما در انتهای پرونده قرار بگیرد نشانه‌ی کنار لیست‌های غیر عددی @@ -224,6 +222,7 @@ work. If not, see . پروانه‌ی پروژه همه آزادند تا به این پروژه کد اضافه کنند. حتا تازه‌کارها تیم پروژه + انجمن Show contributor info. Provide it to be shown here on an opt-in basis after contributing رو به پایین رو به بالا @@ -251,7 +250,6 @@ work. If not, see . برنامه‌ای برای تقویم نصب نشده است! اسناد محبوب رنگ - نیم‌فاصله Basic color scheme Changes background and foreground color of the text editor. Adjusts to app theme so available in light and dark theme. Syntax highlighting colors remain the same. پیش‌تنظیم diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a5a715e8d3..9a9cc7279b 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -174,15 +174,13 @@ work. If not, see . Erikoisnäppäin Sivu ylös (Page Up) Sivu alas (Page down) - Siirrä tekstiä yksi rivi ylöspäin - Siirrä tekstiä yksi rivi alaspäin - Aloita uusi rivi alla Rivin alku (Pos Home) Rivin loppu (Pos End) Asiakirjan alku Asiakirjan loppu Valitse kaikki (Ctrl+A) Sarkain + Tila nollaleveydelle Aloita alhaalta Kun asiakirja ladataan, aseta osoitin sen päähän Järjestämättömän listan kirjoitusmerkki @@ -246,7 +244,6 @@ work. If not, see . Kalenterisovellusta ei ole asennettu! Suositut asiakirjat Väri - Tila nollaleveydelle Perusväriteema Muuttaa tekstin editorin taustan ja edustan väriä. Mukautukset sovellusteemaan, joten saatavilla vaaleassa ja tummassa teemassa. Syntaksin korostus värit pysyvät samoina. Preset diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 1495bfca91..58d4b16776 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -171,15 +171,13 @@ work. If not, see . Espesyal na Key Pahina Pataas (Page Up) Pahina Pababa (Page Down) - Itaas ang text - Ibaba ang text - Magsimula ng bagong linya sa baba Linya Umpisa (Pos Home) Linya Dulo (Pos End) Simula ng dokumento Dulo ng dokumento Piliin lahat (Ctrl+A) Tab + Space na walang lapad Magsimula sa ibaba Pagka-load ng dokumento, ilagay ang panuro sa dulo nito Karakter ng di-nakanumerong listahan @@ -213,6 +211,7 @@ work. If not, see . Lisensiya ng Proyekto Mag-ambag ng code sa proyekto. Maaring gawin ito ng kahit sinuman, pati na ang mga bagong-pasok Project Team + Komunidad Ipakita ang impormasyon ng mga nag-ambag. Nasa opt-in basis ang pagpapakita dito matapos mag-ambag pababa pataas @@ -240,7 +239,6 @@ work. If not, see . Walang naka-install na app na kalendaryo! Mga popular na dokumento Kulay - Space na walang lapad Batayang iskima ng kulay Binabago ang kulay likuran at harapan ng text editor. Sumasaayos sa tema ng app kaya mayroon ito sa temang malinaw at madilim. Ganoon pa rin ang mga kulay sa pagha-highlight ng syntax. Preset diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 73dc7c8cfb..38b904cd4a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -178,15 +178,13 @@ work. If not, see . Contenu spécial AsciiDoc Page précédente Page suivante - Déplacer le texte une ligne vers le haut - Déplacer le texte une ligne vers le bas - Commencer une nouvelle ligne ci-dessous Début de ligne Fin de ligne Début de document Fin de document Tout sélectionner (Ctrl + A) Tabulation + Espace de largeur nulle Commencer en haut Après l\'ouverture d\'un document, placer le curseur à la fin Caractère de liste non ordonnée @@ -228,6 +226,7 @@ work. If not, see . Licence du projet Contribuer au code. Tout le monde est le bienvenu, même les débutants Équipe + Communauté Informations sur les contributeurs. Les contributeurs peuvent fournir des informations qui s\'afficheront ici (option) après contribution décroissant croissant @@ -256,7 +255,6 @@ work. If not, see . Aucune application de calendrier installée ! Documents populaires Couleur - Espace de largeur nulle Thème de couleurs de base Changer les couleurs de fond ou du texte dans l\'éditeur de texte. Des ajustements au thème de l\'application sont disponible en thèmes clairs et sombres. Les couleurs qui marque la mise en évidence de la syntaxe reste la même. Préréglages diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index edc7066397..9353e19a40 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -117,6 +117,7 @@ work. If not, see . Licencia de proxecto Contribuír código ao proxecto. Todo o mundo é benvido para facelo, incluídos os recén chegados Equipo de proxecto + Comunidade Amosar información do colaborador. Proporcione que se mostre aquí de xeito opt-in despois de contribuír Non hai ningunha imaxe seleccionada, tomada ou gardada. Editar imaxe diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 8b6eb69fcf..e37723d75b 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -151,6 +151,7 @@ work. If not, see . परियोजना लाइसेंस परियोजना में कोड योगदान करें। ऐसा करने के लिए सभी का स्वागत है, जिसमें नवागंतुक भी शामिल हैं परियोजना दल + Community योगदानकर्ता जानकारी दिखाएं। योगदान करने के बाद इसे यहां ऑप्ट-इन आधार पर दिखाने के लिए प्रदान करें घटते क्रम में बढ़ते क्रम में diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index cdd133a1ab..22fa2097df 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -171,15 +171,13 @@ work. If not, see . Speciális billentyű Feljebb (Page Up) Lejjebb (Page Down) - Szöveg mozgatása a felső sorba - Szöveg mozgatása az alsó sorba - Új sor kezdése a jelenlegi alatt Sor eleje (Home) Sor vége (End) Dokumentum eleje Dokumentum vége Összes kijelölése (Ctrl+A) Tabulátor + Zero-width space (speciális karakter) Kezdés legalul Fájl megnyitásakor a kurzor a dokumentum végére kerül Számozatlan lista karaktere @@ -213,6 +211,7 @@ work. If not, see . Projekt licensz Adja meg a kódot a projekthez. Mindenkit szívesen látunk, az újonnan jövőket is beleértve. Projekt csapat + Közösség A közreműködő információk megjelenítése. Add meg, hogy megjelenjen a közreműködés után, egy beleegyezés alapú módon. csökkenő növekvő @@ -239,7 +238,6 @@ work. If not, see . Nincs telepítve naptáralkalmazás! Népszerű dokumentumok Szín - Zero-width space (speciális karakter) Alap színséma A szerkesztő háttér- és szövegszínének beállítása. Az alkalmazás témájához alkalmazkodik, sötét és világos módban is elérhető. A szintaxis kiemelő színei ugyanazok maradnak. Előre beállatott diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 64ced2b35e..98d84abf94 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -177,15 +177,13 @@ work. If not, see . Isi AsciiDoc khusus Halaman atas (Halaman atas) Halaman bawah (Halaman bawah) - Pindah teks ke satu baris atas - Pindah teks ke satu baris bawah - Mulai baris baru dibawah Baris memulai (Pos beranda) Baris terakhir (Pos akhir) Memulai dokumen Dokumen akhir Pilih semua (Ctrl+A) Tabulator + Spasi jarak nol Mulai dari bawah Setelah memuat dokumen, posisikan kursor di ujungnya Karakter daftar yang tidak diurutkan @@ -224,6 +222,7 @@ work. If not, see . Lisensi Proyek Kode kontribusi untuk proyek. Semua orang dipersilakan untuk melakukannya, termasuk pendatang baru Tim proyek + Komunitas Tampilkan info kontributor. Berikan untuk ditampilkan di sini secara opt-in setelah berkontribusi menurun menaik @@ -251,7 +250,6 @@ work. If not, see . Tidak ada aplikasi kalender yang diinstal! Dokumen populer Warna - Spasi jarak nol Skema warna dasar Mengubah latar belakang dan warna latar depan editor teks. Menyesuaikan dengan tema aplikasi sehingga tersedia dalam tema terang dan gelap. Sintaks menyoroti warna tetap sama. Pengaturan tersimpan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b8774be97e..d30f63b8f6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -180,15 +180,18 @@ work. If not, see . Contenuto speciale AsciiDoc Pagina superiore (tasto Up) Pagina inferiore (tasto Down) - Sposta il testo una riga in su - Sposta il testo una riga in giù - Inizia una nuova riga sotto Inizio della linea (tasto Home) Fine della linea (tasto End) Inizio del documento Fine del documento + Sposta la riga in su + Sposta la riga in giù + Nuova riga sotto + Seleziona la riga corrente Seleziona tutto (Ctrl + A) Tabulatore + Spazio a larghezza zero + Spaziatura em (&emsp;) Inizia dal basso Dopo che un documento è stato caricato, posiziona il cursore alla fine Carattere per liste non ordinate @@ -230,6 +233,7 @@ work. If not, see . Licenza del progetto Contribuisci al codice del progetto. Tutti sono invitati a farlo, anche i nuovi arrivati Team del progetto + Comunità Mostra informazioni sui contributori. I contributori possono fornire informazioni per essere mostrati qui (opt-in) dopo aver contribuito @@ -260,7 +264,6 @@ work. If not, see . Nessuna app calendario installata! Documenti popolari Colore - Spazio a larghezza zero Schema dei colori di base Cambia il colore di sfondo e di primo piano dell\'editor di testo. Si adegua al tema dell\'applicazione, al tema chiaro o scuro. I colori dell\'evidenziazione della sintassi rimangono gli stessi. Predefinito diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 0366856c5f..7704211265 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -172,15 +172,13 @@ work. If not, see . כפתור מיוחד דף מעלה (דף מעלה) דף מטה (דף מטה) - הזז טקסט שורה אחת למעלה - הזז טקסט שורה אחת למטֿה - שורה חדשה תחילת שורה (מיקום בית) סוף שורה (מיקום סוף) תחילת מסמך סוף מסמך בחר הכל (Ctrl+A) מחולל טבלאות + רווח ברוחב אפס התחל בתחתית בעת טעינת קובץ, מקם את הסמן בסופו סימן עבור רשימות לא ממוספרות @@ -214,6 +212,7 @@ work. If not, see . רישיון הפרויקט לתרום קוד לפרוייקט. כולם מוזמנים לעשות כן, לרבות מתחילים צוות הפרויקט + קהילה הצג פרטי המתנדב. הבא זאת להצגה כאן על בסיס הסכמה מראש לאחר תרומה בסדר יורד בסדר עולה @@ -242,7 +241,6 @@ work. If not, see . לא מותקנת אפליקציית לוח שנה! מסמכים בשימוש נפוץ צבע - רווח ברוחב אפס ערכת הצבעים הבסיסיים שינוי צבע הרקע והטקסט בעורך טקסט. מתאים לערכת הנושא של האפליקציה, לכן זמינים בערכת נושא כהה ובהירה. צבעי סימון תחביר נותר ללא שינוי. קבוע מראש diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c3496461fb..c1ffd50b8d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -175,15 +175,13 @@ work. If not, see . 特殊キー ページ上移動 (Page Up) ページ下移動 (Page Down) - テキストを１行上に移動 - テキストを１行下に移動 - 以下の新しい行を開始します 行の先頭 (Pos Home) 行の末尾 (Pos End) ドキュメントの始め ドキュメントの終わり すべて選択 (Ctrl+A) タブ + ゼロ幅スペース 下部で開始 ドキュメントの読み込み時に、カーソル位置は最後になります 順序なしリスト文字 @@ -247,7 +245,6 @@ work. If not, see . カレンダーアプリがインストールされていません! 人気のあるドキュメント 色 - ゼロ幅スペース 基本的な配色 テキストエディターの背景と前景の色を変更します。アプリのテーマをライトとダークテーマで利用できるように調整します。構文の強調表示の色は変わりません。 プリセット diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 61bb279ae5..5d72470714 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -160,6 +160,7 @@ work. If not, see . Turagt n usenfaṛ Ɛeddet amsukkel i usenfar. Anṣuf yes-sen akk ad xedmen aya, ama d wid i d-yusan d imaynuten Tarbaɛt n usenfaṛ + Tamezdagnut Ssken tilɣa n umeddakel. Efk-it-id ad d-tbanen dagi deg yiwen n opt-in deffir n uddukkel Asun Izirigen n uḍris diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 103d481bb6..dd5c73e722 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -167,14 +167,13 @@ work. If not, see . 특수 키 페이지 업 (Page Up) 페이지 다운 (Page Down) - 텍스트를 한 줄 위로 이동 - 텍스트를 한 줄 아래로 이동 줄 시작 (Pos Home) 줄 끝 (Pos End) 문서 시작 문서 마지막 모두 선택 (Ctrl+A) 탭 (Tab) + 폭 없는 공백 문자(zero-width space) 문서 하단에서 시작 문서를 불러올 때 문서의 맨 끝에 커서를 위치시킴 순서대로 정렬되지 않은 목록 문자 @@ -208,6 +207,7 @@ work. If not, see . 프로젝트 저작권 코드에 기여하세요. 누구나 환영합니다. 신참도 포함해서요! 프로젝트 팀 + 커뮤니티 소프트웨어 기여자 정보를 표시합니다. 기여 후에 옵트-인 방식으로 이 곳에 표시됩니다. 내림차순 오름차순 @@ -235,7 +235,6 @@ work. If not, see . 달력 앱이 설치되지 않았습니다! 인기 문서 색상 - 폭 없는 공백 문자(zero-width space) 기본 색상 배합 텍스트 편집기의 배경 및 전경 색상을 바꿉니다. 밝은/어두운 앱 테마에 대응합니다. 문법 강조 표시 색상은 그대로 유지됩니다. 사전 설정값 diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 5fc3f7ba82..6a86116999 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -140,9 +140,6 @@ work. If not, see . Специјално копче Страна Нагоре (Page Up) Страна Надоле (Page Down) - Помести текст една линија нагоре - Помести текст една линија надоле - Почни нова линија подоле Почеток на линија (Home) Крај на линија (End) Почеток на документ @@ -172,6 +169,7 @@ work. If not, see . Лиценца на проект Придонесете код во проектот. Секој е добредојден да го стори тоа, вклучително и новодојденците Проектен тим + Заедница Прикажи информации за соработниците. Обезбедете да се прикаже овде врз основа на пријавување откако ќе придонесете опаѓачки растечки diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 929a2ef04b..c877ddda79 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -146,6 +146,7 @@ work. If not, see . പ്രോജക്ടു് ലൈസൻസ് പ്രോജക്റ്റിലേക്ക് കോഡ് സംഭാവന ചെയ്യുക. തുടക്കക്കാരെ ഉൾപ്പെടെ എല്ലാവരെയും സ്വാഗതം ചെയ്യുന്നു പ്രോജക്റ്റ് ടീം + കമ്മ്യൂണിറ്റി സംഭാവക വിവരം കാണിക്കുക. സംഭാവന ചെയ്തതിനുശേഷം ഒരു ഓപ്റ്റ്-ഇൻ അടിസ്ഥാനത്തിൽ ഇത് ഇവിടെ കാണിക്കുന്നതിന് നൽകുക ചിത്രം തിരഞ്ഞെടുക്കുകയോ സംരക്ഷിക്കുകയോ ചെയ്തിട്ടില്ല. ചിത്രം എഡിറ്റുചെയ്യുക diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 7a034cd3ab..6f5483b668 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -178,15 +178,13 @@ work. If not, see . Spesielt AsciiDoc-innhold Side opp (Page Up) Side ned (Page Down) - Flytt teksten en linje opp - Flytt teksten en linje ned - Start ny linje under Linjestart (Pos Home) Linjeslutt (Pos End) Dokumentbegynnelse Dokumentslutt Velg alt (Ctrl+A) Tab + Null bredde område Start på bunnen Etter at et dokument lastes, posisjoner pekeren ved dets slutt Usortert liste-tegn @@ -255,7 +253,6 @@ work. If not, see . Ingen kalenderapp installert! Populære dokumenter Farge - Null bredde område Grunnleggende fargevalg Endrer bakgrunn og forgrunnsfarge i tekstbehandleren. Tilpasser seg til apptemaet, og er dermed tilgjengelig i lyst og mørkt tema. Syntaksutheving er de samme som før. Preset diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 7f98f45dd5..4f2ace2207 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -174,15 +174,13 @@ work. If not, see . Speciale toets Vorige pagina Volgende pagina - Verplaats tekst één regel omhoog - Verplaats tekst één regel omlaag - Start nieuwe regel hieronder Start lijn (Pos Home) Eind lijn (Pos End) Document Start Document Einde Alles selecteren (Ctrl+A) Documenteinde + Nul breedte ruimte Start onderaan Bij het laden van een document, plaats cursor aan het einde Ongeordende lijst teken @@ -246,7 +244,6 @@ work. If not, see . Geen agenda app is geïnstalleerd! Populaire documenten Kleur - Nul breedte ruimte Basis kleurschema Verandert achtergrond- en achtergrondkleur van de teksteditor. Aanpasst aan app thema dat beschikbaar is in licht en donker thema. Syntaxis markeren blijven hetzelfde. Voorinstelling diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 3d43f35a67..461d8f4c2d 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -178,15 +178,13 @@ work. If not, see . Spesielt AsciiDoc-innhold Side opp (page opp) Side ned (ned) - Flytt teksten en linje opp - Flytt teksten en linje ned - Start ny linje under Linjestart (Pos Home) Linjeslutt (Pos End) Dokument start Dokument slutt Velg alt (Ctrl+A) Tabulator + Null bredde område Start på bunnen Etter at et dokument lastes, posisjoner markøren ved dets slutt Usortert liste-tegn @@ -227,6 +225,7 @@ work. If not, see . Prosjektets lisens Bidra med kode til prosjektet. Alle er velkomne, inkludert nybegynnere Prosjekt laget + Fellesskap Vis info om bidragsytere. De kan valgfritt bidra med info til visning her etter bidrag. synkende stigende @@ -255,7 +254,6 @@ work. If not, see . Ingen kalenderapp installert! Populære dokumenter Farge - Null bredde område Grunnleggende fargevalg Endrer bakgrunn og forgrunnsfarge i tekstbehandleren. Justerer app tema så tilgjengelig for lys og mørkt tema. Syntaksutheving er de samme som før. Preset diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml index b3d7403a8a..ca40293b38 100644 --- a/app/src/main/res/values-or/strings.xml +++ b/app/src/main/res/values-or/strings.xml @@ -152,6 +152,7 @@ work. If not, see . ପ୍ରୋଜେକ୍ଟ ଲାଇସେନ୍ସ | ପ୍ରୋଜେକ୍ଟରେ କୋଡ୍ ଯୋଗଦାନ କରନ୍ତୁ |. ନବାଗତଙ୍କ ସମେତ ସମସ୍ତେ ଏହା କରିବାକୁ ସ୍ୱାଗତ | ପ୍ରୋଜେକ୍ଟ ଟିମ୍ | + ସମ୍ପ୍ରଦାୟ ଯୋଗଦାନକାରୀ ସୂଚନା ଦେଖାନ୍ତୁ |. ଯୋଗଦାନ ପରେ ଏହାକୁ ଏକ ଅପ୍ଟ-ଇନ୍ ଆଧାରରେ ଏଠାରେ ଦେଖାଇବାକୁ ପ୍ରଦାନ କରନ୍ତୁ | ଅବରୋହଣ ଆରୋହଣ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d37f9679eb..9ef52d872b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -176,15 +176,13 @@ work. If not, see . Znaki specjalne Strona w górę (Page Up) Strona w dół (Page Down) - Przenieś tekst o jedną linię w górę - Przenieś tekst o jedną linię w dół - Rozpocznij nową linię poniżej Początek Linii (Pos Home) Koniec Linii (Pos End) Koniec Dokumentu Początek Dokumentu Zaznacz wszystko (Ctrl + A) Tabulator + Spacja o zerowej szerokości Zacznij od dołu Po załadowaniu dokumentu ustaw kursor na jego końcu Znak listy nieuporządkowanej @@ -220,6 +218,7 @@ work. If not, see . Licencja Projektu Współtwórz kod projektu. Każdy może to zrobić w tym nowicjusze Zespół Projektu + Społeczność Pokaż informacje o współtwórcy. Podaj je tutaj, korzystając z opcji \"opt-in\" po dołączeniu malejąco rosnąco @@ -248,7 +247,6 @@ work. If not, see . Brak aplikacji Kalendarza! Popularne dokumenty Kolor - Spacja o zerowej szerokości Podstawowy schemat kolorów Zmienia kolor tła i pierwszego planu edytora tekstu. Dostosowuje do motywu aplikacji dostępnego w jasnym i ciemnym temacie. Kolory podświetlania składni pozostają takie same. Gotowe ustawienia diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ff478cef8a..05cf532e56 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -177,15 +177,13 @@ work. If not, see . Special AsciiDoc Content Página anterior (Page Up) Página seguinte (Page Down) - Mova o texto uma linha a cima - Mova o texto uma linha abaixo - Iniciar nova linha abaixo Início da linha (Pos Home) Fim da linha (Pos End) Início do documento Fim do documento Selecionar tudo (Ctrl + A) Tabulação + Espaço de largura zero (Zero-width) Começar na parte inferior Depois que um documento é carregado, posicionar o cursor no final da linha Caractere de lista não ordenado @@ -225,6 +223,7 @@ work. If not, see . Licença do Projeto Contribua programando para o projeto. Todos são bem-vindos, incluindo os novatos. Equipe do Projeto + Comunidade Mostrar informações sobre colaboradores. Os colaboradores podem fornecer informação a ser mostrada aqui (opt-in) após a contribuição. decrescente crescente @@ -253,7 +252,6 @@ work. If not, see . Nenhum aplicativo de calendário está instalado! Documentos populares Cor - Espaço de largura zero (Zero-width) Esquema de cores Altera a cor secundária e a cor principal do editor de texto. Apenas estão disponíveis os temas escuro e claro. As cores de destaque da sintaxe não são alteradas. Predefinição diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 8868677bbc..2cbe2edbc0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -180,15 +180,18 @@ work. If not, see . Conteúdo especial AsciiDoc Página acima (Page Up) Página abaixo (Page Down) - Mover texto uma linha acima - Mover texto uma linha abaixo - Iniciar nova linha abaixo Início de linha (Home) Fim de linha (End) Início do documento Fim do documento + Mover linha para cima + Mover linha para baixo + Iniciar nova linha + Selecionar linha atual Selecionar tudo (Ctrl+A) Tabulação + Espaço Zero-width + Em espaço (&emsp;) Iniciar no fim Ao carregar um documento, colocar o cursor no final Carácter de lista não ordenada @@ -230,6 +233,7 @@ work. If not, see . Licença Contribua com código. Todos os contributos serão bem-vindos. Equipa do projeto + Comunidade Mostrar informação sobre os colaboradores. Apenas serão visíveis se autorizadas pelos próprios. descendente ascendente @@ -258,7 +262,6 @@ work. If not, see . Não tem uma aplicação de calendário! Documentos populares Cor - Espaço Zero-width Esquema de cores Altera a cor secundária e a cor principal do editor de texto. Apenas estão disponíveis os temas escuro e claro. As cores de destaque da sintaxe não são alteradas. Predefinição diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1f9d381721..6cdd7ed1c8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -174,15 +174,13 @@ work. If not, see . Cheie specială Pagina în sus (Pagina sus) Pagină în jos (Pagina Jos) - Mutați textul cu o linie în sus - Mutați textul cu o linie în jos - Pornește linia nouă de mai jos Pornire linie (Paca pos) Sfârșit linie (Pos Sfârșit) Pornire document Sfârșit Document Selectează tot (Ctrl+A) Tabel + Spațiu cu lățimea maximă Pornire jos La încărcarea unui document, cursorul de poziție la sfârșit Caracter listă neordonat @@ -246,7 +244,6 @@ work. If not, see . Nicio aplicație din calendar nu este instalată! Documente populare Culoare - Spațiu cu lățimea maximă Schema de culori de bază Schimbă culoarea de fundal și cea din prim-plan a editorului de text. Ajustează tema aplicației astfel disponibilă în tema deschisă și întunecată. Culorile de evidențiere a sintaxei rămân aceleași. Preset diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index df69d996a6..78076d45d4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -180,15 +180,13 @@ work. If not, see . AsciiDoc особое Листать вверх (Page Up) Листать вниз (Page Down) - Переместить текст на строку вверх - Переместить текст на строку вниз - Перевод строки Начало строки (Home) Конец строки (End) Начало документа Конец документа Выбрать всё (Ctrl+A) Табуляция + Пробел нулевой ширины Начать снизу После загрузки ставить курсор в конец документа Символ неупорядоченного списка @@ -230,6 +228,7 @@ work. If not, see . Лицензия проекта Внести вклад в код проекта. Все желающие могут сделать это, в том числе и новички Команда проекта + Сообщество Показ информации об участниках. Предоставьте информацию о себе, если вы внесли свой вклад в проект по убыванию по возрастанию @@ -258,7 +257,6 @@ work. If not, see . Приложение календаря не установлено! Частые документы Цвет - Пробел нулевой ширины Палитра приложения Изменяет фоновый и основной цвет текстового редактора. Приспосабливается к тёмной и светлой теме приложения. Цвет выделения текста остаётся таким же. Шаблон diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 77425ab73f..96a99222c6 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -180,15 +180,13 @@ work. If not, see . Cuntenutu ispetziale AsciiDoc Pàgina in subra (Page Up) Pàgina in suta (Page Down) - Tràmuda su testu de una riga cara a susu - Tràmuda su testu de una riga cara a giosso - Incumintza cun una lìnia noa in suta Incumintzu de sa lìnia (tecla Home) Fine de sa lìnia (tecla End) Incumintzu de su documentu Fine de su documentu Ischerta totu (Ctrl+A) Tabuladore + Ispàtziu a largària zero Incumintza dae bassu A pustis de àere carrigadu unu documentu, pone su cursore a s\'acabu suo Caràtere pro listas disordinadas @@ -230,6 +228,7 @@ work. If not, see . Litzèntzia de su progetu Contribui cun còdighe a su progetu. Totus sunt invitados a lu fàghere, fintzas sos ùrtimos arribbados Iscuadra de su progetu + Comunidade Ammustra informatziones a pitzu de sos contribuidores. Fruni·las pro las fàghere ammustrare inoghe si l\'ant isseberadu a pustis de sa contributzione achirrante ascendente @@ -258,7 +257,6 @@ work. If not, see . Non b\'at peruna aplicatzione de calendàriu installada! Documentos populares Colore - Ispàtziu a largària zero Ischema de colores de base Mudat su colore de s\'isfundu e de primu pianu de s\'editore de testu. S\'adatat a su tema de s\'aplicatzione, a su tema craru o iscuru. Sos colores de s\'evidentziatzione de sa sintassi abarrant sos matessi. Predefinitziones diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index fa45c78bbe..34009dce46 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -171,15 +171,13 @@ work. If not, see . විශේෂ යතුර පිටුව ඉහළට (පිටුව ඉහළට) පිටුව පහළට (පිටුව පහළට) - පෙළ එක් පේළියක් ඉහළට ගෙන යන්න - පෙළ එක පේළියක් පහළට ගෙන යන්න - පහත නව රේඛාව ආරම්භ කරන්න රේඛාව ආරම්භය (Pos Home) රේඛාව අවසානය (Pos End) ලේඛන ආරම්භය ලේඛන අවසානය සියල්ල තෝරන්න (Ctrl+A) ටැබ්ලටර් + ශුන්‍ය පළල අවකාශය පහළින් ආරම්භ කරන්න ලේඛනයක් පූරණය කළ පසු, එහි කෙළවරේ කර්සරය ස්ථානගත කරන්න අනුපිළිවෙලක් නැති ලැයිස්තු අක්ෂරය @@ -212,6 +210,7 @@ work. If not, see . ව්යාපෘති බලපත්රය ව්‍යාපෘතියට කේතය දායක කරන්න. නවකයින් ඇතුළු සියලු දෙනාම එසේ කිරීමට සාදරයෙන් පිළිගනිමු ව්යාපෘති කණ්ඩායම + ප්‍රජාව දායක තොරතුරු පෙන්වන්න. දායක වීමෙන් පසු තේරීමේ පදනම මත එය මෙහි පෙන්වීමට සපයන්න බැස යනවා නැගීම @@ -240,7 +239,6 @@ work. If not, see . දින දර්ශන යෙදුමක් ස්ථාපනය කර නැත! ජනප්රිය ලේඛන වර්ණය - ශුන්‍ය පළල අවකාශය මූලික වර්ණ පටිපාටිය පෙළ සංස්කාරකයේ පසුබිම සහ පෙරබිම් වර්ණය වෙනස් කරයි. ආලෝක සහ අඳුරු තේමාවෙන් ලබා ගත හැකි යෙදුම් තේමාවට ගළපන්න. සින්ටැක්ස් උද්දීපනය කරන වර්ණ එලෙසම පවතී. පෙරසිටුවයි diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index d73bf8b107..29073e9ddb 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -106,6 +106,7 @@ work. If not, see . Licencia na projekt Prispejte kódom do projektu. Všetci sú vítaní, vrátane nováčikov Projektová skupina + Komunita Zobraziť informácie o prispievateľovi. Poskytnite ho, aby sa tu zobrazoval na základe prihlásenia po príspevku Nie je vybratý, nasnímaný ani uložený žiadny obrázok. Upraviť obrázok diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 425ab34eeb..62d8d4bd78 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -43,6 +43,7 @@ work. If not, see . Licenca e projektit Kontribuoni kodin në projekt. Të gjithë janë të mirëpritur ta bëjnë këtë, përfshirë të sapoardhurit Ekipi i projektit + Komuniteti Shfaq informacionin e kontribuesit. Siguroni që të shfaqet këtu në bazë të zgjedhjes pasi të kontribuoni Asnjë foto nuk është zgjedhur, marrë apo ruajtur. Redakto foton diff --git a/app/src/main/res/values-sr-rRS/strings.xml b/app/src/main/res/values-sr-rRS/strings.xml index 4fd5d6d8e2..a927511546 100644 --- a/app/src/main/res/values-sr-rRS/strings.xml +++ b/app/src/main/res/values-sr-rRS/strings.xml @@ -43,6 +43,7 @@ work. If not, see . Licenca projekta Šifra doprinosa projektu. Svi su dobrodošli da to urade, uključujući i pridošlice Projektni tim + Zajednica Prikažite informacije o saradniku. Obezbedite da bude prikazan ovde na osnovu saglasnosti nakon doprinosa Nijedna slika nije oznacena. Uređivanje slike diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 07bc1441ef..6d54c9c5ef 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -54,6 +54,7 @@ work. If not, see . Пројектна лиценца Допринос кода пројекту. Сви су добродошли на то, укључујући и придошлице Пројектни тим + Заједница Покажите информације о сараднику. Омогућите да се овде прикаже на бази за пријаву након доприноса Локација Nijedna slika nije oznacena. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4dad665c08..e77233157e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -178,15 +178,13 @@ work. If not, see . Särskilt AsciiDoc-innehåll Sida upp (Page up) Sida ned (Page down) - Flytta text en rad upp - Flytta text en rad nedåt - Starta ny rad nedan Början av rad (Pos home) Slutet av rad (Pos end) Dokumentets början Dokumentets slut Välj allt (Ctrl+A) Tabulator + Nollbreddsutrymme Börja vid botten När dokument laddat, placera markören vid slutet av raden Oordnat listtecken @@ -227,6 +225,7 @@ work. If not, see . Projektets licens Bidrag med kod till projektet. Alla är välkommna, även nybörjare Projektlag + Gemenskap Visa bidragsinformation. Lämna information för att synas här, om du vill, efter bidragande fallande ordning stigande @@ -255,7 +254,6 @@ work. If not, see . Ingen kalender-app är installerad! Populära dokument Färg - Nollbreddsutrymme Grundläggande färgschema Ändrar bakgrunden och textredigerarens förgrundsfärg. Anpassar sig till appens tema som finns tillgängligt i ljust och ett mörkt tema. De syntax-framhävande färgerna förblir desamma. Förinställning diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 3052e0e06d..fa0ff9d318 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -168,15 +168,13 @@ work. If not, see . சிறப்பு விசை பக்கம் மேலே (மேல்நோக்கி நகர்த்து) பக்கம் கீழ் (கீழ்நோக்கி நகர்த்து) - உரையை ஒரு வரி மேல் நோக்கி நகர்த்து - உரையை ஒரு வரி கீழ் நோக்கி நகர்த்து - கீழே புதிய வரியை தொடங்கவும் வரி தொடக்கம் (துவக்க இடம்) வரி முடிவு (முடியும் இடம்) ஆவணத்தின் ஆரம்பம் ஆவணத்தின் முடிவு அனைத்தையும் தேர்வு செய் (Ctrl+A) பட்டியலிடுவோன் + சுழி அகல இடைவெளி கீழிருந்து தொடங்கு ஒரு ஆவணம் ஏற்றப்பட்டவுடன், சுட்டியை அந்த ஆவணம் முடிவடையும் இடத்தில் வைக்கவும் வரிசைப்படுத்தப்படாத பட்டியலின் எழுத்துக்குறி @@ -210,6 +208,7 @@ work. If not, see . இந்த திட்டத்தின் உரிமம் இந்த திட்டத்திற்கு நிரல் எழுதும் பணிக்கு பங்களியுங்கள். அனைவரும் இதற்காக வரவேற்கப்படுகின்றனர், புதுமுகங்கள் உட்பட திட்டக்குழு + சமூகம் பங்களிப்பாளரின் விவரத்தை காண்பிக்கவும். தன்னுடைய பங்களிப்பை வழங்கிய பிறகு அந்த நபரின் விருப்பத்தின் படியே இங்கே அவரின் விவரங்கள் காண்பிக்கப்படவேண்டும் இறங்கு வரிசை ஏறுவரிசை @@ -237,7 +236,6 @@ work. If not, see . நாட்காட்டி செயலி நிறுவப்படவில்லை! பிரபலமான ஆவணங்கள் நிறம் - சுழி அகல இடைவெளி அடிப்படை நிற திட்டம் உரை திருத்தியின் முன்புறம் மற்றும் பின்புறத்தின் நிறத்தை மாற்றுகிறது. செயலியின் நிற அழகாக்கதற்கு ஏற்ப சரி செய்து கொள்கிறது அதனால் வெளிச்சமுள்ள மற்றும் இருண்ட நிற அழகாகத்தில் கிடைக்கிறது. தொடரியல் தனிப்படுத்தலுக்கான நிறங்களில் எந்த மாற்றமும் இல்லை. முன்னமைவு diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 89b0323d9a..0f5945c954 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -69,6 +69,7 @@ work. If not, see . Adı URL / Yol Bağlantı ekle + Linki düzenle Resim Ekle Katkıda Bulunanlar Kayıt konumu @@ -127,7 +128,7 @@ work. If not, see . Not Oluştur Özel belgeler Ekranı açık tut - Ekran görüntülerine izin verme + ekran alıntılarına izin verme Önceki klasöre dön Uygulama Ayarları Düzenleyici Ayarları @@ -179,15 +180,18 @@ work. If not, see . Özel AsciiDoc İçeriği Sayfa Yukarı (Page Up) Sayfa Aşağı (Page Down) - Metni bir satır yukarı taşı - Metni bir satır aşağı taşı - Aşağıda yeni satıra başla Satır Başlangıcı (Pos Home) Satır Sonu (Pos End) Belge Başlangıcı Belge Sonu + Satırı yukarı taşı + Satırı aşağı taşı + Yeni satıra başla + Şu anki satırı seç Tümünü seç (Ctrl + A) Tabulator + Genişliksiz boşluk + Em boşluğu (&emsp;) Alttan başla Bir belge yüklendikten sonra, İmleci belge sonuna yerleştir. Sırasız liste karakteri @@ -198,7 +202,7 @@ work. If not, see . Markor sadece yerel, çevrimdışı kullanılabilir belgeleri düzenleyebilir ve tam dosya yolunu sağlamayan dosya yöneticilerini desteklemez. Dosya veya dizin mevcut değil ve oluşturulamıyor İzinler - Varsayılan dizin\'e geri gidilsin mi ? + Varsayılan dizin\'e geri gidilsin mi? İzin verilmedi Not: Bir eşitleme uygulaması kullanırsanız, dosyalar bilinen veya özel klasörlerde bulunabilir, Markor\'un belge klasörünü değiştirerek dosyaları açabilir veya dosyayı farklı bir dosya yöneticisi ile açabilirsiniz. Dikey hizalama @@ -210,7 +214,7 @@ work. If not, see . Alt Merkez EtkileşimTuşu aralığı - EtkileşimTuşları arasındaki yatay boşluk + Etkileşim Tuşları arasındaki yatay boşluk Metni ortala Metni ekranın ortasında düzenleyin Pano @@ -229,6 +233,7 @@ work. If not, see . Proje Lisansı Projeye kod yazarak katkıda bulunun. Yeni gelenler de dahil olmak üzere herkes kabul edilir Proje Ekibi + Topluluk Katkıda bulunanlarla ilgili bilgileri gösterin. Katkıda bulunanlar, katkıdan bulunduktan sonra burada gösterilmeleri için bilgilerini sağlayabilir azalan artan @@ -257,7 +262,6 @@ work. If not, see . Hiçbir takvim uygulaması yüklü değil! Popüler belgeler Renk - Genişliksiz boşluk Temel renk düzeni Metin düzenleyicinin arka plan ve ön plan rengini değiştirir. Açık ve koyu uygulama temalarında kullanılabilir. Sözdizimi vurgulama renkleri aynı kalır. Hazır ayar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2a45d722a4..486f38abbf 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -180,15 +180,18 @@ work. If not, see . Особливий зміст AsciiDoc До сторінки вище (Page Up) До сторінки нижче (Page Down) - Перемістити текст на один рядок вище - Перемістити текст на один рядок нижче - Почати новий рядок нижче До початку рядка (Home) В кінець рядка (End) Початок документа Кінець документа + Пересунути рядок вгору + Пересунути рядок вниз + Почати новий рядок + Позначити поточний рядок Обрати все (Ctrl + A) Табуляція + Пробіл нульової ширини + Пробіл \"m\" (&emsp;) Починати внизу Після завантаження документа встановити курсор в кінець Символ для невпорядкованих списків @@ -230,6 +233,7 @@ work. If not, see . Ліцензія проекту Зробити внесок у код проекту. Запрошуются всі охочі, разом із новачками Команда проекту + Спільнота Показати інформацію про учасників проекту, що зробили внесок та побажали бути доданими до цього списку за спаданням за зростанням @@ -258,7 +262,6 @@ work. If not, see . Не встановлено додатку календаря! Популярні документи Колір - Пробіл нульової ширини Кольорова тема Змінює тло і колір тексту в редакторі. Допасовується до кольорів програми, тож є у світлій і темній темах. Колір підсвітки синтаксису не змінюється. Попередньо встановлене diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 3f7974a38c..f8bd9d44de 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -82,6 +82,7 @@ work. If not, see . پروجیکٹ لائسنس پروجیکٹ میں کوڈ کا تعاون کریں. ہر ایک کا استقبال ہے ، بشمول نئے آنے والے پروجیکٹ ٹیم + برادری شراکت دار کی معلومات دکھائیں. تعاون کرنے کے بعد آپٹ ان بنیاد پر اسے دکھایا جائے کوئی تصویر سیلیکٹ، کھنچی یا محفوظ نہیں کی گئی. تصویر میں ترمیم کریں diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index bff9c12889..0a84445281 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -174,6 +174,7 @@ work. If not, see . Giấy phép dự án Đóng góp mã vào dự án. Mọi người đều được làm vậy, kể cả những người mới vào Nhóm dự án + Cộng đồng Hiển thị thông tin người đóng góp. Hãy chủ động cung cấp thông tin để được hiện ở đây sau khi đóng góp Không có ảnh nào được chọn, chụp hoặc lưu. Chỉnh sửa ảnh diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 724512a16a..0cd8747aca 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -180,15 +180,13 @@ work. If not, see . 特殊 AsciiDoc 内容 上一页 (Page Up) 下一页 (Page Down) - 上移一行 - 下移一行 - 在下方新建行 行首 (Home 键) 行末 (End 键) 文首 文末 全选 (Ctrl + A) 制表符 + 零宽度空格 从文末开始 载入文件时将光标置于文件末尾处 无序列表标示字符 @@ -258,7 +256,6 @@ work. If not, see . 没有安装日历应用！ 常用文档 颜色 - 零宽度空格 基本颜色方案 改变文本编辑器的背景色和前景色。随应用主题调整因此在明亮和黑暗主题中可用。语法高亮颜色保持不变。 预设值 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3f4a30200c..f6cfd9e0a4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -180,15 +180,13 @@ work. If not, see . 特殊 AsciiDoc 內容 往上頁 (Page Up) 往下頁 (Page Down) - 往上面一行移動文字 - 移動文字到下一行 - 在底下開始新的一行 起始行 (Pos Home) 行末 (Pos End) 文件起頭 文件結尾 全選 (Ctrl + A) 表格 + 無間隔空間 從底端開始 當載入文件後，游標位於末尾 未排序的清單字元 @@ -230,6 +228,7 @@ work. If not, see . 專案許可證 歡迎每個人都來提供程式碼 專案團隊 + 社群 顯示 貢獻者的資訊，貢獻者在提供所有後可在此留下訊息（選項） 降冪 升羃 @@ -258,7 +257,6 @@ work. If not, see . 未找到日曆應用程式 常用文件 顏色 - 無間隔空間 基本顏色主題 Changes background and foreground color of the text editor. Adjusts to app theme so available in light and dark theme. Syntax highlighting colors remain the same. 預設值 From d161e62df0f91cf59057611a493234f40f1575d9 Mon Sep 17 00:00:00 2001 From: wshoy <172920245+wshoy@users.noreply.github.com> Date: Wed, 25 Sep 2024 00:37:08 +0200 Subject: [PATCH 6/7] Create launcher widget for todo (closes #1997, PR #2379) --- app/src/main/AndroidManifest.xml | 16 ++++ .../activity/DocumentEditAndViewFragment.java | 5 + .../markor/activity/MainActivity.java | 2 + .../markor/activity/SettingsActivity.java | 2 + .../markor/format/todotxt/TodoTxtTask.java | 4 +- .../markor/widget/TodoWidgetProvider.java | 70 ++++++++++++++ .../widget/TodoWidgetRemoteViewsFactory.java | 89 ++++++++++++++++++ .../markor/widget/TodoWidgetService.java | 12 +++ .../drawable-nodpi/todo_widget_preview.png | Bin 0 -> 9275 bytes .../main/res/layout/todo_widget_layout.xml | 23 +++++ .../main/res/layout/todo_widget_list_item.xml | 8 ++ app/src/main/res/xml/todo_widget.xml | 12 +++ 12 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/net/gsantner/markor/widget/TodoWidgetProvider.java create mode 100644 app/src/main/java/net/gsantner/markor/widget/TodoWidgetRemoteViewsFactory.java create mode 100644 app/src/main/java/net/gsantner/markor/widget/TodoWidgetService.java create mode 100644 app/src/main/res/drawable-nodpi/todo_widget_preview.png create mode 100644 app/src/main/res/layout/todo_widget_layout.xml create mode 100644 app/src/main/res/layout/todo_widget_list_item.xml create mode 100644 app/src/main/res/xml/todo_widget.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e92e542793..d8ee6a8d6a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -110,6 +110,22 @@ android:name="other.writeily.widget.WrFilesWidgetService" android:permission="android.permission.BIND_REMOTEVIEWS" /> + + + + + + + + + + getProjects() { } public String getCreationDate() { - return getCreationaDate(""); + return getCreationDate(""); } - public String getCreationaDate(final String defaultValue) { + public String getCreationDate(final String defaultValue) { if (creationDate == null) { creationDate = parseOneValueOrDefault(line, PATTERN_CREATION_DATE, defaultValue); } diff --git a/app/src/main/java/net/gsantner/markor/widget/TodoWidgetProvider.java b/app/src/main/java/net/gsantner/markor/widget/TodoWidgetProvider.java new file mode 100644 index 0000000000..3cee11e85b --- /dev/null +++ b/app/src/main/java/net/gsantner/markor/widget/TodoWidgetProvider.java @@ -0,0 +1,70 @@ +package net.gsantner.markor.widget; + +import android.app.PendingIntent; +import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProvider; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.os.Build; +import android.widget.RemoteViews; + +import net.gsantner.markor.ApplicationObject; +import net.gsantner.markor.R; +import net.gsantner.markor.activity.openeditor.OpenFromShortcutOrWidgetActivity; +import net.gsantner.markor.model.AppSettings; +import net.gsantner.markor.model.Document; + +public class TodoWidgetProvider extends AppWidgetProvider { + + @Override + public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { + + int requestCode = 1; + final AppSettings appSettings = ApplicationObject.settings(); + + final int staticFlags = PendingIntent.FLAG_UPDATE_CURRENT | (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0); + final int mutableFlags = PendingIntent.FLAG_UPDATE_CURRENT | (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_MUTABLE : 0); + + for (int appWidgetId : appWidgetIds) { + + RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.todo_widget_layout); + + final Intent intent = new Intent(context, TodoWidgetService.class); + views.setRemoteAdapter(R.id.todo_widget_list_view, intent); + views.setEmptyView(R.id.todo_widget_list_view, R.id.todo_widget_empty_view); + views.setInt(R.id.todo_widget_list_view, "setBackgroundColor", appSettings.getEditorBackgroundColor()); + + final Intent openTodo = new Intent(context, OpenFromShortcutOrWidgetActivity.class) + .setAction(Intent.ACTION_EDIT) + .putExtra(Document.EXTRA_FILE, appSettings.getTodoFile()); + views.setPendingIntentTemplate(R.id.todo_widget_list_view, PendingIntent.getActivity(context, requestCode++, openTodo, mutableFlags)); + views.setOnClickPendingIntent(R.id.todo_widget_container, PendingIntent.getActivity(context, requestCode++, openTodo, staticFlags)); + + // Tell the AppWidgetManager to perform an update on the current app widget + appWidgetManager.updateAppWidget(appWidgetId, views); + } + + super.onUpdate(context, appWidgetManager, appWidgetIds); + } + + // Update all widget lists and shortcuts for all widgets + public static void updateTodoWidgets() { + final Context context = ApplicationObject.get().getApplicationContext(); + final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); + if (appWidgetManager == null) { + // The device does not support widgets. + return; + } + final ComponentName comp = new ComponentName(context, TodoWidgetProvider.class); + final int[] appWidgetIds = appWidgetManager.getAppWidgetIds(comp); + + // Update List + appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.todo_widget_list_view); + + // Trigger remote views update + context.sendBroadcast(new Intent(context, TodoWidgetProvider.class) + .setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE) + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)); + } +} diff --git a/app/src/main/java/net/gsantner/markor/widget/TodoWidgetRemoteViewsFactory.java b/app/src/main/java/net/gsantner/markor/widget/TodoWidgetRemoteViewsFactory.java new file mode 100644 index 0000000000..058c073c56 --- /dev/null +++ b/app/src/main/java/net/gsantner/markor/widget/TodoWidgetRemoteViewsFactory.java @@ -0,0 +1,89 @@ +package net.gsantner.markor.widget; + +import android.content.Context; +import android.content.Intent; +import android.widget.RemoteViews; +import android.widget.RemoteViewsService; + +import net.gsantner.markor.ApplicationObject; +import net.gsantner.markor.R; +import net.gsantner.markor.format.todotxt.TodoTxtTask; +import net.gsantner.markor.model.AppSettings; +import net.gsantner.markor.model.Document; + +import java.util.ArrayList; +import java.util.List; + +public class TodoWidgetRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory { + + private final Context _context; + private final AppSettings _appSettings; + private final Document _document; + private final List _tasks; + + public TodoWidgetRemoteViewsFactory(Context context, Intent intent) { + _context = context; + _appSettings = ApplicationObject.settings(); + _document = new Document(_appSettings.getTodoFile()); + _tasks = new ArrayList<>(); + } + + @Override + public void onCreate() { + onDataSetChanged(); + } + + @Override + public void onDataSetChanged() { + _tasks.clear(); + final String content = _document.loadContent(_context); + if (content == null) { + return; + } + List tasks = TodoTxtTask.getAllTasks(content); + _tasks.addAll(tasks); + } + + @Override + public void onDestroy() { + _tasks.clear(); + } + + @Override + public int getCount() { + return _tasks.size(); + } + + @Override + public RemoteViews getViewAt(int position) { + RemoteViews views = new RemoteViews(_context.getPackageName(), R.layout.todo_widget_list_item); + views.setTextViewText(R.id.todo_widget_item_text, _tasks.get(position).getDescription()); + views.setInt(R.id.todo_widget_item_text, "setTextColor", _appSettings.getEditorForegroundColor()); + + final Intent fillInIntent = new Intent() + .putExtra(Document.EXTRA_FILE_LINE_NUMBER, position); + views.setOnClickFillInIntent(R.id.todo_widget_item_text, fillInIntent); + + return views; + } + + @Override + public RemoteViews getLoadingView() { + return null; + } + + @Override + public int getViewTypeCount() { + return 1; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public boolean hasStableIds() { + return false; + } +} diff --git a/app/src/main/java/net/gsantner/markor/widget/TodoWidgetService.java b/app/src/main/java/net/gsantner/markor/widget/TodoWidgetService.java new file mode 100644 index 0000000000..f65b8d0ef1 --- /dev/null +++ b/app/src/main/java/net/gsantner/markor/widget/TodoWidgetService.java @@ -0,0 +1,12 @@ + +package net.gsantner.markor.widget; + +import android.content.Intent; +import android.widget.RemoteViewsService; + +public class TodoWidgetService extends RemoteViewsService { + @Override + public RemoteViewsFactory onGetViewFactory(Intent intent) { + return (new TodoWidgetRemoteViewsFactory(getApplicationContext(), intent)); + } +} diff --git a/app/src/main/res/drawable-nodpi/todo_widget_preview.png b/app/src/main/res/drawable-nodpi/todo_widget_preview.png new file mode 100644 index 0000000000000000000000000000000000000000..5c97c862b0309a5308f6294fa818101603159885 GIT binary patch literal 9275 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 VHAwX< + + + + + + diff --git a/app/src/main/res/layout/todo_widget_list_item.xml b/app/src/main/res/layout/todo_widget_list_item.xml new file mode 100644 index 0000000000..f846da9354 --- /dev/null +++ b/app/src/main/res/layout/todo_widget_list_item.xml @@ -0,0 +1,8 @@ + + diff --git a/app/src/main/res/xml/todo_widget.xml b/app/src/main/res/xml/todo_widget.xml new file mode 100644 index 0000000000..467a60334a --- /dev/null +++ b/app/src/main/res/xml/todo_widget.xml @@ -0,0 +1,12 @@ + + From c4458214bf77e5c87945343ba71637910ebf5ed6 Mon Sep 17 00:00:00 2001 From: wshoy <172920245+wshoy@users.noreply.github.com> Date: Wed, 25 Sep 2024 00:48:54 +0200 Subject: [PATCH 7/7] Improvements for the action buttons (closes #2386, PR #2388) --- .../markor/format/ActionButtonBase.java | 2 +- .../format/todotxt/TodoTxtActionButtons.java | 75 +++++++++++++++---- .../TodoTxtBasicSyntaxHighlighter.java | 10 +-- .../markor/frontend/DatetimeFormatDialog.java | 29 +++---- .../main/res/layout/time_format_dialog.xml | 6 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-bs/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-et/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fil/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-nb-rNO/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-no/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sc/strings.xml | 2 +- app/src/main/res/values-si/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-ta/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- .../res/values/string-not_translatable.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 43 files changed, 124 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java index 13802e5164..d6927d9e29 100644 --- a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java +++ b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java @@ -546,7 +546,7 @@ protected void runSurroundAction(final String open, final String close, final bo final CharSequence selection = text.subSequence(ss, se); // Case delims around selection - if ((ss > ol) && ((se + cl) <= text.length())) { + if ((ss >= ol) && ((se + cl) <= text.length())) { final String before = text.subSequence(ss - ol, ss).toString(); final String after = text.subSequence(se, se + cl).toString(); if (before.equals(open) && after.equals(close)) { diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java index dffe3adbfe..0d34c7cef8 100644 --- a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java +++ b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java @@ -57,7 +57,7 @@ public List getFormatActionList() { new ActionItem(R.string.abid_todotxt_add_project, R.drawable.ic_new_label_black_24dp, R.string.add_project), new ActionItem(R.string.abid_todotxt_priority, R.drawable.ic_star_border_black_24dp, R.string.priority), new ActionItem(R.string.abid_todotxt_archive_done_tasks, R.drawable.ic_archive_black_24dp, R.string.archive_completed_tasks), - new ActionItem(R.string.abid_todotxt_current_date, R.drawable.ic_date_range_black_24dp, R.string.current_date), + new ActionItem(R.string.abid_todotxt_due_date, R.drawable.ic_date_range_black_24dp, R.string.due_date), new ActionItem(R.string.abid_todotxt_sort_todo, R.drawable.ic_sort_by_alpha_black_24dp, R.string.sort_by), new ActionItem(R.string.abid_common_insert_link, R.drawable.ic_link_black_24dp, R.string.insert_link), new ActionItem(R.string.abid_common_insert_image, R.drawable.ic_image_black_24dp, R.string.insert_image), @@ -106,20 +106,11 @@ public boolean onActionClick(final @StringRes int action) { } case R.string.abid_todotxt_priority: { MarkorDialogFactory.showPriorityDialog(getActivity(), selTasks.get(0).getPriority(), (priority) -> { - ArrayList patterns = new ArrayList<>(); - if (priority.length() > 1) { - patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, "")); - } else if (priority.length() == 1) { - final String _priority = String.format("(%c) ", priority.charAt(0)); - patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, _priority)); - patterns.add(new ReplacePattern("^\\s*", _priority)); - } - runRegexReplaceAction(patterns); - trimLeadingWhiteSpace(); + setPriority(priority.length() == 1 ? priority.charAt(0) : TodoTxtTask.PRIORITY_NONE); }); return true; } - case R.string.abid_todotxt_current_date: { + case R.string.abid_todotxt_due_date: { setDueDate(_appSettings.getDueDateOffset()); return true; } @@ -166,7 +157,52 @@ public boolean onActionLongClick(final @StringRes int action) { } return true; } - case R.string.abid_todotxt_current_date: { + case R.string.abid_todotxt_priority: { + final Editable text = _hlEditor.getText(); + final int[] sel = TextViewUtils.getSelection(_hlEditor); + final int lineStart = TextViewUtils.getLineStart(text, sel[0]); + final int lineEnd = TextViewUtils.getLineEnd(text, sel[1]); + final List tasks = TodoTxtTask.getTasks(text, new int[]{sel[0], sel[1]}); + char prevPriority = '\0', nextPriority = '\0'; + boolean areAllSamePriority = true; + if (lineStart != 0) { + final int prevLineStart = TextViewUtils.getLineStart(text, lineStart - 1); + final int prevLineEnd = TextViewUtils.getLineEnd(text, prevLineStart); + final String prevLine = text.subSequence(prevLineStart, prevLineEnd).toString(); + prevPriority = new TodoTxtTask(prevLine).getPriority(); + } + if (lineEnd != text.length()) { + final int nextLineStart = TextViewUtils.getLineStart(text, lineEnd + 1); + final int nextLineEnd = TextViewUtils.getLineEnd(text, nextLineStart); + final String nextLine = text.subSequence(nextLineStart, nextLineEnd).toString(); + nextPriority = new TodoTxtTask(nextLine).getPriority(); + } + for (TodoTxtTask task : tasks) { + if (task.getPriority() != tasks.get(0).getPriority()) { + areAllSamePriority = false; + break; + } + } + if (areAllSamePriority) { + if(prevPriority != tasks.get(0).getPriority() && prevPriority != '\0') { + setPriority(prevPriority); + } + else if(nextPriority != tasks.get(tasks.size() - 1).getPriority() && nextPriority != '\0') { + setPriority(nextPriority); + } + else { + setPriority(TodoTxtTask.PRIORITY_NONE); + } + } else { + if(prevPriority != '\0') { + setPriority(prevPriority); + } else { + setPriority(tasks.get(0).getPriority()); + } + } + return true; + } + case R.string.abid_todotxt_due_date: { setDate(); return true; } @@ -307,6 +343,19 @@ private static void insertInline(final Editable editable, String thing) { editable.replace(sel[0], sel[1], thing); } + private void setPriority(char priority) { + ArrayList patterns = new ArrayList<>(); + if (priority == TodoTxtTask.PRIORITY_NONE) { + patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, "")); + } else { + final String _priority = String.format("(%c) ", priority); + patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, _priority)); + patterns.add(new ReplacePattern("^\\s*", _priority)); + } + runRegexReplaceAction(patterns); + trimLeadingWhiteSpace(); + } + private static Calendar parseDateString(final String dateString, final Calendar fallback) { if (dateString == null || dateString.length() != TodoTxtTask.DATEF_YYYY_MM_DD_LEN) { return fallback; diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtBasicSyntaxHighlighter.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtBasicSyntaxHighlighter.java index 1a2a2a894a..fa78ca7c82 100644 --- a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtBasicSyntaxHighlighter.java +++ b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtBasicSyntaxHighlighter.java @@ -11,11 +11,11 @@ public class TodoTxtBasicSyntaxHighlighter extends SyntaxHighlighterBase { private final static int COLOR_CONTEXT = 0xff88b04b; private final static int COLOR_PRIORITY_A = 0xffEF2929; - private final static int COLOR_PRIORITY_B = 0xffF57900; - private final static int COLOR_PRIORITY_C = 0xff73D216; - private final static int COLOR_PRIORITY_D = 0xff0099CC; - private final static int COLOR_PRIORITY_E = 0xffEDD400; - private final static int COLOR_PRIORITY_F = 0xff888A85; + private final static int COLOR_PRIORITY_B = 0xffd16900; + private final static int COLOR_PRIORITY_C = 0xff59a112; + private final static int COLOR_PRIORITY_D = 0xff0091c2; + private final static int COLOR_PRIORITY_E = 0xffa952cb; + private final static int COLOR_PRIORITY_F = 0xff878986; private final static int COLOR_DONE_DARK = 0x999d9d9d; private final static int COLOR_DONE_LIGHT = 0x993d3d3d; diff --git a/app/src/main/java/net/gsantner/markor/frontend/DatetimeFormatDialog.java b/app/src/main/java/net/gsantner/markor/frontend/DatetimeFormatDialog.java index 28ec6279c6..f71c795be4 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/DatetimeFormatDialog.java +++ b/app/src/main/java/net/gsantner/markor/frontend/DatetimeFormatDialog.java @@ -103,7 +103,7 @@ public static void showDatetimeFormatDialog(final Activity activity, final Highl final Button datePickButton = viewRoot.findViewById(R.id.start_datepicker_button); final Button timePickButton = viewRoot.findViewById(R.id.start_timepicker_button); final CheckBox formatInsteadCheckbox = viewRoot.findViewById(R.id.get_format_instead_date_or_time_checkbox); - final CheckBox alwaysNowCheckBox = viewRoot.findViewById(R.id.always_use_current_datetime_checkbox); + final CheckBox useCurrentDateCheckbox = viewRoot.findViewById(R.id.use_current_datetime_checkbox); final List recentFormats = getRecentFormats(activity); final List allFormats = getAllFormats(recentFormats); @@ -117,7 +117,7 @@ public static void showDatetimeFormatDialog(final Activity activity, final Highl popupWindow.setOnItemClickListener((parent, view, position, id) -> { formatEditText.setText(allFormats.get(position)); popupWindow.dismiss(); - setToNow(cal, alwaysNowCheckBox.isChecked()); + setToNow(cal, useCurrentDateCheckbox.isChecked()); previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis())); }); @@ -143,7 +143,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { @Override public void afterTextChanged(Editable s) { if (editTime + DELAY > System.currentTimeMillis()) { - setToNow(cal, alwaysNowCheckBox.isChecked()); + setToNow(cal, useCurrentDateCheckbox.isChecked()); previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis())); final boolean error = previewTextView.getText().toString().isEmpty() && !formatEditText.getText().toString().isEmpty(); formatEditText.setError(error ? "^^^!!! 'normal text'" : null); @@ -165,6 +165,7 @@ public void afterTextChanged(Editable s) { // Pick Date Dialog datePickButton.setOnClickListener(button -> new DatePickerDialog(activity, (view, year, month, day) -> { + useCurrentDateCheckbox.setChecked(false); cal.set(Calendar.YEAR, year); cal.set(Calendar.MONTH, month); cal.set(Calendar.DAY_OF_MONTH, day); @@ -174,22 +175,24 @@ public void afterTextChanged(Editable s) { // Pick Time Dialog timePickButton.setOnClickListener(button -> new TimePickerDialog(activity, (timePicker, hour, min) -> { + useCurrentDateCheckbox.setChecked(false); cal.set(Calendar.HOUR_OF_DAY, hour); cal.set(Calendar.MINUTE, min); previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis())); }, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), true).show() ); - // hide buttons when both check box are checked - final View.OnClickListener onOptionsChangedListener = v -> { - boolean dateChangeable = !formatInsteadCheckbox.isChecked() && !alwaysNowCheckBox.isChecked(); - timePickButton.setEnabled(dateChangeable); - datePickButton.setEnabled(dateChangeable); + formatInsteadCheckbox.setOnClickListener(v -> { dateHeadline.setEnabled(!formatInsteadCheckbox.isChecked()); - alwaysNowCheckBox.setEnabled(!formatInsteadCheckbox.isChecked()); - }; - formatInsteadCheckbox.setOnClickListener(onOptionsChangedListener); - alwaysNowCheckBox.setOnClickListener(onOptionsChangedListener); + datePickButton.setEnabled(!formatInsteadCheckbox.isChecked()); + timePickButton.setEnabled(!formatInsteadCheckbox.isChecked()); + useCurrentDateCheckbox.setEnabled(!formatInsteadCheckbox.isChecked()); + }); + + useCurrentDateCheckbox.setOnClickListener(v -> { + setToNow(cal, useCurrentDateCheckbox.isChecked()); + previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis())); + }); // set builder and implement buttons to discard and submit builder.setView(viewRoot) @@ -204,7 +207,7 @@ public void afterTextChanged(Editable s) { final AlertDialog dialog = builder.create(); callbackInsertTextToEditor.set((selectedFormat) -> { - setToNow(cal, alwaysNowCheckBox.isChecked()); + setToNow(cal, useCurrentDateCheckbox.isChecked()); String text = cu.formatDateTime(locale, selectedFormat, cal.getTimeInMillis()); previewTextView.setText(text); hlEditor.insertOrReplaceTextOnCursor(getOutput( diff --git a/app/src/main/res/layout/time_format_dialog.xml b/app/src/main/res/layout/time_format_dialog.xml index 15b9eef11f..3fd5c8d0ec 100644 --- a/app/src/main/res/layout/time_format_dialog.xml +++ b/app/src/main/res/layout/time_format_dialog.xml @@ -141,7 +141,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:enabled="false" android:text="@string/pick_date" android:textAllCaps="false" /> @@ -150,17 +149,16 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:enabled="false" android:text="@string/pick_time" android:textAllCaps="false" /> + android:text="@string/use_current_date_and_time" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3cf4c45d51..d8a9241977 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -266,7 +266,7 @@ work. If not, see . اختر تاريخاً اختر الوقت كتابة الصيغة وليس التاريخ أو الوقت - دائما استخدم الوقت والتاريخ الحاليين + دائما استخدم الوقت والتاريخ الحاليين النتيجة الوقت فقط التاريخ فقط diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 7f0afcb6e4..5aa1e3ebf9 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -258,7 +258,7 @@ work. If not, see . Izaberi datum Odredi vrijeme Format umjesto datuma ili vremena - Uvijek prikaži trenutni datum i vrijeme + Uvijek prikaži trenutni datum i vrijeme Rezultat Samo vrijeme Samo datum diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index e7a0a612ac..dd136004c8 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -279,7 +279,7 @@ work. If not, see . Tria la data Tria l\'hora Obtén el format en lloc de la data o l\'hora - Utilitza sempre la data i l\'hora actual + Utilitza sempre la data i l\'hora actual Resultat Només l\'hora Només la data diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 34d4e9922e..709bb8e3ce 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -269,7 +269,7 @@ work. If not, see . Vybrat datum Vybrat čas Formát místo data nebo času - Vždy používat aktuální datum & čas + Vždy používat aktuální datum & čas Výsledek Pouze čas Pouze datum diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index cedb508bf8..0c9f37785a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -261,7 +261,7 @@ work. If not, see . Vælg dato Vælg tidspunkt Hent format i stedet dato eller tid - Benyt altid aktuel dato & tid + Benyt altid aktuel dato & tid Resultat Kun tid Kun dato diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1f2146bcaf..ec6b373e53 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -274,7 +274,7 @@ work. If not, see . Datum auswählen Zeit auswählen Format statt Datum und Zeit - Immer die aktuelle Uhrzeit verwenden + Immer die aktuelle Uhrzeit verwenden Ergebnis Nur Zeit Nur Datum diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 57cb97d7d7..f455cde0fe 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -269,7 +269,7 @@ work. If not, see . Επιλέξτε ημερομηνία Επιλέξτε ώρα Χρήση μορφής αντί για ημερομηνία ή ώρα - Να χρησιμοποιείται πάντα η τρέχουσα ημερομηνία & ώρα + Να χρησιμοποιείται πάντα η τρέχουσα ημερομηνία & ώρα Αποτέλεσμα Μόνο ώρα Μόνο ημερομηνία diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f28203a61c..f7cb489c7a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -271,7 +271,7 @@ work. If not, see . Elegir fecha Elegir hora Cambiar formato de fecha y hora - Utilizar siempre la fecha actual & hora + Utilizar siempre la fecha actual & hora Resultado Sólo hora Sólo fecha diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 48dd933077..bf69cfb4d6 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -273,7 +273,7 @@ work. If not, see . Vali kuupäev Mära kellaaeg Hankige kuupäeva või kellaaja asemel vorming - Kasuta alati praegust kuupäeva & aega + Kasuta alati praegust kuupäeva & aega Tulemus Ainult aeg Ainult kuupäev diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 997ad553f7..df435ddedf 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -267,7 +267,7 @@ work. If not, see . انتخاب تاریخ انتخاب زمان Get format instead date or time - همیشه از تاریخ و زمان جاری استفاده شود + همیشه از تاریخ و زمان جاری استفاده شود نتیجه فقط زمان Date only diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9a9cc7279b..b38837f6f0 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -261,7 +261,7 @@ work. If not, see . Valitse päivämäärä Valitse aika Hanki muoto sen sijaan päivämäärä tai aika - Käytä aina nykyistä päivämäärää & aikaa + Käytä aina nykyistä päivämäärää & aikaa Tulos Vain aika Vain päivämäärä diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 58d4b16776..0a7e74ac42 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -256,7 +256,7 @@ work. If not, see . Pumili ng petsa Pumili ng oras Kunin mismo ang ayos imbes ang petsa o oras - Palaging gamitin ang petsa ngayon & oras + Palaging gamitin ang petsa ngayon & oras Resulta Oras lamang Petsa lamang diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 38b904cd4a..31318eeb34 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -272,7 +272,7 @@ work. If not, see . Choisissez une date Choisissez l\'heure Obtenez le format plutôt que date ou heure - Toujours utiliser la date et l\'heure courante + Toujours utiliser la date et l\'heure courante Résultats Heure seulement Date seulement diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 22fa2097df..bdad36f93e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -255,7 +255,7 @@ work. If not, see . Válassz dátumot Válassz időpontot Formátum megjelenítése dátum vagy idő helyett - Mindig az aktuális dátum és idő használata + Mindig az aktuális dátum és idő használata Eredmény Csak idő Csak dátum diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 98d84abf94..604439e37e 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -267,7 +267,7 @@ work. If not, see . Pilih tanggal Pilih waktu Dapatkan format sebagai gantinya tanggal atau waktu - Selalu gunakan tanggal & waktu saat ini + Selalu gunakan tanggal & waktu saat ini Hasil Hanya waktu Hanya tanggal diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d30f63b8f6..588770b91d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -281,7 +281,7 @@ work. If not, see . Scegli la data Scegli l\'ora Ottieni il formato invece della data o dell\'ora - Usa sempre la date e ora attuale + Usa sempre la date e ora attuale Risultato Solo l\'ora Solo la data diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 7704211265..ae9e8e67df 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -258,7 +258,7 @@ work. If not, see . בחר תאריך בחר שעה קבל תצורה במקום תאריך או שעה - השתמש תמיד בתאריך והשעה הנוכחית + השתמש תמיד בתאריך והשעה הנוכחית תוצאה זמן בלבד תאריך בלבד diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c1ffd50b8d..745b72de4c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -262,7 +262,7 @@ work. If not, see . 日付を選択 時間を選択 日付や時間の代わりに形式を取得 - 常に現在の日付と時間を使用する + 常に現在の日付と時間を使用する 結果 時間のみ 日付のみ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index dd5c73e722..74456f74ff 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -252,7 +252,7 @@ work. If not, see . 날짜 선택 시간 선택 날짜/시간 대신 형식 가져오기 - 항상 현재 날짜 및 시간 사용하기 + 항상 현재 날짜 및 시간 사용하기 결과 시간만 날짜만 diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 6f5483b668..1fa4509e99 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -270,7 +270,7 @@ work. If not, see . Velg dato Velg tid Hent format i stedet dato eller klokkeslett - Alltid bruk nåværende dato & tid + Alltid bruk nåværende dato & tid Resultat Kun tid Kun dato diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4f2ace2207..2faff90124 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -261,7 +261,7 @@ work. If not, see . Kies datum Kies tijd Ophalen format in plaats van datum of tijd - Altijd de huidige datum & tijd gebruiken + Altijd de huidige datum & tijd gebruiken Resultaat Alleen tijd Alleen datum diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 461d8f4c2d..d56b0e87e8 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -271,7 +271,7 @@ work. If not, see . Velg dato Velg tid Hent format i stedet dato eller klokkeslett - Alltid bruk nåværende dato & tid + Alltid bruk nåværende dato & tid Resultat Kun tid Kun dato diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9ef52d872b..3e65e365d9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -264,7 +264,7 @@ work. If not, see . Wybierz datę Wybierz godzinę Pobierz format zamiast daty lub godziny - Zawsze używaj bieżącej daty i godziny + Zawsze używaj bieżącej daty i godziny Wynik Tylko godzina Tylko data diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 05cf532e56..61cc44fca5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -269,7 +269,7 @@ work. If not, see . Selecionar data Selecionar hora Obter formato inserido ao em vez de data e hora - Utilizar sempre a data & hora atuais + Utilizar sempre a data & hora atuais Resultado Apenas hora Apenas data diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2cbe2edbc0..ddce6d5d8c 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -279,7 +279,7 @@ work. If not, see . Escolher data Escolher hora Obter formato em vez de data e hora - Utilizar sempre a data e hora atuais + Utilizar sempre a data e hora atuais Resultado Apenas hora Apenas data diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6cdd7ed1c8..cfff18f584 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -261,7 +261,7 @@ work. If not, see . Alege data Alege ora Obțineți formatul în loc de data sau ora - Utilizaţi întotdeauna data curentă & ora + Utilizaţi întotdeauna data curentă & ora Rezultat Doar timp Doar data diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 78076d45d4..476bab3cc2 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -274,7 +274,7 @@ work. If not, see . Выбрать дату Выбор времени Получить формат вместо даты или времени - Всегда использовать текущую дату & время + Всегда использовать текущую дату & время Результат Только время Только дата diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 96a99222c6..b9cb018073 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -274,7 +274,7 @@ work. If not, see . Issèbera sa data Issèbera s\'ora Otene su formadu in logu de sa data o de s\'ora - Imprea semper sa data e s\'ora atuales + Imprea semper sa data e s\'ora atuales Risultadu Ora ebbia Data ebbia diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 34009dce46..4684102f34 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -256,7 +256,7 @@ work. If not, see . දිනය තෝරන්න කාලය තෝරන්න දිනය හෝ වේලාව වෙනුවට ආකෘතිය ලබා ගන්න - සෑම විටම වත්මන් දිනය & වරක් භාවිතා කරන්න + සෑම විටම වත්මන් දිනය & වරක් භාවිතා කරන්න ප්රතිඵලය කාලය පමණි දිනය පමණි diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 29073e9ddb..35339a0cf2 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -113,7 +113,7 @@ work. If not, see . Rôzne Pozadie Písmo - Vzdycky vyuzivaj sucasny datum a cas + Vzdycky vyuzivaj sucasny datum a cas Zavrieť Obľúbené Pocet medzier po pouzity tabulatora diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e77233157e..a6dfc31f93 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -271,7 +271,7 @@ work. If not, see . Välj datum Välj tid Hämta format i stället för datum eller tid - Använd alltid aktuellt datum & tid + Använd alltid aktuellt datum & tid Resultat Endast tid Endast datum diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index fa0ff9d318..4944faa3f6 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -253,7 +253,7 @@ work. If not, see . தேதியைத் தேர்ந்தெடு நேரத்தை தேர்வுசெய் தேதி அல்லது நேரத்திற்கு பதிலாக அதன் வடிவத்தை பெறுக - எப்போதும் தற்போதைய தேதி & நேரத்தை பயன்படுத்தவும் + எப்போதும் தற்போதைய தேதி & நேரத்தை பயன்படுத்தவும் முடிவு நேரம் மட்டும் தேதி மட்டும் diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 0f5945c954..14d6ab46b2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -279,7 +279,7 @@ work. If not, see . Tarih Seç Saat seç Tarih veya saat yerine biçimi al - Her zaman geçerli tarih ve saati kullan + Her zaman geçerli tarih ve saati kullan Sonuç Sadece saat Sadece tarih diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 486f38abbf..72b70de2fe 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -279,7 +279,7 @@ work. If not, see . Оберіть дату Оберіть час Вжити формат замість дати або часу - Завжди використовувати поточні дату і час + Завжди використовувати поточні дату і час Результат Лише час Лише дата diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0cd8747aca..d173bfbf02 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -273,7 +273,7 @@ work. If not, see . 选择日期 选择时间 仅生成格式, 而不是日期或时间 - 始终使用当前日期 & 时间 + 始终使用当前日期 & 时间 结果 仅时间 仅日期 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f6cfd9e0a4..8ff807a61d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -274,7 +274,7 @@ work. If not, see . 選擇日期 選擇時間 不含日期或時間的原始格式 - 總是使用目前的日期 & 時間 + 總是使用目前的日期 & 時間 結果 僅時間 僅日期 diff --git a/app/src/main/res/values/string-not_translatable.xml b/app/src/main/res/values/string-not_translatable.xml index c6d32d2613..6066dc02a3 100644 --- a/app/src/main/res/values/string-not_translatable.xml +++ b/app/src/main/res/values/string-not_translatable.xml @@ -343,7 +343,7 @@ work. If not, see . abid_todotxt_add_project abid_todotxt_priority abid_todotxt_archive_done_tasks - abid_todotxt_current_date + abid_todotxt_due_date abid_todotxt_sort_todo diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc1786c8ad..f70f1a10d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -295,7 +295,7 @@ work. If not, see . Pick date Pick time Get format instead date or time - Always use current date & time + Use current date & time Result Time only Date only