Skip to content

Commit 04f487b

Browse files
Jeremy WoottenJeremy Wootten
Jeremy Wootten
authored and
Jeremy Wootten
committed
Merge branch 'master' into jeremypw/sync-activeproject-startup
# Conflicts: # src/FolderManager/FileView.vala
2 parents 1a54316 + b234902 commit 04f487b

File tree

602 files changed

+12178
-3816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

602 files changed

+12178
-3816
lines changed

‎po/POTFILES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ src/Dialogs/GlobalSearchDialog.vala
55
src/Dialogs/NewBranchDialog.vala
66
src/Dialogs/PreferencesDialog.vala
77
src/Dialogs/RestoreConfirmationDialog.vala
8+
src/Dialogs/CloseProjectsConfirmationDialog.vala
89
src/Dialogs/OverwriteUncommittedConfirmationDialog.vala
910
src/FolderManager/File.vala
1011
src/FolderManager/FileItem.vala

‎po/aa.po‎

Lines changed: 58 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-02-02 19:37+0000\n"
5+
"POT-Creation-Date: 2025-02-04 12:18+0000\n"
66
"PO-Revision-Date: 2015-12-18 20:01+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,73 +46,73 @@ msgstr ""
4646
msgid "Code"
4747
msgstr ""
4848

49-
#: src/MainWindow.vala:377
49+
#: src/MainWindow.vala:374
5050
msgid "Hide search bar"
5151
msgstr ""
5252

53-
#: src/MainWindow.vala:382 src/Widgets/HeaderBar.vala:122
53+
#: src/MainWindow.vala:379 src/Widgets/HeaderBar.vala:122
5454
msgid "Find on Page…"
5555
msgstr ""
5656

57-
#: src/MainWindow.vala:393
57+
#: src/MainWindow.vala:390
5858
msgid "Hide Projects Sidebar"
5959
msgstr ""
6060

61-
#: src/MainWindow.vala:398
61+
#: src/MainWindow.vala:395
6262
msgid "Show Projects Sidebar"
6363
msgstr ""
6464

65-
#: src/MainWindow.vala:407
65+
#: src/MainWindow.vala:404
6666
msgid "Hide Symbol Outline"
6767
msgstr ""
6868

69-
#: src/MainWindow.vala:412
69+
#: src/MainWindow.vala:409
7070
msgid "Show Symbol Outline"
7171
msgstr ""
7272

73-
#: src/MainWindow.vala:421
73+
#: src/MainWindow.vala:418
7474
msgid "Hide Terminal"
7575
msgstr ""
7676

77-
#: src/MainWindow.vala:426 src/Widgets/HeaderBar.vala:196
77+
#: src/MainWindow.vala:423 src/Widgets/HeaderBar.vala:196
7878
msgid "Show Terminal"
7979
msgstr ""
8080

8181
#. Update MainWindow title
8282
#. / TRANSLATORS: First placeholder is document name, second placeholder is app name
83-
#: src/MainWindow.vala:618
83+
#: src/MainWindow.vala:610
8484
#, c-format
8585
msgid "%s - %s"
8686
msgstr ""
8787

88-
#: src/MainWindow.vala:946 src/Services/Document.vala:651
88+
#: src/MainWindow.vala:950 src/Services/Document.vala:651
8989
msgid "All files"
9090
msgstr ""
9191

92-
#: src/MainWindow.vala:950 src/Services/Document.vala:655
92+
#: src/MainWindow.vala:954 src/Services/Document.vala:655
9393
msgid "Text files"
9494
msgstr ""
9595

96-
#: src/MainWindow.vala:954
96+
#: src/MainWindow.vala:958
9797
msgid "Open some files"
9898
msgstr ""
9999

100-
#: src/MainWindow.vala:957
100+
#: src/MainWindow.vala:961
101101
msgid "Open"
102102
msgstr ""
103103

104-
#: src/MainWindow.vala:958 src/Dialogs/GlobalSearchDialog.vala:109
104+
#: src/MainWindow.vala:962 src/Dialogs/GlobalSearchDialog.vala:109
105105
#: src/Dialogs/NewBranchDialog.vala:42 src/Services/Document.vala:493
106106
#: src/Services/Document.vala:663 plugins/pastebin/pastebin_dialog.vala:327
107107
#: plugins/pastebin/pastebin_dialog.vala:378
108108
msgid "Cancel"
109109
msgstr ""
110110

111-
#: src/MainWindow.vala:998
111+
#: src/MainWindow.vala:1002
112112
msgid "_Open"
113113
msgstr ""
114114

115-
#: src/MainWindow.vala:999
115+
#: src/MainWindow.vala:1003
116116
msgid "_Cancel"
117117
msgstr ""
118118

@@ -278,6 +278,47 @@ msgstr ""
278278
msgid "Restore Anyway"
279279
msgstr ""
280280

281+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
282+
msgid "This folder is the parent of an open project"
283+
msgstr ""
284+
285+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:41
286+
#, c-format
287+
msgid "This folder is the parent of %u open projects"
288+
msgstr ""
289+
290+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
291+
msgid "Opening this folder will close the child project"
292+
msgstr ""
293+
294+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:47
295+
msgid "Opening this folder will close all child projects"
296+
msgstr ""
297+
298+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
299+
msgid "Close Child Project"
300+
msgstr ""
301+
302+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:53
303+
msgid "Close Child Projects"
304+
msgstr ""
305+
306+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
307+
msgid "This folder is a child of an open project"
308+
msgstr ""
309+
310+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:58
311+
msgid "Opening this folder will close the parent project"
312+
msgstr ""
313+
314+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:59
315+
msgid "Close Parent Project"
316+
msgstr ""
317+
318+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:62
319+
msgid "Don't Open"
320+
msgstr ""
321+
281322
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
282323
msgid "There are uncommitted changes in the current branch"
283324
msgstr ""

‎po/ab.po‎

Lines changed: 58 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-02-02 19:37+0000\n"
5+
"POT-Creation-Date: 2025-02-04 12:18+0000\n"
66
"PO-Revision-Date: 2015-12-18 20:01+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,73 +46,73 @@ msgstr ""
4646
msgid "Code"
4747
msgstr ""
4848

49-
#: src/MainWindow.vala:377
49+
#: src/MainWindow.vala:374
5050
msgid "Hide search bar"
5151
msgstr ""
5252

53-
#: src/MainWindow.vala:382 src/Widgets/HeaderBar.vala:122
53+
#: src/MainWindow.vala:379 src/Widgets/HeaderBar.vala:122
5454
msgid "Find on Page…"
5555
msgstr ""
5656

57-
#: src/MainWindow.vala:393
57+
#: src/MainWindow.vala:390
5858
msgid "Hide Projects Sidebar"
5959
msgstr ""
6060

61-
#: src/MainWindow.vala:398
61+
#: src/MainWindow.vala:395
6262
msgid "Show Projects Sidebar"
6363
msgstr ""
6464

65-
#: src/MainWindow.vala:407
65+
#: src/MainWindow.vala:404
6666
msgid "Hide Symbol Outline"
6767
msgstr ""
6868

69-
#: src/MainWindow.vala:412
69+
#: src/MainWindow.vala:409
7070
msgid "Show Symbol Outline"
7171
msgstr ""
7272

73-
#: src/MainWindow.vala:421
73+
#: src/MainWindow.vala:418
7474
msgid "Hide Terminal"
7575
msgstr ""
7676

77-
#: src/MainWindow.vala:426 src/Widgets/HeaderBar.vala:196
77+
#: src/MainWindow.vala:423 src/Widgets/HeaderBar.vala:196
7878
msgid "Show Terminal"
7979
msgstr ""
8080

8181
#. Update MainWindow title
8282
#. / TRANSLATORS: First placeholder is document name, second placeholder is app name
83-
#: src/MainWindow.vala:618
83+
#: src/MainWindow.vala:610
8484
#, c-format
8585
msgid "%s - %s"
8686
msgstr ""
8787

88-
#: src/MainWindow.vala:946 src/Services/Document.vala:651
88+
#: src/MainWindow.vala:950 src/Services/Document.vala:651
8989
msgid "All files"
9090
msgstr ""
9191

92-
#: src/MainWindow.vala:950 src/Services/Document.vala:655
92+
#: src/MainWindow.vala:954 src/Services/Document.vala:655
9393
msgid "Text files"
9494
msgstr ""
9595

96-
#: src/MainWindow.vala:954
96+
#: src/MainWindow.vala:958
9797
msgid "Open some files"
9898
msgstr ""
9999

100-
#: src/MainWindow.vala:957
100+
#: src/MainWindow.vala:961
101101
msgid "Open"
102102
msgstr ""
103103

104-
#: src/MainWindow.vala:958 src/Dialogs/GlobalSearchDialog.vala:109
104+
#: src/MainWindow.vala:962 src/Dialogs/GlobalSearchDialog.vala:109
105105
#: src/Dialogs/NewBranchDialog.vala:42 src/Services/Document.vala:493
106106
#: src/Services/Document.vala:663 plugins/pastebin/pastebin_dialog.vala:327
107107
#: plugins/pastebin/pastebin_dialog.vala:378
108108
msgid "Cancel"
109109
msgstr ""
110110

111-
#: src/MainWindow.vala:998
111+
#: src/MainWindow.vala:1002
112112
msgid "_Open"
113113
msgstr ""
114114

115-
#: src/MainWindow.vala:999
115+
#: src/MainWindow.vala:1003
116116
msgid "_Cancel"
117117
msgstr ""
118118

@@ -278,6 +278,47 @@ msgstr ""
278278
msgid "Restore Anyway"
279279
msgstr ""
280280

281+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:40
282+
msgid "This folder is the parent of an open project"
283+
msgstr ""
284+
285+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:41
286+
#, c-format
287+
msgid "This folder is the parent of %u open projects"
288+
msgstr ""
289+
290+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:46
291+
msgid "Opening this folder will close the child project"
292+
msgstr ""
293+
294+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:47
295+
msgid "Opening this folder will close all child projects"
296+
msgstr ""
297+
298+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:52
299+
msgid "Close Child Project"
300+
msgstr ""
301+
302+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:53
303+
msgid "Close Child Projects"
304+
msgstr ""
305+
306+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:57
307+
msgid "This folder is a child of an open project"
308+
msgstr ""
309+
310+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:58
311+
msgid "Opening this folder will close the parent project"
312+
msgstr ""
313+
314+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:59
315+
msgid "Close Parent Project"
316+
msgstr ""
317+
318+
#: src/Dialogs/CloseProjectsConfirmationDialog.vala:62
319+
msgid "Don't Open"
320+
msgstr ""
321+
281322
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
282323
msgid "There are uncommitted changes in the current branch"
283324
msgstr ""

0 commit comments

Comments
 (0)