Merge branch 'master' into danirabbit/release-7.3

elementary · Jul 24, 2024 · 9f44025 · 9f44025
2 parents 82d114a + bb969bf
commit 9f44025
Show file tree

Hide file tree

Showing 602 changed files with 36,591 additions and 42,092 deletions.
diff --git a/data/code.metainfo.xml.in b/data/code.metainfo.xml.in
@@ -89,6 +89,7 @@
         <issue url="https://github.com/elementary/code/issues/1416">Code hangs when choosing active project when two project starting with the same string are loaded</issue>
         <issue url="https://github.com/elementary/code/issues/1418">Duplicated items in "Find In Project Popover"</issue>
         <issue url="https://github.com/elementary/code/issues/1429">Extensions dialogue MUST be resizable</issue>
+        <issue url="https://github.com/elementary/code/issues/1436">Cancelling new folder creation in project causes parent folder to disappear from sidebar</issue>
         <issue url="https://github.com/elementary/code/issues/570">Draw Spaces On Current Line</issue>
         <issue url="https://github.com/elementary/code/issues/574">git branch not readable if dir name is too long</issue>
         <issue url="https://github.com/elementary/code/pull/1446">Fix "go to line" behaviour when column number is not explicitly set</issue>

diff --git a/po/aa.po b/po/aa.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-15 18:47+0000\n"
+"POT-Creation-Date: 2024-07-14 07:09+0000\n"
 "PO-Revision-Date: 2015-12-18 20:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,115 +151,115 @@ msgstr ""
 msgid "Create Branch"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:36 src/Widgets/HeaderBar.vala:218
+#: src/Dialogs/PreferencesDialog.vala:15 src/Widgets/HeaderBar.vala:218
 msgid "Preferences"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:46
-msgid ""
-"Cutting or copying without an active selection will cut or copy the entire "
-"current line"
+#: src/Dialogs/PreferencesDialog.vala:23
+msgid "General"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:51
-msgid "Default build directory"
+#: src/Dialogs/PreferencesDialog.vala:24
+msgid "Save files when changed"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:63
-msgid "General"
+#: src/Dialogs/PreferencesDialog.vala:25
+msgid "Strip trailing whitespace on save"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:64
-msgid "Save files when changed:"
+#: src/Dialogs/PreferencesDialog.vala:27
+msgid "Smart cut/copy lines"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:66
-msgid "Smart cut/copy lines:"
+#: src/Dialogs/PreferencesDialog.vala:29
+msgid ""
+"Cutting or copying without an active selection will cut or copy the entire "
+"current line"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:69
-msgid "Tabs"
+#: src/Dialogs/PreferencesDialog.vala:35
+msgid "Indentation width"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:70
-msgid "Automatic indentation:"
+#: src/Dialogs/PreferencesDialog.vala:46
+msgid "Indentation"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:72
-msgid "Insert spaces instead of tabs:"
+#: src/Dialogs/PreferencesDialog.vala:47
+msgid "Automatic indentation"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:74
-msgid "Strip trailing whitespace:"
+#: src/Dialogs/PreferencesDialog.vala:48
+msgid "Insert spaces instead of tabs"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:76
-msgid "Tab width:"
+#: src/Dialogs/PreferencesDialog.vala:57
+msgid "Default build directory"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:78
+#: src/Dialogs/PreferencesDialog.vala:67
 msgid "Projects"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:86
-msgid "Behavior"
+#: src/Dialogs/PreferencesDialog.vala:78
+msgid "None"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:87
-msgid "Interface"
+#: src/Dialogs/PreferencesDialog.vala:79
+msgid "Current Line"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:103
-#: plugins/pastebin/pastebin_dialog.vala:434
-msgid "Close"
+#: src/Dialogs/PreferencesDialog.vala:80
+msgid "All"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:117
-msgid "Extensions"
+#: src/Dialogs/PreferencesDialog.vala:96
+msgid "Whitespace visible when not selected"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:126
+#: src/Dialogs/PreferencesDialog.vala:111
 msgid "Editor"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:128
-msgid "Highlight matching brackets:"
+#: src/Dialogs/PreferencesDialog.vala:112
+msgid "Highlight matching brackets"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:131
-msgid "Line wrap:"
+#: src/Dialogs/PreferencesDialog.vala:114
+msgid "Mini Map"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:134
-msgid "White space visible when not selected:"
+#: src/Dialogs/PreferencesDialog.vala:115
+msgid "Wrap lines"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:139
-msgid "None"
+#: src/Dialogs/PreferencesDialog.vala:116
+msgid "Line width guide"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:140
-msgid "Current Line"
+#: src/Dialogs/PreferencesDialog.vala:124
+msgid "Font"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:141
-msgid "All"
+#: src/Dialogs/PreferencesDialog.vala:125
+msgid "Use system font"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:156
-msgid "Show Mini Map:"
+#: src/Dialogs/PreferencesDialog.vala:136
+msgid "Behavior"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:159
-msgid "Line width guide:"
+#: src/Dialogs/PreferencesDialog.vala:137
+msgid "Interface"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:167
-msgid "Font"
+#: src/Dialogs/PreferencesDialog.vala:153
+msgid "Extensions"
 msgstr ""
 
-#: src/Dialogs/PreferencesDialog.vala:169
-msgid "Custom font:"
+#: src/Dialogs/PreferencesDialog.vala:159
+#: plugins/pastebin/pastebin_dialog.vala:434
+msgid "Close"
 msgstr ""
 
 #: src/Dialogs/RestoreConfirmationDialog.vala:31
@@ -279,15 +279,15 @@ msgid "Restore Anyway"
 msgstr ""
 
 #: src/FolderManager/FileItem.vala:31 src/FolderManager/FolderItem.vala:91
-#: src/FolderManager/ProjectFolderItem.vala:120
+#: src/FolderManager/ProjectFolderItem.vala:119
 msgid "Open in Terminal Pane"
 msgstr ""
 
-#: src/FolderManager/FileItem.vala:56 src/FolderManager/FolderItem.vala:171
+#: src/FolderManager/FileItem.vala:56 src/FolderManager/FolderItem.vala:155
 msgid "Other Application…"
 msgstr ""
 
-#: src/FolderManager/FileItem.vala:117 src/FolderManager/FolderItem.vala:211
+#: src/FolderManager/FileItem.vala:117 src/FolderManager/FolderItem.vala:195
 msgid "Open In"
 msgstr ""
 
@@ -299,90 +299,90 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: src/FolderManager/FileItem.vala:150 src/FolderManager/FolderItem.vala:147
-#: src/FolderManager/ProjectFolderItem.vala:182
+#: src/FolderManager/FileItem.vala:130 src/FolderManager/FolderItem.vala:129
+#: src/FolderManager/ProjectFolderItem.vala:187
 msgid "Move to Trash"
 msgstr ""
 
-#: src/FolderManager/FileView.vala:49
+#: src/FolderManager/FileView.vala:68
 msgid "Folders"
 msgstr ""
 
-#: src/FolderManager/FolderItem.vala:150
+#: src/FolderManager/FolderItem.vala:134
 msgid "Find in Folder…"
 msgstr ""
 
-#: src/FolderManager/FolderItem.vala:218
+#: src/FolderManager/FolderItem.vala:202
 msgid "Folder"
 msgstr ""
 
-#: src/FolderManager/FolderItem.vala:221
+#: src/FolderManager/FolderItem.vala:207
 msgid "Empty File"
 msgstr ""
 
 #. scan all children
 #. No need to show status when children shown
-#: src/FolderManager/FolderItem.vala:228
-#: src/FolderManager/ProjectFolderItem.vala:271
-#: src/FolderManager/ProjectFolderItem.vala:277
+#: src/FolderManager/FolderItem.vala:216
+#: src/FolderManager/ProjectFolderItem.vala:275
+#: src/FolderManager/ProjectFolderItem.vala:281
 msgid "New"
 msgstr ""
 
-#: src/FolderManager/FolderItem.vala:387
+#: src/FolderManager/FolderItem.vala:375
 msgid "untitled folder"
 msgstr ""
 
-#: src/FolderManager/FolderItem.vala:387
+#: src/FolderManager/FolderItem.vala:375
 msgid "new file"
 msgstr ""
 
-#: src/FolderManager/ProjectFolderItem.vala:130
+#: src/FolderManager/ProjectFolderItem.vala:129
 msgid "Close Folder"
 msgstr ""
 
-#: src/FolderManager/ProjectFolderItem.vala:135
+#: src/FolderManager/ProjectFolderItem.vala:134
 msgid "Close Other Folders"
 msgstr ""
 
-#: src/FolderManager/ProjectFolderItem.vala:140
+#: src/FolderManager/ProjectFolderItem.vala:145
 #, c-format
 msgid "Close %u Open Document"
 msgid_plural "Close %u Open Documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/FolderManager/ProjectFolderItem.vala:154
+#: src/FolderManager/ProjectFolderItem.vala:159
 #, c-format
 msgid "Hide %u Open Document"
 msgid_plural "Hide %u Open Documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/FolderManager/ProjectFolderItem.vala:169
+#: src/FolderManager/ProjectFolderItem.vala:174
 #, c-format
 msgid "Restore %u Hidden Document"
 msgid_plural "Restore %u Hidden Documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/FolderManager/ProjectFolderItem.vala:189 src/Widgets/HeaderBar.vala:131
+#: src/FolderManager/ProjectFolderItem.vala:193 src/Widgets/HeaderBar.vala:131
 msgid "Find in Project…"
 msgstr ""
 
-#: src/FolderManager/ProjectFolderItem.vala:277
+#: src/FolderManager/ProjectFolderItem.vala:281
 msgid "Modified"
 msgstr ""
 
-#: src/FolderManager/ProjectFolderItem.vala:315
+#: src/FolderManager/ProjectFolderItem.vala:319
 #, c-format
 msgid "Error while creating new branch: “%s”"
 msgstr ""
 
-#: src/FolderManager/ProjectFolderItem.vala:601
+#: src/FolderManager/ProjectFolderItem.vala:605
 msgid "New Branch…"
 msgstr ""
 
-#: src/FolderManager/ProjectFolderItem.vala:614
+#: src/FolderManager/ProjectFolderItem.vala:618
 msgid "Branch"
 msgstr ""
 
@@ -689,11 +689,11 @@ msgstr ""
 msgid "Collapse All"
 msgstr ""
 
-#: src/Widgets/Sidebar.vala:70
+#: src/Widgets/Sidebar.vala:69
 msgid "Alphabetize"
 msgstr ""
 
-#: src/Widgets/Sidebar.vala:82
+#: src/Widgets/Sidebar.vala:81
 msgid "Manage project folders"
 msgstr ""
 
@@ -766,19 +766,19 @@ msgstr ""
 msgid "no results"
 msgstr ""
 
-#: src/Widgets/SourceView.vala:556
+#: src/Widgets/SourceView.vala:558
 msgid "Sort Selected Lines"
 msgstr ""
 
-#: src/Widgets/SourceView.vala:569
+#: src/Widgets/SourceView.vala:571
 msgid "Toggle Comment"
 msgstr ""
 
-#: src/Widgets/Terminal.vala:39
+#: src/Widgets/Terminal.vala:59
 msgid "Copy"
 msgstr ""
 
-#: src/Widgets/Terminal.vala:44
+#: src/Widgets/Terminal.vala:60
 msgid "Paste"
 msgstr ""
 
@@ -815,7 +815,7 @@ msgid "Add a project folder to the sidebar."
 msgstr ""
 
 #: plugins/pastebin/pastebin_dialog.vala:248
-#: plugins/pastebin/pastebin_dialog.vala:328 plugins/pastebin/pastebin.vala:96
+#: plugins/pastebin/pastebin_dialog.vala:328 plugins/pastebin/pastebin.vala:117
 msgid "Upload to Pastebin"
 msgstr ""