Skip to content

Commit e9a34b6

Browse files
phase1geophase1geo
committed
Merge branch 'devel'
2 parents fa65eb8 + 9f20b0a commit e9a34b6

27 files changed

+3415
-3069
lines changed

‎data/com.github.phase1geo.minder.appdata.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,33 @@
135135
<content_attribute id="money-gambling">none</content_attribute>
136136
</content_rating>
137137
<releases>
138+
<release version="1.11.1" date="2020-09-25">
139+
<description>
140+
<p>New</p>
141+
<p xml:lang="pt">Novo</p>
142+
<p xml:lang="fr">Nouveau</p>
143+
<ul>
144+
<li>Added Shift-e keyboard shortcut to edit note text for nodes and connections.</li>
145+
</ul>
146+
<p>Changes</p>
147+
<p xml:lang="pt">Alterações</p>
148+
<p xml:lang="fr">Modifications</p>
149+
<ul>
150+
<li>Updated Italian translation (thanks to @albanobattistella).</li>
151+
<li xml:lang="pt">Tradução em Italiano atualizada (obrigado a @albanobattistella).</li>
152+
<li>Improved automatic layout of node trees when adjacent tree sizes change.</li>
153+
<li>Changed node and connection contextual menus to show (Edit Note) instead of (Add Note) and (Remove Note) options.</li>
154+
</ul>
155+
<p>Bug Fixes</p>
156+
<p xml:lang="pt">Correções</p>
157+
<p xml:lang="fr">Corrections de bugs</p>
158+
<ul>
159+
<li>Fixing compilation issues.</li>
160+
<li>Fixing behavior of 't' command when node is selected.</li>
161+
<li>Fixing support for undo/redo of root node insertion.</li>
162+
</ul>
163+
</description>
164+
</release>
138165
<release version="1.11.0" date="2020-09-16">
139166
<description>
140167
<p>New</p>

‎data/com.github.phase1geo.minder.appdata.xml.in‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,26 @@
8989
<content_attribute id="money-gambling">none</content_attribute>
9090
</content_rating>
9191
<releases>
92+
<release version="1.11.1" date="2020-09-25">
93+
<description>
94+
<p>New</p>
95+
<ul>
96+
<li>Added Shift-e keyboard shortcut to edit note text for nodes and connections.</li>
97+
</ul>
98+
<p>Changes</p>
99+
<ul>
100+
<li>Updated Italian translation (thanks to @albanobattistella).</li>
101+
<li>Improved automatic layout of node trees when adjacent tree sizes change.</li>
102+
<li>Changed node and connection contextual menus to show (Edit Note) instead of (Add Note) and (Remove Note) options.</li>
103+
</ul>
104+
<p>Bug Fixes</p>
105+
<ul>
106+
<li>Fixing compilation issues.</li>
107+
<li>Fixing behavior of 't' command when node is selected.</li>
108+
<li>Fixing support for undo/redo of root node insertion.</li>
109+
</ul>
110+
</description>
111+
</release>
92112
<release version="1.11.0" date="2020-09-16">
93113
<description>
94114
<p>New</p>

‎meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('com.github.phase1geo.minder', ['vala', 'c'],
2-
version : '1.11.0',
2+
version : '1.11.1',
33
license: 'GPL-3.0'
44
)
55

‎po/com.github.phase1geo.minder.pot‎

Lines changed: 57 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: com.github.phase1geo.minder\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-09-15 08:49-0500\n"
11+
"POT-Creation-Date: 2020-09-24 07:56-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -42,7 +42,7 @@ msgstr ""
4242
msgid "Upwards"
4343
msgstr ""
4444

45-
#: src/layouts/LayoutManual.vala:26 src/DrawArea.vala:4006
45+
#: src/layouts/LayoutManual.vala:26 src/DrawArea.vala:4008
4646
#: src/MapInspector.vala:300
4747
msgid "Manual"
4848
msgstr ""
@@ -287,43 +287,38 @@ msgid "Delete"
287287
msgstr ""
288288

289289
#: src/ConnectionMenu.vala:46
290-
msgid "Edit…"
290+
msgid "Edit Title…"
291291
msgstr ""
292292

293-
#: src/ConnectionMenu.vala:49 src/ConnectionMenu.vala:111 src/NodeMenu.vala:99
294-
#: src/NodeMenu.vala:391
295-
msgid "Add Note"
293+
#: src/ConnectionMenu.vala:50 src/NodeMenu.vala:96
294+
msgid "Edit Note"
296295
msgstr ""
297296

298-
#: src/ConnectionMenu.vala:52 src/NodeMenu.vala:105
297+
#: src/ConnectionMenu.vala:53 src/NodeMenu.vala:106
299298
msgid "Remove Sticker"
300299
msgstr ""
301300

302-
#: src/ConnectionMenu.vala:55 src/ImageManager.vala:299 src/NodeMenu.vala:167
301+
#: src/ConnectionMenu.vala:56 src/ImageManager.vala:299 src/NodeMenu.vala:168
303302
#: src/NodesMenu.vala:87
304303
msgid "Select"
305304
msgstr ""
306305

307-
#: src/ConnectionMenu.vala:60
306+
#: src/ConnectionMenu.vala:61
308307
msgid "Start Node"
309308
msgstr ""
310309

311-
#: src/ConnectionMenu.vala:64
310+
#: src/ConnectionMenu.vala:65
312311
msgid "End Node"
313312
msgstr ""
314313

315-
#: src/ConnectionMenu.vala:68
314+
#: src/ConnectionMenu.vala:69
316315
msgid "Next Connection"
317316
msgstr ""
318317

319-
#: src/ConnectionMenu.vala:72
318+
#: src/ConnectionMenu.vala:73
320319
msgid "Previous Connection"
321320
msgstr ""
322321

323-
#: src/ConnectionMenu.vala:111 src/NodeMenu.vala:391
324-
msgid "Remove Note"
325-
msgstr ""
326-
327322
#: src/Connection.vala:669
328323
msgid "Connection Title"
329324
msgstr ""
@@ -353,7 +348,7 @@ msgstr ""
353348
msgid "connection drag"
354349
msgstr ""
355350

356-
#: src/DrawArea.vala:2952 src/DrawArea.vala:2965 src/DrawArea.vala:4465
351+
#: src/DrawArea.vala:2952 src/DrawArea.vala:2965 src/DrawArea.vala:4467
357352
msgid "Another Idea"
358353
msgstr ""
359354

@@ -411,7 +406,7 @@ msgstr ""
411406
msgid "Paste"
412407
msgstr ""
413408

414-
#: src/EmptyMenu.vala:42 src/NodeMenu.vala:140
409+
#: src/EmptyMenu.vala:42 src/NodeMenu.vala:141
415410
msgid "Add Root Node"
416411
msgstr ""
417412

@@ -463,7 +458,7 @@ msgstr ""
463458
msgid "Paste Image from Clipboard"
464459
msgstr ""
465460

466-
#: src/ImageEditor.vala:390 src/NodeInspector.vala:192 src/NodeMenu.vala:392
461+
#: src/ImageEditor.vala:390 src/NodeInspector.vala:192 src/NodeMenu.vala:402
467462
msgid "Remove Image"
468463
msgstr ""
469464

@@ -772,7 +767,7 @@ msgstr ""
772767
msgid "Fold"
773768
msgstr ""
774769

775-
#: src/NodeInspector.vala:129 src/NodeMenu.vala:120 src/ThemeEditor.vala:126
770+
#: src/NodeInspector.vala:129 src/NodeMenu.vala:121 src/ThemeEditor.vala:126
776771
msgid "Link Color"
777772
msgstr ""
778773

@@ -812,7 +807,7 @@ msgstr ""
812807
msgid "Cut"
813808
msgstr ""
814809

815-
#: src/NodeMenu.vala:81 src/NodeMenu.vala:406
810+
#: src/NodeMenu.vala:81 src/NodeMenu.vala:414
816811
msgid "Paste and Replace Node"
817812
msgstr ""
818813

@@ -824,160 +819,160 @@ msgstr ""
824819
msgid "Edit Text…"
825820
msgstr ""
826821

827-
#: src/NodeMenu.vala:96 src/NodeMenu.vala:390
822+
#: src/NodeMenu.vala:100 src/NodeMenu.vala:388
828823
msgid "Add Task"
829824
msgstr ""
830825

831-
#: src/NodeMenu.vala:102 src/NodeMenu.vala:392
826+
#: src/NodeMenu.vala:103 src/NodeMenu.vala:402
832827
msgid "Add Image"
833828
msgstr ""
834829

835-
#: src/NodeMenu.vala:109 src/NodeMenu.vala:393
830+
#: src/NodeMenu.vala:110 src/NodeMenu.vala:389
836831
msgid "Add Node Link"
837832
msgstr ""
838833

839-
#: src/NodeMenu.vala:113
834+
#: src/NodeMenu.vala:114
840835
msgid "Add Connection"
841836
msgstr ""
842837

843-
#: src/NodeMenu.vala:117
838+
#: src/NodeMenu.vala:118
844839
msgid "Add Group"
845840
msgstr ""
846841

847-
#: src/NodeMenu.vala:124 src/NodesMenu.vala:72
842+
#: src/NodeMenu.vala:125 src/NodesMenu.vala:72
848843
msgid "Set to color…"
849844
msgstr ""
850845

851-
#: src/NodeMenu.vala:127
846+
#: src/NodeMenu.vala:128
852847
msgid "Randomize color"
853848
msgstr ""
854849

855-
#: src/NodeMenu.vala:130 src/NodesMenu.vala:78
850+
#: src/NodeMenu.vala:131 src/NodesMenu.vala:78
856851
msgid "Use parent color"
857852
msgstr ""
858853

859-
#: src/NodeMenu.vala:134 src/NodeMenu.vala:394 src/NodesMenu.vala:58
854+
#: src/NodeMenu.vala:135 src/NodeMenu.vala:390 src/NodesMenu.vala:58
860855
#: src/NodesMenu.vala:203
861856
msgid "Fold Children"
862857
msgstr ""
863858

864-
#: src/NodeMenu.vala:137
859+
#: src/NodeMenu.vala:138
865860
msgid "Detach"
866861
msgstr ""
867862

868-
#: src/NodeMenu.vala:143
863+
#: src/NodeMenu.vala:144
869864
msgid "Add Parent Node"
870865
msgstr ""
871866

872-
#: src/NodeMenu.vala:147
867+
#: src/NodeMenu.vala:148
873868
msgid "Add Child Node"
874869
msgstr ""
875870

876-
#: src/NodeMenu.vala:151
871+
#: src/NodeMenu.vala:152
877872
msgid "Add Sibling Node"
878873
msgstr ""
879874

880-
#: src/NodeMenu.vala:155 src/QuickEntry.vala:36
875+
#: src/NodeMenu.vala:156 src/QuickEntry.vala:36
881876
msgid "Quick Entry"
882877
msgstr ""
883878

884-
#: src/NodeMenu.vala:159
879+
#: src/NodeMenu.vala:160
885880
msgid "Insert Nodes"
886881
msgstr ""
887882

888-
#: src/NodeMenu.vala:163
883+
#: src/NodeMenu.vala:164
889884
msgid "Replace Nodes"
890885
msgstr ""
891886

892-
#: src/NodeMenu.vala:172
887+
#: src/NodeMenu.vala:173
893888
msgid "Root Node"
894889
msgstr ""
895890

896-
#: src/NodeMenu.vala:177
891+
#: src/NodeMenu.vala:178
897892
msgid "Next Sibling Node"
898893
msgstr ""
899894

900-
#: src/NodeMenu.vala:182
895+
#: src/NodeMenu.vala:183
901896
msgid "Previous Sibling Node"
902897
msgstr ""
903898

904-
#: src/NodeMenu.vala:187
899+
#: src/NodeMenu.vala:188
905900
msgid "Child Node"
906901
msgstr ""
907902

908-
#: src/NodeMenu.vala:192 src/NodesMenu.vala:96
903+
#: src/NodeMenu.vala:193 src/NodesMenu.vala:96
909904
msgid "Child Nodes"
910905
msgstr ""
911906

912-
#: src/NodeMenu.vala:197
907+
#: src/NodeMenu.vala:198
913908
msgid "Subtree"
914909
msgstr ""
915910

916-
#: src/NodeMenu.vala:202
911+
#: src/NodeMenu.vala:203
917912
msgid "Parent Node"
918913
msgstr ""
919914

920-
#: src/NodeMenu.vala:207
915+
#: src/NodeMenu.vala:208
921916
msgid "Linked Node"
922917
msgstr ""
923918

924-
#: src/NodeMenu.vala:212
919+
#: src/NodeMenu.vala:213
925920
msgid "Connection"
926921
msgstr ""
927922

928-
#: src/NodeMenu.vala:217
923+
#: src/NodeMenu.vala:218
929924
msgid "Center Current Node"
930925
msgstr ""
931926

932-
#: src/NodeMenu.vala:221
927+
#: src/NodeMenu.vala:222
933928
msgid "Sort Children"
934929
msgstr ""
935930

936-
#: src/NodeMenu.vala:225
931+
#: src/NodeMenu.vala:226
937932
msgid "Alphabetically"
938933
msgstr ""
939934

940-
#: src/NodeMenu.vala:228
935+
#: src/NodeMenu.vala:229
941936
msgid "Randomize"
942937
msgstr ""
943938

944-
#: src/NodeMenu.vala:388
939+
#: src/NodeMenu.vala:386
945940
msgid "Remove Task"
946941
msgstr ""
947942

948-
#: src/NodeMenu.vala:389
943+
#: src/NodeMenu.vala:387
949944
msgid "Mark Task As Done"
950945
msgstr ""
951946

952-
#: src/NodeMenu.vala:393
947+
#: src/NodeMenu.vala:389
953948
msgid "Remove Node Link"
954949
msgstr ""
955950

956-
#: src/NodeMenu.vala:394 src/NodesMenu.vala:203
951+
#: src/NodeMenu.vala:390 src/NodesMenu.vala:203
957952
msgid "Unfold Children"
958953
msgstr ""
959954

960-
#: src/NodeMenu.vala:399
955+
#: src/NodeMenu.vala:407
961956
msgid "Paste Text As Child Node"
962957
msgstr ""
963958

964-
#: src/NodeMenu.vala:400
959+
#: src/NodeMenu.vala:408
965960
msgid "Paste and Replace Node Text"
966961
msgstr ""
967962

968-
#: src/NodeMenu.vala:402
963+
#: src/NodeMenu.vala:410
969964
msgid "Paste Image As Child Node"
970965
msgstr ""
971966

972-
#: src/NodeMenu.vala:403
967+
#: src/NodeMenu.vala:411
973968
msgid "Paste and Replace Node Image"
974969
msgstr ""
975970

976-
#: src/NodeMenu.vala:405
971+
#: src/NodeMenu.vala:413
977972
msgid "Paste Node As Child"
978973
msgstr ""
979974

980-
#: src/NodeMenu.vala:617 src/NodesMenu.vala:244
975+
#: src/NodeMenu.vala:620 src/NodesMenu.vala:244
981976
msgid "Select a link color"
982977
msgstr ""
983978

@@ -1029,11 +1024,11 @@ msgstr ""
10291024
msgid "Align Right"
10301025
msgstr ""
10311026

1032-
#: src/Node.vala:1719
1027+
#: src/Node.vala:1723
10331028
msgid "Node Title"
10341029
msgstr ""
10351030

1036-
#: src/Node.vala:1722
1031+
#: src/Node.vala:1726
10371032
msgid "Node Note"
10381033
msgstr ""
10391034

0 commit comments

Comments
 (0)