<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } body { font-size: 0.875rem; } body { -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; } body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: inherit; } </style> </head> <body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";'> <div class="content"> <h3 style="margin-top: 20px; margin-bottom: 10px;"> PulseAudio Marge Bot pushed to branch master at <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio" style="color: #1068bf; text-decoration: none;">PulseAudio / pulseaudio</a> </h3> <h4 style="margin-top: 10px; margin-bottom: 10px;"> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ffd7a60767b699c8e20e797328df5d8a857d0261" style="color: #1068bf; text-decoration: none;">ffd7a607</a> <div> by peijiankang at 2022-06-23T09:27:15+00:00 </div> <pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>fix translation error of pulseaudio Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/726> </pre> </li> </ul> <h4 style="margin-top: 10px; margin-bottom: 10px;">1 changed file:</h4> <ul> <li class="file-stats"> <a href="#b62939186b90a0131e4e5a52332a49d9e9b00513" style="color: #1068bf; text-decoration: none;"> src/modules/alsa/alsa-mixer.c </a> </li> </ul> <h4 style="margin-top: 10px; margin-bottom: 10px;">Changes:</h4> <li id="b62939186b90a0131e4e5a52332a49d9e9b00513"> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ffd7a60767b699c8e20e797328df5d8a857d0261#b62939186b90a0131e4e5a52332a49d9e9b00513" style="color: #1068bf; text-decoration: none;">src/modules/alsa/alsa-mixer.c</a> <hr style="overflow: hidden; border: 1px solid #e1e1e1;"> <table class="code white" style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="2838" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="2838" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="color: rgba(0,0,0,0.3); padding: inherit;" bgcolor="#fafafa">@@ -2838,7 +2838,7 @@ static int path_verify(pa_alsa_path *p) {</td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="2838" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2838 </td> <td class="new_line diff-line-num" data-linenumber="2838" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2838 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> if (p->device_port_type == PA_DEVICE_PORT_TYPE_UNKNOWN) </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="2839" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2839 </td> <td class="new_line diff-line-num" data-linenumber="2839" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2839 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> p->device_port_type = map->type; </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="2840" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2840 </td> <td class="new_line diff-line-num" data-linenumber="2840" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2840 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> if (!p->description) </pre></td> </tr> <tr class="line_holder old" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="2841" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> 2841 </td> <td class="new_line diff-line-num old" data-linenumber="2841" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>- p->description = pa_xstrdup(map->description); </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="2842" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="2841" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 2841 </td> <td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+ p->description = pa_xstrdup(_(map->description)); </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="2842" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2842 </td> <td class="new_line diff-line-num" data-linenumber="2842" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2842 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> } </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="2843" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2843 </td> <td class="new_line diff-line-num" data-linenumber="2843" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2843 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="2844" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2844 </td> <td class="new_line diff-line-num" data-linenumber="2844" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa"> 2844 </td> <td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> if (!p->description) { </pre></td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ffd7a60767b699c8e20e797328df5d8a857d0261" style="color: #1068bf; text-decoration: none;">View it on GitLab</a>. You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. <script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ffd7a60767b699c8e20e797328df5d8a857d0261"}}</script> </div> </body> </html>