Skip to content

Commit 3a4410e

Browse files
dreibhdreibh
committed
Further clean-ups.
1 parent 2c061b5 commit 3a4410e

File tree

4 files changed

+50
-49
lines changed

4 files changed

+50
-49
lines changed

‎po/de/subnetcalc.po‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: \"subnetcalc\" \"2.5.2~rc0\"\n"
1010
"Report-Msgid-Bugs-To: \"https://github.com/dreibh/system-tools/issues\"\n"
11-
"POT-Creation-Date: 2024-10-19 19:05+0200\n"
11+
"POT-Creation-Date: 2024-10-19 20:53+0200\n"
1212
"PO-Revision-Date: 2024-10-19 18:40+0200\n"
1313
"Last-Translator: Thomas Dreibholz <[email protected]>\n"
1414
"Language-Team:\n"
@@ -216,89 +216,89 @@ msgid "Global Unicast Properties:"
216216
msgstr "Globale Unicast-Eigenschaften:"
217217

218218
#: src/subnetcalc.cc:707
219-
msgid "6to4 address"
220-
msgstr "6to4-Adresse"
219+
msgid "6-to-4 Address"
220+
msgstr "6-to-4-Adresse"
221221

222-
#: src/subnetcalc.cc:746
222+
#: src/subnetcalc.cc:745
223223
msgid "Usage:"
224224
msgstr "Aufruf:"
225225

226-
#: src/subnetcalc.cc:757 src/subnetcalc.cc:772
226+
#: src/subnetcalc.cc:756 src/subnetcalc.cc:771
227227
#, c-format
228228
msgid "ERROR: Invalid address %s!"
229229
msgstr "FEHLER: Ungültige Adresse %s!"
230230

231-
#: src/subnetcalc.cc:762 src/subnetcalc.cc:781 src/subnetcalc.cc:807
231+
#: src/subnetcalc.cc:761 src/subnetcalc.cc:780 src/subnetcalc.cc:806
232232
#, c-format
233233
msgid "ERROR: Invalid netmask %s!"
234234
msgstr "FEHLER: Ungültige Netzmaske %s!"
235235

236-
#: src/subnetcalc.cc:813
236+
#: src/subnetcalc.cc:812
237237
#, c-format
238238
msgid "ERROR: Incompatible netmask %s!"
239239
msgstr "FEHLER: Inkompatible Netzmaske %s!"
240240

241-
#: src/subnetcalc.cc:834
241+
#: src/subnetcalc.cc:833
242242
#, c-format
243243
msgid "ERROR: Invalid argument %s!"
244244
msgstr "FEHLER: Ungültiges Argument %s!"
245245

246-
#: src/subnetcalc.cc:877
246+
#: src/subnetcalc.cc:876
247247
msgid "Address"
248248
msgstr "Adresse"
249249

250-
#: src/subnetcalc.cc:880
250+
#: src/subnetcalc.cc:879
251251
msgid "Network"
252252
msgstr "Netzwerk"
253253

254-
#: src/subnetcalc.cc:882
254+
#: src/subnetcalc.cc:881
255255
msgid "Netmask"
256256
msgstr "Netzmaske"
257257

258-
#: src/subnetcalc.cc:885
258+
#: src/subnetcalc.cc:884
259259
msgid "Broadcast"
260260
msgstr "Broadcast"
261261

262-
#: src/subnetcalc.cc:890
262+
#: src/subnetcalc.cc:889
263263
msgid "not needed on Point-to-Point links"
264264
msgstr "Bei Punkt-zu-Punkt-Links nicht erforderlich"
265265

266-
#: src/subnetcalc.cc:894
266+
#: src/subnetcalc.cc:893
267267
msgid "Wildcard Mask"
268268
msgstr "Wildcardmaske"
269269

270-
#: src/subnetcalc.cc:899
270+
#: src/subnetcalc.cc:898
271271
msgid "Hex. Address"
272272
msgstr "Hex. Adresse"
273273

274-
#: src/subnetcalc.cc:902
274+
#: src/subnetcalc.cc:901
275275
msgid "Hosts Bits"
276276
msgstr "Hosts-Bits"
277277

278-
#: src/subnetcalc.cc:914
278+
#: src/subnetcalc.cc:913
279279
msgid "Max. Hosts"
280280
msgstr "Hosts maximal"
281281

282-
#: src/subnetcalc.cc:916
282+
#: src/subnetcalc.cc:915
283283
msgid "Host Range"
284284
msgstr "Hostbereich"
285285

286-
#: src/subnetcalc.cc:940 src/subnetcalc.cc:981
286+
#: src/subnetcalc.cc:939 src/subnetcalc.cc:980
287287
msgid "GeoIP AS Info"
288288
msgstr "GeoIP AS-Info"
289289

290-
#: src/subnetcalc.cc:948 src/subnetcalc.cc:989
290+
#: src/subnetcalc.cc:947 src/subnetcalc.cc:988
291291
msgid "GeoIP Country"
292292
msgstr "GeoIP-Land"
293293

294-
#: src/subnetcalc.cc:959 src/subnetcalc.cc:1000
294+
#: src/subnetcalc.cc:958 src/subnetcalc.cc:999
295295
msgid "GeoIP Region"
296296
msgstr "GeoIP-Region"
297297

298-
#: src/subnetcalc.cc:1025
298+
#: src/subnetcalc.cc:1024
299299
msgid "Performing reverse DNS lookup ..."
300300
msgstr "Reverse-DNS-Suche wird durchgeführt ..."
301301

302-
#: src/subnetcalc.cc:1041
302+
#: src/subnetcalc.cc:1040
303303
msgid "DNS Hostname"
304304
msgstr "DNS-Hostname"

‎po/nb/subnetcalc.po‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: \"subnetcalc\" \"2.5.2~rc0\"\n"
1010
"Report-Msgid-Bugs-To: \"https://github.com/dreibh/system-tools/issues\"\n"
11-
"POT-Creation-Date: 2024-10-19 19:05+0200\n"
11+
"POT-Creation-Date: 2024-10-19 20:53+0200\n"
1212
"PO-Revision-Date: 2024-10-19 18:40+0200\n"
1313
"Last-Translator: Thomas Dreibholz <[email protected]>\n"
1414
"Language-Team:\n"
@@ -211,92 +211,92 @@ msgstr "Tilordnet av global forekomst"
211211

212212
#: src/subnetcalc.cc:697
213213
msgid "Global Unicast Properties:"
214-
msgstr "Globale Unicast-egenskaper:"
214+
msgstr "Global Unicast-egenskaper:"
215215

216216
#: src/subnetcalc.cc:707
217-
msgid "6to4 address"
218-
msgstr "6to4-adresse"
217+
msgid "6-to-4 Address"
218+
msgstr "6-to-4-adresse"
219219

220-
#: src/subnetcalc.cc:746
220+
#: src/subnetcalc.cc:745
221221
msgid "Usage:"
222222
msgstr "Bruk:"
223223

224-
#: src/subnetcalc.cc:757 src/subnetcalc.cc:772
224+
#: src/subnetcalc.cc:756 src/subnetcalc.cc:771
225225
#, c-format
226226
msgid "ERROR: Invalid address %s!"
227227
msgstr "FEIL: Ugyldig adresse %s!"
228228

229-
#: src/subnetcalc.cc:762 src/subnetcalc.cc:781 src/subnetcalc.cc:807
229+
#: src/subnetcalc.cc:761 src/subnetcalc.cc:780 src/subnetcalc.cc:806
230230
#, c-format
231231
msgid "ERROR: Invalid netmask %s!"
232232
msgstr "FEIL: Ugyldig nettmaske %s!"
233233

234-
#: src/subnetcalc.cc:813
234+
#: src/subnetcalc.cc:812
235235
#, c-format
236236
msgid "ERROR: Incompatible netmask %s!"
237237
msgstr "FEIL: Inkompatibel nettmaske %s!"
238238

239-
#: src/subnetcalc.cc:834
239+
#: src/subnetcalc.cc:833
240240
#, c-format
241241
msgid "ERROR: Invalid argument %s!"
242242
msgstr "FEIL: Ugyldig argument %s!"
243243

244-
#: src/subnetcalc.cc:877
244+
#: src/subnetcalc.cc:876
245245
msgid "Address"
246246
msgstr "Adresse"
247247

248-
#: src/subnetcalc.cc:880
248+
#: src/subnetcalc.cc:879
249249
msgid "Network"
250250
msgstr "Nettverk"
251251

252-
#: src/subnetcalc.cc:882
252+
#: src/subnetcalc.cc:881
253253
msgid "Netmask"
254254
msgstr "Nettverksmaske"
255255

256-
#: src/subnetcalc.cc:885
256+
#: src/subnetcalc.cc:884
257257
msgid "Broadcast"
258258
msgstr "Broadcast"
259259

260-
#: src/subnetcalc.cc:890
260+
#: src/subnetcalc.cc:889
261261
msgid "not needed on Point-to-Point links"
262262
msgstr "ikke nødvendig på punkt-til-punkt-lenker"
263263

264-
#: src/subnetcalc.cc:894
264+
#: src/subnetcalc.cc:893
265265
msgid "Wildcard Mask"
266266
msgstr "Wildcardmaske"
267267

268-
#: src/subnetcalc.cc:899
268+
#: src/subnetcalc.cc:898
269269
msgid "Hex. Address"
270270
msgstr "Hex. adresse"
271271

272-
#: src/subnetcalc.cc:902
272+
#: src/subnetcalc.cc:901
273273
msgid "Hosts Bits"
274274
msgstr "Host bits"
275275

276-
#: src/subnetcalc.cc:914
276+
#: src/subnetcalc.cc:913
277277
msgid "Max. Hosts"
278278
msgstr "Maks. hosts "
279279

280-
#: src/subnetcalc.cc:916
280+
#: src/subnetcalc.cc:915
281281
msgid "Host Range"
282282
msgstr "Host range"
283283

284-
#: src/subnetcalc.cc:940 src/subnetcalc.cc:981
284+
#: src/subnetcalc.cc:939 src/subnetcalc.cc:980
285285
msgid "GeoIP AS Info"
286286
msgstr "GeoIP AS-info"
287287

288-
#: src/subnetcalc.cc:948 src/subnetcalc.cc:989
288+
#: src/subnetcalc.cc:947 src/subnetcalc.cc:988
289289
msgid "GeoIP Country"
290290
msgstr "GeoIP-land"
291291

292-
#: src/subnetcalc.cc:959 src/subnetcalc.cc:1000
292+
#: src/subnetcalc.cc:958 src/subnetcalc.cc:999
293293
msgid "GeoIP Region"
294294
msgstr "GeoIP-regionen"
295295

296-
#: src/subnetcalc.cc:1025
296+
#: src/subnetcalc.cc:1024
297297
msgid "Performing reverse DNS lookup ..."
298298
msgstr "Utfører omvendt DNS-oppslag ..."
299299

300-
#: src/subnetcalc.cc:1041
300+
#: src/subnetcalc.cc:1040
301301
msgid "DNS Hostname"
302302
msgstr "DNS-vertsnavn"

‎src/subnetcalc.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,11 +704,10 @@ void printAddressProperties(std::ostream& os,
704704
const uint32_t u = ntohs(((const uint16_t*)&ipv6address.s6_addr)[1]);
705705
const uint32_t l = ntohs(((const uint16_t*)&ipv6address.s6_addr)[2]);
706706
sixToFour.in.sin_addr.s_addr = htonl((u << 16) | l);
707-
os << " + " << gettext("6to4 address") << " = ";
707+
os << " + " << format("%-32s = ", gettext("6-to-4 Address"));
708708
printAddress(std::cout, &sixToFour.sa, false);
709709
os << "\n";
710710
}
711-
712711
}
713712
}
714713
}

‎src/test1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ $TEST ./subnetcalc ff3e:0::123:4 128
2525

2626
$TEST ./subnetcalc 64:ff9b::1.2.3.4 96 -n
2727
$TEST ./subnetcalc 64:ff9b:1:2:3:4:5.6.7.8 96 -n
28+
29+
$TEST ./subnetcalc www.heise.de 24

0 commit comments

Comments
 (0)