Skip to content

Commit d1fce54

Browse files
Jeremy WoottenJeremy Wootten
Jeremy Wootten
authored and
Jeremy Wootten
committed
Merge branch 'master' into jeremypw/fix-ambiguous-project
# Conflicts fixed: # po/POTFILES # src/meson.build
2 parents 1fdaddc + f0cdf42 commit d1fce54

606 files changed

Lines changed: 5492 additions & 839 deletions

File tree

Some content is hidden

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

‎plugins/word-completion/meson.build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module_name = 'word-completion'
22

33
module_files = [
44
'prefix-tree.vala',
5+
'prefix-tree-node.vala',
56
'completion-provider.vala',
67
'engine.vala',
78
'plugin.vala'

‎plugins/word-completion/prefix-tree-node.vala‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2024 elementary, Inc. <https://elementary.io>
3+
* 2011 Lucas Baudin <xapantu@gmail.com>
4+
* *
5+
* This is a free software; you can redistribute it and/or
6+
* modify it under the terms of the GNU General Public License as
7+
* published by the Free Software Foundation; either version 2 of the
8+
* License, or (at your option) any later version.
9+
*
10+
* This is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public
16+
* License along with this program; see the file COPYING. If not,
17+
* write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18+
* Boston, MA 02110-1301 USA.
19+
*
20+
*/
21+
22+
public class Scratch.Plugins.PrefixNode : Object {
23+
public GLib.List<PrefixNode> children;
24+
public unichar value { get; construct; }
25+
26+
public PrefixNode (unichar c = '\0') {
27+
Object (
28+
value: c
29+
);
30+
}
31+
32+
construct {
33+
children = new List<PrefixNode> ();
34+
}
35+
}

‎plugins/word-completion/prefix-tree.vala‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11

22
namespace Scratch.Plugins {
3-
private class PrefixNode : Object {
4-
public GLib.List<PrefixNode> children;
5-
public unichar value { get; set; }
6-
7-
construct {
8-
children = new List<PrefixNode> ();
9-
}
10-
}
11-
123
public class PrefixTree : Object {
134
private PrefixNode root;
145

@@ -17,9 +8,7 @@ namespace Scratch.Plugins {
178
}
189

1910
public void clear () {
20-
root = new PrefixNode () {
21-
value = '\0'
22-
};
11+
root = new PrefixNode ();
2312
}
2413

2514
public void insert (string word) {
@@ -47,9 +36,7 @@ namespace Scratch.Plugins {
4736
}
4837
}
4938

50-
var new_child = new PrefixNode () {
51-
value = curr
52-
};
39+
var new_child = new PrefixNode (curr);
5340
node.children.insert_sorted (new_child, (c1, c2) => {
5441
if (c1.value > c2.value) {
5542
return 1;

‎po/POTFILES‎

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

‎po/aa.po‎

Lines changed: 24 additions & 1 deletion
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-01-09 13:54+0000\n"
5+
"POT-Creation-Date: 2025-02-02 19:37+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"
@@ -278,6 +278,29 @@ msgstr ""
278278
msgid "Restore Anyway"
279279
msgstr ""
280280

281+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
282+
msgid "There are uncommitted changes in the current branch"
283+
msgstr ""
284+
285+
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
286+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
287+
#, c-format
288+
msgid ""
289+
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
290+
"now.\n"
291+
"\n"
292+
"<i>It is recommended that uncommitted changes are stashed, committed, or "
293+
"reverted before proceeding </i>"
294+
msgstr ""
295+
296+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
297+
msgid "Checkout and Overwrite"
298+
msgstr ""
299+
300+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
301+
msgid "Do not Checkout"
302+
msgstr ""
303+
281304
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
282305
#: src/FolderManager/ProjectFolderItem.vala:138
283306
msgid "Open in Terminal Pane"

‎po/ab.po‎

Lines changed: 24 additions & 1 deletion
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-01-09 13:54+0000\n"
5+
"POT-Creation-Date: 2025-02-02 19:37+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"
@@ -278,6 +278,29 @@ msgstr ""
278278
msgid "Restore Anyway"
279279
msgstr ""
280280

281+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
282+
msgid "There are uncommitted changes in the current branch"
283+
msgstr ""
284+
285+
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
286+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
287+
#, c-format
288+
msgid ""
289+
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
290+
"now.\n"
291+
"\n"
292+
"<i>It is recommended that uncommitted changes are stashed, committed, or "
293+
"reverted before proceeding </i>"
294+
msgstr ""
295+
296+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
297+
msgid "Checkout and Overwrite"
298+
msgstr ""
299+
300+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
301+
msgid "Do not Checkout"
302+
msgstr ""
303+
281304
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
282305
#: src/FolderManager/ProjectFolderItem.vala:138
283306
msgid "Open in Terminal Pane"

‎po/ae.po‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
msgid ""
22
msgstr ""
33
"Report-Msgid-Bugs-To: \n"
4-
"POT-Creation-Date: 2025-01-09 13:54+0000\n"
4+
"POT-Creation-Date: 2025-02-02 19:37+0000\n"
55
"MIME-Version: 1.0\n"
66
"Content-Type: text/plain; charset=UTF-8\n"
77

@@ -270,6 +270,29 @@ msgstr ""
270270
msgid "Restore Anyway"
271271
msgstr ""
272272

273+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
274+
msgid "There are uncommitted changes in the current branch"
275+
msgstr ""
276+
277+
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
278+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
279+
#, c-format
280+
msgid ""
281+
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
282+
"now.\n"
283+
"\n"
284+
"<i>It is recommended that uncommitted changes are stashed, committed, or "
285+
"reverted before proceeding </i>"
286+
msgstr ""
287+
288+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
289+
msgid "Checkout and Overwrite"
290+
msgstr ""
291+
292+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
293+
msgid "Do not Checkout"
294+
msgstr ""
295+
273296
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
274297
#: src/FolderManager/ProjectFolderItem.vala:138
275298
msgid "Open in Terminal Pane"

‎po/af.po‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-01-09 13:54+0000\n"
10+
"POT-Creation-Date: 2025-02-02 19:37+0000\n"
1111
"PO-Revision-Date: 2017-04-09 21:07+0000\n"
1212
"Last-Translator: Mario Guerriero <Unknown>\n"
1313
"Language-Team: Afrikaans <af@li.org>\n"
@@ -295,6 +295,29 @@ msgstr ""
295295
msgid "Restore Anyway"
296296
msgstr ""
297297

298+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
299+
msgid "There are uncommitted changes in the current branch"
300+
msgstr ""
301+
302+
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
303+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
304+
#, c-format
305+
msgid ""
306+
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
307+
"now.\n"
308+
"\n"
309+
"<i>It is recommended that uncommitted changes are stashed, committed, or "
310+
"reverted before proceeding </i>"
311+
msgstr ""
312+
313+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
314+
msgid "Checkout and Overwrite"
315+
msgstr ""
316+
317+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
318+
msgid "Do not Checkout"
319+
msgstr ""
320+
298321
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
299322
#: src/FolderManager/ProjectFolderItem.vala:138
300323
msgid "Open in Terminal Pane"

‎po/ak.po‎

Lines changed: 24 additions & 1 deletion
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-01-09 13:54+0000\n"
5+
"POT-Creation-Date: 2025-02-02 19:37+0000\n"
66
"PO-Revision-Date: 2017-04-09 20:11+0000\n"
77
"Last-Translator: aberba <karabutaworld@gmail.com>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -282,6 +282,29 @@ msgstr ""
282282
msgid "Restore Anyway"
283283
msgstr ""
284284

285+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
286+
msgid "There are uncommitted changes in the current branch"
287+
msgstr ""
288+
289+
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
290+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
291+
#, c-format
292+
msgid ""
293+
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
294+
"now.\n"
295+
"\n"
296+
"<i>It is recommended that uncommitted changes are stashed, committed, or "
297+
"reverted before proceeding </i>"
298+
msgstr ""
299+
300+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
301+
msgid "Checkout and Overwrite"
302+
msgstr ""
303+
304+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
305+
msgid "Do not Checkout"
306+
msgstr ""
307+
285308
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
286309
#: src/FolderManager/ProjectFolderItem.vala:138
287310
msgid "Open in Terminal Pane"

‎po/am.po‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-01-09 13:54+0000\n"
10+
"POT-Creation-Date: 2025-02-02 19:37+0000\n"
1111
"PO-Revision-Date: 2015-12-21 13:39+0000\n"
1212
"Last-Translator: Mario Guerriero <Unknown>\n"
1313
"Language-Team: Amharic <am@li.org>\n"
@@ -308,6 +308,29 @@ msgstr ""
308308
msgid "Restore Anyway"
309309
msgstr ""
310310

311+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:40
312+
msgid "There are uncommitted changes in the current branch"
313+
msgstr ""
314+
315+
#. /TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
316+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:42
317+
#, c-format
318+
msgid ""
319+
"Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out "
320+
"now.\n"
321+
"\n"
322+
"<i>It is recommended that uncommitted changes are stashed, committed, or "
323+
"reverted before proceeding </i>"
324+
msgstr ""
325+
326+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:44
327+
msgid "Checkout and Overwrite"
328+
msgstr ""
329+
330+
#: src/Dialogs/OverwriteUncommittedConfirmationDialog.vala:46
331+
msgid "Do not Checkout"
332+
msgstr ""
333+
311334
#: src/FolderManager/FileItem.vala:46 src/FolderManager/FolderItem.vala:92
312335
#: src/FolderManager/ProjectFolderItem.vala:138
313336
msgid "Open in Terminal Pane"

0 commit comments

Comments
 (0)