Merge commit 'origin/master' into vuplus

copy po folder from master.
change word on unpack_append.

diff --combined lib/dvb/frontend.cpp
index 9de5917,233921d..db58a6f
mode 100755,100644..100755
--- 1/lib/dvb/frontend.cpp
--- 2/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@@ -490,11 -490,6 +490,11 @@@ void eDVBFrontend::reopenFrontend(
        openFrontend();
  }
  
 +#ifdef BUILD_VUPLUS /* ikseong */
 +int frontend0_fd;
 +int frontend1_fd;
 +#endif
 +
  int eDVBFrontend::openFrontend()
  {
        if (m_state != stateClosed)
@@@ -519,15 -514,6 +519,15 @@@
                                eWarning("failed! (%s) %m", m_filename);
                                return -1;
                        }
 +#ifdef BUILD_VUPLUS /* ikseong */
 +                      else
 +                      {                               
 +                              if (m_dvbid==0)
 +                                      frontend0_fd = m_fd;
 +                              else if (m_dvbid==1)
 +                                      frontend1_fd = m_fd;
 +                      }
 +#endif
                }
        }
        else
@@@ -730,10 -716,6 +730,10 @@@ void eDVBFrontend::timeout(
        m_tuning = 0;
        if (m_state == stateTuning)
        {
 +#ifdef BUILD_VUPLUS /* ikseong  */
 +              eDVBFrontend *sec_fe = this;
 +              sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc
 +#endif
                m_state = stateFailed;
                m_stateChanged(this);
        }
@@@ -1119,7 -1101,7 +1119,7 @@@ static void fillDictWithSatelliteData(e
        PutToDict(dict, "orbital_position", orb_pos);
        PutToDict(dict, "polarization", polarization);
  
-       switch(parm_u_qpsk_fec_inner)
+       switch((int)parm_u_qpsk_fec_inner)
        {
        case FEC_1_2: tmp = eDVBFrontendParametersSatellite::FEC_1_2; break;
        case FEC_2_3: tmp = eDVBFrontendParametersSatellite::FEC_2_3; break;