[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: pactl: explicitly print if port availability is unknown
Tanu Kaskinen
gitlab at gitlab.freedesktop.org
Sat Nov 21 14:34:31 UTC 2020
Tanu Kaskinen pushed to branch master at PulseAudio / pulseaudio
Commits:
2d018a82 by Igor V. Kovalenko at 2020-11-21T16:34:09+03:00
pactl: explicitly print if port availability is unknown
Port availability is a tristate -- not-available / unknown / available.
Explicitly print if availability is unknown to reduce confusion.
- - - - -
89a53e1b by Igor V. Kovalenko at 2020-11-21T16:49:12+03:00
i18n: Update pulseaudio.pot
- - - - -
2 changed files:
- po/pulseaudio.pot
- src/utils/pactl.c
Changes:
=====================================
po/pulseaudio.pot
=====================================
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/new\n"
-"POT-Creation-Date: 2020-08-13 22:00+0300\n"
+"POT-Creation-Date: 2020-11-21 16:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -437,18 +437,18 @@ msgstr ""
msgid "pa_core_new() failed."
msgstr ""
-#: src/daemon/main.c:1110
+#: src/daemon/main.c:1114
msgid "command line arguments"
msgstr ""
-#: src/daemon/main.c:1117
+#: src/daemon/main.c:1121
#, c-format
msgid ""
"Failed to initialize daemon due to errors while executing startup commands. Source of "
"commands: %s"
msgstr ""
-#: src/daemon/main.c:1122
+#: src/daemon/main.c:1126
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
@@ -502,12 +502,12 @@ msgid "Internal Microphone"
msgstr ""
#: src/modules/alsa/alsa-mixer.c:2631 src/modules/alsa/alsa-mixer.c:2717
-#: src/utils/pactl.c:258
+#: src/utils/pactl.c:260
msgid "Radio"
msgstr ""
#: src/modules/alsa/alsa-mixer.c:2632 src/modules/alsa/alsa-mixer.c:2718
-#: src/utils/pactl.c:259
+#: src/utils/pactl.c:261
msgid "Video"
msgstr ""
@@ -544,12 +544,12 @@ msgid "No Bass Boost"
msgstr ""
#: src/modules/alsa/alsa-mixer.c:2641 src/modules/bluetooth/module-bluez5-device.c:1800
-#: src/utils/pactl.c:248
+#: src/utils/pactl.c:250
msgid "Speaker"
msgstr ""
#: src/modules/alsa/alsa-mixer.c:2642 src/modules/alsa/alsa-mixer.c:2720
-#: src/utils/pactl.c:249
+#: src/utils/pactl.c:251
msgid "Headphones"
msgstr ""
@@ -613,7 +613,7 @@ msgstr ""
msgid "Chat Output"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4380
+#: src/modules/alsa/alsa-mixer.c:4394
msgid "Analog Mono"
msgstr ""
@@ -622,131 +622,131 @@ msgstr ""
#. * here would lead to the source name to become "Analog Stereo Input
#. * Input". The same logic applies to analog-stereo-output,
#. * multichannel-input and multichannel-output.
-#: src/modules/alsa/alsa-mixer.c:4381 src/modules/alsa/alsa-mixer.c:4389
-#: src/modules/alsa/alsa-mixer.c:4390
+#: src/modules/alsa/alsa-mixer.c:4395 src/modules/alsa/alsa-mixer.c:4403
+#: src/modules/alsa/alsa-mixer.c:4404
msgid "Analog Stereo"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4382 src/pulse/channelmap.c:103
+#: src/modules/alsa/alsa-mixer.c:4396 src/pulse/channelmap.c:103
#: src/pulse/channelmap.c:771
msgid "Mono"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4383 src/pulse/channelmap.c:775
+#: src/modules/alsa/alsa-mixer.c:4397 src/pulse/channelmap.c:775
msgid "Stereo"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4391 src/modules/alsa/alsa-mixer.c:4392
+#: src/modules/alsa/alsa-mixer.c:4405 src/modules/alsa/alsa-mixer.c:4406
msgid "Multichannel"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4393
+#: src/modules/alsa/alsa-mixer.c:4407
msgid "Analog Surround 2.1"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4394
+#: src/modules/alsa/alsa-mixer.c:4408
msgid "Analog Surround 3.0"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4395
+#: src/modules/alsa/alsa-mixer.c:4409
msgid "Analog Surround 3.1"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4396
+#: src/modules/alsa/alsa-mixer.c:4410
msgid "Analog Surround 4.0"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4397
+#: src/modules/alsa/alsa-mixer.c:4411
msgid "Analog Surround 4.1"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4398
+#: src/modules/alsa/alsa-mixer.c:4412
msgid "Analog Surround 5.0"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4399
+#: src/modules/alsa/alsa-mixer.c:4413
msgid "Analog Surround 5.1"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4400
+#: src/modules/alsa/alsa-mixer.c:4414
msgid "Analog Surround 6.0"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4401
+#: src/modules/alsa/alsa-mixer.c:4415
msgid "Analog Surround 6.1"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4402
+#: src/modules/alsa/alsa-mixer.c:4416
msgid "Analog Surround 7.0"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4403
+#: src/modules/alsa/alsa-mixer.c:4417
msgid "Analog Surround 7.1"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4404
+#: src/modules/alsa/alsa-mixer.c:4418
msgid "Digital Stereo (IEC958)"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4405
+#: src/modules/alsa/alsa-mixer.c:4419
msgid "Digital Surround 4.0 (IEC958/AC3)"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4406
+#: src/modules/alsa/alsa-mixer.c:4420
msgid "Digital Surround 5.1 (IEC958/AC3)"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4407
+#: src/modules/alsa/alsa-mixer.c:4421
msgid "Digital Surround 5.1 (IEC958/DTS)"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4408
+#: src/modules/alsa/alsa-mixer.c:4422
msgid "Digital Stereo (HDMI)"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4409
+#: src/modules/alsa/alsa-mixer.c:4423
msgid "Digital Surround 5.1 (HDMI)"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4410
+#: src/modules/alsa/alsa-mixer.c:4424
msgid "Chat"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4411
+#: src/modules/alsa/alsa-mixer.c:4425
msgid "Game"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4545
+#: src/modules/alsa/alsa-mixer.c:4559
msgid "Analog Mono Duplex"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4546
+#: src/modules/alsa/alsa-mixer.c:4560
msgid "Analog Stereo Duplex"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4547
+#: src/modules/alsa/alsa-mixer.c:4561
msgid "Digital Stereo Duplex (IEC958)"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4548
+#: src/modules/alsa/alsa-mixer.c:4562
msgid "Multichannel Duplex"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4549
+#: src/modules/alsa/alsa-mixer.c:4563
msgid "Stereo Duplex"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4550 src/modules/alsa/module-alsa-card.c:188
+#: src/modules/alsa/alsa-mixer.c:4564 src/modules/alsa/module-alsa-card.c:188
#: src/modules/bluetooth/module-bluez5-device.c:2053
msgid "Off"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4650
+#: src/modules/alsa/alsa-mixer.c:4664
#, c-format
msgid "%s Output"
msgstr ""
-#: src/modules/alsa/alsa-mixer.c:4658
+#: src/modules/alsa/alsa-mixer.c:4672
#, c-format
msgid "%s Input"
msgstr ""
@@ -831,11 +831,11 @@ msgstr ""
msgid "Bluetooth Output"
msgstr ""
-#: src/modules/bluetooth/module-bluez5-device.c:1780 src/utils/pactl.c:252
+#: src/modules/bluetooth/module-bluez5-device.c:1780 src/utils/pactl.c:254
msgid "Headset"
msgstr ""
-#: src/modules/bluetooth/module-bluez5-device.c:1786 src/utils/pactl.c:263
+#: src/modules/bluetooth/module-bluez5-device.c:1786 src/utils/pactl.c:265
msgid "Handsfree"
msgstr ""
@@ -843,19 +843,19 @@ msgstr ""
msgid "Headphone"
msgstr ""
-#: src/modules/bluetooth/module-bluez5-device.c:1813 src/utils/pactl.c:262
+#: src/modules/bluetooth/module-bluez5-device.c:1813 src/utils/pactl.c:264
msgid "Portable"
msgstr ""
-#: src/modules/bluetooth/module-bluez5-device.c:1819 src/utils/pactl.c:264
+#: src/modules/bluetooth/module-bluez5-device.c:1819 src/utils/pactl.c:266
msgid "Car"
msgstr ""
-#: src/modules/bluetooth/module-bluez5-device.c:1825 src/utils/pactl.c:265
+#: src/modules/bluetooth/module-bluez5-device.c:1825 src/utils/pactl.c:267
msgid "HiFi"
msgstr ""
-#: src/modules/bluetooth/module-bluez5-device.c:1831 src/utils/pactl.c:266
+#: src/modules/bluetooth/module-bluez5-device.c:1831 src/utils/pactl.c:268
msgid "Phone"
msgstr ""
@@ -889,7 +889,7 @@ msgid ""
msgstr ""
#. add on profile
-#: src/modules/macosx/module-coreaudio-device.c:824
+#: src/modules/macosx/module-coreaudio-device.c:825
msgid "On"
msgstr ""
@@ -950,7 +950,7 @@ msgstr ""
msgid "Null Output"
msgstr ""
-#: src/modules/module-null-sink.c:345 src/utils/pactl.c:1094
+#: src/modules/module-null-sink.c:345 src/utils/pactl.c:1096
#, c-format
msgid "Failed to set format: invalid format string %s"
msgstr ""
@@ -1588,7 +1588,7 @@ msgstr ""
msgid "pa_stream_connect_record() failed: %s"
msgstr ""
-#: src/utils/pacat.c:514 src/utils/pactl.c:1490
+#: src/utils/pacat.c:514 src/utils/pactl.c:1492
#, c-format
msgid "Connection failure: %s"
msgstr ""
@@ -1709,7 +1709,7 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
-#: src/utils/pacat.c:852 src/utils/pactl.c:1692
+#: src/utils/pacat.c:852 src/utils/pactl.c:1694
#, c-format
msgid "Invalid client name '%s'"
msgstr ""
@@ -1780,7 +1780,7 @@ msgid ""
"file."
msgstr ""
-#: src/utils/pacat.c:1079 src/utils/pactl.c:1756
+#: src/utils/pacat.c:1079 src/utils/pactl.c:1758
msgid "Failed to determine sample specification from file."
msgstr ""
@@ -1813,7 +1813,7 @@ msgstr ""
msgid "Failed to set media name."
msgstr ""
-#: src/utils/pacat.c:1160 src/utils/pactl.c:2106
+#: src/utils/pacat.c:1160 src/utils/pactl.c:2108
msgid "pa_mainloop_new() failed."
msgstr ""
@@ -1821,11 +1821,11 @@ msgstr ""
msgid "io_new() failed."
msgstr ""
-#: src/utils/pacat.c:1190 src/utils/pactl.c:2118
+#: src/utils/pacat.c:1190 src/utils/pactl.c:2120
msgid "pa_context_new() failed."
msgstr ""
-#: src/utils/pacat.c:1198 src/utils/pactl.c:2124
+#: src/utils/pacat.c:1198 src/utils/pactl.c:2126
#, c-format
msgid "pa_context_connect() failed: %s"
msgstr ""
@@ -1834,19 +1834,19 @@ msgstr ""
msgid "pa_context_rttime_new() failed."
msgstr ""
-#: src/utils/pacat.c:1211 src/utils/pactl.c:2129
+#: src/utils/pacat.c:1211 src/utils/pactl.c:2131
msgid "pa_mainloop_run() failed."
msgstr ""
-#: src/utils/pacmd.c:51 src/utils/pactl.c:1614
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1616
msgid "NAME [ARGS ...]"
msgstr ""
-#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1615
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1617
msgid "NAME|#N"
msgstr ""
-#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1613 src/utils/pactl.c:1619
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1615 src/utils/pactl.c:1621
msgid "NAME"
msgstr ""
@@ -1858,7 +1858,7 @@ msgstr ""
msgid "#N VOLUME"
msgstr ""
-#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1617
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1619
msgid "NAME|#N 1|0"
msgstr ""
@@ -1894,7 +1894,7 @@ msgstr ""
msgid "FILENAME SINK|#N"
msgstr ""
-#: src/utils/pacmd.c:69 src/utils/pactl.c:1616
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1618
msgid "#N SINK|SOURCE"
msgstr ""
@@ -1902,15 +1902,15 @@ msgstr ""
msgid "1|0"
msgstr ""
-#: src/utils/pacmd.c:72 src/utils/pactl.c:1618
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1620
msgid "CARD PROFILE"
msgstr ""
-#: src/utils/pacmd.c:73 src/utils/pactl.c:1620
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1622
msgid "NAME|#N PORT"
msgstr ""
-#: src/utils/pacmd.c:74 src/utils/pactl.c:1626
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1628
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2035,71 +2035,75 @@ msgid ""
msgstr ""
#: src/utils/pactl.c:237
-msgid ", available"
+msgid "availability unknown"
msgstr ""
#: src/utils/pactl.c:238
-msgid ", not available"
+msgid "available"
msgstr ""
-#: src/utils/pactl.c:246 src/utils/pactl.c:270
+#: src/utils/pactl.c:239
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:248 src/utils/pactl.c:272
msgid "Unknown"
msgstr ""
-#: src/utils/pactl.c:247
+#: src/utils/pactl.c:249
msgid "Aux"
msgstr ""
-#: src/utils/pactl.c:250
+#: src/utils/pactl.c:252
msgid "Line"
msgstr ""
-#: src/utils/pactl.c:251
+#: src/utils/pactl.c:253
msgid "Mic"
msgstr ""
-#: src/utils/pactl.c:253
+#: src/utils/pactl.c:255
msgid "Handset"
msgstr ""
-#: src/utils/pactl.c:254
+#: src/utils/pactl.c:256
msgid "Earpiece"
msgstr ""
-#: src/utils/pactl.c:255
+#: src/utils/pactl.c:257
msgid "SPDIF"
msgstr ""
-#: src/utils/pactl.c:256
+#: src/utils/pactl.c:258
msgid "HDMI"
msgstr ""
-#: src/utils/pactl.c:257
+#: src/utils/pactl.c:259
msgid "TV"
msgstr ""
-#: src/utils/pactl.c:260
+#: src/utils/pactl.c:262
msgid "USB"
msgstr ""
-#: src/utils/pactl.c:261
+#: src/utils/pactl.c:263
msgid "Bluetooth"
msgstr ""
-#: src/utils/pactl.c:267
+#: src/utils/pactl.c:269
msgid "Network"
msgstr ""
-#: src/utils/pactl.c:268
+#: src/utils/pactl.c:270
msgid "Analog"
msgstr ""
-#: src/utils/pactl.c:292 src/utils/pactl.c:944 src/utils/pactl.c:1022
+#: src/utils/pactl.c:294 src/utils/pactl.c:946 src/utils/pactl.c:1024
#, c-format
msgid "Failed to get sink information: %s"
msgstr ""
-#: src/utils/pactl.c:318
+#: src/utils/pactl.c:320
#, c-format
msgid ""
"Sink #%u\n"
@@ -2121,36 +2125,36 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:362 src/utils/pactl.c:470 src/utils/pactl.c:633
+#: src/utils/pactl.c:364 src/utils/pactl.c:472 src/utils/pactl.c:635
#, c-format
msgid "\tPorts:\n"
msgstr ""
-#: src/utils/pactl.c:364 src/utils/pactl.c:472
+#: src/utils/pactl.c:366 src/utils/pactl.c:474
#, c-format
-msgid "\t\t%s: %s (type: %s, priority: %u%s%s%s)\n"
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
msgstr ""
-#: src/utils/pactl.c:366 src/utils/pactl.c:474 src/utils/pactl.c:638
+#: src/utils/pactl.c:368 src/utils/pactl.c:476 src/utils/pactl.c:640
msgid ", availability group: "
msgstr ""
-#: src/utils/pactl.c:371 src/utils/pactl.c:479
+#: src/utils/pactl.c:373 src/utils/pactl.c:481
#, c-format
msgid "\tActive Port: %s\n"
msgstr ""
-#: src/utils/pactl.c:377 src/utils/pactl.c:485
+#: src/utils/pactl.c:379 src/utils/pactl.c:487
#, c-format
msgid "\tFormats:\n"
msgstr ""
-#: src/utils/pactl.c:401 src/utils/pactl.c:964 src/utils/pactl.c:1037
+#: src/utils/pactl.c:403 src/utils/pactl.c:966 src/utils/pactl.c:1039
#, c-format
msgid "Failed to get source information: %s"
msgstr ""
-#: src/utils/pactl.c:427
+#: src/utils/pactl.c:429
#, c-format
msgid ""
"Source #%u\n"
@@ -2172,19 +2176,19 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:455 src/utils/pactl.c:527 src/utils/pactl.c:570 src/utils/pactl.c:612
-#: src/utils/pactl.c:711 src/utils/pactl.c:712 src/utils/pactl.c:723 src/utils/pactl.c:781
-#: src/utils/pactl.c:782 src/utils/pactl.c:793 src/utils/pactl.c:844 src/utils/pactl.c:845
-#: src/utils/pactl.c:851
+#: src/utils/pactl.c:457 src/utils/pactl.c:529 src/utils/pactl.c:572 src/utils/pactl.c:614
+#: src/utils/pactl.c:713 src/utils/pactl.c:714 src/utils/pactl.c:725 src/utils/pactl.c:783
+#: src/utils/pactl.c:784 src/utils/pactl.c:795 src/utils/pactl.c:846 src/utils/pactl.c:847
+#: src/utils/pactl.c:853
msgid "n/a"
msgstr ""
-#: src/utils/pactl.c:496 src/utils/pactl.c:901
+#: src/utils/pactl.c:498 src/utils/pactl.c:903
#, c-format
msgid "Failed to get module information: %s"
msgstr ""
-#: src/utils/pactl.c:519
+#: src/utils/pactl.c:521
#, c-format
msgid ""
"Module #%u\n"
@@ -2195,12 +2199,12 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:538
+#: src/utils/pactl.c:540
#, c-format
msgid "Failed to get client information: %s"
msgstr ""
-#: src/utils/pactl.c:564
+#: src/utils/pactl.c:566
#, c-format
msgid ""
"Client #%u\n"
@@ -2210,12 +2214,12 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:581
+#: src/utils/pactl.c:583
#, c-format
msgid "Failed to get card information: %s"
msgstr ""
-#: src/utils/pactl.c:604
+#: src/utils/pactl.c:606
#, c-format
msgid ""
"Card #%u\n"
@@ -2226,44 +2230,44 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:620
+#: src/utils/pactl.c:622
#, c-format
msgid "\tProfiles:\n"
msgstr ""
-#: src/utils/pactl.c:622
+#: src/utils/pactl.c:624
#, c-format
msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
msgstr ""
-#: src/utils/pactl.c:627
+#: src/utils/pactl.c:629
#, c-format
msgid "\tActive Profile: %s\n"
msgstr ""
-#: src/utils/pactl.c:636
+#: src/utils/pactl.c:638
#, c-format
-msgid "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s%s)\n"
+msgid "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
msgstr ""
-#: src/utils/pactl.c:642
+#: src/utils/pactl.c:644
#, c-format
msgid ""
"\t\t\tProperties:\n"
"\t\t\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:647
+#: src/utils/pactl.c:649
#, c-format
msgid "\t\t\tPart of profile(s): %s"
msgstr ""
-#: src/utils/pactl.c:664 src/utils/pactl.c:984 src/utils/pactl.c:1052
+#: src/utils/pactl.c:666 src/utils/pactl.c:986 src/utils/pactl.c:1054
#, c-format
msgid "Failed to get sink input information: %s"
msgstr ""
-#: src/utils/pactl.c:693
+#: src/utils/pactl.c:695
#, c-format
msgid ""
"Sink Input #%u\n"
@@ -2285,12 +2289,12 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:734 src/utils/pactl.c:1004 src/utils/pactl.c:1067
+#: src/utils/pactl.c:736 src/utils/pactl.c:1006 src/utils/pactl.c:1069
#, c-format
msgid "Failed to get source output information: %s"
msgstr ""
-#: src/utils/pactl.c:763
+#: src/utils/pactl.c:765
#, c-format
msgid ""
"Source Output #%u\n"
@@ -2312,12 +2316,12 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:804
+#: src/utils/pactl.c:806
#, c-format
msgid "Failed to get sample information: %s"
msgstr ""
-#: src/utils/pactl.c:831
+#: src/utils/pactl.c:833
#, c-format
msgid ""
"Sample #%u\n"
@@ -2334,17 +2338,17 @@ msgid ""
"\t\t%s\n"
msgstr ""
-#: src/utils/pactl.c:859 src/utils/pactl.c:869
+#: src/utils/pactl.c:861 src/utils/pactl.c:871
#, c-format
msgid "Failure: %s"
msgstr ""
-#: src/utils/pactl.c:908
+#: src/utils/pactl.c:910
#, c-format
msgid "Failed to unload module: Module %s not loaded"
msgstr ""
-#: src/utils/pactl.c:926
+#: src/utils/pactl.c:928
#, c-format
msgid ""
"Failed to set volume: You tried to set volumes for %d channel, whereas channel(s) "
@@ -2355,135 +2359,135 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/utils/pactl.c:1137
+#: src/utils/pactl.c:1139
#, c-format
msgid "Failed to upload sample: %s"
msgstr ""
-#: src/utils/pactl.c:1154
+#: src/utils/pactl.c:1156
msgid "Premature end of file"
msgstr ""
-#: src/utils/pactl.c:1174
+#: src/utils/pactl.c:1176
msgid "new"
msgstr ""
-#: src/utils/pactl.c:1177
+#: src/utils/pactl.c:1179
msgid "change"
msgstr ""
-#: src/utils/pactl.c:1180
+#: src/utils/pactl.c:1182
msgid "remove"
msgstr ""
-#: src/utils/pactl.c:1183 src/utils/pactl.c:1218
+#: src/utils/pactl.c:1185 src/utils/pactl.c:1220
msgid "unknown"
msgstr ""
-#: src/utils/pactl.c:1191
+#: src/utils/pactl.c:1193
msgid "sink"
msgstr ""
-#: src/utils/pactl.c:1194
+#: src/utils/pactl.c:1196
msgid "source"
msgstr ""
-#: src/utils/pactl.c:1197
+#: src/utils/pactl.c:1199
msgid "sink-input"
msgstr ""
-#: src/utils/pactl.c:1200
+#: src/utils/pactl.c:1202
msgid "source-output"
msgstr ""
-#: src/utils/pactl.c:1203
+#: src/utils/pactl.c:1205
msgid "module"
msgstr ""
-#: src/utils/pactl.c:1206
+#: src/utils/pactl.c:1208
msgid "client"
msgstr ""
-#: src/utils/pactl.c:1209
+#: src/utils/pactl.c:1211
msgid "sample-cache"
msgstr ""
-#: src/utils/pactl.c:1212
+#: src/utils/pactl.c:1214
msgid "server"
msgstr ""
-#: src/utils/pactl.c:1215
+#: src/utils/pactl.c:1217
msgid "card"
msgstr ""
-#: src/utils/pactl.c:1224
+#: src/utils/pactl.c:1226
#, c-format
msgid "Event '%s' on %s #%u\n"
msgstr ""
-#: src/utils/pactl.c:1496
+#: src/utils/pactl.c:1498
msgid "Got SIGINT, exiting."
msgstr ""
-#: src/utils/pactl.c:1529
+#: src/utils/pactl.c:1531
msgid "Invalid volume specification"
msgstr ""
-#: src/utils/pactl.c:1552
+#: src/utils/pactl.c:1554
msgid "Volume outside permissible range.\n"
msgstr ""
-#: src/utils/pactl.c:1565
+#: src/utils/pactl.c:1567
msgid "Invalid number of volume specifications.\n"
msgstr ""
-#: src/utils/pactl.c:1577
+#: src/utils/pactl.c:1579
msgid "Inconsistent volume specification.\n"
msgstr ""
-#: src/utils/pactl.c:1607 src/utils/pactl.c:1608 src/utils/pactl.c:1609
-#: src/utils/pactl.c:1610 src/utils/pactl.c:1611 src/utils/pactl.c:1612
-#: src/utils/pactl.c:1613 src/utils/pactl.c:1614 src/utils/pactl.c:1615
-#: src/utils/pactl.c:1616 src/utils/pactl.c:1617 src/utils/pactl.c:1618
-#: src/utils/pactl.c:1619 src/utils/pactl.c:1620 src/utils/pactl.c:1621
-#: src/utils/pactl.c:1622 src/utils/pactl.c:1623 src/utils/pactl.c:1624
-#: src/utils/pactl.c:1625 src/utils/pactl.c:1626 src/utils/pactl.c:1627
+#: src/utils/pactl.c:1609 src/utils/pactl.c:1610 src/utils/pactl.c:1611
+#: src/utils/pactl.c:1612 src/utils/pactl.c:1613 src/utils/pactl.c:1614
+#: src/utils/pactl.c:1615 src/utils/pactl.c:1616 src/utils/pactl.c:1617
+#: src/utils/pactl.c:1618 src/utils/pactl.c:1619 src/utils/pactl.c:1620
+#: src/utils/pactl.c:1621 src/utils/pactl.c:1622 src/utils/pactl.c:1623
+#: src/utils/pactl.c:1624 src/utils/pactl.c:1625 src/utils/pactl.c:1626
+#: src/utils/pactl.c:1627 src/utils/pactl.c:1628 src/utils/pactl.c:1629
msgid "[options]"
msgstr ""
-#: src/utils/pactl.c:1609
+#: src/utils/pactl.c:1611
msgid "[TYPE]"
msgstr ""
-#: src/utils/pactl.c:1611
+#: src/utils/pactl.c:1613
msgid "FILENAME [NAME]"
msgstr ""
-#: src/utils/pactl.c:1612
+#: src/utils/pactl.c:1614
msgid "NAME [SINK]"
msgstr ""
-#: src/utils/pactl.c:1621
+#: src/utils/pactl.c:1623
msgid "NAME|#N VOLUME [VOLUME ...]"
msgstr ""
-#: src/utils/pactl.c:1622
+#: src/utils/pactl.c:1624
msgid "#N VOLUME [VOLUME ...]"
msgstr ""
-#: src/utils/pactl.c:1623
+#: src/utils/pactl.c:1625
msgid "NAME|#N 1|0|toggle"
msgstr ""
-#: src/utils/pactl.c:1624
+#: src/utils/pactl.c:1626
msgid "#N 1|0|toggle"
msgstr ""
-#: src/utils/pactl.c:1625
+#: src/utils/pactl.c:1627
msgid "#N FORMATS"
msgstr ""
-#: src/utils/pactl.c:1628
+#: src/utils/pactl.c:1630
#, c-format
msgid ""
"\n"
@@ -2491,7 +2495,7 @@ msgid ""
"can be used to specify the default sink, source and monitor.\n"
msgstr ""
-#: src/utils/pactl.c:1631
+#: src/utils/pactl.c:1633
#, c-format
msgid ""
"\n"
@@ -2502,7 +2506,7 @@ msgid ""
" -n, --client-name=NAME How to call this client on the server\n"
msgstr ""
-#: src/utils/pactl.c:1672
+#: src/utils/pactl.c:1674
#, c-format
msgid ""
"pactl %s\n"
@@ -2510,146 +2514,146 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
-#: src/utils/pactl.c:1728
+#: src/utils/pactl.c:1730
#, c-format
msgid "Specify nothing, or one of: %s"
msgstr ""
-#: src/utils/pactl.c:1738
+#: src/utils/pactl.c:1740
msgid "Please specify a sample file to load"
msgstr ""
-#: src/utils/pactl.c:1751
+#: src/utils/pactl.c:1753
msgid "Failed to open sound file."
msgstr ""
-#: src/utils/pactl.c:1763
+#: src/utils/pactl.c:1765
msgid "Warning: Failed to determine sample specification from file."
msgstr ""
-#: src/utils/pactl.c:1773
+#: src/utils/pactl.c:1775
msgid "You have to specify a sample name to play"
msgstr ""
-#: src/utils/pactl.c:1785
+#: src/utils/pactl.c:1787
msgid "You have to specify a sample name to remove"
msgstr ""
-#: src/utils/pactl.c:1794
+#: src/utils/pactl.c:1796
msgid "You have to specify a sink input index and a sink"
msgstr ""
-#: src/utils/pactl.c:1804
+#: src/utils/pactl.c:1806
msgid "You have to specify a source output index and a source"
msgstr ""
-#: src/utils/pactl.c:1819
+#: src/utils/pactl.c:1821
msgid "You have to specify a module name and arguments."
msgstr ""
-#: src/utils/pactl.c:1839
+#: src/utils/pactl.c:1841
msgid "You have to specify a module index or name"
msgstr ""
-#: src/utils/pactl.c:1852
+#: src/utils/pactl.c:1854
msgid "You may not specify more than one sink. You have to specify a boolean value."
msgstr ""
-#: src/utils/pactl.c:1857 src/utils/pactl.c:1877
+#: src/utils/pactl.c:1859 src/utils/pactl.c:1879
msgid "Invalid suspend specification."
msgstr ""
-#: src/utils/pactl.c:1872
+#: src/utils/pactl.c:1874
msgid "You may not specify more than one source. You have to specify a boolean value."
msgstr ""
-#: src/utils/pactl.c:1889
+#: src/utils/pactl.c:1891
msgid "You have to specify a card name/index and a profile name"
msgstr ""
-#: src/utils/pactl.c:1900
+#: src/utils/pactl.c:1902
msgid "You have to specify a sink name/index and a port name"
msgstr ""
-#: src/utils/pactl.c:1911
+#: src/utils/pactl.c:1913
msgid "You have to specify a sink name"
msgstr ""
-#: src/utils/pactl.c:1921
+#: src/utils/pactl.c:1923
msgid "You have to specify a source name/index and a port name"
msgstr ""
-#: src/utils/pactl.c:1932
+#: src/utils/pactl.c:1934
msgid "You have to specify a source name"
msgstr ""
-#: src/utils/pactl.c:1942
+#: src/utils/pactl.c:1944
msgid "You have to specify a sink name/index and a volume"
msgstr ""
-#: src/utils/pactl.c:1955
+#: src/utils/pactl.c:1957
msgid "You have to specify a source name/index and a volume"
msgstr ""
-#: src/utils/pactl.c:1968
+#: src/utils/pactl.c:1970
msgid "You have to specify a sink input index and a volume"
msgstr ""
-#: src/utils/pactl.c:1973
+#: src/utils/pactl.c:1975
msgid "Invalid sink input index"
msgstr ""
-#: src/utils/pactl.c:1984
+#: src/utils/pactl.c:1986
msgid "You have to specify a source output index and a volume"
msgstr ""
-#: src/utils/pactl.c:1989
+#: src/utils/pactl.c:1991
msgid "Invalid source output index"
msgstr ""
-#: src/utils/pactl.c:2000
+#: src/utils/pactl.c:2002
msgid "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
msgstr ""
-#: src/utils/pactl.c:2005 src/utils/pactl.c:2020 src/utils/pactl.c:2040
-#: src/utils/pactl.c:2058
+#: src/utils/pactl.c:2007 src/utils/pactl.c:2022 src/utils/pactl.c:2042
+#: src/utils/pactl.c:2060
msgid "Invalid mute specification"
msgstr ""
-#: src/utils/pactl.c:2015
+#: src/utils/pactl.c:2017
msgid "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
msgstr ""
-#: src/utils/pactl.c:2030
+#: src/utils/pactl.c:2032
msgid "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
msgstr ""
-#: src/utils/pactl.c:2035
+#: src/utils/pactl.c:2037
msgid "Invalid sink input index specification"
msgstr ""
-#: src/utils/pactl.c:2048
+#: src/utils/pactl.c:2050
msgid "You have to specify a source output index and a mute action (0, 1, or 'toggle')"
msgstr ""
-#: src/utils/pactl.c:2053
+#: src/utils/pactl.c:2055
msgid "Invalid source output index specification"
msgstr ""
-#: src/utils/pactl.c:2070
+#: src/utils/pactl.c:2072
msgid ""
"You have to specify a sink index and a semicolon-separated list of supported formats"
msgstr ""
-#: src/utils/pactl.c:2082
+#: src/utils/pactl.c:2084
msgid "You have to specify a card name/index, a port name and a latency offset"
msgstr ""
-#: src/utils/pactl.c:2089
+#: src/utils/pactl.c:2091
msgid "Could not parse latency offset"
msgstr ""
-#: src/utils/pactl.c:2101
+#: src/utils/pactl.c:2103
msgid "No valid command specified."
msgstr ""
=====================================
src/utils/pactl.c
=====================================
@@ -232,12 +232,14 @@ static void get_server_info_callback(pa_context *c, const pa_server_info *i, voi
complete_action();
}
-static const char* get_available_str_ynonly(int available) {
+static const char* get_available_str(int available) {
switch (available) {
- case PA_PORT_AVAILABLE_YES: return _(", available");
- case PA_PORT_AVAILABLE_NO: return _(", not available");
+ case PA_PORT_AVAILABLE_UNKNOWN: return _("availability unknown");
+ case PA_PORT_AVAILABLE_YES: return _("available");
+ case PA_PORT_AVAILABLE_NO: return _("not available");
}
- return "";
+
+ pa_assert_not_reached();
}
static const char* get_device_port_type(unsigned int type) {
@@ -361,10 +363,10 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_
printf(_("\tPorts:\n"));
for (p = i->ports; *p; p++)
- printf(_("\t\t%s: %s (type: %s, priority: %u%s%s%s)\n"),
+ printf(_("\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"),
(*p)->name, (*p)->description, get_device_port_type((*p)->type),
(*p)->priority, (*p)->availability_group ? _(", availability group: ") : "",
- (*p)->availability_group ?: "", get_available_str_ynonly((*p)->available));
+ (*p)->availability_group ?: "", get_available_str((*p)->available));
}
if (i->active_port)
@@ -469,10 +471,10 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int
printf(_("\tPorts:\n"));
for (p = i->ports; *p; p++)
- printf(_("\t\t%s: %s (type: %s, priority: %u%s%s%s)\n"),
+ printf(_("\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"),
(*p)->name, (*p)->description, get_device_port_type((*p)->type),
(*p)->priority, (*p)->availability_group ? _(", availability group: ") : "",
- (*p)->availability_group ?: "", get_available_str_ynonly((*p)->available));
+ (*p)->availability_group ?: "", get_available_str((*p)->available));
}
if (i->active_port)
@@ -633,10 +635,10 @@ static void get_card_info_callback(pa_context *c, const pa_card_info *i, int is_
printf(_("\tPorts:\n"));
for (p = i->ports; *p; p++) {
pa_card_profile_info **pr = (*p)->profiles;
- printf(_("\t\t%s: %s (type: %s, priority: %u, latency offset: %" PRId64 " usec%s%s%s)\n"), (*p)->name,
+ printf(_("\t\t%s: %s (type: %s, priority: %u, latency offset: %" PRId64 " usec%s%s, %s)\n"), (*p)->name,
(*p)->description, get_device_port_type((*p)->type), (*p)->priority, (*p)->latency_offset,
(*p)->availability_group ? _(", availability group: ") : "", (*p)->availability_group ?: "",
- get_available_str_ynonly((*p)->available));
+ get_available_str((*p)->available));
if (!pa_proplist_isempty((*p)->proplist)) {
printf(_("\t\t\tProperties:\n\t\t\t\t%s\n"), pl = pa_proplist_to_string_sep((*p)->proplist, "\n\t\t\t\t"));
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/d83ad6990e4b383dd08311fd6135556ba84e5847...89a53e1b7184ebfd25298396a32d70564799752a
--
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/d83ad6990e4b383dd08311fd6135556ba84e5847...89a53e1b7184ebfd25298396a32d70564799752a
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20201121/36433f1f/attachment-0001.htm>
More information about the pulseaudio-commits
mailing list