Merge branch 'master' into release-7.1.0

po/cs.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-07-12 15:07+0000\n"
+"PO-Revision-Date: 2023-07-19 08:07+0000\n"
 "Last-Translator: Jakub Kyzr <[email protected]>\n"
 "Language-Team: Czech <https://l10n.elementary.io/projects/code/code/cs/>\n"
 "Language: cs\n"
@@ -682,7 +682,7 @@ msgstr "Nikdy"
 
 #: src/Widgets/SearchBar.vala:104
 msgid "Mixed Case"
-msgstr ""
+msgstr "Smíšená písmena"
 
 #: src/Widgets/SearchBar.vala:105
 msgid "Always"

po/de.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-05-01 21:16+0000\n"
+"PO-Revision-Date: 2023-07-14 18:07+0000\n"
 "Last-Translator: Uwe S <[email protected]>\n"
 "Language-Team: German <https://l10n.elementary.io/projects/code/code/de/>\n"
 "Language: de\n"
@@ -442,18 +442,19 @@ msgid "Show Anyway"
 msgstr "Trotzdem anzeigen"
 
 #: 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 "Der Ort, an dem sich die Datei »%s« befindet, wurde ausgehängt."
+msgstr ""
+"Der Ort, an dem sich die Datei »%s« befindet, wurde ausgehängt; es sind "
+"ungespeicherte Änderungen vorhanden."
 
 #: 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 "Die Datei »%s« wurde von einer anderen Anwendung bearbeitet."
+msgstr ""
+"Die Datei »%s« wurde gelöscht; es sind ungespeicherte Änderungen vorhanden."
 
 #. Check external changes after loading
 #. The file has become unwritable while changes are pending
@@ -463,20 +464,23 @@ msgid "File “%s” does not have write permission."
 msgstr "Datei »%s« ist schreibgeschützt."
 
 #: 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 "Die Datei »%s« wurde von einer anderen Anwendung bearbeitet."
+msgstr "Die Datei »%s« wurde von einer anderen Anwendung bearbeitet"
 
 #: src/Services/Document.vala:886
 msgid ""
 "There are also unsaved changes. Reloading the document will overwrite the "
 "unsaved changes."
 msgstr ""
+"Es sind außerdem ungespeicherte Ändeungen vorhanden. Ein erneutes Laden des "
+"Dokuments wird diese Änderungen überschreiben."
 
 #: src/Services/Document.vala:890
 msgid "The document changed externally since you last saved it."
 msgstr ""
+"Das Dokument wurde von einem anderen Programm geändert, nachdem Sie es "
+"zuletzt gespeichert haben."
 
 #: src/Services/Document.vala:908
 #, c-format
@@ -503,11 +507,9 @@ msgstr "Neu laden"
 
 #: src/Services/Document.vala:973
 msgid "Overwrite"
-msgstr ""
+msgstr "Überschreiben"
 
 #: src/Services/Document.vala:976
-#, fuzzy
-#| msgid "Save the document elsewhere"
 msgid "Save Document elsewhere"
 msgstr "Dokument an anderem Ort speichern"
 

po/fr.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-05-05 09:06+0000\n"
-"Last-Translator: Corentin Noël <[email protected]>\n"
+"PO-Revision-Date: 2023-07-21 09:07+0000\n"
+"Last-Translator: Nathan <[email protected]>\n"
 "Language-Team: French <https://l10n.elementary.io/projects/code/code/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -442,18 +442,20 @@ msgid "Show Anyway"
 msgstr "Afficher quand-même"
 
 #: 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 "L'emplacement contenant le fichier « %s » a été démonté."
+msgstr ""
+"L'emplacement contenant le fichier « %s » a été démonté et certaines "
+"modifications n'ont pas été enregistrées."
 
 #: 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 "Le fichier « %s » a été modifié par une application externe."
+msgstr ""
+"Le fichier « %s » a été supprimé et certaines modifications n'ont pas été "
+"enregistrées."
 
 #. Check external changes after loading
 #. The file has become unwritable while changes are pending
@@ -463,20 +465,23 @@ msgid "File “%s” does not have write permission."
 msgstr "Le fichier « %s » n'est pas accessible en écriture."
 
 #: 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 "Le fichier « %s » a été modifié par une application externe."
+msgstr "Le fichier « %s » a été modifié par une application externe"
 
 #: src/Services/Document.vala:886
 msgid ""
 "There are also unsaved changes. Reloading the document will overwrite the "
 "unsaved changes."
 msgstr ""
+"Certaines modifications n'ont pas été enregistrées. Recharger le document "
+"écrasera ces modifications."
 
 #: src/Services/Document.vala:890
 msgid "The document changed externally since you last saved it."
 msgstr ""
+"Le document a été modifié depuis que vous l'avez enregistré pour la première "
+"fois."
 
 #: src/Services/Document.vala:908
 #, c-format
@@ -502,13 +507,11 @@ msgstr "Recharger"
 
 #: src/Services/Document.vala:973
 msgid "Overwrite"
-msgstr ""
+msgstr "Écraser"
 
 #: src/Services/Document.vala:976
-#, fuzzy
-#| msgid "Save the document elsewhere"
 msgid "Save Document elsewhere"
-msgstr "Enregistrer le fichier ailleurs"
+msgstr "Enregistrer le document ailleurs"
 
 #: src/Services/TemplateManager.vala:198
 msgid "Templates"

po/ka.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-09 17:18+0000\n"
-"PO-Revision-Date: 2023-05-14 05:06+0000\n"
+"PO-Revision-Date: 2023-07-14 18:07+0000\n"
 "Last-Translator: NorwayFun <[email protected]>\n"
 "Language-Team: Georgian <https://l10n.elementary.io/projects/code/code/ka/>\n"
 "Language: ka\n"
@@ -432,18 +432,18 @@ 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
@@ -453,20 +453,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
@@ -492,13 +493,11 @@ msgstr "თავიდან ჩატვირთვა"
 
 #: src/Services/Document.vala:973
 msgid "Overwrite"
-msgstr ""
+msgstr "თავზე გადაწერა"
 
 #: src/Services/Document.vala:976
-#, fuzzy
-#| msgid "Save changes elsewhere"
 msgid "Save Document elsewhere"
-msgstr "ცვლილებების სხვაგან შენახვა"
+msgstr "დოკუმენტის სხვაგან შენახვა"
 
 #: src/Services/TemplateManager.vala:198
 msgid "Templates"

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-07-12 15:07+0000\n"
+"PO-Revision-Date: 2023-07-14 18:07+0000\n"
 "Last-Translator: Marcin Serwin <[email protected]>\n"
 "Language-Team: Polish <https://l10n.elementary.io/projects/code/code/pl/>\n"
 "Language: pl\n"
@@ -473,10 +473,14 @@ msgid ""
 "There are also unsaved changes. Reloading the document will overwrite the "
 "unsaved changes."
 msgstr ""
+"Istnieją również niezapisane zmiany. Przeładowanie dokumentu nadpisze "
+"niezapisane zmiany."
 
 #: src/Services/Document.vala:890
 msgid "The document changed externally since you last saved it."
 msgstr ""
+"Dokument został zmieniony przez aplikację zewnętrzną od czasu ostatniego "
+"zapisu."
 
 #: src/Services/Document.vala:908
 #, c-format
@@ -501,13 +505,11 @@ msgstr "Przeładuj"
 
 #: src/Services/Document.vala:973
 msgid "Overwrite"
-msgstr ""
+msgstr "Nadpisz"
 
 #: src/Services/Document.vala:976
-#, fuzzy
-#| msgid "Save the document elsewhere"
 msgid "Save Document elsewhere"
-msgstr "Zapisuje dokument gdzie indziej"
+msgstr "Zapisz dokument gdzie indziej"
 
 #: src/Services/TemplateManager.vala:198
 msgid "Templates"

src/MainWindow.vala

@@ -515,8 +515,14 @@ namespace Scratch {
                 update_find_actions ();
             });
 
-            document_view.tab_removed.connect (() => {
+            document_view.tab_removed.connect ((tab) => {
                 update_find_actions ();
+                var doc = (Scratch.Services.Document)tab;
+                var selected_item = (Scratch.FolderManager.Item?)(folder_manager_view.selected);
+                if (selected_item != null && selected_item.file.file.equal (doc.file)) {
+                    // Do not leave removed tab selected
+                    folder_manager_view.selected = null;
+                }
             });
 
             document_view.document_change.connect ((doc) => {