From b58e75399c841b7c2928c8406b5e2ff07f040e1c Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Tue, 11 Jul 2023 14:41:28 +0100 Subject: [PATCH 01/11] Fix searchterm reverts (#1336) * Always search for search entry text if present * Add action to clear search entry * Remove temporary comment * Searchbar listens directly for selection change and clears itself * Remove commented out code --------- Co-authored-by: Ryan Kornheisl --- src/MainWindow.vala | 4 ++++ src/Widgets/SearchBar.vala | 11 ++++++++++- src/Widgets/SourceView.vala | 9 +++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 0ea5804d3..db444e8ff 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -1073,6 +1073,10 @@ namespace Scratch { search_bar.search_entry.text = current_search_term; search_bar.search_entry.grab_focus (); search_bar.search_next (); + } else if (search_bar.search_entry.text != "") { + // Always search on what is showing in search entry + current_search_term = search_bar.search_entry.text; + search_bar.search_entry.grab_focus (); } else { var current_doc = get_current_document (); // This is also called when all documents are closed. diff --git a/src/Widgets/SearchBar.vala b/src/Widgets/SearchBar.vala index 3072c167c..adb7f522c 100644 --- a/src/Widgets/SearchBar.vala +++ b/src/Widgets/SearchBar.vala @@ -26,7 +26,6 @@ namespace Scratch.Widgets { MIXED, ALWAYS } - public weak MainWindow window { get; construct; } private Gtk.Button tool_arrow_up; @@ -235,8 +234,11 @@ namespace Scratch.Widgets { return; } else if (this.text_buffer != null) { this.text_buffer.changed.disconnect (on_text_buffer_changed); + this.text_view.selection_changed.disconnect (on_selection_changed); } + this.text_view = text_view; + this.text_view.selection_changed.connect (on_selection_changed); this.text_buffer = text_view.get_buffer (); this.text_buffer.changed.connect (on_text_buffer_changed); this.search_context = new Gtk.SourceSearchContext (text_buffer as Gtk.SourceBuffer, null); @@ -250,6 +252,13 @@ namespace Scratch.Widgets { update_search_widgets (); } + private void on_selection_changed () { + var selected_text = text_view.get_selected_text (); + if (selected_text != search_entry.text) { + search_entry.text = ""; + } + } + private void on_replace_entry_activate () { if (text_buffer == null) { warning ("No valid buffer to replace"); diff --git a/src/Widgets/SourceView.vala b/src/Widgets/SourceView.vala index ef67e56d1..bb8bab160 100644 --- a/src/Widgets/SourceView.vala +++ b/src/Widgets/SourceView.vala @@ -35,6 +35,7 @@ namespace Scratch.Widgets { private uint size_allocate_timer = 0; private Gtk.TextIter last_select_start_iter; private Gtk.TextIter last_select_end_iter; + private string selected_text = ""; private SourceGutterRenderer git_diff_gutter_renderer; private const uint THROTTLE_MS = 400; @@ -42,6 +43,7 @@ namespace Scratch.Widgets { private const double SCROLL_THRESHOLD = 1.0; public signal void style_changed (Gtk.SourceStyleScheme style); + // "selection_changed" signal now only emitted when the selected text changes (position ignored). Listened to by searchbar and highlight word selection plugin public signal void selection_changed (Gtk.TextIter start_iter, Gtk.TextIter end_iter); public signal void deselected (); @@ -570,7 +572,6 @@ namespace Scratch.Widgets { last_select_start_iter.assign (start); last_select_end_iter.assign (end); - update_draw_spaces (); if (selection_changed_timer != 0) { @@ -592,7 +593,11 @@ namespace Scratch.Widgets { Gtk.TextIter start, end; bool selected = buffer.get_selection_bounds (out start, out end); if (selected) { - selection_changed (start, end); + var prev_selected_text = selected_text; + selected_text = buffer.get_text (start, end, true); + if (selected_text != prev_selected_text) { + selection_changed (start, end); + } } else { deselected (); } From 82e97a97475bae99123ee5bd39107f25dabdbcaa Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Sun, 9 Jul 2023 19:28:51 +0000 Subject: [PATCH 02/11] Translated using Weblate (Ukrainian) Currently translated at 100.0% (185 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/uk/ --- po/uk.po | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4c99ee72d..30f973188 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-04-28 20:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: Ihor Hordiichuk \n" -"Language-Team: Ukrainian \n" +"Language-Team: Ukrainian " +"\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.17\n" "X-Launchpad-Export-Date: 2017-05-03 06:03+0000\n" @@ -442,18 +442,16 @@ msgid "Show Anyway" msgstr "Усе одно показати" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "Попереднє розташування файлу «%s» від'єднано." +msgstr "Попереднє розташування файлу «%s» від'єднано, але є незбережені зміни." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "Файл «%s» було змінено іншим застосунком." +msgstr "Файл «%s» було видалено, але є незбережені зміни." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -463,20 +461,21 @@ msgid "File “%s” does not have write permission." msgstr "Файл «%s» не має дозволу на запис." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "Файл «%s» було змінено іншим застосунком." +msgstr "Файл «%s» було змінено іншим застосунком" #: src/Services/Document.vala:886 msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." msgstr "" +"Також є незбережені зміни. Перезавантаження документа перезапише незбережені " +"зміни." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "З моменту останнього збереження в документі відбулися зовнішні зміни." #: src/Services/Document.vala:908 #, c-format @@ -501,11 +500,9 @@ msgstr "Перезавантажити" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "Перезаписати" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the document elsewhere" msgid "Save Document elsewhere" msgstr "Зберегти документ в іншому місці" From d0b860f55ab831c30eebd4f351e7f549f661bfac Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Mon, 10 Jul 2023 10:46:00 +0000 Subject: [PATCH 03/11] Translated using Weblate (Japanese) Currently translated at 100.0% (185 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/ja/ --- po/ja.po | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/po/ja.po b/po/ja.po index 62b45707d..ecc329abe 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-04-30 00:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: Ryo Nakano \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -433,18 +433,16 @@ msgid "Show Anyway" msgstr "強制的に表示" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "ファイル “%s” を含む場所はアンマウントされています。" +msgstr "ファイル “%s” を含む場所はアンマウントされていて、未保存の変更があります。" #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "ファイル “%s” は外部のアプリケーションによって変更されました。" +msgstr "ファイル “%s” は削除されていて、未保存の変更があります。" #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -454,20 +452,20 @@ msgid "File “%s” does not have write permission." msgstr "“%s” への書き込み権限がありません。" #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "ファイル “%s” は外部のアプリケーションによって変更されました。" +msgstr "ファイル “%s” は外部のアプリケーションによって変更されました" #: src/Services/Document.vala:886 msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." -msgstr "" +msgstr "未保存の変更も存在します。ドキュメントを最読み込みすると、未保存の変更は上書" +"きされます。" #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "ドキュメントは、最後の保存以降に外部で変更されました。" #: src/Services/Document.vala:908 #, c-format @@ -492,11 +490,9 @@ msgstr "再読み込み" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "上書きする" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the document elsewhere" msgid "Save Document elsewhere" msgstr "ドキュメントをほかの場所に保存" From 6cbcfd049e846c51e41e9f9710f14e9411878a34 Mon Sep 17 00:00:00 2001 From: Jakub Kyzr Date: Tue, 11 Jul 2023 06:58:28 +0000 Subject: [PATCH 04/11] Translated using Weblate (Czech) Currently translated at 99.4% (184 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/cs/ --- po/cs.po | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3d4b5e8f0..5c7ce5ade 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-07-06 14:07+0000\n" -"Last-Translator: hnklp \n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" +"Last-Translator: Jakub Kyzr \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -440,18 +440,17 @@ msgid "Show Anyway" msgstr "Přesto zobrazit" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "Úložiště obsahující soubor „%s“ bylo odpojeno." +msgstr "" +"Úložiště obsahující soubor „%s“ bylo odpojeno a existují neuložené změny." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "Soubor „%s“ byl mezitím pozměněn jinou aplikací." +msgstr "Soubor „%s“ byl mezitím smazán a existují neuložené změny." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -461,20 +460,21 @@ msgid "File “%s” does not have write permission." msgstr "Soubor „%s“ je chráněn proti zápisu." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "Soubor „%s“ byl mezitím pozměněn jinou aplikací." +msgstr "Soubor „%s“ byl mezitím pozměněn jinou aplikací" #: src/Services/Document.vala:886 msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." msgstr "" +"Existují neuložené změny. Opětovné načtení dokumentu přepíše tyto neuložené " +"změny." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "Tento dokument byl od posledního uložení pozměněn jinou aplikací." #: src/Services/Document.vala:908 #, c-format @@ -499,13 +499,11 @@ msgstr "Znovu načíst" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "Přepsat" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the current file" msgid "Save Document elsewhere" -msgstr "Uložit současný soubor" +msgstr "Uložit dokument jinam" #: src/Services/TemplateManager.vala:198 msgid "Templates" From e7e406e61075f59421abe31264cac2093c64ff8f Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 11 Jul 2023 14:51:07 +0000 Subject: [PATCH 05/11] Translated using Weblate (Polish) Currently translated at 97.8% (181 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/pl/ --- po/pl.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/po/pl.po b/po/pl.po index a2b0b060a..29f0accb3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-04-28 20:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: Marcin Serwin \n" "Language-Team: Polish \n" "Language: pl\n" @@ -443,18 +443,18 @@ msgid "Show Anyway" msgstr "Pokaż mimo to" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "Położenie zawierające plik „%s” jest niedostępne." +msgstr "" +"Położenie zawierające plik „%s” zostało odłączone i istnieją niezapisane " +"zmiany." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "Plik „%s” został zmieniony przez zewnętrzną aplikację." +msgstr "Plik „%s” został usunięty i istnieją niezapisane zmiany." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -464,10 +464,9 @@ msgid "File “%s” does not have write permission." msgstr "Plik „%s” nie ma uprawnień do zapisywania." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "Plik „%s” został zmieniony przez zewnętrzną aplikację." +msgstr "Plik „%s” został zmieniony przez zewnętrzną aplikację" #: src/Services/Document.vala:886 msgid "" From eb07a8dbafba32790a96c7141f76df60bd9b9cc4 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 11 Jul 2023 08:08:43 +0000 Subject: [PATCH 06/11] Translated using Weblate (Catalan) Currently translated at 100.0% (185 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/ca/ --- po/ca.po | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/po/ca.po b/po/ca.po index 550bfb4f6..404235e00 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-04-28 20:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: David M \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -440,18 +440,17 @@ msgid "Show Anyway" msgstr "Mostra'l tanmateix" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "La ubicació que conté el fitxer %s s'ha desmuntat." +msgstr "" +"La ubicació que conté el fitxer %s s'ha desmuntat i hi ha canvis no desats." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "El fitxer %s ha estat modificat per una aplicació externa." +msgstr "S'ha suprimit el fitxer %s i hi ha canvis no desats." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -461,8 +460,7 @@ msgid "File “%s” does not have write permission." msgstr "El fitxer %s no té permís d'escriptura." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" msgstr "El fitxer %s ha estat modificat per una aplicació externa." @@ -471,10 +469,13 @@ msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." msgstr "" +"També hi ha canvis no desats. Si torneu a carregar el document, se " +"sobreescriuran els canvis no desats." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." msgstr "" +"El document ha canviat externament des de l'última vegada que el vau desar." #: src/Services/Document.vala:908 #, c-format @@ -500,11 +501,9 @@ msgstr "Torna a carregar" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "Sobreescriu" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the document elsewhere" msgid "Save Document elsewhere" msgstr "Desa el document en un altre lloc" From 47f25ef825c0d04216a2b8448577aba938dbf3aa Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Mon, 10 Jul 2023 06:57:39 +0000 Subject: [PATCH 07/11] Translated using Weblate (English (United Kingdom)) Currently translated at 100.0% (185 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/en_GB/ --- po/en_GB.po | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 0cfe8af51..0e8a6a9e5 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-04-28 20:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: David Hewitt \n" "Language-Team: English (United Kingdom) \n" @@ -437,18 +437,18 @@ msgid "Show Anyway" msgstr "Show Anyway" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "The location containing the file “%s” was unmounted." +msgstr "" +"The location containing the file “%s” was unmounted and there are unsaved " +"changes." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "File “%s” was modified by an external application." +msgstr "File “%s” was deleted and there are unsaved changes." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -458,20 +458,21 @@ msgid "File “%s” does not have write permission." msgstr "File “%s” does not have write permission." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "File “%s” was modified by an external application." +msgstr "File “%s” was modified by an external application" #: src/Services/Document.vala:886 msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." msgstr "" +"There are also unsaved changes. Reloading the document will overwrite the " +"unsaved changes." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "The document changed externally since you last saved it." #: src/Services/Document.vala:908 #, c-format @@ -496,13 +497,11 @@ msgstr "Reload" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "Overwrite" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the document elsewhere" msgid "Save Document elsewhere" -msgstr "Save the document elsewhere" +msgstr "Save Document elsewhere" #: src/Services/TemplateManager.vala:198 msgid "Templates" From ac0b73106676115fc76d97c12d0c12e2b179bf54 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Mon, 10 Jul 2023 07:56:15 +0000 Subject: [PATCH 08/11] Translated using Weblate (Hebrew) Currently translated at 100.0% (185 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/he/ --- po/he.po | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/po/he.po b/po/he.po index af3a3bc18..1a60242d8 100644 --- a/po/he.po +++ b/po/he.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-04-28 20:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -435,18 +435,16 @@ msgid "Show Anyway" msgstr "להציג בכל זאת" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "בוטלה העגינה של המקום המכיל את הקובץ „%s”." +msgstr "בוטלה העגינה של המקום המכיל את הקובץ „%s” והיו שינויים שלא נשמרו." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "הקובץ „%s” נערך ביישום חיצוני." +msgstr "הקובץ „%s” נמחק ויש שינויים שלא נשמרו." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -456,20 +454,19 @@ msgid "File “%s” does not have write permission." msgstr "לקובץ „%s” אין הרשאות כתיבה." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "הקובץ „%s” נערך ביישום חיצוני." +msgstr "הקובץ „%s” נערך ביישום חיצוני" #: src/Services/Document.vala:886 msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." -msgstr "" +msgstr "יש גם שינויים שלא נשמרו. טעינת המסמך מחדש ישכתב את השינויים שלא נשמרו." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "המסמך נערך חיצונית מאז ששמרת אותו לאחרונה." #: src/Services/Document.vala:908 #, c-format @@ -494,11 +491,9 @@ msgstr "רענון" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "לשכתב" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the document elsewhere" msgid "Save Document elsewhere" msgstr "לשמור את המסמך במקום אחר" From e4ee94d8d65e55e1b2c74151eac97c6491227fab Mon Sep 17 00:00:00 2001 From: TomiOhl Date: Sun, 9 Jul 2023 21:06:11 +0000 Subject: [PATCH 09/11] Translated using Weblate (Hungarian) Currently translated at 100.0% (185 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/hu/ --- po/hu.po | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/po/hu.po b/po/hu.po index 05f6236ab..9c06a1527 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-05-05 09:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: TomiOhl \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian " +"\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -441,18 +441,18 @@ msgid "Show Anyway" msgstr "Megnyitás mindenképp" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "A hely, amely tartalmazta a(z) \"%s\" fájlt, leválasztásra került." +msgstr "" +"A hely, amely tartalmazta a(z) \"%s\" fájlt, leválasztásra került és nem " +"mentett módosítások vannak." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "A(z) \"%s\" fájlt egy külső alkalmazás módosította." +msgstr "A(z) \"%s\" fájl törōlve és nem mentett módosítások vannak." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -462,20 +462,21 @@ msgid "File “%s” does not have write permission." msgstr "A(z) \"%s\" fájlhoz nincs írási engedélye." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "A(z) \"%s\" fájlt egy külső alkalmazás módosította." +msgstr "A(z) \"%s\" fájlt egy külső alkalmazás módosította" #: src/Services/Document.vala:886 msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." msgstr "" +"Nem mentett módosítások is vannak. A dokumentum újratöltése felülírja a nem " +"mentett módosításokat." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "A dokumentum külső forrásból módosult a legutóbbi mentés óta." #: src/Services/Document.vala:908 #, c-format @@ -500,11 +501,9 @@ msgstr "Újratöltés" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "Felülírás" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the document elsewhere" msgid "Save Document elsewhere" msgstr "A dokumentum mentése máshova" From 8bae5a0344e062398d8d074b0b7c64b09df9da43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 9 Jul 2023 19:27:37 +0000 Subject: [PATCH 10/11] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l=20(nb))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 90.2% (167 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/nb/ --- po/nb.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/nb.po b/po/nb.po index 6a41dce26..d96e4ba51 100644 --- a/po/nb.po +++ b/po/nb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-06-14 14:07+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: Allan Nordhøy \n" "Language-Team: Norwegian Bokmål \n" @@ -492,14 +492,16 @@ msgstr "" "eller fortsette redigeringen?" #: src/Services/Document.vala:886 +#, fuzzy msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." msgstr "" +"Det er også ulagrede endringer. Å gjeninnlaste dokumentet vil overskrive dem." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "Dokumentet endret seg eksternt siden sist gang du lagret det." #: src/Services/Document.vala:908 #, c-format @@ -526,7 +528,7 @@ msgstr "Last Opp" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "Overskriv" #: src/Services/Document.vala:976 #, fuzzy From 660a98a32f3cf52995b74d44cbc20d32c39b8462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BA=D1=83=D0=B1=D0=B8=D0=BA=20=D0=BA=D1=80=D1=83=D0=B3?= =?UTF-8?q?=D0=BB=D1=8B=D0=B9?= Date: Mon, 10 Jul 2023 18:04:58 +0000 Subject: [PATCH 11/11] Translated using Weblate (Russian) Currently translated at 100.0% (185 of 185 strings) Translation: Code/Code Translate-URL: https://l10n.elementary.io/projects/code/code/ru/ --- po/ru.po | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/po/ru.po b/po/ru.po index af6eac9c0..4f7a74915 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: scratch\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-09 17:18+0000\n" -"PO-Revision-Date: 2023-04-28 20:06+0000\n" +"PO-Revision-Date: 2023-07-12 15:07+0000\n" "Last-Translator: кубик круглый \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.17\n" "X-Launchpad-Export-Date: 2017-05-04 05:45+0000\n" @@ -441,18 +441,17 @@ msgid "Show Anyway" msgstr "Всё равно открыть" #: src/Services/Document.vala:819 -#, fuzzy, c-format -#| msgid "The location containing the file “%s” was unmounted." +#, c-format msgid "" "The location containing the file “%s” was unmounted and there are unsaved " "changes." -msgstr "Источник, содержащий файл «%s», был извлечён." +msgstr "" +"Источник, содержащий файл «%s» с несохранёнными изменениями, был извлечён." #: src/Services/Document.vala:821 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was deleted and there are unsaved changes." -msgstr "Файл «%s» был изменён другим приложением." +msgstr "Файл «%s» с несохранёнными изменениями был изменён другим приложением." #. Check external changes after loading #. The file has become unwritable while changes are pending @@ -462,20 +461,21 @@ msgid "File “%s” does not have write permission." msgstr "Файл «%s» не имеет прав на запись." #: src/Services/Document.vala:881 -#, fuzzy, c-format -#| msgid "File “%s” was modified by an external application." +#, c-format msgid "File “%s” was modified by an external application" -msgstr "Файл «%s» был изменён другим приложением." +msgstr "Файл «%s» был изменён другим приложением" #: src/Services/Document.vala:886 msgid "" "There are also unsaved changes. Reloading the document will overwrite the " "unsaved changes." msgstr "" +"Имеются несохранённые изменения. При перезагрузке документа они будут " +"перезаписаны." #: src/Services/Document.vala:890 msgid "The document changed externally since you last saved it." -msgstr "" +msgstr "Документ был изменён извне с момента его последнего сохранения." #: src/Services/Document.vala:908 #, c-format @@ -500,11 +500,9 @@ msgstr "Перезагрузить" #: src/Services/Document.vala:973 msgid "Overwrite" -msgstr "" +msgstr "Перезаписать" #: src/Services/Document.vala:976 -#, fuzzy -#| msgid "Save the document elsewhere" msgid "Save Document elsewhere" msgstr "Сохранить в другом месте"