<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17256">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: transfer<br><br>Change-Id: I65ef4684f70bf1e04c8d41f8cc5b2b2e96beb9a3<br>---<br>M addons/ooh323c/src/ooq931.h<br>M channels/chan_skinny.c<br>M channels/chan_unistim.c<br>M contrib/unistimLang/en.po<br>4 files changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/56/17256/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/addons/ooh323c/src/ooq931.h b/addons/ooh323c/src/ooq931.h</span><br><span>index 18c014b..3071e5d 100644</span><br><span>--- a/addons/ooh323c/src/ooq931.h</span><br><span>+++ b/addons/ooh323c/src/ooq931.h</span><br><span>@@ -104,7 +104,7 @@</span><br><span> Q931TransferUnrestrictedDigital = 8,</span><br><span> Q931TransferRestrictedDigital = 9,</span><br><span> Q931Transfer3_1kHzAudio = 16,</span><br><span style="color: hsl(0, 100%, 40%);">- Q931TrasnferUnrestrictedDigitalWithTones = 17,</span><br><span style="color: hsl(120, 100%, 40%);">+ Q931TransferUnrestrictedDigitalWithTones = 17,</span><br><span> Q931TransferVideo = 24</span><br><span> };</span><br><span> </span><br><span>diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c</span><br><span>index 66a6f2b..f4fcad8 100644</span><br><span>--- a/channels/chan_skinny.c</span><br><span>+++ b/channels/chan_skinny.c</span><br><span>@@ -713,7 +713,7 @@</span><br><span> #define SOFTKEY_REDIAL 0x01</span><br><span> #define SOFTKEY_NEWCALL 0x02</span><br><span> #define SOFTKEY_HOLD 0x03</span><br><span style="color: hsl(0, 100%, 40%);">-#define SOFTKEY_TRNSFER 0x04</span><br><span style="color: hsl(120, 100%, 40%);">+#define SOFTKEY_TRANSFER 0x04</span><br><span> #define SOFTKEY_CFWDALL 0x05</span><br><span> #define SOFTKEY_CFWDBUSY 0x06</span><br><span> #define SOFTKEY_CFWDNOANSWER 0x07</span><br><span>@@ -737,7 +737,7 @@</span><br><span> #define KEYMASK_REDIAL (1 << 1)</span><br><span> #define KEYMASK_NEWCALL (1 << 2)</span><br><span> #define KEYMASK_HOLD (1 << 3)</span><br><span style="color: hsl(0, 100%, 40%);">-#define KEYMASK_TRNSFER (1 << 4)</span><br><span style="color: hsl(120, 100%, 40%);">+#define KEYMASK_TRANSFER (1 << 4)</span><br><span> #define KEYMASK_CFWDALL (1 << 5)</span><br><span> #define KEYMASK_CFWDBUSY (1 << 6)</span><br><span> #define KEYMASK_CFWDNOANSWER (1 << 7)</span><br><span>@@ -892,7 +892,7 @@</span><br><span> { OCTAL_REDIAL, SOFTKEY_REDIAL },</span><br><span> { OCTAL_NEWCALL, SOFTKEY_NEWCALL },</span><br><span> { OCTAL_HOLD, SOFTKEY_HOLD },</span><br><span style="color: hsl(0, 100%, 40%);">- { OCTAL_TRANSFER, SOFTKEY_TRNSFER },</span><br><span style="color: hsl(120, 100%, 40%);">+ { OCTAL_TRANSFER, SOFTKEY_TRANSFER },</span><br><span> { OCTAL_CFWDALL, SOFTKEY_CFWDALL },</span><br><span> { OCTAL_CFWDBUSY, SOFTKEY_CFWDBUSY },</span><br><span> { OCTAL_CFWDNOAN, SOFTKEY_CFWDNOANSWER },</span><br><span>@@ -932,7 +932,7 @@</span><br><span> static const uint8_t soft_key_default_connected[] = {</span><br><span> SOFTKEY_HOLD,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> SOFTKEY_PARK,</span><br><span> SOFTKEY_CFWDALL,</span><br><span> SOFTKEY_CFWDBUSY,</span><br><span>@@ -943,19 +943,19 @@</span><br><span> SOFTKEY_RESUME,</span><br><span> SOFTKEY_NEWCALL,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> };</span><br><span> </span><br><span> static const uint8_t soft_key_default_ringin[] = {</span><br><span> SOFTKEY_ANSWER,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> };</span><br><span> </span><br><span> static const uint8_t soft_key_default_offhook[] = {</span><br><span> SOFTKEY_REDIAL,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> SOFTKEY_CFWDALL,</span><br><span> SOFTKEY_CFWDBUSY,</span><br><span> SOFTKEY_CFWDNOANSWER,</span><br><span>@@ -965,7 +965,7 @@</span><br><span> static const uint8_t soft_key_default_connwithtrans[] = {</span><br><span> SOFTKEY_HOLD,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> SOFTKEY_PARK,</span><br><span> SOFTKEY_CFWDALL,</span><br><span> SOFTKEY_CFWDBUSY,</span><br><span>@@ -975,7 +975,7 @@</span><br><span> static const uint8_t soft_key_default_dadfd[] = {</span><br><span> SOFTKEY_BKSPC,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> SOFTKEY_FORCEDIAL,</span><br><span> };</span><br><span> </span><br><span>@@ -991,13 +991,13 @@</span><br><span> static const uint8_t soft_key_default_ringoutwithtransfer[] = {</span><br><span> SOFTKEY_NONE,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> };</span><br><span> </span><br><span> static const uint8_t soft_key_default_offhookwithfeat[] = {</span><br><span> SOFTKEY_REDIAL,</span><br><span> SOFTKEY_ENDCALL,</span><br><span style="color: hsl(0, 100%, 40%);">- SOFTKEY_TRNSFER,</span><br><span style="color: hsl(120, 100%, 40%);">+ SOFTKEY_TRANSFER,</span><br><span> };</span><br><span> </span><br><span> static const uint8_t soft_key_default_unknown[] = {</span><br><span>@@ -7061,8 +7061,8 @@</span><br><span> }</span><br><span> </span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case SOFTKEY_TRNSFER:</span><br><span style="color: hsl(0, 100%, 40%);">- SKINNY_DEBUG(DEBUG_PACKET, 3, "Received SOFTKEY_TRNSFER from %s, inst %d, callref %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ case SOFTKEY_TRANSFER:</span><br><span style="color: hsl(120, 100%, 40%);">+ SKINNY_DEBUG(DEBUG_PACKET, 3, "Received SOFTKEY_TRANSFER from %s, inst %d, callref %d\n",</span><br><span> d->name, instance, callreference);</span><br><span> if (l->transfer)</span><br><span> handle_transfer_button(sub);</span><br><span>diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c</span><br><span>index 6a71e44..d3875ee 100644</span><br><span>--- a/channels/chan_unistim.c</span><br><span>+++ b/channels/chan_unistim.c</span><br><span>@@ -3156,7 +3156,7 @@</span><br><span> send_text(TEXT_LINE1, TEXT_NORMAL, s, s->device->phone_number);</span><br><span> send_text(TEXT_LINE2, TEXT_NORMAL, s, ustmtext("Dialing...", s));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- send_text_status(s, ustmtext("TransfrCancel", s));</span><br><span style="color: hsl(120, 100%, 40%);">+ send_text_status(s, ustmtext("TransferCancel", s));</span><br><span> </span><br><span> if (ast_pthread_create(&sub->ss_thread, NULL, unistim_ss, c)) {</span><br><span> ast_log(LOG_WARNING, "Unable to start simple switch on channel %p\n", c);</span><br><span>diff --git a/contrib/unistimLang/en.po b/contrib/unistimLang/en.po</span><br><span>index 8973068..d1e9750 100644</span><br><span>--- a/contrib/unistimLang/en.po</span><br><span>+++ b/contrib/unistimLang/en.po</span><br><span>@@ -58,8 +58,8 @@</span><br><span> msgstr "Dialing..."</span><br><span> </span><br><span> #: chan_unistim_lang.c:13</span><br><span style="color: hsl(0, 100%, 40%);">-msgid "TransfrCancel"</span><br><span style="color: hsl(0, 100%, 40%);">-msgstr "TransfrCancel"</span><br><span style="color: hsl(120, 100%, 40%);">+msgid "TransferCancel"</span><br><span style="color: hsl(120, 100%, 40%);">+msgstr "TransferCancel"</span><br><span> </span><br><span> #: chan_unistim_lang.c:14</span><br><span> #: chan_unistim_lang.c:20</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17256">change 17256</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/17256"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I65ef4684f70bf1e04c8d41f8cc5b2b2e96beb9a3 </div>
<div style="display:none"> Gerrit-Change-Number: 17256 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>