Skip to content

Commit 1d51494

Browse files
committed
Merge branch 'master' of github.com:hneemann/Digital into romManager
2 parents e72d9f3 + 1289a3f commit 1d51494

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

src/main/dig/lib/DIL Chips/74xx/counter/74193.dig

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,18 @@
9595
<elementAttributes>
9696
<entry>
9797
<string>Description</string>
98-
<string>Data Input 0</string>
98+
<string>Down Count</string>
9999
</entry>
100100
<entry>
101101
<string>Label</string>
102-
<string>D0</string>
102+
<string>DN</string>
103103
</entry>
104104
<entry>
105105
<string>pinNumber</string>
106-
<string>15</string>
106+
<string>4</string>
107107
</entry>
108108
</elementAttributes>
109-
<pos x="340" y="200"/>
109+
<pos x="340" y="300"/>
110110
</visualElement>
111111
<visualElement>
112112
<elementName>Not</elementName>
@@ -118,18 +118,18 @@
118118
<elementAttributes>
119119
<entry>
120120
<string>Description</string>
121-
<string>Down Count</string>
121+
<string>Up Count</string>
122122
</entry>
123123
<entry>
124124
<string>Label</string>
125-
<string>DN</string>
125+
<string>UP</string>
126126
</entry>
127127
<entry>
128128
<string>pinNumber</string>
129-
<string>4</string>
129+
<string>5</string>
130130
</entry>
131131
</elementAttributes>
132-
<pos x="340" y="300"/>
132+
<pos x="340" y="500"/>
133133
</visualElement>
134134
<visualElement>
135135
<elementName>And</elementName>
@@ -156,18 +156,18 @@
156156
<elementAttributes>
157157
<entry>
158158
<string>Description</string>
159-
<string>Up Count</string>
159+
<string>Data Input 0</string>
160160
</entry>
161161
<entry>
162162
<string>Label</string>
163-
<string>UP</string>
163+
<string>D0</string>
164164
</entry>
165165
<entry>
166166
<string>pinNumber</string>
167-
<string>5</string>
167+
<string>15</string>
168168
</entry>
169169
</elementAttributes>
170-
<pos x="340" y="500"/>
170+
<pos x="340" y="200"/>
171171
</visualElement>
172172
<visualElement>
173173
<elementName>NAnd</elementName>

src/main/java/de/neemann/gui/InfoDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ private void createInfoString(StringBuilder sb) {
226226
p = path.lastIndexOf('/');
227227
sb.append("<p>");
228228
sb.append(path.substring(p + 1)).append("<br/>");
229-
sb.append("Build git-Revision").append(": ");
229+
sb.append("Build Git-Revision").append(": ");
230230
sb.append(get(REVISION)).append("<br/>");
231231
sb.append("Build Time").append(": ");
232232
sb.append(get(TIME)).append("<br/></p>");

src/main/resources/lang/lang_en.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@
20322032
<p>Written by H. Neemann in 2016-2021.</p>
20332033
<p>The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
20342034
<p>Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>.
2035-
At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
2035+
At GitHub you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
20362036
the latest release.</p>
20372037
<p>There you also can file an <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a>
20382038
or suggest

src/main/resources/lang/lang_es_ref.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ In the file howTo.md you can find more details about translations.
15041504
<p>Written by H. Neemann in 2016-2021.</p>
15051505
<p>The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
15061506
<p>Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>.
1507-
At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
1507+
At GitHub you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
15081508
the latest release.</p>
15091509
<p>There you also can file an <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a>
15101510
or suggest

src/main/resources/lang/lang_fr_ref.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,7 @@ In the file howTo.md you can find more details about translations.
18821882
<p>Written by H. Neemann in 2016-2021.</p>
18831883
<p>The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
18841884
<p>Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>.
1885-
At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
1885+
At GitHub you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
18861886
the latest release.</p>
18871887
<p>There you also can file an <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a>
18881888
or suggest

src/main/resources/lang/lang_it.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,7 @@ In the file howTo.md you can find more details about translations.
15971597
&lt;p&gt;Scritto da H. Neemann nel 2016-2021.&lt;/p&gt;
15981598
&lt;p&gt;Le icone sono prese dal &lt;a href="http://tango.freedesktop.org"&gt;Tango Desktop Project&lt;/a&gt;.&lt;/p&gt;
15991599
&lt;p&gt;Visita il progetto su &lt;a href="https://github.com/hneemann/[[name]]"&gt;GitHub&lt;/a&gt;.
1600-
Su Github puoi anche &lt;a href="https://github.com/hneemann/[[name]]/releases/latest"&gt;scaricare&lt;/a&gt;
1600+
Su GitHub puoi anche &lt;a href="https://github.com/hneemann/[[name]]/releases/latest"&gt;scaricare&lt;/a&gt;
16011601
l'ultima versione.&lt;/p&gt;
16021602
&lt;p&gt;Puoi anche inviare un &lt;a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&amp;labels=bug"&gt;problema&lt;/a&gt;
16031603
o suggerire

src/main/resources/lang/lang_it_ref.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ In the file howTo.md you can find more details about translations.
16521652
&lt;p&gt;Written by H. Neemann in 2016-2021.&lt;/p&gt;
16531653
&lt;p&gt;The icons are taken from the &lt;a href="http://tango.freedesktop.org"&gt;Tango Desktop Project&lt;/a&gt;.&lt;/p&gt;
16541654
&lt;p&gt;Visit the project at &lt;a href="https://github.com/hneemann/[[name]]"&gt;GitHub&lt;/a&gt;.
1655-
At Github you can also &lt;a href="https://github.com/hneemann/[[name]]/releases/latest"&gt;download&lt;/a&gt;
1655+
At GitHub you can also &lt;a href="https://github.com/hneemann/[[name]]/releases/latest"&gt;download&lt;/a&gt;
16561656
the latest release.&lt;/p&gt;
16571657
&lt;p&gt;There you also can file an &lt;a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&amp;labels=bug"&gt;issue&lt;/a&gt;
16581658
or suggest

src/main/resources/lang/lang_pt_ref.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1558,7 +1558,7 @@ In the file howTo.md you can find more details about translations.
15581558
<p>Written by H. Neemann in 2016-2021.</p>
15591559
<p>The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
15601560
<p>Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>.
1561-
At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
1561+
At GitHub you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
15621562
the latest release.</p>
15631563
<p>There you also can file an <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a>
15641564
or suggest

src/main/resources/lang/lang_zh_ref.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ In the file howTo.md you can find more details about translations.
967967
<p>Written by H. Neemann in 2016-2021.</p>
968968
<p>The icons are taken from the <a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
969969
<p>Visit the project at <a href="https://github.com/hneemann/[[name]]">GitHub</a>.
970-
At Github you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
970+
At GitHub you can also <a href="https://github.com/hneemann/[[name]]/releases/latest">download</a>
971971
the latest release.</p>
972972
<p>There you also can file an <a href="https://github.com/hneemann/[[name]]/issues/new?body=version:%20[[version]]&labels=bug">issue</a>
973973
or suggest

0 commit comments

Comments
 (0)