diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 17:07:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 17:07:02 +0000 |
| commit | 555d702903fb0857122024e1ab78a72d122d3f16 (patch) | |
| tree | 6c749e09d7b761f4ce353bedcc31627a38529196 /sc | |
| parent | ff721adbe05f7a6659d9dffcf46c671f8a644da7 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'sc')
309 files changed, 17754 insertions, 10701 deletions
diff --git a/sc/addin/datefunc/dfa.src b/sc/addin/datefunc/dfa.src index 9cc38af9759c..bff23ee7c886 100644 --- a/sc/addin/datefunc/dfa.src +++ b/sc/addin/datefunc/dfa.src @@ -2,9 +2,9 @@ * * $RCSfile: dfa.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2001-11-16 22:54:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,8 +87,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "Çìåñïìçíßá 1"; Text[ korean ] = "ë‚ ì§œ 1"; Text[ turkish ] = "Tarih 1"; - Text[ catalan ] = "Fecha 1"; - Text[ finnish ] = "P?iv?m??r? 1"; + Text[ catalan ] = "Data 1"; + Text[ finnish ] = "Päivämäärä 1"; + Text[ thai ] = "วันที่ 1"; }; String DFA_PAR_DATE2_NAME // Name of Date2 Parameter { @@ -114,8 +115,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "Çìåñïìçíßá 2"; Text[ korean ] = "ë‚ ì§œ 2"; Text[ turkish ] = "Tarih 2"; - Text[ catalan ] = "Fecha 2"; - Text[ finnish ] = "P?iv?m??r? 2"; + Text[ catalan ] = "Data 2"; + Text[ finnish ] = "Päivämäärä 2"; + Text[ thai ] = "วันที่ 2"; }; String DFA_PAR_MODE_NAME // Name of Mode Parameter { @@ -123,7 +125,7 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "Mode" ; Text[ english_us ] = "Mode"; Text[ portuguese ] = "Modo"; - Text[ russian ] = "Ñïîñîá âû÷èñëåíèé"; + Text[ russian ] = "Ðåæèì"; Text[ dutch ] = "Modus"; Text[ french ] = "Mode"; Text[ spanish ] = "Modo"; @@ -132,7 +134,7 @@ Resource RID_SC_ADDIN_DFA Text[ swedish ] = "Typ"; Text[ polish ] = "Tryb"; Text[ portuguese_brazilian ] = "Mode"; - Text[ japanese ] = "ﾓｰﾄﾞ"; + Text[ japanese ] = "モード"; Text[ chinese_simplified ] = "类型"; Text[ chinese_traditional ] = "é¡žåž‹"; Text[ arabic ] = "ØÑíÞÉ ÇáÍÓÇÈ"; @@ -141,8 +143,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "Ôñüðïò"; Text[ korean ] = "모드"; Text[ turkish ] = "Tür"; - Text[ catalan ] = "Modo"; + Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "โหมด"; }; String DFA_PAR_DATE_NAME // Name of Date Parameter @@ -169,8 +172,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "Çìåñïìçíßá"; Text[ korean ] = "ë‚ ì§œ"; Text[ turkish ] = "Tarih"; - Text[ catalan ] = "Fecha"; - Text[ finnish ] = "P?iv?m??r?"; + Text[ catalan ] = "Data"; + Text[ finnish ] = "Päivämäärä"; + Text[ thai ] = "วันที่"; }; String DFA_PAR_DATE_DESC // Description of Date Parameter @@ -179,7 +183,7 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "a internal date value" ; Text[ english_us ] = "Internal number of the date"; Text[ portuguese ] = "Número interno da data"; - Text[ russian ] = "Ïðåäñòàâëÿåò âíóòðåííåå çíà÷åíèå äàòû"; + Text[ russian ] = "Âíóòðåííåå ÷èñëî äàòû"; Text[ dutch ] = "Interne waarde van de datum"; Text[ french ] = "Le numéro de série de la date"; Text[ spanish ] = "Número interno de la fecha"; @@ -188,17 +192,18 @@ Resource RID_SC_ADDIN_DFA Text[ swedish ] = "Datumets interna tal"; Text[ polish ] = "Wewnêtrzna liczba daty"; Text[ portuguese_brazilian ] = "a internal date value"; - Text[ japanese ] = "日付ã®ï½¼ï¾˜ï½±ï¾™å€¤"; + Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_simplified ] = "日期的系统内部数å—"; Text[ chinese_traditional ] = "日期的內部數å—"; Text[ arabic ] = "ÇáÑÞã ÇáÏÇÎáí ááÊÇÑíÎ"; Text[ dutch ] = "Interne waarde van de datum"; Text[ chinese_simplified ] = "日期的系统内部数å—"; Text[ greek ] = "Åóùôåñéêüò áñéèìüò ôçò çìåñïìçíßáò"; - Text[ korean ] = "ë‚ ì§œì˜ ìˆ«ìž"; + Text[ korean ] = "ë‚ ì§œ 내부값"; Text[ turkish ] = "Dahili tarih sayýsý"; - Text[ catalan ] = "Número interno de la fecha"; - Text[ finnish ] = "P?iv?m??r?n sis?inen numero"; + Text[ catalan ] = "Número intern de la data"; + Text[ finnish ] = "Päivämäärän sisäinen numero"; + Text[ thai ] = "ตัวเลขภายในขà¸à¸‡à¸§à¸±à¸™à¸—ี่"; }; /*-=======================================================================*/ @@ -226,8 +231,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "ÅâäïìÜäåò"; Text[ korean ] = "주"; Text[ turkish ] = "Hafta"; - Text[ catalan ] = "Semanas"; - Text[ finnish ] = "Viikot"; + Text[ catalan ] = "Setmanes"; + Text[ finnish ] = "VIIKOT"; + Text[ thai ] = "สัปดาห์"; }; String DFA_WEEK_DESC // Description { @@ -235,10 +241,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "returns number of weeks between two dates" ; Text[ english_us ] = "Returns the difference in weeks between two dates"; Text[ portuguese ] = "devolve o número de semanas entre duas datas"; - Text[ russian ] = "Îïðåäåëÿåò ÷èñëî íåäåëü ìåæäó äâóìÿ äàòàìè"; + Text[ russian ] = "Âîçâðàùàåò ÷èñëî íåäåëü ìåæäó äâóìÿ äàòàìè"; Text[ dutch ] = "Bepaalt het aantal weken tussen twee datums"; Text[ french ] = "Renvoie la différence en semaines de deux dates"; - Text[ spanish ] = "Determina la diferencia en semanas de dos fechas"; + Text[ spanish ] = "Devuelve la diferencia semanal de dos fechas"; Text[ italian ] = "Restituisce la differenza settimanale di due date"; Text[ danish ] = "Bestemmer ugedifferensen mellem to datoer"; Text[ swedish ] = "Bestämmer veckodifferensen mellan två datum"; @@ -253,8 +259,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "Ïñßæåé ôçí äéáöïñÜ åâäïìÜäùí äýï çìåñïìçíéþí"; Text[ korean ] = "ë‘ ë‚ ì§œ 사ì´ì˜ 주 수를 ê²°ì •"; Text[ turkish ] = "Ýki veri arasýndaki hafta farkýný bulur"; - Text[ catalan ] = "Determina la diferencia en semanas de dos fechas"; - Text[ finnish ] = "Palauttaa kahden p?iv?m??r?n v?lisen eron viikkoina"; + Text[ catalan ] = "Retorna la diferència en setmanes entre dues dates"; + Text[ finnish ] = "Palauttaa kahden päivämäärän välisen eron viikkoina"; + Text[ thai ] = "à¸à¸¥à¸±à¸šà¹„ปยังผลต่างในสัปดาห์ระหว่างวันสà¸à¸‡à¸§à¸±à¸™"; }; String DFA_WEEK_PAR1_DESC // Description of Parameter 1 { @@ -263,10 +270,10 @@ Resource RID_SC_ADDIN_DFA Text[ language_user1 ] = "J?geres Datum ist das Gegenteil von older date"; Text[ english_us ] = "The end date for calculating the difference in weeks"; Text[ portuguese ] = "Data mais recente para a diferença em semanas"; - Text[ russian ] = "Êîíå÷íàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â êîëè÷åñòâå íåäåëü."; + Text[ russian ] = "Êîíå÷íàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â íåäåëÿõ."; Text[ dutch ] = "De vroegere datum"; Text[ french ] = "Date la plus récente pour la différence en semaines"; - Text[ spanish ] = "Fecha más reciente para la diferencia en semanas"; + Text[ spanish ] = "La fecha más reciente para la diferencia semanal"; Text[ italian ] = "La data più recente per la differenza settimanale"; Text[ danish ] = "Yngre dato for ugedifferensen"; Text[ swedish ] = "Yngre datum för veckodifferensen"; @@ -279,10 +286,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "De vroegere datum"; Text[ chinese_simplified ] = "属于一个周差é¢çš„较早的日期"; Text[ greek ] = "ÔåëéêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò óå åâäïìÜäåò"; - Text[ korean ] = "ë‘ ë‚ ì§œ ì‚¬ì´ ê³„ì‚°ì—ì„œì˜ ë§ˆì§€ë§‰ ë‚ ì§œ"; + Text[ korean ] = "ì£¼ì¼ ìˆ˜ ì°¨ì´ ê³„ì‚°ì˜ ìµœì¢… ë‚ ì§œ"; Text[ turkish ] = "Hafta farký hesabý için daha geç olan tarih"; - Text[ catalan ] = "Fecha más reciente para la diferencia en semanas"; - Text[ finnish ] = "Lopetusp?iv?m??r? laskettaessa p?iv?m??rien v?linen ero viikkoina"; + Text[ catalan ] = "Data final per calcular la diferència en setmanes"; + Text[ finnish ] = "Lopetuspäivämäärä laskettaessa päivämäärien välinen ero viikkoina"; + Text[ thai ] = "วันสิ้นสุดสำหรับà¸à¸²à¸£à¸„ำนวณผลต่างในสัปดาห์"; }; String DFA_WEEK_PAR2_DESC // Description of Parameter 2 { @@ -290,10 +298,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "the younger date for the week difference" ; Text[ english_us ] = "The start date for calculating the difference weeks"; Text[ portuguese ] = "Data mais antiga para a diferença em semanas"; - Text[ russian ] = "Íà÷àëüíàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â êîëè÷åñòâå íåäåëü."; + Text[ russian ] = "Íà÷àëüíàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â íåäåëÿõ."; Text[ dutch ] = "De latere datum"; Text[ french ] = "Date la plus ancienne pour la différence en semaines"; - Text[ spanish ] = "Fecha más antigua para la diferencia en semanas"; + Text[ spanish ] = "La fecha más vieja para la diferencia semanal"; Text[ italian ] = "La data meno recente per la differenza settimanale"; Text[ danish ] = "Ældre dato for ugedifferensen"; Text[ swedish ] = "Äldre datum för veckodifferensen"; @@ -306,10 +314,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "De latere datum"; Text[ chinese_simplified ] = "属于一个周差é¢çš„较晚的日期"; Text[ greek ] = "Áñ÷éêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò óå åâäïìÜäåò"; - Text[ korean ] = "ë‘ ë‚ ì§œ ì‚¬ì´ ê³„ì‚°ì—ì„œì˜ ì‹œìž‘ã€€ë‚ ì§œ"; + Text[ korean ] = "ì£¼ì¼ ìˆ˜ ì°¨ì´ ê³„ì‚°ì˜ ì‹œìž‘ ë‚ ì§œ"; Text[ turkish ] = "Hafta farký hesabý için daha erken olan tarih"; - Text[ catalan ] = "Fecha más antigua para la diferencia en semanas"; - Text[ finnish ] = "Aloitusp?iv?m??r? laskettaessa p?iv?m??rien v?linen ero viikkoina"; + Text[ catalan ] = "Data d'inici per calcular la diferència en setmanes"; + Text[ finnish ] = "Aloituspäivämäärä laskettaessa päivämäärien välinen ero viikkoina"; + Text[ thai ] = "วันเริ่มต้นสำหรับคำนวณผลต่างสัปดาห์"; }; String DFA_WEEK_PAR3_DESC // Description of Parameter 3 { @@ -317,16 +326,16 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "Mode=0 means week interval, Mode=1 means by week of year" ; Text[ english_us ] = "Type of difference calculation: mode=0 means the interval, mode=1 means calendar weeks"; Text[ portuguese ] = "Modo de formação da diferença: modo=0 para intervalos; modo=1 para semanas."; - Text[ russian ] = "Ñïîñîá âû÷èñëåíèé: ñïîñîá=0 îçíà÷àåò èíòåðâàë, ñïîñîá=1 îçíà÷àåò èíòåðâàë â êàëåíäàðíûõ íåäåëÿõ"; + Text[ russian ] = "Òèïû âû÷èñëåíèé: ðåæèì=0 îçíà÷àåò èíòåðâàë, ðåæèì=1 îçíà÷àåò èíòåðâàë â êàëåíäàðíûõ íåäåëÿõ"; Text[ dutch ] = "Modus=0 betekent aantal , Modus=1 betekent in kalenderweken"; Text[ french ] = "Mode de calcul de la différence Mode=0 pour l'intervalle, Mode=1 pour les semaines de l'année"; - Text[ spanish ] = "Tipo de formación de diferencia: Tipo=0 significa intervalo; tipo=1, semanas del año"; + Text[ spanish ] = "Tipo de cálculo de la diferencia, tipo=0 significa intervalo, tipo=1, semanas del año"; Text[ italian ] = "Modo di calcolo della differenza Modo=0 per l'intervallo, Modo=1 per le settimane dell'anno"; Text[ danish ] = "Differensdannelsestype Type=O betyder interval, Type=1 betyder i kalenderuger"; - Text[ swedish ] = "Typ av differensbildning typ=0 heter intervall, typ=1 heter i kalenderveckan"; + Text[ swedish ] = "Typ av differensbildning typ=0 betyder intervall, typ=1 betyder i kalenderveckor"; Text[ polish ] = "Rodzaj obliczania ró¿nicy: Typ=0 oznacza przedzia³, Typ=1 - tygodnie kalendarzowe."; Text[ portuguese_brazilian ] = "Mode=0 means week interval, Mode=1 means by week of year"; - Text[ japanese ] = "計算方法: ﾓｰﾄﾞ=0 ã¯7æ—¥å˜ä½ã€ï¾“ｰﾄﾞ=1 ã¯ï½¶ï¾šï¾ï¾€ï¾žï½°ã®é€±ã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; + Text[ japanese ] = "計算方法: モード=0 ã¯7æ—¥å˜ä½ã€ãƒ¢ãƒ¼ãƒ‰=1 ã¯ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼ã®é€±ã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_simplified ] = "得出差é¢çš„类型 Mode=0 表示间隔， Mode=1 表示一年的星期数"; Text[ chinese_traditional ] = "得出差é¡çš„é¡žåž‹ Mode=0 表示間隔， Mode=1 表示一年的星期數"; Text[ arabic ] = "ØÑíÞÉ ÍÓÇÈ ÇáÝÑÞ: mode=0 ÊÚäí ÇáÝÇÕá ÇáÒãäí¡ mode=1 ÊÚäí Ýí ÃÓÇÈíÚ ÇáÊÞæíã"; @@ -335,8 +344,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "Ôñüðïò õðïëïãéóìïý ôçò äéáöïñÜò: Ôñüðïò=0 óçìáßíåé äéÜóôçìá, Ôñüðïò=1 óçìáßíåé çìåñïëïãéáêÝò åâäïìÜäåò"; Text[ korean ] = "ì°¨ì´ ê³„ì‚° 형태: 모드=0 ì€ ê°„ê²©ì„ ì˜ë¯¸í•˜ê³ , 모드=1 ì€ ì£¼ë¥¼ ì˜ë¯¸í•œë‹¤"; Text[ turkish ] = "Fark hesabý türü, tür=0 aralýk, tür=1 ise takvim haftasý cinsinden anlamýna gelir"; - Text[ catalan ] = "Tipo de formación de diferencia: Tipo=0 significa intervalo; tipo=1, semanas del año"; - Text[ finnish ] = "Erotuslaskennan tyyppi: tila = 0 tarkoittaa v?li?, tila = 1 tarkoittaa kalenteriviikkoja"; + Text[ catalan ] = "Tipus de càlcul de la diferència: mode=0 indica interval i mode=1 indica setmanes del calendari"; + Text[ finnish ] = "Erotuslaskennan tyyppi: tila = 0 tarkoittaa väliä, tila = 1 tarkoittaa kalenteriviikkoja"; + Text[ thai ] = "ชนิดขà¸à¸‡à¸à¸²à¸£à¸„ำนวณที่ต่างà¸à¸±à¸™: โหมด=0 หมายความถึงà¸à¸²à¸£à¹€à¸§à¹‰à¸™à¸Šà¹ˆà¸§à¸‡à¹€à¸§à¸¥à¸², โหมด=1 หมายถึงสัปดาห์ตามปà¸à¸´à¸—ิน"; }; /*-=======================================================================*/ @@ -365,8 +375,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "ÌÞíåò"; Text[ korean ] = "ì›”"; Text[ turkish ] = "Ay"; - Text[ catalan ] = "Meses"; - Text[ finnish ] = "Kuukaudet"; + Text[ catalan ] = "Mesos"; + Text[ finnish ] = "KUUKAUDET"; + Text[ thai ] = "เดืà¸à¸™"; }; String DFA_MONTHS_DESC // Description { @@ -377,7 +388,7 @@ Resource RID_SC_ADDIN_DFA Text[ russian ] = "Îïðåäåëÿåò ÷èñëî ìåñÿöåâ ìåæäó äâóìÿ äàòàìè"; Text[ dutch ] = "Bepaalt het aantal maanden tussen twee datums"; Text[ french ] = "Renvoie la différence en mois de deux dates"; - Text[ spanish ] = "Determina la diferencia en meses entre dos fechas"; + Text[ spanish ] = "Devuelve la diferencia mensual de dos fechas"; Text[ italian ] = "Restituisce la differenza mensile di due date"; Text[ danish ] = "Bestemmer månedsdifferensen mellem to datoer"; Text[ swedish ] = "Bestämmer månadsdifferensen mellan två datum"; @@ -392,8 +403,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "Ïñßæåé ôçí äéáöïñÜ äýï çìåñïìçíéþí óå ìÞíåò"; Text[ korean ] = "ë‘ ë‚ ì§œ 사ì´ì˜ 개월수를 ê²°ì •"; Text[ turkish ] = "Ýki veri arasýndaki ay farkýný belirler"; - Text[ catalan ] = "Determina la diferencia en meses entre dos fechas"; - Text[ finnish ] = "M??ritt?? kahden p?iv?m??r?n v?liss? olevien kuukausien m??r?n"; + Text[ catalan ] = "Determina el nombre de mesos entre dues dates"; + Text[ finnish ] = "Määrittää kahden päivämäärän välissä olevien kuukausien määrän"; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”จำนวนเดืà¸à¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸§à¸±à¸™à¸ªà¸à¸‡à¸§à¸±à¸™"; }; String DFA_MONTHS_PAR1_DESC // Description of Parameter 1 { @@ -401,10 +413,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "the older date for the month difference" ; Text[ english_us ] = "The end date for calculating the difference in months"; Text[ portuguese ] = "Data mais recente para a diferença em meses"; - Text[ russian ] = "Êîíå÷íàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â êîëè÷åñòâå ìåñÿöåâ."; + Text[ russian ] = "Êîíå÷íàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â ìåñÿöàõ."; Text[ dutch ] = "de vroegere datum"; Text[ french ] = "Date la plus récente pour la différence en mois"; - Text[ spanish ] = "Fecha más reciente para la diferencia mensual"; + Text[ spanish ] = "La fecha más reciente para la diferencia mensual"; Text[ italian ] = "La data più recente per la differenza mensile"; Text[ danish ] = "Yngre dato for månedsdifferensen"; Text[ swedish ] = "Yngre datum för månadsdifferensen"; @@ -417,10 +429,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "de vroegere datum"; Text[ chinese_simplified ] = "属于一个月差é¢çš„较早的日期"; Text[ greek ] = "ÔåëéêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò óå ìÞíåò"; - Text[ korean ] = "개월 수 계산ì—ì„œì˜ ë§ˆì§€ë§‰ ë‚ ì§œ"; + Text[ korean ] = "개월 수 ì°¨ì´ ê³„ì‚°ì˜ ìµœì¢… ë‚ ì§œ"; Text[ turkish ] = "Ay farký hesabý için daha geç olan tarih"; - Text[ catalan ] = "Fecha más reciente para la diferencia mensual"; - Text[ finnish ] = "Lopetusp?iv?m??r? laskettaessa p?iv?m??rien v?linen ero kuukausina"; + Text[ catalan ] = "Data final per calcular la diferència en mesos"; + Text[ finnish ] = "Lopetuspäivämäärä laskettaessa päivämäärien välinen ero kuukausina"; + Text[ thai ] = "วันสิ้นสุดสำหรับà¸à¸²à¸£à¸„ำนวณผลต่างในเดืà¸à¸™"; }; String DFA_MONTHS_PAR2_DESC // Description of Parameter 2 { @@ -428,10 +441,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "the younger date for the month difference" ; Text[ english_us ] = "The start date for calculating the difference in months"; Text[ portuguese ] = "Data mais antiga para a diferença em meses"; - Text[ russian ] = "Íà÷àëüíàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â êîëè÷åñòâå ìåñÿöåâ."; + Text[ russian ] = "Íà÷àëüíàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â ìåñÿöàõ."; Text[ dutch ] = "Latere datum"; Text[ french ] = "Date la plus ancienne pour la différence en mois"; - Text[ spanish ] = "Fecha más antigua para la diferencia mensual"; + Text[ spanish ] = "La fecha más vieja para la diferencia mensual"; Text[ italian ] = "La data meno recente per la differenza mensile"; Text[ danish ] = "Ældre dato for månedsdifferensen"; Text[ swedish ] = "Äldre datum för månadsdifferensen"; @@ -444,10 +457,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "Latere datum"; Text[ chinese_simplified ] = "属于一个月差é¢çš„较晚的日期"; Text[ greek ] = "Áñ÷éêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò óå ìÞíåò"; - Text[ korean ] = "개월 수 계산ì—ì„œì˜ ì‹œìž‘ ë‚ ì§œ"; + Text[ korean ] = "개월 수 ì°¨ì´ ê³„ì‚°ì˜ ì‹œìž‘ ë‚ ì§œ"; Text[ turkish ] = "Ay farký hesabý için daha erken olan tarih"; - Text[ catalan ] = "Fecha más antigua para la diferencia mensual"; - Text[ finnish ] = "Aloitusp?iv?m??r? laskettaessa p?iv?m??rien v?linen ero kuukausina"; + Text[ catalan ] = "Data inicial per calcular la diferència en mesos"; + Text[ finnish ] = "Aloituspäivämäärä laskettaessa päivämäärien välinen ero kuukausina"; + Text[ thai ] = "วันเริ่มต้นสำหรับà¸à¸²à¸£à¸„ำนวณผลต่างในเดืà¸à¸™"; }; String DFA_MONTHS_PAR3_DESC // Description of Parameter 2 { @@ -455,26 +469,27 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "Mode=0 means month interval, Mode=1 means by month of year" ; Text[ english_us ] = "Type of difference calculation: Mode = 0 means interval, mode = 1 means in calendar months"; Text[ portuguese ] = "Modo de formação da diferença: modo=0 para intervalos; modo=1 para meses."; - Text[ russian ] = "Ñïîñîá âû÷èñëåíèé: ñïîñîá=0 îçíà÷àåò èíòåðâàë, ñïîñîá=1 îçíà÷àåò èíòåðâàë â êàëåíäàðíûõ ìåñÿöàõ."; + Text[ russian ] = "Òèïû âû÷èñëåíèé: ðåæèì=0 îçíà÷àåò èíòåðâàë, ðåæèì=1 îçíà÷àåò èíòåðâàë â êàëåíäàðíûõ ìåñÿöàõ"; Text[ dutch ] = "Modus=0 betekent aantal, Modus=1 betekent in kalendermaanden"; Text[ french ] = "Mode de calcul de la différence Mode=0 pour l'intervalle, Mode=1 pour les mois de l'année"; - Text[ spanish ] = "Tipo de formación de diferencia: Tipo=0 significa intervalo; tipo=1, meses del año"; + Text[ spanish ] = "Tipo de cálculo de la diferencia, tipo=0 significa intervalo, tipo=1, meses del año"; Text[ italian ] = "Modo di calcolo della differenza Modo=0 per l'intervallo, Modo=1 per i mesi dell'anno"; Text[ danish ] = "Differensdannelsestype Type=O betyder interval, Type=1 betyder i kalendermåneder"; - Text[ swedish ] = "Typ av differensbildning typ=0 heter intervall, typ=1 heter i kalendermånaden"; + Text[ swedish ] = "Typ av differensbildning typ=0 betyder intervall, typ=1 betyder i kalendermånader"; Text[ polish ] = "Rodzaj obliczania ró¿nicy: Typ=0 oznacza przedzia³, Typ=1 - miesi¹ce kalendarzowe."; Text[ portuguese_brazilian ] = "Mode=0 means month interval, Mode=1 means by month of year"; - Text[ japanese ] = "計算方法: ﾓｰﾄﾞ=0 ã¯ä¸€å®šå˜ä½ã€ï¾“ｰﾄﾞ=1 ã¯ï½¶ï¾šï¾ï¾€ï¾žï½°ã®æœˆã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; + Text[ japanese ] = "計算方法: モード=0 ã¯ä¸€å®šå˜ä½ã€ãƒ¢ãƒ¼ãƒ‰=1 ã¯ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼ã®æœˆã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_simplified ] = "å¾—å‡ºå·®é¢ Mode=0 表示间隔， Mode=1 表示一年的月数"; Text[ chinese_traditional ] = "å¾—å‡ºå·®é¡ Mode=0 表示間隔， Mode=1 表示一年的月數"; Text[ arabic ] = "ØÑíÞÉ ÍÓÇÈ ÇáÝÑÞ: mode=0 ÊÚäí ÇáÝÇÕá ÇáÒãäí¡ mode=1 ÊÚäí Ýí ÃÔåÑ ÇáÊÞæíã"; Text[ dutch ] = "Modus=0 betekent aantal, Modus=1 betekent in kalendermaanden"; Text[ chinese_simplified ] = "å¾—å‡ºå·®é¢ Mode=0 表示间隔， Mode=1 表示一年的月数"; Text[ greek ] = "Ôñüðïò õðïëïãéóìïý äéáöïñÜò: Ôñüðïò=0 óçìáßíåé äéÜóôçìá, Ôñüðïò=1 óçìáßíåé çìåñïëïãéáêïß ìÞíåò"; - Text[ korean ] = "ì°¨ì´ ê³„ì‚° 형태: 모드=0 ì€ ê°„ê²©ì„ ì˜ë¯¸í•˜ê³ , 모드=1ì€ ê°œì›”ì„ ì˜ë¯¸í•œë‹¤"; + Text[ korean ] = "ì°¨ì´ ê³„ì‚° 형태: 모드=0 ì€ ê°„ê²©ì„ ì˜ë¯¸í•˜ê³ 모드=1ì€ ê°œì›”ì„ ì˜ë¯¸í•©ë‹ˆë‹¤."; Text[ turkish ] = "Fark hesabý türü, tür=0 aralýk, tür=1 ise takvim ayý cinsinden anlamýna gelir"; - Text[ catalan ] = "Tipo de formación de diferencia: Tipo=0 significa intervalo; tipo=1, meses del año"; - Text[ finnish ] = "Erotuslaskennan tyyppi: tila = 0 tarkoittaa v?li?, tila = 1 tarkoittaa kalenterikuukausia"; + Text[ catalan ] = "Tipus de càlcul de la diferència: mode=0 indica interval i mode=1 indica mesos del calendari"; + Text[ finnish ] = "Erotuslaskennan tyyppi: tila = 0 tarkoittaa väliä, tila = 1 tarkoittaa kalenterikuukausia"; + Text[ thai ] = "ชนิดขà¸à¸‡à¸à¸²à¸£à¸„ำนวณที่ต่างà¸à¸±à¸™: โหมด = 0 หมายถึงà¸à¸²à¸£à¹€à¸§à¹‰à¸™à¸Šà¹ˆà¸§à¸‡à¹€à¸§à¸¥à¸², โหมด = 1 หมายถึงเดืà¸à¸™à¸•à¸²à¸¡à¸›à¸à¸´à¸—ิน"; }; /*-=======================================================================*/ @@ -501,10 +516,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "Jaren"; Text[ chinese_simplified ] = "Years"; Text[ greek ] = "×ñüíéá"; - Text[ korean ] = "ë…„ë„"; + Text[ korean ] = "ë…„"; Text[ turkish ] = "Yýl"; - Text[ catalan ] = "Años"; - Text[ finnish ] = "Vuodet"; + Text[ catalan ] = "Anys"; + Text[ finnish ] = "VUODET"; + Text[ thai ] = "ปี"; }; String DFA_YEARS_DESC // Description { @@ -512,10 +528,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "returns number of years between two dates" ; Text[ english_us ] = "Returns the difference in years between two dates"; Text[ portuguese ] = "devolve o número de anos entre duas datas"; - Text[ russian ] = "Îïðåäåëÿåò êîëè÷åñòâî ëåò ìåæäó äâóìÿ äàòàìè"; + Text[ russian ] = "Âîçâðàùàåò êîëè÷åñòâî ëåò ìåæäó äâóìÿ äàòàìè"; Text[ dutch ] = "Bepaalt het aantal jaren tussen twee datums"; Text[ french ] = "Renvoie la différence en années de deux dates"; - Text[ spanish ] = "Determina la diferencia en años de dos fechas"; + Text[ spanish ] = "Devuelve la diferencia anual de dos fechas"; Text[ italian ] = "Restituisce la differenza annuale di due date"; Text[ danish ] = "Bestemmer årsdifferensen mellem to datoer"; Text[ swedish ] = "Bestämmer årsdifferensen mellan två datum"; @@ -528,10 +544,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "Bepaalt het aantal jaren tussen twee datums"; Text[ chinese_simplified ] = "计算两个数æ®çš„å¹´å·®é¢"; Text[ greek ] = "Ïñßæåé ôçí äéáöïñÜ äýï çìåñïìçíéþí óå Ýôç"; - Text[ korean ] = "ë‘ ë‚ ì§œ 사ì´ì˜ ë…„ë„ ì°¨ì´ ê²°ì •"; + Text[ korean ] = "ë‘ ë‚ ì§œ 사ì´ì˜ ì—°ë„차를 구합니다."; Text[ turkish ] = "Ýki veri arasýndaki yýl farkýný bulur"; - Text[ catalan ] = "Determina la diferencia en años de dos fechas"; - Text[ finnish ] = "Palauttaa kahden p?iv?m??r?n v?lisen eron vuosina"; + Text[ catalan ] = "Retorna la diferència en anys entre dues dates"; + Text[ finnish ] = "Palauttaa kahden päivämäärän välisen eron vuosina"; + Text[ thai ] = "à¸à¸¥à¸±à¸šà¹„ปสู่ผลต่างในปีระหว่างวันสà¸à¸‡à¸§à¸±à¸™"; }; String DFA_YEARS_PAR1_DESC // Description of Parameter 1 { @@ -539,10 +556,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "the older date for the year difference" ; Text[ english_us ] = "The end date for calculating the difference in years"; Text[ portuguese ] = "Data mais recente para a diferença em anos"; - Text[ russian ] = "Êîíå÷íàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â êîëè÷åñòâå ëåò."; + Text[ russian ] = "Êîíå÷íàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â ãîäàõ."; Text[ dutch ] = "De vroegere datum"; Text[ french ] = "Date la plus récente pour la différence en années"; - Text[ spanish ] = "Fecha más reciente para la diferencia en años"; + Text[ spanish ] = "La fecha más reciente para la diferencia anual"; Text[ italian ] = "La data meno recente per la differenza annuale"; Text[ danish ] = "Yngre dato for årsdifferensen"; Text[ swedish ] = "Yngre datum för årsdifferensen"; @@ -555,10 +572,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "De vroegere datum"; Text[ chinese_simplified ] = "属于一个年差é¢çš„较早的日期"; Text[ greek ] = "ÔåëéêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò óå Ýôç"; - Text[ korean ] = "ë…„ ì°¨ì´ ê³„ì‚°ì—ì„œì˜ ë§ˆì§€ë§‰ ë‚ ì§œ"; + Text[ korean ] = "ì—°ë„ì°¨ ê³„ì‚°ì˜ ìµœì¢… ë‚ ì§œ"; Text[ turkish ] = "Yýl farký hesabý için daha geç olan tarih"; - Text[ catalan ] = "Fecha más reciente para la diferencia en años"; - Text[ finnish ] = "Lopetusp?iv?m??r? laskettaessa p?iv?m??rien v?linen ero vuosina"; + Text[ catalan ] = "Data final per calcular la diferència en anys"; + Text[ finnish ] = "Lopetuspäivämäärä laskettaessa päivämäärien välinen ero vuosina"; + Text[ thai ] = "วันสิ้นสุดสำหรับà¸à¸²à¸£à¸„ำนวณผลต่างในปี"; }; String DFA_YEARS_PAR2_DESC // Description of Parameter 2 { @@ -566,10 +584,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "the younger date for the year difference" ; Text[ english_us ] = "The start date for calculating the difference in years"; Text[ portuguese ] = "Data mais antiga para a diferença em anos"; - Text[ russian ] = "Íà÷àëüíàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â êîëè÷åñòâå ëåò."; + Text[ russian ] = "Íà÷àëüíàÿ äàòà äëÿ îïðåäåëåíèÿ ðàçíèöû â ãîäàõ."; Text[ dutch ] = "De latere datum"; Text[ french ] = "Date la plus ancienne pour la différence en années"; - Text[ spanish ] = "Fecha más antigua para la diferencia en años"; + Text[ spanish ] = "La fecha más vieja para la diferencia anual"; Text[ italian ] = "La data meno recente per la differenza annuale"; Text[ danish ] = "Ældre dato for årsdifferensen"; Text[ swedish ] = "Äldre datum för årsdifferensen"; @@ -582,10 +600,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "De latere datum"; Text[ chinese_simplified ] = "属于一个年差é¢çš„较晚的日期"; Text[ greek ] = "Áñ÷éêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò óå Ýôç"; - Text[ korean ] = "ë…„ ì°¨ì´ ê³„ì‚°ì—ì„œì˜ ì‹œìž‘ ë‚ ì§œ"; + Text[ korean ] = "ì—°ë„ì°¨ ê³„ì‚°ì˜ ì‹œìž‘ ë‚ ì§œ"; Text[ turkish ] = "Yýl farký hesabý için daha erken olan tarih"; - Text[ catalan ] = "Fecha más antigua para la diferencia en años"; - Text[ finnish ] = "Aloitusp?iv?m??r? laskettaessa p?iv?m??rien v?linen ero vuosina"; + Text[ catalan ] = "Data inicial per calcular la diferència en anys"; + Text[ finnish ] = "Aloituspäivämäärä laskettaessa päivämäärien välinen ero vuosina"; + Text[ thai ] = "วันเริ่มต้นสำหรับà¸à¸²à¸£à¸„ำนวณผลต่างในหลายปี"; }; String DFA_YEARS_PAR3_DESC // Description of Parameter 2 { @@ -593,26 +612,27 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "Mode=0 means year interval, Mode=1 means by calendar years" ; Text[ english_us ] = "Type of difference calculation: Mode=0 means interval, mode=1 means in calendar years."; Text[ portuguese ] = "Modo de formação da diferença: modo=0 para intervalos; modo=1 para anos ."; - Text[ russian ] = "Ñïîñîá âû÷èñëåíèé: ñïîñîá=0 îçíà÷àåò èíòåðâàë, ñïîñîá=1 îçíà÷àåò èíòåðâàë â êàëåíäàðíûõ ãîäàõ"; + Text[ russian ] = "Òèïû âû÷èñëåíèé: ðåæèì=0 îçíà÷àåò èíòåðâàë, ðåæèì=1 îçíà÷àåò èíòåðâàë â êàëåíäàðíûõ ãîäàõ"; Text[ dutch ] = "Modus=0 betekent aantal, modus=1 betekent in kalenderjaren"; Text[ french ] = "Mode de calcul de la différence Mode=0 pour l'intervalle, Mode=1 pour les années"; - Text[ spanish ] = "Tipo de formación de diferencia: Tipo=0 significa intervalo; tipo=1, años naturales"; + Text[ spanish ] = "Tipo de cálculo de la diferencia, tipo=0 significa intervalo, tipo=1, años naturales"; Text[ italian ] = "Modo di calcolo della differenza Modo=0 per l'intervallo, Modo=1 per l'anno"; Text[ danish ] = "Differensdannelsestype Type=O betyder interval, Type=1 betyder i kalenderår"; - Text[ swedish ] = "Typ av differensbildning typ=0 heter intervall, typ=1 heter i kalenderåren"; + Text[ swedish ] = "Typ av differensbildning typ=0 betyder intervall, typ=1 betyder i kalenderår"; Text[ polish ] = "Rodzaj obliczania ró¿nicy: Typ=0 oznacza przedzia³, Typ=1 - lata kalendarzowe."; Text[ portuguese_brazilian ] = "Mode=0 means year interval, Mode=1 means by calendar years"; - Text[ japanese ] = "計算方法: ﾓｰﾄﾞ=0 ã¯ä¸€å®šå˜ä½ã€ï¾“ｰﾄﾞ=1 ã¯ï½¶ï¾šï¾ï¾€ï¾žï½°ã®å¹´ã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; + Text[ japanese ] = "計算方法: モード=0 ã¯ä¸€å®šå˜ä½ã€ãƒ¢ãƒ¼ãƒ‰=1 ã¯ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼ã®å¹´ã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_simplified ] = "得出差é¢çš„类型 Mode=0 表示年间隔， Mode=1 表示星期年数"; Text[ chinese_traditional ] = "得出差é¡çš„é¡žåž‹ Mode=0 表示年間隔， Mode=1 表示星期年數"; Text[ arabic ] = "ØÑíÞÉ ÍÓÇÈ ÇáÝÑÞ: mode=0 ÊÚäí ÝÇÕá Òãäí¡ mode=1 ÊÚäí Ýí ÓäæÇÊ ÇáÊÞæíã"; Text[ dutch ] = "Modus=0 betekent aantal, modus=1 betekent in kalenderjaren"; Text[ chinese_simplified ] = "得出差é¢çš„类型 Mode=0 表示年间隔， Mode=1 表示星期年数"; Text[ greek ] = "Ôñüðïò ôïõ õðïëïãéóìïý ôçò äéáöïñÜò: Ôñüðïò=0 óçìáßíåé äéÜóôçìá, Ôñüðïò=1 óçìáßíåé óå çìåñïëïãéáêÜ Ýôç"; - Text[ korean ] = "ì°¨ì´ ê³„ì‚° 형태: 모드=0 ì€ ê°„ê²©ì„ ì˜ë¯¸í•˜ê³ , 모드=1ì€ ë…„ì„ ì˜ë¯¸í•œë‹¤."; + Text[ korean ] = "ì°¨ì´ ê³„ì‚° 형태: 모드=0 ì€ ê°„ê²©ìœ¼ë¡œ, 모드=1ì€ ì—°ë„ë¡œ 계산합니다."; Text[ turkish ] = "Fark hesabý türü, tür=0 aralýk, tür=1 ise takvim yýlý cinsinden anlamýna gelir"; - Text[ catalan ] = "Tipo de formación de diferencia: Tipo=0 significa intervalo; tipo=1, años naturales"; - Text[ finnish ] = "Erotuslaskennan tyyppi: tila = 0 tarkoittaa v?li?, tila = 1 tarkoittaa kalenterivuosia."; + Text[ catalan ] = "Tipus de càlcul de la diferència: mode=0 indica interval i mode=1 indica anys del calendari"; + Text[ finnish ] = "Erotuslaskennan tyyppi: tila = 0 tarkoittaa väliä, tila = 1 tarkoittaa kalenterivuosia."; + Text[ thai ] = "ชนิดขà¸à¸‡à¸à¸²à¸£à¸„ำนวณที่ต่างà¸à¸±à¸™: โหมด=0 หมายถึงà¸à¸²à¸£à¹€à¸§à¹‰à¸™à¸Šà¹ˆà¸§à¸‡à¹€à¸§à¸¥à¸², โหมด=1 หมายถึงปีตามปà¸à¸´à¸—ิน"; }; /*-=======================================================================*/ @@ -623,7 +643,7 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "IsLeapYear" ; Text[ english_us ] = "IsLeapYear"; Text[ portuguese ] = "ÉAnoBissexto"; - Text[ russian ] = "Âûñîêîñíûé ãîä"; + Text[ russian ] = "Âèñîêîñíûé ãîä"; Text[ dutch ] = "IsSchrikkelJaar"; Text[ french ] = "EstAnnéeBissextile"; Text[ spanish ] = "EsAñoBisiesto"; @@ -641,8 +661,9 @@ Resource RID_SC_ADDIN_DFA Text[ greek ] = "ÅßíáéÄßóåêôï¸ôïò"; Text[ korean ] = "윤년"; Text[ turkish ] = "Artýkyýldýr"; - Text[ catalan ] = "EsAñoBisiesto"; - Text[ finnish ] = "OnKarkausvuosi"; + Text[ catalan ] = "IsLeapYear"; + Text[ finnish ] = "ONKARK_VUOSI"; + Text[ thai ] = "เป็นปีà¸à¸˜à¸´à¸à¸§à¸²à¸£"; }; String DFA_ISLEAPYEAR_DESC // Description { @@ -650,8 +671,8 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "returns 1 if the date is in a LeapYear, 0 otherwise" ; Text[ english_us ] = "Returns 1 (TRUE) if a leap year is used, otherwise 0 (FALSE) is returned"; Text[ portuguese ] = "devolve 1(VERDADEIRO) se o ano for um ano bissexto, caso contrário 0 (FALSO)"; - Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå 1 (ÈÑÒÈÍÀ), åñëè ãîä ÿâëÿåòñÿ âûñîêîñíûì, â ïðîòèâíîì ñëó÷àå âîçâðàùàåò çíà÷åíèå 0 (ËÎÆÜ)"; - Text[ dutch ] = "Geeft als resultaat 1(WAAR) als het jaar een schrikkeljaar is, andrs 0(ONWAAR)"; + Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå 1 (ÈÑÒÈÍÀ), åñëè ãîä ÿâëÿåòñÿ âèñîêîñíûì, â ïðîòèâíîì ñëó÷àå âîçâðàùàåò çíà÷åíèå 0 (ËÎÆÜ)"; + Text[ dutch ] = "Geeft als resultaat 1(WAAR) als het jaar een schrikkeljaar is, anders 0(ONWAAR)"; Text[ french ] = "Renvoie 1 (VRAI) si l'année est une année bissextile, sinon 0 (FAUX)"; Text[ spanish ] = "Devuelve 1(VERDADERO) si el año es bisiesto; si no, 0(FALSO)"; Text[ italian ] = "Restituisce 1(VERO) se l'anno è bisestile, altrimenti 0(FALSO)"; @@ -659,17 +680,18 @@ Resource RID_SC_ADDIN_DFA Text[ swedish ] = "Returnerar 1(SANT) om året är ett skottår annars 0(FALSKT)"; Text[ polish ] = "Podaje 1 (PRAWDA), jeœli rok jest rokiem przestêpnym, w innym wypadku 0 (FA£SZ)."; Text[ portuguese_brazilian ] = "returns 1 if the date is in a LeapYear, 0 otherwise"; - Text[ japanese ] = "ãã®å¹´ãŒé–å¹´ã§ã‚れ㰠1(TRUE)ã€ãã†ã§ãªã‘れ㰠0(FALSE)ã‚’è¿”ã—ã¾ã™ã€‚"; + Text[ japanese ] = "指定ã—ãŸæ—¥ä»˜ãŒé–å¹´ã®å ´åˆã¯ 1(TRUE)ã€ãã†ã§ãªã„å ´åˆã¯ 0(FALSE)ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_simplified ] = "如果是闰年就å馈 1(TRUE) ，å¦åˆ™å°±å馈 0 (FALSE)"; Text[ chinese_traditional ] = "如果是é–年就傳回 1(TRUE)，å¦å‰‡å°±å‚³å›ž 0 (FALSE)"; Text[ arabic ] = "íÞÏã 1 (ÕÍíÍ) ÚäÏãÇ Êßæä ÇáÓäÉ ßÈíÓÉ¡ ÚÏÇ Ðáß 0 (ÎØÃ)"; - Text[ dutch ] = "Geeft als resultaat 1(WAAR) als het jaar een schrikkeljaar is, andrs 0(ONWAAR)"; + Text[ dutch ] = "Geeft als resultaat 1(WAAR) als het jaar een schrikkeljaar is, anders 0(ONWAAR)"; Text[ chinese_simplified ] = "如果是闰年就å馈 1(TRUE) ，å¦åˆ™å°±å馈 0 (FALSE)"; Text[ greek ] = "Áðïäßäåé 1 (ÁËÇÈÇÓ) üôáí ðñüêåéôáé ãéá äßóåêôï Ýôïò, áëëéþò 0 (ØÅÕÄÇÓ)"; - Text[ korean ] = "윤년ì´ë©´ 1(ì°¸)ì´ã€€ë˜ê³ , ê·¸ë ‡ì§€ 않으면 0(거짓)ì´ëœë‹¤."; + Text[ korean ] = "윤년ì´ë©´ 1(TRUE)ë¡œ 아니면 0(FALSE)으로 계산합니다."; Text[ turkish ] = "Yýl, artýkyýl ise 1(DOÐRU) aksi halde 0(YANLIÞ) verir"; - Text[ catalan ] = "Devuelve 1(VERDADERO) si el año es bisiesto; si no, 0(FALSO)"; - Text[ finnish ] = "Palauttaa arvon 1 (TRUE), jos karkausvuotta k?ytet??n, muussa tapauksessa palautetaan arvo 0 (FALSE)"; + Text[ catalan ] = "Retorna 1 (TRUE) si fem servir un any de traspàs, o 0 (FALSE) en cas contrari"; + Text[ finnish ] = "Palauttaa arvon 1 (TRUE), jos karkausvuotta käytetään, muussa tapauksessa palautetaan arvo 0 (FALSE)"; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š 1 (จริง) ถ้าใช้ปีà¸à¸˜à¸´à¸à¸§à¸²à¸£à¹à¸¥à¹‰à¸§ มิฉะนั้น ส่งà¸à¸¥à¸±à¸š 0 (เท็จ) "; }; /*-=======================================================================*/ @@ -696,10 +718,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "DagenInMaand"; Text[ chinese_simplified ] = "DaysInMonth"; Text[ greek ] = "ÇìÝñåòÁíÜÌÞíá"; - Text[ korean ] = "ì›”ì˜ ë‚ ì§œ 수"; + Text[ korean ] = "ì›”ì˜ ë‚ ì§œ ê°’"; Text[ turkish ] = "AydakiGünSayýsý"; - Text[ catalan ] = "DíasEnMes"; - Text[ finnish ] = "P?ivi?kuukaudessa"; + Text[ catalan ] = "DaysInMonth"; + Text[ finnish ] = "PÄIVÄT_KUUKAUSI"; + Text[ thai ] = "วันในเดืà¸à¸™"; }; String DFA_DAYSINMONTH_DESC // Description { @@ -710,7 +733,7 @@ Resource RID_SC_ADDIN_DFA Text[ russian ] = "Îïðåäåëÿåò êîëè÷åñòâî äíåé â ìåñÿöå äëÿ óêàçàííîé äàòû"; Text[ dutch ] = "Geeft als resultaat het aantal dagen in een maand bij een bepaalde datum"; Text[ french ] = "Renvoie le nombre de jours dans le mois en relation avec la date indiquée."; - Text[ spanish ] = "Determina la cantidad de días en un mes para una fecha"; + Text[ spanish ] = "Devuelve el número de días del mes en relación a la fecha indicada."; Text[ italian ] = "Restituisce il numero dei giorni del mese per una determinata data"; Text[ danish ] = "Bestemmer antallet af dage i en måned til en dato"; Text[ swedish ] = "Bestämmer antalet dagar i månaden till ett datum"; @@ -723,10 +746,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "Geeft als resultaat het aantal dagen in een maand bij een bepaalde datum"; Text[ chinese_simplified ] = "计算一个属于给定日期的月的天数"; Text[ greek ] = "Ïñßæåé ãéá ìéá çìåñïìçíßá ôïí áñéèìü çìåñþí áíÜ ìÞíá"; - Text[ korean ] = "ë‚ ì§œì™€ ê´€ë ¨, ê·¸ 달ì—ì„œì˜ ë‚ ì§œ 수를 ê²°ì •"; + Text[ korean ] = "ìž…ë ¥í•œ ë‚ ì§œì™€ ê´€ë ¨ëœ ë‹¬ì˜ ì¼ìˆ˜ë¥¼ 구합니다."; Text[ turkish ] = "Girilen tarihe göre ayýn gün sayýsýný bulur"; - Text[ catalan ] = "Determina la cantidad de días en un mes para una fecha"; - Text[ finnish ] = "Palauttaa p?ivien m??r?n siin? kuukaudessa, johon liittyv? p?iv?m??r? sy?ettiin"; + Text[ catalan ] = "Retorna el nombre de dies del mes segons la data introduïda"; + Text[ finnish ] = "Palauttaa päivien määrän siinä kuukaudessa, johon liittyvä päivämäärä syötettiin"; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸§à¸±à¸™à¹ƒà¸™à¹€à¸”ืà¸à¸™à¹ƒà¸™à¸„วามสัมพันธ์à¸à¸±à¸šà¸§à¸±à¸™à¸—ี่ที่ป้à¸à¸™"; }; /*-=======================================================================*/ @@ -753,10 +777,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "DagenInJaar"; Text[ chinese_simplified ] = "DaysInYear"; Text[ greek ] = "ÇìÝñåòÓôï¸ôïò"; - Text[ korean ] = "ë…„ì˜ ë‚ ì§œ 수"; + Text[ korean ] = "DaysInYear"; Text[ turkish ] = "YýldakiGünSayýsý"; - Text[ catalan ] = "DíasEnAño"; - Text[ finnish ] = "P?ivi?vuodessa"; + Text[ catalan ] = "DaysInYear"; + Text[ finnish ] = "PÄIVÄT_VUOSI"; + Text[ thai ] = "วันในปี"; }; String DFA_DAYSINYEAR_DESC // Description { @@ -767,7 +792,7 @@ Resource RID_SC_ADDIN_DFA Text[ russian ] = "Îïðåäåëÿåò êîëè÷åñòâî äíåé â ãîäó äëÿ óêàçàííîé äàòû."; Text[ dutch ] = "Geeft als resultaat het aantal dagen in een jaar bij een bepaalde datum"; Text[ french ] = "Renvoie le nombre de jours dans l'année en relation avec la date indiquée."; - Text[ spanish ] = "Determina la cantidad de días en un año para una fecha"; + Text[ spanish ] = "Devuelve el número de días del año en relación a la fecha introducida. "; Text[ italian ] = "Restituisce il numero dei giorni dell'anno per una deteminata data"; Text[ danish ] = "Bestemmer antallet af dage i et år til en dato"; Text[ swedish ] = "Bestämmer antalet dagar i året till ett datum"; @@ -780,10 +805,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "Geeft als resultaat het aantal dagen in een jaar bij een bepaalde datum"; Text[ chinese_simplified ] = "计算一个属于给定日期的年的天数"; Text[ greek ] = "Ïñßæåé ôïí áñéèìü çìåñþí áíÜ Ýôïò ãéá ìßá çìåñïìçíßá"; - Text[ korean ] = "ë‚ ì§œì™€ ê´€ë ¨, ë…„ì˜ ë‚ ì§œ 수를 ê²°ì •"; + Text[ korean ] = "ìž…ë ¥í•œ ë‚ ì§œì™€ ê´€ë ¨í•˜ì—¬ í•œ í•´ì˜ ì¼ìˆ˜ë¥¼ 구합니다."; Text[ turkish ] = "Girilen tarihe göre yýlýn gün sayýsýný bulur"; - Text[ catalan ] = "Determina la cantidad de días en un año para una fecha"; - Text[ finnish ] = "Palauttaa p?ivien m??r?n siin? vuodessa, johon liittyv? p?iv?m??r? sy?ettiin"; + Text[ catalan ] = "Retorna el nombre de dies de l'any segons la data introduïda"; + Text[ finnish ] = "Palauttaa päivien määrän siinä vuodessa, johon liittyvä päivämäärä syötettiin"; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸§à¸±à¸™à¹ƒà¸™à¸«à¸™à¸¶à¹ˆà¸‡à¸›à¸µà¹ƒà¸™à¸„วามสัมพันธ์à¸à¸±à¸šà¸§à¸±à¸™à¸—ี่ที่ป้à¸à¸™"; }; /*-=======================================================================*/ @@ -810,10 +836,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "WekenInJaar"; Text[ chinese_simplified ] = "WeeksInYear"; Text[ greek ] = "ÅâäïìÜäåòÁíܸôïò"; - Text[ korean ] = "ë…„ì˜ ì£¼ 수"; + Text[ korean ] = "WeeksInYear"; Text[ turkish ] = "YýldakiHaftaSayýsý"; - Text[ catalan ] = "SemanasEnAño"; - Text[ finnish ] = "ViikkoaVuodessa"; + Text[ catalan ] = "WeeksInYear"; + Text[ finnish ] = "VIIKOT_VUOSI"; + Text[ thai ] = "สัปดาห์ในปี"; }; String DFA_WEEKSINYEAR_DESC // Description { @@ -821,10 +848,10 @@ Resource RID_SC_ADDIN_DFA Text [ english ] = "returns the number of weeks in the year for a date" ; Text[ english_us ] = "Returns the number of weeks in the year in relation to a date"; Text[ portuguese ] = "Devolve o número de semanas no ano para uma determinada data"; - Text[ russian ] = "Îïðåäåëÿåò êîëè÷åñòâî íåäåëü â ãîäó äëÿ óêàçàííîé äàòû."; + Text[ russian ] = "Âîçâðàùàåò êîëè÷åñòâî íåäåëü â ãîäó äëÿ óêàçàííîé äàòû."; Text[ dutch ] = "Geeft als resultaat het aantal weken in een jaar bij een datum"; Text[ french ] = "Renvoie le nombre de semaines dans l'année en relation avec la date indiquée."; - Text[ spanish ] = "Determina la cantidad de semanas en un año para una fecha"; + Text[ spanish ] = "Devuelve el número de semanas del año en relación a una fecha"; Text[ italian ] = "Restituisce il numero delle settimane dell'anno per una determinata data"; Text[ danish ] = "Bestemmer antallet af dage i en måned til en dato"; Text[ swedish ] = "Bestämmer antalet veckor på året till ett datum"; @@ -837,10 +864,11 @@ Resource RID_SC_ADDIN_DFA Text[ dutch ] = "Geeft als resultaat het aantal weken in een jaar bij een datum"; Text[ chinese_simplified ] = "计算一个属于给定日期的年的星期数"; Text[ greek ] = "Ïñßæåé ãéá ìßá çìåñïìçíßá ôïí áñéèìü åâäïìÜäùí áíÜ Ýôïò"; - Text[ korean ] = "ë‚ ì§œì™€ ê´€ë ¨,ë…„ì˜ ì£¼ 수를 ê²°ì •"; + Text[ korean ] = "ìž…ë ¥í•œ ë‚ ì§œì™€ ê´€ë ¨ëœ í•´ì˜ ì£¼ì¼ ìˆ˜ë¥¼ 구합니다."; Text[ turkish ] = "Girilen tarihe göre yýlýn hafta sayýsýný bulur"; - Text[ catalan ] = "Determina la cantidad de semanas en un año para una fecha"; - Text[ finnish ] = "Palauttaa viikkojen m??r?n siin? vuodessa, johon liittyv? p?iv?m??r? sy?ettiin"; + Text[ catalan ] = "Retorna el nombre de setmanes de l'any segons una data"; + Text[ finnish ] = "Palauttaa viikkojen määrän siinä vuodessa, johon liittyvä päivämäärä syötettiin"; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸ªà¸±à¸›à¸”าห์ในปีในความสัมพันธ์à¸à¸±à¸šà¸§à¸±à¸™à¸—ี่"; }; }; @@ -856,3 +884,8 @@ Resource RID_SC_ADDIN_DFA + + + + + diff --git a/sc/addin/datefunc/makefile.mk b/sc/addin/datefunc/makefile.mk index 43d9983c676e..7f6fc02f5239 100644 --- a/sc/addin/datefunc/makefile.mk +++ b/sc/addin/datefunc/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hjs $ $Date: 2002-05-14 11:07:04 $ +# last change: $Author: hr $ $Date: 2003-03-26 18:03:16 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -117,8 +117,9 @@ $(MISC)$/cl2c.pl: ..$/util/cl2c.pl @+$(COPY) ..$/util$/cl2c.pl $@ .ENDIF +# convert C++ //... comments to C /*...*/ comments without affecting http://... $(INCCOM)$/xlang.h : $(SOLARINCDIR)$/tools$/lang.hxx - @+$(COPY) $(SOLARINCDIR)$/tools$/lang.hxx $@ + @+$(SED) -e "s#\([ \t]\)//\(.*\)#\1/*\2 */#" -e "s#^//\(.*\)#/*\1 */#" $(SOLARINCDIR)$/tools$/lang.hxx >$@ $(SLOFILES) : $(INCCOM)$/xlang.h diff --git a/sc/addin/rot13/makefile.mk b/sc/addin/rot13/makefile.mk index 96652cb8532f..1debfdc9d070 100644 --- a/sc/addin/rot13/makefile.mk +++ b/sc/addin/rot13/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hjs $ $Date: 2002-05-14 11:10:57 $ +# last change: $Author: hr $ $Date: 2003-03-26 18:03:18 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -114,8 +114,9 @@ $(MISC)$/cl2c.pl: ..$/util$/cl2c.pl @+$(COPY) ..$/util$/cl2c.pl $@ .ENDIF +# convert C++ //... comments to C /*...*/ comments without affecting http://... $(INCCOM)$/xlang.h : $(SOLARINCDIR)$/tools$/lang.hxx - @+$(COPY) $(SOLARINCDIR)$/tools$/lang.hxx $@ + @+$(SED) -e "s#\([ \t]\)//\(.*\)#\1/*\2 */#" -e "s#^//\(.*\)#/*\1 */#" $(SOLARINCDIR)$/tools$/lang.hxx >$@ $(SLOFILES) : $(INCCOM)$/xlang.h diff --git a/sc/addin/rot13/rot13.src b/sc/addin/rot13/rot13.src index 4cc4119e9fbc..ac1d7bbeb39a 100644 --- a/sc/addin/rot13/rot13.src +++ b/sc/addin/rot13/rot13.src @@ -2,9 +2,9 @@ * * $RCSfile: rot13.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:31:52 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ Resource RID_SC_ADDIN_ROT13 Text [ english ] = "ROT13 Algorithm, each alphabetical character of the text is rotated by 13 in the alphabet" ; Text[ english_us ] = "ROT13 Algorithm, each alphabetical character of the text is rotated by 13 in the alphabet"; Text[ portuguese ] = "ROT13 Algoritmo: rotação de 13 caracteres no alfabeto para cada um dos caracteres alfabéticos do texto."; - Text[ russian ] = "Àëãîðèòì ROT13: çàìåíà êàæäîãî àëôàâèòíîãî çíàêà òåêñòà íà äðóãîé, ñäâèíóòûé â àëôàâèòå íà 13 ïîçèöèé."; - Text[ dutch ] = "ROT13 Algorithme, ieder alfabetisch teken van de tekst roteert met het 13e in het alfabet."; + Text[ russian ] = "Àëãîðèòì ROT13: çàìåíà êàæäîãî àëôàâèòíîãî ñèìâîëà òåêñòà íà äðóãîé, ñäâèíóòûé â àëôàâèòå íà 13 ïîçèöèé."; + Text[ dutch ] = "ROT13 Algoritme, ieder alfabetisch teken van de tekst roteert met het 13e in het alfabet."; Text[ french ] = "ROT13 Algorythme, remplacement de chaque caractère alphabétique du texte par rotation de 13 caractères dans l'alphabet."; Text[ spanish ] = "Algoritmo ROT13, cada carácter alfabético del texto rodará 13 espacios en el alfabeto."; Text[ italian ] = "ROT13 algoritmo, ogni carattere alfabetico del testo viene ruotato di 13 nell'alfabeto."; @@ -78,18 +78,19 @@ Resource RID_SC_ADDIN_ROT13 Text[ swedish ] = "ROT13 algoritm, varje alfabetiskt tecken i texten roteras med 13 i alfabetet."; Text[ polish ] = "Algorytm ROT13, ka¿dy alfabetyczny znak tekstu zostanie obrócony o 13 w alfabecie."; Text[ portuguese_brazilian ] = "ROT13 Algorithm, each alphabetical character of the text is rotated by 13 in the alphabet"; - Text[ japanese ] = "ROT13 ±ÙºÞؽÞÑA÷½Ä‚ÌŠe±Ù̧Íޯĕ¶Žš‚Í13Žš‚²‚Æ‚ÉŒJ‚è•Ô‚³‚ê‚Ü‚·B"; - Text[ chinese_simplified ] = "ROT13 ·¨Ôò£¬Îı¾ÄÚÿ¸ö×Öĸ½«ÑØ×Öĸ±íµÄµÚ13¸ö×Öĸѻ·Ðýת¡£"; - Text[ chinese_traditional ] = "ROT13 ªk«h¡A¥»¤å¤º¨CÓ¦r¥À±Nªu¦r¥Àªíªº²Ä13Ó¦r¥À´`Àô±ÛÂà¡C"; + Text[ japanese ] = "ROT13 アルゴリズムã€ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆæ–‡å—ã‚’13å—ãšã‚‰ã—ã¦æ–‡å—列を暗å·åŒ–ã—ã¾ã™ã€‚"; + Text[ chinese_simplified ] = "ROT13 法则，文本内æ¯ä¸ªå—æ¯å°†æ²¿å—æ¯è¡¨çš„第13个å—æ¯å¾ªçŽ¯æ—‹è½¬ã€‚"; + Text[ chinese_traditional ] = "ROT13 法則，本文內æ¯å€‹å—æ¯å°‡æ²¿å—æ¯è¡¨çš„第13個å—æ¯å¾ªç’°æ—‹è½‰ã€‚"; Text[ arabic ] = "äÙÇã ÇáÚÏ ROT13¡ íÊã ÊÏæíÑ ßá ÍÑÝ ÃÈÌÏí Ýí ÇáäÕ äÍæ 13 ÍÑÝÇð ãä ÍÑæÝ ÇáÃáÝÈÇÁ."; - Text[ dutch ] = "ROT13 Algorithme, ieder alfabetisch teken van de tekst roteert met het 13e in het alfabet."; - Text[ chinese_simplified ] = "ROT13 ·¨Ôò£¬Îı¾ÄÚÿ¸ö×Öĸ½«ÑØ×Öĸ±íµÄµÚ13¸ö×Öĸѻ·Ðýת¡£"; + Text[ dutch ] = "ROT13 Algoritme, ieder alfabetisch teken van de tekst roteert met het 13e in het alfabet."; + Text[ chinese_simplified ] = "ROT13 法则，文本内æ¯ä¸ªå—æ¯å°†æ²¿å—æ¯è¡¨çš„第13个å—æ¯å¾ªçŽ¯æ—‹è½¬ã€‚"; Text[ greek ] = "Áëãüñéèìïò ROT13, êÜèå áëöáâçôéêüò ÷áñáêôÞñáò ôïõ êåéìÝíïõ ðåñéóôñÝöåôáé êáôÜ 13 èÝóåéò óôï áëöÜâçôï"; - Text[ korean ] = "ROT13 ¾Ë°í¸®Áò, ÅؽºÆ®ÀÇ ¸ðµç ¾ËÆĺª ¹®ÀÚ´Â ¾ËÆĺª¿¡¼ 13 ÀÚ¸®¾¿ À̵¿ÇÕ´Ï´Ù."; + Text[ korean ] = "ROT13 ì•Œê³ ë¦¬ì¦˜, í…ìŠ¤íŠ¸ì˜ ëª¨ë“ ì•ŒíŒŒë²³ 문ìžëŠ” 알파벳ì—ì„œ 13 ìžë¦¬ì”© ì´ë™í•©ë‹ˆë‹¤."; Text[ turkish ] = "ROT13 Algoritmi, metnin her alfabetik karakteri alfabe içinde 13 sýra döndürülür."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Algoritmo ROT13, cada carácter alfabético del texto rodará 13 espacios en el alfabeto."; + Text[ catalan ] = "Algorisme ROT13, cada caràcter alfabètic del text es desplaça 13 posicions dins de l'alfabet"; Text[ finnish ] = "ROT13-koodaus; jokaista tekstin aakkosnumeerista merkkiä siirretään aakkosissa 13 askelta"; + Text[ thai ] = "à¸à¸±à¸¥à¸à¸à¸£à¸´à¸˜à¸¶à¸¡ ROT13 , à¹à¸•à¹ˆà¸¥à¸°à¸•à¸±à¸§à¸à¸±à¸à¸©à¸£à¸‚à¸à¸‡à¸‚้à¸à¸„วามหมุนโดย 13 ในตัวà¸à¸±à¸à¸©à¸£"; }; String ROT13_PAR1_NAME // Name of Parameter 1 @@ -107,18 +108,19 @@ Resource RID_SC_ADDIN_ROT13 Text[ swedish ] = "Text"; Text[ polish ] = "Tekst"; Text[ portuguese_brazilian ] = "Text"; - Text[ japanese ] = "÷½Ä"; - Text[ chinese_simplified ] = "Text"; - Text[ chinese_traditional ] = "¤å¦r"; + Text[ japanese ] = "æ–‡å—列"; + Text[ chinese_simplified ] = "text"; + Text[ chinese_traditional ] = "æ–‡å—"; Text[ arabic ] = "ÇáäÕ"; Text[ dutch ] = "Tekst"; - Text[ chinese_simplified ] = "Text"; + Text[ chinese_simplified ] = "text"; Text[ greek ] = "Êåßìåíï"; - Text[ korean ] = "ÅؽºÆ®"; + Text[ korean ] = "í…스트"; Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto"; + Text[ catalan ] = "Text"; Text[ finnish ] = "Teksti"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String ROT13_PAR1_DESC // Description of Parameter 1 @@ -130,24 +132,25 @@ Resource RID_SC_ADDIN_ROT13 Text[ russian ] = "Òåêñò, êîòîðûé äîëæåí âðàùàòüñÿ"; Text[ dutch ] = "de tekst die roteert"; Text[ french ] = "Le texte de rotation"; - Text[ spanish ] = "El texto que debe rodar"; + Text[ spanish ] = "Texto que debe rodar"; Text[ italian ] = "Il testo da ruotare"; Text[ danish ] = "Teksten, som skal roteres"; Text[ swedish ] = "Texten som skall roteras"; Text[ polish ] = "Tekst, który ma zostaæ obrócony"; Text[ portuguese_brazilian ] = "the text which should be rotated"; - Text[ japanese ] = "ŒJ‚è•Ô‚·Ã·½Ä"; - Text[ chinese_simplified ] = "ÒªÐýתµÄÎÄ×Ö"; - Text[ chinese_traditional ] = "n±ÛÂ઺¥»¤å"; + Text[ japanese ] = "13å—ãšã‚‰ã—ã¦æš—å·åŒ–ã™ã‚‹æ–‡å—列。"; + Text[ chinese_simplified ] = "è¦æ—‹è½¬çš„æ–‡å—"; + Text[ chinese_traditional ] = "è¦æ—‹è½‰çš„本文"; Text[ arabic ] = "ÇáäÕ ÇáæÇÌÈ ÇÓÊÏÇÑÊå"; Text[ dutch ] = "de tekst die roteert"; - Text[ chinese_simplified ] = "ÒªÐýתµÄÎÄ×Ö"; + Text[ chinese_simplified ] = "è¦æ—‹è½¬çš„æ–‡å—"; Text[ greek ] = "Ôï êåßìåíï ðïõ ðñüêåéôáé íá ðåñéóôñáöåß"; - Text[ korean ] = "ȸÀüµÉ ÅؽºÆ®"; + Text[ korean ] = "íšŒì „ë í…스트"; Text[ turkish ] = "Döndürülecek metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El texto que debe rodar"; + Text[ catalan ] = "Text que s'ha de desplaçar"; Text[ finnish ] = "Kierrettävä teksti"; + Text[ thai ] = "ข้à¸à¸„วามที่ถูà¸à¸«à¸¡à¸¸à¸™"; }; }; @@ -156,3 +159,13 @@ Resource RID_SC_ADDIN_ROT13 + + + + + + + + + + diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 18f228019e85..b936244bef31 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chgtrack.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: er $ $Date: 2002-04-15 11:06:58 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1255,6 +1255,8 @@ public: } ULONG GetLastSavedActionNumber() const { return nMarkLastSaved; } + void SetLastSavedActionNumber(ULONG nNew) + { nMarkLastSaved = nNew; } ScChangeAction* GetLastSaved() const { return aTable.Get( nMarkLastSaved ); } ScChangeActionContent** GetContentSlots() const { return ppContentSlots; } diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 87d595e5a508..1a6a87511e3a 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chgviset.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-11-20 10:26:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,8 @@ namespace utl { class TextSearch; } +class ScDocument; + class ScChangeViewSettings { private: @@ -173,6 +175,9 @@ public: ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); + /// Adjust dates according to selected DateMode + void AdjustDateMode( const ScDocument& rDoc ); + }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 8af0dd74017c..255fbfb400da 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compiler.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: er $ $Date: 2002-11-21 16:10:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -337,6 +337,8 @@ class ScTokenArray // nVal kann auch kombinierte Bits enthalten, // aber nur ein exklusives Bit darf gesetzt sein! + BOOL ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const; + public: ScTokenArray(); ScTokenArray( const ScTokenArray& ); // Zuweisung mit Referenzen auf Tokens @@ -364,7 +366,8 @@ public: BOOL HasOpCodeRPN( OpCode ) const; BOOL HasName() const; // token of type svIndex BOOL HasNameOrColRowName() const; // token of type svIndex or opcode ocColRowName - BOOL IsReference( ScRange& rRange ) const; // exactly and only one range + BOOL IsReference( ScRange& rRange ) const; // exactly and only one range (valid or deleted) + BOOL IsValidReference( ScRange& rRange ) const; // exactly and only one valid range (no #REF!s) BOOL GetTableOpRefs( // exactly and only one multiple operation ScAddress& rFormula, ScAddress& rColFirstPos, ScAddress& rColRelPos, diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index d1792aa201e2..0ee37414279a 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2,9 +2,9 @@ * * $RCSfile: document.hxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: er $ $Date: 2002-12-05 16:00:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,10 @@ #include "brdcst.hxx" #endif +#ifndef SC_TABOPPARAMS_HXX +#include "tabopparams.hxx" +#endif + class KeyEvent; class OutputDevice; class SdrObject; @@ -407,6 +411,11 @@ private: Timer aTrackTimer; +public: + ScTabOpList aTableOpList; // list of ScInterpreterTableOpParams currently in use + ScInterpreterTableOpParams aLastTableOpParams; // remember last params +private: + LanguageType eLanguage; // default language LanguageType eCjkLanguage; // default language for asian text LanguageType eCtlLanguage; // default language for complex text @@ -479,6 +488,8 @@ private: BYTE nInDdeLinkUpdate; // originating DDE links (stacked bool) + BOOL bInUnoBroadcast; + mutable BOOL bStyleSheetUsageInvalid; @@ -1534,6 +1545,9 @@ public: if ( nInterpreterTableOpLevel ) nInterpreterTableOpLevel--; } + // add a formula to be remembered for TableOp broadcasts + void AddTableOpFormulaCell( ScFormulaCell* ); + void InvalidateLastTableOpParams() { aLastTableOpParams.bValid = FALSE; } BOOL IsInDtorClear() const { return bInDtorClear; } void SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; } BOOL IsExpandRefs() { return bExpandRefs; } diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index c5fb99ea5542..3d9e888470e7 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -2,9 +2,9 @@ * * $RCSfile: global.hxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: er $ $Date: 2002-11-12 18:28:04 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -296,6 +296,7 @@ inline BOOL ValidColRowTab(USHORT nCol, USHORT nRow, USHORT nTab) #define HASATTR_CONDITIONAL 512 #define HASATTR_ROTATE 1024 #define HASATTR_NOTOVERLAPPED 2048 +#define HASATTR_RTL 4096 #define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL ) diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index 17c48522f810..a70bcea8b341 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: refdata.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: er $ $Date: 2001-02-21 18:22:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,6 +131,7 @@ struct SingleRefData // Single reference (one address) into the sheet inline BOOL IsRowDeleted() const { return Flags.bRowDeleted; } inline void SetTabDeleted( BOOL bVal ) { Flags.bTabDeleted = (bVal ? TRUE : FALSE ); } inline BOOL IsTabDeleted() const { return Flags.bTabDeleted; } + inline BOOL IsDeleted() const { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); } inline void SetFlag3D( BOOL bVal ) { Flags.bFlag3D = (bVal ? TRUE : FALSE ); } inline BOOL IsFlag3D() const { return Flags.bFlag3D; } diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 391f2b83ba89..e081f0dd8448 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scdll.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,13 +116,6 @@ public: //------------------------------------------------------------------------- -#ifdef WNT -typedef void ( __cdecl * ScSigCatchFunc )( int ); -#else -typedef void ( * ScSigCatchFunc )( int ); -#endif -typedef ScSigCatchFunc ( * ScLibSignalFunc )( int, ScSigCatchFunc ); - class ScModuleDummy: public SfxModule /* [Description] @@ -137,17 +130,14 @@ public: // SvFactory name convention: // 'p' + SfxObjectShell-subclass + 'Factory' SotFactory* pScDocShellFactory; - ScLibSignalFunc pSignalFunc; ScModuleDummy( ResMgr *pResMgr, BOOL bDummy, SfxObjectFactory* pFact ) : SfxModule(pResMgr, bDummy, pFact, NULL), - pScDocShellFactory(pFact), pSignalFunc(0) + pScDocShellFactory(pFact) {} virtual SfxModule* Load(); - ScLibSignalFunc GetSignalFunc() { return pSignalFunc; } - static SvGlobalName GetID(USHORT nFileFormat); static USHORT HasID(const SvGlobalName& rName); }; diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx index fcf708b02a5e..05b7a08c14eb 100644 --- a/sc/inc/scextopt.hxx +++ b/sc/inc/scextopt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scextopt.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-10 14:04:37 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,6 @@ public: // Cursor UINT16 nCurCol; // aktuelle Cursor-Position UINT16 nCurRow; - double fColScale; // <= 0 -> invalid // ------------------------------------------------------------------- ScExtDocOptions( void ); ~ScExtDocOptions(); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 8ca4e46d82d5..dc6d1f732058 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scmod.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: nn $ $Date: 2002-10-24 17:17:17 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,7 @@ class SfxErrorHandler; class SvxErrorHandler; class SvtAccessibilityOptions; -namespace svx { class ColorConfig; } +namespace svtools { class ColorConfig; } class ScRange; class ScDocument; @@ -169,7 +169,7 @@ class ScModule: public ScModuleDummy, public SfxListener ScInputCfg* pInputCfg; ScPrintCfg* pPrintCfg; ScNavipiCfg* pNavipiCfg; - svx::ColorConfig* pColorConfig; + svtools::ColorConfig* pColorConfig; SvtAccessibilityOptions* pAccessOptions; SfxErrorHandler* pErrorHdl; SvxErrorHandler* pSvxErrorHdl; @@ -248,7 +248,7 @@ public: static BOOL HasThesaurusLanguage( USHORT nLang ); ScNavipiCfg& GetNavipiCfg(); - svx::ColorConfig& GetColorConfig(); + svtools::ColorConfig& GetColorConfig(); SvtAccessibilityOptions& GetAccessOptions(); void ModifyOptions( const SfxItemSet& rOptSet ); diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx new file mode 100644 index 000000000000..f6dd98bbfbaf --- /dev/null +++ b/sc/inc/tabopparams.hxx @@ -0,0 +1,136 @@ +/************************************************************************* + * + * $RCSfile: tabopparams.hxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $ $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef SC_TABOPPARAMS_HXX +#define SC_TABOPPARAMS_HXX + +#ifndef SC_SCGLOB_HXX +#include "global.hxx" +#endif +#include <vector> + +class ScFormulaCell; + +struct ScInterpreterTableOpParams +{ + ScAddress aOld1; + ScAddress aNew1; + ScAddress aOld2; + ScAddress aNew2; + ScAddress aFormulaPos; + ::std::vector< ScFormulaCell* > aNotifiedFormulaCells; + ::std::vector< ScAddress > aNotifiedFormulaPos; + BOOL bValid; + BOOL bRefresh; + BOOL bCollectNotifications; + + ScInterpreterTableOpParams() + : bValid( FALSE ) + , bRefresh( FALSE ) + , bCollectNotifications( TRUE ) + { + } + + ScInterpreterTableOpParams( const ScInterpreterTableOpParams& r ) + : aOld1( r.aOld1 ) + , aNew1( r.aNew1 ) + , aOld2( r.aOld2 ) + , aNew2( r.aNew2 ) + , aFormulaPos( r.aFormulaPos ) + , aNotifiedFormulaCells( r.aNotifiedFormulaCells ) + , aNotifiedFormulaPos( r.aNotifiedFormulaPos ) + , bValid( r.bValid ) + , bRefresh( r.bRefresh ) + , bCollectNotifications( r.bCollectNotifications ) + { + } + + ScInterpreterTableOpParams& operator =( const ScInterpreterTableOpParams& r ) + { + aOld1 = r.aOld1; + aNew1 = r.aNew1; + aOld2 = r.aOld2; + aNew2 = r.aNew2; + aFormulaPos = r.aFormulaPos; + aNotifiedFormulaCells = r.aNotifiedFormulaCells; + aNotifiedFormulaPos = r.aNotifiedFormulaPos; + bValid = r.bValid; + bRefresh = r.bRefresh; + bCollectNotifications = r.bCollectNotifications; + return *this; + } + + operator ==( const ScInterpreterTableOpParams& r ) + { + return + bValid && r.bValid && + aOld1 == r.aOld1 && + aOld2 == r.aOld2 && + aFormulaPos == r.aFormulaPos ; + // aNotifiedFormula(Cells|Pos), aNew1, aNew2, bRefresh, + // bCollectNotifications are not compared + } +}; + +DECLARE_LIST( ScTabOpList, ScInterpreterTableOpParams* ); + +#endif // SC_TABOPPARAMS_HXX + diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 5eb77e7e5066..7d4960896d73 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unonames.hxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: sab $ $Date: 2002-11-11 12:35:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -262,6 +262,7 @@ #define SC_UNONAME_CONTHDR "ContainsHeader" #define SC_UNONAME_MAXFLD "MaxFieldCount" #define SC_UNONAME_ORIENT "Orientation" +#define SC_UNONAME_SORTCOLUMNS "SortColumns" #define SC_UNONAME_SORTFLD "SortFields" #define SC_UNONAME_SORTASC "SortAscending" #define SC_UNONAME_ENUSLIST "EnableUserSortList" @@ -271,6 +272,7 @@ #define SC_UNONAME_AUTOFLT "AutoFilter" #define SC_UNONAME_FLTCRT "FilterCriteriaSource" #define SC_UNONAME_USEFLTCRT "UseFilterCriteriaSource" +#define SC_UNONAME_ENABSORT "EnableSort" // text fields #define SC_UNONAME_ANCTYPE "AnchorType" diff --git a/sc/prj/build.lst b/sc/prj/build.lst index 257a016e0972..1832b6e05ad3 100644 --- a/sc/prj/build.lst +++ b/sc/prj/build.lst @@ -1,4 +1,4 @@ -sc sc : offmgr NULL +sc sc : offmgr boost NULL sc sc usr1 - all sc_mkout NULL sc sc\inc get - all sc_inc NULL sc sc\prj get - all sc_prj NULL diff --git a/sc/prj/d.lst b/sc/prj/d.lst index 0e6cc343a647..7be9f46e98eb 100644 --- a/sc/prj/d.lst +++ b/sc/prj/d.lst @@ -1,12 +1,4 @@ -mkdir: %_DEST%\odk%_EXT% -mkdir: %_DEST%\odk%_EXT%\inc -mkdir: %_DEST%\odk%_EXT%\lib -mkdir: %_DEST%\odk%_EXT%\src -mkdir: %_DEST%\odk%_EXT%\pck ..\inc\sc.lst %_DEST%\inc%_EXT%\sc.lst -..\%__SRC%\inc\scinter.h %_DEST%\odk\inc%_EXT%\scinter.h -..\%__SRC%\lib\scinter.lib %_DEST%\odk\lib%_EXT%\scinter.lib -..\%__SRC%\misc\scinter.c %_DEST%\odk\src%_EXT%\scinter.c ..\%__SRC%\bin\scalc3.exe %_DEST%\bin%_EXT%\scalc3.exe ..\%__SRC%\bin\*.sym %_DEST%\bin%_EXT%\*.sym ..\%__SRC%\bin\scalc3.pdb %_DEST%\bin%_EXT%\scalc3.pdb @@ -27,9 +19,7 @@ touch: ..\%__SRC%\misc\sc.hid %_DEST%\bin%_EXT%\sc.hid ..\inc\sc.hrc %_DEST%\inc%_EXT%\sc.hrc mkdir: %_DEST%\inc\%_EXT%\sc hedabu: ..\inc\scdll.hxx %_DEST%\inc%_EXT%\sc\scdll.hxx -mkdir: %_DEST%\ucr%_EXT%\sc -..\%__SRC%\ucr\*.ucr %_DEST%\ucr%_EXT%\sc\*.ucr -..\xml\*.xml %_DEST%\xml\*.xml +..\xml\*.xml %_DEST%\xml%_EXT%\*.xml ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 541a9b9f1944..044341c21936 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -2,9 +2,9 @@ * * $RCSfile: attarray.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: er $ $Date: 2002-12-05 16:08:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,6 +70,7 @@ #include "scitems.hxx" #include <svx/algitem.hxx> #include <svx/boxitem.hxx> +#include <svx/frmdiritem.hxx> #include <svx/shaditem.hxx> #include <svtools/poolcach.hxx> @@ -1315,6 +1316,13 @@ BOOL ScAttrArray::HasAttrib( USHORT nRow1, USHORT nRow2, USHORT nMask ) const if ( eLoc == SVX_SHADOW_BOTTOMLEFT || eLoc == SVX_SHADOW_BOTTOMRIGHT ) bFound = TRUE; } + if ( nMask & HASATTR_RTL ) + { + const SvxFrameDirectionItem& rDirection = + (const SvxFrameDirectionItem&) pPattern->GetItem( ATTR_WRITINGDIR ); + if ( rDirection.GetValue() == FRMDIR_HORI_RIGHT_TOP ) + bFound = TRUE; + } } return bFound; diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 778b4185aa16..13c00812d8f6 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bcaslot.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2002-11-27 21:19:51 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -442,7 +442,7 @@ ScBroadcastAreaSlotMachine::~ScBroadcastAreaSlotMachine() if ( *pp ) delete *pp; } - delete ppSlots; + delete[] ppSlots; for ( ScBroadcastArea* pBCA = pBCAlwaysList->First(); pBCA; pBCA = pBCAlwaysList->Next() ) { diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 30c0e5b87ec7..50c59d806d13 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cell.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: er $ $Date: 2002-10-01 17:18:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -918,7 +918,7 @@ void ScFormulaCell::Save( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rHdr.StartEntry(); - if ( bIsValue && !pCode->GetError() && !SOMA_FINITE( nErgValue ) ) + if ( bIsValue && !pCode->GetError() && !::rtl::math::isFinite( nErgValue ) ) { DBG_ERRORFILE( msgDbgInfinity ); pCode->SetError( errIllegalFPOperation ); @@ -1187,7 +1187,7 @@ void ScFormulaCell::CalcAfterLoad() // gespeichert werden, woraufhin spaeter im NumberFormatter die BLC Lib // bei einem fabs(-NAN) abstuerzt (#32739#) // hier fuer alle Systeme ausbuegeln, damit da auch Err503 steht - if ( bIsValue && !SOMA_FINITE( nErgValue ) ) + if ( bIsValue && !::rtl::math::isFinite( nErgValue ) ) { DBG_ERRORFILE("Formelzelle INFINITY !!! Woher kommt das Dokument?"); nErgValue = 0.0; @@ -1456,7 +1456,7 @@ void ScFormulaCell::Interpret() && !pCode->IsRecalcModeAlways() ) pDocument->RemoveFromFormulaTree( this ); #ifndef PRODUCT - if ( bIsValue && !pCode->GetError() && !SOMA_FINITE( nErgValue ) ) + if ( bIsValue && !pCode->GetError() && !::rtl::math::isFinite( nErgValue ) ) { DBG_ERRORFILE( msgDbgInfinity ); nErgValue = 0.0; @@ -1515,7 +1515,11 @@ void __EXPORT ScFormulaCell::SFX_NOTIFY( SfxBroadcaster& rBC, if ( p->GetId() & SC_HINT_TABLEOPDIRTY ) { bForceTrack = !bTableOpDirty; - bTableOpDirty = TRUE; + if ( !bTableOpDirty ) + { + pDocument->AddTableOpFormulaCell( this ); + bTableOpDirty = TRUE; + } } else { @@ -1570,7 +1574,11 @@ void ScFormulaCell::SetTableOpDirty() { if ( !bTableOpDirty || !pDocument->IsInFormulaTree( this ) ) { - bTableOpDirty = TRUE; + if ( !bTableOpDirty ) + { + pDocument->AddTableOpFormulaCell( this ); + bTableOpDirty = TRUE; + } pDocument->AppendToFormulaTrack( this ); pDocument->TrackFormulas( SC_HINT_TABLEOPDIRTY ); } diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 2d6a65955ffb..a8c3d12a5908 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: column3.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: er $ $Date: 2002-11-27 21:29:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -560,7 +560,8 @@ void ScColumn::DeleteRange( USHORT nStartIndex, USHORT nEndIndex, USHORT nDelFla pOldCell->ForgetBroadcaster(); pOldCell->Delete(); } - delete ppDelCells; + + delete[] ppDelCells; } diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 9e19f53e8fd1..d2620d6d1e50 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: conditio.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: nn $ $Date: 2002-08-15 14:35:04 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ #include <sfx2/objsh.hxx> #include <svtools/itemset.hxx> #include <svtools/zforlist.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #ifndef _UNOTOOLS_COLLATORWRAPPER_HXX #include <unotools/collatorwrapper.hxx> @@ -536,25 +536,77 @@ void ScConditionEntry::CompileXML() TRUE, FALSE, TRUE ); } +void lcl_CondUpdateInsertTab( ScTokenArray& rCode, USHORT nInsTab, USHORT nPosTab, BOOL& rChanged ) +{ + // Insert table: only update absolute table references. + // (Similar to ScCompiler::UpdateInsertTab with bIsName=TRUE, result is the same as for named ranges) + // For deleting, ScCompiler::UpdateDeleteTab is used because of the handling of invalid references. + + rCode.Reset(); + ScToken* p = rCode.GetNextReference(); + while( p ) + { + SingleRefData& rRef1 = p->GetSingleRef(); + if ( !rRef1.IsTabRel() && nInsTab <= rRef1.nTab ) + { + rRef1.nTab += 1; + rRef1.nRelTab = rRef1.nTab - nPosTab; + rChanged = TRUE; + } + if( p->GetType() == svDoubleRef ) + { + SingleRefData& rRef2 = p->GetDoubleRef().Ref2; + if ( !rRef2.IsTabRel() && nInsTab <= rRef2.nTab ) + { + rRef2.nTab += 1; + rRef2.nRelTab = rRef2.nTab - nPosTab; + rChanged = TRUE; + } + } + p = rCode.GetNextReference(); + } +} + void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, short nDx, short nDy, short nDz ) { + BOOL bInsertTab = ( eUpdateRefMode == URM_INSDEL && nDz == 1 ); + BOOL bDeleteTab = ( eUpdateRefMode == URM_INSDEL && nDz == -1 ); + BOOL bChanged1 = FALSE; BOOL bChanged2 = FALSE; if (pFormula1) { - ScCompiler aComp( pDoc, aSrcPos, *pFormula1 ); - aComp.UpdateNameReference( eUpdateRefMode, rRange, nDx, nDy, nDz, bChanged1); + if ( bInsertTab ) + lcl_CondUpdateInsertTab( *pFormula1, rRange.aStart.Tab(), aSrcPos.Tab(), bChanged1 ); + else + { + ScCompiler aComp( pDoc, aSrcPos, *pFormula1 ); + if ( bDeleteTab ) + aComp.UpdateDeleteTab( rRange.aStart.Tab(), FALSE, TRUE, bChanged1 ); + else + aComp.UpdateNameReference( eUpdateRefMode, rRange, nDx, nDy, nDz, bChanged1 ); + } + if (bChanged1) - DELETEZ(pFCell1); // wird bei IsValid wieder angelegt + DELETEZ(pFCell1); // is created again in IsValid } if (pFormula2) { - ScCompiler aComp( pDoc, aSrcPos, *pFormula2 ); - aComp.UpdateNameReference( eUpdateRefMode, rRange, nDx, nDy, nDz, bChanged2); + if ( bInsertTab ) + lcl_CondUpdateInsertTab( *pFormula2, rRange.aStart.Tab(), aSrcPos.Tab(), bChanged2 ); + else + { + ScCompiler aComp( pDoc, aSrcPos, *pFormula2 ); + if ( bDeleteTab ) + aComp.UpdateDeleteTab( rRange.aStart.Tab(), FALSE, TRUE, bChanged2 ); + else + aComp.UpdateNameReference( eUpdateRefMode, rRange, nDx, nDy, nDz, bChanged2 ); + } + if (bChanged2) - DELETEZ(pFCell2); // wird bei IsValid wieder angelegt + DELETEZ(pFCell2); // is created again in IsValid } } @@ -729,7 +781,7 @@ BOOL ScConditionEntry::IsValid( double nArg ) const double nTemp = nComp1; nComp1 = nComp2; nComp2 = nTemp; } - // Alle Grenzfaelle muessen per SolarMath::ApproxEqual getestet werden! + // Alle Grenzfaelle muessen per ::rtl::math::approxEqual getestet werden! BOOL bValid = FALSE; switch (eOp) @@ -737,33 +789,33 @@ BOOL ScConditionEntry::IsValid( double nArg ) const case SC_COND_NONE: break; // immer FALSE; case SC_COND_EQUAL: - bValid = SolarMath::ApproxEqual( nArg, nComp1 ); + bValid = ::rtl::math::approxEqual( nArg, nComp1 ); break; case SC_COND_NOTEQUAL: - bValid = !SolarMath::ApproxEqual( nArg, nComp1 ); + bValid = !::rtl::math::approxEqual( nArg, nComp1 ); break; case SC_COND_GREATER: - bValid = ( nArg > nComp1 ) && !SolarMath::ApproxEqual( nArg, nComp1 ); + bValid = ( nArg > nComp1 ) && !::rtl::math::approxEqual( nArg, nComp1 ); break; case SC_COND_EQGREATER: - bValid = ( nArg >= nComp1 ) || SolarMath::ApproxEqual( nArg, nComp1 ); + bValid = ( nArg >= nComp1 ) || ::rtl::math::approxEqual( nArg, nComp1 ); break; case SC_COND_LESS: - bValid = ( nArg < nComp1 ) && !SolarMath::ApproxEqual( nArg, nComp1 ); + bValid = ( nArg < nComp1 ) && !::rtl::math::approxEqual( nArg, nComp1 ); break; case SC_COND_EQLESS: - bValid = ( nArg <= nComp1 ) || SolarMath::ApproxEqual( nArg, nComp1 ); + bValid = ( nArg <= nComp1 ) || ::rtl::math::approxEqual( nArg, nComp1 ); break; case SC_COND_BETWEEN: bValid = ( nArg >= nComp1 && nArg <= nComp2 ) || - SolarMath::ApproxEqual( nArg, nComp1 ) || SolarMath::ApproxEqual( nArg, nComp2 ); + ::rtl::math::approxEqual( nArg, nComp1 ) || ::rtl::math::approxEqual( nArg, nComp2 ); break; case SC_COND_NOTBETWEEN: bValid = ( nArg < nComp1 || nArg > nComp2 ) && - !SolarMath::ApproxEqual( nArg, nComp1 ) && !SolarMath::ApproxEqual( nArg, nComp2 ); + !::rtl::math::approxEqual( nArg, nComp1 ) && !::rtl::math::approxEqual( nArg, nComp2 ); break; case SC_COND_DIRECT: - bValid = !SolarMath::ApproxEqual( nComp1, 0.0 ); + bValid = !::rtl::math::approxEqual( nComp1, 0.0 ); break; default: DBG_ERROR("unbekannte Operation bei ScConditionEntry"); @@ -777,7 +829,7 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const // Interpret muss schon gerufen sein if ( eOp == SC_COND_DIRECT ) // Formel ist unabhaengig vom Inhalt - return !SolarMath::ApproxEqual( nVal1, 0.0 ); + return !::rtl::math::approxEqual( nVal1, 0.0 ); // Wenn Bedingung Zahl enthaelt, immer FALSE, ausser bei "ungleich" diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 204d69a12d40..73441248fa46 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docpool.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: nn $ $Date: 2002-09-09 13:57:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,7 +110,7 @@ #include "sc.hrc" // Slot-IDs -#define SC_MAX_POOLREF (SFX_ITEMS_MAXREF - 39) +#define SC_MAX_POOLREF (SFX_ITEMS_OLD_MAXREF - 39) #define SC_SAFE_POOLREF (SC_MAX_POOLREF + 20) // STATIC DATA ----------------------------------------------------------- @@ -394,7 +394,7 @@ __EXPORT ScDocumentPool::~ScDocumentPool() for ( USHORT i=0; i < ATTR_ENDINDEX-ATTR_STARTINDEX+1; i++ ) { - SetRef( *ppPoolDefaults[i], 0 ); + SetRefCount( *ppPoolDefaults[i], 0 ); delete ppPoolDefaults[i]; } @@ -590,13 +590,13 @@ void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem ) { if ( rItem.Which() == ATTR_PATTERN ) // nur Pattern ist special { - USHORT nRef = rItem.GetRef(); - if ( nRef >= SC_MAX_POOLREF && nRef <= SFX_ITEMS_MAXREF ) + ULONG nRef = rItem.GetRefCount(); + if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF ) { - if ( nRef != SC_SAFE_POOLREF ) + if ( nRef != (ULONG) SC_SAFE_POOLREF ) { DBG_ERROR("Wer fummelt da an meinen Ref-Counts herum"); - SetRef( (SfxPoolItem&)rItem, SC_SAFE_POOLREF ); + SetRefCount( (SfxPoolItem&)rItem, (ULONG) SC_SAFE_POOLREF ); } return; // nicht herunterzaehlen } @@ -606,15 +606,14 @@ void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem ) void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static { - USHORT nRef = rItem.GetRef(); - if ( nRef >= SC_MAX_POOLREF && nRef <= SFX_ITEMS_MAXREF ) + ULONG nRef = rItem.GetRefCount(); + if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF ) { // beim Apply vom Cache wird evtl. um 2 hochgezaehlt (auf MAX+1 oder SAFE+2), // heruntergezaehlt wird nur einzeln (in LoadCompleted) - DBG_ASSERT( nRef<=SC_MAX_POOLREF+1 || (nRef>=SC_SAFE_POOLREF-1 && nRef<=SC_SAFE_POOLREF+2), - "ScDocumentPool::CheckRef" ); - - SetRef( (SfxPoolItem&)rItem, SC_SAFE_POOLREF ); + DBG_ASSERT( nRef<=(ULONG)SC_MAX_POOLREF+1 || (nRef>=(ULONG)SC_SAFE_POOLREF-1 && nRef<=(ULONG)SC_SAFE_POOLREF+2), + "ScDocumentPool::CheckRef" ); + SetRefCount( (SfxPoolItem&)rItem, (ULONG) SC_SAFE_POOLREF ); } } diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index b2fa8cac2f6f..fca61c6d6d98 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen2.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: er $ $Date: 2002-12-05 16:08:58 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -385,6 +385,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, pCacheFieldEditEngine( NULL ), nInDdeLinkUpdate( 0 ), nXMLImportedFormulaCount( 0 ), + bInUnoBroadcast( FALSE ), bStyleSheetUsageInvalid( TRUE ) { eSrcSet = gsl_getSystemTextEncoding(); diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 725fadfafa66..263fd84d3e2a 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen3.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: sab $ $Date: 2002-09-06 08:53:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,6 +160,7 @@ #include "sc.hrc" // SID_LINK #include "hints.hxx" #include "dpobject.hxx" +#include "unoguard.hxx" using namespace com::sun::star; @@ -748,15 +749,53 @@ void ScDocument::AddUnoObject( SfxListener& rObject ) void ScDocument::RemoveUnoObject( SfxListener& rObject ) { if (pUnoBroadcaster) + { rObject.EndListening( *pUnoBroadcaster ); + + if ( bInUnoBroadcast ) + { + // #107294# Broadcasts from ScDocument::BroadcastUno are the only way that + // uno object methods are called without holding a reference. + // + // If RemoveUnoObject is called from an object dtor in the finalizer thread + // while the main thread is calling BroadcastUno, the dtor thread must wait + // (or the object's Notify might try to access a deleted object). + // The SolarMutex can't be locked here because if a component is called from + // a VCL event, the main thread has the SolarMutex locked all the time. + // + // This check is done after calling EndListening, so a later BroadcastUno call + // won't touch this object. + + vos::IMutex& rSolarMutex = Application::GetSolarMutex(); + if ( rSolarMutex.tryToAcquire() ) + { + // BroadcastUno is always called with the SolarMutex locked, so if it + // can be acquired, this is within the same thread (should not happen) + DBG_ERRORFILE( "RemoveUnoObject called from BroadcastUno" ); + rSolarMutex.release(); + } + else + { + // let the thread that called BroadcastUno continue + while ( bInUnoBroadcast ) + { + vos::OThread::yield(); + } + } + } + } else - DBG_ERROR("kein Uno-Broadcaster??!?"); + DBG_ERROR("No Uno broadcaster"); } void ScDocument::BroadcastUno( const SfxHint &rHint ) { if (pUnoBroadcaster) + { + bInUnoBroadcast = TRUE; pUnoBroadcaster->Broadcast( rHint ); + bInUnoBroadcast = FALSE; + } } void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode, diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 4c3b7640f5d5..a636e48f7ff6 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen4.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dr $ $Date: 2001-08-03 13:43:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -502,8 +502,8 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) } else nPrecision = (short)GetDocOptions().GetStdPrecision(); - double fRound = SolarMath::Round( fVal, nPrecision ); - if ( SolarMath::ApproxEqual( fVal, fRound ) ) + double fRound = ::rtl::math::round( fVal, nPrecision ); + if ( ::rtl::math::approxEqual( fVal, fRound ) ) return fVal; // durch Rundung hoechstens Fehler else return fRound; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 32b2dd60a6ed..4391a1b9f753 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen8.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: dr $ $Date: 2002-11-27 15:08:06 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -234,11 +234,21 @@ SfxPrinter* ScDocument::GetPrinter() void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) { - SfxPrinter* pOld = pPrinter; - pPrinter = pNewPrinter; - UpdateDrawPrinter(); - delete pOld; - InvalidateTextWidth(); + if ( pNewPrinter == pPrinter ) + { + // #i6706# SetPrinter is called with the same printer again if + // the JobSetup has changed. In that case just call UpdateDrawPrinter + // (SetRefDevice for drawing layer) because of changed text sizes. + UpdateDrawPrinter(); + } + else + { + SfxPrinter* pOld = pPrinter; + pPrinter = pNewPrinter; + UpdateDrawPrinter(); + delete pOld; + } + InvalidateTextWidth(); // in both cases } //------------------------------------------------------------------------ diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 9c3f13cb5d65..137255e64086 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2,9 +2,9 @@ * * $RCSfile: document.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: er $ $Date: 2002-12-05 16:08:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,7 @@ #define ITEMID_FIELD EE_FEATURE_FIELD #include <svx/boxitem.hxx> +#include <svx/frmdiritem.hxx> #include <svx/pageitem.hxx> #include <svx/editeng.hxx> #include <sfx2/app.hxx> @@ -208,6 +209,8 @@ BOOL ScDocument::GetTable( const String& rName, USHORT& rTab ) const BOOL ScDocument::ValidTabName( const String& rName ) const { + /* If changed, ScfTools::ConvertToScSheetName (sc/source/filter/ftools/ftools.cxx) + needs to be changed too. */ using namespace ::com::sun::star::i18n; sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::ASC_UNDERSCORE; @@ -2234,6 +2237,24 @@ void ScDocument::SetTableOpDirty( const ScRange& rRange ) } +void ScDocument::AddTableOpFormulaCell( ScFormulaCell* pCell ) +{ + ScInterpreterTableOpParams* p = aTableOpList.Last(); + if ( p && p->bCollectNotifications ) + { + if ( p->bRefresh ) + { // refresh pointers only + p->aNotifiedFormulaCells.push_back( pCell ); + } + else + { // init both, address and pointer + p->aNotifiedFormulaCells.push_back( pCell ); + p->aNotifiedFormulaPos.push_back( pCell->aPos ); + } + } +} + + void ScDocument::CalcAll() { BOOL bOldAutoCalc = GetAutoCalc(); @@ -3074,7 +3095,29 @@ BOOL ScDocument::HasAttrib( USHORT nCol1, USHORT nRow1, USHORT nTab1, break; } if (!bAnyItem) - nMask &= ~ATTR_ROTATE_VALUE; + nMask &= ~HASATTR_ROTATE; + } + + if ( nMask & HASATTR_RTL ) + { + // first check if right-to left is in the pool at all + // (the same item is used in cell and page format) + + ScDocumentPool* pPool = xPoolHelper->GetDocPool(); + + BOOL bHasRtl = FALSE; + USHORT nDirCount = pPool->GetItemCount( ATTR_WRITINGDIR ); + for (USHORT nItem=0; nItem<nDirCount; nItem++) + { + const SfxPoolItem* pItem = pPool->GetItem( ATTR_WRITINGDIR, nItem ); + if ( pItem && ((const SvxFrameDirectionItem*)pItem)->GetValue() == FRMDIR_HORI_RIGHT_TOP ) + { + bHasRtl = TRUE; + break; + } + } + if (!bHasRtl) + nMask &= ~HASATTR_RTL; } if (!nMask) @@ -3083,7 +3126,15 @@ BOOL ScDocument::HasAttrib( USHORT nCol1, USHORT nRow1, USHORT nTab1, BOOL bFound = FALSE; for (USHORT i=nTab1; i<=nTab2 && !bFound; i++) if (pTab[i]) + { + if ( nMask & HASATTR_RTL ) + { + if ( GetEditTextDirection(i) == EE_HTEXTDIR_R2L ) // sheet default + bFound = TRUE; + } + bFound |= pTab[i]->HasAttrib( nCol1, nRow1, nCol2, nRow2, nMask ); + } return bFound; } diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index c81b92e48d05..9007f6ad881f 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dpsdbtab.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: nn $ $Date: 2001-01-26 19:26:10 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -379,7 +379,7 @@ void lcl_FillItemData( ScDPItemData& rData, if (!pImpl->pFormatter) pImpl->pFormatter = new SvNumberFormatter( pImpl->xServiceManager, ScGlobal::eLnge ); - ULONG nIndex = pImpl->pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge ); + ULONG nIndex = pImpl->pFormatter->GetStandardFormat( nNumType, ScGlobal::eLnge ); pImpl->pFormatter->GetInputLineString( rData.fValue, nIndex, rData.aString ); } } diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 89f37ec3b38d..9f918cff9efe 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dptabsrc.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: er $ $Date: 2001-03-14 18:05:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ // INCLUDE --------------------------------------------------------------- #include <tools/debug.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <svtools/itemprop.hxx> #include "dptabsrc.hxx" @@ -1802,10 +1802,10 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) : double fLastVal = rStrings[nFirstString-1]->GetValue(); long nFirstYear = pSource->GetData()->GetDatePart( - (long)SolarMath::ApproxFloor( fFirstVal ), + (long)::rtl::math::approxFloor( fFirstVal ), nHier, nLev ); long nLastYear = pSource->GetData()->GetDatePart( - (long)SolarMath::ApproxFloor( fLastVal ), + (long)::rtl::math::approxFloor( fLastVal ), nHier, nLev ); nMbrCount = nLastYear + 1 - nFirstYear; @@ -1962,7 +1962,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const const TypedStrCollection& rStrings = pSource->GetData()->GetColumnEntries(nSrcDim); double fFirstVal = rStrings[0]->GetValue(); long nFirstYear = pSource->GetData()->GetDatePart( - (long)SolarMath::ApproxFloor( fFirstVal ), + (long)::rtl::math::approxFloor( fFirstVal ), nHier, nLev ); nVal = nFirstYear + nIndex; @@ -2034,7 +2034,7 @@ BOOL ScDPMember::IsNamedItem( const ScDPItemData& r ) const if ( nHier != SC_DAPI_HIERARCHY_FLAT && pSource->IsDateDimension( nSrcDim ) && r.bHasValue ) { long nComp = pSource->GetData()->GetDatePart( - (long)SolarMath::ApproxFloor( r.fValue ), + (long)::rtl::math::approxFloor( r.fValue ), nHier, nLev ); // fValue is converted from integer, so simple comparison works diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index abede2acac0e..32bd7139ec73 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwlayer.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: nn $ $Date: 2002-10-07 18:11:29 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -330,6 +330,8 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : __EXPORT ScDrawLayer::~ScDrawLayer() { + Broadcast(SdrHint(HINT_MODELCLEARED)); + Clear(); delete pUndoGroup; diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 7b68fbcbe8b3..fb4c79baf8c9 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -2,9 +2,9 @@ * * $RCSfile: global.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: er $ $Date: 2002-11-12 18:27:38 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,7 +130,6 @@ #include "interpre.hxx" #include "strload.hxx" #include "docpool.hxx" -#include "scdll.hxx" // ScLibSignalFunc #include "unitconv.hxx" #include "globstr.hrc" #include "scfuncs.hrc" @@ -650,9 +649,6 @@ void ScGlobal::Init() UpdatePPT(NULL); ScCompiler::Init(); -#if SOMA_FPSIGNAL_JUMP - ScInterpreter::pSignalFunc = SC_DLL()->GetSignalFunc(); -#endif srand( (unsigned) time( NULL ) ); // Random Seed Init fuer Interpreter InitAddIns(); @@ -744,7 +740,6 @@ void ScGlobal::Clear() DELETEZ(pStarCalcFunctionList); // vor ResMgr zerstoeren! DELETEZ(pStarCalcFunctionMgr); ScCompiler::DeInit(); - ScInterpreter::aTableOpList.Clear(); ScInterpreter::GlobalExit(); // statischen Stack loeschen DELETEZ(pEmptyBrushItem); diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index ca9eac0fc004..76a31dbe5349 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: markarr.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: er $ $Date: 2002-01-18 16:58:05 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -384,8 +384,7 @@ void ScMarkArray::MoveTo(USHORT nStartRow, USHORT nEndRow, ScMarkArray& rMarkArr void ScMarkArray::CopyMarksTo( ScMarkArray& rDestMarkArray ) const { - if (rDestMarkArray.pData) - delete rDestMarkArray.pData; + delete[] rDestMarkArray.pData; if (pData) { diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 247f4c3f64d0..52e77d9f72a8 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: patattr.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: nn $ $Date: 2002-12-10 17:23:43 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ #include <svx/brshitem.hxx> #include <svx/charreliefitem.hxx> #include <svx/cntritem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/colritem.hxx> #include <svx/crsditem.hxx> #include <svx/emphitem.hxx> @@ -424,7 +424,7 @@ void ScPatternAttr::GetFont( Font& rFont, ScAutoFontColorMode eAutoMode, aBackColor = *pBackConfigColor; } else - aBackColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + aBackColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); } // get system text color for comparison @@ -437,7 +437,7 @@ void ScPatternAttr::GetFont( Font& rFont, ScAutoFontColorMode eAutoMode, aSysTextColor = *pTextConfigColor; } else - aSysTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + aSysTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); // select the resulting color if ( aBackColor.IsDark() && aSysTextColor.IsDark() ) diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 24d60a2ea270..6f5258122f05 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: table3.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: er $ $Date: 2002-11-27 21:40:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ // INCLUDE --------------------------------------------------------------- -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <unotools/textsearch.hxx> #include <svtools/zforlist.hxx> #include <unotools/charclass.hxx> @@ -1007,26 +1007,26 @@ BOOL ScTable::ValidQuery(USHORT nRow, const ScQueryParam& rParam, switch (rEntry.eOp) { case SC_EQUAL : - bOk = SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bOk = ::rtl::math::approxEqual( nCellVal, rEntry.nVal ); break; case SC_LESS : - bOk = (nCellVal < rEntry.nVal) && !SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bOk = (nCellVal < rEntry.nVal) && !::rtl::math::approxEqual( nCellVal, rEntry.nVal ); break; case SC_GREATER : - bOk = (nCellVal > rEntry.nVal) && !SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bOk = (nCellVal > rEntry.nVal) && !::rtl::math::approxEqual( nCellVal, rEntry.nVal ); break; case SC_LESS_EQUAL : - bOk = (nCellVal < rEntry.nVal) || SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bOk = (nCellVal < rEntry.nVal) || ::rtl::math::approxEqual( nCellVal, rEntry.nVal ); if ( bOk && pbTestEqualCondition ) - bTestEqual = SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bTestEqual = ::rtl::math::approxEqual( nCellVal, rEntry.nVal ); break; case SC_GREATER_EQUAL : - bOk = (nCellVal > rEntry.nVal) || SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bOk = (nCellVal > rEntry.nVal) || ::rtl::math::approxEqual( nCellVal, rEntry.nVal ); if ( bOk && pbTestEqualCondition ) - bTestEqual = SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bTestEqual = ::rtl::math::approxEqual( nCellVal, rEntry.nVal ); break; case SC_NOT_EQUAL : - bOk = !SolarMath::ApproxEqual( nCellVal, rEntry.nVal ); + bOk = !::rtl::math::approxEqual( nCellVal, rEntry.nVal ); break; } } diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 4e1062402838..0a76562803bf 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: table4.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2002-12-04 11:22:38 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,7 +91,7 @@ #endif #include <svtools/zforlist.hxx> #include <vcl/keycodes.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <unotools/charclass.hxx> #include <math.h> @@ -321,7 +321,7 @@ void ScTable::FillAnalyse( USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow { nVal2 = ((ScValueCell*)pCell)->GetValue(); double nDiff = nVal2 - nVal1; - if ( !SolarMath::ApproxEqual( nDiff, rInc ) ) + if ( !::rtl::math::approxEqual( nDiff, rInc ) ) bVal = FALSE; nVal1 = nVal2; } @@ -383,7 +383,7 @@ void ScTable::FillAnalyse( USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow if ( nFlag1 == nFlag2 ) { double nDiff = (double)nVal2 - (double)nVal1; - if ( !SolarMath::ApproxEqual( nDiff, rInc ) ) + if ( !::rtl::math::approxEqual( nDiff, rInc ) ) bVal = FALSE; nVal1 = nVal2; } diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index a805c99e8b47..b5ca2bc3131f 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -2,9 +2,9 @@ * * $RCSfile: table6.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: er $ $Date: 2002-01-18 16:25:38 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,8 @@ // INCLUDE --------------------------------------------------------------- +#include <com/sun/star/i18n/TransliterationModules.hpp> + #include <unotools/textsearch.hxx> #include "table.hxx" @@ -711,6 +713,15 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem, // SearchParam no longer needed - SearchOptions contains all settings com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions(); aSearchOptions.Locale = *ScGlobal::pLocale; + + // #107259# reflect UseAsianOptions flag in SearchOptions + // (use only ignore case and width if asian options are disabled). + // This is also done in SvxSearchDialog CommandHdl, but not in API object. + if ( !rSearchItem.IsUseAsianOptions() ) + aSearchOptions.transliterateFlags &= + ( com::sun::star::i18n::TransliterationModules_IGNORE_CASE | + com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH ); + pSearchText = new utl::TextSearch( aSearchOptions ); if (nCommand == SVX_SEARCHCMD_FIND) diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 98ca5fe02c93..053c9151481c 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: validat.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: nn $ $Date: 2002-06-27 16:30:14 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,7 @@ #include <svtools/zforlist.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <math.h> @@ -526,7 +526,7 @@ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) c case SC_VALID_TIME: bOk = bIsVal; if ( bOk && eDataMode == SC_VALID_WHOLE ) - bOk = SolarMath::ApproxEqual( nVal, floor(nVal+0.5) ); // ganze Zahlen + bOk = ::rtl::math::approxEqual( nVal, floor(nVal+0.5) ); // ganze Zahlen if ( bOk ) bOk = IsCellValid( pCell, rPos ); break; diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 6840ed769875..88626462d9f1 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -2,9 +2,9 @@ * * $RCSfile: interpre.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: er $ $Date: 2002-12-08 17:13:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include <math.h> -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> // SOMA_FPSIGNAL_JUMP +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef SC_COMPILER_HXX @@ -115,10 +115,6 @@ class SvNumberFormatter; }; #endif -#ifndef _TABOPLIST_DECLARED -#define _TABOPLIST_DECLARED -DECLARE_LIST (TabOpList, USHORT*); -#endif struct ScCompare { @@ -175,13 +171,7 @@ class ScInterpreter public: DECL_FIXEDMEMPOOL_NEWDEL( ScInterpreter ) -#if SOMA_FPSIGNAL_JUMP - static jmp_buf* pJumpBuf; // fuer die mySignal-Funktion - static ScLibSignalFunc pSignalFunc; // signal() Wrapper der App -#endif static USHORT nGlobalError; // globale Fehlervariable - static ULONG nInterpCount; // Zaehlt aktuelle Interpreteraufrufe - static TabOpList aTableOpList; // Liste von Ref-Arrays fuer Mehrfachoperat. #if SC_SPEW_ENABLED static ScSpew theSpew; #endif @@ -211,9 +201,6 @@ private: StackVar eResult; USHORT nGlobError; // lokale Kopie -#if SOMA_FPSIGNAL_JUMP - jmp_buf* pLocalJumpBuf; // lokale Kopie -#endif const ScToken* pCur; // aktuelles Token String aTempStr; // fuer GetString() ScTokenStack* pStackObj; // enthaelt den Stack @@ -223,7 +210,6 @@ private: USHORT sp; // der Stackpointer USHORT maxsp; // der maximale StackPointer double** ppGlobSortArray; // Pointer auf Array zum Sortieren - USHORT* pTableOp; // der lokale Pointer auf das aktuelle TableOp ScMatrix** ppTempMatArray; // Array fuer temporaere Matrizen USHORT nMatCount; // dazugehoeriger Zaehler BOOL bMatDel; // und Kontrollvariable @@ -433,7 +419,15 @@ void ScLookup(); void ScHLookup(); void ScVLookup(); void ScSubTotal(); -BOOL GetDBParams(USHORT& rTab, ScQueryParam& rParam); + +// If upon call rMissingField==TRUE then the database field parameter may be +// missing (Xcl DCOUNT() syntax), or may be faked as missing by having the +// value 0.0 or being exactly the entire database range reference (old SO +// compatibility). If this was the case then rMissingField is set to TRUE upon +// return. If rMissingField==FALSE upon call all "missing cases" are considered +// to be an error. +BOOL GetDBParams( USHORT& rTab, ScQueryParam& rParam, BOOL& rMissingField ); + void DBIterator( ScIterFunc ); void ScDBSum(); void ScDBCount(); @@ -501,7 +495,7 @@ void ScEven(); void ScOdd(); void ScCeil(); void ScFloor(); -void RoundNumber( SolarMathRoundingMode eMode ); +void RoundNumber( rtl_math_RoundingMode eMode ); void ScRound(); void ScRoundUp(); void ScRoundDown(); @@ -704,7 +698,6 @@ public: { if (nError && !nGlobalError) nGlobalError = nError; } static USHORT GetError() { return nGlobalError; } - static void MySigFunc(int sig); const String& GetStringResult() { return aResult; } double GetNumResult() { return nResult; } diff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.src index f238cc561943..90d360104e85 100644 --- a/sc/source/core/src/compiler.src +++ b/sc/source/core/src/compiler.src @@ -2,9 +2,9 @@ * * $RCSfile: compiler.src,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: vg $ $Date: 2002-11-27 16:36:10 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -5099,7 +5099,7 @@ Resource RID_SC_FUNCTION_NAMES Text[ chinese_simplified ] = "DPRODUCT"; Text[ russian ] = "ÁÄÏÐÎÈÇÂÅÄ"; Text[ polish ] = "BD.ILOCZYN"; - Text[ japanese ] = "DPRODUKT"; + Text[ japanese ] = "DPRODUCT"; Text[ chinese_traditional ] = "DPRODUCT"; Text[ arabic ] = "DPRODUCT"; Text[ dutch ] = "DBPRODUKT"; @@ -5845,7 +5845,7 @@ Resource RID_SC_FUNCTION_NAMES Text [ french ] = "CHERCHE" ; Text [ swedish ] = "SÖK" ; Text [ dutch ] = "VIND.SPEC" ; - Text [ spanish ] = "HALLAR" ; + Text [ spanish ] = "BUSCAR" ; Text [ english_us ] = "SEARCH" ; Text[ chinese_simplified ] = "SEARCH"; Text[ russian ] = "ÏÎÈÑÊ"; @@ -7825,7 +7825,7 @@ Resource RID_SC_FUNCTION_NAMES Text [ french ] = "NO.SEMAINE" ; Text [ swedish ] = "VECKONR" ; Text [ dutch ] = "KALENDERWEEK" ; - Text [ spanish ] = "SEM.DEL.AÑO" ; + Text [ spanish ] = "NUM.SEMANA" ; Text [ english_us ] = "WEEKNUM" ; Text[ chinese_simplified ] = "WEEKNUM"; Text[ russian ] = "ÊÀËÅÍÄ.ÍÅÄÅËß"; @@ -8410,3 +8410,8 @@ Resource RID_SC_FUNCTION_NAMES_ENGLISH + + + + + diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 460628470eb7..66607689ba15 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chartarr.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: er $ $Date: 2002-07-09 13:11:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1315,12 +1315,13 @@ ScChartPositionMap::ScChartPositionMap( USHORT nChartCols, USHORT nChartRows, ScChartPositionMap::~ScChartPositionMap() { - USHORT j; - for ( j=0; j < nCount; j++ ) + for ( ULONG nIndex=0; nIndex < nCount; nIndex++ ) { - delete ppData[j]; + delete ppData[nIndex]; } delete [] ppData; + + USHORT j; for ( j=0; j < nColCount; j++ ) { delete ppColHeader[j]; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 4e36417c1c65..277fe6bf3d48 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chgtrack.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: er $ $Date: 2002-04-15 11:08:01 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,6 +107,7 @@ #include "scmod.hxx" // SC_MOD #include "inputopt.hxx" // GetExpandRefs #include "patattr.hxx" +#include "hints.hxx" #include "globstr.hrc" @@ -2643,10 +2644,24 @@ void __EXPORT ScChangeTrack::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) rSet.GetPool()->GetWhich( SID_ATTR_ADDRESS ), TRUE, &pItem ) == SFX_ITEM_SET ) { + USHORT nOldCount = aUserCollection.GetCount(); + String aStr( ((SvxAddressItem*)pItem)->GetFirstName() ); aStr += ' '; aStr += ((SvxAddressItem*)pItem)->GetName(); SetUser( aStr ); + + if ( aUserCollection.GetCount() != nOldCount ) + { + // New user in collection -> have to repaint because + // colors may be different now (#106697#). + // (Has to be done in the Notify handler, to be sure + // the user collection has already been updated) + + SfxObjectShell* pDocSh = pDoc->GetDocumentShell(); + if (pDocSh) + pDocSh->Broadcast( ScPaintHint( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB), PAINT_GRID ) ); + } } } } diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 5bddd6be0a5f..c3c71208d36c 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chgviset.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-11-20 10:29:51 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,7 @@ #include "chgviset.hxx" #include "rechead.hxx" +#include "chgtrack.hxx" // ----------------------------------------------------------------------- ScChangeViewSettings::~ScChangeViewSettings() @@ -221,6 +222,53 @@ void ScChangeViewSettings::Store( SvStream& rStream ) const } - - +void ScChangeViewSettings::AdjustDateMode( const ScDocument& rDoc ) +{ + switch ( eDateMode ) + { // corresponds with ScViewUtil::IsActionShown + case SCDM_DATE_EQUAL : + case SCDM_DATE_NOTEQUAL : + aFirstDateTime.SetTime( 0 ); + aLastDateTime = aFirstDateTime; + aLastDateTime.SetTime( 23595999 ); + break; + case SCDM_DATE_SAVE: + { + const ScChangeAction* pLast = 0; + ScChangeTrack* pTrack = rDoc.GetChangeTrack(); + if ( pTrack ) + { + pLast = pTrack->GetLastSaved(); + if ( pLast ) + { + aFirstDateTime = pLast->GetDateTime(); +#if 0 +// This would be the proper handling. But since the SvxTPFilter dialog uses +// DateField/TimeField, and the filter dialog is used in ScAcceptChgDlg as the +// controlling instance, and the TimeFields are used there without seconds or +// 100ths, we'd display some extra entries between the floor of the minute and +// the start of the next minute. + // add one 100th second to point past last saved + aFirstDateTime += Time( 0, 0, 0, 1 ); +#else + // Set the next minute as the start time and assume that + // the document isn't saved, reloaded, edited and filter set + // all together during the gap between those two times. + aFirstDateTime += Time( 0, 1 ); + aFirstDateTime.SetSec(0); + aFirstDateTime.Set100Sec(0); +#endif + } + } + if ( !pLast ) + { + aFirstDateTime.SetDate( 18990101 ); + aFirstDateTime.SetTime( 0 ); + } + aLastDateTime = Date(); + aLastDateTime.SetYear( aLastDateTime.GetYear() + 100 ); + } + break; + } +} diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 838649917353..be6397ecb5a1 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: compiler.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: er $ $Date: 2002-11-21 18:26:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,8 +82,8 @@ #ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #include <ctype.h> #include <stdio.h> @@ -2229,8 +2229,18 @@ void ScCompiler::PutCode( ScRawToken* p ) void ScCompiler::PutCode( ScToken* p ) { - if( pc >= MAXCODE ) + if( pc >= MAXCODE-1 ) + { + if ( pc == MAXCODE-1 ) + { + p = new ScByteToken( ocStop ); + *pCode++ = p; + ++pc; + p->IncRef(); + } SetError(errCodeOverflow); + return; + } if( pArr->GetError() && !bCompileForFAP ) return; *pCode++ = p; pc++; @@ -3614,21 +3624,22 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke { case svDouble: { - String aStr; if ( pSymbolTable == pSymbolTableEnglish ) { // Don't go via number formatter, slows down XML export // significantly because on every formula the number formatter // has to switch to/from English/native language. - SolarMath::DoubleToString( aStr, t->GetDouble(), 'A', INT_MAX, - '.', TRUE ); + ::rtl::math::doubleToUStringBuffer( rBuffer, t->GetDouble(), + rtl_math_StringFormat_Automatic, + rtl_math_DecimalPlaces_Max, '.', TRUE ); } else { - SolarMath::DoubleToString( aStr, t->GetDouble(), 'A', INT_MAX, - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), - TRUE ); + ::rtl::math::doubleToUStringBuffer( rBuffer, t->GetDouble(), + rtl_math_StringFormat_Automatic, + rtl_math_DecimalPlaces_Max, + ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), + TRUE ); } - rBuffer.append(aStr); } break; case svString: diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index dee591d018ae..8e4c535038ad 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: detfunc.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: nn $ $Date: 2002-05-16 07:18:05 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/eeitem.hxx> #include <svx/outlobj.hxx> #include <svx/sdshitm.hxx> @@ -1927,10 +1927,10 @@ void ScDetectiveFunc::InitializeColors() { // may be called several times to update colors from configuration - const svx::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig(); - nArrowColor = rColorCfg.GetColorValue(svx::CALCDETECTIVE).nColor; - nErrorColor = rColorCfg.GetColorValue(svx::CALCDETECTIVEERROR).nColor; - nCommentColor = rColorCfg.GetColorValue(svx::CALCNOTESBACKGROUND).nColor; + const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig(); + nArrowColor = rColorCfg.GetColorValue(svtools::CALCDETECTIVE).nColor; + nErrorColor = rColorCfg.GetColorValue(svtools::CALCDETECTIVEERROR).nColor; + nCommentColor = rColorCfg.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor; bColorsInitialized = TRUE; } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 8a8968dbe033..38e6e0b75e54 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -2,9 +2,9 @@ * * $RCSfile: editutil.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: nn $ $Date: 2002-09-23 14:13:00 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ #define ITEMID_FIELD EE_FEATURE_FIELD #include <svx/algitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/editview.hxx> #include <svx/editstat.hxx> #include <svx/escpitem.hxx> @@ -795,8 +795,8 @@ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, break; } - svx::ColorConfigEntry eEntry = - INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svx::LINKSVISITED : svx::LINKS; + svtools::ColorConfigEntry eEntry = + INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS; rTxtColor = new Color( SC_MOD()->GetColorConfig().GetColorValue(eEntry).nColor ); } else diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 3feddd32cffb..9ea66e805c64 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr1.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: er $ $Date: 2002-12-08 17:12:10 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,7 +168,7 @@ void ScInterpreter::ScChoseJump() { const short* pJump = pCur->GetJump(); short nJumpCount = pJump[ 0 ]; - double nJumpIndex = SolarMath::ApproxFloor( GetDouble() ); + double nJumpIndex = ::rtl::math::approxFloor( GetDouble() ); if ((nJumpIndex >= 1) && (nJumpIndex < nJumpCount)) aCode.Jump( pJump[ (short) nJumpIndex ], pJump[ nJumpCount ] ); else @@ -185,7 +185,7 @@ short ScInterpreter::CompareFunc( const ScCompare& rComp ) ; // leere Zelle == leere Zelle, nRes 0 else if( rComp.bVal[ 1 ] ) { - if ( !SolarMath::ApproxEqual( rComp.nVal[ 1 ], 0.0 ) ) + if ( !::rtl::math::approxEqual( rComp.nVal[ 1 ], 0.0 ) ) { if ( rComp.nVal[ 1 ] < 0.0 ) nRes = 1; // leere Zelle > -x @@ -205,7 +205,7 @@ short ScInterpreter::CompareFunc( const ScCompare& rComp ) { if( rComp.bVal[ 0 ] ) { - if ( !SolarMath::ApproxEqual( rComp.nVal[ 0 ], 0.0 ) ) + if ( !::rtl::math::approxEqual( rComp.nVal[ 0 ], 0.0 ) ) { if ( rComp.nVal[ 0 ] < 0.0 ) nRes = -1; // -x < leere Zelle @@ -225,7 +225,7 @@ short ScInterpreter::CompareFunc( const ScCompare& rComp ) { if( rComp.bVal[ 1 ] ) { - if ( !SolarMath::ApproxEqual( rComp.nVal[ 0 ], rComp.nVal[ 1 ] ) ) + if ( !::rtl::math::approxEqual( rComp.nVal[ 0 ], rComp.nVal[ 1 ] ) ) { if( rComp.nVal[ 0 ] - rComp.nVal[ 1 ] < 0 ) nRes = -1; @@ -859,25 +859,25 @@ void ScInterpreter::ScRad() void ScInterpreter::ScSin() { - PushDouble(SolarMath::Sin(GetDouble())); + PushDouble(::rtl::math::sin(GetDouble())); } void ScInterpreter::ScCos() { - PushDouble(SolarMath::Cos(GetDouble())); + PushDouble(::rtl::math::cos(GetDouble())); } void ScInterpreter::ScTan() { - PushDouble(SolarMath::Tan(GetDouble())); + PushDouble(::rtl::math::tan(GetDouble())); } void ScInterpreter::ScCot() { - PushDouble(1.0 / SolarMath::Tan(GetDouble())); + PushDouble(1.0 / ::rtl::math::tan(GetDouble())); } @@ -1641,7 +1641,7 @@ short ScInterpreter::IsEven() SetIllegalParameter(); } if (nRes) - nRes = ( fmod( SolarMath::ApproxFloor( fabs( fVal ) ), 2.0 ) < 0.5 ); + nRes = ( fmod( ::rtl::math::approxFloor( fabs( fVal ) ), 2.0 ) < 0.5 ); return nRes; } @@ -2334,8 +2334,8 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero ) } switch( eFunc ) { - case ifSUM: fRes = SolarMath::ApproxAdd( fRes, fMem ); break; - case ifAVERAGE: fRes = SolarMath::ApproxAdd( fRes, fMem ) / nCount; break; + case ifSUM: fRes = ::rtl::math::approxAdd( fRes, fMem ); break; + case ifAVERAGE: fRes = ::rtl::math::approxAdd( fRes, fMem ) / nCount; break; case ifCOUNT2: case ifCOUNT: fRes = nCount; break; case ifPRODUCT: if ( !nCount ) fRes = 0.0; break; @@ -2479,7 +2479,7 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount, SetError(errIllegalParameter); } } - rVal = SolarMath::ApproxSub( fSumSqr, fSum*fSum/rValCount ); + rVal = ::rtl::math::approxSub( fSumSqr, fSum*fSum/rValCount ); } @@ -3309,7 +3309,7 @@ void ScInterpreter::ScSumIf() } } while ( aCellIter.GetNext() ); } - PushDouble( SolarMath::ApproxAdd( fSum, fMem ) ); + PushDouble( ::rtl::math::approxAdd( fSum, fMem ) ); } else SetIllegalParameter(); @@ -3685,7 +3685,7 @@ void ScInterpreter::ScHLookup() bSorted = GetBool(); else bSorted = TRUE; - double fIndex = SolarMath::ApproxFloor( GetDouble() ) - 1.0; + double fIndex = ::rtl::math::approxFloor( GetDouble() ) - 1.0; ScMatrix* pMat = NULL; USHORT nC, nR; USHORT nCol1, nRow1, nTab1, nCol2, nRow2, nTab2; @@ -3939,7 +3939,7 @@ void ScInterpreter::ScVLookup() bSorted = GetBool(); else bSorted = TRUE; - double fIndex = SolarMath::ApproxFloor( GetDouble() ) - 1.0; + double fIndex = ::rtl::math::approxFloor( GetDouble() ) - 1.0; ScMatrix* pMat = NULL; USHORT nC, nR; USHORT nCol1, nRow1, nTab1, nCol2, nRow2, nTab2; @@ -4192,7 +4192,7 @@ void ScInterpreter::ScSubTotal() // Wir muessen den 1. Parameter tief aus dem Stack herausfischen! const ScToken* p = pStack[ sp - nParamCount ]; PushTempToken( *p ); - int nFunc = (int) SolarMath::ApproxFloor( GetDouble() ); + int nFunc = (int) ::rtl::math::approxFloor( GetDouble() ); if( nFunc < 1 || nFunc > 11 ) SetIllegalParameter(); else @@ -4227,9 +4227,16 @@ void ScInterpreter::ScSubTotal() #endif -BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam) +BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam, + BOOL& rMissingField ) { BOOL bRet = FALSE; + BOOL bAllowMissingField = FALSE; + if ( rMissingField ) + { + bAllowMissingField = TRUE; + rMissingField = FALSE; + } if ( GetByte() == 3 ) { @@ -4239,10 +4246,14 @@ BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam) BOOL bByVal = TRUE; double nVal; String aStr; + ScRange aMissingRange; + BOOL bRangeFake = FALSE; switch (GetStackType()) { case svDouble : - nVal = GetDouble(); + nVal = ::rtl::math::approxFloor( GetDouble() ); + if ( bAllowMissingField && nVal == 0.0 ) + rMissingField = TRUE; // fake missing parameter break; case svString : bByVal = FALSE; @@ -4262,17 +4273,56 @@ BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam) } } break; + case svDoubleRef : + if ( bAllowMissingField ) + { // fake missing parameter for old SO compatibility + bRangeFake = TRUE; + PopDoubleRef( aMissingRange ); + } + else + { + PopError(); + SetError( errIllegalParameter ); + } + break; + case svMissing : + PopError(); + if ( bAllowMissingField ) + rMissingField = TRUE; + else + SetError( errIllegalParameter ); + break; + default: + PopError(); + SetError( errIllegalParameter ); } USHORT nDBCol1, nDBRow1, nDBTab1, nDBCol2, nDBRow2, nDBTab2; PopDoubleRef(nDBCol1, nDBRow1, nDBTab1, nDBCol2, nDBRow2, nDBTab2); + if ( nGlobalError == 0 && bRangeFake ) + { + // range parameter must match entire database range + if ( aMissingRange == ScRange( nDBCol1, nDBRow1, nDBTab1, nDBCol2, + nDBRow2, nDBTab2) ) + rMissingField = TRUE; + else + SetError( errIllegalParameter ); + } + if (nGlobalError == 0) { USHORT nField = nDBCol1; BOOL bFound = TRUE; - if (bByVal) - nField = Min(nDBCol2, (USHORT)(nDBCol1 + (USHORT)SolarMath::ApproxFloor(nVal) - 1)); + if ( rMissingField ) + ; // special case + else if ( bByVal ) + { + if ( nVal <= 0 || nVal > (nDBCol2 - nDBCol1 + 1) ) + bFound = FALSE; + else + nField = Min(nDBCol2, (USHORT)(nDBCol1 + (USHORT)nVal - 1)); + } else { bFound = FALSE; @@ -4303,6 +4353,12 @@ BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam) rParam.bDuplicate = TRUE; if (pDok->CreateQueryParam(nQCol1, nQRow1, nQCol2, nQRow2, nQTab1, rParam)) { + // An allowed missing field parameter sets the result field + // to any of the query fields, just to be able to return + // some cell from the iterator. + if ( rMissingField ) + nField = rParam.GetEntry(0).nField; + rParam.nCol1 = nField; rParam.nCol2 = nField; rTab = nDBTab1; @@ -4336,9 +4392,10 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc ) double nErg = 0.0; double fMem = 0.0; BOOL bNull = TRUE; - long nCount = 0; + ULONG nCount = 0; ScQueryParam aQueryParam; - if (GetDBParams(nTab1, aQueryParam)) + BOOL bMissingField = FALSE; + if ( GetDBParams( nTab1, aQueryParam, bMissingField) ) { double nVal; USHORT nErr; @@ -4381,8 +4438,8 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc ) switch( eFunc ) { case ifCOUNT: nErg = nCount; break; - case ifSUM: nErg = SolarMath::ApproxAdd( nErg, fMem ); break; - case ifAVERAGE: nErg = (nCount ? SolarMath::ApproxAdd( nErg, fMem ) / nCount : 0); break; + case ifSUM: nErg = ::rtl::math::approxAdd( nErg, fMem ); break; + case ifAVERAGE: nErg = ::rtl::math::approxAdd( nErg, fMem ) / nCount; break; } PushDouble( nErg ); } @@ -4396,7 +4453,49 @@ void ScInterpreter::ScDBSum() void ScInterpreter::ScDBCount() { - DBIterator( ifCOUNT ); + USHORT nTab; + ScQueryParam aQueryParam; + BOOL bMissingField = TRUE; + if ( GetDBParams( nTab, aQueryParam, bMissingField) ) + { + ULONG nCount = 0; + if ( bMissingField ) + { // count all matching records + // TODO: currently the QueryIterators only return cell pointers of + // existing cells, so if a query matches an empty cell there's + // nothing returned, and therefor not counted! + // Since this has ever been the case and this code here only came + // into existance to fix #i6899 and it never worked before we'll + // have to live with it until we reimplement the iterators to also + // return empty cells, which would mean to adapt all callers of + // iterators. + ScQueryCellIterator aCellIter( pDok, nTab, aQueryParam); + if ( aCellIter.GetFirst() ) + { + do + { + nCount++; + } while ( aCellIter.GetNext() ); + } + } + else + { // count only matching records with a value in the "result" field + double nVal; + USHORT nErr = 0; + ScQueryValueIterator aValIter( pDok, nTab, aQueryParam); + if ( aValIter.GetFirst( nVal, nErr) && !nErr ) + { + do + { + nCount++; + } while ( aValIter.GetNext( nVal, nErr) && !nErr ); + } + SetError( nErr ); + } + PushDouble( nCount ); + } + else + SetIllegalParameter(); } @@ -4404,7 +4503,8 @@ void ScInterpreter::ScDBCount2() { USHORT nTab; ScQueryParam aQueryParam; - if (GetDBParams(nTab, aQueryParam)) + BOOL bMissingField = FALSE; + if (GetDBParams( nTab, aQueryParam, bMissingField)) { ULONG nCount = 0; ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam); @@ -4453,7 +4553,8 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) double fSumSqr = 0.0; USHORT nTab; ScQueryParam aQueryParam; - if (GetDBParams(nTab, aQueryParam)) + BOOL bMissingField = FALSE; + if (GetDBParams( nTab, aQueryParam, bMissingField)) { double fVal; USHORT nErr; @@ -4472,7 +4573,7 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) } else SetIllegalParameter(); - rVal = SolarMath::ApproxSub( fSumSqr, fSum*fSum/rValCount ); + rVal = ::rtl::math::approxSub( fSumSqr, fSum*fSum/rValCount ); } @@ -4550,9 +4651,9 @@ void ScInterpreter::ScAdress() if (nParamCount == 4) sTabStr = GetString(); if (nParamCount >= 3) - nAbs = (USHORT) SolarMath::ApproxFloor(GetDouble()); - USHORT nCol = (USHORT) SolarMath::ApproxFloor(GetDouble()); - USHORT nRow = (USHORT) SolarMath::ApproxFloor(GetDouble()); + nAbs = (USHORT) ::rtl::math::approxFloor(GetDouble()); + USHORT nCol = (USHORT) ::rtl::math::approxFloor(GetDouble()); + USHORT nRow = (USHORT) ::rtl::math::approxFloor(GetDouble()); if (nCol < 1 || nCol > MAXCOL + 1 || nRow < 1 || nRow > MAXROW + 1) { SetIllegalParameter(); @@ -4594,11 +4695,11 @@ void ScInterpreter::ScOffset() { short nColNew, nRowNew, nColPlus, nRowPlus; if (nParamCount == 5) - nColNew = (short) SolarMath::ApproxFloor(GetDouble()); + nColNew = (short) ::rtl::math::approxFloor(GetDouble()); if (nParamCount >= 4) - nRowNew = (short) SolarMath::ApproxFloor(GetDouble()); - nColPlus = (short) SolarMath::ApproxFloor(GetDouble()); - nRowPlus = (short) SolarMath::ApproxFloor(GetDouble()); + nRowNew = (short) ::rtl::math::approxFloor(GetDouble()); + nColPlus = (short) ::rtl::math::approxFloor(GetDouble()); + nRowPlus = (short) ::rtl::math::approxFloor(GetDouble()); USHORT nCol1, nRow1, nTab1, nCol2, nRow2, nTab2; if ( (nParamCount == 5 && nColNew == 0) || (nParamCount >= 4 && nRowNew == 0) ) @@ -4664,15 +4765,15 @@ void ScInterpreter::ScIndex() short nBereich, nMaxAnz, nCount; USHORT nCol, nRow; if (nParamCount == 4) - nBereich = (short) SolarMath::ApproxFloor(GetDouble()); + nBereich = (short) ::rtl::math::approxFloor(GetDouble()); else nBereich = 1; if (nParamCount >= 3) - nCol = (USHORT) SolarMath::ApproxFloor(GetDouble()); + nCol = (USHORT) ::rtl::math::approxFloor(GetDouble()); else nCol = 0; if (nParamCount >= 2) - nRow = (USHORT) SolarMath::ApproxFloor(GetDouble()); + nRow = (USHORT) ::rtl::math::approxFloor(GetDouble()); else nRow = 0; if (GetStackType() == svByte) // vorher MultiSelektion? @@ -4875,7 +4976,7 @@ void ScInterpreter::ScCurrency() double fDec; if (nParamCount == 2) { - fDec = SolarMath::ApproxFloor(GetDouble()); + fDec = ::rtl::math::approxFloor(GetDouble()); if (fDec < -15.0 || fDec > 15.0) { SetIllegalArgument(); @@ -4961,7 +5062,7 @@ void ScInterpreter::ScFixed() bThousand = TRUE; if (nParamCount >= 2) { - fDec = SolarMath::ApproxFloor(GetDouble()); + fDec = ::rtl::math::approxFloor(GetDouble()); if (fDec < -15.0 || fDec > 15.0) { SetIllegalArgument(); @@ -5051,7 +5152,7 @@ void ScInterpreter::ScLeft() xub_StrLen n; if (nParamCount == 2) { - double nVal = SolarMath::ApproxFloor(GetDouble()); + double nVal = ::rtl::math::approxFloor(GetDouble()); if ( nVal < 0.0 || nVal > STRING_MAXLEN ) { SetIllegalParameter(); @@ -5077,7 +5178,7 @@ void ScInterpreter::ScRight() xub_StrLen n; if (nParamCount == 2) { - double nVal = SolarMath::ApproxFloor(GetDouble()); + double nVal = ::rtl::math::approxFloor(GetDouble()); if ( nVal < 0.0 || nVal > STRING_MAXLEN ) { SetIllegalParameter(); @@ -5104,7 +5205,7 @@ void ScInterpreter::ScSearch() { if (nParamCount == 3) { - fAnz = SolarMath::ApproxFloor(GetDouble()); + fAnz = ::rtl::math::approxFloor(GetDouble()); if (fAnz > double(STRING_MAXLEN)) { SetIllegalParameter(); @@ -5140,8 +5241,8 @@ void ScInterpreter::ScMid() { if ( MustHaveParamCount( GetByte(), 3 ) ) { - double fAnz = SolarMath::ApproxFloor(GetDouble()); - double fAnfang = SolarMath::ApproxFloor(GetDouble()); + double fAnz = ::rtl::math::approxFloor(GetDouble()); + double fAnfang = ::rtl::math::approxFloor(GetDouble()); const String& rStr = GetString(); if (fAnfang < 1.0 || fAnz < 0.0 || fAnfang > double(STRING_MAXLEN) || fAnz > double(STRING_MAXLEN)) SetIllegalParameter(); @@ -5184,7 +5285,7 @@ void ScInterpreter::ScSubstitute() xub_StrLen nAnz; if (nParamCount == 4) { - double fAnz = SolarMath::ApproxFloor(GetDouble()); + double fAnz = ::rtl::math::approxFloor(GetDouble()); if( fAnz < 1 || fAnz > STRING_MAXLEN ) { SetIllegalParameter(); @@ -5234,7 +5335,7 @@ void ScInterpreter::ScRept() { if ( MustHaveParamCount( GetByte(), 2 ) ) { - double fAnz = SolarMath::ApproxFloor(GetDouble()); + double fAnz = ::rtl::math::approxFloor(GetDouble()); String aStr( GetString() ); if ( fAnz < 0.0 ) SetIllegalParameter(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 554f46d3bb6e..70837df1da4f 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr2.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: er $ $Date: 2001-03-15 21:31:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,45 +152,45 @@ void ScInterpreter::ScGetActTime() void ScInterpreter::ScGetYear() { Date aDate = *(pFormatter->GetNullDate()); - aDate += (long) SolarMath::ApproxFloor(GetDouble()); + aDate += (long) ::rtl::math::approxFloor(GetDouble()); PushDouble( (double) aDate.GetYear() ); } void ScInterpreter::ScGetMonth() { Date aDate = *(pFormatter->GetNullDate()); - aDate += (long) SolarMath::ApproxFloor(GetDouble()); + aDate += (long) ::rtl::math::approxFloor(GetDouble()); PushDouble( (double) aDate.GetMonth() ); } void ScInterpreter::ScGetDay() { Date aDate = *(pFormatter->GetNullDate()); - aDate += (long)SolarMath::ApproxFloor(GetDouble()); + aDate += (long)::rtl::math::approxFloor(GetDouble()); PushDouble((double) aDate.GetDay()); } void ScInterpreter::ScGetMin() { double fTime = GetDouble(); - fTime -= SolarMath::ApproxFloor(fTime); // Datumsanteil weg - long nVal = (long)SolarMath::ApproxFloor(fTime*D_TIMEFACTOR+0.5) % 3600; + fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg + long nVal = (long)::rtl::math::approxFloor(fTime*D_TIMEFACTOR+0.5) % 3600; PushDouble( (double) (nVal/60) ); } void ScInterpreter::ScGetSec() { double fTime = GetDouble(); - fTime -= SolarMath::ApproxFloor(fTime); // Datumsanteil weg - long nVal = (long)SolarMath::ApproxFloor(fTime*D_TIMEFACTOR+0.5) % 60; + fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg + long nVal = (long)::rtl::math::approxFloor(fTime*D_TIMEFACTOR+0.5) % 60; PushDouble( (double) nVal ); } void ScInterpreter::ScGetHour() { double fTime = GetDouble(); - fTime -= SolarMath::ApproxFloor(fTime); // Datumsanteil weg - long nVal = (long)SolarMath::ApproxFloor(fTime*D_TIMEFACTOR+0.5) / 3600; + fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg + long nVal = (long)::rtl::math::approxFloor(fTime*D_TIMEFACTOR+0.5) / 3600; PushDouble((double) nVal); } @@ -218,12 +218,12 @@ void ScInterpreter::ScGetDayOfWeek() { short nFlag; if (nParamCount == 2) - nFlag = (short) SolarMath::ApproxFloor(GetDouble()); + nFlag = (short) ::rtl::math::approxFloor(GetDouble()); else nFlag = 1; Date aDate = *(pFormatter->GetNullDate()); - aDate += (long)SolarMath::ApproxFloor(GetDouble()); + aDate += (long)::rtl::math::approxFloor(GetDouble()); int nVal = (int) aDate.GetDayOfWeek(); if (nFlag == 1) { @@ -242,10 +242,10 @@ void ScInterpreter::ScGetWeekOfYear() { if ( MustHaveParamCount( GetByte(), 2 ) ) { - short nFlag = (short) SolarMath::ApproxFloor(GetDouble()); + short nFlag = (short) ::rtl::math::approxFloor(GetDouble()); Date aDate = *(pFormatter->GetNullDate()); - aDate += (long)SolarMath::ApproxFloor(GetDouble()); + aDate += (long)::rtl::math::approxFloor(GetDouble()); PushInt( (int) aDate.GetWeekOfYear( nFlag == 1 ? SUNDAY : MONDAY )); } } @@ -256,7 +256,7 @@ void ScInterpreter::ScEasterSunday() if ( MustHaveParamCount( GetByte(), 1 ) ) { INT16 nDay, nMonth, nYear; - nYear = (INT16) SolarMath::ApproxFloor( GetDouble() ); + nYear = (INT16) ::rtl::math::approxFloor( GetDouble() ); if ( nYear < 100 ) nYear = pFormatter->ExpandTwoDigitYear( nYear ); // don't worry, be happy :) @@ -285,9 +285,9 @@ void ScInterpreter::ScGetDate() nFuncFmtType = NUMBERFORMAT_DATE; if ( MustHaveParamCount( GetByte(), 3 ) ) { - INT16 nDay = (INT16) SolarMath::ApproxFloor(GetDouble()); - INT16 nMonth = (INT16) SolarMath::ApproxFloor(GetDouble()); - INT16 nYear = (INT16) SolarMath::ApproxFloor(GetDouble()); + INT16 nDay = (INT16) ::rtl::math::approxFloor(GetDouble()); + INT16 nMonth = (INT16) ::rtl::math::approxFloor(GetDouble()); + INT16 nYear = (INT16) ::rtl::math::approxFloor(GetDouble()); if (nYear < 0) SetIllegalParameter(); else @@ -344,9 +344,9 @@ void ScInterpreter::ScGetDiffDate360() else fSign = 1.0; Date aDate1 = *(pFormatter->GetNullDate()); - aDate1 += (long) SolarMath::ApproxFloor(nDate1); + aDate1 += (long) ::rtl::math::approxFloor(nDate1); Date aDate2 = *(pFormatter->GetNullDate()); - aDate2 += (long) SolarMath::ApproxFloor(nDate2); + aDate2 += (long) ::rtl::math::approxFloor(nDate2); if (aDate1.GetDay() == 31) aDate1 -= (ULONG) 1; else if (!bFlag) @@ -418,25 +418,25 @@ void ScInterpreter::ScAbs() void ScInterpreter::ScInt() { - PushDouble(SolarMath::ApproxFloor(GetDouble())); + PushDouble(::rtl::math::approxFloor(GetDouble())); } -void ScInterpreter::RoundNumber( SolarMathRoundingMode eMode ) +void ScInterpreter::RoundNumber( rtl_math_RoundingMode eMode ) { BYTE nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { double fVal = 0.0; if (nParamCount == 1) - fVal = SolarMath::Round( GetDouble(), 0, eMode ); + fVal = ::rtl::math::round( GetDouble(), 0, eMode ); else { - INT32 nDec = (INT32) SolarMath::ApproxFloor(GetDouble()); + INT32 nDec = (INT32) ::rtl::math::approxFloor(GetDouble()); if( nDec < -20 || nDec > 20 ) SetIllegalArgument(); else - fVal = SolarMath::Round( GetDouble(), (short)nDec, eMode ); + fVal = ::rtl::math::round( GetDouble(), (short)nDec, eMode ); } PushDouble(fVal); } @@ -444,17 +444,17 @@ void ScInterpreter::RoundNumber( SolarMathRoundingMode eMode ) void ScInterpreter::ScRound() { - RoundNumber( SolarMathRoundCorrected ); + RoundNumber( rtl_math_RoundingMode_Corrected ); } void ScInterpreter::ScRoundDown() { - RoundNumber( SolarMathRoundDown ); + RoundNumber( rtl_math_RoundingMode_Down ); } void ScInterpreter::ScRoundUp() { - RoundNumber( SolarMathRoundUp ); + RoundNumber( rtl_math_RoundingMode_Up ); } void ScInterpreter::ScCeil() @@ -472,9 +472,9 @@ void ScInterpreter::ScCeil() else { if ( !bAbs && fVal < 0.0 ) - PushDouble(SolarMath::ApproxFloor(fVal/fDec) * fDec); + PushDouble(::rtl::math::approxFloor(fVal/fDec) * fDec); else - PushDouble(SolarMath::ApproxCeil(fVal/fDec) * fDec); + PushDouble(::rtl::math::approxCeil(fVal/fDec) * fDec); } } } @@ -494,9 +494,9 @@ void ScInterpreter::ScFloor() else { if ( !bAbs && fVal < 0.0 ) - PushDouble(SolarMath::ApproxCeil(fVal/fDec) * fDec); + PushDouble(::rtl::math::approxCeil(fVal/fDec) * fDec); else - PushDouble(SolarMath::ApproxFloor(fVal/fDec) * fDec); + PushDouble(::rtl::math::approxFloor(fVal/fDec) * fDec); } } } @@ -505,9 +505,9 @@ void ScInterpreter::ScEven() { double fVal = GetDouble(); if (fVal < 0.0) - PushDouble(SolarMath::ApproxFloor(fVal/2.0) * 2.0); + PushDouble(::rtl::math::approxFloor(fVal/2.0) * 2.0); else - PushDouble(SolarMath::ApproxCeil(fVal/2.0) * 2.0); + PushDouble(::rtl::math::approxCeil(fVal/2.0) * 2.0); } void ScInterpreter::ScOdd() @@ -515,13 +515,13 @@ void ScInterpreter::ScOdd() double fVal = GetDouble(); if (fVal >= 0.0) { - fVal = SolarMath::ApproxCeil(fVal); + fVal = ::rtl::math::approxCeil(fVal); if (fmod(fVal, 2.0) == 0.0) fVal += 1.0; } else { - fVal = SolarMath::ApproxFloor(fVal); + fVal = ::rtl::math::approxFloor(fVal); if (fmod(fVal, 2.0) == 0.0) fVal -= 1.0; } @@ -886,7 +886,7 @@ void ScInterpreter::ScGDA2() if (nParamCount == 4) nMonate = 12.0; else - nMonate = SolarMath::ApproxFloor(GetDouble()); + nMonate = ::rtl::math::approxFloor(GetDouble()); double nPeriode = GetDouble(); double nDauer = GetDouble(); double nRest = GetDouble(); @@ -898,17 +898,17 @@ void ScInterpreter::ScGDA2() return; } double nAbRate = 1.0 - pow(nRest / nWert, 1.0 / nDauer); - nAbRate = SolarMath::ApproxFloor((nAbRate * 1000.0) + 0.5) / 1000.0; + nAbRate = ::rtl::math::approxFloor((nAbRate * 1000.0) + 0.5) / 1000.0; double nErsteAbRate = nWert * nAbRate * nMonate / 12.0; double nGda2; - if (SolarMath::ApproxFloor(nPeriode) == 1) + if (::rtl::math::approxFloor(nPeriode) == 1) nGda2 = nErsteAbRate; else { double nSummAbRate = nErsteAbRate; double nMin = nDauer; if (nMin > nPeriode) nMin = nPeriode; - USHORT iMax = (USHORT)SolarMath::ApproxFloor(nMin); + USHORT iMax = (USHORT)::rtl::math::approxFloor(nMin); for (USHORT i = 2; i <= iMax; i++) { nGda2 = (nWert - nSummAbRate) * nAbRate; @@ -925,7 +925,7 @@ double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer, double fDauer1,double fPeriode,double fFaktor) { double fVdb=0; - double fIntEnd = SolarMath::ApproxCeil(fPeriode); + double fIntEnd = ::rtl::math::approxCeil(fPeriode); ULONG nLoopEnd = (ULONG) fIntEnd; double fTerm, fLia; @@ -1002,8 +1002,8 @@ void ScInterpreter::ScVDB() SetIllegalParameter(); else { - double fIntStart = SolarMath::ApproxFloor(fAnfang); - double fIntEnd = SolarMath::ApproxCeil(fEnde); + double fIntStart = ::rtl::math::approxFloor(fAnfang); + double fIntEnd = ::rtl::math::approxCeil(fEnde); ULONG nLoopStart = (ULONG) fIntStart; ULONG nLoopEnd = (ULONG) fIntEnd; @@ -1030,11 +1030,11 @@ void ScInterpreter::ScVDB() double fPart; //@Die Frage aller Fragen: "Ist das hier richtig" - if(!SolarMath::ApproxEqual(fAnfang,SolarMath::ApproxFloor(fAnfang))) + if(!::rtl::math::approxEqual(fAnfang,::rtl::math::approxFloor(fAnfang))) { if(fFaktor>1) { - if(fAnfang>fDauer/2 || SolarMath::ApproxEqual(fAnfang,fDauer/2)) + if(fAnfang>fDauer/2 || ::rtl::math::approxEqual(fAnfang,fDauer/2)) { fPart=fAnfang-fDauer/2; fAnfang=fDauer/2; @@ -1318,8 +1318,8 @@ void ScInterpreter::ScKumZinsZ() { double fZins, fZzr, fBw, fAnfang, fEnde, fF, fRmz, fZinsZ; fF = GetDouble(); - fEnde = SolarMath::ApproxFloor(GetDouble()); - fAnfang = SolarMath::ApproxFloor(GetDouble()); + fEnde = ::rtl::math::approxFloor(GetDouble()); + fAnfang = ::rtl::math::approxFloor(GetDouble()); fBw = GetDouble(); fZzr = GetDouble(); fZins = GetDouble(); @@ -1358,8 +1358,8 @@ void ScInterpreter::ScKumKapZ() { double fZins, fZzr, fBw, fAnfang, fEnde, fF, fRmz, fKapZ; fF = GetDouble(); - fEnde = SolarMath::ApproxFloor(GetDouble()); - fAnfang = SolarMath::ApproxFloor(GetDouble()); + fEnde = ::rtl::math::approxFloor(GetDouble()); + fAnfang = ::rtl::math::approxFloor(GetDouble()); fBw = GetDouble(); fZzr = GetDouble(); fZins = GetDouble(); @@ -1403,7 +1403,7 @@ void ScInterpreter::ScEffektiv() SetIllegalParameter(); else { - fPerioden = SolarMath::ApproxFloor(fPerioden); + fPerioden = ::rtl::math::approxFloor(fPerioden); PushDouble(pow(1.0 + fNominal/fPerioden, fPerioden) - 1.0); } } @@ -1420,7 +1420,7 @@ void ScInterpreter::ScNominal() SetIllegalParameter(); else { - fPerioden = SolarMath::ApproxFloor(fPerioden); + fPerioden = ::rtl::math::approxFloor(fPerioden); PushDouble( (pow(fEffektiv + 1.0, 1.0 / fPerioden) - 1.0) * fPerioden ); } } @@ -1432,7 +1432,7 @@ void ScInterpreter::ScMod() { double nVal2 = GetDouble(); double nVal1 = GetDouble(); - PushDouble(nVal1 - (SolarMath::ApproxFloor(nVal1 / nVal2) * nVal2)); + PushDouble(nVal1 - (::rtl::math::approxFloor(nVal1 / nVal2) * nVal2)); } } @@ -1534,7 +1534,7 @@ void ScInterpreter::ScBackSolver() xn = xn - (fn / fs); } } - double nX = SolarMath::ApproxFloor((nBestX / nDelta) + 0.5) * nDelta; + double nX = ::rtl::math::approxFloor((nBestX / nDelta) + 0.5) * nDelta; if ( bRet ) { pValue->SetValue( nX ); @@ -1761,7 +1761,7 @@ void ScInterpreter::ScDde() { BYTE nMode = SC_DDE_DEFAULT; if (nParamCount == 4) - nMode = (BYTE) SolarMath::ApproxFloor(GetDouble()); + nMode = (BYTE) ::rtl::math::approxFloor(GetDouble()); String aItem = GetString(); String aTopic = GetString(); String aAppl = GetString(); @@ -1867,7 +1867,7 @@ void ScInterpreter::ScBase() xub_StrLen nMinLen; if ( nParamCount == 3 ) { - double fLen = SolarMath::ApproxFloor( GetDouble() ); + double fLen = ::rtl::math::approxFloor( GetDouble() ); if ( 1.0 <= fLen && fLen < STRING_MAXLEN ) nMinLen = (xub_StrLen) fLen; else if ( fLen == 0.0 ) @@ -1877,8 +1877,8 @@ void ScInterpreter::ScBase() } else nMinLen = 1; - double fBase = SolarMath::ApproxFloor( GetDouble() ); - double fVal = SolarMath::ApproxFloor( GetDouble() ); + double fBase = ::rtl::math::approxFloor( GetDouble() ); + double fVal = ::rtl::math::approxFloor( GetDouble() ); double fChars = ((fVal > 0.0 && fBase > 0.0) ? (ceil( log( fVal ) / log( fBase ) ) + 2.0) : 2.0); @@ -1914,21 +1914,21 @@ void ScInterpreter::ScBase() while ( fVal && p > pBuf ) { //! mit fmod Rundungsfehler ab 2**48 -// double fDig = SolarMath::ApproxFloor( fmod( fVal, fBase ) ); +// double fDig = ::rtl::math::approxFloor( fmod( fVal, fBase ) ); // so ist es etwas besser - double fInt = SolarMath::ApproxFloor( fVal / fBase ); + double fInt = ::rtl::math::approxFloor( fVal / fBase ); double fMult = fInt * fBase; #ifdef DEBUG // #53943# =BASIS(1e308;36) => GPF mit - // nDig = (size_t) SolarMath::ApproxFloor( fVal - fMult ); + // nDig = (size_t) ::rtl::math::approxFloor( fVal - fMult ); // trotz vorheriger Pruefung ob fVal >= fMult double fDebug1 = fVal - fMult; // fVal := 7,5975311883090e+290 // fMult := 7,5975311883090e+290 // fDebug1 := 1,3848924157003e+275 <- RoundOff-Error - // fVal != fMult, aber: SolarMath::ApproxEqual( fVal, fMult ) == TRUE - double fDebug2 = SolarMath::ApproxSub( fVal, fMult ); - // und SolarMath::ApproxSub( fVal, fMult ) == 0 + // fVal != fMult, aber: ::rtl::math::approxEqual( fVal, fMult ) == TRUE + double fDebug2 = ::rtl::math::approxSub( fVal, fMult ); + // und ::rtl::math::approxSub( fVal, fMult ) == 0 double fDebug3 = ( fInt ? fVal / fInt : 0.0 ); // Nach dem strange fDebug1 und fVal < fMult ist eigentlich // fDebug2 == fBase, trotzdem wird das mit einem Vergleich @@ -1942,7 +1942,7 @@ void ScInterpreter::ScBase() } else { - double fDig = SolarMath::ApproxFloor( SolarMath::ApproxSub( fVal, fMult ) ); + double fDig = ::rtl::math::approxFloor( ::rtl::math::approxSub( fVal, fMult ) ); if ( bDirt ) { bDirt = FALSE; @@ -1983,7 +1983,7 @@ void ScInterpreter::ScDecimal() { // Text, Base if ( MustHaveParamCount( GetByte(), 2 ) ) { - double fBase = SolarMath::ApproxFloor( GetDouble() ); + double fBase = ::rtl::math::approxFloor( GetDouble() ); String aStr( GetString() ); if ( !nGlobalError && 2 <= fBase && fBase <= 36 ) { @@ -2064,8 +2064,8 @@ void ScInterpreter::ScRoman() BYTE nParamCount = GetByte(); if( MustHaveParamCount( nParamCount, 1, 2 ) ) { - double fMode = (nParamCount == 2) ? SolarMath::ApproxFloor( GetDouble() ) : 0.0; - double fVal = SolarMath::ApproxFloor( GetDouble() ); + double fMode = (nParamCount == 2) ? ::rtl::math::approxFloor( GetDouble() ) : 0.0; + double fVal = ::rtl::math::approxFloor( GetDouble() ); if( nGlobalError ) SetIllegalParameter(); else if( (fMode >= 0.0) && (fMode < 5.0) && (fVal >= 0.0) && (fVal < 4000.0) ) diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 1ef06c51a018..246b84921e07 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr3.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: er $ $Date: 2001-09-06 13:36:03 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -240,7 +240,7 @@ double ScInterpreter::gauss(double x) double asympt[] = { -1.0, 1.0, -3.0, 15.0, -105.0 }; double xAbs = fabs(x); - USHORT xShort = (USHORT)SolarMath::ApproxFloor(xAbs); + USHORT xShort = (USHORT)::rtl::math::approxFloor(xAbs); double nVal = 0.0; if (xShort == 0) nVal = taylor(t0, 11, (xAbs * xAbs)) * xAbs; @@ -285,7 +285,7 @@ double ScInterpreter::gaussinv(double x) double ScInterpreter::Fakultaet(double x) { - x = SolarMath::ApproxFloor(x); + x = ::rtl::math::approxFloor(x); if (x < 0.0) return 0.0; else if (x == 0.0) @@ -311,7 +311,7 @@ double ScInterpreter::Fakultaet(double x) double ScInterpreter::BinomKoeff(double n, double k) { double nVal = 0.0; - k = SolarMath::ApproxFloor(k); + k = ::rtl::math::approxFloor(k); if (n < k) nVal = 0.0; else if (k == 0.0) @@ -377,7 +377,7 @@ double ScInterpreter::GetGamma(double x) double G = GammaHelp(x, bReflect); G = pow(x+5.5,x+0.5)*G/exp(x+5.5); if (bReflect) - G = F_PI*x/(G*SolarMath::Sin(F_PI*x)); + G = F_PI*x/(G*::rtl::math::sin(F_PI*x)); return G; } @@ -387,7 +387,7 @@ double ScInterpreter::GetLogGamma(double x) double G = GammaHelp(x, bReflect); G = (x+0.5)*log(x+5.5)+log(G)-(x+5.5); if (bReflect) - G = log(F_PI*x)-G-log(SolarMath::Sin(F_PI*x)); + G = log(F_PI*x)-G-log(::rtl::math::sin(F_PI*x)); return G; } @@ -615,8 +615,8 @@ void ScInterpreter::ScKombin() { if ( MustHaveParamCount( GetByte(), 2 ) ) { - double k = SolarMath::ApproxFloor(GetDouble()); - double n = SolarMath::ApproxFloor(GetDouble()); + double k = ::rtl::math::approxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); if (k < 0.0 || n < 0.0 || k > n) SetIllegalArgument(); else @@ -628,8 +628,8 @@ void ScInterpreter::ScKombin2() { if ( MustHaveParamCount( GetByte(), 2 ) ) { - double k = SolarMath::ApproxFloor(GetDouble()); - double n = SolarMath::ApproxFloor(GetDouble()); + double k = ::rtl::math::approxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); if (k < 0.0 || n < 0.0 || k > n) SetIllegalArgument(); else @@ -641,8 +641,8 @@ void ScInterpreter::ScVariationen() { if ( MustHaveParamCount( GetByte(), 2 ) ) { - double k = SolarMath::ApproxFloor(GetDouble()); - double n = SolarMath::ApproxFloor(GetDouble()); + double k = ::rtl::math::approxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); if (n < 0.0 || k < 0.0 || k > n) SetIllegalArgument(); else if (k == 0.0) @@ -661,8 +661,8 @@ void ScInterpreter::ScVariationen2() { if ( MustHaveParamCount( GetByte(), 2 ) ) { - double k = SolarMath::ApproxFloor(GetDouble()); - double n = SolarMath::ApproxFloor(GetDouble()); + double k = ::rtl::math::approxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); if (n < 0.0 || k < 0.0 || k > n) SetIllegalArgument(); else @@ -677,9 +677,9 @@ void ScInterpreter::ScB() return ; if (nParamCount == 3) { - double x = SolarMath::ApproxFloor(GetDouble()); + double x = ::rtl::math::approxFloor(GetDouble()); double p = GetDouble(); - double n = SolarMath::ApproxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); if (n < 0.0 || x < 0.0 || x > n || p < 0.0 || p > 1.0) SetIllegalArgument(); else @@ -797,8 +797,8 @@ void ScInterpreter::ScBinomDist() { double kum = GetDouble(); // 0 oder 1 double p = GetDouble(); // p - double n = SolarMath::ApproxFloor(GetDouble()); // n - double x = SolarMath::ApproxFloor(GetDouble()); // x + double n = ::rtl::math::approxFloor(GetDouble()); // n + double x = ::rtl::math::approxFloor(GetDouble()); // x double fFactor, q, fSum; if (n < 0.0 || x < 0.0 || x > n || p < 0.0 || p > 1.0) SetIllegalArgument(); @@ -877,7 +877,7 @@ void ScInterpreter::ScCritBinom() { double alpha = GetDouble(); // alpha double p = GetDouble(); // p - double n = SolarMath::ApproxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); if (n < 0.0 || alpha <= 0.0 || alpha >= 1.0 || p < 0.0 || p > 1.0) SetIllegalArgument(); else @@ -1000,8 +1000,8 @@ void ScInterpreter::ScTDist() { if ( !MustHaveParamCount( GetByte(), 3 ) ) return; - double fFlag = SolarMath::ApproxFloor(GetDouble()); - double fDF = SolarMath::ApproxFloor(GetDouble()); + double fFlag = ::rtl::math::approxFloor(GetDouble()); + double fDF = ::rtl::math::approxFloor(GetDouble()); double T = GetDouble(); if (fDF < 1.0 || T < 0.0 || (fFlag != 1.0 && fFlag != 2.0) ) { @@ -1019,8 +1019,8 @@ void ScInterpreter::ScFDist() { if ( !MustHaveParamCount( GetByte(), 3 ) ) return; - double fF2 = SolarMath::ApproxFloor(GetDouble()); - double fF1 = SolarMath::ApproxFloor(GetDouble()); + double fF2 = ::rtl::math::approxFloor(GetDouble()); + double fF1 = ::rtl::math::approxFloor(GetDouble()); double fF = GetDouble(); if (fF < 0.0 || fF1 < 1.0 || fF2 < 1.0 || fF1 >= 1.0E10 || fF2 >= 1.0E10) { @@ -1034,7 +1034,7 @@ void ScInterpreter::ScChiDist() { if ( !MustHaveParamCount( GetByte(), 2 ) ) return; - double fDF = SolarMath::ApproxFloor(GetDouble()); + double fDF = ::rtl::math::approxFloor(GetDouble()); double fChi = GetDouble(); if (fDF < 1.0 || fDF >= 1.0E5 || fChi < 0.0 ) { @@ -1068,7 +1068,7 @@ void ScInterpreter::ScPoissonDist() { double kum = GetDouble(); // 0 oder 1 double lambda = GetDouble(); // Mittelwert - double x = SolarMath::ApproxFloor(GetDouble()); // x + double x = ::rtl::math::approxFloor(GetDouble()); // x if (lambda < 0.0 || x < 0.0) SetIllegalArgument(); else if (kum == 0.0) // Dichte @@ -1103,10 +1103,10 @@ void ScInterpreter::ScHypGeomDist() { if ( MustHaveParamCount( GetByte(), 4 ) ) { - double N = SolarMath::ApproxFloor(GetDouble()); - double M = SolarMath::ApproxFloor(GetDouble()); - double n = SolarMath::ApproxFloor(GetDouble()); - double x = SolarMath::ApproxFloor(GetDouble()); + double N = ::rtl::math::approxFloor(GetDouble()); + double M = ::rtl::math::approxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); + double x = ::rtl::math::approxFloor(GetDouble()); if( (x < 0.0) || (n < x) || (M < x) || (N < n) || (N < M) || (x < n - N + M) ) { @@ -1311,7 +1311,7 @@ void ScInterpreter::ScTInv() { if ( !MustHaveParamCount( GetByte(), 2 ) ) return; - double fDF = SolarMath::ApproxFloor(GetDouble()); + double fDF = ::rtl::math::approxFloor(GetDouble()); double fP = GetDouble(); if (fDF < 1.0 || fDF >= 1.0E5 || fP <= 0.0 || fP > 1.0 ) { @@ -1343,8 +1343,8 @@ void ScInterpreter::ScFInv() { if ( !MustHaveParamCount( GetByte(), 3 ) ) return; - double fF2 = SolarMath::ApproxFloor(GetDouble()); - double fF1 = SolarMath::ApproxFloor(GetDouble()); + double fF2 = ::rtl::math::approxFloor(GetDouble()); + double fF1 = ::rtl::math::approxFloor(GetDouble()); double fP = GetDouble(); if (fP <= 0.0 || fF1 < 1.0 || fF2 < 1.0 || fF1 >= 1.0E10 || fF2 >= 1.0E10 || fP > 1.0) { @@ -1376,7 +1376,7 @@ void ScInterpreter::ScChiInv() { if ( !MustHaveParamCount( GetByte(), 2 ) ) return; - double fDF = SolarMath::ApproxFloor(GetDouble()); + double fDF = ::rtl::math::approxFloor(GetDouble()); double fP = GetDouble(); if (fDF < 1.0 || fDF >= 1.0E5 || fP <= 0.0 || fP > 1.0 ) { @@ -1398,7 +1398,7 @@ void ScInterpreter::ScConfidence() { if ( MustHaveParamCount( GetByte(), 3 ) ) { - double n = SolarMath::ApproxFloor(GetDouble()); + double n = ::rtl::math::approxFloor(GetDouble()); double sigma = GetDouble(); double alpha = GetDouble(); if (sigma <= 0.0 || alpha <= 0.0 || alpha >= 1.0 || n < 1.0) @@ -1522,8 +1522,8 @@ void ScInterpreter::ScTTest() { if ( !MustHaveParamCount( GetByte(), 4 ) ) return; - double fTyp = SolarMath::ApproxFloor(GetDouble()); - double fAnz = SolarMath::ApproxFloor(GetDouble()); + double fTyp = ::rtl::math::approxFloor(GetDouble()); + double fAnz = ::rtl::math::approxFloor(GetDouble()); if (fAnz != 1.0 && fAnz != 2.0) { SetIllegalArgument(); @@ -1678,8 +1678,8 @@ void ScInterpreter::ScTTest() } fT = fabs(fSum1/fCount1 - fSum2/fCount2)/sqrt(fS1+fS2); double c = fS1/(fS1+fS2); -// s.u. fF = SolarMath::ApproxFloor(1.0/(c*c/(fCount1-1.0)+(1.0-c)*(1.0-c)/(fCount2-1.0))); -// fF = SolarMath::ApproxFloor((fS1+fS2)*(fS1+fS2)/(fS1*fS1/(fCount1-1.0) + fS2*fS2/(fCount2-1.0))); +// s.u. fF = ::rtl::math::approxFloor(1.0/(c*c/(fCount1-1.0)+(1.0-c)*(1.0-c)/(fCount2-1.0))); +// fF = ::rtl::math::approxFloor((fS1+fS2)*(fS1+fS2)/(fS1*fS1/(fCount1-1.0) + fS2*fS2/(fCount2-1.0))); // GetTDist wird mit GetBetaDist berechnet und kommt auch mit nicht ganzzahligen // Freiheitsgraden klar. Dann stimmt das Ergebnis auch mit Excel ueberein (#52406#): @@ -2469,8 +2469,8 @@ void ScInterpreter::ScPercentile() PushDouble(pSArray[0]); else { - ULONG nIndex = (ULONG)SolarMath::ApproxFloor(alpha*(nSize-1)); - double fDiff = alpha*(nSize-1) - SolarMath::ApproxFloor(alpha*(nSize-1)); + ULONG nIndex = (ULONG)::rtl::math::approxFloor(alpha*(nSize-1)); + double fDiff = alpha*(nSize-1) - ::rtl::math::approxFloor(alpha*(nSize-1)); DBG_ASSERT(nIndex >= 0 && nIndex < nSize, "ScPercentile: falscher Index (1)"); if (fDiff == 0.0) PushDouble(pSArray[nIndex]); @@ -2496,7 +2496,7 @@ void ScInterpreter::ScQuartile() { if ( !MustHaveParamCount( GetByte(), 2 ) ) return; - double fFlag = SolarMath::ApproxFloor(GetDouble()); + double fFlag = ::rtl::math::approxFloor(GetDouble()); if (fFlag < 0.0 || fFlag > 4.0) { SetIllegalArgument(); @@ -2522,8 +2522,8 @@ void ScInterpreter::ScQuartile() PushDouble(pSArray[0]); else if (fFlag == 1.0) { - ULONG nIndex = (ULONG)SolarMath::ApproxFloor(0.25*(nSize-1)); - double fDiff = 0.25*(nSize-1) - SolarMath::ApproxFloor(0.25*(nSize-1)); + ULONG nIndex = (ULONG)::rtl::math::approxFloor(0.25*(nSize-1)); + double fDiff = 0.25*(nSize-1) - ::rtl::math::approxFloor(0.25*(nSize-1)); DBG_ASSERT(nIndex >= 0 && nIndex < nSize, "ScQuartile: falscher Index (1)"); if (fDiff == 0.0) PushDouble(pSArray[nIndex]); @@ -2543,8 +2543,8 @@ void ScInterpreter::ScQuartile() } else if (fFlag == 3.0) { - ULONG nIndex = (ULONG)SolarMath::ApproxFloor(0.75*(nSize-1)); - double fDiff = 0.75*(nSize-1) - SolarMath::ApproxFloor(0.75*(nSize-1)); + ULONG nIndex = (ULONG)::rtl::math::approxFloor(0.75*(nSize-1)); + double fDiff = 0.75*(nSize-1) - ::rtl::math::approxFloor(0.75*(nSize-1)); DBG_ASSERT(nIndex >= 0 && nIndex < nSize, "ScQuartile: falscher Index (3)"); if (fDiff == 0.0) PushDouble(pSArray[nIndex]); @@ -2631,7 +2631,7 @@ void ScInterpreter::ScLarge() return; double* pSortArray = NULL; ULONG nSize = 0; - ULONG k = (ULONG) SolarMath::ApproxFloor(GetDouble()); + ULONG k = (ULONG) ::rtl::math::approxFloor(GetDouble()); if (k <= 0) { SetIllegalArgument(); @@ -2681,7 +2681,7 @@ void ScInterpreter::ScSmall() return; double* pSortArray = NULL; ULONG nSize = 0; - ULONG k = (ULONG) SolarMath::ApproxFloor(GetDouble()); + ULONG k = (ULONG) ::rtl::math::approxFloor(GetDouble()); if (k <= 0) { SetIllegalArgument(); @@ -2734,7 +2734,7 @@ void ScInterpreter::ScPercentrank() double fPrec; if (nParamCount == 3) { - fPrec = SolarMath::ApproxFloor(GetDouble()); + fPrec = ::rtl::math::approxFloor(GetDouble()); if (fPrec < 1.0) { SetIllegalArgument(); @@ -2833,7 +2833,7 @@ void ScInterpreter::ScTrimMean() #else double* pSArray = pSortArray; #endif - ULONG nIndex = (ULONG) SolarMath::ApproxFloor(alpha*(double)nSize); + ULONG nIndex = (ULONG) ::rtl::math::approxFloor(alpha*(double)nSize); if (nIndex % 2 != 0) nIndex--; nIndex /= 2; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 540f0b25fb21..c816bf9c100c 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr4.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: er $ $Date: 2002-12-06 17:25:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,7 +124,6 @@ using namespace com::sun::star; #include "scmatrix.hxx" #include "adiasync.hxx" #include "sc.hrc" -#include "scdll.hxx" // ScLibSignalFunc #include "cellsuno.hxx" #include "optuno.hxx" #include "rangeseq.hxx" @@ -140,105 +139,10 @@ extern BOOL bOderSo; // in GLOBAL.CXX USHORT ScInterpreter::nGlobalError = 0; // fuer matherr -#if SOMA_FPSIGNAL_JUMP -jmp_buf* ScInterpreter::pJumpBuf = NULL; // fuer die mySignal-Funktion -ScLibSignalFunc ScInterpreter::pSignalFunc = NULL; // signal() Wrapper der App -#endif - -TabOpList ScInterpreter::aTableOpList; #if SC_SPEW_ENABLED ScSpew ScInterpreter::theSpew; #endif -//------------------------------------------------------- - -#if SOMA_FPSIGNAL_JUMP - -#if ( defined (MSC) && defined (WIN) && ! ( defined (WNT) ) ) -extern "C" int _matherr(struct _exception *except); -#elif defined (OS2) && !defined( WTC ) -extern "C" int _matherr(struct exception *except); -#elif defined (OS2) && defined( WTC ) -extern "C" double _matherr(struct exception *except); -#elif defined (LINUX) -extern "C" int matherr(struct __exception *except); -#elif defined (UNX) && !defined (LINUX) -extern "C" int matherr(struct exception *except); -#endif - -#ifndef _UNDERFLOW -#define _UNDERFLOW UNDERFLOW -#endif - -#if ( defined (MSC) && defined (WIN) && ! ( defined (WNT) ) ) - - -int _matherr(struct _exception *except) -{ - if( except->type == _UNDERFLOW ) - except->retval = 0.0; - else - { - ScInterpreter::SetError(errIllegalFPOperation); - except->retval = 1.0; - } - return 1; -}; - -#elif defined (OS2) - - -#ifndef WTC -int _matherr(struct exception *except) -#else -double _matherr(struct exception *except) -#endif -{ - if( except->type == UNDERFLOW ) - except->retval = 0.0; - else - { - ScInterpreter::SetError(errIllegalFPOperation); - except->retval = 1.0; - } - return 1; -}; -#elif ( defined UNX && !defined LINUX ) - - -int matherr(struct exception *except) -{ - if( except->type == UNDERFLOW ) - except->retval = 0.0; - else - { - ScInterpreter::SetError(errIllegalFPOperation); - except->retval = 1.0; - } - return 1; -}; -#endif - -#endif - - -void ScInterpreter::MySigFunc(int sig) -{ -#if SOMA_FPSIGNAL_JUMP - SOMA_FPRESET(); // reinitialize math package - longjmp(*ScInterpreter::pJumpBuf,1); -#endif -} - -/* inline: - -void ScInterpreter::SetError(USHORT nError) -{ - if( nError && !nGlobalError ) - nGlobalError = nError; -} -*/ - //------------------------------------------------------------------------- // Funktionen für den Zugriff auf das Document //------------------------------------------------------------------------- @@ -246,50 +150,47 @@ void ScInterpreter::SetError(USHORT nError) void ScInterpreter::ReplaceCell( ScAddress& rPos ) { - USHORT nCol, nRow, nTab; - nCol = rPos.Col(); - nRow = rPos.Row(); - nTab = rPos.Tab(); - USHORT* pTOp = aTableOpList.First(); + ScInterpreterTableOpParams* pTOp = pDok->aTableOpList.First(); while (pTOp) { - if (nCol == pTOp[0] && nRow == pTOp[1] && nTab == pTOp[2]) + if ( rPos == pTOp->aOld1 ) { - rPos.Set( pTOp[3], pTOp[4], pTOp[5] ); + rPos = pTOp->aNew1; return ; } - else if (nCol == pTOp[6] && nRow == pTOp[7] && nTab == pTOp[8]) + else if ( rPos == pTOp->aOld2 ) { - rPos.Set( pTOp[9], pTOp[10], pTOp[11] ); + rPos = pTOp->aNew2; return ; } else - pTOp = aTableOpList.Next(); + pTOp = pDok->aTableOpList.Next(); } } void ScInterpreter::ReplaceCell( USHORT& rCol, USHORT& rRow, USHORT& rTab ) { - USHORT* pTOp = aTableOpList.First(); + ScAddress aPos( rCol, rRow, rTab ); + ScInterpreterTableOpParams* pTOp = pDok->aTableOpList.First(); while (pTOp) { - if (rCol == pTOp[0] && rRow == pTOp[1] && rTab == pTOp[2]) + if ( aPos == pTOp->aOld1 ) { - rCol = pTOp[3]; - rRow = pTOp[4]; - rTab = pTOp[5]; + rCol = pTOp->aNew1.Col(); + rRow = pTOp->aNew1.Row(); + rTab = pTOp->aNew1.Tab(); return ; } - else if (rCol == pTOp[6] && rRow == pTOp[7] && rTab == pTOp[8]) + else if ( aPos == pTOp->aOld2 ) { - rCol = pTOp[9]; - rRow = pTOp[10]; - rTab = pTOp[11]; + rCol = pTOp->aNew2.Col(); + rRow = pTOp->aNew2.Row(); + rTab = pTOp->aNew2.Tab(); return ; } else - pTOp = aTableOpList.Next(); + pTOp = pDok->aTableOpList.Next(); } } @@ -300,16 +201,14 @@ BOOL ScInterpreter::IsTableOpInRange( const ScRange& rRange ) return FALSE; // not considered to be a range in TableOp sense // we can't replace a single cell in a range - USHORT* pTOp = aTableOpList.First(); + ScInterpreterTableOpParams* pTOp = pDok->aTableOpList.First(); while (pTOp) { - ScAddress aAdr( pTOp[0], pTOp[1], pTOp[2] ); - if ( rRange.In( aAdr ) ) + if ( rRange.In( pTOp->aOld1 ) ) return TRUE; - aAdr.Set( pTOp[6], pTOp[7], pTOp[8] ); - if ( rRange.In( aAdr ) ) + if ( rRange.In( pTOp->aOld2 ) ) return TRUE; - pTOp = aTableOpList.Next(); + pTOp = pDok->aTableOpList.Next(); } return FALSE; } @@ -954,7 +853,7 @@ void ScInterpreter::PopSingleRef(USHORT& rCol, USHORT &rRow, USHORT& rTab) SetError( errNoRef ), rRow = 0; if( rTab < 0 || rTab >= pDok->GetTableCount() || rRef.IsTabDeleted() ) SetError( errNoRef ), rTab = 0; - if ( aTableOpList.Count() > 0 ) + if ( pDok->aTableOpList.Count() > 0 ) ReplaceCell( rCol, rRow, rTab ); return; } @@ -996,7 +895,7 @@ void ScInterpreter::PopSingleRef( ScAddress& rAdr ) if( nTab < 0 || nTab >= pDok->GetTableCount() || rRef.IsTabDeleted() ) SetError( errNoRef ), nTab = 0; rAdr.Set( (USHORT)nCol, (USHORT)nRow, (USHORT)nTab ); - if ( aTableOpList.Count() > 0 ) + if ( pDok->aTableOpList.Count() > 0 ) ReplaceCell( rAdr ); return; } @@ -1063,7 +962,7 @@ void ScInterpreter::PopDoubleRef(USHORT& rCol1, USHORT &rRow1, USHORT& rTab1, if( rTab2 < 0 || rTab2 >= nMaxTab || rRef.IsTabDeleted() ) SetError( errNoRef ), rTab2 = 0; } - if ( aTableOpList.Count() > 0 && !bDontCheckForTableOp ) + if ( pDok->aTableOpList.Count() > 0 && !bDontCheckForTableOp ) { ScRange aRange( rCol1, rRow1, rTab1, rCol2, rRow2, rTab2 ); if ( IsTableOpInRange( aRange ) ) @@ -1135,7 +1034,7 @@ void ScInterpreter::PopDoubleRef( ScRange& rRange, BOOL bDontCheckForTableOp ) SetError( errNoRef ), nTab = 0; rRange.aEnd.Set( (USHORT)nCol, (USHORT)nRow, (USHORT)nTab ); } - if ( aTableOpList.Count() > 0 && !bDontCheckForTableOp ) + if ( pDok->aTableOpList.Count() > 0 && !bDontCheckForTableOp ) { if ( IsTableOpInRange( rRange ) ) SetError( errIllegalParameter ); @@ -1214,16 +1113,14 @@ ScMatrix* ScInterpreter::PopMatrix() void ScInterpreter::PushDouble(double nVal) { -#if !SOMA_FPSIGNAL_JUMP - if (!SOMA_FINITE(nVal)) + if (!::rtl::math::isFinite(nVal)) { - if ( SolarMath::IsNAN( nVal ) ) + if ( ::rtl::math::isNan( nVal ) ) SetError(errNoValue); else SetError(errIllegalFPOperation); nVal = 0.0; } -#endif PushTempToken( new ScDoubleToken( nVal ) ); } @@ -1518,7 +1415,8 @@ void ScInterpreter::ScDBGet() { USHORT nTab; ScQueryParam aQueryParam; - if (GetDBParams(nTab, aQueryParam)) + BOOL bMissingField = FALSE; + if (GetDBParams( nTab, aQueryParam, bMissingField)) { ScBaseCell* pCell; ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam); @@ -1816,8 +1714,8 @@ void ScInterpreter::ScExternal() case SC_ADDINARG_INTEGER: { double fVal = GetDouble(); - double fInt = (fVal >= 0.0) ? SolarMath::ApproxFloor( fVal ) : - SolarMath::ApproxCeil( fVal ); + double fInt = (fVal >= 0.0) ? ::rtl::math::approxFloor( fVal ) : + ::rtl::math::approxCeil( fVal ); if ( fInt >= LONG_MIN && fInt <= LONG_MAX ) aParam <<= (INT32)fInt; else @@ -1841,8 +1739,8 @@ void ScInterpreter::ScExternal() case svSingleRef: { double fVal = GetDouble(); - double fInt = (fVal >= 0.0) ? SolarMath::ApproxFloor( fVal ) : - SolarMath::ApproxCeil( fVal ); + double fInt = (fVal >= 0.0) ? ::rtl::math::approxFloor( fVal ) : + ::rtl::math::approxCeil( fVal ); if ( fInt >= LONG_MIN && fInt <= LONG_MAX ) { INT32 nIntVal = (long)fInt; @@ -2429,64 +2327,72 @@ void ScInterpreter::ScTableOp() SetIllegalParameter(); return; } - ScAddress aFAdr; - USHORT nOCol1, nORow1, nOTab1, nNCol1, nNRow1, nNTab1; - USHORT nOCol2, nORow2, nOTab2, nNCol2, nNRow2, nNTab2; - ScRange aRange2; + ScInterpreterTableOpParams* pTableOp = new ScInterpreterTableOpParams; if (nParamCount == 5) { - PopSingleRef(nNCol2, nNRow2, nNTab2); - PopSingleRef(nOCol2, nORow2, nOTab2); - aRange2.aStart.Set( nOCol2, nORow2, nOTab2 ); - aRange2.aEnd = aRange2.aStart; + PopSingleRef( pTableOp->aNew2 ); + PopSingleRef( pTableOp->aOld2 ); } - else - nOCol2 = MAXCOL+1; - PopSingleRef(nNCol1, nNRow1, nNTab1); - PopSingleRef(nOCol1, nORow1, nOTab1); - ScRange aRange1( nOCol1, nORow1, nOTab1 ); - PopSingleRef( aFAdr ); - pTableOp = new USHORT[12]; - pTableOp[0] = nOCol1; - pTableOp[1] = nORow1; - pTableOp[2] = nOTab1; - pTableOp[3] = nNCol1; - pTableOp[4] = nNRow1; - pTableOp[5] = nNTab1; - pTableOp[6] = nOCol2; - pTableOp[7] = nORow2; - pTableOp[8] = nOTab2; - pTableOp[9] = nNCol2; - pTableOp[10] = nNRow2; - pTableOp[11] = nNTab2; - aTableOpList.Insert(pTableOp); + PopSingleRef( pTableOp->aNew1 ); + PopSingleRef( pTableOp->aOld1 ); + PopSingleRef( pTableOp->aFormulaPos ); + pTableOp->bValid = TRUE; + pDok->aTableOpList.Insert( pTableOp ); pDok->IncInterpreterTableOpLevel(); - pDok->SetTableOpDirty( aRange1 ); - if ( nOCol2 != MAXCOL+1 ) - pDok->SetTableOpDirty( aRange2 ); - ScBaseCell* pFCell = pDok->GetCell( aFAdr ); - if (pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA) + BOOL bReuseLastParams = (pDok->aLastTableOpParams == *pTableOp); + if ( bReuseLastParams ) + { + pTableOp->aNotifiedFormulaPos = pDok->aLastTableOpParams.aNotifiedFormulaPos; + pTableOp->bRefresh = TRUE; + for ( ::std::vector< ScAddress >::const_iterator iBroadcast( + pTableOp->aNotifiedFormulaPos.begin() ); + iBroadcast != pTableOp->aNotifiedFormulaPos.end(); + ++iBroadcast ) + { // emulate broadcast and indirectly collect cell pointers + ScBaseCell* pCell = pDok->GetCell( *iBroadcast ); + if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA ) + ((ScFormulaCell*)pCell)->SetTableOpDirty(); + } + } + else + { // broadcast and indirectly collect cell pointers and positions + pDok->SetTableOpDirty( pTableOp->aOld1 ); + if ( nParamCount == 5 ) + pDok->SetTableOpDirty( pTableOp->aOld2 ); + } + pTableOp->bCollectNotifications = FALSE; + + ScBaseCell* pFCell = pDok->GetCell( pTableOp->aFormulaPos ); + if ( pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA ) ((ScFormulaCell*)pFCell)->SetDirtyVar(); - if (HasCellValueData(pFCell)) - PushDouble(GetCellValue( aFAdr, pFCell )); + if ( HasCellValueData( pFCell ) ) + PushDouble( GetCellValue( pTableOp->aFormulaPos, pFCell )); else { String aCellString; - GetCellString(aCellString, pFCell); - PushString(aCellString); + GetCellString( aCellString, pFCell ); + PushString( aCellString ); } - if (pTableOp) + + pDok->aTableOpList.Remove( pTableOp ); + // set dirty again once more to be able to recalculate original + for ( ::std::vector< ScFormulaCell* >::const_iterator iBroadcast( + pTableOp->aNotifiedFormulaCells.begin() ); + iBroadcast != pTableOp->aNotifiedFormulaCells.end(); + ++iBroadcast ) { - aTableOpList.Remove(pTableOp); - delete [] pTableOp; - pTableOp = NULL; + (*iBroadcast)->SetTableOpDirty(); } - pDok->SetTableOpDirty( aRange1 ); - if ( nOCol2 != MAXCOL+1 ) - pDok->SetTableOpDirty( aRange2 ); - if (pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA) + if ( !bReuseLastParams ) + { + pTableOp->aNotifiedFormulaCells.clear(); + pDok->aLastTableOpParams = *pTableOp; + } + delete pTableOp; + + if ( pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA ) { ((ScFormulaCell*)pFCell)->SetDirtyVar(); ((ScFormulaCell*)pFCell)->GetErrCode(); // recalculate original @@ -2495,6 +2401,7 @@ void ScInterpreter::ScTableOp() pDok->DecInterpreterTableOpLevel(); } + /* void ScInterpreter::ScErrCell() @@ -2634,7 +2541,7 @@ void ScInterpreter::ScCalcTeam() { ShowTheTeam(); String aTeam( RTL_CONSTASCII_USTRINGPARAM( "Timm, Ballach, Rathke, Rentz, Nebel" ) ); - if ( (GetByte() == 1) && SolarMath::ApproxEqual( GetDouble(), 1996) ) + if ( (GetByte() == 1) && ::rtl::math::approxEqual( GetDouble(), 1996) ) aTeam.AppendAscii( " (a word with 'B': -Olk, -Nietsch, -Daeumling)" ); PushString( aTeam ); bShown = TRUE; @@ -2969,17 +2876,11 @@ StackVar ScInterpreter::Interpret() USHORT nErrorFunctionCount = 0; USHORT nStackBase; -#if SOMA_FPSIGNAL_JUMP - BOOL bIllegalFPOperationSignal = FALSE; - pLocalJumpBuf = pJumpBuf; - pJumpBuf = (jmp_buf*) new BYTE[sizeof(jmp_buf)]; -#endif nGlobError = nGlobalError; nGlobalError = 0; nMatCount = 0; bMatDel = FALSE; ppGlobSortArray = NULL; - pTableOp = NULL; nStackBase = sp = maxsp = 0; nRetFmtType = NUMBERFORMAT_UNDEFINED; nFuncFmtType = NUMBERFORMAT_UNDEFINED; @@ -2990,10 +2891,13 @@ StackVar ScInterpreter::Interpret() glSubTotal = FALSE; UINT16 nOldOpCode = ocStop; - SOMA_FPCONTROL(); // FP-Exceptions ein-/ausschalten -#if SOMA_FPSIGNAL_JUMP - ScSigCatchFunc pOldSigFunc = (pSignalFunc)( SC_SIGFPE, MySigFunc ); -#endif // SOMA_FPSIGNAL_JUMP + // Once upon a time we used to have FP exceptions on, and there was a + // Windows printer driver that kept switching off exceptions, so we had to + // switch them back on again every time. Who knows if there isn't a driver + // that keeps switching exceptions on, now that we run with exceptions off, + // so reassure exceptions are really off. + SAL_MATH_FPEXCEPTIONS_OFF(); + aCode.Reset(); while( ( pCur = aCode.Next() ) != NULL && (!nGlobalError || nErrorFunction <= nErrorFunctionCount) ) @@ -3022,323 +2926,313 @@ StackVar ScInterpreter::Interpret() if ( nStackBase > sp ) nStackBase = sp; // underflow?!? -#if SOMA_FPSIGNAL_JUMP - if (setjmp(*pJumpBuf)) + switch( eOp ) { - bIllegalFPOperationSignal = TRUE; - SetError( errIllegalFPOperation ); + case ocSep: + case ocClose: // vom Compiler gepusht + case ocMissing : ScMissing(); break; + case ocMacro : ScMacro(); break; + case ocDBArea : ScDBArea(); break; + case ocColRowNameAuto : ScColRowNameAuto(); break; +// gesondert case ocPush : Push( (ScToken&) *pCur ); break; + case ocIf : ScIfJump(); break; + case ocChose : ScChoseJump(); break; + case ocAdd : ScAdd(); break; + case ocSub : ScSub(); break; + case ocMul : ScMul(); break; + case ocDiv : ScDiv(); break; + case ocAmpersand : ScAmpersand(); break; + case ocPow : ScPow(); break; + case ocEqual : ScEqual(); break; + case ocNotEqual : ScNotEqual(); break; + case ocLess : ScLess(); break; + case ocGreater : ScGreater(); break; + case ocLessEqual : ScLessEqual(); break; + case ocGreaterEqual : ScGreaterEqual(); break; + case ocAnd : ScAnd(); break; + case ocOr : ScOr(); break; + case ocIntersect : ScIntersect(); break; + case ocNot : ScNot(); break; + case ocNegSub : + case ocNeg : ScNeg(); break; + case ocPercentSign : ScPercentSign(); break; + case ocPi : ScPi(); break; +// case ocDefPar : ScDefPar(); break; + case ocRandom : ScRandom(); break; + case ocTrue : ScTrue(); break; + case ocFalse : ScFalse(); break; + case ocGetActDate : ScGetActDate(); break; + case ocGetActTime : ScGetActTime(); break; + case ocNoValue : nGlobalError = NOVALUE; + PushInt(0); break; + case ocDeg : ScDeg(); break; + case ocRad : ScRad(); break; + case ocSin : ScSin(); break; + case ocCos : ScCos(); break; + case ocTan : ScTan(); break; + case ocCot : ScCot(); break; + case ocArcSin : ScArcSin(); break; + case ocArcCos : ScArcCos(); break; + case ocArcTan : ScArcTan(); break; + case ocArcCot : ScArcCot(); break; + case ocSinHyp : ScSinHyp(); break; + case ocCosHyp : ScCosHyp(); break; + case ocTanHyp : ScTanHyp(); break; + case ocCotHyp : ScCotHyp(); break; + case ocArcSinHyp : ScArcSinHyp(); break; + case ocArcCosHyp : ScArcCosHyp(); break; + case ocArcTanHyp : ScArcTanHyp(); break; + case ocArcCotHyp : ScArcCotHyp(); break; + case ocExp : ScExp(); break; + case ocLn : ScLn(); break; + case ocLog10 : ScLog10(); break; + case ocSqrt : ScSqrt(); break; + case ocFact : ScFact(); break; + case ocGetYear : ScGetYear(); break; + case ocGetMonth : ScGetMonth(); break; + case ocGetDay : ScGetDay(); break; + case ocGetDayOfWeek : ScGetDayOfWeek(); break; + case ocWeek : ScGetWeekOfYear(); break; + case ocEasterSunday : ScEasterSunday(); break; + case ocGetHour : ScGetHour(); break; + case ocGetMin : ScGetMin(); break; + case ocGetSec : ScGetSec(); break; + case ocPlusMinus : ScPlusMinus(); break; + case ocAbs : ScAbs(); break; + case ocInt : ScInt(); break; + case ocEven : ScEven(); break; + case ocOdd : ScOdd(); break; + case ocPhi : ScPhi(); break; + case ocGauss : ScGauss(); break; + case ocStdNormDist : ScStdNormDist(); break; + case ocFisher : ScFisher(); break; + case ocFisherInv : ScFisherInv(); break; + case ocIsEmpty : ScIsEmpty(); break; + case ocIsString : ScIsString(); break; + case ocIsNonString : ScIsNonString(); break; + case ocIsLogical : ScIsLogical(nOldOpCode); break; + case ocType : ScType(); break; + case ocCell : ScCell(); break; + case ocIsRef : ScIsRef(); break; + case ocIsValue : ScIsValue(); break; + case ocIsFormula : ScIsFormula(); break; + case ocFormula : ScFormula(); break; + case ocIsNV : ScIsNV(); break; + case ocIsErr : ScIsErr(); break; + case ocIsError : ScIsError(); break; + case ocIsEven : ScIsEven(); break; + case ocIsOdd : ScIsOdd(); break; + case ocN : ScN(); break; + case ocGetDateValue : ScGetDateValue(); break; + case ocGetTimeValue : ScGetTimeValue(); break; + case ocCode : ScCode(); break; + case ocTrim : ScTrim(); break; + case ocUpper : ScUpper(); break; + case ocPropper : ScPropper(); break; + case ocLower : ScLower(); break; + case ocLen : ScLen(); break; + case ocT : ScT(); break; + case ocClean : ScClean(); break; + case ocValue : ScValue(); break; + case ocChar : ScChar(); break; + case ocArcTan2 : ScArcTan2(); break; + case ocMod : ScMod(); break; + case ocPower : ScPower(); break; + case ocRound : ScRound(); break; + case ocRoundUp : ScRoundUp(); break; + case ocTrunc : + case ocRoundDown : ScRoundDown(); break; + case ocCeil : ScCeil(); break; + case ocFloor : ScFloor(); break; + case ocSumProduct : ScSumProduct(); break; + case ocSumSQ : ScSumSQ(); break; + case ocSumX2MY2 : ScSumX2MY2(); break; + case ocSumX2DY2 : ScSumX2DY2(); break; + case ocSumXMY2 : ScSumXMY2(); break; + case ocLog : ScLog(); break; + case ocGGT : ScGGT(); break; + case ocKGV : ScKGV(); break; + case ocGetDate : ScGetDate(); break; + case ocGetTime : ScGetTime(); break; + case ocGetDiffDate : ScGetDiffDate(); break; + case ocGetDiffDate360 : ScGetDiffDate360(); break; + case ocMin : ScMin( FALSE ); break; + case ocMinA : ScMin( TRUE ); break; + case ocMax : ScMax( FALSE ); break; + case ocMaxA : ScMax( TRUE ); break; + case ocSum : ScSum(); break; + case ocProduct : ScProduct(); break; + case ocNBW : ScNBW(); break; + case ocIKV : ScIKV(); break; + case ocMIRR : ScMIRR(); break; + case ocISPMT : ScISPMT(); break; + case ocAverage : ScAverage( FALSE ); break; + case ocAverageA : ScAverage( TRUE ); break; + case ocCount : ScCount(); break; + case ocCount2 : ScCount2(); break; + case ocVar : ScVar( FALSE ); break; + case ocVarA : ScVar( TRUE ); break; + case ocVarP : ScVarP( FALSE ); break; + case ocVarPA : ScVarP( TRUE ); break; + case ocStDev : ScStDev( FALSE ); break; + case ocStDevA : ScStDev( TRUE ); break; + case ocStDevP : ScStDevP( FALSE ); break; + case ocStDevPA : ScStDevP( TRUE ); break; + case ocBW : ScBW(); break; + case ocDIA : ScDIA(); break; + case ocGDA : ScGDA(); break; + case ocGDA2 : ScGDA2(); break; + case ocVBD : ScVDB(); break; + case ocLaufz : ScLaufz(); break; + case ocLIA : ScLIA(); break; + case ocRMZ : ScRMZ(); break; + case ocColumns : ScColumns(); break; + case ocRows : ScRows(); break; + case ocTables : ScTables(); break; + case ocColumn : ScColumn(); break; + case ocRow : ScRow(); break; + case ocTable : ScTable(); break; + case ocZGZ : ScZGZ(); break; + case ocZW : ScZW(); break; + case ocZZR : ScZZR(); break; + case ocZins : ScZins(); break; + case ocZinsZ : ScZinsZ(); break; + case ocKapz : ScKapz(); break; + case ocKumZinsZ : ScKumZinsZ(); break; + case ocKumKapZ : ScKumKapZ(); break; + case ocEffektiv : ScEffektiv(); break; + case ocNominal : ScNominal(); break; + case ocSubTotal : ScSubTotal(); break; + case ocDBSum : ScDBSum(); break; + case ocDBCount : ScDBCount(); break; + case ocDBCount2 : ScDBCount2(); break; + case ocDBAverage : ScDBAverage(); break; + case ocDBGet : ScDBGet(); break; + case ocDBMax : ScDBMax(); break; + case ocDBMin : ScDBMin(); break; + case ocDBProduct : ScDBProduct(); break; + case ocDBStdDev : ScDBStdDev(); break; + case ocDBStdDevP : ScDBStdDevP(); break; + case ocDBVar : ScDBVar(); break; + case ocDBVarP : ScDBVarP(); break; + case ocIndirect : ScIndirect(); break; + case ocAdress : ScAdress(); break; + case ocMatch : ScMatch(); break; + case ocCountEmptyCells : ScCountEmptyCells(); break; + case ocCountIf : ScCountIf(); break; + case ocSumIf : ScSumIf(); break; + case ocLookup : ScLookup(); break; + case ocVLookup : ScVLookup(); break; + case ocHLookup : ScHLookup(); break; + case ocIndex : ScIndex(); break; + case ocMultiArea : ScMultiArea(); break; + case ocOffset : ScOffset(); break; + case ocAreas : ScAreas(); break; + case ocCurrency : ScCurrency(); break; + case ocReplace : ScReplace(); break; + case ocFixed : ScFixed(); break; + case ocFind : ScFind(); break; + case ocExact : ScExact(); break; + case ocLeft : ScLeft(); break; + case ocRight : ScRight(); break; + case ocSearch : ScSearch(); break; + case ocMid : ScMid(); break; + case ocText : ScText(); break; + case ocSubstitute : ScSubstitute(); break; + case ocRept : ScRept(); break; + case ocConcat : ScConcat(); break; + case ocMatValue : ScMatValue(); break; + case ocMatrixUnit : ScEMat(); break; + case ocMatDet : ScMatDet(); break; + case ocMatInv : ScMatInv(); break; + case ocMatMult : ScMatMult(); break; + case ocMatTrans : ScMatTrans(); break; + case ocMatRef : ScMatRef(); break; + case ocBackSolver : ScBackSolver(); break; + case ocB : ScB(); break; + case ocNormDist : ScNormDist(); break; + case ocExpDist : ScExpDist(); break; + case ocBinomDist : ScBinomDist(); break; + case ocPoissonDist : ScPoissonDist(); break; + case ocKombin : ScKombin(); break; + case ocKombin2 : ScKombin2(); break; + case ocVariationen : ScVariationen(); break; + case ocVariationen2 : ScVariationen2(); break; + case ocHypGeomDist : ScHypGeomDist(); break; + case ocLogNormDist : ScLogNormDist(); break; + case ocTDist : ScTDist(); break; + case ocFDist : ScFDist(); break; + case ocChiDist : ScChiDist(); break; + case ocStandard : ScStandard(); break; + case ocAveDev : ScAveDev(); break; + case ocDevSq : ScDevSq(); break; + case ocKurt : ScKurt(); break; + case ocSchiefe : ScSkew(); break; + case ocModalValue : ScModalValue(); break; + case ocMedian : ScMedian(); break; + case ocGeoMean : ScGeoMean(); break; + case ocHarMean : ScHarMean(); break; + case ocWeibull : ScWeibull(); break; + case ocKritBinom : ScCritBinom(); break; + case ocNegBinomVert : ScNegBinomDist(); break; + case ocNoName : ScNoName(); break; + case ocZTest : ScZTest(); break; + case ocTTest : ScTTest(); break; + case ocFTest : ScFTest(); break; + case ocRank : ScRank(); break; + case ocPercentile : ScPercentile(); break; + case ocPercentrank : ScPercentrank(); break; + case ocLarge : ScLarge(); break; + case ocSmall : ScSmall(); break; + case ocFrequency : ScFrequency(); break; + case ocQuartile : ScQuartile(); break; + case ocNormInv : ScNormInv(); break; + case ocSNormInv : ScSNormInv(); break; + case ocConfidence : ScConfidence(); break; + case ocTrimMean : ScTrimMean(); break; + case ocProb : ScProbability(); break; + case ocCorrel : ScCorrel(); break; + case ocCovar : ScCovar(); break; + case ocPearson : ScPearson(); break; + case ocRSQ : ScRSQ(); break; + case ocSTEYX : ScSTEXY(); break; + case ocSlope : ScSlope(); break; + case ocIntercept : ScIntercept(); break; + case ocTrend : ScTrend(); break; + case ocGrowth : ScGrowth(); break; + case ocRGP : ScRGP(); break; + case ocRKP : ScRKP(); break; + case ocForecast : ScForecast(); break; + case ocGammaLn : ScLogGamma(); break; + case ocGammaDist : ScGammaDist(); break; + case ocGammaInv : ScGammaInv(); break; + case ocChiTest : ScChiTest(); break; + case ocChiInv : ScChiInv(); break; + case ocTInv : ScTInv(); break; + case ocFInv : ScFInv(); break; + case ocLogInv : ScLogNormInv(); break; + case ocBetaDist : ScBetaDist(); break; + case ocBetaInv : ScBetaInv(); break; + case ocExternal : ScExternal(); break; + case ocTableOp : ScTableOp(); break; +// case ocErrCell : ScErrCell(); break; + case ocStop : break; + case ocErrorType : ScErrorType(); break; + case ocCurrent : ScCurrent(); break; + case ocStyle : ScStyle(); break; + case ocDde : ScDde(); break; + case ocBase : ScBase(); break; + case ocDecimal : ScDecimal(); break; + case ocConvert : ScConvert(); break; + case ocRoman : ScRoman(); break; + case ocArabic : ScArabic(); break; + case ocAnswer : ScAnswer(); break; + case ocTeam : ScCalcTeam(); break; + case ocTTT : ScTTT(); break; + case ocSpew : ScSpewFunc(); break; + case ocGame : ScGame(); break; + default : SetError(errUnknownOpCode); PushInt(0); break; } - else -#endif - { - switch( eOp ) - { - case ocSep: - case ocClose: // vom Compiler gepusht - case ocMissing : ScMissing(); break; - case ocMacro : ScMacro(); break; - case ocDBArea : ScDBArea(); break; - case ocColRowNameAuto : ScColRowNameAuto(); break; -// gesondert case ocPush : Push( (ScToken&) *pCur ); break; - case ocIf : ScIfJump(); break; - case ocChose : ScChoseJump(); break; - case ocAdd : ScAdd(); break; - case ocSub : ScSub(); break; - case ocMul : ScMul(); break; - case ocDiv : ScDiv(); break; - case ocAmpersand : ScAmpersand(); break; - case ocPow : ScPow(); break; - case ocEqual : ScEqual(); break; - case ocNotEqual : ScNotEqual(); break; - case ocLess : ScLess(); break; - case ocGreater : ScGreater(); break; - case ocLessEqual : ScLessEqual(); break; - case ocGreaterEqual : ScGreaterEqual(); break; - case ocAnd : ScAnd(); break; - case ocOr : ScOr(); break; - case ocIntersect : ScIntersect(); break; - case ocNot : ScNot(); break; - case ocNegSub : - case ocNeg : ScNeg(); break; - case ocPercentSign : ScPercentSign(); break; - case ocPi : ScPi(); break; -// case ocDefPar : ScDefPar(); break; - case ocRandom : ScRandom(); break; - case ocTrue : ScTrue(); break; - case ocFalse : ScFalse(); break; - case ocGetActDate : ScGetActDate(); break; - case ocGetActTime : ScGetActTime(); break; - case ocNoValue : nGlobalError = NOVALUE; - PushInt(0); break; - case ocDeg : ScDeg(); break; - case ocRad : ScRad(); break; - case ocSin : ScSin(); break; - case ocCos : ScCos(); break; - case ocTan : ScTan(); break; - case ocCot : ScCot(); break; - case ocArcSin : ScArcSin(); break; - case ocArcCos : ScArcCos(); break; - case ocArcTan : ScArcTan(); break; - case ocArcCot : ScArcCot(); break; - case ocSinHyp : ScSinHyp(); break; - case ocCosHyp : ScCosHyp(); break; - case ocTanHyp : ScTanHyp(); break; - case ocCotHyp : ScCotHyp(); break; - case ocArcSinHyp : ScArcSinHyp(); break; - case ocArcCosHyp : ScArcCosHyp(); break; - case ocArcTanHyp : ScArcTanHyp(); break; - case ocArcCotHyp : ScArcCotHyp(); break; - case ocExp : ScExp(); break; - case ocLn : ScLn(); break; - case ocLog10 : ScLog10(); break; - case ocSqrt : ScSqrt(); break; - case ocFact : ScFact(); break; - case ocGetYear : ScGetYear(); break; - case ocGetMonth : ScGetMonth(); break; - case ocGetDay : ScGetDay(); break; - case ocGetDayOfWeek : ScGetDayOfWeek(); break; - case ocWeek : ScGetWeekOfYear(); break; - case ocEasterSunday : ScEasterSunday(); break; - case ocGetHour : ScGetHour(); break; - case ocGetMin : ScGetMin(); break; - case ocGetSec : ScGetSec(); break; - case ocPlusMinus : ScPlusMinus(); break; - case ocAbs : ScAbs(); break; - case ocInt : ScInt(); break; - case ocEven : ScEven(); break; - case ocOdd : ScOdd(); break; - case ocPhi : ScPhi(); break; - case ocGauss : ScGauss(); break; - case ocStdNormDist : ScStdNormDist(); break; - case ocFisher : ScFisher(); break; - case ocFisherInv : ScFisherInv(); break; - case ocIsEmpty : ScIsEmpty(); break; - case ocIsString : ScIsString(); break; - case ocIsNonString : ScIsNonString(); break; - case ocIsLogical : ScIsLogical(nOldOpCode); break; - case ocType : ScType(); break; - case ocCell : ScCell(); break; - case ocIsRef : ScIsRef(); break; - case ocIsValue : ScIsValue(); break; - case ocIsFormula : ScIsFormula(); break; - case ocFormula : ScFormula(); break; - case ocIsNV : ScIsNV(); break; - case ocIsErr : ScIsErr(); break; - case ocIsError : ScIsError(); break; - case ocIsEven : ScIsEven(); break; - case ocIsOdd : ScIsOdd(); break; - case ocN : ScN(); break; - case ocGetDateValue : ScGetDateValue(); break; - case ocGetTimeValue : ScGetTimeValue(); break; - case ocCode : ScCode(); break; - case ocTrim : ScTrim(); break; - case ocUpper : ScUpper(); break; - case ocPropper : ScPropper(); break; - case ocLower : ScLower(); break; - case ocLen : ScLen(); break; - case ocT : ScT(); break; - case ocClean : ScClean(); break; - case ocValue : ScValue(); break; - case ocChar : ScChar(); break; - case ocArcTan2 : ScArcTan2(); break; - case ocMod : ScMod(); break; - case ocPower : ScPower(); break; - case ocRound : ScRound(); break; - case ocRoundUp : ScRoundUp(); break; - case ocTrunc : - case ocRoundDown : ScRoundDown(); break; - case ocCeil : ScCeil(); break; - case ocFloor : ScFloor(); break; - case ocSumProduct : ScSumProduct(); break; - case ocSumSQ : ScSumSQ(); break; - case ocSumX2MY2 : ScSumX2MY2(); break; - case ocSumX2DY2 : ScSumX2DY2(); break; - case ocSumXMY2 : ScSumXMY2(); break; - case ocLog : ScLog(); break; - case ocGGT : ScGGT(); break; - case ocKGV : ScKGV(); break; - case ocGetDate : ScGetDate(); break; - case ocGetTime : ScGetTime(); break; - case ocGetDiffDate : ScGetDiffDate(); break; - case ocGetDiffDate360 : ScGetDiffDate360(); break; - case ocMin : ScMin( FALSE ); break; - case ocMinA : ScMin( TRUE ); break; - case ocMax : ScMax( FALSE ); break; - case ocMaxA : ScMax( TRUE ); break; - case ocSum : ScSum(); break; - case ocProduct : ScProduct(); break; - case ocNBW : ScNBW(); break; - case ocIKV : ScIKV(); break; - case ocMIRR : ScMIRR(); break; - case ocISPMT : ScISPMT(); break; - case ocAverage : ScAverage( FALSE ); break; - case ocAverageA : ScAverage( TRUE ); break; - case ocCount : ScCount(); break; - case ocCount2 : ScCount2(); break; - case ocVar : ScVar( FALSE ); break; - case ocVarA : ScVar( TRUE ); break; - case ocVarP : ScVarP( FALSE ); break; - case ocVarPA : ScVarP( TRUE ); break; - case ocStDev : ScStDev( FALSE ); break; - case ocStDevA : ScStDev( TRUE ); break; - case ocStDevP : ScStDevP( FALSE ); break; - case ocStDevPA : ScStDevP( TRUE ); break; - case ocBW : ScBW(); break; - case ocDIA : ScDIA(); break; - case ocGDA : ScGDA(); break; - case ocGDA2 : ScGDA2(); break; - case ocVBD : ScVDB(); break; - case ocLaufz : ScLaufz(); break; - case ocLIA : ScLIA(); break; - case ocRMZ : ScRMZ(); break; - case ocColumns : ScColumns(); break; - case ocRows : ScRows(); break; - case ocTables : ScTables(); break; - case ocColumn : ScColumn(); break; - case ocRow : ScRow(); break; - case ocTable : ScTable(); break; - case ocZGZ : ScZGZ(); break; - case ocZW : ScZW(); break; - case ocZZR : ScZZR(); break; - case ocZins : ScZins(); break; - case ocZinsZ : ScZinsZ(); break; - case ocKapz : ScKapz(); break; - case ocKumZinsZ : ScKumZinsZ(); break; - case ocKumKapZ : ScKumKapZ(); break; - case ocEffektiv : ScEffektiv(); break; - case ocNominal : ScNominal(); break; - case ocSubTotal : ScSubTotal(); break; - case ocDBSum : ScDBSum(); break; - case ocDBCount : ScDBCount(); break; - case ocDBCount2 : ScDBCount2(); break; - case ocDBAverage : ScDBAverage(); break; - case ocDBGet : ScDBGet(); break; - case ocDBMax : ScDBMax(); break; - case ocDBMin : ScDBMin(); break; - case ocDBProduct : ScDBProduct(); break; - case ocDBStdDev : ScDBStdDev(); break; - case ocDBStdDevP : ScDBStdDevP(); break; - case ocDBVar : ScDBVar(); break; - case ocDBVarP : ScDBVarP(); break; - case ocIndirect : ScIndirect(); break; - case ocAdress : ScAdress(); break; - case ocMatch : ScMatch(); break; - case ocCountEmptyCells : ScCountEmptyCells(); break; - case ocCountIf : ScCountIf(); break; - case ocSumIf : ScSumIf(); break; - case ocLookup : ScLookup(); break; - case ocVLookup : ScVLookup(); break; - case ocHLookup : ScHLookup(); break; - case ocIndex : ScIndex(); break; - case ocMultiArea : ScMultiArea(); break; - case ocOffset : ScOffset(); break; - case ocAreas : ScAreas(); break; - case ocCurrency : ScCurrency(); break; - case ocReplace : ScReplace(); break; - case ocFixed : ScFixed(); break; - case ocFind : ScFind(); break; - case ocExact : ScExact(); break; - case ocLeft : ScLeft(); break; - case ocRight : ScRight(); break; - case ocSearch : ScSearch(); break; - case ocMid : ScMid(); break; - case ocText : ScText(); break; - case ocSubstitute : ScSubstitute(); break; - case ocRept : ScRept(); break; - case ocConcat : ScConcat(); break; - case ocMatValue : ScMatValue(); break; - case ocMatrixUnit : ScEMat(); break; - case ocMatDet : ScMatDet(); break; - case ocMatInv : ScMatInv(); break; - case ocMatMult : ScMatMult(); break; - case ocMatTrans : ScMatTrans(); break; - case ocMatRef : ScMatRef(); break; - case ocBackSolver : ScBackSolver(); break; - case ocB : ScB(); break; - case ocNormDist : ScNormDist(); break; - case ocExpDist : ScExpDist(); break; - case ocBinomDist : ScBinomDist(); break; - case ocPoissonDist : ScPoissonDist(); break; - case ocKombin : ScKombin(); break; - case ocKombin2 : ScKombin2(); break; - case ocVariationen : ScVariationen(); break; - case ocVariationen2 : ScVariationen2(); break; - case ocHypGeomDist : ScHypGeomDist(); break; - case ocLogNormDist : ScLogNormDist(); break; - case ocTDist : ScTDist(); break; - case ocFDist : ScFDist(); break; - case ocChiDist : ScChiDist(); break; - case ocStandard : ScStandard(); break; - case ocAveDev : ScAveDev(); break; - case ocDevSq : ScDevSq(); break; - case ocKurt : ScKurt(); break; - case ocSchiefe : ScSkew(); break; - case ocModalValue : ScModalValue(); break; - case ocMedian : ScMedian(); break; - case ocGeoMean : ScGeoMean(); break; - case ocHarMean : ScHarMean(); break; - case ocWeibull : ScWeibull(); break; - case ocKritBinom : ScCritBinom(); break; - case ocNegBinomVert : ScNegBinomDist(); break; - case ocNoName : ScNoName(); break; - case ocZTest : ScZTest(); break; - case ocTTest : ScTTest(); break; - case ocFTest : ScFTest(); break; - case ocRank : ScRank(); break; - case ocPercentile : ScPercentile(); break; - case ocPercentrank : ScPercentrank(); break; - case ocLarge : ScLarge(); break; - case ocSmall : ScSmall(); break; - case ocFrequency : ScFrequency(); break; - case ocQuartile : ScQuartile(); break; - case ocNormInv : ScNormInv(); break; - case ocSNormInv : ScSNormInv(); break; - case ocConfidence : ScConfidence(); break; - case ocTrimMean : ScTrimMean(); break; - case ocProb : ScProbability(); break; - case ocCorrel : ScCorrel(); break; - case ocCovar : ScCovar(); break; - case ocPearson : ScPearson(); break; - case ocRSQ : ScRSQ(); break; - case ocSTEYX : ScSTEXY(); break; - case ocSlope : ScSlope(); break; - case ocIntercept : ScIntercept(); break; - case ocTrend : ScTrend(); break; - case ocGrowth : ScGrowth(); break; - case ocRGP : ScRGP(); break; - case ocRKP : ScRKP(); break; - case ocForecast : ScForecast(); break; - case ocGammaLn : ScLogGamma(); break; - case ocGammaDist : ScGammaDist(); break; - case ocGammaInv : ScGammaInv(); break; - case ocChiTest : ScChiTest(); break; - case ocChiInv : ScChiInv(); break; - case ocTInv : ScTInv(); break; - case ocFInv : ScFInv(); break; - case ocLogInv : ScLogNormInv(); break; - case ocBetaDist : ScBetaDist(); break; - case ocBetaInv : ScBetaInv(); break; - case ocExternal : ScExternal(); break; - case ocTableOp : ScTableOp(); break; -// case ocErrCell : ScErrCell(); break; - case ocStop : break; - case ocErrorType : ScErrorType(); break; - case ocCurrent : ScCurrent(); break; - case ocStyle : ScStyle(); break; - case ocDde : ScDde(); break; - case ocBase : ScBase(); break; - case ocDecimal : ScDecimal(); break; - case ocConvert : ScConvert(); break; - case ocRoman : ScRoman(); break; - case ocArabic : ScArabic(); break; - case ocAnswer : ScAnswer(); break; - case ocTeam : ScCalcTeam(); break; - case ocTTT : ScTTT(); break; - case ocSpew : ScSpewFunc(); break; - case ocGame : ScGame(); break; - default : SetError(errUnknownOpCode); PushInt(0); break; - } - } // of else ( !setjmp ) // aeussere Funktion bestimmt das Format eines Ausdrucks if ( nFuncFmtType != NUMBERFORMAT_UNDEFINED ) @@ -3384,25 +3278,6 @@ StackVar ScInterpreter::Interpret() } } } -#if SOMA_FPSIGNAL_JUMP - if ( bIllegalFPOperationSignal ) - { - if ( sp ) - { // eigentlich kann kein Ergebnis gepusht worden sein - ScToken* pRes = pStack[ sp - 1 ]; - if ( pRes->GetOpCode() == ocPush - && pRes->GetType() == svDouble - && !SOMA_FINITE( pRes->nValue ) ) - { - pRes->nValue = 0.0; - } - else - PushInt(0); - } - else - PushInt(0); - } -#endif if ( nErrorFunction >= nErrorFunctionCount ) ++nErrorFunction; // das war's, Fehler => Abbruch else @@ -3416,14 +3291,6 @@ StackVar ScInterpreter::Interpret() Pop(); PushTempToken( *pResult ); } -#if SOMA_FPSIGNAL_JUMP - if ( bIllegalFPOperationSignal ) - { - bIllegalFPOperationSignal = FALSE; - SOMA_FPCONTROL(); // FP-Exceptions ein-/ausschalten - (pSignalFunc)( SC_SIGFPE, MySigFunc ); // reestablish handler - } -#endif } } @@ -3554,20 +3421,15 @@ StackVar ScInterpreter::Interpret() } else SetError(errNoCode); -#if !SOMA_FPSIGNAL_JUMP - if (!SOMA_FINITE(nResult)) + + if (!::rtl::math::isFinite(nResult)) { - if ( SolarMath::IsNAN( nResult ) ) + if ( ::rtl::math::isNan( nResult ) ) SetError(errNoValue); else SetError(errIllegalFPOperation); nResult = 0.0; } -#else - delete [] pJumpBuf; - pJumpBuf = (jmp_buf*) pLocalJumpBuf; - (pSignalFunc)(SC_SIGFPE, pOldSigFunc); -#endif if( nRetTypeExpr != NUMBERFORMAT_UNDEFINED ) { @@ -3607,11 +3469,6 @@ StackVar ScInterpreter::Interpret() while( maxsp-- ) (*p++)->DecRef(); nGlobalError = nGlobError; - if (pTableOp) - { - aTableOpList.Remove(pTableOp); - delete [] pTableOp; - } return eResult; } diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index bf1e1167989e..9d14d3df9f87 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr5.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: er $ $Date: 2001-07-12 21:31:46 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -640,8 +640,8 @@ void ScInterpreter::ScMatValue() { if ( MustHaveParamCount( GetByte(), 3 ) ) { - USHORT nR = (USHORT) SolarMath::ApproxFloor(GetDouble()); // 0 bis nAnz - 1 - USHORT nC = (USHORT) SolarMath::ApproxFloor(GetDouble()); // 0 bis nAnz - 1 + USHORT nR = (USHORT) ::rtl::math::approxFloor(GetDouble()); // 0 bis nAnz - 1 + USHORT nC = (USHORT) ::rtl::math::approxFloor(GetDouble()); // 0 bis nAnz - 1 switch (GetStackType()) { case svSingleRef : @@ -741,7 +741,7 @@ void ScInterpreter::ScEMat() { if ( MustHaveParamCount( GetByte(), 1 ) ) { - ULONG nDim = (ULONG) SolarMath::ApproxFloor(GetDouble()); + ULONG nDim = (ULONG) ::rtl::math::approxFloor(GetDouble()); if ( nDim * nDim > ScMatrix::GetElementsMax() || nDim == 0) SetIllegalArgument(); else @@ -1351,7 +1351,7 @@ ScMatrix* ScInterpreter::MatAdd(ScMatrix* pMat1, ScMatrix* pMat2) for (j = 0; j < nMinR; j++) { if (pMat1->IsValueOrEmpty(i,j) && pMat2->IsValueOrEmpty(i,j)) - pResMat->PutDouble( SolarMath::ApproxAdd( pMat1->GetDouble(i,j), + pResMat->PutDouble( ::rtl::math::approxAdd( pMat1->GetDouble(i,j), pMat2->GetDouble(i,j)), i, j); else pResMat->PutString(ScGlobal::GetRscString( @@ -1385,7 +1385,7 @@ ScMatrix* ScInterpreter::MatSub(ScMatrix* pMat1, ScMatrix* pMat2) for (j = 0; j < nMinR; j++) { if (pMat1->IsValueOrEmpty(i,j) && pMat2->IsValueOrEmpty(i,j)) - pResMat->PutDouble( SolarMath::ApproxSub( pMat1->GetDouble(i,j), + pResMat->PutDouble( ::rtl::math::approxSub( pMat1->GetDouble(i,j), pMat2->GetDouble(i,j)), i, j); else pResMat->PutString(ScGlobal::GetRscString( @@ -1650,7 +1650,7 @@ void ScInterpreter::ScAdd() for ( ULONG i = 0; i < nCount; i++ ) { if (pMat->IsValue(i)) - pResMat->PutDouble( SolarMath::ApproxAdd( pMat->GetDouble(i), fVal), i); + pResMat->PutDouble( ::rtl::math::approxAdd( pMat->GetDouble(i), fVal), i); else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } @@ -1661,7 +1661,7 @@ void ScInterpreter::ScAdd() SetNoValue(); } else - PushDouble( SolarMath::ApproxAdd( fVal1, fVal2 ) ); + PushDouble( ::rtl::math::approxAdd( fVal1, fVal2 ) ); if ( nFmtCurrencyType == NUMBERFORMAT_CURRENCY ) { nFuncFmtType = nFmtCurrencyType; @@ -1849,7 +1849,7 @@ void ScInterpreter::ScSub() if (bFlag) { for ( ULONG i = 0; i < nCount; i++ ) { if (pMat->IsValue(i)) - pResMat->PutDouble( SolarMath::ApproxSub( fVal, pMat->GetDouble(i)), i); + pResMat->PutDouble( ::rtl::math::approxSub( fVal, pMat->GetDouble(i)), i); else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } @@ -1857,7 +1857,7 @@ void ScInterpreter::ScSub() else { for ( ULONG i = 0; i < nCount; i++ ) { if (pMat->IsValue(i)) - pResMat->PutDouble( SolarMath::ApproxSub( pMat->GetDouble(i), fVal), i); + pResMat->PutDouble( ::rtl::math::approxSub( pMat->GetDouble(i), fVal), i); else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } @@ -1869,7 +1869,7 @@ void ScInterpreter::ScSub() SetNoValue(); } else - PushDouble( SolarMath::ApproxSub( fVal1, fVal2 ) ); + PushDouble( ::rtl::math::approxSub( fVal1, fVal2 ) ); if ( nFmtCurrencyType == NUMBERFORMAT_CURRENCY ) { nFuncFmtType = nFmtCurrencyType; diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 62b6025f49a3..1f17d252bd17 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rangenam.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: er $ $Date: 2002-11-28 16:14:51 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -582,6 +582,8 @@ void ScRangeData::MakeValidName( String& rName ) // static BOOL ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc ) { + /* If changed, ScfTools::ConvertToScDefinedName (sc/source/filter/ftools/ftools.cxx) + needs to be changed too. */ xub_StrLen nPos = 0; xub_StrLen nLen = rName.Len(); if ( !nLen || !ScCompiler::IsCharWordChar( rName.GetChar(nPos++) ) ) diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 23ea3df81336..d737c0b1b459 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rangeseq.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: nn $ $Date: 2001-04-10 18:46:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #pragma hdrstop #include <svtools/zforlist.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> @@ -83,8 +83,8 @@ using namespace com::sun::star; long lcl_DoubleToLong( double fVal ) { - double fInt = (fVal >= 0.0) ? SolarMath::ApproxFloor( fVal ) : - SolarMath::ApproxCeil( fVal ); + double fInt = (fVal >= 0.0) ? ::rtl::math::approxFloor( fVal ) : + ::rtl::math::approxCeil( fVal ); if ( fInt >= LONG_MIN && fInt <= LONG_MAX ) return (long)fInt; else diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index 07c66ddb771b..cfc57818325d 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rechead.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,7 +176,7 @@ ScMultipleReadHeader::~ScMultipleReadHeader() rStream.SetError( SCWARN_IMPORT_INFOLOST ); } delete pMemStream; - delete pBuf; + delete[] pBuf; rStream.Seek(nEndPos); } diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 09e203d311e7..d61d80f9cfce 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scmatrix.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: er $ $Date: 2001-04-23 20:25:02 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,8 +76,8 @@ #ifndef _STREAM_HXX //autogen #include <tools/stream.hxx> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif //------------------------------------------------------------------------ @@ -179,7 +179,7 @@ void ScMatrix::Store(SvStream& rStream) const rStream << (USHORT) 1; rStream << (BYTE) CELLTYPE_VALUE; double fVal; - SolarMath::SetNAN( fVal, FALSE ); + ::rtl::math::setNan( &fVal ); rStream << fVal; return; } diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx index 83596a778db5..448c5e831d59 100644 --- a/sc/source/core/tool/subtotal.cxx +++ b/sc/source/core/tool/subtotal.cxx @@ -2,9 +2,9 @@ * * $RCSfile: subtotal.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mh $ $Date: 2001-10-23 15:15:45 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,8 +88,6 @@ #include "subtotal.hxx" #include "interpre.hxx" -#include "scdll.hxx" // ScLibSignalFunc - // STATIC DATA ----------------------------------------------------------- jmp_buf SubTotal::aGlobalJumpBuf; @@ -126,118 +124,54 @@ void SubTotal::UpdateNoVal() void SubTotal::Update( double nVal ) { - SOMA_FPCONTROL(); // FP-Exceptions ein-/ausschalten -#if SOMA_FPSIGNAL_JUMP - ScSigCatchFunc pOldSigFunc = (ScInterpreter::pSignalFunc)( SC_SIGFPE, ScInterpreter::MySigFunc ); - jmp_buf* pSaveBuf = ScInterpreter::pJumpBuf; - ScInterpreter::pJumpBuf = &aGlobalJumpBuf; - if (setjmp(aGlobalJumpBuf)) - { - if (nProgress == 0) - { - bSumOk = FALSE; - bProductOk = FALSE; - bSumSqrOk = FALSE; - } - else if (nProgress == 1) - { - bProductOk = FALSE; - bSumSqrOk = FALSE; - } - else - { - bSumSqrOk = FALSE; - DBG_ASSERT(nProgress == 2,"subtotal.cxx: Update(1)"); - } - } - else -#endif // SOMA_FPSIGNAL_JUMP - { - nCount++; - nCount2++; - if (nVal > nMax) nMax = nVal; - if (nVal < nMin) nMin = nVal; - nProgress = 0; - if (bSumOk) nSum += nVal; - nProgress = 1; - if (bProductOk) nProduct *= nVal; - nProgress = 2; - if (bSumSqrOk) nSumSqr += nVal*nVal; - } -#if !SOMA_FPSIGNAL_JUMP - if (!SOMA_FINITE(nSum)) + SAL_MATH_FPEXCEPTIONS_OFF(); + nCount++; + nCount2++; + if (nVal > nMax) nMax = nVal; + if (nVal < nMin) nMin = nVal; + nProgress = 0; + if (bSumOk) nSum += nVal; + nProgress = 1; + if (bProductOk) nProduct *= nVal; + nProgress = 2; + if (bSumSqrOk) nSumSqr += nVal*nVal; + if (!::rtl::math::isFinite(nSum)) bSumOk = FALSE; - if (!SOMA_FINITE(nProduct)) + if (!::rtl::math::isFinite(nProduct)) bProductOk = FALSE; - if (!SOMA_FINITE(nSumSqr)) + if (!::rtl::math::isFinite(nSumSqr)) bSumSqrOk = FALSE; -#else // SOMA_FPSIGNAL_JUMP - ScInterpreter::pJumpBuf = pSaveBuf; - (ScInterpreter::pSignalFunc)( SC_SIGFPE, pOldSigFunc ); -#endif } void SubTotal::Update( const SubTotal& rVal ) { - SOMA_FPCONTROL(); // FP-Exceptions ein-/ausschalten -#if SOMA_FPSIGNAL_JUMP - ScSigCatchFunc pOldSigFunc = (ScInterpreter::pSignalFunc)( SC_SIGFPE, ScInterpreter::MySigFunc ); - jmp_buf* pSaveBuf = ScInterpreter::pJumpBuf; - ScInterpreter::pJumpBuf = &aGlobalJumpBuf; - if (setjmp(aGlobalJumpBuf)) - { - if (nProgress == 0) - { - bSumOk = FALSE; - bProductOk = FALSE; - bSumSqrOk = FALSE; - } - else if (nProgress == 1) - { - bProductOk = FALSE; - bSumSqrOk = FALSE; - } - else - { - DBG_ASSERT(nProgress == 2,"subtotal.cxx: Update(2)"); - bSumSqrOk = FALSE; - } - } + SAL_MATH_FPEXCEPTIONS_OFF(); + nCount += rVal.nCount; + nCount2 += rVal.nCount2; + if (rVal.nMax > nMax) nMax = rVal.nMax; + if (rVal.nMin < nMin) nMin = rVal.nMin; + nProgress = 0; + if (rVal.bSumOk && bSumOk) + nSum += rVal.nSum; else -#endif // SOMA_FPSIGNAL_JUMP - { - nCount += rVal.nCount; - nCount2 += rVal.nCount2; - if (rVal.nMax > nMax) nMax = rVal.nMax; - if (rVal.nMin < nMin) nMin = rVal.nMin; - nProgress = 0; - if (rVal.bSumOk && bSumOk) - nSum += rVal.nSum; - else - bSumOk = FALSE; - nProgress = 1; - if (rVal.bProductOk && bProductOk) - nProduct *= rVal.nProduct; - else - bProductOk = FALSE; - nProgress = 2; - if (rVal.bSumSqrOk && bSumSqrOk) - nSumSqr += rVal.nSumSqr; - else - bSumSqrOk = FALSE; - } -#if !SOMA_FPSIGNAL_JUMP - if (!SOMA_FINITE(nSum)) bSumOk = FALSE; - if (!SOMA_FINITE(nProduct)) + nProgress = 1; + if (rVal.bProductOk && bProductOk) + nProduct *= rVal.nProduct; + else bProductOk = FALSE; - if (!SOMA_FINITE(nSumSqr)) + nProgress = 2; + if (rVal.bSumSqrOk && bSumSqrOk) + nSumSqr += rVal.nSumSqr; + else + bSumSqrOk = FALSE; + if (!::rtl::math::isFinite(nSum)) + bSumOk = FALSE; + if (!::rtl::math::isFinite(nProduct)) + bProductOk = FALSE; + if (!::rtl::math::isFinite(nSumSqr)) bSumSqrOk = FALSE; -#else // SOMA_FPSIGNAL_JUMP - ScInterpreter::pJumpBuf = pSaveBuf; - (ScInterpreter::pSignalFunc)( SC_SIGFPE, pOldSigFunc ); -#endif } @@ -344,12 +278,9 @@ double SubTotal::Result( USHORT nFunction ) const BOOL SubTotal::SafePlus(double& fVal1, double fVal2) { BOOL bOk = TRUE; - SOMA_FPCONTROL(); // FP-Exceptions ein-/ausschalten -#if SOMA_FPSIGNAL_JUMP - ScSigCatchFunc pOldSigFunc = (ScInterpreter::pSignalFunc)( SC_SIGFPE, ScInterpreter::MySigFunc ); - jmp_buf* pSaveBuf = ScInterpreter::pJumpBuf; - ScInterpreter::pJumpBuf = &aGlobalJumpBuf; - if (setjmp(aGlobalJumpBuf)) + SAL_MATH_FPEXCEPTIONS_OFF(); + fVal1 += fVal2; + if (!::rtl::math::isFinite(fVal1)) { bOk = FALSE; if (fVal2 > 0.0) @@ -357,22 +288,6 @@ BOOL SubTotal::SafePlus(double& fVal1, double fVal2) else fVal1 = -DBL_MAX; } - else -#endif // SOMA_FPSIGNAL_JUMP - fVal1 += fVal2; -#if !SOMA_FPSIGNAL_JUMP - if (!SOMA_FINITE(fVal1)) - { - bOk = FALSE; - if (fVal2 > 0.0) - fVal1 = DBL_MAX; - else - fVal1 = -DBL_MAX; - } -#else // SOMA_FPSIGNAL_JUMP - ScInterpreter::pJumpBuf = pSaveBuf; - (ScInterpreter::pSignalFunc)( SC_SIGFPE, pOldSigFunc ); -#endif return bOk; } @@ -380,29 +295,13 @@ BOOL SubTotal::SafePlus(double& fVal1, double fVal2) BOOL SubTotal::SafeMult(double& fVal1, double fVal2) { BOOL bOk = TRUE; - SOMA_FPCONTROL(); // FP-Exceptions ein-/ausschalten -#if SOMA_FPSIGNAL_JUMP - ScSigCatchFunc pOldSigFunc = (ScInterpreter::pSignalFunc)( SC_SIGFPE, ScInterpreter::MySigFunc ); - jmp_buf* pSaveBuf = ScInterpreter::pJumpBuf; - ScInterpreter::pJumpBuf = &aGlobalJumpBuf; - if (setjmp(aGlobalJumpBuf)) - { - bOk = FALSE; - fVal1 = DBL_MAX; - } - else -#endif // SOMA_FPSIGNAL_JUMP - fVal1 *= fVal2; -#if !SOMA_FPSIGNAL_JUMP - if (!SOMA_FINITE(fVal1)) + SAL_MATH_FPEXCEPTIONS_OFF(); + fVal1 *= fVal2; + if (!::rtl::math::isFinite(fVal1)) { bOk = FALSE; fVal1 = DBL_MAX; } -#else // SOMA_FPSIGNAL_JUMP - ScInterpreter::pJumpBuf = pSaveBuf; - (ScInterpreter::pSignalFunc)( SC_SIGFPE, pOldSigFunc ); -#endif return bOk; } @@ -410,28 +309,12 @@ BOOL SubTotal::SafeMult(double& fVal1, double fVal2) BOOL SubTotal::SafeDiv(double& fVal1, double fVal2) { BOOL bOk = TRUE; - SOMA_FPCONTROL(); // FP-Exceptions ein-/ausschalten -#if SOMA_FPSIGNAL_JUMP - ScSigCatchFunc pOldSigFunc = (ScInterpreter::pSignalFunc)( SC_SIGFPE, ScInterpreter::MySigFunc ); - jmp_buf* pSaveBuf = ScInterpreter::pJumpBuf; - ScInterpreter::pJumpBuf = &aGlobalJumpBuf; - if (setjmp(aGlobalJumpBuf)) + SAL_MATH_FPEXCEPTIONS_OFF(); + fVal1 /= fVal2; + if (!::rtl::math::isFinite(fVal1)) { bOk = FALSE; fVal1 = DBL_MAX; } - else -#endif // SOMA_FPSIGNAL_JUMP - fVal1 /= fVal2; -#if !SOMA_FPSIGNAL_JUMP - if (!SOMA_FINITE(fVal1)) - { - bOk = FALSE; - fVal1 = DBL_MAX; - } -#else // SOMA_FPSIGNAL_JUMP - ScInterpreter::pJumpBuf = pSaveBuf; - (ScInterpreter::pSignalFunc)( SC_SIGFPE, pOldSigFunc ); -#endif return bOk; } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 7d13c69c7a6b..c4e787a2b07d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2,9 +2,9 @@ * * $RCSfile: token.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: er $ $Date: 2002-09-27 17:18:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1026,7 +1026,7 @@ BOOL ScTokenArray::HasNameOrColRowName() const return FALSE; } -BOOL ScTokenArray::IsReference( ScRange& rRange ) const +BOOL ScTokenArray::ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const { BOOL bIs = FALSE; if ( pCode && nLen == 1 ) @@ -1038,7 +1038,7 @@ BOOL ScTokenArray::IsReference( ScRange& rRange ) const { const SingleRefData& rRef = ((const ScSingleRefToken*)pToken)->GetSingleRef(); rRange.aStart = rRange.aEnd = ScAddress( rRef.nCol, rRef.nRow, rRef.nTab ); - bIs = TRUE; + bIs = !bValidOnly || !rRef.IsDeleted(); } else if ( pToken->GetType() == svDoubleRef ) { @@ -1047,13 +1047,23 @@ BOOL ScTokenArray::IsReference( ScRange& rRange ) const const SingleRefData& rRef2 = rCompl.Ref2; rRange.aStart = ScAddress( rRef1.nCol, rRef1.nRow, rRef1.nTab ); rRange.aEnd = ScAddress( rRef2.nCol, rRef2.nRow, rRef2.nTab ); - bIs = TRUE; + bIs = !bValidOnly || (!rRef1.IsDeleted() && !rRef2.IsDeleted()); } } } return bIs; } +BOOL ScTokenArray::IsReference( ScRange& rRange ) const +{ + return ImplGetReference( rRange, FALSE ); +} + +BOOL ScTokenArray::IsValidReference( ScRange& rRange ) const +{ + return ImplGetReference( rRange, TRUE ); +} + inline void lcl_GetAddress( ScAddress& rAddress, const ScToken& rToken ) { if ( rToken.GetType() == svSingleRef ) @@ -1499,7 +1509,7 @@ ScToken* ScTokenArray::Add( ScToken* t ) { if( !pCode ) pCode = new ScToken*[ MAXCODE ]; - if( nLen < MAXCODE ) + if( nLen < MAXCODE-1 ) { pCode[ nLen++ ] = t; if( t->GetOpCode() == ocPush @@ -1511,6 +1521,12 @@ ScToken* ScTokenArray::Add( ScToken* t ) else { t->Delete(); + if ( nLen == MAXCODE-1 ) + { + t = new ScByteToken( ocStop ); + pCode[ nLen++ ] = t; + t->IncRef(); + } return NULL; } } diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index 9fb53e904930..59f8cc1bf2d0 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: difexp.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: er $ $Date: 2002-12-06 17:26:49 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ //------------------------------------------------------------------------ -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <stdio.h> @@ -79,6 +79,9 @@ #include "global.hxx" #include "progress.hxx" +#ifndef _RTL_TENCINFO_H +#include <rtl/tencinfo.h> +#endif FltError ScExportDif( SvStream& rStream, ScDocument* pDoc, const ScAddress& rOutPos, const CharSet eNach, UINT32 nDifOption ) @@ -94,42 +97,53 @@ FltError ScExportDif( SvStream& rStream, ScDocument* pDoc, } -void lcl_EscapeQuotes( ByteString& rString ) -{ - // Quotes in (quoted) strings have to be escaped (duplicated) - // (at least Excel and Quattro do it that way) - - // This has to be done after converting the string to 8-bit characters, - // because different characters (typographic quotes) might get converted - // into quote characters. - - xub_StrLen nPos = 0; - while( ( nPos = rString.Search( (sal_Char)'"', nPos ) ) != STRING_NOTFOUND ) - { - rString.Insert( (sal_Char)'"', nPos ); - nPos += 2; - } -} - - FltError ScExportDif( SvStream& rOut, ScDocument* pDoc, - const ScRange&rRange, const CharSet eNach, UINT32 nDifOption ) + const ScRange&rRange, const CharSet eCharSet, UINT32 nDifOption ) { DBG_ASSERT( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range unsortiert!" ); DBG_ASSERTWARNING( rRange.aStart.Tab() == rRange.aEnd.Tab(), "ScExportDif(): nur eine Tabelle bidde!" ); + const CharSet eStreamCharSet = rOut.GetStreamCharSet(); + if ( eStreamCharSet != eCharSet ) + rOut.SetStreamCharSet( eCharSet ); + + sal_Unicode cStrDelim('"'); + ByteString aStrDelimEncoded; // only used if not Unicode + UniString aStrDelimDecoded; // only used if context encoding + BOOL bContextOrNotAsciiEncoding; + if ( eCharSet == RTL_TEXTENCODING_UNICODE ) + { + rOut.StartWritingUnicodeText(); + bContextOrNotAsciiEncoding = FALSE; + } + else + { + aStrDelimEncoded = ByteString( cStrDelim, eCharSet ); + rtl_TextEncodingInfo aInfo; + aInfo.StructSize = sizeof(aInfo); + if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) + { + bContextOrNotAsciiEncoding = + (((aInfo.Flags & RTL_TEXTENCODING_INFO_CONTEXT) != 0) || + ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); + if ( bContextOrNotAsciiEncoding ) + aStrDelimDecoded = String( aStrDelimEncoded, eCharSet ); + } + else + bContextOrNotAsciiEncoding = FALSE; + } + const sal_Char* p2DoubleQuotes_LF = "\"\"\n"; const sal_Char* pSpecDataType_LF = "-1,0\n"; const sal_Char* pEmptyData = "1,0\n\"\"\n"; - const sal_Char* pStringData = "1,0\n\""; + const sal_Char* pStringData = "1,0\n"; const sal_Char* pNumData = "0,"; const sal_Char* pNumDataERROR = "0,0\nERROR\n"; FltError eRet = eERR_OK; - ByteString aTmp; - ByteString aOS; - String aUniString; + String aOS; + String aString; UINT16 nEndCol = rRange.aEnd.Col(); UINT16 nEndRow = rRange.aEnd.Row(); UINT16 nNumCols = nEndCol - rRange.aStart.Col() + 1; @@ -140,7 +154,7 @@ FltError ScExportDif( SvStream& rOut, ScDocument* pDoc, const BOOL bPlain = ( nDifOption == SC_DIFOPT_PLAIN ); - ScProgress aPrgrsBar( NULL, ScGlobal::GetRscString( STR_LOAD_DOC ), nNumRows ); + ScProgress aPrgrsBar( pDoc->GetDocumentShell(), ScGlobal::GetRscString( STR_LOAD_DOC ), nNumRows ); aPrgrsBar.SetState( 0 ); @@ -148,41 +162,47 @@ FltError ScExportDif( SvStream& rOut, ScDocument* pDoc, DBG_ASSERT( pDoc->HasTable( nTab ), "*ScExportDif(): Tabelle nicht vorhanden!" ); aOS = pKeyTABLE; - aOS += "\n0,1\n\""; + aOS.AppendAscii( "\n0,1\n\"" ); - pDoc->GetName( nTab, aUniString ); - aOS += ByteString( aUniString, eNach ); - aOS += "\"\n"; - rOut.Write( aOS.GetBuffer(), aOS.Len() ); + pDoc->GetName( nTab, aString ); + aOS += aString; + aOS.AppendAscii( "\"\n" ); + rOut.WriteUnicodeOrByteText( aOS ); // VECTORS aOS = pKeyVECTORS; - aOS += "\n0,"; - aOS += ByteString::CreateFromInt32( nNumCols ); - aOS += '\n'; - aOS += p2DoubleQuotes_LF; - rOut.Write( aOS.GetBuffer(), aOS.Len() ); + aOS.AppendAscii( "\n0," ); + aOS += String::CreateFromInt32( nNumCols ); + aOS += sal_Unicode('\n'); + aOS.AppendAscii( p2DoubleQuotes_LF ); + rOut.WriteUnicodeOrByteText( aOS ); // TUPLES aOS = pKeyTUPLES; - aOS += "\n0,"; - aOS += ByteString::CreateFromInt32( nNumRows ); - aOS += '\n'; - aOS += p2DoubleQuotes_LF; - rOut.Write( aOS.GetBuffer(), aOS.Len() ); + aOS.AppendAscii( "\n0," ); + aOS += String::CreateFromInt32( nNumRows ); + aOS += sal_Unicode('\n'); + aOS.AppendAscii( p2DoubleQuotes_LF ); + rOut.WriteUnicodeOrByteText( aOS ); // DATA - rOut << pKeyDATA << "\n0,0\n" << p2DoubleQuotes_LF; + aOS = pKeyDATA; + aOS.AppendAscii( "\n0,0\n" ); + aOS.AppendAscii( p2DoubleQuotes_LF ); + rOut.WriteUnicodeOrByteText( aOS ); UINT16 nColCnt, nRowCnt; ScBaseCell* pAkt; - const sal_Char* pOutString; for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ ) { - rOut << pSpecDataType_LF << pKeyBOT << '\n'; + aOS.AssignAscii( pSpecDataType_LF ); + aOS += pKeyBOT; + aOS += sal_Unicode('\n'); + rOut.WriteUnicodeOrByteText( aOS ); for( nColCnt = rRange.aStart.Col() ; nColCnt <= nEndCol ; nColCnt++ ) { + bool bWriteStringData = false; pDoc->GetCell( nColCnt, nRowCnt, nTab, pAkt ); if( pAkt ) { @@ -190,89 +210,138 @@ FltError ScExportDif( SvStream& rOut, ScDocument* pDoc, { case CELLTYPE_NONE: case CELLTYPE_NOTE: - pOutString = pEmptyData; + aOS.AssignAscii( pEmptyData ); break; case CELLTYPE_VALUE: - aOS = pNumData; + aOS.AssignAscii( pNumData ); if( bPlain ) { fVal = ( ( ScValueCell * ) pAkt )->GetValue(); - aUniString.Erase(); - SolarMath::DoubleToString( aUniString, fVal, 'G', 14, '.', TRUE ); - aOS += ByteString( aUniString, eNach ); + aOS += String( ::rtl::math::doubleToUString( + fVal, rtl_math_StringFormat_G, 14, '.', + TRUE)); } else { - pDoc->GetInputString( nColCnt, nRowCnt, nTab, aUniString ); - aOS += ByteString( aUniString, eNach ); + pDoc->GetInputString( nColCnt, nRowCnt, nTab, aString ); + aOS += aString; } - aOS += "\nV\n"; - pOutString = aOS.GetBuffer(); + aOS.AppendAscii( "\nV\n" ); break; case CELLTYPE_EDIT: - aOS = pStringData; - ( ( ScEditCell* ) pAkt )->GetString( aUniString ); - aTmp = ByteString( aUniString, eNach ); - lcl_EscapeQuotes( aTmp ); - aOS += aTmp; - aOS += "\"\n"; - pOutString = aOS.GetBuffer(); + ( ( ScEditCell* ) pAkt )->GetString( aString ); + bWriteStringData = true; break; case CELLTYPE_STRING: - aOS = pStringData; - ( ( ScStringCell* ) pAkt )->GetString( aUniString ); - aTmp = ByteString( aUniString, eNach ); - lcl_EscapeQuotes( aTmp ); - aOS += aTmp; - aOS += "\"\n"; - pOutString = aOS.GetBuffer(); + ( ( ScStringCell* ) pAkt )->GetString( aString ); + bWriteStringData = true; break; case CELLTYPE_FORMULA: if ( ((ScFormulaCell*)pAkt)->GetErrCode() ) - pOutString = pNumDataERROR; + aOS.AssignAscii( pNumDataERROR ); else if( pAkt->HasValueData() ) { - aOS = pNumData; + aOS.AssignAscii( pNumData ); if( bPlain ) { fVal = ( ( ScFormulaCell * ) pAkt )->GetValue(); - aUniString.Erase(); - SolarMath::DoubleToString( aUniString, fVal, 'G', 14, '.', TRUE ); - aOS += ByteString( aUniString, eNach ); + aOS += String( ::rtl::math::doubleToUString( + fVal, rtl_math_StringFormat_G, 14, + '.', TRUE)); } else { - pDoc->GetInputString( nColCnt, nRowCnt, nTab, aUniString ); - aOS += ByteString( aUniString, eNach ); + pDoc->GetInputString( nColCnt, nRowCnt, nTab, aString ); + aOS += aString; } - aOS += "\nV\n"; - pOutString = aOS.GetBuffer(); + aOS.AppendAscii( "\nV\n" ); } else if( pAkt->HasStringData() ) { - aOS = pStringData; - ( ( ScFormulaCell * ) pAkt )->GetString( aUniString ); - aTmp = ByteString( aUniString, eNach ); - lcl_EscapeQuotes( aTmp ); - aOS += aTmp; - aOS += "\"\n"; - pOutString = aOS.GetBuffer(); + ( ( ScFormulaCell * ) pAkt )->GetString( aString ); + bWriteStringData = true; } else - pOutString = pNumDataERROR; + aOS.AssignAscii( pNumDataERROR ); break; } } else - pOutString = pEmptyData; + aOS.AssignAscii( pEmptyData ); - rOut << pOutString; + if ( !bWriteStringData ) + rOut.WriteUnicodeOrByteText( aOS ); + else + { + // for an explanation why this complicated, see + // sc/source/ui/docsh.cxx:ScDocShell::AsciiSave() + // In fact we should create a common method if this would be + // needed just one more time.. + aOS.AssignAscii( pStringData ); + rOut.WriteUnicodeOrByteText( aOS, eCharSet ); + if ( eCharSet == RTL_TEXTENCODING_UNICODE ) + { + xub_StrLen nPos = aString.Search( cStrDelim ); + while ( nPos != STRING_NOTFOUND ) + { + aString.Insert( cStrDelim, nPos ); + nPos = aString.Search( cStrDelim, nPos+2 ); + } + rOut.WriteUniOrByteChar( cStrDelim, eCharSet ); + rOut.WriteUnicodeText( aString ); + rOut.WriteUniOrByteChar( cStrDelim, eCharSet ); + } + else if ( bContextOrNotAsciiEncoding ) + { + // to byte encoding + ByteString aStrEnc( aString, eCharSet ); + // back to Unicode + UniString aStrDec( aStrEnc, eCharSet ); + // search on re-decoded string + xub_StrLen nPos = aStrDec.Search( aStrDelimDecoded ); + while ( nPos != STRING_NOTFOUND ) + { + aStrDec.Insert( aStrDelimDecoded, nPos ); + nPos = aStrDec.Search( aStrDelimDecoded, + nPos+1+aStrDelimDecoded.Len() ); + } + // write byte re-encoded + rOut.WriteUniOrByteChar( cStrDelim, eCharSet ); + rOut.WriteUnicodeOrByteText( aStrDec, eCharSet ); + rOut.WriteUniOrByteChar( cStrDelim, eCharSet ); + } + else + { + ByteString aStrEnc( aString, eCharSet ); + // search on encoded string + xub_StrLen nPos = aStrEnc.Search( aStrDelimEncoded ); + while ( nPos != STRING_NOTFOUND ) + { + aStrEnc.Insert( aStrDelimEncoded, nPos ); + nPos = aStrEnc.Search( aStrDelimEncoded, + nPos+1+aStrDelimEncoded.Len() ); + } + // write byte encoded + rOut.Write( aStrDelimEncoded.GetBuffer(), + aStrDelimEncoded.Len() ); + rOut.Write( aStrEnc.GetBuffer(), aStrEnc.Len() ); + rOut.Write( aStrDelimEncoded.GetBuffer(), + aStrDelimEncoded.Len() ); + } + rOut.WriteUniOrByteChar( '\n', eCharSet ); + } } aPrgrsBar.SetState( nRowCnt ); } - rOut << pSpecDataType_LF << pKeyEOD << '\n'; + aOS.AssignAscii( pSpecDataType_LF ); + aOS += pKeyEOD; + aOS += sal_Unicode('\n'); + rOut.WriteUnicodeOrByteText( aOS ); + + // restore original value + rOut.SetStreamCharSet( eStreamCharSet ); return eRet; } diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 87f63c82a63b..0469842fbdf7 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: difimp.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: er $ $Date: 2002-10-31 19:15:02 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ #include "dif.hxx" #include "filter.hxx" -#include "fltprgrs.hxx" +#include "fprogressbar.hxx" #include "flttools.hxx" #include "scerrors.hxx" #include "document.hxx" @@ -83,51 +83,25 @@ #include "attrib.hxx" -const sal_Char* pKeyTABLE = "TABLE"; -const sal_Char* pKeyVECTORS = "VECTORS"; -const sal_Char* pKeyTUPLES = "TUPLES"; -const sal_Char* pKeyDATA = "DATA"; -const sal_Char* pKeyBOT = "BOT"; -const sal_Char* pKeyEOD = "EOD"; -const sal_Char* pKeyERROR = "ERROR"; -const sal_Char* pKeyTRUE = "TRUE"; -const sal_Char* pKeyFALSE = "FALSE"; -const sal_Char* pKeyNA = "NA"; - - -#if __ALIGNMENT4 == 1 -UINT32 DifParser::nBOT = *( ( UINT32* ) pKeyBOT ); -UINT32 DifParser::nEOD = *( ( UINT32* ) pKeyEOD ); -UINT32 DifParser::n1_0 = *( ( UINT32* ) "1,0" ); -#else -sal_Char DifParser::cBOT_0 = 'B'; -sal_Char DifParser::cBOT_1 = 'O'; -sal_Char DifParser::cBOT_2 = 'T'; -sal_Char DifParser::cBOT_3 = 0x00; -sal_Char DifParser::cEOD_0 = 'E'; -sal_Char DifParser::cEOD_1 = 'O'; -sal_Char DifParser::cEOD_2 = 'D'; -sal_Char DifParser::cEOD_3 = 0x00; -sal_Char DifParser::c1_0_0 = '1'; -sal_Char DifParser::c1_0_1 = ','; -sal_Char DifParser::c1_0_2 = '0'; -sal_Char DifParser::c1_0_3 = 0x00; -#endif - -#if __ALIGNMENT2 == 1 -UINT16 DifParser::nV = *( ( UINT16* ) "V" ); -#else -sal_Char DifParser::cV_0 = 'V'; -sal_Char DifParser::cV_1 = 0x00; -#endif - - +const sal_Unicode pKeyTABLE[] = { 'T', 'A', 'B', 'L', 'E', 0 }; +const sal_Unicode pKeyVECTORS[] = { 'V', 'E', 'C', 'T', 'O', 'R', 'S', 0 }; +const sal_Unicode pKeyTUPLES[] = { 'T', 'U', 'P', 'L', 'E', 'S', 0 }; +const sal_Unicode pKeyDATA[] = { 'D', 'A', 'T', 'A', 0 }; +const sal_Unicode pKeyBOT[] = { 'B', 'O', 'T', 0 }; +const sal_Unicode pKeyEOD[] = { 'E', 'O', 'D', 0 }; +const sal_Unicode pKeyERROR[] = { 'E', 'R', 'R', 'O', 'R', 0 }; +const sal_Unicode pKeyTRUE[] = { 'T', 'R', 'U', 'E', 0 }; +const sal_Unicode pKeyFALSE[] = { 'F', 'A', 'L', 'S', 'E', 0 }; +const sal_Unicode pKeyNA[] = { 'N', 'A', 0 }; +const sal_Unicode pKeyV[] = { 'V', 0 }; +const sal_Unicode pKey1_0[] = { '1', ',', '0', 0 }; FltError ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, const CharSet eVon, UINT32 nDifOption ) { DifParser aDifParser( rIn, nDifOption, *pDoc, eVon ); + const BOOL bPlain = aDifParser.IsPlain(); UINT16 nBaseTab = rInsPos.Tab(); @@ -136,7 +110,7 @@ FltError ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, BOOL bSyntErrWarn = FALSE; BOOL bOverflowWarn = FALSE; - ByteString& rData = aDifParser.aData; + String& rData = aDifParser.aData; BOOL bData = FALSE; UINT16 nNumCols = 0; @@ -144,7 +118,7 @@ FltError ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, rIn.Seek( 0 ); - FilterProgressBar aPrgrsBar( rIn ); + ScfStreamProgressBar aPrgrsBar( rIn, pDoc->GetDocumentShell() ); while( eTopic != T_DATA && eTopic != T_END ) { @@ -161,7 +135,7 @@ FltError ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, if( aDifParser.nVector != 0 || aDifParser.nVal != 1 ) bSyntErrWarn = TRUE; if( bData ) - pDoc->RenameTab( nBaseTab, String( rData, eVon ) ); + pDoc->RenameTab( nBaseTab, rData ); } break; case T_VECTORS: @@ -261,13 +235,13 @@ FltError ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, aDifParser.nNumFormat ); } else if( rData == pKeyNA || rData == pKeyERROR ) - pCell = new ScStringCell( String( rData, eVon ) ); + pCell = new ScStringCell( rData ); else { - ByteString aTmp( "#IND: " ); + String aTmp( RTL_CONSTASCII_USTRINGPARAM( "#IND: " )); aTmp += rData; - aTmp += '?'; - pCell = new ScStringCell( String( aTmp, eVon ) ); + aTmp += sal_Unicode('?'); + pCell = new ScStringCell( aTmp ); } pDoc->PutCell( nColCnt, nRowCnt, nBaseTab, pCell, ( BOOL ) TRUE ); @@ -286,7 +260,7 @@ FltError ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, if( rData.Len() > 0 ) { pDoc->PutCell( nColCnt, nRowCnt, nBaseTab, - ScBaseCell::CreateTextCell( String( rData, eVon ), pDoc ), ( BOOL ) TRUE ); + ScBaseCell::CreateTextCell( rData, pDoc ), ( BOOL ) TRUE ); } } else @@ -326,6 +300,14 @@ DifParser::DifParser( SvStream& rNewIn, const UINT32 nOption, ScDocument& rDoc, rIn( rNewIn ) { eCharSet = e; + if ( rIn.GetStreamCharSet() != eCharSet ) + { + DBG_ERRORFILE( "CharSet passed overrides and modifies StreamCharSet" ); + rIn.SetStreamCharSet( eCharSet ); + } + if ( eCharSet == RTL_TEXTENCODING_UNICODE ) + rIn.StartReadingUnicodeText(); + bPlain = ( nOption == SC_DIFOPT_PLAIN ); if( bPlain ) @@ -339,22 +321,33 @@ TOPIC DifParser::GetNextTopic( void ) { enum STATE { S_VectorVal, S_Data, S_END, S_START, S_UNKNOWN, S_ERROR_L2 }; - static const sal_Char* ppKeys[] = + static const sal_Unicode pKeyLABEL[] = { 'L', 'A', 'B', 'E', 'L', 0 }; + static const sal_Unicode pKeyCOMMENT[] = { 'C', 'O', 'M', 'M', 'E', 'N', 'T', 0 }; + static const sal_Unicode pKeySIZE[] = { 'S', 'I', 'Z', 'E', 0 }; + static const sal_Unicode pKeyPERIODICITY[] = { 'P', 'E', 'R', 'I', 'O', 'D', 'I', 'C', 'I', 'T', 'Y', 0 }; + static const sal_Unicode pKeyMAJORSTART[] = { 'M', 'A', 'J', 'O', 'R', 'S', 'T', 'A', 'R', 'T', 0 }; + static const sal_Unicode pKeyMINORSTART[] = { 'M', 'I', 'N', 'O', 'R', 'S', 'T', 'A', 'R', 'T', 0 }; + static const sal_Unicode pKeyTRUELENGTH[] = { 'T', 'R', 'U', 'E', 'L', 'E', 'N', 'G', 'T', 'H', 0 }; + static const sal_Unicode pKeyUINITS[] = { 'U', 'I', 'N', 'I', 'T', 'S', 0 }; + static const sal_Unicode pKeyDISPLAYUNITS[] = { 'D', 'I', 'S', 'P', 'L', 'A', 'Y', 'U', 'N', 'I', 'T', 'S', 0 }; + static const sal_Unicode pKeyUNKNOWN[] = { 0 }; + + static const sal_Unicode* ppKeys[] = { pKeyTABLE, // 0 pKeyVECTORS, pKeyTUPLES, pKeyDATA, - "LABEL", - "COMMENT", // 5 - "SIZE", - "PERIODICITY", - "MAJORSTART", - "MINORSTART", - "TRUELENGTH", // 10 - "UINITS", - "DISPLAYUNITS", - "" // 13 + pKeyLABEL, + pKeyCOMMENT, // 5 + pKeySIZE, + pKeyPERIODICITY, + pKeyMAJORSTART, + pKeyMINORSTART, + pKeyTRUELENGTH, // 10 + pKeyUINITS, + pKeyDISPLAYUNITS, + pKeyUNKNOWN // 13 }; static const TOPIC pTopics[] = @@ -377,7 +370,7 @@ TOPIC DifParser::GetNextTopic( void ) STATE eS = S_START; BOOL bValOverflow = FALSE; - ByteString aLine; + String aLine; nVector = 0; nVal = 0; @@ -385,7 +378,7 @@ TOPIC DifParser::GetNextTopic( void ) while( eS != S_END ) { - if( !rIn.ReadLine( aLine ) ) + if( !rIn.ReadUniOrByteStringLine( aLine ) ) { eS = S_END; eRet = T_END; @@ -395,7 +388,7 @@ TOPIC DifParser::GetNextTopic( void ) { case S_START: { - const sal_Char* pRef; + const sal_Unicode* pRef; UINT16 nCnt = 0; BOOL bSearch = TRUE; @@ -425,7 +418,7 @@ TOPIC DifParser::GetNextTopic( void ) break; case S_VectorVal: { - const sal_Char* pCur = aLine.GetBuffer(); + const sal_Unicode* pCur = aLine.GetBuffer(); pCur = ScanIntVal( pCur, nVector ); @@ -455,10 +448,10 @@ TOPIC DifParser::GetNextTopic( void ) #endif case S_UNKNOWN: // 2 Zeilen ueberlesen - rIn.ReadLine( aLine ); + rIn.ReadUniOrByteStringLine( aLine ); case S_ERROR_L2: // Fehler in Line 2 aufgetreten // eine Zeile ueberlesen - rIn.ReadLine( aLine ); + rIn.ReadUniOrByteStringLine( aLine ); eS = S_END; break; #ifdef DBG_UTIL @@ -472,15 +465,16 @@ TOPIC DifParser::GetNextTopic( void ) } -void lcl_DeEscapeQuotesDif( ByteString& rString ) +void lcl_DeEscapeQuotesDif( String& rString ) { // Special handling for DIF import: Escaped (duplicated) quotes are resolved. // Single quote characters are left in place because older versions didn't // escape quotes in strings (and Excel doesn't when using the clipboard). // The quotes around the string are removed before this function is called. + static const sal_Unicode aDQ[] = { '"', '"', 0 }; xub_StrLen nPos = 0; - while ( (nPos = rString.Search( "\"\"", nPos )) != STRING_NOTFOUND ) + while ( (nPos = rString.Search( aDQ, nPos )) != STRING_NOTFOUND ) { rString.Erase( nPos, 1 ); ++nPos; @@ -491,10 +485,10 @@ void lcl_DeEscapeQuotesDif( ByteString& rString ) DATASET DifParser::GetNextDataset( void ) { DATASET eRet = D_UNKNOWN; - ByteString aLine; - const sal_Char* pAkt; + String aLine; + const sal_Unicode* pAkt; - rIn.ReadLine( aLine ); + rIn.ReadUniOrByteStringLine( aLine ); pAkt = aLine.GetBuffer(); @@ -505,7 +499,7 @@ DATASET DifParser::GetNextDataset( void ) if( Is1_0( pAkt ) ) { - rIn.ReadLine( aLine ); + rIn.ReadUniOrByteStringLine( aLine ); if( IsBOT( aLine.GetBuffer() ) ) eRet = D_BOT; else if( IsEOD( aLine.GetBuffer() ) ) @@ -527,7 +521,7 @@ DATASET DifParser::GetNextDataset( void ) else { // ...und zur Strafe mit'm Numberformatter... DBG_ASSERT( pNumFormatter, "-DifParser::GetNextDataset(): No Formatter, more fun!" ); - String aTestVal( pAkt, eCharSet ); + String aTestVal( pAkt ); ULONG nFormat = 0; double fTmpVal; if( pNumFormatter->IsNumberFormat( aTestVal, nFormat, fTmpVal ) ) @@ -539,14 +533,14 @@ DATASET DifParser::GetNextDataset( void ) else eRet = D_SYNT_ERROR; } - rIn.ReadLine( aData ); + rIn.ReadUniOrByteStringLine( aData ); if ( eRet == D_SYNT_ERROR ) { // for broken records write "#ERR: data" to cell - ByteString aTmp( "#ERR: " ); + String aTmp( RTL_CONSTASCII_USTRINGPARAM( "#ERR: " )); aTmp += pAkt; - aTmp += " ("; + aTmp.AppendAscii( " (" ); aTmp += aData; - aTmp += ')'; + aTmp += sal_Unicode(')'); aData = aTmp; eRet = D_STRING; } @@ -555,7 +549,7 @@ DATASET DifParser::GetNextDataset( void ) case '1': // String Data if( Is1_0( aLine.GetBuffer() ) ) { - rIn.ReadLine( aLine ); + rIn.ReadUniOrByteStringLine( aLine ); DBG_ASSERT( aLine.Len() >= 2, "*DifParser::GetNextTopic(): Text ist zu kurz (mind. \"\")!" ); aData = aLine.Copy( 1, aLine.Len() - 2 ); @@ -566,7 +560,7 @@ DATASET DifParser::GetNextDataset( void ) } if( eRet == D_UNKNOWN ) - rIn.ReadLine( aLine ); + rIn.ReadUniOrByteStringLine( aLine ); if( rIn.IsEof() ) eRet = D_EOD; @@ -575,9 +569,9 @@ DATASET DifParser::GetNextDataset( void ) } -const sal_Char* DifParser::ScanIntVal( const sal_Char* pStart, UINT32& rRet ) +const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRet ) { - sal_Char cAkt = *pStart; + sal_Unicode cAkt = *pStart; if( IsNumber( cAkt ) ) rRet = ( UINT32 ) ( cAkt - '0' ); @@ -600,7 +594,7 @@ const sal_Char* DifParser::ScanIntVal( const sal_Char* pStart, UINT32& rRet ) } -BOOL DifParser::ScanFloatVal( const sal_Char* pStart ) +BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) { double fNewVal = 0.0; BOOL bNeg = FALSE; @@ -610,7 +604,7 @@ BOOL DifParser::ScanFloatVal( const sal_Char* pStart ) BOOL bExpOverflow = FALSE; static const UINT16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden! - sal_Char cAkt; + sal_Unicode cAkt; BOOL bRet = FALSE; enum STATE { S_FIRST, S_PRE, S_POST, S_EXP_FIRST, S_EXP, S_END, S_FINDEND }; diff --git a/sc/source/filter/excel/biffdump.cxx b/sc/source/filter/excel/biffdump.cxx index 9b28ff605d7b..e348e4006eeb 100644 --- a/sc/source/filter/excel/biffdump.cxx +++ b/sc/source/filter/excel/biffdump.cxx @@ -2,9 +2,9 @@ * * $RCSfile: biffdump.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: dr $ $Date: 2002-12-09 13:43:55 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ #include <stdlib.h> #include <stdio.h> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #ifndef SC_DOCUMENT_HXX #include "document.hxx" @@ -93,15 +93,17 @@ #ifndef SC_SCGLOB_HXX #include "global.hxx" #endif + +#ifndef SC_FPROGRESSBAR_HXX +#include "fprogressbar.hxx" +#endif #ifndef SC_XLTOOLS_HXX #include "xltools.hxx" #endif + #ifndef _FLTTOOLS_HXX #include "flttools.hxx" #endif -#ifndef _FLTPRGRS_HXX -#include "fltprgrs.hxx" -#endif #ifndef _IMP_OP_HXX #include "imp_op.hxx" #endif @@ -258,8 +260,7 @@ static void __AddPureBin( ByteString& r, UINT32 nVal ) inline static void __AddDec( ByteString& r, UINT32 n ) { sal_Char p[ 32 ]; - sprintf( p, "%u", n ); - + sprintf( p, "%u", n ); // #100211# - checked r += p; } @@ -279,8 +280,7 @@ inline static void __AddDec( ByteString& r, UINT8 n ) inline static void __AddDec( ByteString& r, INT32 n ) { sal_Char p[ 32 ]; - sprintf( p, "%d", n ); - + sprintf( p, "%d", n ); // #100211# - checked r += p; } @@ -290,6 +290,11 @@ inline static void __AddDec( ByteString& r, INT16 n ) __AddDec( r, ( INT32 ) n ); } +inline static void __AddDec( ByteString& r, INT8 n ) +{ + __AddDec( r, ( INT32 ) n ); +} + static void __AddDec( ByteString& r, UINT32 nVal, UINT16 nNumOfDig, sal_Char c = ' ' ) { @@ -313,9 +318,7 @@ inline static void __AddDec1616( ByteString& r, UINT32 n ) static void __AddDouble( ByteString& r, const double f ) { - String aStr; - SolarMath::DoubleToString( aStr, f, 'G', 15, '.', TRUE ); - r += ByteString( aStr, RTL_TEXTENCODING_ASCII_US ); + r += ByteString( ::rtl::math::doubleToString( f, rtl_math_StringFormat_G, 15, '.', TRUE ) ); } @@ -642,8 +645,8 @@ DUMP_ERR::~DUMP_ERR() #define PreDump(LEN) {rIn.PushPosition();ContDump(LEN);rIn.PopPosition();} #define ADDCELLHEAD() {UINT16 nR,nC,nX;rIn>>nR>>nC>>nX;__AddCellHead(t,nC,nR,nX);} #define STARTFLAG() {ADDTEXT( "flags (" ); __AddHex( t, __nFlags ); ADDTEXT( "):" );} -#define ADDFLAG(mask,text) {if( __nFlags & mask ) t += text;} -#define ADDRESERVED(mask) ADDFLAG(mask," !RESERVED!") +#define ADDFLAG(mask,text) {if( __nFlags & mask ) t.Append( ' ' ).Append( text );} +#define ADDRESERVED(mask) ADDFLAG(mask,"!RESERVED!") UINT16 Biff8RecDumper::DumpXF( XclImpStream& rIn, const sal_Char* pPre ) @@ -910,7 +913,7 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) case 0x005D: // OBJ case 0x00EC: // MSODRAWING case 0x01B6: // TXO - pIn->InitializeRecord( FALSE ); + pIn->InitializeRecord( false ); break; default: pIn->InitializeRecord( bReadContRecs ); @@ -1027,9 +1030,9 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { ADDTEXT( " " ); STARTFLAG(); - ADDFLAG( 0x01, " fAlwaysCalc" ); - ADDFLAG( 0x02, " fCalcOnLoad" ); - ADDFLAG( 0x08, " fShrFmla" ); + ADDFLAG( 0x01, "fAlwaysCalc" ); + ADDFLAG( 0x02, "fCalcOnLoad" ); + ADDFLAG( 0x08, "fShrFmla" ); } PRINT(); LINESTART(); @@ -1085,13 +1088,13 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) rIn >> __nFlags >> n8 >> nNameText >> nNameDef >> n16 >> n16 >> n8 >> n8 >> n8 >> n8; LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fHidden" ); - ADDFLAG( 0x0002, " fFunc" ); - ADDFLAG( 0x0004, " fVBProc" ); - ADDFLAG( 0x0008, " fProc" ); - ADDFLAG( 0x0010, " fCalcExp" ); - ADDFLAG( 0x0020, " fBuiltIn" ); - ADDFLAG( 0x1000, " fBig" ); + ADDFLAG( 0x0001, "fHidden" ); + ADDFLAG( 0x0002, "fFunc" ); + ADDFLAG( 0x0004, "fVBProc" ); + ADDFLAG( 0x0008, "fProc" ); + ADDFLAG( 0x0010, "fCalcExp" ); + ADDFLAG( 0x0020, "fBuiltIn" ); + ADDFLAG( 0x1000, "fBig" ); ADDRESERVED( 0xE000 ); ADDTEXT( " Fn grp index: " ); __AddDec( t, (UINT16)((__nFlags & 0x0FC0) >> 6) ); @@ -1192,10 +1195,10 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) ADDTEXT( "/20pt " ); rIn >> __nFlags; STARTFLAG(); - ADDFLAG( 0x0002, " fItalic" ); - ADDFLAG( 0x0008, " fStrikeout" ); - ADDFLAG( 0x0010, " fOutline" ); - ADDFLAG( 0x0020, " fShadow" ); + ADDFLAG( 0x0002, "fItalic" ); + ADDFLAG( 0x0008, "fStrikeout" ); + ADDFLAG( 0x0010, "fOutline" ); + ADDFLAG( 0x0020, "fShadow" ); ADDRESERVED( 0xFFC5 ); PRINT(); LINESTART(); @@ -1236,7 +1239,7 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fReadOnlyRec" ); + ADDFLAG( 0x0001, "fReadOnlyRec" ); PRINT(); } DumpValidPassword( rIn, pPre ); @@ -1260,10 +1263,10 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) rIn >> __nFlags; LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fHidden" ); + ADDFLAG( 0x0001, "fHidden" ); ADDTEXT( " outlnlev=" ); __AddDec( t, (UINT16)((__nFlags & 0x0700) >> 8) ); - ADDFLAG( 0x1000, " fCollapsed" ); + ADDFLAG( 0x1000, "fCollapsed" ); ADDRESERVED( 0xE8FE ); PRINT(); LINESTART(); @@ -1304,22 +1307,22 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) STARTFLAG(); if( __nFlags & 0x00F1 ) { - ADDFLAG( 0x0001, " fShowAutoBreaks" ); - ADDFLAG( 0x0010, " fDialog" ); - ADDFLAG( 0x0020, " fApplyStyles" ); - ADDFLAG( 0x0040, " fRowSumsBelow" ); - ADDFLAG( 0x0080, " fColSumsBelow" ); + ADDFLAG( 0x0001, "fShowAutoBreaks" ); + ADDFLAG( 0x0010, "fDialog" ); + ADDFLAG( 0x0020, "fApplyStyles" ); + ADDFLAG( 0x0040, "fRowSumsBelow" ); + ADDFLAG( 0x0080, "fColSumsBelow" ); PRINT(); LINESTART(); } if( __nFlags & (0xCD00 | 0x320E) ) { ADDTEXT( " " ); - ADDFLAG( 0x0100, " fFitToPage" ); - ADDFLAG( 0x0400, " fDispRowGuts" ); - ADDFLAG( 0x0800, " fDispColGuts" ); - ADDFLAG( 0x4000, " fAee" ); - ADDFLAG( 0x8000, " fAfe" ); + ADDFLAG( 0x0100, "fFitToPage" ); + ADDFLAG( 0x0400, "fDispRowGuts" ); + ADDFLAG( 0x0800, "fDispColGuts" ); + ADDFLAG( 0x4000, "fAee" ); + ADDFLAG( 0x8000, "fAfe" ); ADDRESERVED( 0x320E ); PRINT(); } @@ -1370,12 +1373,12 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) ADDDEC( 2 ); rIn >> __nFlags; STARTFLAG(); - ADDFLAG( 0x0003, " fJoin" ); - ADDFLAG( 0x0004, " fSimpleEq1" ); - ADDFLAG( 0x0008, " fSimpleEq2" ); - ADDFLAG( 0x0010, " fTop10" ); - ADDFLAG( 0x0020, " fTop" ); - ADDFLAG( 0x0040, " fPercent" ); + ADDFLAG( 0x0003, "fJoin" ); + ADDFLAG( 0x0004, "fSimpleEq1" ); + ADDFLAG( 0x0008, "fSimpleEq2" ); + ADDFLAG( 0x0010, "fTop10" ); + ADDFLAG( 0x0020, "fTop" ); + ADDFLAG( 0x0040, "fPercent" ); PRINT(); LINESTART(); if( __nFlags & 0x0003 ) @@ -1487,14 +1490,14 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) LINESTART(); rIn >> __nFlags; STARTFLAG(); - ADDFLAG( 0x0001, " fLeftRight" ); - ADDFLAG( 0x0002, " fPortrait" ); - ADDFLAG( 0x0004, " fNoPrintSettings" ); - ADDFLAG( 0x0008, " fMonochrom" ); - ADDFLAG( 0x0010, " fDraft" ); - ADDFLAG( 0x0020, " fNotes" ); - ADDFLAG( 0x0040, " fNoOrientation" ); - ADDFLAG( 0x0080, " fCustomNumber" ); + ADDFLAG( 0x0001, "fLeftRight" ); + ADDFLAG( 0x0002, "fPortrait" ); + ADDFLAG( 0x0004, "fNoPrintSettings" ); + ADDFLAG( 0x0008, "fMonochrom" ); + ADDFLAG( 0x0010, "fDraft" ); + ADDFLAG( 0x0020, "fNotes" ); + ADDFLAG( 0x0040, "fNoOrientation" ); + ADDFLAG( 0x0080, "fCustomNumber" ); PRINT(); LINESTART(); ADDTEXT( "Print res: " ); ADDDEC( 2 ); @@ -1575,15 +1578,15 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fRowGrand" ); - ADDFLAG( 0x0002, " fColGrand" ); - ADDFLAG( 0x0008, " fAutoFormat" ); - ADDFLAG( 0x0010, " fWidthHeightAuto" ); - ADDFLAG( 0x0020, " fFontAuto" ); - ADDFLAG( 0x0040, " fAlignAuto" ); - ADDFLAG( 0x0080, " fBorderAuto" ); - ADDFLAG( 0x0100, " fPatternAuto" ); - ADDFLAG( 0x0200, " fNumberAuto" ); + ADDFLAG( 0x0001, "fRowGrand" ); + ADDFLAG( 0x0002, "fColGrand" ); + ADDFLAG( 0x0008, "fAutoFormat" ); + ADDFLAG( 0x0010, "fWidthHeightAuto" ); + ADDFLAG( 0x0020, "fFontAuto" ); + ADDFLAG( 0x0040, "fAlignAuto" ); + ADDFLAG( 0x0080, "fBorderAuto" ); + ADDFLAG( 0x0100, "fPatternAuto" ); + ADDFLAG( 0x0200, "fNumberAuto" ); PRINT(); } LINESTART(); @@ -1617,10 +1620,10 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) ADDTEXT( "):" ); if( __nFlags ) { - ADDFLAG( 0x0001, " row" ); - ADDFLAG( 0x0002, " col" ); - ADDFLAG( 0x0004, " page" ); - ADDFLAG( 0x0008, " data" ); + ADDFLAG( 0x0001, "row" ); + ADDFLAG( 0x0002, "col" ); + ADDFLAG( 0x0004, "page" ); + ADDFLAG( 0x0008, "data" ); } else ADDTEXT( " no axis" ); @@ -1634,18 +1637,18 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) ADDTEXT( "):" ); if( __nFlags ) { - ADDFLAG( 0x0001, " Default" ); - ADDFLAG( 0x0002, " Sum" ); - ADDFLAG( 0x0004, " Counta" ); - ADDFLAG( 0x0008, " Average" ); - ADDFLAG( 0x0010, " Max" ); - ADDFLAG( 0x0020, " Min" ); - ADDFLAG( 0x0040, " Product" ); - ADDFLAG( 0x0080, " Count" ); - ADDFLAG( 0x0100, " Stdev" ); - ADDFLAG( 0x0200, " Stddevp" ); - ADDFLAG( 0x0400, " Var" ); - ADDFLAG( 0x0800, " Varp" ); + ADDFLAG( 0x0001, "Default" ); + ADDFLAG( 0x0002, "Sum" ); + ADDFLAG( 0x0004, "Counta" ); + ADDFLAG( 0x0008, "Average" ); + ADDFLAG( 0x0010, "Max" ); + ADDFLAG( 0x0020, "Min" ); + ADDFLAG( 0x0040, "Product" ); + ADDFLAG( 0x0080, "Count" ); + ADDFLAG( 0x0100, "Stdev" ); + ADDFLAG( 0x0200, "Stddevp" ); + ADDFLAG( 0x0400, "Var" ); + ADDFLAG( 0x0800, "Varp" ); } else ADDTEXT( " none" ); @@ -1700,10 +1703,10 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x01, " fHidden" ); - ADDFLAG( 0x02, " fHideDetail" ); - ADDFLAG( 0x04, " fFormula" ); - ADDFLAG( 0x08, " fMissing" ); + ADDFLAG( 0x01, "fHidden" ); + ADDFLAG( 0x02, "fHideDetail" ); + ADDFLAG( 0x04, "fFormula" ); + ADDFLAG( 0x08, "fMissing" ); PRINT(); } LINESTART(); @@ -1771,13 +1774,13 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) LINESTART(); ADDTEXT( pInd ); STARTFLAG(); - ADDFLAG( 0x0001, " fMultiDataName" ); - ADDFLAG( 0x0200, " fSub" ); - ADDFLAG( 0x0400, " fBlock" ); - ADDFLAG( 0x0800, " fGrand" ); - ADDFLAG( 0x1000, " fMultiDataOnAxis" ); - ADDFLAG( 0x2000, " fBlankLine" ); // undocumented - ADDFLAG( 0x4000, " fHideDetail" ); // undocumented + ADDFLAG( 0x0001, "fMultiDataName" ); + ADDFLAG( 0x0200, "fSub" ); + ADDFLAG( 0x0400, "fBlock" ); + ADDFLAG( 0x0800, "fGrand" ); + ADDFLAG( 0x1000, "fMultiDataOnAxis" ); + ADDFLAG( 0x2000, "fBlankLine" ); // undocumented + ADDFLAG( 0x4000, "fHideDetail" ); // undocumented ADDRESERVED( 0x8000 ); PRINT(); LINESTART(); @@ -1966,9 +1969,9 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) ADDTEXT( pPre ); rIn >> __nFlags; STARTFLAG(); - ADDFLAG( 0x0001, " fInIndexList" ); - ADDFLAG( 0x0002, " fNotInList" ); - ADDFLAG( 0x0200, " fLongIndex" ); + ADDFLAG( 0x0001, "fInIndexList" ); + ADDFLAG( 0x0002, "fNotInList" ); + ADDFLAG( 0x0200, "fLongIndex" ); ADDTEXT( " data type: " ); __nFlags &= 0x0DFC; switch( __nFlags ) @@ -2189,33 +2192,33 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) STARTFLAG(); if( __nFlags & 0x009F ) { - ADDFLAG( 0x0001, " fShowAllItems" ); - ADDFLAG( 0x0002, " fDragToRow" ); - ADDFLAG( 0x0004, " fDragToColumn" ); - ADDFLAG( 0x0008, " fDragToPage" ); - ADDFLAG( 0x0010, " fDragToHide" ); - ADDFLAG( 0x0080, " fServerBased" ); + ADDFLAG( 0x0001, "fShowAllItems" ); + ADDFLAG( 0x0002, "fDragToRow" ); + ADDFLAG( 0x0004, "fDragToColumn" ); + ADDFLAG( 0x0008, "fDragToPage" ); + ADDFLAG( 0x0010, "fDragToHide" ); + ADDFLAG( 0x0080, "fServerBased" ); PRINT(); LINESTART(); } if( __nFlags & 0xBF00 ) { ADDTEXT( " " ); - ADDFLAG( 0x0200, " fAutoSort" ); - ADDFLAG( 0x0400, " fAscendSort" ); - ADDFLAG( 0x0800, " fAutoShow" ); - ADDFLAG( 0x1000, " fAscendShow" ); - ADDFLAG( 0x2000, " fCalculatedField" ); + ADDFLAG( 0x0200, "fAutoSort" ); + ADDFLAG( 0x0400, "fAscendSort" ); + ADDFLAG( 0x0800, "fAutoShow" ); + ADDFLAG( 0x1000, "fAscendShow" ); + ADDFLAG( 0x2000, "fCalculatedField" ); PRINT(); LINESTART(); } if( __nFlags & 0x00FF4000 ) { ADDTEXT( " " ); // Layout flags: - ADDFLAG( 0x00004000, " fLONewPage" ); // undocumented - ADDFLAG( 0x00200000, " fLOReport" ); // undocumented - ADDFLAG( 0x00400000, " fLOBlankLine" ); // undocumented - ADDFLAG( 0x00800000, " fLOSubTotalTop" ); // undocumented + ADDFLAG( 0x00004000, "fLONewPage" ); // undocumented + ADDFLAG( 0x00200000, "fLOReport" ); // undocumented + ADDFLAG( 0x00400000, "fLOBlankLine" ); // undocumented + ADDFLAG( 0x00800000, "fLOSubTotalTop" ); // undocumented PRINT(); LINESTART(); } @@ -2308,7 +2311,7 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) LINESTART(); UINT16 __nFlags = Read2( rIn ); STARTFLAG(); - ADDFLAG( 0x0001, " fAuto" ); + ADDFLAG( 0x0001, "fAuto" ); ADDRESERVED( 0xFFFE ); UINT16 nCol1, nRow1, nCol2, nRow2; rIn >> nRow1 >> nRow2 >> nCol1 >> nCol2; @@ -2634,15 +2637,15 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) LINESTART(); UINT16 __nFlags = Read2( rIn ); STARTFLAG(); - ADDFLAG( 0x0001, " fDsplFormulaBar" ); - ADDFLAG( 0x0002, " fDsplStatus" ); - ADDFLAG( 0x0004, " fNoteOff" ); - ADDFLAG( 0x0008, " fDsplHScroll" ); - ADDFLAG( 0x0010, " fDsplVScroll" ); - ADDFLAG( 0x0020, " fBotAdornment" ); - ADDFLAG( 0x0040, " fZoom" ); - ADDFLAG( 0x0080, " fShowPlaceHld" ); - ADDFLAG( 0x0100, " fHideAll" ); + ADDFLAG( 0x0001, "fDsplFormulaBar" ); + ADDFLAG( 0x0002, "fDsplStatus" ); + ADDFLAG( 0x0004, "fNoteOff" ); + ADDFLAG( 0x0008, "fDsplHScroll" ); + ADDFLAG( 0x0010, "fDsplVScroll" ); + ADDFLAG( 0x0020, "fBotAdornment" ); + ADDFLAG( 0x0040, "fZoom" ); + ADDFLAG( 0x0080, "fShowPlaceHld" ); + ADDFLAG( 0x0100, "fHideAll" ); if( !(__nFlags && 0x0180) ) ADDTEXT( " fShowAll" ); PRINT(); @@ -2676,40 +2679,40 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) STARTFLAG(); if( __nFlags & 0x000000FF ) { - ADDFLAG( 0x00000001, " fShowPgBrk" ); - ADDFLAG( 0x00000002, " fDsplForml" ); - ADDFLAG( 0x00000004, " fDsplGrid" ); - ADDFLAG( 0x00000008, " fDsplRCHead" ); - ADDFLAG( 0x00000010, " fDsplGuts" ); - ADDFLAG( 0x00000020, " fDsplZeros" ); - ADDFLAG( 0x00000040, " fPrintHorC" ); - ADDFLAG( 0x00000080, " fPrintVerC" ); + ADDFLAG( 0x00000001, "fShowPgBrk" ); + ADDFLAG( 0x00000002, "fDsplForml" ); + ADDFLAG( 0x00000004, "fDsplGrid" ); + ADDFLAG( 0x00000008, "fDsplRCHead" ); + ADDFLAG( 0x00000010, "fDsplGuts" ); + ADDFLAG( 0x00000020, "fDsplZeros" ); + ADDFLAG( 0x00000040, "fPrintHorC" ); + ADDFLAG( 0x00000080, "fPrintVerC" ); PRINT(); LINESTART(); } if( __nFlags & 0x00007F00 ) { ADDTEXT( " " ); - ADDFLAG( 0x00000100, " fPrintRCHead" ); - ADDFLAG( 0x00000200, " fPrintGrid" ); - ADDFLAG( 0x00000400, " fFitToPage" ); - ADDFLAG( 0x00000800, " fPrintArea" ); - ADDFLAG( 0x00001000, " fOnePrintArea" ); - ADDFLAG( 0x00002000, " fFilter" ); - ADDFLAG( 0x00004000, " fAutoFilter" ); + ADDFLAG( 0x00000100, "fPrintRCHead" ); + ADDFLAG( 0x00000200, "fPrintGrid" ); + ADDFLAG( 0x00000400, "fFitToPage" ); + ADDFLAG( 0x00000800, "fPrintArea" ); + ADDFLAG( 0x00001000, "fOnePrintArea" ); + ADDFLAG( 0x00002000, "fFilter" ); + ADDFLAG( 0x00004000, "fAutoFilter" ); PRINT(); LINESTART(); } if( __nFlags & 0xFFF80000 ) { ADDTEXT( " " ); - ADDFLAG( 0x00020000, " fSplitV" ); - ADDFLAG( 0x00040000, " fSplitH" ); - ADDFLAG( 0x00180000, " fHiddenRow" ); - ADDFLAG( 0x00200000, " fHiddenCol" ); - ADDFLAG( 0x01000000, " fChartSize" ); - ADDFLAG( 0x02000000, " fFilterUnique" ); - ADDFLAG( 0x04000000, " fLayoutView" ); + ADDFLAG( 0x00020000, "fSplitV" ); + ADDFLAG( 0x00040000, "fSplitH" ); + ADDFLAG( 0x00180000, "fHiddenRow" ); + ADDFLAG( 0x00200000, "fHiddenCol" ); + ADDFLAG( 0x01000000, "fChartSize" ); + ADDFLAG( 0x02000000, "fFilterUnique" ); + ADDFLAG( 0x04000000, "fLayoutView" ); ADDRESERVED( 0xF8C18000 ); PRINT(); LINESTART(); @@ -2741,12 +2744,12 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) LINESTART(); rIn >> __nFlags; STARTFLAG(); - ADDFLAG( 0x0001, " fTitles" ); - ADDFLAG( 0x0002, " fRowNums" ); - ADDFLAG( 0x0004, " fDisRefr" ); - ADDFLAG( 0x0080, " fFill" ); - ADDFLAG( 0x0100, " fAutoFmt" ); - ADDFLAG( 0x0400, " fDisEdit" ); + ADDFLAG( 0x0001, "fTitles" ); + ADDFLAG( 0x0002, "fRowNums" ); + ADDFLAG( 0x0004, "fDisRefr" ); + ADDFLAG( 0x0080, "fFill" ); + ADDFLAG( 0x0100, "fAutoFmt" ); + ADDFLAG( 0x0400, "fDisEdit" ); ADDRESERVED( 0xFA78 ); PRINT(); LINESTART(); @@ -2809,7 +2812,7 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) rIn >> __nFlags; ADDTEXT( " " ); STARTFLAG(); - ADDFLAG( 0x0001, " fToughRecalc" ); + ADDFLAG( 0x0001, "fToughRecalc" ); ADDRESERVED( 0xFFFE ); PRINT(); LINESTART(); @@ -3017,9 +3020,9 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) __AddPureBin( t, __nFlags ); ADDTEXT( ")" ); ADDTEXT( "):" ); - ADDFLAG( 0x0001, " fWnClosed" ); - ADDFLAG( 0x0002, " fWnPinned" ); - ADDFLAG( 0x0004, " fCached" ); + ADDFLAG( 0x0001, "fWnClosed" ); + ADDFLAG( 0x0002, "fWnPinned" ); + ADDFLAG( 0x0004, "fCached" ); PRINT(); LINESTART(); ADDTEXT( "input window: " ); @@ -3051,11 +3054,11 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) if( __nFlags ) { ADDTEXT( " " ); - ADDFLAG( 0x00000080, " fStrLookup" ); - ADDFLAG( 0x00000100, " fAllowBlank" ); - ADDFLAG( 0x00000200, " fSuppressCombo" ); - ADDFLAG( 0x00040000, " fShowInputMsg" ); - ADDFLAG( 0x00080000, " fShowErrorMsg" ); + ADDFLAG( 0x00000080, "fStrLookup" ); + ADDFLAG( 0x00000100, "fAllowBlank" ); + ADDFLAG( 0x00000200, "fSuppressCombo" ); + ADDFLAG( 0x00040000, "fShowInputMsg" ); + ADDFLAG( 0x00080000, "fShowErrorMsg" ); } PRINT(); LINESTART(); @@ -3170,12 +3173,12 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) UINT32 __nFlags = Read4( rIn ); LINESTART(); STARTFLAG(); - ADDFLAG( 0x00000001, " fBody" ); - ADDFLAG( 0x00000002, " fAbs" ); - ADDFLAG( 0x00000014, " fDescr" ); - ADDFLAG( 0x00000008, " fMark" ); - ADDFLAG( 0x00000080, " fFrame" ); - ADDFLAG( 0x00000100, " fUNC" ); + ADDFLAG( 0x00000001, "fBody" ); + ADDFLAG( 0x00000002, "fAbs" ); + ADDFLAG( 0x00000014, "fDescr" ); + ADDFLAG( 0x00000008, "fMark" ); + ADDFLAG( 0x00000080, "fFrame" ); + ADDFLAG( 0x00000100, "fUNC" ); ADDRESERVED( 0xFFFFFE60 ); PRINT(); @@ -3347,10 +3350,10 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) STARTFLAG(); ADDTEXT( " outlnlev=" ); __AddDec( t, (UINT16)(__nFlags & 0x0007) ); - ADDFLAG( 0x0010, " fCollapsed" ); - ADDFLAG( 0x0020, " fRowHeightZero" ); - ADDFLAG( 0x0040, " fUnsynced" ); - ADDFLAG( 0x0080, " fGhostDirty" ); + ADDFLAG( 0x0010, "fCollapsed" ); + ADDFLAG( 0x0020, "fRowHeightZero" ); + ADDFLAG( 0x0040, "fUnsynced" ); + ADDFLAG( 0x0080, "fGhostDirty" ); ADDRESERVED( 0xFF08 ); PRINT(); UINT16 nXF; @@ -3359,8 +3362,8 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) ADDTEXT( "ix to XF: " ); __AddDec( t, (UINT16)(nXF & 0x0FFF) ); ADDTEXT( " add. flags(" ); __AddHex( t, nXF ); ADDTEXT( "):" ); - ADDFLAG( 0x1000, " fExAsc" ); - ADDFLAG( 0x2000, " fExDsc" ); + ADDFLAG( 0x1000, "fExAsc" ); + ADDFLAG( 0x2000, "fExDsc" ); ADDRESERVED( 0xC000 ); PRINT(); } @@ -3378,8 +3381,8 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) PRINT(); LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fAlwaysCalc" ); - ADDFLAG( 0x0002, " fCalcOnLoad" ); + ADDFLAG( 0x0001, "fAlwaysCalc" ); + ADDFLAG( 0x0002, "fCalcOnLoad" ); ADDRESERVED( 0xFFFC ); PRINT(); LINESTART(); @@ -3399,10 +3402,10 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) LINESTART(); ADDTEXT( "default row " ); STARTFLAG(); - ADDFLAG( 0x0001, " fUnsynced" ); - ADDFLAG( 0x0002, " fRowHtZero" ); - ADDFLAG( 0x0004, " fExAsc" ); - ADDFLAG( 0x0008, " fExDsc" ); + ADDFLAG( 0x0001, "fUnsynced" ); + ADDFLAG( 0x0002, "fRowHtZero" ); + ADDFLAG( 0x0004, "fExAsc" ); + ADDFLAG( 0x0008, "fExDsc" ); ADDRESERVED( 0xFFF0 ); PRINT(); LINESTART(); @@ -3466,17 +3469,17 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) LINESTART(); rIn >> __nFlags; STARTFLAG(); - ADDFLAG( 0x0001, " fImportPRE" ); - ADDFLAG( 0x0002, " fIgnoreSep" ); - ADDFLAG( 0x0004, " fUseSetting" ); - ADDFLAG( 0x0010, " fIgnoreDate" ); - ADDFLAG( 0x0020, " fWhatIsIt?" ); + ADDFLAG( 0x0001, "fImportPRE" ); + ADDFLAG( 0x0002, "fIgnoreSep" ); + ADDFLAG( 0x0004, "fUseSetting" ); + ADDFLAG( 0x0010, "fIgnoreDate" ); + ADDFLAG( 0x0020, "fWhatIsIt?" ); ADDRESERVED( 0xFFC8 ); PRINT(); LINESTART(); rIn >> __nFlags; STARTFLAG(); - ADDFLAG( 0x0002, " fTables" ); + ADDFLAG( 0x0002, "fTables" ); ADDRESERVED( 0xFFFD ); PRINT(); LINESTART(); @@ -3558,14 +3561,14 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) STARTFLAG(); if( __nFlags ) { - ADDFLAG( 0x00000001, " fWin" ); - ADDFLAG( 0x00000002, " fRisc" ); - ADDFLAG( 0x00000004, " fBeta" ); - ADDFLAG( 0x00000008, " fWinAny" ); - ADDFLAG( 0x00000010, " fMacAny" ); - ADDFLAG( 0x00000020, " fBetaAny" ); - ADDFLAG( 0x00000100, " fRiscAny" ); - ADDFLAG( 0xFFFFE0C0, " fXxxxxxx" ); + ADDFLAG( 0x00000001, "fWin" ); + ADDFLAG( 0x00000002, "fRisc" ); + ADDFLAG( 0x00000004, "fBeta" ); + ADDFLAG( 0x00000008, "fWinAny" ); + ADDFLAG( 0x00000010, "fMacAny" ); + ADDFLAG( 0x00000020, "fBetaAny" ); + ADDFLAG( 0x00000100, "fRiscAny" ); + ADDRESERVED( 0xFFFFE0C0 ); } PRINT(); @@ -3659,8 +3662,8 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fAuto" ); - ADDFLAG( 0x0004, " fDrawTick" ); + ADDFLAG( 0x0001, "fAuto" ); + ADDFLAG( 0x0004, "fDrawTick" ); PRINT(); } LINESTART(); @@ -3700,9 +3703,9 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fAuto" ); - ADDFLAG( 0x0010, " fNoBackg" ); - ADDFLAG( 0x0020, " fNoFore" ); + ADDFLAG( 0x0001, "fAuto" ); + ADDFLAG( 0x0010, "fNoBackg" ); + ADDFLAG( 0x0020, "fNoFore" ); ADDRESERVED( 0xFFCE ); PRINT(); } @@ -3735,8 +3738,8 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x01, " fAuto" ); - ADDFLAG( 0x02, " fInvertNeg" ); + ADDFLAG( 0x01, "fAuto" ); + ADDFLAG( 0x02, "fInvertNeg" ); PRINT(); } } @@ -3768,7 +3771,7 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fVaried" ); + ADDFLAG( 0x0001, "fVaried" ); PRINT(); } LINESTART(); @@ -3819,12 +3822,12 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x01, " fAutoPosition" ); - ADDFLAG( 0x02, " fAutoSeries" ); - ADDFLAG( 0x04, " fAutoPosX" ); - ADDFLAG( 0x08, " fAutoPosY" ); - ADDFLAG( 0x10, " fVert" ); - ADDFLAG( 0x20, " fWasDataTable" ); + ADDFLAG( 0x01, "fAutoPosition" ); + ADDFLAG( 0x02, "fAutoSeries" ); + ADDFLAG( 0x04, "fAutoPosX" ); + ADDFLAG( 0x08, "fAutoPosY" ); + ADDFLAG( 0x10, "fVert" ); + ADDFLAG( 0x20, "fWasDataTable" ); PRINT(); } } @@ -3845,10 +3848,10 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fTranspose" ); - ADDFLAG( 0x0002, " fStacked" ); - ADDFLAG( 0x0004, " f100" ); - ADDFLAG( 0x0008, " fHasShadow" ); + ADDFLAG( 0x0001, "fTranspose" ); + ADDFLAG( 0x0002, "fStacked" ); + ADDFLAG( 0x0004, "f100" ); + ADDFLAG( 0x0008, "fHasShadow" ); PRINT(); } } @@ -3938,9 +3941,9 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fAutoCol" ); - ADDFLAG( 0x0002, " fAutoBack" ); - ADDFLAG( 0x0020, " fAutoRot" ); + ADDFLAG( 0x0001, "fAutoCol" ); + ADDFLAG( 0x0002, "fAutoBack" ); + ADDFLAG( 0x0020, "fAutoRot" ); PRINT(); } LINESTART(); @@ -3969,14 +3972,14 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fAutoMin" ); - ADDFLAG( 0x0002, " fAutoMax" ); - ADDFLAG( 0x0004, " fAutoMajor" ); - ADDFLAG( 0x0008, " fAutoMinor" ); - ADDFLAG( 0x0010, " fAutoCross" ); - ADDFLAG( 0x0020, " fLogScale" ); - ADDFLAG( 0x0040, " fReverse" ); - ADDFLAG( 0x0080, " fMaxCross" ); + ADDFLAG( 0x0001, "fAutoMin" ); + ADDFLAG( 0x0002, "fAutoMax" ); + ADDFLAG( 0x0004, "fAutoMajor" ); + ADDFLAG( 0x0008, "fAutoMinor" ); + ADDFLAG( 0x0010, "fAutoCross" ); + ADDFLAG( 0x0020, "fLogScale" ); + ADDFLAG( 0x0040, "fReverse" ); + ADDFLAG( 0x0080, "fMaxCross" ); PRINT(); } } @@ -3998,9 +4001,9 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fBetween" ); - ADDFLAG( 0x0002, " fMaxCross" ); - ADDFLAG( 0x0004, " fReverse" ); + ADDFLAG( 0x0001, "fBetween" ); + ADDFLAG( 0x0002, "fMaxCross" ); + ADDFLAG( 0x0004, "fReverse" ); PRINT(); } } @@ -4092,18 +4095,18 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fAutoColor" ); - ADDFLAG( 0x0002, " fShowKey" ); - ADDFLAG( 0x0004, " fShowValue" ); - ADDFLAG( 0x0008, " fVert" ); - ADDFLAG( 0x0010, " fAutoText" ); - ADDFLAG( 0x0020, " fGenerated" ); - ADDFLAG( 0x0040, " fDeleted" ); - ADDFLAG( 0x0080, " fAutoMode" ); - ADDFLAG( 0x0800, " fShLabPct" ); - ADDFLAG( 0x1000, " fShowPct" ); - ADDFLAG( 0x2000, " fShowBubbleSizes" ); - ADDFLAG( 0x4000, " fShowLabel" ); + ADDFLAG( 0x0001, "fAutoColor" ); + ADDFLAG( 0x0002, "fShowKey" ); + ADDFLAG( 0x0004, "fShowValue" ); + ADDFLAG( 0x0008, "fVert" ); + ADDFLAG( 0x0010, "fAutoText" ); + ADDFLAG( 0x0020, "fGenerated" ); + ADDFLAG( 0x0040, "fDeleted" ); + ADDFLAG( 0x0080, "fAutoMode" ); + ADDFLAG( 0x0800, "fShLabPct" ); + ADDFLAG( 0x1000, "fShowPct" ); + ADDFLAG( 0x2000, "fShowBubbleSizes" ); + ADDFLAG( 0x4000, "fShowLabel" ); PRINT(); } LINESTART(); @@ -4171,8 +4174,8 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x01, " fAutoSize" ); - ADDFLAG( 0x02, " fAutoPosition" ); + ADDFLAG( 0x01, "fAutoSize" ); + ADDFLAG( 0x02, "fAutoPosition" ); PRINT(); } } @@ -4310,7 +4313,7 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x01, " fCustomIfmt" ); + ADDFLAG( 0x01, "fCustomIfmt" ); PRINT(); } LINESTART(); @@ -4410,14 +4413,14 @@ void Biff8RecDumper::RecDump( BOOL bSubStream ) { LINESTART(); STARTFLAG(); - ADDFLAG( 0x0001, " fAutiMin" ); - ADDFLAG( 0x0002, " fAutoMax" ); - ADDFLAG( 0x0004, " fAutoMajor" ); - ADDFLAG( 0x0008, " fAutoMinor" ); - ADDFLAG( 0x0010, " fDateAxis" ); - ADDFLAG( 0x0020, " fAutoBase" ); - ADDFLAG( 0x0040, " fAutoCross" ); - ADDFLAG( 0x0080, " fAutoDate" ); + ADDFLAG( 0x0001, "fAutoMin" ); + ADDFLAG( 0x0002, "fAutoMax" ); + ADDFLAG( 0x0004, "fAutoMajor" ); + ADDFLAG( 0x0008, "fAutoMinor" ); + ADDFLAG( 0x0010, "fDateAxis" ); + ADDFLAG( 0x0020, "fAutoBase" ); + ADDFLAG( 0x0040, "fAutoCross" ); + ADDFLAG( 0x0080, "fAutoDate" ); PRINT(); } } @@ -4911,9 +4914,9 @@ void Biff8RecDumper::ObjDump( const ULONG nMaxLen ) { ADDTEXT( " " ); STARTFLAG(); - ADDFLAG( 0x0008, " fAsSymbol" ); - ADDFLAG( 0x0002, " fLinked" ); - ADDFLAG( 0x0001, " f1???" ); + ADDFLAG( 0x0008, "fAsSymbol" ); + ADDFLAG( 0x0002, "fLinked" ); + ADDFLAG( 0x0001, "f1???" ); } } break; @@ -4924,12 +4927,12 @@ void Biff8RecDumper::ObjDump( const ULONG nMaxLen ) rIn >> nFmlaLen; if ( sizeof(nFmlaLen) + nFmlaLen == nL ) { - ADDTEXT( "linked\n OLE stream: LNK........ (ID in EXTERNNAME of SUPBOOK)\n XTI: " ); - IGNORE(7); - ADDHEX(2); - ADDTEXT( " Externname: " ); - ADDHEX(2); - IGNORE(3); // MAY be right + ADDTEXT( "linked\n OLE stream: LNK??? (from EXTERNNAME) " ); + rIn >> nFmlaLen; + ADDTEXT( " unknown=" ); ADDHEX( 4 ); + PRINT(); + t.Erase(); + FormulaDump( nFmlaLen, FT_CellFormula ); } else { @@ -4945,22 +4948,20 @@ void Biff8RecDumper::ObjDump( const ULONG nMaxLen ) ADDTEXT( '\n' ); if ( nBytesLeft < 4 ) ADDTEXT( " >> ByteString OVERRUN <<\n" ); - else if ( nBytesLeft == 5 ) + + rIn.Seek( nPos1 + sizeof(nFmlaLen) + nFmlaLen ); + if( rIn.GetRecLeft() == 4 ) { - ADDTEXT( " pad byte " ); - ADDHEX(1); - ADDTEXT( '\n' ); + ADDTEXT( " OLE storage name: MBD" ); + __AddPureHex( t, rIn.ReaduInt32() ); } - else if ( nBytesLeft == 4 ) - ADDTEXT( " no pad byte\n" ); else - ADDTEXT( " oops.. bytes left?!?\n" ); - - ADDTEXT( " OLE stream: MBD" ); - rIn.Seek( nPos1 + sizeof(nFmlaLen) + nFmlaLen ); - UINT32 nOleId; - rIn >> nOleId; - __AddPureHex( t, nOleId ); + { + ADDTEXT( " Ctls stream data: start=" ); + ADDHEX( 4 ); + ADDTEXT( " size=" ); + ADDHEX( 4 ); + } } } break; @@ -5027,12 +5028,10 @@ void Biff8RecDumper::ObjDump( const ULONG nMaxLen ) } -#undef ADDFLAG #undef LINESTART #undef IGNORE #undef ADDHEX #undef ADDDEC -#undef ADDTEXT #undef ADDCOLROW #undef PRINT #undef PreDump @@ -5206,409 +5205,396 @@ void Biff8RecDumper::ContDumpStream( SvStream& rStrm, const ULONG nL ) struct XclDumpFunc { const sal_Char* pName; /// Name of the function. - sal_uInt16 nIndex; /// Excel built-in function index. sal_uInt16 nParam; /// Parameter count for fixed functions. }; const XclDumpFunc pFuncData[] = { - { "COUNT", 0, 0 }, - { "IF", 1, 0 }, - { "ISNA", 2, 1 }, - { "ISERROR", 3, 1 }, - { "SUM", 4, 0 }, - { "AVERAGE", 5, 0 }, - { "MIN", 6, 0 }, - { "MAX", 7, 0 }, - { "ROW", 8, 0 }, - { "COLUMN", 9, 0 }, - { "NA", 10, 0 }, - { "NPV", 11, 0 }, - { "STDEV", 12, 0 }, - { "DOLLAR", 13, 0 }, - { "FIXED", 14, 0 }, - { "SIN", 15, 1 }, - { "COS", 16, 1 }, - { "TAN", 17, 1 }, - { "ATAN", 18, 1 }, - { "PI", 19, 0 }, - { "SQRT", 20, 1 }, - { "EXP", 21, 1 }, - { "LN", 22, 1 }, - { "LOG10", 23, 1 }, - { "ABS", 24, 1 }, - { "INT", 25, 1 }, - { "SIGN", 26, 1 }, - { "ROUND", 27, 2 }, - { "LOOKUP", 28, 0 }, - { "INDEX", 29, 0 }, - { "REPT", 30, 2 }, - { "MID", 31, 3 }, - { "LEN", 32, 1 }, - { "VALUE", 33, 1 }, - { "TRUE", 34, 0 }, - { "FALSE", 35, 0 }, - { "AND", 36, 0 }, - { "OR", 37, 0 }, - { "NOT", 38, 1 }, - { "MOD", 39, 2 }, - { "DCOUNT", 40, 3 }, - { "DSUM", 41, 3 }, - { "DAVERAGE", 42, 3 }, - { "DMIN", 43, 3 }, - { "DMAX", 44, 3 }, - { "DSTDEV", 45, 3 }, - { "VAR", 46, 0 }, - { "DVAR", 47, 3 }, - { "TEXT", 48, 2 }, - { "LINEST", 49, 0 }, - { "TREND", 50, 0 }, - { "LOGEST", 51, 0 }, - { "GROWTH", 52, 0 }, - { "GOTO", 53 }, // macro/internal - { "HALT", 54 }, // macro/internal - { "RETURN", 55 }, // macro/internal - { "PV", 56, 0 }, - { "FV", 57, 0 }, - { "NPER", 58, 0 }, - { "PMT", 59, 0 }, - { "RATE", 60, 0 }, - { "MIRR", 61, 3 }, - { "IRR", 62, 0 }, - { "RAND", 63, 0 }, - { "MATCH", 64, 0 }, - { "DATE", 65, 3 }, - { "TIME", 66, 3 }, - { "DAY", 67, 1 }, - { "MONTH", 68, 1 }, - { "YEAR", 69, 1 }, - { "WEEKDAY", 70, 0 }, - { "HOUR", 71, 1 }, - { "MINUTE", 72, 1 }, - { "SECOND", 73, 1 }, - { "NOW", 74, 0 }, - { "AREAS", 75, 1 }, - { "ROWS", 76, 1 }, - { "COLUMNS", 77, 1 }, - { "OFFSET", 78, 0 }, - { "ABSREF", 79 }, // macro/internal - { "RELREF", 80 }, // macro/internal - { "ARGUMENT", 81 }, // macro/internal - { "SEARCH", 82, 0 }, - { "TRANSPOSE", 83, 1 }, - { "ERROR", 84 }, // macro/internal - { "STEP", 85 }, // macro/internal - { "TYPE", 86, 1 }, - { "ECHO", 87 }, // macro/internal - { "SET.NAME", 88 }, // macro/internal - { "CALLER", 89 }, // macro/internal - { "DEREF", 90 }, // macro/internal - { "WINDOWS", 91 }, // macro/internal - { "SERIES", 92 }, // macro/internal - { "DOCUMENTS", 93 }, // macro/internal - { "ACTIVE.CELL", 94 }, // macro/internal - { "SELECTION", 95 }, // macro/internal - { "RESULT", 96 }, // macro/internal - { "ATAN2", 97, 2 }, - { "ASIN", 98, 1 }, - { "ACOS", 99, 1 }, - { "CHOSE", 100, 0 }, - { "HLOOKUP", 101, 0 }, - { "VLOOKUP", 102, 0 }, - { "LINKS", 103 }, // macro/internal - { "INPUT", 104 }, // macro/internal - { "ISREF", 105, 1 }, - { "GET.FORMULA", 106 }, // macro/internal - { "GET.NAME", 107 }, // macro/internal - { "SET.VALUE", 108, 2 }, // macro/internal - { "LOG", 109, 0 }, - { "EXEC", 110 }, // macro/internal - { "CHAR", 111, 1 }, - { "LOWER", 112, 1 }, - { "UPPER", 113, 1 }, - { "PROPER", 114, 1 }, - { "LEFT", 115, 0 }, - { "RIGHT", 116, 0 }, - { "EXACT", 117, 2 }, - { "TRIM", 118, 1 }, - { "REPLACE", 119, 4 }, - { "SUBSTITUTE", 120, 0 }, - { "CODE", 121, 1 }, - { "NAMES", 122 }, // macro/internal - { "DIRECTORY", 123 }, // macro/internal - { "FIND", 124, 0 }, - { "CELL", 125, 0 }, - { "ISERR", 126, 1 }, - { "ISTEXT", 127, 1 }, - { "ISNUMBER", 128, 1 }, - { "ISBLANK", 129, 1 }, - { "T", 130, 1 }, - { "N", 131, 1 }, - { "FOPEN", 132 }, // macro/internal - { "FCLOSE", 133 }, // macro/internal - { "FSIZE", 134 }, // macro/internal - { "FREADLN", 135 }, // macro/internal - { "FREAD", 136 }, // macro/internal - { "FWRITELN", 137 }, // macro/internal - { "FWRITE", 138 }, // macro/internal - { "FPOS", 139 }, // macro/internal - { "DATEVALUE", 140, 1 }, - { "TIMEVALUE", 141, 1 }, - { "SLN", 142, 3 }, - { "SYD", 143, 4 }, - { "DDB", 144, 0 }, - { "GET.DEF", 145 }, // macro/internal - { "REFTEXT", 146 }, // macro/internal - { "TEXTREF", 147 }, // macro/internal - { "INDIRECT", 148, 0 }, - { "REGISTER", 149 }, // macro/internal - { "CALL", 150 }, // macro/internal - { "ADD.BAR", 151 }, // macro/internal - { "ADD.MENU", 152 }, // macro/internal - { "ADD.COMMAND", 153 }, // macro/internal - { "ENABLE.COMMAND", 154 }, // macro/internal - { "CHECK.COMMAND", 155 }, // macro/internal - { "RENAME.COMMAND", 156 }, // macro/internal - { "SHOW.BAR", 157 }, // macro/internal - { "DELETE.MENU", 158 }, // macro/internal - { "DELETE.COMMAND", 159 }, // macro/internal - { "GET.CHART.ITEM", 160 }, // macro/internal - { "DIALOG.BOX", 161 }, // macro/internal - { "CLEAN", 162, 1 }, - { "MDETERM", 163, 1 }, - { "MINVERSE", 164, 1 }, - { "MMULT", 165, 2 }, - { "FILES", 166 }, // macro/internal - { "IPMT", 167, 0 }, - { "PPMT", 168, 0 }, - { "COUNTA", 169, 0 }, - { "CANCEL.KEY", 170 }, // macro/internal - { "FOR", 171 }, // macro/internal - { "WHILE", 172 }, // macro/internal - { "BREAK", 173 }, // macro/internal - { "NEXT", 174 }, // macro/internal - { "INITIATE", 175 }, // macro/internal - { "REQUEST", 176 }, // macro/internal - { "POKE", 177 }, // macro/internal - { "EXECUTE", 178 }, // macro/internal - { "TERMINATE", 179 }, // macro/internal - { "RESTART", 180 }, // macro/internal - { "HELP", 181 }, // macro/internal - { "GET.BAR", 182 }, // macro/internal - { "PRODUCT", 183, 0 }, - { "FACT", 184, 1 }, - { "GET.CELL", 185 }, // macro/internal - { "GET.WORKSPACE", 186 }, // macro/internal - { "GET.WINDOW", 187 }, // macro/internal - { "GET.DOCUMENT", 188 }, // macro/internal - { "DPRODUCT", 189, 3 }, - { "ISNONTEXT", 190, 1 }, - { "GET.NOTE", 191 }, // macro/internal - { "NOTE", 192 }, // macro/internal - { "STDEVP", 193, 0 }, - { "VARP", 194, 0 }, - { "DSTDDEVP", 195, 3 }, - { "DVARP", 196, 3 }, - { "TRUNC", 197, 0 }, - { "ISLOGICAL", 198, 1 }, - { "DBCOUNTA", 199, 3 }, - { "DELETE.BAR", 200 }, // macro/internal - { "UNREGISTER", 201 }, // macro/internal - { "202", 202 }, // not used - { "203", 203 }, // not used - { "USDOLLAR", 204 }, // macro/internal - { "FINDB", 205 }, // macro/internal - { "SEARCHB", 206 }, // macro/internal - { "REPLACEB", 207 }, // macro/internal - { "LEFTB", 208 }, // macro/internal - { "RIGHTB", 209 }, // macro/internal - { "MIDB", 210 }, // macro/internal - { "LENB", 211 }, // macro/internal - { "ROUNDUP", 212, 2 }, - { "ROUNDDOWN", 213, 2 }, - { "ASC", 214 }, // macro/internal - { "DBSC", 215 }, // macro/internal - { "RANK", 216, 0 }, - { "217", 217 }, // not used - { "218", 218 }, // not used - { "ADDRESS", 219, 0 }, - { "DAYS360", 220, 0 }, - { "TODAY", 221, 0 }, - { "VDB", 222, 0 }, - { "ELSE", 223 }, // macro/internal - { "ELSE.IF", 224 }, // macro/internal - { "END.IF", 225 }, // macro/internal - { "FOR.CELL", 226 }, // macro/internal - { "MEDIAN", 227, 0 }, - { "SUMPRODUCT", 228, 0 }, - { "SINH", 229, 1 }, - { "COSH", 230, 1 }, - { "TANH", 231, 1 }, - { "ASINH", 232, 1 }, - { "ACOSH", 233, 1 }, - { "ATANH", 234, 1 }, - { "DGET", 235, 3 }, - { "CREATE.OBJECT", 236 }, // macro/internal - { "VOLATILE", 237 }, // macro/internal - { "LAST.ERROR", 238 }, // macro/internal - { "CUSTOM.UNDO", 239 }, // macro/internal - { "CUSTOM.REPEAT", 240 }, // macro/internal - { "FORMULA.CONVERT", 241 }, // macro/internal - { "GET.LINK.INFO", 242 }, // macro/internal - { "TEXT.BOX", 243 }, // macro/internal - { "INFO", 244 }, // macro/internal - { "GROUP", 245 }, // macro/internal - { "GET.OBJECT", 246 }, // macro/internal - { "DB", 247, 0 }, - { "PAUSE", 248 }, // macro/internal - { "249", 249 }, // not used - { "250", 250 }, // not used - { "RESUME", 251 }, // macro/internal - { "FREQUENCY", 252, 2 }, - { "ADD.TOOLBAR", 253 }, // macro/internal - { "DELETE.TOOLBAR", 254 }, // macro/internal - { "EXTERNCALL", 255 }, // macro/internal - { "RESET.TOOLBAR", 256 }, // macro/internal - { "EVALUATE", 257 }, // macro/internal - { "GET.TOOLBAR", 258 }, // macro/internal - { "GET.TOOL", 259 }, // macro/internal - { "SPELLING.CHECK", 260 }, // macro/internal - { "ERROR.TYPE", 261, 1 }, - { "APP.TITLE", 262 }, // macro/internal - { "WINDOW.TITLE", 263 }, // macro/internal - { "SAVE.TOOLBAR", 264 }, // macro/internal - { "ENABLE.TOOL", 265 }, // macro/internal - { "PRESS.TOOL", 266 }, // macro/internal - { "REGISTER.ID", 267 }, // macro/internal - { "GET.WORKBOOK", 268 }, // macro/internal - { "AVEDEV", 269, 0 }, - { "BETADIST", 270, 0 }, - { "GAMMALN", 271, 1 }, - { "BETAINV", 272, 0 }, - { "BINOMDIST", 273, 4 }, - { "CHIDIST", 274, 2 }, - { "CHIINV", 275, 2 }, - { "COMBIN", 276, 2 }, - { "CONFIDENCE", 277, 3 }, - { "CRITBINOM", 278, 3 }, - { "EVEN", 279, 1 }, - { "EXPONDIST", 280, 3 }, - { "FDIST", 281, 3 }, - { "FINV", 282, 3 }, - { "FISHER", 283, 1 }, - { "FISHERINV", 284, 1 }, - { "FLOOR", 285, 2 }, - { "GAMMADIST", 286, 4 }, - { "GAMMAINV", 287, 3 }, - { "CEILING", 288, 2 }, - { "HYPGEOMDIST", 289, 4 }, - { "LOGNORMDIST", 290, 3 }, - { "LOGINV", 291, 3 }, - { "NEGBINOMDIST", 292, 3 }, - { "NORMDIST", 293, 4 }, - { "NORMSDIST", 294, 1 }, - { "NORMINV", 295, 3 }, - { "NORMSINV", 296, 1 }, - { "STANDARDIZE", 297, 3 }, - { "ODD", 298, 1 }, - { "PERMUT", 299, 2 }, - { "POISSON", 300, 3 }, - { "TDIST", 301, 3 }, - { "WEIBULL", 302, 4 }, - { "SUMXMY2", 303, 2 }, - { "SUMX2MY2", 304, 2 }, - { "SUMX2PY2", 305, 2 }, - { "CHITEST", 306, 2 }, - { "CORREL", 307, 2 }, - { "COVAR", 308, 2 }, - { "FORECAST", 309, 3 }, - { "FTEST", 310, 2 }, - { "INTERCEPT", 311, 2 }, - { "PEARSON", 312, 2 }, - { "RSQ", 313, 2 }, - { "STEYX", 314, 2 }, - { "SLOPE", 315, 2 }, - { "TTEST", 316, 4 }, - { "PROB", 317, 0 }, - { "DEVSQ", 318, 0 }, - { "GEOMEAN", 319, 0 }, - { "HARMEAN", 320, 0 }, - { "SUMSQ", 321, 0 }, - { "KURT", 322, 0 }, - { "SKEW", 323, 0 }, - { "ZTEST", 324, 0 }, - { "LARGE", 325, 2 }, - { "SMALL", 326, 2 }, - { "QUARTILE", 327, 2 }, - { "PERCENTILE", 328, 2 }, - { "PERCENTRANK", 329, 0 }, - { "MODE", 330, 0 }, - { "TRIMMEAN", 331, 2 }, - { "TINV", 332, 2 }, - { "333", 333 }, // not used - { "MOVIE.COMMAND", 334 }, // macro/internal - { "GET.MOVIE", 335 }, // macro/internal - { "CONCATENATE", 336, 0 }, - { "POWER", 337, 2 }, - { "PIVOT.ADD.DATA", 338 }, // macro/internal - { "GET.PIVOT.TABLE", 339 }, // macro/internal - { "GET.PIVOT.FIELD", 340 }, // macro/internal - { "GET.PIVOT.ITEM", 341 }, // macro/internal - { "RADIANS", 342, 1 }, - { "DEGREES", 343, 1 }, - { "SUBTOTAL", 344, 0 }, - { "SUMIF", 345, 0 }, - { "COUNTIF", 346, 2 }, - { "COUNTBLANK", 347, 1 }, - { "SCENARIO.GET", 348 }, // macro/internal - { "OPTIONS.LISTS.GET",349 }, // macro/internal - { "ISPMT", 350, 4 }, - { "DATEDIF", 351 }, // macro/internal - { "DATESTRING", 352 }, // macro/internal - { "NUMBERSTRING", 353 }, // macro/internal - { "ROMAN", 354, 0 }, - { "OPEN.DIALOG", 355 }, // macro/internal - { "SAVE.DIALOG", 356 }, // macro/internal - { "VIEW.GET", 357 }, // macro/internal - { "GETPIVOTDATA", 358, 0 }, - { "HYPERLINK", 359, 2 }, - { "PHONETIC", 360 }, // macro/internal - { "AVERAGEA", 361, 0 }, - { "MAXA", 362, 0 }, - { "MINA", 363, 0 }, - { "STDEVPA", 364, 0 }, - { "VARPA", 365, 0 }, - { "STDEVA", 366, 0 }, - { "VARA", 367, 0 }, - { "BAHTTEXT", 368, 1 }, - { "THAIDAYOFWEEK", 369 }, // macro/internal - { "THAIDIGIT", 370 }, // macro/internal - { "THAIMONTHOFYEAR", 371 }, // macro/internal - { "THAINUMSOUND", 372 }, // macro/internal - { "THAINUMSTRING", 373 }, // macro/internal - { "THAISTRINGLENGTH", 374 }, // macro/internal - { "ISTHAIDIGIT", 375 }, // macro/internal - { "ROUNDBAHTDOWN", 376 }, // macro/internal - { "ROUNDBAHTUP", 377 }, // macro/internal - { "THAIYEAR", 378 }, // macro/internal - { "RTD", 379 } // macro/internal +/* 0*/ { "COUNT", 0 }, + { "IF", 0 }, + { "ISNA", 1 }, + { "ISERROR", 1 }, + { "SUM", 0 }, +/* 5*/ { "AVERAGE", 0 }, + { "MIN", 0 }, + { "MAX", 0 }, + { "ROW", 0 }, + { "COLUMN", 0 }, +/* 10*/ { "NA", 0 }, + { "NPV", 0 }, + { "STDEV", 0 }, + { "DOLLAR", 0 }, + { "FIXED", 0 }, +/* 15*/ { "SIN", 1 }, + { "COS", 1 }, + { "TAN", 1 }, + { "ATAN", 1 }, + { "PI", 0 }, +/* 20*/ { "SQRT", 1 }, + { "EXP", 1 }, + { "LN", 1 }, + { "LOG10", 1 }, + { "ABS", 1 }, +/* 25*/ { "INT", 1 }, + { "SIGN", 1 }, + { "ROUND", 2 }, + { "LOOKUP", 0 }, + { "INDEX", 0 }, +/* 30*/ { "REPT", 2 }, + { "MID", 3 }, + { "LEN", 1 }, + { "VALUE", 1 }, + { "TRUE", 0 }, +/* 35*/ { "FALSE", 0 }, + { "AND", 0 }, + { "OR", 0 }, + { "NOT", 1 }, + { "MOD", 2 }, +/* 40*/ { "DCOUNT", 3 }, + { "DSUM", 3 }, + { "DAVERAGE", 3 }, + { "DMIN", 3 }, + { "DMAX", 3 }, +/* 45*/ { "DSTDEV", 3 }, + { "VAR", 0 }, + { "DVAR", 3 }, + { "TEXT", 2 }, + { "LINEST", 0 }, +/* 50*/ { "TREND", 0 }, + { "LOGEST", 0 }, + { "GROWTH", 0 }, + { "GOTO" }, // macro/internal + { "HALT" }, // macro/internal +/* 55*/ { "RETURN" }, // macro/internal + { "PV", 0 }, + { "FV", 0 }, + { "NPER", 0 }, + { "PMT", 0 }, +/* 60*/ { "RATE", 0 }, + { "MIRR", 3 }, + { "IRR", 0 }, + { "RAND", 0 }, + { "MATCH", 0 }, +/* 65*/ { "DATE", 3 }, + { "TIME", 3 }, + { "DAY", 1 }, + { "MONTH", 1 }, + { "YEAR", 1 }, +/* 70*/ { "WEEKDAY", 0 }, + { "HOUR", 1 }, + { "MINUTE", 1 }, + { "SECOND", 1 }, + { "NOW", 0 }, +/* 75*/ { "AREAS", 1 }, + { "ROWS", 1 }, + { "COLUMNS", 1 }, + { "OFFSET", 0 }, + { "ABSREF" }, // macro/internal +/* 80*/ { "RELREF" }, // macro/internal + { "ARGUMENT" }, // macro/internal + { "SEARCH", 0 }, + { "TRANSPOSE", 1 }, + { "ERROR" }, // macro/internal +/* 85*/ { "STEP" }, // macro/internal + { "TYPE", 1 }, + { "ECHO" }, // macro/internal + { "SET.NAME" }, // macro/internal + { "CALLER" }, // macro/internal +/* 90*/ { "DEREF" }, // macro/internal + { "WINDOWS" }, // macro/internal + { "SERIES" }, // macro/internal + { "DOCUMENTS" }, // macro/internal + { "ACTIVE.CELL" }, // macro/internal +/* 95*/ { "SELECTION" }, // macro/internal + { "RESULT" }, // macro/internal + { "ATAN2", 2 }, + { "ASIN", 1 }, + { "ACOS", 1 }, +/*100*/ { "CHOSE", 0 }, + { "HLOOKUP", 0 }, + { "VLOOKUP", 0 }, + { "LINKS" }, // macro/internal + { "INPUT" }, // macro/internal +/*105*/ { "ISREF", 1 }, + { "GET.FORMULA" }, // macro/internal + { "GET.NAME" }, // macro/internal + { "SET.VALUE", 2 }, // macro/internal + { "LOG", 0 }, +/*110*/ { "EXEC" }, // macro/internal + { "CHAR", 1 }, + { "LOWER", 1 }, + { "UPPER", 1 }, + { "PROPER", 1 }, +/*115*/ { "LEFT", 0 }, + { "RIGHT", 0 }, + { "EXACT", 2 }, + { "TRIM", 1 }, + { "REPLACE", 4 }, +/*120*/ { "SUBSTITUTE", 0 }, + { "CODE", 1 }, + { "NAMES" }, // macro/internal + { "DIRECTORY" }, // macro/internal + { "FIND", 0 }, +/*125*/ { "CELL", 0 }, + { "ISERR", 1 }, + { "ISTEXT", 1 }, + { "ISNUMBER", 1 }, + { "ISBLANK", 1 }, +/*130*/ { "T", 1 }, + { "N", 1 }, + { "FOPEN" }, // macro/internal + { "FCLOSE" }, // macro/internal + { "FSIZE" }, // macro/internal +/*135*/ { "FREADLN" }, // macro/internal + { "FREAD" }, // macro/internal + { "FWRITELN" }, // macro/internal + { "FWRITE" }, // macro/internal + { "FPOS" }, // macro/internal +/*140*/ { "DATEVALUE", 1 }, + { "TIMEVALUE", 1 }, + { "SLN", 3 }, + { "SYD", 4 }, + { "DDB", 0 }, +/*145*/ { "GET.DEF" }, // macro/internal + { "REFTEXT" }, // macro/internal + { "TEXTREF" }, // macro/internal + { "INDIRECT", 0 }, + { "REGISTER" }, // macro/internal +/*150*/ { "CALL" }, // macro/internal + { "ADD.BAR" }, // macro/internal + { "ADD.MENU" }, // macro/internal + { "ADD.COMMAND" }, // macro/internal + { "ENABLE.COMMAND" }, // macro/internal +/*155*/ { "CHECK.COMMAND" }, // macro/internal + { "RENAME.COMMAND" }, // macro/internal + { "SHOW.BAR" }, // macro/internal + { "DELETE.MENU" }, // macro/internal + { "DELETE.COMMAND" }, // macro/internal +/*160*/ { "GET.CHART.ITEM" }, // macro/internal + { "DIALOG.BOX" }, // macro/internal + { "CLEAN", 1 }, + { "MDETERM", 1 }, + { "MINVERSE", 1 }, +/*165*/ { "MMULT", 2 }, + { "FILES" }, // macro/internal + { "IPMT", 0 }, + { "PPMT", 0 }, + { "COUNTA", 0 }, +/*170*/ { "CANCEL.KEY" }, // macro/internal + { "FOR" }, // macro/internal + { "WHILE" }, // macro/internal + { "BREAK" }, // macro/internal + { "NEXT" }, // macro/internal +/*175*/ { "INITIATE" }, // macro/internal + { "REQUEST" }, // macro/internal + { "POKE" }, // macro/internal + { "EXECUTE" }, // macro/internal + { "TERMINATE" }, // macro/internal +/*180*/ { "RESTART" }, // macro/internal + { "HELP" }, // macro/internal + { "GET.BAR" }, // macro/internal + { "PRODUCT", 0 }, + { "FACT", 1 }, +/*185*/ { "GET.CELL" }, // macro/internal + { "GET.WORKSPACE" }, // macro/internal + { "GET.WINDOW" }, // macro/internal + { "GET.DOCUMENT" }, // macro/internal + { "DPRODUCT", 3 }, +/*190*/ { "ISNONTEXT", 1 }, + { "GET.NOTE" }, // macro/internal + { "NOTE" }, // macro/internal + { "STDEVP", 0 }, + { "VARP", 0 }, +/*195*/ { "DSTDDEVP", 3 }, + { "DVARP", 3 }, + { "TRUNC", 0 }, + { "ISLOGICAL", 1 }, + { "DBCOUNTA", 3 }, +/*200*/ { "DELETE.BAR" }, // macro/internal + { "UNREGISTER" }, // macro/internal + { "202" }, // not used + { "203" }, // not used + { "USDOLLAR" }, // macro/internal +/*205*/ { "FINDB" }, // macro/internal + { "SEARCHB" }, // macro/internal + { "REPLACEB" }, // macro/internal + { "LEFTB" }, // macro/internal + { "RIGHTB" }, // macro/internal +/*210*/ { "MIDB" }, // macro/internal + { "LENB" }, // macro/internal + { "ROUNDUP", 2 }, + { "ROUNDDOWN", 2 }, + { "ASC" }, // macro/internal +/*215*/ { "DBSC" }, // macro/internal + { "RANK", 0 }, + { "217" }, // not used + { "218" }, // not used + { "ADDRESS", 0 }, +/*220*/ { "DAYS360", 0 }, + { "TODAY", 0 }, + { "VDB", 0 }, + { "ELSE" }, // macro/internal + { "ELSE.IF" }, // macro/internal +/*225*/ { "END.IF" }, // macro/internal + { "FOR.CELL" }, // macro/internal + { "MEDIAN", 0 }, + { "SUMPRODUCT", 0 }, + { "SINH", 1 }, +/*230*/ { "COSH", 1 }, + { "TANH", 1 }, + { "ASINH", 1 }, + { "ACOSH", 1 }, + { "ATANH", 1 }, +/*235*/ { "DGET", 3 }, + { "CREATE.OBJECT" }, // macro/internal + { "VOLATILE" }, // macro/internal + { "LAST.ERROR" }, // macro/internal + { "CUSTOM.UNDO" }, // macro/internal +/*240*/ { "CUSTOM.REPEAT" }, // macro/internal + { "FORMULA.CONVERT" }, // macro/internal + { "GET.LINK.INFO" }, // macro/internal + { "TEXT.BOX" }, // macro/internal + { "INFO" }, // macro/internal +/*245*/ { "GROUP" }, // macro/internal + { "GET.OBJECT" }, // macro/internal + { "DB", 0 }, + { "PAUSE" }, // macro/internal + { "249" }, // not used +/*250*/ { "250" }, // not used + { "RESUME" }, // macro/internal + { "FREQUENCY", 2 }, + { "ADD.TOOLBAR" }, // macro/internal + { "DELETE.TOOLBAR" }, // macro/internal +/*255*/ { "EXTERN.CALL" }, // macro/internal + { "RESET.TOOLBAR" }, // macro/internal + { "EVALUATE" }, // macro/internal + { "GET.TOOLBAR" }, // macro/internal + { "GET.TOOL" }, // macro/internal +/*260*/ { "SPELLING.CHECK" }, // macro/internal + { "ERROR.TYPE", 1 }, + { "APP.TITLE" }, // macro/internal + { "WINDOW.TITLE" }, // macro/internal + { "SAVE.TOOLBAR" }, // macro/internal +/*265*/ { "ENABLE.TOOL" }, // macro/internal + { "PRESS.TOOL" }, // macro/internal + { "REGISTER.ID" }, // macro/internal + { "GET.WORKBOOK" }, // macro/internal + { "AVEDEV", 0 }, +/*270*/ { "BETADIST", 0 }, + { "GAMMALN", 1 }, + { "BETAINV", 0 }, + { "BINOMDIST", 4 }, + { "CHIDIST", 2 }, +/*275*/ { "CHIINV", 2 }, + { "COMBIN", 2 }, + { "CONFIDENCE", 3 }, + { "CRITBINOM", 3 }, + { "EVEN", 1 }, +/*280*/ { "EXPONDIST", 3 }, + { "FDIST", 3 }, + { "FINV", 3 }, + { "FISHER", 1 }, + { "FISHERINV", 1 }, +/*285*/ { "FLOOR", 2 }, + { "GAMMADIST", 4 }, + { "GAMMAINV", 3 }, + { "CEILING", 2 }, + { "HYPGEOMDIST", 4 }, +/*290*/ { "LOGNORMDIST", 3 }, + { "LOGINV", 3 }, + { "NEGBINOMDIST", 3 }, + { "NORMDIST", 4 }, + { "NORMSDIST", 1 }, +/*295*/ { "NORMINV", 3 }, + { "NORMSINV", 1 }, + { "STANDARDIZE", 3 }, + { "ODD", 1 }, + { "PERMUT", 2 }, +/*300*/ { "POISSON", 3 }, + { "TDIST", 3 }, + { "WEIBULL", 4 }, + { "SUMXMY2", 2 }, + { "SUMX2MY2", 2 }, +/*305*/ { "SUMX2PY2", 2 }, + { "CHITEST", 2 }, + { "CORREL", 2 }, + { "COVAR", 2 }, + { "FORECAST", 3 }, +/*310*/ { "FTEST", 2 }, + { "INTERCEPT", 2 }, + { "PEARSON", 2 }, + { "RSQ", 2 }, + { "STEYX", 2 }, +/*315*/ { "SLOPE", 2 }, + { "TTEST", 4 }, + { "PROB", 0 }, + { "DEVSQ", 0 }, + { "GEOMEAN", 0 }, +/*320*/ { "HARMEAN", 0 }, + { "SUMSQ", 0 }, + { "KURT", 0 }, + { "SKEW", 0 }, + { "ZTEST", 0 }, +/*325*/ { "LARGE", 2 }, + { "SMALL", 2 }, + { "QUARTILE", 2 }, + { "PERCENTILE", 2 }, + { "PERCENTRANK", 0 }, +/*330*/ { "MODE", 0 }, + { "TRIMMEAN", 2 }, + { "TINV", 2 }, + { "333" }, // not used + { "MOVIE.COMMAND" }, // macro/internal +/*335*/ { "GET.MOVIE" }, // macro/internal + { "CONCATENATE", 0 }, + { "POWER", 2 }, + { "PIVOT.ADD.DATA" }, // macro/internal + { "GET.PIVOT.TABLE" }, // macro/internal +/*340*/ { "GET.PIVOT.FIELD" }, // macro/internal + { "GET.PIVOT.ITEM" }, // macro/internal + { "RADIANS", 1 }, + { "DEGREES", 1 }, + { "SUBTOTAL", 0 }, +/*345*/ { "SUMIF", 0 }, + { "COUNTIF", 2 }, + { "COUNTBLANK", 1 }, + { "SCENARIO.GET" }, // macro/internal + { "OPTIONS.LISTS.GET" }, // macro/internal +/*350*/ { "ISPMT", 4 }, + { "DATEDIF" }, // macro/internal + { "DATESTRING" }, // macro/internal + { "NUMBERSTRING" }, // macro/internal + { "ROMAN", 0 }, +/*355*/ { "OPEN.DIALOG" }, // macro/internal + { "SAVE.DIALOG" }, // macro/internal + { "VIEW.GET" }, // macro/internal + { "GETPIVOTDATA", 0 }, + { "HYPERLINK", 2 }, +/*360*/ { "PHONETIC" }, // macro/internal + { "AVERAGEA", 0 }, + { "MAXA", 0 }, + { "MINA", 0 }, + { "STDEVPA", 0 }, +/*365*/ { "VARPA", 0 }, + { "STDEVA", 0 }, + { "VARA", 0 }, + { "BAHTTEXT", 1 }, + { "THAIDAYOFWEEK" }, // macro/internal +/*370*/ { "THAIDIGIT" }, // macro/internal + { "THAIMONTHOFYEAR" }, // macro/internal + { "THAINUMSOUND" }, // macro/internal + { "THAINUMSTRING" }, // macro/internal + { "THAISTRINGLENGTH" }, // macro/internal +/*375*/ { "ISTHAIDIGIT" }, // macro/internal + { "ROUNDBAHTDOWN" }, // macro/internal + { "ROUNDBAHTUP" }, // macro/internal + { "THAIYEAR" }, // macro/internal + { "RTD" } // macro/internal }; const XclDumpFunc* lcl_GetFuncData( sal_uInt16 nIndex ) { - const XclDumpFunc* pFirst = pFuncData; - const XclDumpFunc* pLast = pFuncData + sizeof( pFuncData ) / sizeof( XclDumpFunc ) - 1; - while( pFirst <= pLast ) - { - const XclDumpFunc* pCurr = pFirst + (pLast - pFirst) / 2; - if( pCurr->nIndex > nIndex ) - pLast = pCurr - 1; - else if( pCurr->nIndex < nIndex ) - pFirst = pCurr + 1; - else - return pCurr; - } - return NULL; + return (nIndex < STATIC_TABLE_SIZE( pFuncData )) ? (pFuncData + nIndex) : NULL; } @@ -5985,7 +5971,7 @@ void Biff8RecDumper::FormulaDump( const UINT16 nL, const FORMULA_TYPE eFT ) break; case 0x1D: // Boolean [315 266] STARTTOKEN( "Bool" ); - aOperand += pIn->ReaduInt8() ? "FALSE" : "TRUE"; + aOperand += pIn->ReaduInt8() ? "TRUE" : "FALSE"; t += aOperand; aStack.PushOperand( aOperand ); break; @@ -6246,26 +6232,438 @@ void Biff8RecDumper::FormulaDump( const UINT16 nL, const FORMULA_TYPE eFT ) } -void Biff8RecDumper::ControlsDump( SvStream& rIn ) + + +/** Import from bytestream. */ +SvStream& operator>>( SvStream& rStrm, XclGuid& rGuid ) { - if( !pDumpStream ) - return; + rStrm.Read( rGuid.mpData, 16 ); + return rStrm; +} - rIn.Seek( STREAM_SEEK_TO_END ); - ULONG nLen = rIn.Tell(); - rIn.Seek( STREAM_SEEK_TO_BEGIN ); +/** Output as text. */ +SvStream& operator<<( SvStream& rStrm, const XclGuid& rGuid ) +{ + ByteString aOut; + __AddPureHex( aOut, SVBT32ToLong( rGuid.mpData ) ); + aOut.Append( '-' ); + __AddPureHex( aOut, SVBT16ToShort( rGuid.mpData + 4 ) ); + aOut.Append( '-' ); + __AddPureHex( aOut, SVBT16ToShort( rGuid.mpData + 6 ) ); + aOut.Append( '-' ); + __AddPureHex( aOut, rGuid.mpData[ 8 ] ); + __AddPureHex( aOut, rGuid.mpData[ 9 ] ); + aOut.Append( '-' ); + __AddPureHex( aOut, rGuid.mpData[ 10 ] ); + __AddPureHex( aOut, rGuid.mpData[ 11 ] ); + __AddPureHex( aOut, rGuid.mpData[ 12 ] ); + __AddPureHex( aOut, rGuid.mpData[ 13 ] ); + __AddPureHex( aOut, rGuid.mpData[ 14 ] ); + __AddPureHex( aOut, rGuid.mpData[ 15 ] ); + return rStrm << aOut.GetBuffer(); +} - if( nLen == ~0UL ) - return; +// *** yet some other ugly macros for the specials of form control dumping *** + +// align the instream +#define EXC_CTRLDUMP_ALIGN_INSTRM( val ) rInStrm.Seek( (rInStrm.Tell()+(val)-1) & ~((val)-1) ) +// push the string to outstream +#define EXC_CTRLDUMP_PRINT() { if( t.Len() ) { rOutStrm << t.GetBuffer() << '\n'; t.Erase(); } } +#define EXC_CTRLDUMP_PRINTC() { if( t.Len() > 60 ) EXC_CTRLDUMP_PRINT(); } + +// implementation, don't use +#define IMPL_EXC_CTRLDUMP_VALUE( type, func, text ) { EXC_CTRLDUMP_ALIGN_INSTRM( sizeof( type ) ); type n; rInStrm >> n; t += " " text "="; func( t, n ); EXC_CTRLDUMP_PRINTC(); } +#define IMPL_EXC_CTRLDUMP_VAR( var, mask, func, text ) { EXC_CTRLDUMP_ALIGN_INSTRM( sizeof( var ) ); rInStrm >> var; var &= (mask); t += " " text "="; func( t, var ); EXC_CTRLDUMP_PRINTC(); } + +// read a value from stream +#define EXC_CTRLDUMP_HEX4( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_uInt32, __AddHex, text ) +#define EXC_CTRLDUMP_DEC4( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_Int32, __AddDec, text ) +#define EXC_CTRLDUMP_HEX2( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_uInt16, __AddHex, text ) +#define EXC_CTRLDUMP_DEC2( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_Int16, __AddDec, text ) +#define EXC_CTRLDUMP_HEX1( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_uInt8, __AddHex, text ) +#define EXC_CTRLDUMP_DEC1( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_Int8, __AddDec, text ) +// read a value from stream into existing variable +#define EXC_CTRLDUMP_HEXVAR( var, text ) IMPL_EXC_CTRLDUMP_VAR( var, ~0, __AddHex, text ) +#define EXC_CTRLDUMP_DECVAR( var, text ) IMPL_EXC_CTRLDUMP_VAR( var, ~0, __AddDec, text ) +#define EXC_CTRLDUMP_HEXVARMASK( var, mask, text ) IMPL_EXC_CTRLDUMP_VAR( var, mask, __AddHex, text ) +#define EXC_CTRLDUMP_DECVARMASK( var, mask, text ) IMPL_EXC_CTRLDUMP_VAR( var, mask, __AddDec, text ) +// read a string +#define EXC_CTRLDUMP_STRING( var, text ) \ +if( var ) \ +{ \ + EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); \ + if( var > 128 ) var = 128; \ + sal_Char* p = new sal_Char[ var + 1 ]; \ + rInStrm.Read( p, var ); p[ var ] = '\0'; \ + t.Append( " " text "='" ).Append( p ).Append( '\'' ); \ + delete [] p; \ + EXC_CTRLDUMP_PRINTC(); \ +} +// read flag fields +#define EXC_CTRLDUMP_STARTFLAG( text ) { EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); rInStrm >> __nFlags; t += " " text "="; __AddHex( t, __nFlags ); } +#define EXC_CTRLDUMP_ADDFLAG( flag, text ) { if( __nFlags & (flag) ) t += " -" text; EXC_CTRLDUMP_PRINTC(); } +#define EXC_CTRLDUMP_ENDFLAG( reserved ) EXC_CTRLDUMP_ADDFLAG( reserved, "!unknown!" ) +// read coordinates +#define EXC_CTRLDUMP_COORD( text ) { EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); EXC_CTRLDUMP_DEC2( text "-x" ); EXC_CTRLDUMP_DEC2( "y" ); } +#define EXC_CTRLDUMP_SIZE() { EXC_CTRLDUMP_DEC4( "width" ); EXC_CTRLDUMP_DEC4( "height" ); } + +// *** macros end *** - *pDumpStream << "### start Ctls stream ###\n"; - while( nLen ) +void Biff8RecDumper::ControlsDump( SvStream& rInStrm ) +{ + static const XclGuid aPushButtonGuid( 0xD7053240, 0xCE69, 0x11CD, 0xA7, 0x77, 0x00, 0xDD, 0x01, 0x14, 0x3C, 0x57 ); + static const XclGuid aToggleButtonGuid( 0x8BD21D60, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 ); + static const XclGuid aCheckBoxGuid( 0x8BD21D40, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 ); + static const XclGuid aRadioButtonGuid( 0x8BD21D50, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 ); + static const XclGuid aLabelGuid( 0x978C9E23, 0xD4B0, 0x11CE, 0xBF, 0x2D, 0x00, 0xAA, 0x00, 0x3F, 0x40, 0xD0 ); + static const XclGuid aEditGuid( 0x8BD21D10, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 ); + static const XclGuid aListBoxGuid( 0x8BD21D20, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 ); + static const XclGuid aComboBoxGuid( 0x8BD21D30, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 ); + static const XclGuid aSpinGuid( 0x79176FB0, 0xB7F2, 0x11CE, 0x97, 0xEF, 0x00, 0xAA, 0x00, 0x6D, 0x27, 0x76 ); + static const XclGuid aScrollBarGuid( 0xDFD181E0, 0x5E2F, 0x11CE, 0xA4, 0x49, 0x00, 0xAA, 0x00, 0x4A, 0x80, 0x3D ); + + if( !pDumpStream ) return; + rInStrm.Seek( STREAM_SEEK_TO_END ); + sal_uInt32 nInSize = rInStrm.Tell(); + rInStrm.Seek( STREAM_SEEK_TO_BEGIN ); + if( nInSize == ~0UL ) return; + + SvStream& rOutStrm = *pDumpStream; + rOutStrm << "\n\n\n-- Ctls stream dump --\n"; + + enum { + xlCtrlPushButton, + xlCtrlToggleButton, + xlCtrlCheckBox, + xlCtrlRadioButton, + xlCtrlLabel, + xlCtrlEdit, + xlCtrlListBox, + xlCtrlComboBox, + xlCtrlSpin, + xlCtrlScrollBar, + xlCtrlUnknown + } eCtrlType = xlCtrlUnknown; + + while( rInStrm.Tell() < nInSize ) { - UINT16 nPart = ( nLen >= 1024 )? 1024 : ( UINT16 ) nLen; - ContDumpStream( rIn, nPart ); - nLen -= nPart; + ByteString t; // "t" needed for macros + sal_uInt32 __nFlags; // "__nFlags" needed for macros + sal_uInt16 nId, nSize; + sal_uInt32 nNextPos; + + // stream position + __AddHex( t, rInStrm.Tell() ); + rOutStrm << '\n' << t.GetBuffer() << ": "; + + // control type + XclGuid aGuid; + rInStrm >> aGuid >> nId >> nSize; + nNextPos = rInStrm.Tell() + nSize; + + if( aGuid == aPushButtonGuid ) eCtrlType = xlCtrlPushButton; + else if( aGuid == aToggleButtonGuid ) eCtrlType = xlCtrlToggleButton; + else if( aGuid == aCheckBoxGuid ) eCtrlType = xlCtrlCheckBox; + else if( aGuid == aRadioButtonGuid ) eCtrlType = xlCtrlRadioButton; + else if( aGuid == aLabelGuid ) eCtrlType = xlCtrlLabel; + else if( aGuid == aEditGuid ) eCtrlType = xlCtrlEdit; + else if( aGuid == aListBoxGuid ) eCtrlType = xlCtrlListBox; + else if( aGuid == aComboBoxGuid ) eCtrlType = xlCtrlComboBox; + else if( aGuid == aSpinGuid ) eCtrlType = xlCtrlSpin; + else if( aGuid == aScrollBarGuid ) eCtrlType = xlCtrlScrollBar; + else eCtrlType = xlCtrlUnknown; + + // write control type + rOutStrm << aGuid << " ("; + switch( eCtrlType ) + { + case xlCtrlPushButton: rOutStrm << "PushButton"; break; + case xlCtrlToggleButton: rOutStrm << "ToggleButton"; break; + case xlCtrlCheckBox: rOutStrm << "CheckBox"; break; + case xlCtrlRadioButton: rOutStrm << "RadioButton"; break; + case xlCtrlLabel: rOutStrm << "Label"; break; + case xlCtrlEdit: rOutStrm << "Edit"; break; + case xlCtrlListBox: rOutStrm << "ListBox"; break; + case xlCtrlComboBox: rOutStrm << "ComboBox"; break; + case xlCtrlSpin: rOutStrm << "Spin"; break; + case xlCtrlScrollBar: rOutStrm << "ScrollBar"; break; + default: rOutStrm << "*UNKNOWN*"; + } + rOutStrm << ")\n"; + + // control data + t = "id="; __AddHex( t, nId ); t += " size="; __AddHex( t, nSize ); + rOutStrm << t.GetBuffer() << " (control data)\n"; + t.Erase(); + + switch( eCtrlType ) + { + case xlCtrlPushButton: + { + sal_uInt32 nCaptionLen = 0; + + EXC_CTRLDUMP_STARTFLAG( "content-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x0001, "forecolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x0002, "backcolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x0004, "option" ); + EXC_CTRLDUMP_ADDFLAG( 0x0008, "caption" ); + EXC_CTRLDUMP_ADDFLAG( 0x0010, "picpos" ); + EXC_CTRLDUMP_ADDFLAG( 0x0040, "mouseptr" ); + EXC_CTRLDUMP_ADDFLAG( 0x0080, "pic" ); + EXC_CTRLDUMP_ADDFLAG( 0x0100, "accel" ); + EXC_CTRLDUMP_ADDFLAG( 0x0400, "icon" ); + EXC_CTRLDUMP_ENDFLAG( 0xFFFFFA00 ); // 0x20 always(?) + sal_uInt32 nCtrlFlags = __nFlags; + + if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_HEX4( "forecolor" ); + if( nCtrlFlags & 0x0002 ) EXC_CTRLDUMP_HEX4( "backcolor" ); + if( nCtrlFlags & 0x0004 ) + { + EXC_CTRLDUMP_STARTFLAG( "option-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000004, "locked" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000008, "backstyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x00800000, "wordwrap" ); + EXC_CTRLDUMP_ADDFLAG( 0x10000000, "autosize" ); + EXC_CTRLDUMP_ENDFLAG( 0xEF7FFFF1 ); + } + if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_DECVARMASK( nCaptionLen, 0x7FFFFFFF, "caption-len" ); + if( nCtrlFlags & 0x0010 ) EXC_CTRLDUMP_COORD( "picpos" ); + if( nCtrlFlags & 0x0040 ) EXC_CTRLDUMP_HEX2( "mouseptr" ); + if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_HEX2( "pic-len" ); + if( nCtrlFlags & 0x0100 ) EXC_CTRLDUMP_HEX2( "accel" ); + if( nCtrlFlags & 0x0400 ) EXC_CTRLDUMP_HEX2( "icon-len" ); + EXC_CTRLDUMP_STRING( nCaptionLen, "caption" ); + EXC_CTRLDUMP_SIZE(); + } + break; + case xlCtrlToggleButton: + case xlCtrlCheckBox: + case xlCtrlRadioButton: + case xlCtrlEdit: + case xlCtrlListBox: + case xlCtrlComboBox: + { + sal_uInt32 nCaptionLen = 0; + sal_uInt32 nValueLen = 0; + sal_uInt32 nGroupNameLen = 0; + + EXC_CTRLDUMP_STARTFLAG( "content-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000001, "option" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000002, "backcolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000004, "forecolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000008, "maxlen" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000010, "borderstyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000020, "scrollbars" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000040, "style" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000080, "mouseptr" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000200, "password" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000400, "listwidth" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000800, "boundcol" ); + EXC_CTRLDUMP_ADDFLAG( 0x00001000, "textcol" ); + EXC_CTRLDUMP_ADDFLAG( 0x00002000, "colcount" ); + EXC_CTRLDUMP_ADDFLAG( 0x00004000, "listrows" ); + EXC_CTRLDUMP_ADDFLAG( 0x00008000, "colwidth?" ); + EXC_CTRLDUMP_ADDFLAG( 0x00010000, "matchentry" ); + EXC_CTRLDUMP_ADDFLAG( 0x00020000, "liststyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x00040000, "showdropbtn" ); + EXC_CTRLDUMP_ADDFLAG( 0x00100000, "dropbtnstyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x00200000, "multistate" ); + EXC_CTRLDUMP_ADDFLAG( 0x00400000, "value" ); + EXC_CTRLDUMP_ADDFLAG( 0x00800000, "caption" ); + EXC_CTRLDUMP_ADDFLAG( 0x01000000, "pos" ); + EXC_CTRLDUMP_ADDFLAG( 0x02000000, "bordercolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x04000000, "specialeff" ); + EXC_CTRLDUMP_ADDFLAG( 0x08000000, "icon" ); + EXC_CTRLDUMP_ADDFLAG( 0x10000000, "pic" ); + EXC_CTRLDUMP_ADDFLAG( 0x20000000, "accel" ); + EXC_CTRLDUMP_ENDFLAG( 0x40080000 ); // 0x80000100 always set? + sal_uInt32 nCtrlFlags = __nFlags; + + EXC_CTRLDUMP_STARTFLAG( "2nd-content-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000001, "groupname" ); + EXC_CTRLDUMP_ENDFLAG( 0xFFFFFFFE ); + sal_uInt32 nCtrlFlags2 = __nFlags; + + if( nCtrlFlags & 0x00000001 ) + { + EXC_CTRLDUMP_STARTFLAG( "option-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000004, "locked" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000008, "backstyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000400, "colheads" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000800, "intheight" ); + EXC_CTRLDUMP_ADDFLAG( 0x00001000, "matchreq" ); + EXC_CTRLDUMP_ADDFLAG( 0x00002000, "align" ); + EXC_CTRLDUMP_ADDFLAG( 0x00080000, "dragbehav" ); + EXC_CTRLDUMP_ADDFLAG( 0x00100000, "enterkeybehav" ); + EXC_CTRLDUMP_ADDFLAG( 0x00200000, "enterfieldbehav" ); + EXC_CTRLDUMP_ADDFLAG( 0x00400000, "tabkeybehav" ); + EXC_CTRLDUMP_ADDFLAG( 0x00800000, "wordwrap" ); + EXC_CTRLDUMP_ADDFLAG( 0x04000000, "selmargin" ); + EXC_CTRLDUMP_ADDFLAG( 0x08000000, "autowordsel" ); + EXC_CTRLDUMP_ADDFLAG( 0x10000000, "autosize" ); + EXC_CTRLDUMP_ADDFLAG( 0x20000000, "hidesel" ); + EXC_CTRLDUMP_ADDFLAG( 0x40000000, "autotab" ); + EXC_CTRLDUMP_ADDFLAG( 0x80000000, "multiline" ); + EXC_CTRLDUMP_ENDFLAG( 0x0307C3F1 ); + } + if( nCtrlFlags & 0x00000002 ) EXC_CTRLDUMP_HEX4( "backcolor" ); + if( nCtrlFlags & 0x00000004 ) EXC_CTRLDUMP_HEX4( "forecolor" ); + if( nCtrlFlags & 0x00000008 ) EXC_CTRLDUMP_DEC4( "maxlen" ); + if( nCtrlFlags & 0x00000010 ) EXC_CTRLDUMP_DEC1( "borderstyle" ); + if( nCtrlFlags & 0x00000020 ) EXC_CTRLDUMP_DEC1( "scrollbars" ); + if( nCtrlFlags & 0x00000040 ) EXC_CTRLDUMP_DEC1( "style" ); + if( nCtrlFlags & 0x00000080 ) EXC_CTRLDUMP_DEC1( "mouseptr" ); + if( nCtrlFlags & 0x00000200 ) EXC_CTRLDUMP_HEX1( "password" ); + if( nCtrlFlags & 0x00000400 ) EXC_CTRLDUMP_DEC4( "listwidth" ); + if( nCtrlFlags & 0x00000800 ) EXC_CTRLDUMP_DEC2( "boundcol" ); + if( nCtrlFlags & 0x00001000 ) EXC_CTRLDUMP_DEC2( "textcol" ); + if( nCtrlFlags & 0x00002000 ) EXC_CTRLDUMP_DEC2( "colcount" ); + if( nCtrlFlags & 0x00004000 ) EXC_CTRLDUMP_DEC2( "listrows" ); + if( nCtrlFlags & 0x00008000 ) EXC_CTRLDUMP_DEC2( "colwidth?" ); + if( nCtrlFlags & 0x00010000 ) EXC_CTRLDUMP_DEC1( "matchentry" ); + if( nCtrlFlags & 0x00020000 ) EXC_CTRLDUMP_DEC1( "liststyle" ); + if( nCtrlFlags & 0x00040000 ) EXC_CTRLDUMP_DEC1( "showdropbtn" ); + if( nCtrlFlags & 0x00100000 ) EXC_CTRLDUMP_DEC1( "dropbtnstyle" ); + if( nCtrlFlags & 0x00200000 ) EXC_CTRLDUMP_DEC1( "multistate" ); + if( nCtrlFlags & 0x00400000 ) EXC_CTRLDUMP_DECVARMASK( nValueLen, 0x7FFFFFFF, "value-len" ); + if( nCtrlFlags & 0x00800000 ) EXC_CTRLDUMP_DECVARMASK( nCaptionLen, 0x7FFFFFFF, "caption-len" ); + if( nCtrlFlags & 0x01000000 ) EXC_CTRLDUMP_COORD( "pos" ); + if( nCtrlFlags & 0x02000000 ) EXC_CTRLDUMP_HEX4( "bordercolor" ); + if( nCtrlFlags & 0x04000000 ) EXC_CTRLDUMP_DEC1( "specialeff" ); + if( nCtrlFlags & 0x08000000 ) EXC_CTRLDUMP_DEC2( "icon-len" ); + if( nCtrlFlags & 0x10000000 ) EXC_CTRLDUMP_DEC2( "pic-len" ); + if( nCtrlFlags & 0x20000000 ) EXC_CTRLDUMP_HEX1( "accel" ); + if( nCtrlFlags2 & 0x00000001 ) EXC_CTRLDUMP_DECVARMASK( nGroupNameLen, 0x7FFFFFFF, "groupname-len" ); + EXC_CTRLDUMP_SIZE(); + EXC_CTRLDUMP_STRING( nValueLen, "value" ); + EXC_CTRLDUMP_STRING( nCaptionLen, "caption" ); + EXC_CTRLDUMP_STRING( nGroupNameLen, "groupname" ); + } + break; + case xlCtrlLabel: + { + sal_uInt32 nCaptionLen = 0; + + EXC_CTRLDUMP_STARTFLAG( "content-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x0001, "forecolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x0002, "backcolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x0004, "option" ); + EXC_CTRLDUMP_ADDFLAG( 0x0008, "caption" ); + EXC_CTRLDUMP_ADDFLAG( 0x0010, "pos" ); + EXC_CTRLDUMP_ADDFLAG( 0x0040, "mouseptr" ); + EXC_CTRLDUMP_ADDFLAG( 0x0080, "bordercolor" ); + EXC_CTRLDUMP_ADDFLAG( 0x0100, "borderstyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x0200, "specialeff" ); + EXC_CTRLDUMP_ADDFLAG( 0x0400, "pic" ); + EXC_CTRLDUMP_ADDFLAG( 0x0800, "accel" ); + EXC_CTRLDUMP_ADDFLAG( 0x1000, "icon" ); + EXC_CTRLDUMP_ENDFLAG( 0xFFFFE020 ); + sal_uInt32 nCtrlFlags = __nFlags; + + if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_HEX4( "forecolor" ); + if( nCtrlFlags & 0x0002 ) EXC_CTRLDUMP_HEX4( "backcolor" ); + if( nCtrlFlags & 0x0004 ) + { + EXC_CTRLDUMP_STARTFLAG( "option-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000004, "locked" ); + EXC_CTRLDUMP_ADDFLAG( 0x00000008, "backstyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x00800000, "wordwrap" ); + EXC_CTRLDUMP_ADDFLAG( 0x10000000, "autosize" ); + EXC_CTRLDUMP_ENDFLAG( 0xEF7FFFF1 ); + } + if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_DECVARMASK( nCaptionLen, 0x7FFFFFFF, "caption-len" ); + if( nCtrlFlags & 0x0010 ) EXC_CTRLDUMP_COORD( "pos" ); + if( nCtrlFlags & 0x0040 ) EXC_CTRLDUMP_HEX2( "mouseptr" ); + if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_HEX4( "bordercolor" ); + if( nCtrlFlags & 0x0100 ) EXC_CTRLDUMP_HEX2( "borderstyle" ); + if( nCtrlFlags & 0x0200 ) EXC_CTRLDUMP_HEX2( "specialleff" ); + if( nCtrlFlags & 0x0400 ) EXC_CTRLDUMP_HEX2( "pic-len" ); + if( nCtrlFlags & 0x0800 ) EXC_CTRLDUMP_HEX2( "accel" ); + if( nCtrlFlags & 0x1000 ) EXC_CTRLDUMP_HEX2( "icon-len" ); + EXC_CTRLDUMP_STRING( nCaptionLen, "caption" ); + EXC_CTRLDUMP_SIZE(); + } + break; + } + EXC_CTRLDUMP_PRINT(); + + EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); + if( rInStrm.Tell() < nNextPos ) + { + rOutStrm << " unknown data:"; + ContDumpStream( rInStrm, nNextPos - rInStrm.Tell() ); + rOutStrm << '\n'; + } + rInStrm.Seek( nNextPos ); + + // font data + rInStrm >> nId >> nSize; + if( nId == 0x0200 ) + { + nNextPos = rInStrm.Tell() + nSize; + + t = "id="; __AddHex( t, nId ); t += " size="; __AddHex( t, nSize ); + rOutStrm << t.GetBuffer() << " (font data)\n"; + t.Erase(); + + EXC_CTRLDUMP_STARTFLAG( "content-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x01, "fontname" ); + EXC_CTRLDUMP_ADDFLAG( 0x02, "fontstyle" ); + EXC_CTRLDUMP_ADDFLAG( 0x04, "fontsize" ); + EXC_CTRLDUMP_ADDFLAG( 0x10, "language-id" ); + EXC_CTRLDUMP_ADDFLAG( 0x40, "align" ); + EXC_CTRLDUMP_ADDFLAG( 0x80, "fontweight" ); + EXC_CTRLDUMP_ENDFLAG( 0xFFFFFF08 ); // 0x20 always set? + sal_uInt32 nCtrlFlags = __nFlags; + sal_uInt32 nFontLen = 0; + + if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_DECVARMASK( nFontLen, 0x7FFFFFFF, "fontname-len" ); + if( nCtrlFlags & 0x0002 ) + { + EXC_CTRLDUMP_STARTFLAG( "fontstyle-flags" ); + EXC_CTRLDUMP_ADDFLAG( 0x01, "bold" ); + EXC_CTRLDUMP_ADDFLAG( 0x02, "italic" ); + EXC_CTRLDUMP_ADDFLAG( 0x04, "underline" ); + EXC_CTRLDUMP_ADDFLAG( 0x08, "strikeout" ); + EXC_CTRLDUMP_ENDFLAG( 0xBFFFFFF0 ); // 0x40000000 always set? + } + if( nCtrlFlags & 0x0004 ) EXC_CTRLDUMP_DEC4( "fontsize" ); + if( nCtrlFlags & 0x0010 ) EXC_CTRLDUMP_HEX2( "language-id" ); + if( nCtrlFlags & 0x0040 ) + { + EXC_CTRLDUMP_ALIGN_INSTRM( 2 ); + sal_uInt16 nAlign; rInStrm >> nAlign; + t += " align="; __AddDec( t, nAlign ); + switch( nAlign ) + { + case 1: t += "=left"; break; + case 2: t += "=right"; break; + case 3: t += "=center"; break; + default: t += "=!unknown!"; + } + EXC_CTRLDUMP_PRINTC(); + } + if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_DEC2( "fontweight" ); + EXC_CTRLDUMP_STRING( nFontLen, "font" ); + EXC_CTRLDUMP_PRINT(); + + EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); + if( rInStrm.Tell() < nNextPos ) + { + rOutStrm << " unknown data:"; + ContDumpStream( rInStrm, nNextPos - rInStrm.Tell() ); + rOutStrm << '\n'; + } + rInStrm.Seek( nNextPos ); + } + else + rInStrm.SeekRel( -4 ); } - *pDumpStream << "\n### end Ctls stream ###\n"; + + rOutStrm << "\n-- end of stream --\n"; } @@ -7582,11 +7980,14 @@ BOOL Biff8RecDumper::Dump( XclImpStream& r ) r.StoreGlobalPosition(); r.SetWarningMode( bWarnings ); - FilterProgressBar* pPrgrsBar = new FilterProgressBar( r ); + ::std::auto_ptr< ScfProgressBar > pProgress( new ScfProgressBar( + pExcRoot->pIR->GetDocShell(), String( RTL_CONSTASCII_USTRINGPARAM( "Dumper" ) ) ) ); + sal_Int32 nStreamSeg = pProgress->AddSegment( r.GetStreamSize() ); + pProgress->ActivateSegment( nStreamSeg ); while( r.StartNextRecord() ) { - pPrgrsBar->Progress(); + pProgress->Progress( r.Tell() ); if( HasModeDump( r.GetRecId() ) ) RecDump(); @@ -7595,7 +7996,7 @@ BOOL Biff8RecDumper::Dump( XclImpStream& r ) *pDumpStream << '\n'; pIn = NULL; - delete pPrgrsBar; + pProgress.reset(); r.SeekGlobalPosition(); r.SetWarningMode( TRUE ); diff --git a/sc/source/filter/excel/biffrecdumper.ini b/sc/source/filter/excel/biffrecdumper.ini index a11b7a5f83da..62629107a08a 100644 --- a/sc/source/filter/excel/biffrecdumper.ini +++ b/sc/source/filter/excel/biffrecdumper.ini @@ -74,6 +74,7 @@ BODY=* // alternativ B 0x0042=CODEPAGE , 0x0043=XF , 0x0044=IXFE , +0x0045=EFONT , 0x004D=PLS , 0x0050=DCON , 0x0051=DCONREF , diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index c32eea396f43..b3c95293cb41 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: colrowst.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-10 14:07:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -500,7 +500,6 @@ ScExtDocOptions::ScExtDocOptions( void ) pCodenames = NULL; bChanged = TRUE; - fColScale = 0.0; SetWinProtection(false); } @@ -578,8 +577,6 @@ ScExtDocOptions& ScExtDocOptions::operator =( const ScExtDocOptions& rCpy ) bChanged = rCpy.bChanged; - fColScale = rCpy.fColScale; - return *this; } diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index b34765178dad..31bc8417150b 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: excdoc.cxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: dr $ $Date: 2002-12-12 13:13:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -254,8 +254,9 @@ void ExcTable::SetDefRowXF( UINT16 nXF, UINT16 n ) void ExcTable::FillAsHeader( ExcRecordListRefs& rBSRecList ) { RootData& rR = *pExcRoot; + const XclExpRoot& rRoot = *rR.pER; ScDocument& rDoc = *rR.pDoc; - XclExpTabIdBuffer& rTabBuffer = rR.pER->GetTabIdBuffer(); + XclExpTabIdBuffer& rTabBuffer = rRoot.GetTabIdBuffer(); if ( rR.eDateiTyp < Biff8 ) Add( new ExcBofW ); @@ -269,31 +270,15 @@ void ExcTable::FillAsHeader( ExcRecordListRefs& rBSRecList ) UINT16 nCodenames = rTabBuffer.GetCodenameCount(); ExcNameList* pNameList = rR.pNameList = new ExcNameList( rR ); - UsedAttrList* pXFRecs = rR.pXFRecs = new UsedAttrList( &rR ); rR.pObjRecs = NULL; // per sheet - rR.pNoteRecs = NULL; // per sheet - - pXFRecs->SetBaseIndex( 21 ); if( rR.eDateiTyp < Biff8 ) Add( new ExcDummy_00 ); else { // first create style XFs - SfxStyleSheetIterator aStyleIter( rDoc.GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); - SfxStyleSheetBase* pStyle = aStyleIter.First(); - ScPatternAttr* pPatt; - - while( pStyle ) - { - if( pStyle->IsUserDefined() ) - { - pPatt = new ScPatternAttr( &pStyle->GetItemSet() ); - pXFRecs->Find( pPatt, TRUE ); - } - pStyle = aStyleIter.Next(); - } + rRoot.GetXFBuffer().InsertUserStyles(); Add( new ExcDummy8_00a ); rR.pTabId = new XclExpChTrTabId( Max( nExcTabCount, nCodenames ) ); @@ -347,17 +332,12 @@ void ExcTable::FillAsHeader( ExcRecordListRefs& rBSRecList ) Add( new ExcDummy_040 ); Add( new Exc1904( rDoc ) ); Add( new ExcDummy_041 ); - // Font - Add( new XclExpRefRecord( rR.pER->GetFontBuffer() ) ); - // Format - Add( new XclExpRefRecord( rR.pER->GetNumFmtBuffer() ) ); - // XF + Style - Add( new ExcDummy_XF ); - Add( pXFRecs ); - // Style - Add( new ExcDummy_Style ); - // Colors - Add( new XclExpRefRecord( rR.pER->GetPalette() ) ); + + // Formatting: FONT, FORMAT, XF, STYLE, PALETTE + Add( new XclExpRefRecord( rRoot.GetFontBuffer() ) ); + Add( new XclExpRefRecord( rRoot.GetNumFmtBuffer() ) ); + Add( new XclExpRefRecord( rRoot.GetXFBuffer() ) ); + Add( new XclExpRefRecord( rRoot.GetPalette() ) ); // Bundlesheet ExcBundlesheetBase* pBS; @@ -380,15 +360,12 @@ void ExcTable::FillAsHeader( ExcRecordListRefs& rBSRecList ) Add( new ExcWindow18( rR ) ); Add( new Exc1904( rDoc ) ); Add( new ExcDummy8_041 ); - // Font - Add( new XclExpRefRecord( rR.pER->GetFontBuffer() ) ); - // Format - Add( new XclExpRefRecord( rR.pER->GetNumFmtBuffer() ) ); - // XF + Style - Add( new ExcDummy8_XF ); - Add( pXFRecs ); - // Style - Add( new ExcDummy8_Style ); + + // Formatting: FONT, FORMAT, XF, STYLE, PALETTE + Add( new XclExpRefRecord( rRoot.GetFontBuffer() ) ); + Add( new XclExpRefRecord( rRoot.GetNumFmtBuffer() ) ); + Add( new XclExpRefRecord( rRoot.GetXFBuffer() ) ); + Add( new XclExpRefRecord( rRoot.GetPalette() ) ); // Pivot Cache ScDPCollection* pDPColl = rDoc.GetDPCollection(); @@ -405,9 +382,6 @@ void ExcTable::FillAsHeader( ExcRecordListRefs& rBSRecList ) } } - // Colors - Add( new XclExpRefRecord( rR.pER->GetPalette() ) ); - // Change tracking if( rDoc.GetChangeTrack() ) { @@ -438,15 +412,15 @@ void ExcTable::FillAsHeader( ExcRecordListRefs& rBSRecList ) // COUNTRY always Germany Add( new ExcDummy8_Country ); - // SUPBOOKs, XCTs, CRNs, EXTERNSHEET - Add( new XclExpRefRecord( rR.pER->GetLinkManager() ) ); - // NAMEs + // SUPBOOK, XCT, CRN, EXTERNNAME, EXTERNSHEET + Add( new XclExpRefRecord( rRoot.GetLinkManager() ) ); + // NAME Add( pNameList ); // MSODRAWINGGROUP per-document data Add( new XclMsodrawinggroup( rR, ESCHER_DggContainer ) ); // SST, EXTSST - Add( new XclExpRefRecord( rR.pER->GetSst() ) ); + Add( new XclExpRefRecord( rRoot.GetSst() ) ); } Add( new ExcEof ); @@ -456,8 +430,10 @@ void ExcTable::FillAsHeader( ExcRecordListRefs& rBSRecList ) void ExcTable::FillAsTable( void ) { RootData& rR = *pExcRoot; - ScDocument& rDoc = *rR.pDoc; - XclExpTabIdBuffer& rTabBuffer = rR.pER->GetTabIdBuffer(); + const XclExpRoot& rRoot = *rR.pER; + ScDocument& rDoc = rRoot.GetDoc(); + XclExpTabIdBuffer& rTabBuffer = rRoot.GetTabIdBuffer(); + XclExpXFBuffer& rXFBuffer = rRoot.GetXFBuffer(); if( nScTab >= rTabBuffer.GetScTabCount() ) { @@ -477,7 +453,6 @@ void ExcTable::FillAsTable( void ) UINT16 nPrevRow = 0; UINT16 nColMin; // fuer aktuelle Zeile // Row-Records - const UINT16 nDefXF = 0x0F; UINT16 nCol = 0; UINT16 nRow = 0; @@ -507,6 +482,10 @@ void ExcTable::FillAsTable( void ) XclExpDval* pRecDval = NULL; // data validation + XclExpNoteList* pNoteList = NULL; // cell notes + + ExcFmlaResultStr* pFormulaResult = NULL; + DBG_ASSERT( (nScTab >= 0L) && (nScTab <= MAXTAB), "-ExcTable::Table(): nScTab - no ordinary table!" ); DBG_ASSERT( (nExcTab >= 0L) && (nExcTab <= MAXTAB), "-ExcTable::Table(): nExcTab - no ordinary table!" ); @@ -642,13 +621,15 @@ void ExcTable::FillAsTable( void ) Add( pExcDefColWidth ); // COLINFO records - ExcColinfo* pLastColInfo = new ExcColinfo( 0, nScTab, nDefXF, rR, aExcOLCol ); + sal_uInt16 nColDefXF = rXFBuffer.Insert( rDoc.GetPattern( 0, MAXROW, nScTab ) ); + ExcColinfo* pLastColInfo = new ExcColinfo( 0, nScTab, nColDefXF, rR, aExcOLCol ); ExcColinfo* pNewColInfo; Add( pLastColInfo ); for( UINT16 iCol = 1; iCol <= MAXCOL; iCol++ ) { - pNewColInfo = new ExcColinfo( iCol, nScTab, nDefXF, rR, aExcOLCol ); + nColDefXF = rXFBuffer.Insert( rDoc.GetPattern( iCol, MAXROW, nScTab ) ); + pNewColInfo = new ExcColinfo( iCol, nScTab, nColDefXF, rR, aExcOLCol ); pLastColInfo->Expand( pNewColInfo ); if( pNewColInfo ) { @@ -670,7 +651,7 @@ void ExcTable::FillAsTable( void ) // AutoFilter Add( new ExcAutoFilterRecs( rR, nScTab ) ); // list of NOTE records - rR.pNoteRecs = new XclNoteList; + pNoteList = new XclExpNoteList; } // NOTE @@ -684,7 +665,7 @@ void ExcTable::FillAsTable( void ) // at least one ROW rec if( !bIter ) - AddRow( new ExcRow( 0, nScTab, 0, 0, nDefXF, rDoc, aExcOLRow, *this ) ); + AddRow( new ExcRow( 0, nScTab, 0, 0, EXC_XF_DEFAULTCELL, rDoc, aExcOLRow, *this ) ); while( bIter ) { @@ -693,12 +674,13 @@ void ExcTable::FillAsTable( void ) pPatt = aIterator.GetPattern(); pAktExcCell = NULL; + pNote = NULL; pTableOpRec = NULL; // add ROW recs from empty rows while( nPrevRow < nRow ) { - ExcRow* pRow = new ExcRow( nPrevRow, nScTab, 0, 0, nDefXF, rDoc, aExcOLRow, *this ); + ExcRow* pRow = new ExcRow( nPrevRow, nScTab, 0, 0, EXC_XF_DEFAULTCELL, rDoc, aExcOLRow, *this ); AddUsedRow( pRow ); nPrevRow++; } @@ -764,47 +746,32 @@ void ExcTable::FillAsTable( void ) case CELLTYPE_FORMULA: { pLastRKMulRK = NULL; - ScFormulaCell* pFormCell = ( ScFormulaCell * ) pAktScCell; - ULONG nCellNumForm = ( pPatt ? - (( const SfxUInt32Item& ) pPatt->GetItem( - ATTR_VALUE_FORMAT )).GetValue() : 0 ); - ULONG nAltNumForm; - BOOL bForceAltNumForm; - if( ( nCellNumForm % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ) - { - // #73420# Xcl doesn't know boolean number formats, - // we write "TRUE";"TRUE";"FALSE" or "WAHR";"WAHR";"FALSCH" - // or any other language dependent key words instead. - // Don't do it for automatic formula formats, - // because Xcl gets them right. - if( pFormCell->GetFormatType() == NUMBERFORMAT_LOGICAL ) - nAltNumForm = NUMBERFORMAT_ENTRY_NOT_FOUND; - else - nAltNumForm = pFormCell->GetStandardFormat( - rFormatter, nCellNumForm ); - bForceAltNumForm = FALSE; - } - else - { - // #73420# If number format set is boolean and - // automatic format is boolean don't write that ugly - // special format. - if( pFormCell->GetFormatType() == NUMBERFORMAT_LOGICAL - && rFormatter.GetType( nCellNumForm ) == NUMBERFORMAT_LOGICAL ) - { - nAltNumForm = 0; - bForceAltNumForm = TRUE; - } - else - { - nAltNumForm = NUMBERFORMAT_ENTRY_NOT_FOUND; - bForceAltNumForm = FALSE; - } + ScFormulaCell* pFormCell = (ScFormulaCell*) pAktScCell; + + // current cell number format + sal_uInt32 nCellNumFmt = pPatt ? + static_cast< const SfxUInt32Item& >( pPatt->GetItem( ATTR_VALUE_FORMAT ) ).GetValue() : + rR.pER->GetNumFmtBuffer().GetStandardFormat(); + // alternative number format passed to XF buffer + sal_uInt32 nFmlaNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND; + + /* #73420# Xcl doesn't know boolean number formats, we write + "TRUE";"TRUE";"FALSE" (language dependent). Don't do it for + automatic formula formats, because Xcl gets them right. */ + /* #i8640# Don't set text format, if we have string results */ + if( ((nCellNumFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0) && + (pFormCell->GetFormatType() != NUMBERFORMAT_LOGICAL) && + (pFormCell->GetFormatType() != NUMBERFORMAT_TEXT) ) + nFmlaNumFmt = pFormCell->GetStandardFormat( rFormatter, nCellNumFmt ); + /* #73420# If cell number format is Boolean and automatic formula + format is Boolean don't write that ugly special format. */ + else if( (pFormCell->GetFormatType() == NUMBERFORMAT_LOGICAL) && + (rFormatter.GetType( nCellNumFmt ) == NUMBERFORMAT_LOGICAL) ) + nFmlaNumFmt = rR.pER->GetNumFmtBuffer().GetStandardFormat(); - } ExcFormula* pFmlaCell = new ExcFormula( - aScPos, pPatt, rR, nAltNumForm, bForceAltNumForm, *pFormCell->GetCode(), - &pLastArray, ( ScMatrixMode ) pFormCell->GetMatrixFlag(), &pShrdFmla, &aShrdFmlaList ); + aScPos, pPatt, rR, nFmlaNumFmt, *pFormCell->GetCode(), + &pLastArray, ( ScMatrixMode ) pFormCell->GetMatrixFlag(), &pShrdFmla, &aShrdFmlaList, pFormCell, &pFormulaResult); pAktExcCell = pFmlaCell; pTableOpRec = aTableOpList.InsertCell( pFormCell->GetCode(), *pFmlaCell ); } @@ -828,6 +795,7 @@ void ExcTable::FillAsTable( void ) break; case CELLTYPE_NOTE: { + pAktScCell = NULL; // #i11733# empty note cell is empty cell pAktExcCell = NULL; pLastRKMulRK = NULL; DBG_ASSERT( pNote, "-ExcTable::Table(): Note-Cell ohne Note!" ); @@ -845,17 +813,16 @@ void ExcTable::FillAsTable( void ) pLastRKMulRK = NULL; } } - else - {// leere Zelle mit Attributierung - pNote = NULL; + // #i11733# not "else" - pAktScCell may be set to NULL above (empty note cell) + if( !pAktScCell ) + {// leere Zelle mit Attributierung UINT16 nColCnt = aIterator.GetEndCol() - aIterator.GetStartCol() + 1; if( pLastBlank && pLastBlank->GetLastCol() + 1 == aIterator.GetStartCol() ) { pLastBlank->Add( aScPos, pPatt, rR, nColCnt, *this ); - - pAktScCell = NULL; // kein NEUER Record! + pAktExcCell = NULL; // kein NEUER Record! } else { @@ -889,26 +856,36 @@ void ExcTable::FillAsTable( void ) if( pTableOpRec ) Add( pTableOpRec ); - // notes - String sNoteText; - String sNoteAuthor; - if( pNote ) + if(pFormulaResult) { - sNoteText = pNote->GetText(); - sNoteAuthor = pNote->GetAuthor(); + Add( pFormulaResult ); + pFormulaResult = NULL; } - if( rR.sAddNoteText.Len() ) + + + // notes + if( rRoot.GetBiff() < xlBiff8 ) { - if( sNoteText.Len() ) - (sNoteText += (sal_Unicode) 0x0A) += (sal_Unicode) 0x0A; - sNoteText += rR.sAddNoteText; + String sNoteText; + String sNoteAuthor; + if( pNote ) + { + sNoteText = pNote->GetText(); + sNoteAuthor = pNote->GetAuthor(); + } + if( rR.sAddNoteText.Len() ) + { + if( sNoteText.Len() ) + (sNoteText += (sal_Unicode) 0x0A) += (sal_Unicode) 0x0A; + sNoteText += rR.sAddNoteText; + } + if( sNoteText.Len() || sNoteAuthor.Len() ) + Add( new ExcNote( aScPos, sNoteText, rR ) ); } - if( sNoteText.Len() || sNoteAuthor.Len() ) + else { - if ( rR.eDateiTyp < Biff8 ) - Add( new ExcNote( aScPos, sNoteText, rR ) ); - else - rR.pNoteRecs->Add( new XclNote( rR, aScPos, sNoteText, sNoteAuthor ) ); + if( pNote || rR.sAddNoteText.Len() ) + pNoteList->Append( new XclExpNote( rRoot, aScPos, pNote, rR.sAddNoteText ) ); } if( pPatt && (rR.eDateiTyp >= Biff8) ) @@ -950,7 +927,7 @@ void ExcTable::FillAsTable( void ) // new row -> add previous ROW rec if( !bIter || (nPrevRow < nRow) ) { - AddRow( new ExcRow( nPrevRow, nScTab, nColMin, nCol, nDefXF, rDoc, aExcOLRow, *this ) ); + AddRow( new ExcRow( nPrevRow, nScTab, nColMin, nCol, EXC_XF_DEFAULTCELL, rDoc, aExcOLRow, *this ) ); nPrevRow++; nColMin = aIterator.GetStartCol(); @@ -964,7 +941,7 @@ void ExcTable::FillAsTable( void ) while( nRow < nMaxFlagRow ) { nRow++; - ExcRow* pRow = new ExcRow( nRow, nScTab, 0, 0, nDefXF, rDoc, aExcOLRow, *this ); + ExcRow* pRow = new ExcRow( nRow, nScTab, 0, 0, EXC_XF_DEFAULTCELL, rDoc, aExcOLRow, *this ); AddUsedRow( pRow ); } @@ -997,7 +974,7 @@ void ExcTable::FillAsTable( void ) // all MSODRAWING and OBJ stuff of this sheet goes here Add( rR.pObjRecs ); // NOTE records - Add( rR.pNoteRecs ); + Add( pNoteList ); // pivot tables ScDPCollection* pDPColl = rDoc.GetDPCollection(); @@ -1156,7 +1133,7 @@ ExcDocument::ExcDocument( const XclExpRoot& rRoot ) : pTabNames = new NameBuffer( 0, 16 ); pPrgrsBar = new ScProgress( - NULL, ScGlobal::GetRscString(STR_SAVE_DOC), + GetDocShell(), ScGlobal::GetRscString(STR_SAVE_DOC), ( UINT32 ) GetDoc().GetCellCount() * 2 ); ExcCell::SetPrgrsBar( *pPrgrsBar ); } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index febdc7690b53..a04b41debf8b 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: excel.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:15:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 970a12a0e81e..6ab7ceb0deae 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: excform.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:15:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1857,7 +1857,7 @@ DefTokenId ExcelToSc::IndexToToken( UINT16 nIndex ) ocNoName, // XlfScenarioGet ocNoName, // XlfOptionsListsGet ocISPMT, // XlfIspmt - ocGetDiffDate, // XlfDatedif + ocNoName, // XlfDatedif ocNoName, // XlfDatestring ocNoName, // XlfNumberstring ocRoman, // XlfRoman @@ -2270,7 +2270,7 @@ BYTE ExcelToSc::IndexToAnzahl( UINT16 nIndex ) 0, // XlfScenarioGet 0, // XlfOptionsListsGet 4, // XlfIspmt - 0, // XlfDatedif + 3, // XlfDatedif 0, // XlfDatestring 0, // XlfNumberstring 1, // XlfRoman @@ -2380,6 +2380,11 @@ void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, SingleRefData &rSRD, con rSRD.nRelCol = rSRD.nCol - aEingPos.Col(); if ( rSRD.IsRowRel() ) rSRD.nRelRow = rSRD.nRow - aEingPos.Row(); + + // T A B + // #i10184# abs needed if rel in shared formula for ScCompiler UpdateNameReference + if ( rSRD.IsTabRel() && !rSRD.IsFlag3D() ) + rSRD.nTab = pExcRoot->pIR->GetScTab() + rSRD.nRelTab; } } diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 65a38494fe16..cb67ac7455cc 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: excform8.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: dr $ $Date: 2002-12-06 15:17:05 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -671,6 +671,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, UINT32 nFormulaLen pExcRoot->pDoc->CreateDdeLink( aAppl, aExtDoc, pExtName->GetName() ); } + else if( (pExtName->GetType() == xlExtName) && pSupbook->IsAddIn() ) + aStack << aPool.Store( ocNoName, pExtName->GetAddInName() ); else aStack << aPool.Store( ocNoName, pExtName->GetName() ); } @@ -1229,6 +1231,11 @@ void ExcelToSc8::ExcRelToScRel( UINT16 nRow, UINT16 nC, SingleRefData &rSRD, con rSRD.nRelRow = (INT16) nRow - aEingPos.Row(); else rSRD.nRow = nRow; + + // T A B + // #i10184# abs needed if rel in shared formula for ScCompiler UpdateNameReference + if ( rSRD.IsTabRel() && !rSRD.IsFlag3D() ) + rSRD.nTab = pExcRoot->pIR->GetScTab() + rSRD.nRelTab; } } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 9174fcefbc16..5fd21973a8f4 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: excimp8.cxx,v $ * - * $Revision: 1.79 $ + * $Revision: 1.80 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-10 14:07:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,6 @@ #include <svx/flditem.hxx> #include <svx/xflclit.hxx> #include <svx/svxmsbas.hxx> -#include <svx/unoapi.hxx> #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> @@ -106,7 +105,7 @@ #include <tools/string.hxx> #include <tools/urlobj.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX #include <unotools/localedatawrapper.hxx> @@ -128,7 +127,13 @@ #include "markdata.hxx" #include "rangenam.hxx" #include "docoptio.hxx" +#ifndef SC_DETFUNC_HXX +#include "detfunc.hxx" +#endif +#ifndef SC_XLOCX_HXX +#include "xlocx.hxx" +#endif #ifndef SC_XILINK_HXX #include "xilink.hxx" #endif @@ -138,11 +143,9 @@ #include "excimp8.hxx" #include "excform.hxx" -#include "fltprgrs.hxx" #include "flttools.hxx" #include "scextopt.hxx" #include "stlpool.hxx" -#include "scmsocximexp.hxx" using namespace com::sun::star; @@ -274,9 +277,10 @@ void ExcCondForm::ReadCf( XclImpStream& rIn, ExcelToSc& rConv ) default: nPosF = 0; nPosL = 0; nPosP = 0; } - SfxItemSet& rStyleItemSet = rDoc.GetStyleSheetPool()->Make( - aStyle, SFX_STYLE_FAMILY_PARA, - SFXSTYLEBIT_USERDEF ).GetItemSet(); + SfxStyleSheetBase* pStyleSheet = rDoc.GetStyleSheetPool()->Find( aStyle, SFX_STYLE_FAMILY_PARA ); + SfxItemSet& rStyleItemSet = pStyleSheet ? pStyleSheet->GetItemSet() : + rDoc.GetStyleSheetPool()->Make( aStyle, SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_USERDEF ).GetItemSet(); + rStyleItemSet.ClearItem(); const XclImpPalette& rPalette = GetPalette(); @@ -340,42 +344,40 @@ void ExcCondForm::ReadCf( XclImpStream& rIn, ExcelToSc& rConv ) if( nPosL ) // line { - UINT8 nLineH, nLineV; - UINT16 nColH, nColV; + sal_uInt16 nLine, nColor1, nColor2; rIn.Seek( nPosL ); - - rIn >> nLineV >> nLineH >> nColV >> nColH; - - UINT8 nLineL = nLineV & 0x0F; - UINT16 nColL = nColV & 0x007F; - UINT8 nLineR = nLineV >> 4; - UINT16 nColR = ( nColV >> 7 ) & 0x007F; - UINT8 nLineT = nLineH & 0x0F; - UINT16 nColT = nColH & 0x007F; - UINT8 nLineB = nLineH >> 4; - UINT16 nColB = ( nColH >> 7 ) & 0x007F; - - XclImpXF::SetBorder( rStyleItemSet, rPalette, - nLineL, nColL, nLineR, nColR, nLineT, nColT, nLineB, nColB ); + rIn >> nLine >> nColor1 >> nColor2; + + XclImpXFBorder aBorder; + ::extract_value( aBorder.mnLeftLine, nLine, 0, 4 ); + ::extract_value( aBorder.mnRightLine, nLine, 4, 4 ); + ::extract_value( aBorder.mnTopLine, nLine, 8, 4 ); + ::extract_value( aBorder.mnBottomLine, nLine, 12, 4 ); + ::extract_value( aBorder.mnLeftColor, nColor1, 0, 7 ); + ::extract_value( aBorder.mnRightColor, nColor1, 7, 7 ); + ::extract_value( aBorder.mnTopColor, nColor2, 0, 7 ); + ::extract_value( aBorder.mnBottomColor, nColor2, 7, 7 ); + XclImpXF::SetBorder( rStyleItemSet, rPalette, aBorder ); } if( nPosP ) // pattern (fill) { - UINT16 nPatt; - UINT16 nCol; - + sal_uInt16 nPattern, nColor; rIn.Seek( nPosP ); - rIn >> nPatt >> nCol; + rIn >> nPattern >> nColor; - UINT8 nF = nCol & 0x007F; - UINT8 nB = ( nCol >> 7 ) & 0x007F; - UINT8 nP = (UINT8)((nPatt >> 10) & 0x003F); - if( nP <= 1 ) + XclImpXFArea aArea; + ::extract_value( aArea.mnForeColor, nColor, 0, 7 ); + ::extract_value( aArea.mnBackColor, nColor, 7, 7 ); + ::extract_value( aArea.mnPattern, nPattern, 10, 6 ); + if( (aArea.mnPattern == EXC_PATT_NONE) || (aArea.mnPattern == EXC_PATT_SOLID) ) { - nP = nB; nB = nF; nF = nP; nP = 1; + // overwrite a cell style with "no fill" + // EXC_PATT_SOLID forces creation of a brush item in SetArea() + ::std::swap( aArea.mnForeColor, aArea.mnBackColor ); + aArea.mnPattern = EXC_PATT_SOLID; } - - XclImpXF::SetArea( rStyleItemSet, rPalette, nP, nF, nB ); + XclImpXF::SetArea( rStyleItemSet, rPalette, aArea ); } // convert formulas @@ -448,7 +450,7 @@ void ExcCondForm::Apply( void ) if( nR2 > MAXROW ) nR2 = MAXROW; - GetDoc().ApplyPatternAreaTab( nC1, nR1, nC2, nR2, GetScTab(), aPat ); + GetDoc().ApplyPatternAreaTab( nC1, nR1, nC2, nR2, p->aStart.Tab(), aPat ); p = pRangeList->Next(); } @@ -484,8 +486,7 @@ void ExcCondFormList::Apply( void ) ImportExcel8::ImportExcel8( SvStorage* pStorage, SvStream& rStream, ScDocument* pDoc, const String& rBasePath, SvStorage* pPivotCache ) : - ImportExcel( rStream, pDoc, rBasePath ), - aObjManager( *pExcRoot ) + ImportExcel( rStream, pDoc, rBasePath ) { delete pFormConv; @@ -597,20 +598,30 @@ void ImportExcel8::Horizontalpagebreaks( void ) void ImportExcel8::Note( void ) { - UINT16 nCol, nRow, nId; + UINT16 nCol, nRow, nFlags, nId; - aIn >> nRow >> nCol; - aIn.Ignore( 2 ); - aIn >> nId; + aIn >> nRow >> nCol >> nFlags >> nId; if( nRow <= MAXROW && nCol <= MAXCOL ) { if( nId ) { - const XclImpEscherNote* pObj = aObjManager.GetObjNote( nId, GetScTab() ); + const XclImpEscherNote* pObj = GetObjectManager().GetObjNote( nId, GetScTab() ); const String* pText = pObj ? pObj->GetText() : NULL; if( pText ) - pD->SetNote( nCol, nRow, GetScTab(), ScPostIt( *pText ) ); + { + bool bVisible = ::get_flag( nFlags, EXC_NOTE_VISIBLE ); + ScPostIt aNote( *pText ); + aNote.SetShown( bVisible ); + GetDoc().SetNote( nCol, nRow, GetScTab(), aNote ); + if( bVisible ) + { + ScDocument *pDoc = GetDocPtr(); + ScDetectiveFunc( pDoc, GetScTab() ).ShowComment( nCol, nRow, TRUE ); + + // ScDetectiveFunc( GetDocPtr(), GetScTab() ).ShowComment( nCol, nRow, TRUE ); + } + } } } else @@ -623,7 +634,7 @@ void ImportExcel8::Note( void ) void ImportExcel8::Cont( void ) { if( bObjSection ) - aObjManager.ReadMsodrawing( aIn ); + GetObjectManager().ReadMsodrawing( aIn ); } @@ -648,14 +659,14 @@ void ImportExcel8::Dconref( void ) aTabName = aUrl; aUrl.Erase(); } - ScfTools::ConvertName( aTabName ); + ScfTools::ConvertToScSheetName( aTabName ); pCurrPivotCache->SetSource( nC1, nR1, nC2, nR2, aUrl, aTabName, bSelf ); } void ImportExcel8::Obj() { - aObjManager.ReadObj( aIn ); + GetObjectManager().ReadObj( maStrm ); } @@ -669,7 +680,7 @@ void ImportExcel8::Boundsheet( void ) String aName( aIn.ReadUniString( nLen ) ); - ScfTools::ConvertName( aName ); + ScfTools::ConvertToScSheetName( aName ); *pExcRoot->pTabNameBuff << aName; if( nBdshtTab > 0 ) @@ -730,19 +741,19 @@ void ImportExcel8::Cellmerging( void ) void ImportExcel8::Msodrawinggroup( void ) { - aObjManager.ReadMsodrawinggroup( aIn ); + GetObjectManager().ReadMsodrawinggroup( maStrm ); } void ImportExcel8::Msodrawing( void ) { - aObjManager.ReadMsodrawing( aIn ); + GetObjectManager().ReadMsodrawing( maStrm ); } void ImportExcel8::Msodrawingselection( void ) { - aObjManager.ReadMsodrawingselection( aIn ); + GetObjectManager().ReadMsodrawingselection( maStrm ); } void ImportExcel8::Condfmt( void ) @@ -842,7 +853,7 @@ void ImportExcel8::Label( void ) void ImportExcel8::Txo( void ) { - aObjManager.ReadTxo( aIn ); + GetObjectManager().ReadTxo( maStrm ); } @@ -923,11 +934,18 @@ void ImportExcel8::Name( void ) const BOOL bExtract = bBuiltIn && ( cFirstChar == EXC_BUILTIN_EXTRACT ); BOOL bAppendTabNum = FALSE; BOOL bSkip = FALSE; + RangeType eNameType = RT_ABSAREA; if( bBuiltIn ) XclTools::GetBuiltInName( aName, cFirstChar, nSheet ); else - ScfTools::ConvertName( aName ); + ScfTools::ConvertToScDefinedName( aName ); + + if(bPrintArea) + eNameType = RT_PRINTAREA; + if(bCriteria) + eNameType = RT_CRITERIA; + pFormConv->Reset(); if( nOpt & (EXC_NAME_VB | EXC_NAME_PROC | EXC_NAME_BIG) ) @@ -962,7 +980,12 @@ void ImportExcel8::Name( void ) else if( bCriteria ) pAutoFilterBuffer->AddAdvancedRange( aRange ); else if( bExtract ) - pAutoFilterBuffer->AddExtractPos( aRange ); + { + if( pErgebnis->IsValidReference( aRange ) ) + pAutoFilterBuffer->AddExtractPos( aRange ); + else + eNameType = RT_NAME; + } } } } @@ -973,7 +996,7 @@ void ImportExcel8::Name( void ) pExcRoot->pRNameBuff->Store( aName, NULL, nSheet ); else // ohne hidden - pExcRoot->pRNameBuff->Store( aName, pErgebnis, nSheet, bPrintArea ); + pExcRoot->pRNameBuff->Store( aName, pErgebnis, nSheet, eNameType ); } @@ -997,28 +1020,18 @@ void ImportExcel8::PostDocLoad( void ) pCondFormList->Apply(); if( pAutoFilterBuffer ) pAutoFilterBuffer->Apply(); - GetWebQueryBuffer().Apply(); + GetWebQueryBuffer().Apply(); //! test if extant UINT32 nChartCnt = 0; - SfxObjectShell* pShell = pD->GetDocumentShell(); - if( aObjManager.HasEscherStream() ) + SfxObjectShell* pShell = GetDocShell(); + XclImpObjectManager& rObjManager = GetObjectManager(); + + if( pShell && rObjManager.HasEscherStream() ) { - Biff8MSDffManager* pDffMan = new Biff8MSDffManager( *pExcRoot, aObjManager, + Biff8MSDffManager* pDffMan = new Biff8MSDffManager( *pExcRoot, rObjManager, 0, 0, pD->GetDrawLayer(), 1440 ); - const String aStrName( _STRING( "Ctls" ) ); - SvStorage& rStrg = *pExcRoot->pRootStorage; - const BOOL bHasCtrls = rStrg.IsContained( aStrName ) && rStrg.IsStream( aStrName ); - ScMSConvertControls* pCtrlConv; - SvStorageStreamRef xStStream; - - if( bHasCtrls && pShell ) - { - pCtrlConv = new ScMSConvertControls( pShell ); - xStStream = pExcRoot->pRootStorage->OpenStream( aStrName, STREAM_READ | STREAM_SHARE_DENYALL ); - } - const XclImpAnchorData* pAnch; const SvxMSDffShapeInfos* pShpInf = pDffMan->GetShapeInfos(); @@ -1045,6 +1058,8 @@ void ImportExcel8::PostDocLoad( void ) nOLEImpFlags |= OLE_POWERPOINT_2_STARIMPRESS; } + XclImpOcxConverter aOcxConverter( *this ); + for( n = 0 ; n < nMax ; n++ ) { p = pShpInf->GetObject( ( UINT16 ) n ); @@ -1052,7 +1067,7 @@ void ImportExcel8::PostDocLoad( void ) nShapeId = p->nShapeId; - XclImpEscherObj* pObj = aObjManager.GetObjFromStream( p->nFilePos ); + XclImpEscherObj* pObj = rObjManager.GetObjFromStream( p->nFilePos ); if( pObj && !pObj->GetSdrObj() ) { pMSDffImportData = new SvxMSDffImportData; @@ -1060,7 +1075,7 @@ void ImportExcel8::PostDocLoad( void ) if( pObj->GetSdrObj() ) { - pAnch = aObjManager.GetAnchorData( p->nFilePos ); + pAnch = rObjManager.GetAnchorData( p->nFilePos ); // *** find all objects to ignore *** bIgnoreObj = false; @@ -1074,7 +1089,7 @@ void ImportExcel8::PostDocLoad( void ) } // other objects if( !bIgnoreObj ) - bIgnoreObj = IsIgnoreObject( pObj->GetId() ); + bIgnoreObj = rObjManager.IsIgnoreObject( pObj->GetId() ); if( bIgnoreObj ) pObj->SetSdrObj( NULL ); // delete SdrObject @@ -1086,17 +1101,7 @@ void ImportExcel8::PostDocLoad( void ) ((XclImpEscherOle*)pObj)->CreateSdrOle( *pDffMan, nOLEImpFlags ); break; case otCtrl: - if( bHasCtrls ) - { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - xShapeRef = GetXShapeForSdrObject( ( SdrObject* ) pObj->GetSdrObj() ); - if( pCtrlConv->ReadOCXExcelKludgeStream( xStStream, &xShapeRef, TRUE ) ) - { - SdrObject* pNewObj = GetSdrObjectFromXShape( xShapeRef ); - if( pNewObj ) - pObj->SetSdrObj( pNewObj ); - } - } + aOcxConverter.ReadControl( static_cast< XclImpEscherOle& >( *pObj ) ); break; } } @@ -1106,25 +1111,11 @@ void ImportExcel8::PostDocLoad( void ) } } - if( bHasCtrls ) - delete pCtrlConv; - delete pDffMan; } - aObjManager.Apply(); + rObjManager.Apply(); - // controls -/* - ScMSConvertControls aCtrlConverter( pShell ); - String aStrName( String::CreateFromAscii( "Ctls" ) ); - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >* pShapeRef = NULL; - - SvStorageStreamRef xStStream = pExcRoot->pRootStorage->OpenStream( - aStrName, STREAM_READ | STREAM_SHARE_DENYALL ); - aCtrlConverter.ReadOCXExcelKludgeStream( xStStream, pShapeRef, TRUE ); - // BOOL bFloatingCtrl -*/ ImportExcel::PostDocLoad(); // Scenarien bemachen! ACHTUNG: Hier wird Tabellen-Anzahl im Dokument erhoeht!! @@ -1175,45 +1166,6 @@ void ImportExcel8::PostDocLoad( void ) -void ImportExcel8::CreateTmpCtrlStorage( void ) -{ -// if( pExcRoot->pCtrlStorage ) - if( pExcRoot->xCtrlStorage.Is() ) - return; // already done - - SvStorageStream* pContrIn = pExcRoot->pRootStorage->OpenStream( _STRINGCONST( "Ctls" ), STREAM_STD_READ ); - if( pContrIn ) - { - SvStorageRef xStrg( new SvStorage( new SvMemoryStream(), TRUE ) ); - pExcRoot->xCtrlStorage = SvStorageRef( new SvStorage( new SvMemoryStream(), TRUE ) ); -// SvStorage* pStrg = new SvStorage( new SvMemoryStream(), TRUE ); - -// SvStorageStreamRef xTemp = pStrg->OpenStream( _STRINGCONST( "contents" ) ); - SvStorageStreamRef xTemp = xStrg->OpenStream( _STRINGCONST( "contents" ) ); - if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) - { - pContrIn->Seek( 16 ); // no need for class id at this point - *xTemp << *pContrIn; - - SvGlobalName aName( 0xD7053240, 0xCE69, 0x11CD, 0xA7, 0x77, - 0x00, 0xDD, 0x01, 0x14, 0x3C, 0x57 ); - UINT32 nClip = SotExchange::RegisterFormatName( _STRING( "Embedded Object" ) ); -// pStrg->SetClass( aName, nClip, _STRING( "Microsoft Forms 2.0 CommandButton" ) ); - xStrg->SetClass( aName, nClip, _STRING( "Microsoft Forms 2.0 CommandButton" ) ); - - pExcRoot->xCtrlStorage = xStrg; - } -/* else - { - delete pStrg; - pStrg = NULL; - }*/ - -// pExcRoot->pCtrlStorage = pStrg; - } -} - - void ImportExcel8::EndAllChartObjects( void ) { } @@ -1335,6 +1287,17 @@ void ImportExcel8::SXVdex( void ) void ImportExcel8::FilterMode( void ) { + // The FilterMode record exists: if either the AutoFilter + // record exists or an Advanced Filter is saved and stored + // in the sheet. Thus if the FilterMode records only exists + // then the latter is true.. + if( !pAutoFilterBuffer ) return; + + pAutoFilterBuffer->IncrementActiveAF(); + + XclImpAutoFilterData* pData = pAutoFilterBuffer->GetByTab( GetScTab() ); + if( pData ) + pData->SetAutoOrAdvanced(); } void ImportExcel8::AutoFilterInfo( void ) @@ -1362,10 +1325,14 @@ void ImportExcel8::AutoFilter( void ) XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRange, const String& rName ) : ExcRoot( pRoot ), + pCurrDBData(NULL), nFirstEmpty( 0 ), bActive( FALSE ), bHasDropDown( FALSE ), - bHasConflict( FALSE ) + bHasConflict( FALSE ), + bCriteria( FALSE ), + bAutoOrAdvanced(FALSE), + aFilterName(rName) { aParam.nCol1 = rRange.aStart.Col(); aParam.nRow1 = rRange.aStart.Row(); @@ -1373,21 +1340,18 @@ XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRan aParam.nCol2 = rRange.aEnd.Col(); aParam.nRow2 = rRange.aEnd.Row(); - ScDBCollection& rColl = *pRoot->pDoc->GetDBCollection(); + // Excel defaults to always in place regardless + // of whether an extract record exists. The user + // must choose to explicity set the Copy To in the UI. + aParam.bInplace = TRUE; - pCurrDBData = rColl.GetDBAtArea( Tab(), StartCol(), StartRow(), EndCol(), EndRow() ); - if( !pCurrDBData ) - { - pCurrDBData = new ScDBData( rName, Tab(), StartCol(), StartRow(), EndCol(), EndRow() ); - if( pCurrDBData ) - rColl.Insert( pCurrDBData ); - } } void XclImpAutoFilterData::CreateFromDouble( String& rStr, double fVal ) { - SolarMath::DoubleToString( rStr, fVal, 'A', INT_MAX, - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE ); + rStr += String( ::rtl::math::doubleToUString( fVal, + rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, + ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE)); } void XclImpAutoFilterData::SetCellAttribs() @@ -1563,8 +1527,13 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) void XclImpAutoFilterData::SetAdvancedRange( const ScRange* pRange ) { - if( pCurrDBData ) - pCurrDBData->SetAdvancedQuerySource( pRange ); + if (pRange) + { + aCriteriaRange = *pRange; + bCriteria = TRUE; + } + else + bCriteria = FALSE; } void XclImpAutoFilterData::SetExtractPos( const ScAddress& rAddr ) @@ -1572,12 +1541,14 @@ void XclImpAutoFilterData::SetExtractPos( const ScAddress& rAddr ) aParam.nDestCol = rAddr.Col(); aParam.nDestRow = rAddr.Row(); aParam.nDestTab = rAddr.Tab(); - aParam.bInplace = FALSE; aParam.bDestPers = TRUE; + } -void XclImpAutoFilterData::Apply() +void XclImpAutoFilterData::Apply( const BOOL bUseUnNamed ) { + CreateScDBData(bUseUnNamed); + if( bActive ) { InsertQueryParam(); @@ -1593,8 +1564,68 @@ void XclImpAutoFilterData::Apply() } } +void XclImpAutoFilterData::CreateScDBData( const BOOL bUseUnNamed ) +{ + + // Create the ScDBData() object if the AutoFilter is activated + // or if we need to create the Advanced Filter. + if( bActive || bCriteria) + { + ScDBCollection& rColl = *pExcRoot->pDoc->GetDBCollection(); + pCurrDBData = rColl.GetDBAtArea( Tab(), StartCol(), StartRow(), EndCol(), EndRow() ); + if( !pCurrDBData ) + { + AmendAFName(bUseUnNamed); + + pCurrDBData = new ScDBData( aFilterName, Tab(), StartCol(), StartRow(), EndCol(), EndRow() ); + + if( pCurrDBData ) + { + if(bCriteria) + { + EnableRemoveFilter(); + + pCurrDBData->SetQueryParam( aParam ); + pCurrDBData->SetAdvancedQuerySource(&aCriteriaRange); + } + else + pCurrDBData->SetAdvancedQuerySource(NULL); + rColl.Insert( pCurrDBData ); + } + } + } + +} + +void XclImpAutoFilterData::EnableRemoveFilter() +{ + // only if this is a saved Advanced filter + if( !bActive && bAutoOrAdvanced ) + { + ScQueryEntry& aEntry = aParam.GetEntry( nFirstEmpty ); + aEntry.bDoQuery = TRUE; + ++nFirstEmpty; + } + // TBD: force the automatic activation of the + // "Remove Filter" by setting a virtual mouse click + // inside the advanced range +} +void XclImpAutoFilterData::AmendAFName(const BOOL bUseUnNamed) +{ + // If-and-only-if we have one AF filter then + // use the Calc "unnamed" range name. Calc + // only supports one in total while Excel + // supports one per sheet. + if( bUseUnNamed && bAutoOrAdvanced ) + aFilterName = ScGlobal::GetRscString(STR_DB_NONAME); +} + +XclImpAutoFilterBuffer::XclImpAutoFilterBuffer() : + nAFActiveCount( 0 ) +{ +} XclImpAutoFilterBuffer::~XclImpAutoFilterBuffer() { @@ -1626,7 +1657,7 @@ void XclImpAutoFilterBuffer::AddExtractPos( const ScRange& rRange ) void XclImpAutoFilterBuffer::Apply() { for( XclImpAutoFilterData* pData = _First(); pData; pData = _Next() ) - pData->Apply(); + pData->Apply(UseUnNamed()); } XclImpAutoFilterData* XclImpAutoFilterBuffer::GetByTab( UINT16 nTab ) diff --git a/sc/source/filter/excel/excobj.cxx b/sc/source/filter/excel/excobj.cxx index cc81bcf16da2..c74da3ec42d6 100644 --- a/sc/source/filter/excel/excobj.cxx +++ b/sc/source/filter/excel/excobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: excobj.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:16:00 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,8 +129,6 @@ #include "editutil.hxx" #include "imp_op.hxx" -#include "fltprgrs.hxx" -#include "scmsocximexp.hxx" #ifndef SC_XILINK_HXX #include "xilink.hxx" @@ -544,16 +542,3 @@ void ImportExcel::EndAllChartObjects( void ) #ifdef WNT #pragma optimize("",on) #endif - - - - -using namespace ::com::sun::star; - -BOOL ScMSConvertControls::InsertControl( - const uno::Reference< form::XFormComponent >& rFComp, - const awt::Size& rSize, - uno::Reference< drawing::XShape >* pShape,BOOL bFloatingCtrl ) -{ - return FALSE; -} diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 91df7256f829..797f3de0cf8c 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -2,9 +2,9 @@ * * $RCSfile: excrecds.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,6 +100,7 @@ #include <string.h> #include "global.hxx" +#include "globstr.hrc" #include "docpool.hxx" #include "patattr.hxx" #include "cell.hxx" @@ -176,64 +177,6 @@ const BYTE ExcDummy_041::pMyData[] = { }; const ULONG ExcDummy_041::nMyLen = sizeof( ExcDummy_041::pMyData ); -//--------------------------------------------------------- class ExcDummy_XF - -const BYTE ExcDummy_XF::pMyData[] = { - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0x00, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xff, 0x20, 0xf4, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x05, 0x00, 0x2b, 0x00, 0xf5, 0xff, 0x20, 0xf8, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x05, 0x00, 0x29, 0x00, 0xf5, 0xff, 0x20, 0xf8, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x05, 0x00, 0x09, 0x00, 0xf5, 0xff, 0x20, 0xf8, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x05, 0x00, 0x2c, 0x00, 0xf5, 0xff, 0x20, 0xf8, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x10, 0x00, 0x05, 0x00, 0x2a, 0x00, 0xf5, 0xff, 0x20, 0xf8, - 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; -const ULONG ExcDummy_XF::nMyLen = sizeof( ExcDummy_XF::pMyData ); - -//------------------------------------------------------ class ExcDummy_Style - -const BYTE ExcDummy_Style::pMyData[] = { - 0x93, 0x02, 0x04, 0x00, 0x10, 0x80, 0x03, 0xff, - 0x93, 0x02, 0x04, 0x00, 0x11, 0x80, 0x06, 0xff, - 0x93, 0x02, 0x04, 0x00, 0x12, 0x80, 0x05, 0xff, - 0x93, 0x02, 0x04, 0x00, 0x00, 0x80, 0x00, 0xff, - 0x93, 0x02, 0x04, 0x00, 0x13, 0x80, 0x04, 0xff, - 0x93, 0x02, 0x04, 0x00, 0x14, 0x80, 0x07, 0xff -}; -const ULONG ExcDummy_Style::nMyLen = sizeof( ExcDummy_Style::pMyData ); - //-------------------------------------------------------- class ExcDummy_02a - const BYTE ExcDummy_02a::pMyData[] = { 0x0d, 0x00, 0x02, 0x00, 0x01, 0x00, // CALCMODE @@ -260,14 +203,6 @@ const BYTE ExcDummy_02c::pMyData[] = { const ULONG ExcDummy_02c::nMyLen = sizeof( ExcDummy_02c::pMyData ); -//--------------------------------------------------------- - - -#ifdef DBG_UTIL -UINT16 ExcXf::nObjCnt = 0; -#endif - - //----------------------------------------------------------- class ExcRecord - void ExcRecord::Save( XclExpStream& rStrm ) @@ -525,35 +460,6 @@ UINT16 Exc1904::GetNum( void ) const -//--------------------------------------------------------- class ExcDummy_XF - - -ULONG ExcDummy_XF::GetLen( void ) const -{ - return nMyLen; -} - - -const BYTE* ExcDummy_XF::GetData( void ) const -{ - return pMyData; -} - - - -//------------------------------------------------------ class ExcDummy_Style - - -ULONG ExcDummy_Style::GetLen( void ) const -{ - return nMyLen; -} - - -const BYTE* ExcDummy_Style::GetData( void ) const -{ - return pMyData; -} - - //------------------------------------------------------ class ExcBundlesheet - ExcBundlesheetBase::ExcBundlesheetBase( RootData& rRootData, UINT16 nTab ) : @@ -700,19 +606,17 @@ ExcCell::ExcCell( const ScAddress rPos, const ScPatternAttr* pAttr, RootData& rRootData, - const ULONG nAltNumForm, - BOOL bForceAltNumForm ) : + const ULONG nAltNumForm ) : aPos( rPos ) { if( pPrgrsBar ) pPrgrsBar->SetState( GetCellCount() ); IncCellCount(); - DBG_ASSERT( rRootData.pXFRecs, "ExcCell::ExcCell - missing XF record list" ); DBG_ASSERT( rRootData.pCellMerging, "ExcCell::ExcCell - missing cell merging list" ); if( !rRootData.pCellMerging->FindMergeBaseXF( aPos, nXF ) ) - nXF = rRootData.pXFRecs->Find( pAttr, FALSE, nAltNumForm, bForceAltNumForm ); + nXF = rRootData.pER->GetXFBuffer().Insert( pAttr, nAltNumForm ); #ifdef DBG_UTIL _nRefCount++; @@ -799,7 +703,7 @@ ExcBoolerr::ExcBoolerr( UINT8 nValP, BOOL bIsError ) : // #73420# force to "no number format" if boolean value - ExcCell( rPos, pAttr, rRootData, (bIsError ? NUMBERFORMAT_ENTRY_NOT_FOUND : 0), !bIsError ), + ExcCell( rPos, pAttr, rRootData, bIsError ? NUMBERFORMAT_ENTRY_NOT_FOUND : 0 ), nVal( bIsError ? nValP : (nValP != 0) ), bError( bIsError != 0 ) { @@ -868,7 +772,7 @@ ExcRKMulRK* ExcRKMulRK::Extend( ExcRKMulRKEntry* pNewCont = new ExcRKMulRKEntry; if( !rRootData.pCellMerging->FindMergeBaseXF( rPos, pNewCont->nXF ) ) - pNewCont->nXF = rRootData.pXFRecs->Find( pAttr ); + pNewCont->nXF = rRootData.pER->GetXFBuffer().Insert( pAttr ); pNewCont->nVal = nVal; List::Insert( pNewCont, LIST_APPEND ); return NULL; @@ -1143,7 +1047,7 @@ ExcRichStr::ExcRichStr( ExcCell& rExcCell, String& rText, const ScPatternAttr* p } // XF mit Umbruch auswaehlen? - rExcCell.SetXF( nParCnt <= 1 ? rRoot.pXFRecs->Find( pAttr ) : rRoot.pXFRecs->FindWithLineBreak( pAttr ) ); + rExcCell.SetXF( rRoot.pER->GetXFBuffer().Insert( pAttr, nParCnt > 1 ) ); } else { @@ -1232,13 +1136,16 @@ ExcFormula::ExcFormula( const ScPatternAttr* pAttr, RootData& rRootData, const ULONG nAltNumForm, - BOOL bForceAltNumForm, const ScTokenArray& rTokArray, ExcArray** ppArray, ScMatrixMode eMM, ExcShrdFmla** ppShrdFmla, - ExcArrays* pShrdFmlas ) : - ExcCell( rPos, pAttr, rRootData, nAltNumForm, bForceAltNumForm ) + ExcArrays* pShrdFmlas, + ScFormulaCell* pFormulaCell, + ExcFmlaResultStr** pFormulaResult) : + ExcCell( rPos, pAttr, rRootData, nAltNumForm ) , + pFCell(pFormulaCell) + { bShrdFmla = FALSE; EC_Codetype eCodeType; @@ -1314,6 +1221,30 @@ ExcFormula::ExcFormula( delete pExcUPN; + if(pFCell && (pFCell->GetFormatType() == NUMBERFORMAT_TEXT)) + { + String sText; + pFCell->GetString(sText); + XclExpString aFormulaText; + if ( rRootData.eDateiTyp < Biff8 ) + { + aFormulaText.AssignByte(sText,*rRootData.pCharset); + *pFormulaResult = new ExcFmlaResultStr(aFormulaText); + } + else if(sText.Len()) + { + aFormulaText.Assign(sText); + *pFormulaResult = new ExcFmlaResultStr(aFormulaText); + } + else + *pFormulaResult = NULL; + } + else + { + *pFormulaResult = NULL; + } + + /* if( ppShrdFmla && aExcUPN.GetShrdFmla( pData, nFormLen ) ) { // shared formula ref only if( aExcUPN.IsFirstShrdFmla() ) @@ -1358,12 +1289,68 @@ void ExcFormula::SetTableOp( USHORT nCol, USHORT nRow ) ShortToSVBT16( (UINT16) nCol, (BYTE*) &pData[ 3 ] ); } - void ExcFormula::SaveDiff( XclExpStream& rStrm ) {// grbit chn UINT16 nGrBit = bShrdFmla? 0x000B : 0x0003; - rStrm << ( double ) 0.0 << nGrBit << ( UINT32 ) 0x00000000 - << nFormLen; + double fVal = 0.0; + UINT16 nErrorCode = 0; + String sText; + + + if(pFCell) + { + switch(pFCell->GetFormatType()) + { + case NUMBERFORMAT_NUMBER: + if(!(nErrorCode = pFCell->GetErrCode())) + { + fVal = pFCell->GetValue(); + rStrm << fVal; + } + else + { + BYTE nByte = ScErrorCodeToExc(nErrorCode); + rStrm << (UINT8)0x02 + << (UINT8)0 + << (UINT8)nByte + << (UINT16)0 << (UINT8)0 + << (UINT16)0xFFFF; + } + break; + + case NUMBERFORMAT_TEXT: + pFCell->GetString(sText); + if(sText.Len()) + rStrm << (UINT8)0x00 << (UINT32)0 << (UINT8)0 << (UINT16)0xFFFF; + else + { + if ( rStrm.GetRoot().GetBiff() < xlBiff8 ) + rStrm << (UINT8)0x00 << (UINT32)0 << (UINT8)0 << (UINT16)0xFFFF; + else + { + // empty formula result cells are represented by 0x03 in Biff8 + rStrm << (UINT8)0x03 << (UINT32)0 << (UINT8)0 << (UINT16)0xFFFF; + } + } + break; + + case NUMBERFORMAT_LOGICAL: + fVal = pFCell->GetValue(); + rStrm << (UINT8)0x01 + << (UINT8)0 + << (UINT8)((fVal != 0) ? 0x01 : 0x00) + << (UINT16)0 << (UINT8)0 + << (UINT16)0xFFFF; + break; + + default: + rStrm << fVal; + break; + } + } + + rStrm << nGrBit << (UINT32)0x00000000 << nFormLen; + rStrm.Write( pData, nFormLen ); } @@ -1379,6 +1366,33 @@ ULONG ExcFormula::GetDiffLen( void ) const return 16 + nFormLen; } +BYTE ExcFormula::ScErrorCodeToExc(UINT16 nErrorCode) +{ + BYTE nRetVal; + + switch(nErrorCode) + { + case errIllegalFPOperation: //503 to #DIV/0 + nRetVal = 0x07; + break; + case errNoValue : //519 to #VALUE (wrong argument or operand) + nRetVal = 0x0F; + break; + case errNoCode: //521 to #NULL + nRetVal = 0x00; + break; + case errNoRef: //524 to #REF(cell referral not valid) + nRetVal = 0x17; + break; + case errNoName: //525 to #NAME (does not recognise text) + nRetVal = 0x1D; + break; + default: + nRetVal = 0x0F; // all others to #VALUE + break; + } + return nRetVal; +} //---------------------------------------------------- class ExcBlankMulblank - @@ -1432,7 +1446,7 @@ void ExcBlankMulblank::AddEntries( DBG_ASSERT( rPos.Col() + nCount <= MAXCOL + 1, "ExcBlankMulblank::AddEntries - column overflow" ); ScAddress aCurrPos( rPos ); - UINT16 nCellXF = rRootData.pXFRecs->Find( pAttr ); + UINT16 nCellXF = rRootData.pER->GetXFBuffer().Insert( pAttr ); sal_uInt16 nTmpCount = nCount; while( nTmpCount ) @@ -1577,7 +1591,20 @@ void ExcNameListEntry::SetCode( const ExcUPN& rUPN ) void ExcNameListEntry::SaveCont( XclExpStream& rStrm ) { - rStrm << (UINT16) EXC_NAME_BUILTIN // grbit (built in only) + if(rStrm.GetRoot().GetBiff() < xlBiff8) + { + rStrm << (UINT16) EXC_NAME_BUILTIN // grbit (built in only) + << (UINT8) 0x00 // chKey (keyboard shortcut) + << (UINT8) 0x01 // cch (string len) + << nFormLen // cce (formula len) + << nTabNum // set ixals = itab + << nTabNum // itab (table index, 1-based) + << (UINT32) 0x00000000 // cch + << nBuiltInKey; // string + } + else + { + rStrm << (UINT16) EXC_NAME_BUILTIN // grbit (built in only) << (UINT8) 0x00 // chKey (keyboard shortcut) << (UINT8) 0x01 // cch (string len) << nFormLen // cce (formula len) @@ -1586,6 +1613,7 @@ void ExcNameListEntry::SaveCont( XclExpStream& rStrm ) << (UINT32) 0x00000000 // cch << (UINT8) 0x00 // string grbit << nBuiltInKey; // string + } rStrm.Write( pData, nFormLen ); } @@ -1665,6 +1693,10 @@ ExcName::ExcName( RootData& rRootData, ScDBData* pArea ) : String aRangeName; pArea->GetName( aRangeName ); + + if( IsBuiltInAFName( aRangeName, EXC_BUILTIN_AUTOFILTER )) + return; + SetUniqueName( aRangeName ); ScRange aRange; @@ -1740,6 +1772,16 @@ BOOL ExcName::SetBuiltInName( const String& rName, UINT8 nKey ) return FALSE; } +BOOL ExcName::IsBuiltInAFName( const String& rName, UINT8 nKey ) +{ + if( XclTools::IsBuiltInName( nTabNum, rName, nKey ) || + (rName == ScGlobal::GetRscString( STR_DB_NONAME ))) + { + bDummy = TRUE; + return TRUE; + } + return FALSE; +} void ExcName::SaveCont( XclExpStream& rStrm ) { @@ -1893,8 +1935,15 @@ ExcNameList::ExcNameList( RootData& rRootData ) : DBG_ASSERT( pData, "ExcNameList::ExcNameList - missing db area" ); ExcName* pExcName = new ExcName( rRootData, pData ); - nExpIx = Append( pExcName ); - pData->SetExportIndex( nExpIx ); + if( pExcName->IsDummy() ) + { + delete pExcName; + } + else + { + nExpIx = Append( pExcName ); + pData->SetExportIndex( nExpIx ); + } } maNextInsVec.resize( nScTabCount, Count() ); @@ -2092,7 +2141,7 @@ void ExcEGuts::SaveCont( XclExpStream& rStrm ) rStrm << (UINT16)(nRowLevel ? (12 * nRowLevel + 17) : 0) << (UINT16)(nColLevel ? (12 * nColLevel + 17) : 0) << (UINT16)(nRowLevel + (nRowLevel ? 1 : 0)) - << (UINT16)(nColLevel + (nRowLevel ? 1 : 0)); + << (UINT16)(nColLevel + (nColLevel ? 1 : 0)); } @@ -2279,7 +2328,7 @@ ExcColinfo::ExcColinfo( UINT16 nCol, UINT16 nTab, UINT16 nNewXF, RootData& rRoot nXF = nNewXF; - SetWidth( rDoc.GetColWidth( nCol, nTab ), rRoot.fColScale ); + nColWidth = XclTools::GetXclColumnWidth( rDoc.GetColWidth( nCol, nTab ), rRoot.pER->GetCharWidth() ); BYTE nColFlags = rDoc.GetColFlags( nCol, nTab ); nOptions = 0x0000; @@ -2295,18 +2344,6 @@ ExcColinfo::ExcColinfo( UINT16 nCol, UINT16 nTab, UINT16 nNewXF, RootData& rRoot } -void ExcColinfo::SetWidth( UINT16 nWidth, double fColScale ) -{ - double f = nWidth; - f *= 1328.0 / 25.0; - f += 90.0; - f *= 1.0 / 23.0; - f /= fColScale; - - nColWidth = (UINT16) f; -} - - void ExcColinfo::Expand( ExcColinfo*& rpExp ) { if( !rpExp ) return; @@ -2340,226 +2377,6 @@ ULONG ExcColinfo::GetLen( void ) const -//--------------------------------------------------------------- class ExcXf - - -ExcXf::ExcXf( const XclExpRoot& rRoot, UINT16 nFont, UINT16 nForm, const ScPatternAttr* pPattAttr, BOOL& rbWrap, BOOL bSt ) : - XclExpRoot( rRoot ), - bStyle( bSt ) -{ -#ifdef DBG_UTIL - nObjCnt++; -#endif - - bAtrNum = bAtrFnt = bAtrAlc = bAtrBdr = bAtrPat = bAtrProt = !bSt; // always TRUE for cell xfs - - nIfnt = nFont; - nIfmt = nForm; - - if( pPattAttr ) - { - nOffs8 = 0x0000; - const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&) pPattAttr->GetItem( ATTR_PROTECTION ); - if( rProtAttr.GetProtection() ) - nOffs8 |= EXC_XF_LOCKED; - if( rProtAttr.GetHideFormula() || rProtAttr.GetHideCell() ) - nOffs8 |= EXC_XF_HIDDEN; - - switch( ( SvxCellHorJustify ) - ((const SvxHorJustifyItem&)pPattAttr->GetItem( ATTR_HOR_JUSTIFY )).GetValue() ) - { - case SVX_HOR_JUSTIFY_STANDARD: eAlc = xlHAlignGeneral; break; - case SVX_HOR_JUSTIFY_LEFT: eAlc = xlHAlignLeft; break; - case SVX_HOR_JUSTIFY_CENTER: eAlc = xlHAlignCenter; break; - case SVX_HOR_JUSTIFY_RIGHT: eAlc = xlHAlignRight; break; - case SVX_HOR_JUSTIFY_BLOCK: eAlc = xlHAlignJustify; break; - case SVX_HOR_JUSTIFY_REPEAT: eAlc = xlHAlignFill; break; - default: - DBG_ERROR( "ExcXf::ExcXf(): ATTR_HOR_JUSTIFY unbekannt!" ); - eAlc = xlHAlignGeneral; - } - - switch( ( SvxCellVerJustify ) - ((const SvxVerJustifyItem&)pPattAttr->GetItem( ATTR_VER_JUSTIFY )).GetValue() ) - { - case SVX_VER_JUSTIFY_STANDARD: eAlcV = xlVAlignBottom; break; - case SVX_VER_JUSTIFY_TOP: eAlcV = xlVAlignTop; break; - case SVX_VER_JUSTIFY_CENTER: eAlcV = xlVAlignCenter; break; - case SVX_VER_JUSTIFY_BOTTOM: eAlcV = xlVAlignBottom; break; - default: - DBG_ERROR( "ExcXf::ExcXf(): ATTR_VER_JUSTIFY unbekannt!" ); - eAlcV = xlVAlignBottom; - } - - switch( ( SvxCellOrientation ) - ((const SvxOrientationItem&)pPattAttr->GetItem( ATTR_ORIENTATION )).GetValue() ) - { - case SVX_ORIENTATION_STANDARD: eOri = xlTextOrientNoRot; break; - case SVX_ORIENTATION_TOPBOTTOM: eOri = xlTextOrient90cw; break; - case SVX_ORIENTATION_BOTTOMTOP: eOri = xlTextOrient90ccw; break; - case SVX_ORIENTATION_STACKED: eOri = xlTextOrientTopBottom; break; - default: - DBG_ERROR( "ExcXf::ExcXf(): ATTR_ORIENTATION unbekannt!" ); - eOri = xlTextOrientNoRot; - } - - bFWrap = rbWrap || - ( ( BOOL ) ((const SfxBoolItem&)pPattAttr->GetItem( ATTR_LINEBREAK )).GetValue() ); - - // fore-/background - const SvxBrushItem& rBrushItem = ( const SvxBrushItem& ) pPattAttr->GetItem( ATTR_BACKGROUND ); - Color aCol = rBrushItem.GetColor(); - - nFls = aCol.GetTransparency()? 0x0000 : 0x0001; - - nIcvForeSer = GetPalette().InsertColor( aCol, xlColorCellArea ); - nIcvBackSer = GetPalette().InsertColor( Color( COL_BLACK ), xlColorCellArea ); - - // Umrandung - const SvxBoxItem& rBox = ((const SvxBoxItem&)pPattAttr->GetItem( ATTR_BORDER )); - - ScToExcBorderLine( GetPalette(), rBox.GetTop(), nIcvTopSer, nDgTop ); - ScToExcBorderLine( GetPalette(), rBox.GetLeft(), nIcvLftSer, nDgLeft ); - ScToExcBorderLine( GetPalette(), rBox.GetBottom(), nIcvBotSer, nDgBottom ); - ScToExcBorderLine( GetPalette(), rBox.GetRight(), nIcvRigSer, nDgRight ); - - if( bSt ) - { - static const USHORT pFntChkWichs[] = - { - ATTR_FONT_HEIGHT, - ATTR_FONT_WEIGHT, - ATTR_FONT_POSTURE, - ATTR_FONT_UNDERLINE, - ATTR_FONT_CROSSEDOUT, - ATTR_FONT_CONTOUR, - ATTR_FONT_SHADOWED, - ATTR_FONT_COLOR, - ATTR_FONT_LANGUAGE, - 0 - }; - - const SfxItemSet& rSet = pPattAttr->GetItemSet(); - - bAtrNum = rSet.GetItemState( ATTR_VALUE_FORMAT, FALSE ) == SFX_ITEM_SET; - bAtrFnt = pPattAttr->HasItemsSet( pFntChkWichs ); - bAtrAlc = ( rSet.GetItemState( ATTR_HOR_JUSTIFY, FALSE ) == SFX_ITEM_SET ) || - ( rSet.GetItemState( ATTR_VER_JUSTIFY, FALSE ) == SFX_ITEM_SET ) || - ( rSet.GetItemState( ATTR_LINEBREAK, FALSE ) == SFX_ITEM_SET ); - bAtrBdr = rSet.GetItemState( ATTR_BORDER, FALSE ) == SFX_ITEM_SET; - bAtrPat = rSet.GetItemState( ATTR_BACKGROUND, FALSE ) == SFX_ITEM_SET; - bAtrProt = rSet.GetItemState( ATTR_PROTECTION, FALSE ) == SFX_ITEM_SET; - } - } - else - { - nOffs8 = EXC_XF_LOCKED; - eAlc = xlHAlignGeneral; - eAlcV = xlVAlignBottom; - eOri = xlTextOrientNoRot; - bFWrap = FALSE; - nFls = 0x0000; - nIcvBackSer = GetPalette().InsertIndex( 65 ); - nIcvForeSer = GetPalette().InsertIndex( 64 ); - nIcvTopSer = nIcvBotSer = nIcvLftSer = nIcvRigSer = 0; - nDgTop = nDgLeft = nDgBottom = nDgRight = 0; - } - - rbWrap = bFWrap; - - bFSxButton = FALSE; // XF Record attached PivotTable Button -} - - -#ifdef DBG_UTIL -ExcXf::~ExcXf() -{ - nObjCnt--; -} -#endif - - -void ExcXf::ScToExcBorderLine( XclExpPalette& rPalette, const SvxBorderLine* pLine, UINT32& rIcvSer, UINT16& rDg ) -{ - if( !pLine ) - { - rIcvSer = rPalette.InsertIndex( 0 ); - rDg = 0; - return; - } - - rIcvSer = rPalette.InsertColor( pLine->GetColor(), xlColorCellBorder ); - - if( pLine->GetDistance() ) - // doppelte Linien - rDg = 6; - else - {// einfache Linien - UINT16 nOut = pLine->GetOutWidth(); - - if( nOut <= DEF_LINE_WIDTH_1 ) - rDg = 1; - else if( nOut <= DEF_LINE_WIDTH_2 ) - rDg = 2; - else - rDg = 5; - } -} - - -void ExcXf::SaveCont( XclExpStream& rStrm ) -{ - UINT16 nTmp; - - rStrm << nIfnt << nIfmt // Offs 4 + 6 - << nOffs8; // Offs 8 - - nTmp = ( UINT16 ) eAlc; // Offs 10 - nTmp |= 0x0800; // locked - if( bFWrap ) - nTmp += 0x0008; - nTmp += ( ( UINT16 ) eAlcV ) << 4; - nTmp += ( ( UINT16 ) eOri ) << 8; - rStrm << nTmp; - - UINT16 nForeInd, nBackInd; - GetPalette().GetMixedColors( nForeInd, nBackInd, nFls, nIcvForeSer, nIcvBackSer ); - nTmp = nForeInd; // Offs 12 - nTmp |= nBackInd << 7; - - if ( bFSxButton ) - nTmp |= 0x2000; - rStrm << nTmp; - - nTmp = nFls; // Offs 14 - nTmp += nDgBottom << 6; - nTmp |= GetPalette().GetColorIndex( nIcvBotSer ) << 9; - rStrm << nTmp; - - nTmp = nDgTop; // Offs 16 - nTmp += nDgLeft << 3; - nTmp += nDgRight << 6; - nTmp |= GetPalette().GetColorIndex( nIcvTopSer ) << 9; - rStrm << nTmp; - - nTmp = GetPalette().GetColorIndex( nIcvLftSer ); // Offs 18 - nTmp |= GetPalette().GetColorIndex( nIcvRigSer ) << 7; - rStrm << nTmp; -} - - -UINT16 ExcXf::GetNum( void ) const -{ - return 0x00E0; -} - - -ULONG ExcXf::GetLen( void ) const -{ - return 16; -} - - - //------------------------------------------------------ class ExcExterncount - ExcExterncount::ExcExterncount( RootData* pRD, const BOOL bTableNew ) : @@ -2608,7 +2425,7 @@ ExcExternsheet::ExcExternsheet( RootData* pExcRoot, const UINT16 nNewTabNum ) : void ExcExternsheet::SaveCont( XclExpStream& rStrm ) { - rStrm << ( UINT8 ) Min( (xub_StrLen)(aTabName.Len() + 1), (xub_StrLen) 255 ) << ( UINT8 ) 0x03; + rStrm << ( UINT8 ) Min( (xub_StrLen)(aTabName.Len() ), (xub_StrLen) 255 ) << ( UINT8 ) 0x03; rStrm.WriteByteStringBuffer( ByteString( aTabName, *pExcRoot->pCharset ), 254 ); // max 254 chars (leading 0x03!) } @@ -2721,133 +2538,6 @@ ULONG ExcSelection::GetLen( void ) const } -//------------------------------------------------------------ class UsedList - - -void UsedList::Save( XclExpStream& rStrm ) -{ - for( ExcRecord* pExcRec = (ExcRecord*) First(); pExcRec; pExcRec = (ExcRecord*) Next() ) - pExcRec->Save( rStrm ); -} - - - -//-------------------------------------------------------- class UsedAttrList - - -UsedAttrList::UsedAttrList( RootData* pRD ) : - ExcRoot( pRD ), - rFntLst( pRD->pER->GetFontBuffer() ), - rFrmLst( pRD->pER->GetNumFmtBuffer() ) -{ -} - - -UsedAttrList::~UsedAttrList() -{ - for( ENTRY* pEntry = _First(); pEntry; pEntry = _Next() ) - delete pEntry; -} - - -void UsedAttrList::AddNewXF( const ScPatternAttr* pAttr, const BOOL bStyle, const BOOL bExplLineBreak, - const ULONG nAltNumForm, BOOL bForceAltNumForm ) -{ - // Aufbauen der Excel-Daten - ENTRY* pData = new ENTRY; - pData->pPattAttr = pAttr; - pData->bLineBreak = bExplLineBreak; - pData->nAltNumForm = nAltNumForm; - List::Insert( pData, LIST_APPEND ); - - // Font-Daten - UINT16 nFontIndex; - - // Format-Daten - ULONG nScForm; - - if( pAttr ) - { - nFontIndex = rFntLst.Insert( *pAttr ); - - if ( bForceAltNumForm ) - nScForm = nAltNumForm; - else - { - nScForm = (( SfxUInt32Item& ) pAttr->GetItem( ATTR_VALUE_FORMAT )).GetValue(); - - if( nAltNumForm != NUMBERFORMAT_ENTRY_NOT_FOUND && - ( nScForm % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ) - nScForm = nAltNumForm; - } - } - else - { - nScForm = nAltNumForm; - nFontIndex = 0; - } - - UINT16 nFormatIndex = rFrmLst.Insert( nScForm ); - - if ( pExcRoot->eDateiTyp < Biff8 ) - pData->pXfRec = new ExcXf( *pExcRoot->pER, nFontIndex, nFormatIndex, pAttr, pData->bLineBreak, bStyle ); - else - pData->pXfRec = new ExcXf8( *pExcRoot->pER, nFontIndex, nFormatIndex, pAttr, pData->bLineBreak, bStyle ); -} - - -UINT16 UsedAttrList::Find( const ScPatternAttr* pAttr, const BOOL bStyle, - const UINT32 nAltNumForm, BOOL bForceAltNumForm ) -{ - if( !pAttr && nAltNumForm == NUMBERFORMAT_ENTRY_NOT_FOUND ) - return 15; // default XF - - DBG_ASSERT( nBaseIndex, "*UsedAttrList::Find(): leer == nichtleer?" ); - - UINT16 nC = nBaseIndex; - for( ENTRY* pCurr = _First(); pCurr; pCurr = _Next() ) - { - if( pCurr->Equal( pAttr, nAltNumForm ) ) - return nC; - nC++; - } - - // neuen ausdenken - - AddNewXF( pAttr, bStyle, FALSE, nAltNumForm, bForceAltNumForm ); - - return nC; -} - - -UINT16 UsedAttrList::FindWithLineBreak( const ScPatternAttr* pAttr ) -{ - DBG_ASSERT( nBaseIndex, - "*UsedAttrList::FindWithLineBreak(): leer == nichtleer?" ); - - UINT16 nC = nBaseIndex; - for( ENTRY* pCurr = _First(); pCurr; pCurr = _Next() ) - { - if( pCurr->pPattAttr == pAttr && pCurr->bLineBreak ) - return nC; - nC++; - } - - // neuen ausdenken - - AddNewXF( pAttr, FALSE, TRUE ); - - return nC; -} - - -void UsedAttrList::Save( XclExpStream& rStrm ) -{ - for( ENTRY* pEntry = _First(); pEntry; pEntry = _Next() ) - if( pEntry->pXfRec ) - pEntry->pXfRec->Save( rStrm ); -} - - - // XclExpWsbool =============================================================== XclExpWsbool::XclExpWsbool( RootData& rRootData ) : @@ -3861,6 +3551,24 @@ ULONG ExcShrdFmla::GetLen() const return 10 + nFormLen; } +//----------------------------------------------------------------- + +void ExcFmlaResultStr::WriteBody( XclExpStream& rStrm ) +{ + rStrm << maResultText; +} + + +ExcFmlaResultStr::ExcFmlaResultStr(const XclExpString& aFmlaText) : + XclExpRecord( EXC_ID_STRING ), + maResultText(aFmlaText) +{ +} + + +ExcFmlaResultStr::~ExcFmlaResultStr() +{ +} //--------------------------- class XclExpTableOp, class XclExpTableOpManager - diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 7d95fa8f2288..95c4625c73e4 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: exctools.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,6 @@ #include "imp_op.hxx" #include "excimp8.hxx" #include "otlnbuff.hxx" -#include "fltprgrs.hxx" #include "excrecds.hxx" #include "xcl97rec.hxx" @@ -124,7 +123,7 @@ String RootData::GetCondFormStyleName( const UINT16 n ) RootData::RootData( void ) { - fColScale = fRowScale = 1.0; + fRowScale = 1.0; pDoc = NULL; pScRangeName = NULL; @@ -153,12 +152,10 @@ RootData::RootData( void ) pCellMerging = NULL; pNameList = NULL; pScNameList = NULL; - pXFRecs = NULL; pExtSheetCntAndRecs = NULL; nRowMax = 0; pObjRecs = NULL; - pNoteRecs = NULL; pEscher = NULL; pPivotCacheList = NULL; @@ -425,82 +422,6 @@ void OutlineBuffer::Reset( ScOutlineArray *pOArray ) -INT32 FilterProgressBar::nInstances = 0; - - -FilterProgressBar::FilterProgressBar( SvStream& rStream ) : pStr( &rStream ), pXIStr( NULL ) -{ - ULONG nOldPos = rStream.Tell(); - rStream.Seek( STREAM_SEEK_TO_END ); - ULONG nStrmLen = rStream.Tell(); - rStream.Seek( nOldPos ); - Init( nOldPos, nStrmLen, STR_LOAD_DOC ); -} - - -FilterProgressBar::FilterProgressBar( XclImpStream& rStream ) : pStr( NULL ), pXIStr( &rStream ) -{ - Init( rStream.Tell(), rStream.GetStreamSize(), STR_LOAD_DOC ); -} - - -FilterProgressBar::FilterProgressBar( UINT32 nObjCount ) : pStr( NULL ), pXIStr( NULL ) -{ - Init( 0, nObjCount, STR_PROGRESS_CALCULATING ); -} - - -FilterProgressBar::~FilterProgressBar() -{ - nInstances--; - - if( pPrgrs ) - delete pPrgrs; -} - - -void FilterProgressBar::Init( ULONG nStartPos, ULONG nSize, USHORT nResStr ) -{ - nInstances++; - - nCnt = 0; - - if( nInstances == 1 ) - { - nUnitSize = (nSize < 128) ? 1 : (nSize / 128); - nNextUnit = 0; - pPrgrs = new ScProgress( NULL, ScGlobal::GetRscString( nResStr ), nSize ); - pPrgrs->SetState( nStartPos ); - } - else - pPrgrs = NULL; -} - - -void FilterProgressBar::Progress( void ) -{ - if( pPrgrs ) - { - UINT32 nNewState; - if( pStr ) - nNewState = pStr->Tell(); - else if( pXIStr ) - nNewState = pXIStr->Tell(); - else - { - nCnt++; - nNewState = nCnt; - } - - if( nNewState >= nNextUnit ) - { - pPrgrs->SetState( nNewState ); - nNextUnit += nUnitSize; - } - } -} - - //___________________________________________________________________ diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index dad17f1c57f5..4f29f8e3b352 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: expop2.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:16:01 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -135,17 +135,6 @@ ExportBiff5::ExportBiff5( SvStorage& rRootStorage, SvStream& aStream, ScDocument if( pExcRoot->fRowScale <= 0.0 ) pExcRoot->fRowScale = 1.0; - double fColScale = pExcRoot->pExtDocOpt->fColScale; - if( fColScale <= 0.0 ) - { - fColScale = aFilterOpt.GetExcelColScale(); - if( fColScale <= 0.0 ) - fColScale = 1.0; - - fColScale *= 1.027027027027; // adjustment for export of calc documents - } - pExcRoot->fColScale = fColScale; - pExcDoc = new ExcDocument( *this ); } diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 67e67d97b17f..b6d7906fcddc 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fontbuff.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:16:01 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 83ca0f808803..7b5245468408 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impop.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,10 +238,6 @@ ImportExcel::ImportExcel( SvStream& rSvStrm, ScDocument* pDoc, const String& rBa // options from configuration ScFilterOptions aFilterOpt; - pExcRoot->fColScale = aFilterOpt.GetExcelColScale(); - if( pExcRoot->fColScale <= 0.0 ) - pExcRoot->fColScale = 1.0; - pExcRoot->fRowScale = aFilterOpt.GetExcelRowScale(); if( pExcRoot->fRowScale <= 0.0 ) pExcRoot->fRowScale = 1.0; @@ -497,11 +493,15 @@ void ImportExcel::Row25( void ) void ImportExcel::Bof2( void ) { sal_uInt16 nSubType; +#if SC_XCL_USEDECR maStrm.UseDecryption( false ); +#endif maStrm.Ignore( 2 ); maStrm >> nSubType; SetBiff( xlBiff2 ); +#if SC_XCL_USEDECR maStrm.UseDecryption( true ); +#endif pExcRoot->eHauptDateiTyp = Biff2; if( nSubType == 0x0010 ) // Worksheet? @@ -563,7 +563,7 @@ void ImportExcel::Externsheet( void ) bool bSameWorkBook; aIn.AppendByteString( aEncodedUrl, false ); XclImpUrlHelper::DecodeUrl( aUrl, aTabName, bSameWorkBook, *pExcRoot->pIR, aEncodedUrl ); - ScfTools::ConvertName( aTabName ); + ScfTools::ConvertToScSheetName( aTabName ); pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook ); } @@ -584,7 +584,7 @@ void ImportExcel::Name25( void ) // Namen einlesen String aName( aIn.ReadRawByteString( nLenName ) ); - ScfTools::ConvertName( aName ); + ScfTools::ConvertToScDefinedName( aName ); pFormConv->Reset(); if( nAttr0 & 0x02 ) @@ -626,13 +626,18 @@ void ImportExcel::Name25( void ) sal_Char cFirstNameChar = ( sal_Char ) aName.GetChar( 0 ); const BOOL bPrintArea = bBuildIn && ( cFirstNameChar == EXC_BUILTIN_PRINTAREA ); const BOOL bPrintTitles = bBuildIn && ( cFirstNameChar == EXC_BUILTIN_PRINTTITLES ); + RangeType eNameType = RT_ABSAREA; + + if(bPrintArea) + eNameType = RT_PRINTAREA; + if( bBuildIn ) {// Build-in name XclTools::GetBuiltInName( aName, cFirstNameChar, nSheet ); } else - ScfTools::ConvertName( aName ); + ScfTools::ConvertToScDefinedName( aName ); pFormConv->Reset(); if( nOpt & (EXC_NAME_VB | EXC_NAME_BIG) ) @@ -658,7 +663,7 @@ void ImportExcel::Name25( void ) pExcRoot->pRNameBuff->Store( aName, NULL, nSheet ); else // ohne hidden - pExcRoot->pRNameBuff->Store( aName, pErgebnis, nSheet, bPrintArea ); + pExcRoot->pRNameBuff->Store( aName, pErgebnis, nSheet, eNameType); }// ----------------------------------------- Ende fuer Biff5 } @@ -821,7 +826,7 @@ void ImportExcel::Externname25( void ) if( ( nOpt & 0x0001 ) || ( ( nOpt & 0xFFFE ) == 0x0000 ) ) {// external name - ScfTools::ConvertName( aName ); + ScfTools::ConvertToScDefinedName( aName ); pExcRoot->pExtNameBuff->AddName( aName ); } else if( nOpt & 0x0010 ) @@ -845,7 +850,8 @@ void ImportExcel::Colwidth( void ) if( nColLast > MAXCOL ) nColLast = MAXCOL; - pColRowBuff->SetWidthRange( nColFirst, nColLast, CalcColWidth( nColWidth ) ); + sal_uInt16 nScWidth = XclTools::GetScColumnWidth( nColWidth, GetCharWidth() ); + pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth ); } @@ -932,6 +938,7 @@ void ImportExcel::DocProtect( void ) BOOL ImportExcel::Filepass( void ) { +#if SC_XCL_USEDECR if( pExcRoot->eHauptDateiTyp <= Biff5 ) { aIn.UseDecryption( false ); @@ -958,6 +965,7 @@ BOOL ImportExcel::Filepass( void ) return !bValid; } else +#endif // POST: return = TRUE, wenn Password <> 0 return aIn.ReaduInt32() != 0; } @@ -1003,10 +1011,16 @@ void ImportExcel::Ixfe( void ) void ImportExcel::DefColWidth( void ) { - UINT16 nWidth; - aIn >> nWidth; + // stored as entire characters -> convert to 1/256 of characters (as in COLINFO) + double fDefWidth = 256.0 * maStrm.ReaduInt16(); + + // #i3006# additional space for default width - Excel adds space depending on font size + long nFontHt = GetFontBuffer().GetAppFontData().mnHeight; + fDefWidth += 40960.0 / ::std::max( nFontHt - 15L, 60L ) + 50.0; + fDefWidth = ::std::min( fDefWidth, 65535.0 ); - pColRowBuff->SetDefWidth( CalcColWidth( (UINT16) ( (double)nWidth * 292.5 ) ) ); + sal_uInt16 nScWidth = XclTools::GetScColumnWidth( static_cast< sal_uInt16 >( fDefWidth ), GetCharWidth() ); + pColRowBuff->SetDefWidth( nScWidth ); } @@ -1034,7 +1048,8 @@ void ImportExcel::Colinfo( void ) if( nOpt & EXC_COL_HIDDEN ) // Cols hidden? pColRowBuff->HideColRange( nColFirst, nColLast ); - pColRowBuff->SetWidthRange( nColFirst, nColLast, CalcColWidth( nColWidth ) ); + sal_uInt16 nScWidth = XclTools::GetScColumnWidth( nColWidth, GetCharWidth() ); + pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth ); pColRowBuff->SetDefaultXF( nColFirst, nColLast, nXF ); } @@ -1112,7 +1127,7 @@ void ImportExcel::Boundsheet( void ) nGrbit = 0x0000; String aName( aIn.ReadByteString( FALSE ) ); - ScfTools::ConvertName( aName ); + ScfTools::ConvertToScSheetName( aName ); *pExcRoot->pTabNameBuff << aName; @@ -1199,10 +1214,8 @@ void ImportExcel::Palette( void ) void ImportExcel::Standardwidth( void ) { - UINT16 nWidth; - aIn >> nWidth; - - pColRowBuff->SetDefWidth( CalcColWidth( nWidth ), TRUE ); + sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); + pColRowBuff->SetDefWidth( nScWidth, TRUE ); } @@ -1634,11 +1647,15 @@ void ImportExcel::Row34( void ) void ImportExcel::Bof3( void ) { sal_uInt16 nSubType; +#if SC_XCL_USEDECR maStrm.UseDecryption( false ); +#endif maStrm.Ignore( 2 ); maStrm >> nSubType; SetBiff( xlBiff3 ); +#if SC_XCL_USEDECR maStrm.UseDecryption( true ); +#endif DBG_ASSERT( nSubType != 0x0100, "*ImportExcel::Bof3(): Biff3 als Workbook?!" ); pExcRoot->eHauptDateiTyp = Biff3; @@ -1685,7 +1702,7 @@ void ImportExcel::Name34( void ) } else { - ScfTools::ConvertName( aName ); + ScfTools::ConvertToScDefinedName( aName ); bPrintArea = bPrintTitles = bBuildIn = FALSE; } @@ -1725,7 +1742,7 @@ void ImportExcel::Array34( void ) BYTE nFirstCol, nLastCol; aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol; - aIn.Ignore( 6 ); + aIn.Ignore( (pExcRoot->eHauptDateiTyp >= Biff5) ? 6 : 2 ); aIn >> nFormLen; if( nLastRow <= MAXROW && nLastCol <= MAXCOL ) @@ -1864,11 +1881,15 @@ void ImportExcel::Window2_5( void ) void ImportExcel::Bof4( void ) { sal_uInt16 nSubType; +#if SC_XCL_USEDECR maStrm.UseDecryption( false ); +#endif maStrm.Ignore( 2 ); maStrm >> nSubType; SetBiff( xlBiff4 ); +#if SC_XCL_USEDECR maStrm.UseDecryption( true ); +#endif pExcRoot->eHauptDateiTyp = Biff4; if( nSubType == 0x0010 ) // Sheet? @@ -1894,10 +1915,14 @@ void ImportExcel::Bof5( void ) BiffTyp eHaupt = Biff5; BiffTyp eDatei; +#if SC_XCL_USEDECR maStrm.UseDecryption( false ); +#endif maStrm >> nVers >> nSubType; SetBiff( (nVers == 0x0600) ? xlBiff8 : xlBiff5 ); +#if SC_XCL_USEDECR maStrm.UseDecryption( true ); +#endif switch( nSubType ) { @@ -1961,6 +1986,21 @@ void ImportExcel::EndSheet( void ) if( pExcRoot->eHauptDateiTyp < Biff8 ) pExcRoot->pExtNameBuff->Reset(); + + // no or empty HEADER record + if( !bHasHeader ) + { + SvxSetItem aHeaderSetItem( (const SvxSetItem&) pStyleSheetItemSet->Get( ATTR_PAGE_HEADERSET ) ); + aHeaderSetItem.GetItemSet().Put( SfxBoolItem( ATTR_PAGE_ON, sal_False ) ); + pStyleSheetItemSet->Put( aHeaderSetItem ); + } + // no or empty FOOTER record + if( !bHasFooter ) + { + SvxSetItem aFooterSetItem( (const SvxSetItem&) pStyleSheetItemSet->Get( ATTR_PAGE_FOOTERSET ) ); + aFooterSetItem.GetItemSet().Put( SfxBoolItem( ATTR_PAGE_ON, sal_False ) ); + pStyleSheetItemSet->Put( aFooterSetItem ); + } } @@ -1975,7 +2015,7 @@ void ImportExcel::NeueTabelle( void ) ScStyleSheetPool* pStyleShPool = pD->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSh = pStyleShPool->Find( aStyleName, SFX_STYLE_FAMILY_PAGE ); - pStyleSheetItemSet = pStyleSh ? &pStyleSh->GetItemSet() : + pExcRoot->pStyleSheetItemSet = pStyleSheetItemSet = pStyleSh ? &pStyleSh->GetItemSet() : &pStyleShPool->Make( aStyleName, SFX_STYLE_FAMILY_PAGE, SFXSTYLEBIT_USERDEF ).GetItemSet(); pExcRoot->bDefaultPage = TRUE; @@ -2160,7 +2200,6 @@ void ImportExcel::PostDocLoad( void ) } } - pExcRoot->pExtDocOpt->fColScale = pExcRoot->fColScale; pD->SetExtDocOptions( pExcRoot->pExtDocOpt ); pExcRoot->pExtDocOpt = NULL; @@ -2230,21 +2269,6 @@ void ImportExcel::PostDocLoad( void ) } } } - - // no or empty HEADER record - if( !bHasHeader ) - { - SvxSetItem aHeaderSetItem( (const SvxSetItem&) pStyleSheetItemSet->Get( ATTR_PAGE_HEADERSET ) ); - aHeaderSetItem.GetItemSet().Put( SfxBoolItem( ATTR_PAGE_ON, sal_False ) ); - pStyleSheetItemSet->Put( aHeaderSetItem ); - } - // no or empty FOOTER record - if( !bHasFooter ) - { - SvxSetItem aFooterSetItem( (const SvxSetItem&) pStyleSheetItemSet->Get( ATTR_PAGE_FOOTERSET ) ); - aFooterSetItem.GetItemSet().Put( SfxBoolItem( ATTR_PAGE_ON, sal_False ) ); - pStyleSheetItemSet->Put( aFooterSetItem ); - } } @@ -2277,22 +2301,6 @@ void ImportExcel::SetTextCell( const UINT16 nC, const UINT16 nR, String& r, cons } -UINT16 ImportExcel::CalcColWidth( const UINT16 n ) -{ - double f = ( double ) n; - - f *= pExcRoot->fColScale; - f *= 23.0; - f -= 90.0; - f *= 25.0 / 1328.0; - - if( f < 0.0 ) - f = 0.0; - - return ( UINT16 ) f; -} - - void ImportExcel::SetMarginItem( SfxItemSet& rItemSet, double fMarginInch, XclMarginType eType ) { sal_uInt16 nMarginTwips = XclTools::GetTwipsFromInch( fMarginInch ); diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk index 7e591e41d9c8..b02c12c73543 100644 --- a/sc/source/filter/excel/makefile.mk +++ b/sc/source/filter/excel/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: dr $ $Date: 2002-11-21 12:16:01 $ +# last change: $Author: hr $ $Date: 2003-03-26 18:04:33 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,6 +84,7 @@ SLOFILES = \ $(SLO)$/xltools.obj \ $(SLO)$/xlroot.obj \ $(SLO)$/xlstyle.obj \ + $(SLO)$/xlocx.obj \ $(SLO)$/xistream.obj \ $(SLO)$/xiroot.obj \ $(SLO)$/xihelper.obj \ diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index d1fc21931936..cef2aa3dbd0e 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -2,9 +2,9 @@ * * $RCSfile: namebuff.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,14 +169,14 @@ BOOL NameBuffer::Find( const sal_Char* pRefName, UINT16& rIndex ) -void RangeNameBuffer::Store( ByteString& r, const ScTokenArray* p, UINT16 n, const BOOL b ) +void RangeNameBuffer::Store( ByteString& r, const ScTokenArray* p, UINT16 n, const RangeType t) { String aTmpStr( r, *pExcRoot->pCharset ); - Store( aTmpStr, p, n, b ); + Store( aTmpStr, p, n, t ); } -void RangeNameBuffer::Store( String& rName, const ScTokenArray* pDef, UINT16 nAltSheet, const BOOL bPrintarea ) +void RangeNameBuffer::Store( String& rName, const ScTokenArray* pDef, UINT16 nAltSheet, const RangeType eNameType) { if( pDef ) { @@ -196,8 +196,12 @@ void RangeNameBuffer::Store( String& rName, const ScTokenArray* pDef, UINT16 nAl pData->GuessPosition(); pData->SetIndex( ( UINT16 ) Count() ); - if( bPrintarea ) - pData->AddType( RT_PRINTAREA ); + if( eNameType == RT_PRINTAREA ) + pData->AddType( eNameType ); + else if( eNameType == RT_CRITERIA ) + pData->SetType( eNameType ); + else if( eNameType == RT_NAME ) + pData->SetType( eNameType ); pExcRoot->pScRangeName->Insert( pData ); diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index eba5cc7ddafd..784047423ce5 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -2,9 +2,9 @@ * * $RCSfile: read.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-10 14:07:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,9 +148,8 @@ FltError ImportExcel::Read( void ) DBG_ASSERT( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" ); - ::std::auto_ptr< ScfProgressBar > pProgress( new ScfProgressBar( ScGlobal::GetRscString( STR_LOAD_DOC ) ) ); - sal_uInt32 nStreamSeg = pProgress->AddSegment( aIn.GetStreamSize() ); - pProgress->ActivateSegment( nStreamSeg ); + ::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar( + aIn.GetStreamSize(), GetDocShell(), STR_LOAD_DOC ) ); while( eAkt != Z_Ende ) { @@ -1015,8 +1014,6 @@ FltError ImportExcel8::Read( void ) } #endif - CreateTmpCtrlStorage(); - UINT16 nOpcode; // aktueller Opcode UINT16 nBofLevel = 0; @@ -1042,9 +1039,8 @@ FltError ImportExcel8::Read( void ) DBG_ASSERT( &aIn != NULL, "-ImportExcel8::Read(): Kein Stream - wie dass?!" ); - ::std::auto_ptr< ScfProgressBar > pProgress( new ScfProgressBar( ScGlobal::GetRscString( STR_LOAD_DOC ) ) ); - sal_uInt32 nStreamSeg = pProgress->AddSegment( aIn.GetStreamSize() ); - pProgress->ActivateSegment( nStreamSeg ); + ::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar( + aIn.GetStreamSize(), GetDocShell(), STR_LOAD_DOC ) ); bObjSection = FALSE; @@ -1197,7 +1193,7 @@ FltError ImportExcel8::Read( void ) NeueTabelle(); if( pExcRoot->eDateiTyp == Biff8C ) { - if( bWithDrawLayer && aObjManager.IsCurrObjChart() ) + if( bWithDrawLayer && GetObjectManager().IsCurrObjChart() ) ReadChart8( *pProgress, FALSE ); // zunaechst Return vergessen else {// Stream-Teil mit Chart ueberlesen @@ -1256,7 +1252,7 @@ FltError ImportExcel8::Read( void ) case EXC_ID_HLINK: XclImpHyperlink::ReadHlink( maStrm ); break; case EXC_ID_LABELRANGES: XclImpLabelranges::ReadLabelranges( maStrm ); break; - case EXC_ID_DVAL: XclImpValidation::ReadDval( maStrm, *this ); break; + case EXC_ID_DVAL: XclImpValidation::ReadDval( maStrm ); break; case EXC_ID_DV: XclImpValidation::ReadDv( maStrm, *pFormConv ); break; case EXC_ID_QSI: GetWebQueryBuffer().ReadQsi( maStrm ); break; @@ -1299,7 +1295,7 @@ FltError ImportExcel8::Read( void ) { Bof5(); if( pExcRoot->eDateiTyp == Biff8C && bWithDrawLayer && - aObjManager.IsCurrObjChart() ) + GetObjectManager().IsCurrObjChart() ) ReadChart8( *pProgress, FALSE ); // zunaechst Return vergessen else { @@ -1359,7 +1355,7 @@ FltError ImportExcel8::Read( void ) Bof5(); NeueTabelle(); - aObjManager.InsertDummyObj(); + GetObjectManager().InsertDummyObj(); switch( pExcRoot->eDateiTyp ) { @@ -1372,7 +1368,7 @@ FltError ImportExcel8::Read( void ) aIn.StoreGlobalPosition(); break; case Biff8C: - aObjManager.SetNewCurrObjChart(); + GetObjectManager().SetNewCurrObjChart(); pExcRoot->bChartTab = TRUE; ReadChart8( *pProgress, TRUE ); pExcRoot->bChartTab = FALSE; @@ -1500,7 +1496,7 @@ FltError ImportExcel8::Read( void ) //___________________________________________________________________ -FltError ImportExcel8::ReadChart8( ScfProgressBar& rProgress, const BOOL bOwnTab ) +FltError ImportExcel8::ReadChart8( ScfSimpleProgressBar& rProgress, const BOOL bOwnTab ) { bFirstScl = TRUE; @@ -1508,7 +1504,7 @@ FltError ImportExcel8::ReadChart8( ScfProgressBar& rProgress, const BOOL bOwnTab BOOL bLoop; UINT16 nOpcode; // current opcode - XclImpChart* pChart = aObjManager.GetCurrChartData(); + XclImpChart* pChart = GetObjectManager().GetCurrChartData(); if( !pChart ) { bLoop = TRUE; @@ -1554,11 +1550,11 @@ FltError ImportExcel8::ReadChart8( ScfProgressBar& rProgress, const BOOL bOwnTab case 0x100D: pChart->ReadSeriestext( aIn ); break; // SERIESTEXT case 0x1014: pChart->ReadChartformat(); break; // CHARTFORMAT case 0x1015: pChart->ReadLegend( aIn ); break; // LEGEND - case 0x1017: pChart = aObjManager.ReplaceChartData( aIn, ctBar ); break; // BAR - case 0x1018: pChart = aObjManager.ReplaceChartData( aIn, ctLine ); break; // LINE - case 0x1019: pChart = aObjManager.ReplaceChartData( aIn, ctPie ); break; // PIE - case 0x101A: pChart = aObjManager.ReplaceChartData( aIn, ctArea ); break; // AREA - case 0x101B: pChart = aObjManager.ReplaceChartData( aIn, ctScatter );break; // SCATTER + case 0x1017: pChart = GetObjectManager().ReplaceChartData( aIn, ctBar ); break; // BAR + case 0x1018: pChart = GetObjectManager().ReplaceChartData( aIn, ctLine ); break; // LINE + case 0x1019: pChart = GetObjectManager().ReplaceChartData( aIn, ctPie ); break; // PIE + case 0x101A: pChart = GetObjectManager().ReplaceChartData( aIn, ctArea ); break; // AREA + case 0x101B: pChart = GetObjectManager().ReplaceChartData( aIn, ctScatter );break; // SCATTER case 0x101C: pChart->ReadChartline( aIn ); break; // CHARTLINE case 0x101D: pChart->ReadAxis( aIn ); break; // AXIS case 0x101E: pChart->ReadTick( aIn ); break; // TICK @@ -1576,8 +1572,8 @@ FltError ImportExcel8::ReadChart8( ScfProgressBar& rProgress, const BOOL bOwnTab case 0x103A: pChart->Read3D( aIn ); break; // 3D case 0x103C: pChart->ReadPicf( aIn ); break; // PICF case 0x103D: pChart->ReadDropbar( aIn ); break; // DROPBAR - case 0x103E: pChart = aObjManager.ReplaceChartData( aIn, ctNet ); break; // RADAR - case 0x103F: pChart = aObjManager.ReplaceChartData( aIn, ctSurface );break; // SURFACE + case 0x103E: pChart = GetObjectManager().ReplaceChartData( aIn, ctNet ); break; // RADAR + case 0x103F: pChart = GetObjectManager().ReplaceChartData( aIn, ctSurface );break; // SURFACE case 0x1041: pChart->ReadAxisparent( aIn ); break; // AXISPARENT case 0x1045: pChart->ReadSertocrt( aIn ); break; // SERTOCRT case 0x1046: pChart->ReadAxesused( aIn ); break; // AXESUSED diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index bc75b2b5869f..2ffbb9785ebc 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xecontent.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 272108bcc002..fb838eca6ba3 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xehelper.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -694,10 +694,29 @@ void XclExpHFConverter::AppendPortion( String& rHFString, const EditTextObject* aParaText.AppendAscii( "&D" ); else if( pFieldData->ISA( SvxTimeField ) || pFieldData->ISA( SvxExtTimeField ) ) aParaText.AppendAscii( "&T" ); - else if( pFieldData->ISA( SvxFileField ) || pFieldData->ISA( SvxExtFileField ) ) - aParaText.AppendAscii( "&F" ); else if( pFieldData->ISA( SvxTableField ) ) aParaText.AppendAscii( "&A" ); + else if( pFieldData->ISA( SvxFileField ) ) // title -> file name + aParaText.AppendAscii( "&F" ); + else if( pFieldData->ISA( SvxExtFileField ) ) + { + const SvxExtFileField* pFileField = static_cast< const SvxExtFileField* >( pFieldData ); + switch( pFileField->GetFormat() ) + { + case SVXFILEFORMAT_NAME_EXT: + case SVXFILEFORMAT_NAME: + aParaText.AppendAscii( "&F" ); + break; + case SVXFILEFORMAT_PATH: + aParaText.AppendAscii( "&Z" ); + break; + case SVXFILEFORMAT_FULLPATH: + aParaText.AppendAscii( "&Z&F" ); + break; + default: + DBG_ERRORFILE( "XclExpHFConverter::AppendPortion - unknown file field" ); + } + } } } else diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 199f3b98da87..8391fb3e7fc5 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xelink.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 1212eda87304..fecc93d55911 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xerecord.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:12:49 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,12 @@ void XclExpRecordBase::Save( XclExpStream& rStrm ) { } +void XclExpRecordBase::SaveRepeated( XclExpStream& rStrm, sal_uInt32 nCount ) +{ + for( sal_uInt32 nIndex = 0; nIndex < nCount; ++nIndex ) + Save( rStrm ); +} + // ---------------------------------------------------------------------------- @@ -95,6 +101,12 @@ XclExpRecord::~XclExpRecord() { } +void XclExpRecord::SetRecHeader( sal_uInt16 nRecId, sal_uInt32 nRecSize ) +{ + SetRecId( nRecId ); + SetRecSize( nRecSize ); +} + void XclExpRecord::WriteBody( XclExpStream& rStrm ) { } @@ -118,6 +130,26 @@ void XclExpBoolRecord::WriteBody( XclExpStream& rStrm ) // ---------------------------------------------------------------------------- +XclExpDummyRecord::XclExpDummyRecord( sal_uInt16 nRecId, const void* pRecData, sal_uInt32 nRecSize ) : + XclExpRecord( nRecId ) +{ + SetData( pRecData, nRecSize ); +} + +void XclExpDummyRecord::SetData( const void* pRecData, sal_uInt32 nRecSize ) +{ + mpData = pRecData; + SetRecSize( pRecData ? nRecSize : 0 ); +} + +void XclExpDummyRecord::WriteBody( XclExpStream& rStrm ) +{ + rStrm.Write( mpData, GetRecSize() ); +} + + +// ---------------------------------------------------------------------------- + void XclExpRefRecord::Save( XclExpStream& rStrm ) { mrRec.Save( rStrm ); diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 3cf6f73e92fd..347c40884383 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xeroot.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,7 @@ #include "xecontent.hxx" #endif +#include <patattr.hxx> // Global data ================================================================ @@ -101,11 +102,12 @@ XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) : XclRoot( rExpRootData ), mrExpData( rExpRootData ) { - mrExpData.mpPalette.reset( new XclExpPalette( *this ) ); - mrExpData.mpFontBuffer.reset( new XclExpFontBuffer( *this ) ); - mrExpData.mpNumFmtBuffer.reset( new XclExpNumFmtBuffer( *this ) ); + mrExpData.mpPalette.reset( new XclExpPalette( GetRoot() ) ); + mrExpData.mpFontBuffer.reset( new XclExpFontBuffer( GetRoot() ) ); + mrExpData.mpNumFmtBuffer.reset( new XclExpNumFmtBuffer( GetRoot() ) ); + mrExpData.mpXFBuffer.reset( new XclExpXFBuffer( GetRoot() ) ); mrExpData.mpTabIdBuffer.reset( new XclExpTabIdBuffer( GetDoc() ) ); - mrExpData.mpLinkManager.reset( new XclExpLinkManager( *this ) ); + mrExpData.mpLinkManager.reset( new XclExpLinkManager( GetRoot() ) ); } XclExpRoot::XclExpRoot( const XclExpRoot& rRoot ) : @@ -123,9 +125,9 @@ XclExpRoot& XclExpRoot::operator=( const XclExpRoot& rRoot ) void XclExpRoot::SetBiff( XclBiff eBiff ) { XclRoot::SetBiff( eBiff ); - GetPalette().SetBiff( eBiff ); - GetFontBuffer().SetBiff( eBiff ); - GetNumFmtBuffer().SetBiff( eBiff ); + GetPalette().OnChangeBiff(); + GetFontBuffer().OnChangeBiff(); + GetNumFmtBuffer().OnChangeBiff(); } XclExpSst& XclExpRoot::GetSst() const @@ -150,6 +152,11 @@ XclExpNumFmtBuffer& XclExpRoot::GetNumFmtBuffer() const return *mrExpData.mpNumFmtBuffer; } +XclExpXFBuffer& XclExpRoot::GetXFBuffer() const +{ + return *mrExpData.mpXFBuffer; +} + XclExpTabIdBuffer& XclExpRoot::GetTabIdBuffer() const { return *mrExpData.mpTabIdBuffer; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index b7e69696a6d4..2b4e25019429 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xestream.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 57655f89d0c7..ad8104e74db3 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xestyle.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dr $ $Date: 2002-12-12 16:42:32 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,24 +76,52 @@ #ifndef _SV_FONTCVT_HXX #include <vcl/fontcvt.hxx> #endif -#ifndef _ZFORLIST_HXX -#include <svtools/zforlist.hxx> -#endif #ifndef _ZFORMAT_HXX #include <svtools/zformat.hxx> #endif +#ifndef SC_ITEMS_HXX +#include "scitems.hxx" +#endif +#ifndef _SVX_ALGITEM_HXX +#include <svx/algitem.hxx> +#endif +#ifndef _SVX_BOXITEM_HXX +#include <svx/boxitem.hxx> +#endif +#ifndef _SVX_ROTMODIT_HXX +#include <svx/rotmodit.hxx> +#endif +#ifndef _SVX_COLRITEM_HXX +#include <svx/colritem.hxx> +#endif +#ifndef _SVX_BRSHITEM_HXX +#include <svx/brshitem.hxx> +#endif +#ifndef _SVX_FRMDIRITEM_HXX +#include <svx/frmdiritem.hxx> +#endif + #ifndef SC_DOCUMENT_HXX #include "document.hxx" #endif +#ifndef SC_STLPOOL_HXX +#include "stlpool.hxx" +#endif #ifndef SC_SCPATATR_HXX #include "patattr.hxx" #endif +#ifndef SC_SCATTR_HXX +#include "attrib.hxx" +#endif #ifndef SC_XEHELPER_HXX #include "xehelper.hxx" #endif +#ifndef _RTL_TENCINFO_H +#include <rtl/tencinfo.h> +#endif // PALETTE record - color information ========================================= @@ -124,7 +152,7 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const Color& rColor ) // additional classes for color reduction ------------------------------------- /** Maps a color list index to a palette index. - @descr Used to remap the CID data vector from list indexes to palette indexes. */ + @descr Used to remap the color ID data vector from list indexes to palette indexes. */ struct XclRemap { sal_uInt32 mnPalIndex; /// Index to palette. @@ -152,9 +180,9 @@ typedef ::std::vector< XclNearest > XclNearestVec; IMPL_FIXEDMEMPOOL_NEWDEL( XclExpPalette::XclListColor, 100, 100 ) -XclExpPalette::XclListColor::XclListColor( const Color& rColor, sal_uInt32 nCID ) : +XclExpPalette::XclListColor::XclListColor( const Color& rColor, sal_uInt32 nColorId ) : maColor( rColor ), - mnCID( nCID ), + mnColorId( nColorId ), mnWeight( 0 ) { } @@ -198,16 +226,18 @@ const sal_Int32 EXC_PAL_MAXDIST = 0x7FFFFFFF; XclExpPalette::XclExpPalette( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_PALETTE ), + XclDefaultPalette( rRoot.GetBiff() ), + XclExpRoot( rRoot ), mnLastIx( 0 ) { - SetRecSize( GetColorCount() * 4 + 2 ); InsertColor( Color( COL_BLACK ), xlColorCellText ); - SetBiff( rRoot.GetBiff() ); + OnChangeBiff(); } -void XclExpPalette::SetBiff( XclBiff eBiff ) +void XclExpPalette::OnChangeBiff() { - XclDefaultPalette::SetBiff( eBiff ); + SetDefaultColors( GetBiff() ); + SetRecSize( GetColorCount() * 4 + 2 ); // initialize maPalette with default colors sal_uInt32 nCount = GetColorCount(); @@ -232,7 +262,7 @@ sal_uInt32 XclExpPalette::InsertColor( const Color& rColor, XclColorType eType, pEntry->UpdateWeighting( eType ); mnLastIx = nIndex; - return pEntry->GetCID(); + return pEntry->GetColorId(); } sal_uInt32 XclExpPalette::InsertIndex( sal_uInt16 nIndex ) @@ -242,19 +272,19 @@ sal_uInt32 XclExpPalette::InsertIndex( sal_uInt16 nIndex ) void XclExpPalette::ReduceColors() { -// --- build initial CID data vector (maCIDDataVec) --- +// --- build initial color ID data vector (maColorIdDataVec) --- sal_uInt32 nCount = maColorList.Count(); - maCIDDataVec.resize( nCount ); + maColorIdDataVec.resize( nCount ); for( sal_uInt32 nIx = 0; nIx < nCount; ++nIx ) { XclListColor* pListColor = maColorList.GetObject( nIx ); - maCIDDataVec[ pListColor->GetCID() ].Set( pListColor->GetColor(), nIx ); + maColorIdDataVec[ pListColor->GetColorId() ].Set( pListColor->GetColor(), nIx ); } // --- loop as long as current color count does not fit into palette of current BIFF --- - // CID data vector (maCIDDataVec) will map CIDs to color list entries (maColorList) + // Color ID data vector (maColorIdDataVec) will map color IDs to color list entries (maColorList) while( maColorList.Count() > GetColorCount() ) { // find a list color to remove @@ -292,19 +322,19 @@ void XclExpPalette::ReduceColors() aRemapVec[ nFound ].SetIndex( nNearest ); } - // remap CID data map (maCIDDataVec) from list indexes to palette indexes - for( XclCIDDataVec::iterator aIter = maCIDDataVec.begin(), aEnd = maCIDDataVec.end(); + // remap color ID data map (maColorIdDataVec) from list indexes to palette indexes + for( XclColorIdDataVec::iterator aIter = maColorIdDataVec.begin(), aEnd = maColorIdDataVec.end(); aIter != aEnd; ++aIter ) aIter->mnIndex = aRemapVec[ aIter->mnIndex ].mnPalIndex; } -sal_uInt16 XclExpPalette::GetColorIndex( sal_uInt32 nCID ) const +sal_uInt16 XclExpPalette::GetColorIndex( sal_uInt32 nColorId ) const { sal_uInt16 nRet = 0; - if( nCID >= EXC_PAL_INDEXBASE ) - nRet = static_cast< sal_uInt16 >( nCID & ~EXC_PAL_INDEXBASE ); - else if( nCID < maCIDDataVec.size() ) - nRet = GetXclIndex( maCIDDataVec[ nCID ].mnIndex ); + if( nColorId >= EXC_PAL_INDEXBASE ) + nRet = static_cast< sal_uInt16 >( nColorId & ~EXC_PAL_INDEXBASE ); + else if( nColorId < maColorIdDataVec.size() ) + nRet = GetXclIndex( maColorIdDataVec[ nColorId ].mnIndex ); return nRet; } @@ -319,22 +349,22 @@ sal_uInt16 XclExpPalette::GetColorIndex( const Color& rColor, sal_uInt16 nAutoDe } void XclExpPalette::GetMixedColors( - sal_uInt16& rnXclForeIx, sal_uInt16& rnXclBackIx, sal_uInt16& rnXclPattern, - sal_uInt32 nCIDForegr, sal_uInt32 nCIDBackgr ) const + sal_uInt16& rnXclForeIx, sal_uInt16& rnXclBackIx, sal_uInt8& rnXclPattern, + sal_uInt32 nForeColorId, sal_uInt32 nBackColorId ) const { - if( (nCIDForegr >= EXC_PAL_INDEXBASE) || (nCIDBackgr >= EXC_PAL_INDEXBASE) || (rnXclPattern != EXC_PATT_SOLID) ) + if( (nForeColorId >= EXC_PAL_INDEXBASE) || (nBackColorId >= EXC_PAL_INDEXBASE) || (rnXclPattern != EXC_PATT_SOLID) ) { - rnXclForeIx = GetColorIndex( nCIDForegr ); - rnXclBackIx = GetColorIndex( nCIDBackgr ); + rnXclForeIx = GetColorIndex( nForeColorId ); + rnXclBackIx = GetColorIndex( nBackColorId ); return; } rnXclForeIx = rnXclBackIx = 0; - if( nCIDForegr >= maCIDDataVec.size() ) + if( nForeColorId >= maColorIdDataVec.size() ) return; sal_uInt32 nIndex1, nIndex2; - Color aForeColor( GetOriginalColor( nCIDForegr ) ); + Color aForeColor( GetOriginalColor( nForeColorId ) ); sal_Int32 nFirstDist = GetNearPaletteColors( nIndex1, nIndex2, aForeColor ); if( (nIndex1 >= maPalette.size()) || (nIndex2 >= maPalette.size()) ) return; @@ -377,10 +407,10 @@ ColorData XclExpPalette::GetColorData( sal_uInt16 nXclIndex, ColorData nDefault return GetDefColorData( nXclIndex, nDefault ); } -const Color& XclExpPalette::GetOriginalColor( sal_uInt32 nCID ) const +const Color& XclExpPalette::GetOriginalColor( sal_uInt32 nColorId ) const { - if( nCID < maCIDDataVec.size() ) - return maCIDDataVec[ nCID ].maColor; + if( nColorId < maColorIdDataVec.size() ) + return maColorIdDataVec[ nColorId ].maColor; return maPalette[ 0 ].maColor; } @@ -446,9 +476,9 @@ void XclExpPalette::MergeListColors( sal_uInt32 nKeep, sal_uInt32 nRemove ) pKeepEntry->Merge( *pRemoveEntry ); maColorList.Delete( nRemove ); - // recalculate CID data map (maps CIDs to color list indexes) - XclCIDDataVec::iterator aEnd = maCIDDataVec.end(); - for( XclCIDDataVec::iterator aIter = maCIDDataVec.begin(); aIter != aEnd; ++aIter ) + // recalculate color ID data map (maps color IDs to color list indexes) + XclColorIdDataVec::iterator aEnd = maColorIdDataVec.end(); + for( XclColorIdDataVec::iterator aIter = maColorIdDataVec.begin(); aIter != aEnd; ++aIter ) { if( aIter->mnIndex == nRemove ) aIter->mnIndex = nKeep; // not "else if", aIter->mnIndex may become greater than nRemove in previous op. @@ -582,7 +612,7 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, XclEscapement eEscapem ) XclExpFont::XclExpFont( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_FONT, 14 ), XclExpRoot( rRoot ), - mnCID( rRoot.GetPalette().InsertIndex( EXC_FONT_AUTOCOLOR ) ), + mnColorId( rRoot.GetPalette().InsertIndex( EXC_FONT_AUTOCOLOR ) ), mnHash( 0 ), mbHasColor( false ) { @@ -602,12 +632,12 @@ void XclExpFont::SetName( const String& rName ) void XclExpFont::SetColor( const Color& rColor ) { - SetCID( GetPalette().InsertColor( rColor, xlColorCellText, EXC_FONT_AUTOCOLOR ) ); + SetColorId( GetPalette().InsertColor( rColor, xlColorCellText, EXC_FONT_AUTOCOLOR ) ); } -void XclExpFont::SetCID( sal_uInt32 nCID ) +void XclExpFont::SetColorId( sal_uInt32 nColorId ) { - mnCID = nCID; + mnColorId = nColorId; mbHasColor = true; } @@ -627,8 +657,8 @@ void XclExpFont::SetFont( const Font& rFont ) SetUnderline( rFont.GetUnderline() ); SetItalic( rFont.GetItalic() != ITALIC_NONE ); SetStrikeout( rFont.GetStrikeout() != STRIKEOUT_NONE ); - SetOutline( rFont.IsOutline() == TRUE ); - SetShadow( rFont.IsShadow() == TRUE ); + SetOutline( !!rFont.IsOutline() ); // BOOL->bool + SetShadow( !!rFont.IsShadow() ); // BOOL->bool CalcHash(); } @@ -651,7 +681,7 @@ bool XclExpFont::operator==( const XclExpFont& rCmp ) const { return (mnHash == rCmp.mnHash) && - (!mbHasColor || !rCmp.mbHasColor || (mnCID == rCmp.mnCID)) && + (!mbHasColor || !rCmp.mbHasColor || (mnColorId == rCmp.mnColorId)) && (maData.mnHeight == rCmp.maData.mnHeight) && (maData.mnWeight == rCmp.maData.mnWeight) && (maData.meUnderline == rCmp.maData.meUnderline) && @@ -683,21 +713,7 @@ sal_uInt8 XclExpFont::GetXclFamily( FontFamily eFamily ) sal_uInt8 XclExpFont::GetXclCharSet( rtl_TextEncoding eCharSet ) { - switch( eCharSet ) - { - case RTL_TEXTENCODING_DONTKNOW: return EXC_FONTCSET_DONTKNOW; - case RTL_TEXTENCODING_MS_1252: return EXC_FONTCSET_MS_1252; - case RTL_TEXTENCODING_APPLE_ROMAN: return EXC_FONTCSET_APPLE_ROMAN; - case RTL_TEXTENCODING_IBM_437: return EXC_FONTCSET_IBM_437; - case RTL_TEXTENCODING_IBM_850: return EXC_FONTCSET_IBM_850; - case RTL_TEXTENCODING_IBM_860: return EXC_FONTCSET_IBM_860; - case RTL_TEXTENCODING_IBM_861: return EXC_FONTCSET_IBM_861; - case RTL_TEXTENCODING_IBM_863: return EXC_FONTCSET_IBM_863; - case RTL_TEXTENCODING_IBM_865: return EXC_FONTCSET_IBM_865; - case (rtl_TextEncoding) 9: return EXC_FONTCSET_SYSTEM; - case RTL_TEXTENCODING_SYMBOL: return EXC_FONTCSET_SYMBOL; - } - return EXC_FONTCSET_DONTKNOW; + return rtl_getBestWindowsCharsetFromTextEncoding(eCharSet); } sal_uInt16 XclExpFont::GetXclWeight( FontWeight eWeight ) @@ -757,7 +773,7 @@ void XclExpFont::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnHeight << nAttr - << GetPalette().GetColorIndex( mnCID ) + << GetPalette().GetColorIndex( mnColorId ) << maData.mnWeight << maData.meEscapem << maData.meUnderline @@ -772,20 +788,23 @@ void XclExpFont::WriteBody( XclExpStream& rStrm ) XclExpFontBuffer::XclExpFontBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), - mnMaxCount( 0 ) + mnXclMaxCount( 0 ) { - SetBiff( GetBiff() ); + OnChangeBiff(); + + // currently always using Arial/10 + SetCharWidth( 110 ); } -void XclExpFontBuffer::SetBiff( XclBiff eBiff ) +void XclExpFontBuffer::OnChangeBiff() { - DBG_ASSERT( maFontList.Empty(), "XclExpFontBuffer::SetBiff - call is too late" ); - switch( eBiff ) + DBG_ASSERT( maFontList.Empty(), "XclExpFontBuffer::OnChangeBiff - call is too late" ); + switch( GetBiff() ) { - case xlBiff4: mnMaxCount = EXC_FONT_MAXCOUNT4; break; + case xlBiff4: mnXclMaxCount = EXC_FONT_MAXCOUNT4; break; case xlBiff5: - case xlBiff7: mnMaxCount = EXC_FONT_MAXCOUNT5; break; - case xlBiff8: mnMaxCount = EXC_FONT_MAXCOUNT8; break; + case xlBiff7: mnXclMaxCount = EXC_FONT_MAXCOUNT5; break; + case xlBiff8: mnXclMaxCount = EXC_FONT_MAXCOUNT8; break; default: DBG_ERROR_BIFF(); } } @@ -793,7 +812,7 @@ void XclExpFontBuffer::SetBiff( XclBiff eBiff ) sal_uInt16 XclExpFontBuffer::GetIndex( const XclExpFont& rFont, sal_uInt16 nDefault ) { sal_uInt32 nIndex = Find( rFont ); - return (nIndex < mnMaxCount) ? GetXclIndex( nIndex ) : nDefault; + return (nIndex < mnXclMaxCount) ? GetXclIndex( nIndex ) : nDefault; } sal_uInt16 XclExpFontBuffer::Insert( XclExpFont*& rpFont ) @@ -810,11 +829,11 @@ sal_uInt16 XclExpFontBuffer::Insert( XclExpFont*& rpFont ) XclExpFont* pOldFont = maFontList.GetObject( nIndex ); // old font does not have a color -> take color from new font if( !pOldFont->HasColor() ) - pOldFont->SetCID( rpFont->GetCID() ); + pOldFont->SetColorId( rpFont->GetColorId() ); delete rpFont; rpFont = pOldFont; } - else if( nCount < mnMaxCount ) + else if( nCount < mnXclMaxCount ) { // --- font not found, possible to insert --- maFontList.Append( rpFont ); @@ -833,7 +852,7 @@ sal_uInt16 XclExpFontBuffer::Insert( XclExpFont*& rpFont ) sal_uInt16 XclExpFontBuffer::Insert( const Font& rFont ) { - XclExpFont* pNewFont = new XclExpFont( *this ); + XclExpFont* pNewFont = new XclExpFont( GetRoot() ); pNewFont->SetFont( rFont ); return Insert( pNewFont ); } @@ -854,7 +873,7 @@ void XclExpFontBuffer::Save( XclExpStream& rStrm ) void XclExpFontBuffer::InitDefaultFonts() { - XclExpFont aFont( *this ); + XclExpFont aFont( GetRoot() ); aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Arial" ) ) ); aFont.SetFamily( FAMILY_DONTKNOW ); aFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW ); @@ -889,7 +908,7 @@ void XclExpFontBuffer::InitDefaultFonts() } } -sal_uInt16 XclExpFontBuffer::GetXclIndex( sal_uInt32 nIndex ) +sal_uInt16 XclExpFontBuffer::GetXclIndex( sal_uInt32 nIndex ) const { if( nIndex > 3 ) ++nIndex; @@ -948,9 +967,10 @@ XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) : cannot convert from 'class String *' to 'class String (*)[54]' The effective result here is class String (*)[54*1] */ mpKeywordTable( new NfKeywordTable[ 1 ] ), - mpFormatter( new SvNumberFormatter( rRoot.GetDoc().GetServiceManager(), LANGUAGE_ENGLISH_US ) ) + mpFormatter( new SvNumberFormatter( rRoot.GetDoc().GetServiceManager(), LANGUAGE_ENGLISH_US ) ), + mnStdFmt( GetFormatter().GetStandardFormat( GetDefLanguage() ) ) { - SetBiff( GetBiff() ); + OnChangeBiff(); mpFormatter->FillKeywordTable( *mpKeywordTable, LANGUAGE_ENGLISH_US ); // remap codes unknown to Excel @@ -965,10 +985,10 @@ XclExpNumFmtBuffer::~XclExpNumFmtBuffer() delete[] mpKeywordTable; } -void XclExpNumFmtBuffer::SetBiff( XclBiff eBiff ) +void XclExpNumFmtBuffer::OnChangeBiff() { - DBG_ASSERT( maFormatMap.empty(), "XclExpNumFmtBuffer::SetBiff - call is too late" ); - switch( eBiff ) + DBG_ASSERT( maFormatMap.empty(), "XclExpNumFmtBuffer::OnChangeBiff - call is too late" ); + switch( GetBiff() ) { case xlBiff5: case xlBiff7: mnXclOffset = EXC_FORMAT_OFFSET5; break; @@ -977,10 +997,10 @@ void XclExpNumFmtBuffer::SetBiff( XclBiff eBiff ) } } -sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uInt32 nFormatIx ) +sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uInt32 nScFormatIx ) { XclExpNumFmtVec::const_iterator aIter = - ::std::find_if( maFormatMap.begin(), maFormatMap.end(), XclExpNumFmtPred( nFormatIx ) ); + ::std::find_if( maFormatMap.begin(), maFormatMap.end(), XclExpNumFmtPred( nScFormatIx ) ); if( aIter != maFormatMap.end() ) return aIter->mnXclIx; @@ -988,7 +1008,7 @@ sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uInt32 nFormatIx ) if( nSize < 0xFFFFUL - mnXclOffset ) { sal_uInt16 nXclIx = static_cast< sal_uInt16 >( nSize + mnXclOffset ); - maFormatMap.push_back( XclExpNumFmt( nFormatIx, nXclIx ) ); + maFormatMap.push_back( XclExpNumFmt( nScFormatIx, nXclIx ) ); return nXclIx; } @@ -1062,7 +1082,7 @@ void XclExpNumFmtBuffer::WriteFormatRecord( XclExpStream& rStrm, const XclExpNum void XclExpNumFmtBuffer::WriteDefaultFormats( XclExpStream& rStrm ) { - const XclExpDefaultFormat* pEnd = pDefaultFormats + STATIC_TABLE_SIZE( pDefaultFormats ); + const XclExpDefaultFormat* pEnd = STATIC_TABLE_END( pDefaultFormats ); for( const XclExpDefaultFormat* pCurr = pDefaultFormats; pCurr != pEnd; ++pCurr ) WriteFormatRecord( rStrm, pCurr->mnIndex, String( pCurr->mpFormat, RTL_TEXTENCODING_UTF8 ) ); } @@ -1070,5 +1090,630 @@ void XclExpNumFmtBuffer::WriteDefaultFormats( XclExpStream& rStrm ) // XF, STYLE record - Cell formatting ========================================= +XclExpXFBorder::XclExpXFBorder() : + mnLeftColorId( 0 ), + mnRightColorId( 0 ), + mnTopColorId( 0 ), + mnBottomColorId( 0 ), + mnLeftLine( EXC_LINE_NONE ), + mnRightLine( EXC_LINE_NONE ), + mnTopLine( EXC_LINE_NONE ), + mnBottomLine( EXC_LINE_NONE ) +{ +} + +#if 0 +void lcl_GetBorder2( sal_uInt8& rnFlags, const XclExpXFBorder& rBorder ) +{ + ::set_flag( rnFlags, EXC_XF2_LEFTLINE, rBorder.mnLeftLine != EXC_LINE_NONE ); + ::set_flag( rnFlags, EXC_XF2_RIGHTLINE, rBorder.mnRightLine != EXC_LINE_NONE ); + ::set_flag( rnFlags, EXC_XF2_TOPLINE, rBorder.mnTopLine != EXC_LINE_NONE ); + ::set_flag( rnFlags, EXC_XF2_BOTTOMLINE, rBorder.mnBottomLine != EXC_LINE_NONE ); +} + +void lcl_GetBorder3( sal_uInt32& rnFlags, const XclExpXFBorder& rBorder, const XclExpPalette& rPalette ) +{ + ::insert_value( rnFlags, rBorder.mnTopLine, 0, 3 ); + ::insert_value( rnFlags, rBorder.mnLeftLine, 8, 3 ); + ::insert_value( rnFlags, rBorder.mnBottomLine, 16, 3 ); + ::insert_value( rnFlags, rBorder.mnRightLine, 24, 3 ); + ::insert_value( rnFlags, rPalette.GetColorIndex( rBorder.mnTopColorId ), 3, 5 ); + ::insert_value( rnFlags, rPalette.GetColorIndex( rBorder.mnLeftColorId ), 11, 5 ); + ::insert_value( rnFlags, rPalette.GetColorIndex( rBorder.mnBottomColorId ), 19, 5 ); + ::insert_value( rnFlags, rPalette.GetColorIndex( rBorder.mnRightColorId ), 27, 5 ); +} +#endif + +void lcl_GetBorder5( + sal_uInt32& rnBorder, sal_uInt32& rnArea, + const XclExpXFBorder& rBorder, const XclExpPalette& rPalette ) +{ + ::insert_value( rnBorder, rBorder.mnTopLine, 0, 3 ); + ::insert_value( rnBorder, rBorder.mnLeftLine, 3, 3 ); + ::insert_value( rnArea, rBorder.mnBottomLine, 22, 3 ); + ::insert_value( rnBorder, rBorder.mnRightLine, 6, 3 ); + ::insert_value( rnBorder, rPalette.GetColorIndex( rBorder.mnTopColorId ), 9, 7 ); + ::insert_value( rnBorder, rPalette.GetColorIndex( rBorder.mnLeftColorId ), 16, 7 ); + ::insert_value( rnArea, rPalette.GetColorIndex( rBorder.mnBottomColorId ), 25, 7 ); + ::insert_value( rnBorder, rPalette.GetColorIndex( rBorder.mnRightColorId ), 23, 7 ); +} + +void lcl_GetBorder8( + sal_uInt32& rnBorder1, sal_uInt32& rnBorder2, + const XclExpXFBorder& rBorder, const XclExpPalette& rPalette ) +{ + ::insert_value( rnBorder1, rBorder.mnLeftLine, 0, 4 ); + ::insert_value( rnBorder1, rBorder.mnRightLine, 4, 4 ); + ::insert_value( rnBorder1, rBorder.mnTopLine, 8, 4 ); + ::insert_value( rnBorder1, rBorder.mnBottomLine, 12, 4 ); + ::insert_value( rnBorder1, rPalette.GetColorIndex( rBorder.mnLeftColorId ), 16, 7 ); + ::insert_value( rnBorder1, rPalette.GetColorIndex( rBorder.mnRightColorId ), 23, 7 ); + ::insert_value( rnBorder2, rPalette.GetColorIndex( rBorder.mnTopColorId ), 0, 7 ); + ::insert_value( rnBorder2, rPalette.GetColorIndex( rBorder.mnBottomColorId ), 7, 7 ); +} + + +// ---------------------------------------------------------------------------- + +XclExpXFArea::XclExpXFArea() : + mnForeColorId( 0 ), + mnBackColorId( 0 ), + mnPattern( EXC_PATT_NONE ) +{ +} + +#if 0 +void lcl_GetArea2( sal_uInt8& rnFlags, const XclExpXFArea& rArea ) +{ + ::set_flag( rnFlags, EXC_XF2_BACKGROUND, rArea.mnPattern != EXC_PATT_NONE ); +} + +void lcl_GetArea3( sal_uInt16& rnArea, const XclExpXFArea& rArea, const XclExpPalette& rPalette ) +{ + ::insert_value( rnArea, rArea.mnPattern, 0, 6 ); + ::insert_value( rnArea, rPalette.GetColorIndex( rArea.mnForeColorId ), 6, 5 ); + ::insert_value( rnArea, rPalette.GetColorIndex( rArea.mnBackColorId ), 11, 5 ); +} +#endif + +void lcl_GetArea5( sal_uInt32& rnArea, const XclExpXFArea& rArea, const XclExpPalette& rPalette ) +{ + sal_uInt16 nXclForeIx, nXclBackIx; + sal_uInt8 nXclPattern = rArea.mnPattern; + rPalette.GetMixedColors( nXclForeIx, nXclBackIx, nXclPattern, rArea.mnForeColorId, rArea.mnBackColorId ); + ::insert_value( rnArea, nXclPattern, 16, 6 ); + ::insert_value( rnArea, nXclForeIx, 0, 7 ); + ::insert_value( rnArea, nXclBackIx, 7, 7 ); +} + +void lcl_GetArea8( sal_uInt32& rnBorder2, sal_uInt16& rnArea, const XclExpXFArea& rArea, const XclExpPalette& rPalette ) +{ + sal_uInt16 nXclForeIx, nXclBackIx; + sal_uInt8 nXclPattern = rArea.mnPattern; + rPalette.GetMixedColors( nXclForeIx, nXclBackIx, nXclPattern, rArea.mnForeColorId, rArea.mnBackColorId ); + ::insert_value( rnBorder2, nXclPattern, 26, 6 ); + ::insert_value( rnArea, nXclForeIx, 0, 7 ); + ::insert_value( rnArea, nXclBackIx, 7, 7 ); +} + + +// ---------------------------------------------------------------------------- + +XclExpXF::XclExpXF( + const XclExpRoot& rRoot, const ScPatternAttr* pPattern, + sal_uInt32 nForcedNumFmt, bool bForceWrapped ) : + mbCellXF( true ) +{ + Init( rRoot, pPattern, nForcedNumFmt, bForceWrapped ); +} + +XclExpXF::XclExpXF( const XclExpRoot& rRoot, SfxStyleSheetBase& rStyleSheet ) : + mbCellXF( false ) +{ + // create an own ScPatternAttr and let Init() do all the work + mpOwnPattern.reset( new ScPatternAttr( rStyleSheet.GetItemSet().Clone() ) ); + Init( rRoot, mpOwnPattern.get() ); +} + +bool XclExpXF::Equals( const ScPatternAttr* pPattern, sal_uInt32 nForcedNumFmt, bool bForceWrapped ) const +{ + return mbCellXF && (mpPattern == pPattern) && + ((nForcedNumFmt == NUMBERFORMAT_ENTRY_NOT_FOUND) || (mnNumFmt == nForcedNumFmt)) && + (!bForceWrapped || mbWrapped); +} + +void XclExpXF::GetBorderLine( + sal_uInt8& rnXclLine, sal_uInt32& rnColorId, + XclExpPalette& rPalette, const SvxBorderLine* pLine ) +{ + if( pLine ) + { + sal_uInt16 nOuterWidth = pLine->GetOutWidth(); + sal_uInt16 nDistance = pLine->GetDistance(); + if( nDistance > 0 ) + rnXclLine = EXC_LINE_DOUBLE; + else if( nOuterWidth > DEF_LINE_WIDTH_2 ) + rnXclLine = EXC_LINE_THICK; + else if( nOuterWidth > DEF_LINE_WIDTH_1 ) + rnXclLine = EXC_LINE_MEDIUM; + else if( nOuterWidth > DEF_LINE_WIDTH_0 ) + rnXclLine = EXC_LINE_THIN; + else if( nOuterWidth > 0 ) + rnXclLine = EXC_LINE_HAIR; + else + rnXclLine = EXC_LINE_NONE; + rnColorId = rPalette.InsertColor( pLine->GetColor(), xlColorCellBorder ); + } + else + { + rnXclLine = EXC_LINE_NONE; + rnColorId = rPalette.InsertIndex( 0 ); + } +} + +void XclExpXF::GetBorder( XclExpXFBorder& rBorder, XclExpPalette& rPalette, const ScPatternAttr& rPattern ) +{ + const SvxBoxItem& rBoxItem = static_cast< const SvxBoxItem& >( rPattern.GetItem( ATTR_BORDER ) ); + GetBorderLine( rBorder.mnLeftLine, rBorder.mnLeftColorId, rPalette, rBoxItem.GetLeft() ); + GetBorderLine( rBorder.mnRightLine, rBorder.mnRightColorId, rPalette, rBoxItem.GetRight() ); + GetBorderLine( rBorder.mnTopLine, rBorder.mnTopColorId, rPalette, rBoxItem.GetTop() ); + GetBorderLine( rBorder.mnBottomLine, rBorder.mnBottomColorId, rPalette, rBoxItem.GetBottom() ); +} + +void XclExpXF::GetArea( XclExpXFArea& rArea, XclExpPalette& rPalette, const ScPatternAttr& rPattern ) +{ + const SvxBrushItem& rBrushItem = static_cast< const SvxBrushItem& >( rPattern.GetItem( ATTR_BACKGROUND ) ); + rArea.mnPattern = rBrushItem.GetColor().GetTransparency() ? EXC_PATT_NONE : EXC_PATT_SOLID; + rArea.mnForeColorId = rPalette.InsertColor( rBrushItem.GetColor(), xlColorCellArea ); + rArea.mnBackColorId = rPalette.InsertColor( Color( COL_BLACK ), xlColorCellArea ); +} + +void XclExpXF::Init( + const XclExpRoot& rRoot, const ScPatternAttr* pPattern, + sal_uInt32 nForcedNumFmt, bool bForceWrapped ) +{ + XclExpPalette& rPalette = rRoot.GetPalette(); + XclExpNumFmtBuffer& rNumFmtBuffer = rRoot.GetNumFmtBuffer(); + +// *** reset members *** + + // mbCellXF set in constructors + SetRecHeader( EXC_ID_XF, (rRoot.GetBiff() == xlBiff8) ? 20 : 16 ); + mpPattern = pPattern; + meHorAlign = xlHAlignGeneral; + meVerAlign = xlVAlignBottom; + meOrient = xlTextOrientNoRot; + meTextDir = xlTextDirContext; + mnParent = mbCellXF ? EXC_XF_DEFAULTSTYLE : EXC_XF_STYLEPARENT; + mnFont = mnNumFmt = 0; + if( nForcedNumFmt != NUMBERFORMAT_ENTRY_NOT_FOUND ) + mnNumFmt = rNumFmtBuffer.Insert( nForcedNumFmt ); + mnIndent = mnRotation = 0; + mbLocked = true; // default in Calc and Excel + mbHidden = false; + mbWrapped = bForceWrapped; + mbProtUsed = mbFontUsed = mbFmtUsed = mbAlignUsed = mbBorderUsed = mbAreaUsed = false; + +// *** formatting attributes *** + + if( !mpPattern ) + { + maArea.mnForeColorId = rPalette.InsertIndex( 64 ); + maArea.mnBackColorId = rPalette.InsertIndex( 65 ); + if( nForcedNumFmt == NUMBERFORMAT_ENTRY_NOT_FOUND ) + mnNumFmt = rNumFmtBuffer.Insert( rNumFmtBuffer.GetStandardFormat() ); + return; + } + +// Creates a variable 'name' of type "const 'type' &" and assigns item with 'which' ID from mpPattern. +#define GETITEM( type, name, which ) \ + const type & name = static_cast< const type & >( mpPattern->GetItem( which ) ) + + // cell protection + GETITEM( ScProtectionAttr, rProtItem, ATTR_PROTECTION ); + mbLocked = !!rProtItem.GetProtection(); // BOOL->bool + mbHidden = rProtItem.GetHideFormula() || rProtItem.GetHideCell(); + + // font + mnFont = rRoot.GetFontBuffer().Insert( *mpPattern ); + + // number format + if( nForcedNumFmt == NUMBERFORMAT_ENTRY_NOT_FOUND ) // don't overwrite forced format + { + GETITEM( SfxUInt32Item, rNumFmtItem, ATTR_VALUE_FORMAT ); + mnNumFmt = rNumFmtBuffer.Insert( rNumFmtItem.GetValue() ); + } + + // horizontal alignment + GETITEM( SvxHorJustifyItem, rHorJustItem, ATTR_HOR_JUSTIFY ); + switch( static_cast< SvxCellHorJustify >( rHorJustItem.GetValue() ) ) + { + case SVX_HOR_JUSTIFY_STANDARD: meHorAlign = xlHAlignGeneral; break; + case SVX_HOR_JUSTIFY_LEFT: meHorAlign = xlHAlignLeft; break; + case SVX_HOR_JUSTIFY_CENTER: meHorAlign = xlHAlignCenter; break; + case SVX_HOR_JUSTIFY_RIGHT: meHorAlign = xlHAlignRight; break; + case SVX_HOR_JUSTIFY_BLOCK: meHorAlign = xlHAlignJustify; break; + case SVX_HOR_JUSTIFY_REPEAT: meHorAlign = xlHAlignFill; break; + default: DBG_ERROR( "XclExpXF::Init - unknown horizontal adjustment" ); + } + + // text wrap + if( !mbWrapped ) // only, if not yet forced by caller + { + GETITEM( SfxBoolItem, rWrapItem, ATTR_LINEBREAK ); + mbWrapped = !!rWrapItem.GetValue(); // BOOL->bool + } + + // vertical alignment + GETITEM( SvxVerJustifyItem, rVerJustItem, ATTR_VER_JUSTIFY ); + switch( static_cast< SvxCellVerJustify >( rVerJustItem.GetValue() ) ) + { + case SVX_VER_JUSTIFY_STANDARD: meVerAlign = xlVAlignBottom; break; + case SVX_VER_JUSTIFY_TOP: meVerAlign = xlVAlignTop; break; + case SVX_VER_JUSTIFY_CENTER: meVerAlign = xlVAlignCenter; break; + case SVX_VER_JUSTIFY_BOTTOM: meVerAlign = xlVAlignBottom; break; + default: DBG_ERROR( "XclExpXF::Init - unknown vertical adjustment" ); + } + + // text indent + GETITEM( SfxUInt16Item, rIndentItem, ATTR_INDENT ); + sal_Int32 nTmpIndent = rIndentItem.GetValue(); // SfxUInt16Item returns INT16, weird... + (nTmpIndent += 100) /= 200; + mnIndent = static_cast< sal_uInt8 >( ::std::max( ::std::min( nTmpIndent, 0x0FL ), 0L ) ); + + // orientation and rotation + GETITEM( SvxOrientationItem, rOrientItem, ATTR_ORIENTATION ); + switch( static_cast< SvxCellOrientation >( rOrientItem.GetValue() ) ) + { + case SVX_ORIENTATION_STANDARD: meOrient = xlTextOrientNoRot; break; + case SVX_ORIENTATION_TOPBOTTOM: meOrient = xlTextOrient90cw; break; + case SVX_ORIENTATION_BOTTOMTOP: meOrient = xlTextOrient90ccw; break; + case SVX_ORIENTATION_STACKED: meOrient = xlTextOrientTopBottom; break; + default: DBG_ERROR( "XclExpXF::Init - unknown text orientation" ); + } + switch( meOrient ) + { + case xlTextOrientTopBottom: mnRotation = EXC_XF8_STACKED; break; + // #i4378# old calc doc's without real rotation + case xlTextOrient90ccw: mnRotation = 90; break; + case xlTextOrient90cw: mnRotation = 180; break; + default: + { + GETITEM( SfxInt32Item, rRotateItem, ATTR_ROTATE_VALUE ); + mnRotation = XclTools::GetXclRotation( rRotateItem.GetValue() ); + } + } + + // cell border + GetBorder( maBorder, rPalette, *mpPattern ); + + // cell background area + GetArea( maArea, rPalette, *mpPattern ); + + // CTL text direction + GETITEM( SvxFrameDirectionItem, rFrameDirItem, ATTR_WRITINGDIR ); + switch( static_cast< SvxFrameDirection >( rFrameDirItem.GetValue() ) ) + { + case FRMDIR_ENVIRONMENT: meTextDir = xlTextDirContext; break; + case FRMDIR_HORI_LEFT_TOP: meTextDir = xlTextDirLTR; break; + case FRMDIR_HORI_RIGHT_TOP: meTextDir = xlTextDirRTL; break; + default: DBG_ERRORFILE( "XclExpXF::Init - unknown CTL text direction" ); + } + +#undef GETITEM + +// *** used/unused flags *** + + // all font items + static const sal_uInt16 pnFontWhichIds[] = + { + ATTR_FONT_HEIGHT, + ATTR_FONT_WEIGHT, + ATTR_FONT_POSTURE, + ATTR_FONT_UNDERLINE, + ATTR_FONT_CROSSEDOUT, + ATTR_FONT_CONTOUR, + ATTR_FONT_SHADOWED, + ATTR_FONT_COLOR, + ATTR_FONT_LANGUAGE, + 0 + }; + + const SfxItemSet& rItemSet = mpPattern->GetItemSet(); + +// Expands to true if rItemSet really contains the item with 'which' ID. +#define CHECKITEM( which ) (rItemSet.GetItemState( which, FALSE ) == SFX_ITEM_SET) + + switch( rRoot.GetBiff() ) + { + // all 'case's -> run through + case xlBiff8: // new in BIFF8/BIFF8X + mbAlignUsed |= CHECKITEM( ATTR_ROTATE_VALUE ) || + CHECKITEM( ATTR_INDENT ) || CHECKITEM( ATTR_WRITINGDIR ); + + case xlBiff7: // new in BIFF7 - nothing + case xlBiff5: // new in BIFF5 - nothing + case xlBiff4: // new in BIFF4 + mbAlignUsed |= CHECKITEM( ATTR_VER_JUSTIFY ) || CHECKITEM( ATTR_ORIENTATION ); + + case xlBiff3: // attributes in all BIFF versions (BIFF2 does not use the flags at all) + mbProtUsed |= CHECKITEM( ATTR_PROTECTION ); + mbFontUsed |= !!mpPattern->HasItemsSet( pnFontWhichIds ); // BOOL->bool + mbFmtUsed |= CHECKITEM( ATTR_VALUE_FORMAT ); + mbBorderUsed |= CHECKITEM( ATTR_BORDER ); + mbAreaUsed |= CHECKITEM( ATTR_BACKGROUND ); + mbAlignUsed |= CHECKITEM( ATTR_HOR_JUSTIFY ) || CHECKITEM( ATTR_LINEBREAK ); + break; + } + +#undef CHECKITEM +} + +sal_uInt8 XclExpXF::GetUsedAttribMask() const +{ + sal_uInt8 nUsedFlags = 0; + // "mbCellXF == mb***Used" evaluates to correct value in cell and style XFs + ::set_flag( nUsedFlags, EXC_XF_DIFF_PROT, mbCellXF == mbProtUsed ); + ::set_flag( nUsedFlags, EXC_XF_DIFF_FONT, mbCellXF == mbFontUsed ); + ::set_flag( nUsedFlags, EXC_XF_DIFF_VALFMT, mbCellXF == mbFmtUsed ); + ::set_flag( nUsedFlags, EXC_XF_DIFF_ALIGN, mbCellXF == mbAlignUsed ); + ::set_flag( nUsedFlags, EXC_XF_DIFF_BORDER, mbCellXF == mbBorderUsed ); + ::set_flag( nUsedFlags, EXC_XF_DIFF_AREA, mbCellXF == mbAreaUsed ); + return nUsedFlags; +} + +void XclExpXF::WriteBody5( XclExpStream& rStrm ) +{ + sal_uInt16 nTypeProt = 0; + ::set_flag( nTypeProt, EXC_XF_LOCKED, mbLocked ); + ::set_flag( nTypeProt, EXC_XF_HIDDEN, mbHidden ); + ::set_flag( nTypeProt, EXC_XF_STYLE, !mbCellXF ); + ::insert_value( nTypeProt, mnParent, 4, 12 ); + + sal_uInt16 nAlign = 0; + ::insert_value( nAlign, meHorAlign, 0, 3 ); + ::set_flag( nAlign, EXC_XF_WRAPPED, mbWrapped ); + ::insert_value( nAlign, meVerAlign, 4, 3 ); + ::insert_value( nAlign, meOrient, 8, 2 ); + ::insert_value( nAlign, GetUsedAttribMask(), 10, 6 ); + + sal_uInt32 nArea = 0, nBorder = 0; + lcl_GetBorder5( nBorder, nArea, maBorder, rStrm.GetRoot().GetPalette() ); + lcl_GetArea5( nArea, maArea, rStrm.GetRoot().GetPalette() ); + + rStrm << mnFont << mnNumFmt << nTypeProt << nAlign << nArea << nBorder; +} + +void XclExpXF::WriteBody8( XclExpStream& rStrm ) +{ + sal_uInt16 nTypeProt = 0; + ::set_flag( nTypeProt, EXC_XF_LOCKED, mbLocked ); + ::set_flag( nTypeProt, EXC_XF_HIDDEN, mbHidden ); + ::set_flag( nTypeProt, EXC_XF_STYLE, !mbCellXF ); + ::insert_value( nTypeProt, mnParent, 4, 12 ); + + sal_uInt16 nAlign = 0; + ::insert_value( nAlign, meHorAlign, 0, 3 ); + ::set_flag( nAlign, EXC_XF_WRAPPED, mbWrapped ); + ::insert_value( nAlign, meVerAlign, 4, 3 ); + ::insert_value( nAlign, mnRotation, 8, 8 ); + + sal_uInt16 nMiscAttrib = 0; + ::insert_value( nMiscAttrib, mnIndent, 0, 4 ); + ::insert_value( nMiscAttrib, meTextDir, 6, 2 ); + ::insert_value( nMiscAttrib, GetUsedAttribMask(), 10, 6 ); + + sal_uInt32 nBorder1 = 0, nBorder2 = 0; + sal_uInt16 nArea = 0; + lcl_GetBorder8( nBorder1, nBorder2, maBorder, rStrm.GetRoot().GetPalette() ); + lcl_GetArea8( nBorder2, nArea, maArea, rStrm.GetRoot().GetPalette() ); + + rStrm << mnFont << mnNumFmt << nTypeProt << nAlign << nMiscAttrib << nBorder1 << nBorder2 << nArea; +} + +void XclExpXF::WriteBody( XclExpStream& rStrm ) +{ + switch( rStrm.GetRoot().GetBiff() ) + { + case xlBiff5: + case xlBiff7: WriteBody5( rStrm ); break; + case xlBiff8: WriteBody8( rStrm ); break; + default: DBG_ERROR_BIFF(); + } +} + + +// ---------------------------------------------------------------------------- + +XclExpStyle::XclExpStyle( const String& rName, sal_uInt16 nXFIndex ) : + XclExpRecord( EXC_ID_STYLE ), + maName( rName ), + mnXFIndex( nXFIndex ) +{ + DBG_ASSERT( maName.Len(), "XclExpStyle::XclExpStyle - empty style name" ); +} + +void XclExpStyle::WriteBody( XclExpStream& rStrm ) +{ + XclExpString aNameEx; + if( rStrm.GetRoot().GetBiff() >= xlBiff8 ) + aNameEx.Assign( maName ); + else + aNameEx.AssignByte( maName, rStrm.GetRoot().GetCharSet(), EXC_STR_8BITLENGTH ); + rStrm << mnXFIndex << aNameEx; +} + + +// ---------------------------------------------------------------------------- + +XclExpXFBuffer::XclExpXFBuffer( const XclExpRoot& rRoot ) : + XclExpRoot( rRoot ), + mnXclMaxCount( EXC_XF_MAXCOUNT ), + mnXclOffset( EXC_XF_OFFSET ) +{ +} + +void XclExpXFBuffer::InsertUserStyles() +{ + SfxStyleSheetIterator aStyleIter( GetDoc().GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); + for( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) + if( pStyle->IsUserDefined() ) + InsertStyle( *pStyle ); +} + +sal_uInt16 XclExpXFBuffer::Insert( const ScPatternAttr* pPattern, bool bForceWrapped ) +{ + return InsertCellXF( pPattern, NUMBERFORMAT_ENTRY_NOT_FOUND, bForceWrapped ); +} + +sal_uInt16 XclExpXFBuffer::Insert( const ScPatternAttr* pPattern, sal_uInt32 nForcedNumFmt ) +{ + return InsertCellXF( pPattern, nForcedNumFmt, false ); +} + +sal_uInt16 XclExpXFBuffer::InsertStyle( SfxStyleSheetBase& rStyleSheet ) +{ + // create the XF record + sal_uInt16 nXFIndex = EXC_XF_DEFAULTSTYLE; + if( maXFList.Count() < EXC_XF_MAXCOUNT ) + { + nXFIndex = GetXclIndex( maXFList.Count() ); + maXFList.Append( new XclExpXF( GetRoot(), rStyleSheet ) ); + } + + // create the STYLE record + if( rStyleSheet.GetName().Len() ) + maStyleList.Append( new XclExpStyle( rStyleSheet.GetName(), nXFIndex ) ); + + return nXFIndex; +} + +void XclExpXFBuffer::Save( XclExpStream& rStrm ) +{ + // XF records + switch( GetBiff() ) + { + case xlBiff5: + case xlBiff7: WriteDefaultXFs5( rStrm ); break; + case xlBiff8: WriteDefaultXFs8( rStrm ); break; + default: DBG_ERROR_BIFF(); + } + maXFList.Save( rStrm ); + + // STYLE records + switch( GetBiff() ) + { + case xlBiff5: + case xlBiff7: + case xlBiff8: WriteDefaultStyles5( rStrm ); break; + default: DBG_ERROR_BIFF(); + } + maStyleList.Save( rStrm ); +} + +sal_uInt16 XclExpXFBuffer::GetXclIndex( sal_uInt32 nIndex ) const +{ + DBG_ASSERT( nIndex < mnXclMaxCount, "XclExpXFBuffer::GetXclIndex - invalid index" ); + return static_cast< sal_uInt16 >( nIndex + mnXclOffset ); +} + +sal_uInt16 XclExpXFBuffer::InsertCellXF( + const ScPatternAttr* pPattern, sal_uInt32 nForcedNumFmt, bool bForceWrapped ) +{ + sal_uInt32 nIndex = LIST_ENTRY_NOTFOUND; + + // try to find existing cell XF + for( const XclExpXF* pXF = maXFList.First(); pXF; pXF = maXFList.Next() ) + { + if( pXF->Equals( pPattern, nForcedNumFmt, bForceWrapped ) ) + { + nIndex = maXFList.GetCurPos(); + break; + } + } + + // not found - insert new XF + if( nIndex == LIST_ENTRY_NOTFOUND ) + { + nIndex = maXFList.Count(); + if( nIndex < EXC_XF_MAXCOUNT ) + maXFList.Append( new XclExpXF( GetRoot(), pPattern, nForcedNumFmt, bForceWrapped ) ); + else + // list full - fall back to default cell XF + return EXC_XF_DEFAULTCELL; + } + + return GetXclIndex( nIndex ); +} + +void XclExpXFBuffer::WriteDefaultXFs5( XclExpStream& rStrm ) +{ + static const sal_uInt8 pnDefStyle[] = { 0x00,0x00,0x00,0x00,0xF5,0xFF,0x20,0x00,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnOutlineStyle1[] = { 0x01,0x00,0x00,0x00,0xF5,0xFF,0x20,0xF4,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnOutlineStyle2[] = { 0x02,0x00,0x00,0x00,0xF5,0xFF,0x20,0xF4,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnOutlineStyle3[] = { 0x00,0x00,0x00,0x00,0xF5,0xFF,0x20,0xF4,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnDefCell[] = { 0x00,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnBuiltInStyle1[] = { 0x05,0x00,0x2B,0x00,0xF5,0xFF,0x20,0xF8,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnBuiltInStyle2[] = { 0x05,0x00,0x29,0x00,0xF5,0xFF,0x20,0xF8,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnBuiltInStyle3[] = { 0x05,0x00,0x2C,0x00,0xF5,0xFF,0x20,0xF8,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnBuiltInStyle4[] = { 0x05,0x00,0x2A,0x00,0xF5,0xFF,0x20,0xF8,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + static const sal_uInt8 pnBuiltInStyle5[] = { 0x05,0x00,0x09,0x00,0xF5,0xFF,0x20,0xF8,0xC0,0x20,0x00,0x00,0x00,0x00,0x00,0x00 }; + + // default style (1) + XclExpDummyRecord aXF( EXC_ID_XF, pnDefStyle, STATIC_TABLE_SIZE( pnDefStyle ) ); aXF.Save( rStrm ); + // outline styles (14) + aXF.SetData( pnOutlineStyle1, STATIC_TABLE_SIZE( pnOutlineStyle1 ) ); aXF.SaveRepeated( rStrm, 2 ); + aXF.SetData( pnOutlineStyle2, STATIC_TABLE_SIZE( pnOutlineStyle2 ) ); aXF.SaveRepeated( rStrm, 2 ); + aXF.SetData( pnOutlineStyle3, STATIC_TABLE_SIZE( pnOutlineStyle3 ) ); aXF.SaveRepeated( rStrm, 10 ); + // default cell XF (1) + aXF.SetData( pnDefCell, STATIC_TABLE_SIZE( pnDefCell ) ); aXF.Save( rStrm ); + // built-in styles (5) + aXF.SetData( pnBuiltInStyle1, STATIC_TABLE_SIZE( pnBuiltInStyle1 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle2, STATIC_TABLE_SIZE( pnBuiltInStyle2 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle3, STATIC_TABLE_SIZE( pnBuiltInStyle3 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle4, STATIC_TABLE_SIZE( pnBuiltInStyle4 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle5, STATIC_TABLE_SIZE( pnBuiltInStyle5 ) ); aXF.Save( rStrm ); +} + +void XclExpXFBuffer::WriteDefaultXFs8( XclExpStream& rStrm ) +{ + static const sal_uInt8 pnDefStyle[] = { 0x00,0x00,0x00,0x00,0xF5,0xFF,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnOutlineStyle1[] = { 0x01,0x00,0x00,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnOutlineStyle2[] = { 0x02,0x00,0x00,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnOutlineStyle3[] = { 0x00,0x00,0x00,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnDefCell[] = { 0x00,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnBuiltInStyle1[] = { 0x01,0x00,0x2B,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnBuiltInStyle2[] = { 0x01,0x00,0x29,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnBuiltInStyle3[] = { 0x01,0x00,0x2C,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnBuiltInStyle4[] = { 0x01,0x00,0x2A,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + static const sal_uInt8 pnBuiltInStyle5[] = { 0x01,0x00,0x09,0x00,0xF5,0xFF,0x20,0x00,0x00,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x20 }; + + // default style (1) + XclExpDummyRecord aXF( EXC_ID_XF, pnDefStyle, STATIC_TABLE_SIZE( pnDefStyle ) ); aXF.Save( rStrm ); + // outline styles (14) + aXF.SetData( pnOutlineStyle1, STATIC_TABLE_SIZE( pnOutlineStyle1 ) ); aXF.SaveRepeated( rStrm, 2 ); + aXF.SetData( pnOutlineStyle2, STATIC_TABLE_SIZE( pnOutlineStyle2 ) ); aXF.SaveRepeated( rStrm, 2 ); + aXF.SetData( pnOutlineStyle3, STATIC_TABLE_SIZE( pnOutlineStyle3 ) ); aXF.SaveRepeated( rStrm, 10 ); + // default cell XF (1) + aXF.SetData( pnDefCell, STATIC_TABLE_SIZE( pnDefCell ) ); aXF.Save( rStrm ); + // built-in styles (5) + aXF.SetData( pnBuiltInStyle1, STATIC_TABLE_SIZE( pnBuiltInStyle1 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle2, STATIC_TABLE_SIZE( pnBuiltInStyle2 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle3, STATIC_TABLE_SIZE( pnBuiltInStyle3 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle4, STATIC_TABLE_SIZE( pnBuiltInStyle4 ) ); aXF.Save( rStrm ); + aXF.SetData( pnBuiltInStyle5, STATIC_TABLE_SIZE( pnBuiltInStyle5 ) ); aXF.Save( rStrm ); +} + +void XclExpXFBuffer::WriteDefaultStyles5( XclExpStream& rStrm ) +{ + XclExpUInt32Record( EXC_ID_STYLE, 0xFF038010 ).Save( rStrm ); + XclExpUInt32Record( EXC_ID_STYLE, 0xFF068011 ).Save( rStrm ); + XclExpUInt32Record( EXC_ID_STYLE, 0xFF048012 ).Save( rStrm ); + XclExpUInt32Record( EXC_ID_STYLE, 0xFF078013 ).Save( rStrm ); + XclExpUInt32Record( EXC_ID_STYLE, 0xFF008000 ).Save( rStrm ); + XclExpUInt32Record( EXC_ID_STYLE, 0xFF058014 ).Save( rStrm ); +} + + // ============================================================================ diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index a5f8366356b8..49ee80cfd828 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xicontent.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-04 14:18:17 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,6 +145,7 @@ #endif +#include "XclImpObjects.hxx" #include "excform.hxx" @@ -183,6 +184,7 @@ void XclImpBitmap::ReadBitmap( XclImpStream& rStrm ) { const XclImpRoot& rRoot = rStrm.GetRoot(); DBG_ASSERT( rRoot.mpRD->pStyleSheetItemSet, "XclImpBitmap::ReadBitmap - no itemset" ); + if( !rRoot.mpRD->pStyleSheetItemSet ) return; SfxItemSet& rItemSet = *rRoot.mpRD->pStyleSheetItemSet; sal_uInt32 nID; @@ -475,15 +477,16 @@ void XclImpLabelranges::ReadLabelranges( XclImpStream& rStrm ) // Data Validation ============================================================ -void XclImpValidation::ReadDval( XclImpStream& rStrm, XclImpRoot& rRoot ) +void XclImpValidation::ReadDval( XclImpStream& rStrm ) { + const XclImpRoot& rRoot = rStrm.GetRoot(); DBG_ASSERT_BIFF( rRoot.GetBiff() == xlBiff8 ); sal_uInt32 nObjId; rStrm.Ignore( 10 ); rStrm >> nObjId; if( nObjId != EXC_DVAL_NOOBJ ) - rRoot.SetIgnoreObject( nObjId ); + rRoot.GetObjectManager().SetIgnoreObject( nObjId ); } void XclImpValidation::ReadDv( XclImpStream& rStrm, ExcelToSc& rFmlaConv ) diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index a0d68643a523..2c304539777c 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xihelper.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -323,6 +323,7 @@ void XclImpHFConverter::ParseString( const String& rHFString ) } eState = xlPSText; const sal_Unicode* pChar = rHFString.GetBuffer(); + const sal_Unicode* pNull = pChar + rHFString.Len(); // pointer to teminating null char while( *pChar ) { switch( eState ) @@ -365,9 +366,20 @@ void XclImpHFConverter::ParseString( const String& rHFString ) case 'N': InsertField( SvxFieldItem( SvxPagesField() ) ); break; // page count case 'D': InsertField( SvxFieldItem( SvxDateField() ) ); break; // date case 'T': InsertField( SvxFieldItem( SvxTimeField() ) ); break; // time - case 'F': InsertField( SvxFieldItem( SvxExtFileField() ) ); break; // file case 'A': InsertField( SvxFieldItem( SvxTableField() ) ); break; // table name + case 'Z': // file path + InsertField( SvxFieldItem( SvxExtFileField() ) ); // convert to full name + if( (pNull - pChar >= 2) && (*(pChar + 1) == '&') && (*(pChar + 2) == 'F') ) + { + // &Z&F found - ignore the &F part + pChar += 2; + } + break; + case 'F': // file name + InsertField( SvxFieldItem( SvxExtFileField( EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ) ) ); + break; + case 'U': // underline SetAttribs(); mpFontData->meUnderline = (mpFontData->meUnderline == xlUnderlSingle) ? @@ -616,7 +628,7 @@ void XclImpUrlHelper::DecodeUrl( rUrl.Append( '\\' ); else // control character in raw name -> DDE link { - rUrl.Append( '|' ); + rUrl.Append( EXC_DDE_DELIM ); eState = xlUrlRaw; } break; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 7f80582178b5..5ed531463adf 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xilink.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:12:51 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,8 +129,8 @@ XclImpExtName::XclImpExtName( XclImpStream& rStrm ) if( ::get_flag( nFlags, EXC_EXTN_BUILTIN ) || !::get_flag( nFlags, EXC_EXTN_OLE_OR_DDE ) ) { meType = xlExtName; - ScfTools::ConvertName( maName, true ); // also a point is a valid char for func names! - maName = rStrm.GetRoot().GetAddInNames().GetScName( maName ); + maAddInName = rStrm.GetRoot().GetAddInNames().GetScName( maName ); + ScfTools::ConvertToScDefinedName( maName ); } else meType = ::get_flagvalue( nFlags, EXC_EXTN_OLE, xlExtOLE, xlExtDDE ); @@ -205,14 +205,17 @@ void XclImpSupbookTab::CreateTable( ScDocument& rDoc, const String& rUrl ) XclImpSupbook::XclImpSupbook( XclImpStream& rStrm ) : mnCurrExcTab( EXC_TAB_INVALID ), - mbSelf( false ) + mbSelf( false ), + mbAddIn( false ) { sal_uInt16 nTabCnt; rStrm >> nTabCnt; if( rStrm.GetRecLeft() == 2 ) { - mbSelf = (rStrm.ReaduInt16() == EXC_SUPB_SELF); + sal_uInt16 nType = rStrm.ReaduInt16(); + mbSelf = (nType == EXC_SUPB_SELF); + mbAddIn = (nType == EXC_SUPB_ADDIN); return; } @@ -242,7 +245,7 @@ void XclImpSupbook::ReadUrl( XclImpStream& rStrm, String& rUrl, bool& rbSelf ) void XclImpSupbook::ReadTabName( XclImpStream& rStrm, String& rTabName ) { rStrm.AppendUniString( rTabName ); - ScfTools::ConvertName( rTabName ); + ScfTools::ConvertToScSheetName( rTabName ); } void XclImpSupbook::ReadXct( XclImpStream& rStrm ) @@ -277,9 +280,7 @@ const XclImpExtName* XclImpSupbook::GetExtName( sal_uInt16 nXclIndex ) const bool XclImpSupbook::GetLink( String& rApplic, String& rDoc ) const { - // first backslash is application name delimiter - // (created by XclImpUrlDecoder::DecodeUrl()) - xub_StrLen nPos = maUrl.Search( '\\' ); + xub_StrLen nPos = maUrl.Search( EXC_DDE_DELIM ); if( mbSelf || !maUrl.Len() || (nPos == STRING_NOTFOUND) ) return false; rApplic = maUrl.Copy( 0, nPos ); diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 88cc80e83959..f24c562fdd95 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xiroot.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:12:51 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,6 @@ #ifdef PCH #include "filt_pch.hxx" #endif - #pragma hdrstop // ============================================================================ @@ -81,12 +80,13 @@ #include "xicontent.hxx" #endif +#include "XclImpObjects.hxx" + // Global data ================================================================ XclImpRootData::XclImpRootData( XclBiff eBiff, ScDocument& rDocument, const String& rBasePath, CharSet eCharSet ) : - XclRootData( eBiff, rDocument, rBasePath, eCharSet ), - mbIgnoreObjSorted( false ) + XclRootData( eBiff, rDocument, rBasePath, eCharSet ) { } @@ -101,13 +101,13 @@ XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) : XclRoot( rImpRootData ), mrImpData( rImpRootData ) { - mrImpData.mpPalette.reset( new XclImpPalette( *this ) ); - mrImpData.mpFontBuffer.reset( new XclImpFontBuffer( *this ) ); - mrImpData.mpNumFmtBuffer.reset( new XclImpNumFmtBuffer( *this ) ); - mrImpData.mpXFBuffer.reset( new XclImpXFBuffer( *this ) ); - mrImpData.mpXFIndexBuffer.reset( new XclImpXFIndexBuffer( *this ) ); + mrImpData.mpPalette.reset( new XclImpPalette( GetRoot() ) ); + mrImpData.mpFontBuffer.reset( new XclImpFontBuffer( GetRoot() ) ); + mrImpData.mpNumFmtBuffer.reset( new XclImpNumFmtBuffer( GetRoot() ) ); + mrImpData.mpXFBuffer.reset( new XclImpXFBuffer( GetRoot() ) ); + mrImpData.mpXFIndexBuffer.reset( new XclImpXFIndexBuffer( GetRoot() ) ); mrImpData.mpTabIdBuffer.reset( new XclImpTabIdBuffer ); - mrImpData.mpLinkManager.reset( new XclImpLinkManager( *this ) ); + mrImpData.mpLinkManager.reset( new XclImpLinkManager( GetRoot() ) ); } XclImpRoot::XclImpRoot( const XclImpRoot& rRoot ) : @@ -125,13 +125,13 @@ XclImpRoot& XclImpRoot::operator=( const XclImpRoot& rRoot ) void XclImpRoot::SetBiff( XclBiff eBiff ) { XclRoot::SetBiff( eBiff ); - GetPalette().SetBiff( eBiff ); + GetPalette().OnChangeBiff(); } XclImpSst& XclImpRoot::GetSst() const { if( !mrImpData.mpSst.get() ) - mrImpData.mpSst.reset( new XclImpSst( *this ) ); + mrImpData.mpSst.reset( new XclImpSst( GetRoot() ) ); return *mrImpData.mpSst; } @@ -170,10 +170,17 @@ XclImpLinkManager& XclImpRoot::GetLinkManager() const return *mrImpData.mpLinkManager; } +XclImpObjectManager& XclImpRoot::GetObjectManager() const +{ + if( !mrImpData.mpObjManager.get() ) + mrImpData.mpObjManager.reset( new XclImpObjectManager( GetRoot() ) ); + return *mrImpData.mpObjManager; +} + XclImpWebQueryBuffer& XclImpRoot::GetWebQueryBuffer() const { if( !mrImpData.mpWebQBuffer.get() ) - mrImpData.mpWebQBuffer.reset( new XclImpWebQueryBuffer( *this ) ); + mrImpData.mpWebQBuffer.reset( new XclImpWebQueryBuffer( GetRoot() ) ); return *mrImpData.mpWebQBuffer; } @@ -192,22 +199,6 @@ void XclImpRoot::CheckCellRangeList( ScRangeList& rRanges ) const XclRoot::CheckCellRangeList( rRanges, GetScMaxPos() ); } -void XclImpRoot::SetIgnoreObject( sal_uInt32 nObjId ) -{ - mrImpData.maIgnoreObj.push_back( nObjId ); - mrImpData.mbIgnoreObjSorted = false; -} - -bool XclImpRoot::IsIgnoreObject( sal_uInt32 nObjId ) const -{ - if( !mrImpData.mbIgnoreObjSorted ) - { - ::std::sort( mrImpData.maIgnoreObj.begin(), mrImpData.maIgnoreObj.end() ); - mrImpData.mbIgnoreObjSorted = true; - } - return ::std::binary_search( mrImpData.maIgnoreObj.begin(), mrImpData.maIgnoreObj.end(), nObjId ); -} - // ============================================================================ diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index eb367435abc1..e81d3c1a906b 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xistream.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,6 +83,7 @@ // ============================================================================ +#if SC_XCL_USEDECR XclImpDecrypter::~XclImpDecrypter() { } @@ -222,6 +223,7 @@ sal_uInt32 XclImpBiff8Decrypter::ReadDecrypt( SvStream& rStrm, void* pData, sal_ { return rStrm.Read( pData, nBytes ); } +#endif // ============================================================================ @@ -279,7 +281,9 @@ XclImpStream::XclImpStream( SvStream& rInStrm, const XclImpRoot& rRoot, bool bCo mnRecSize( 0 ), mnRecLeft( 0 ), mbCont( bContHandling ), +#if SC_XCL_USEDECR mbUseDecr( false ), +#endif mbValidRec( false ), mbValid( false ), mbWarnings( true ) @@ -300,7 +304,9 @@ bool XclImpStream::GetNextRecord( sal_uInt16& rnRecId, sal_uInt16& rnRecSize ) if( bRet ) { mrStrm >> rnRecId >> rnRecSize; // read direct +#if SC_XCL_USEDECR SetDecrypterOffset( rnRecSize ); +#endif } else rnRecId = rnRecSize = 0; @@ -359,6 +365,7 @@ void XclImpStream::InitializeRecord( bool bContHandling, sal_uInt16 nAltContId ) } } +#if SC_XCL_USEDECR void XclImpStream::EnableDecryption( XclImpDecrypter* pDecrypter ) { mpDecrypter.reset( pDecrypter ); @@ -370,6 +377,7 @@ void XclImpStream::UseDecryption( bool bUse ) { mbUseDecr = (mpDecrypter.get() && mpDecrypter->IsValid()) ? bUse : false; } +#endif bool XclImpStream::GetContinue() { @@ -455,7 +463,9 @@ void XclImpStream::SeekGlobalPosition() mnComplRecSize = mnCurrRecSize; mbHasComplRec = !mbCont; mbValidRec = mbValid = mbGlobValidRec; +#if SC_XCL_USEDECR SetDecrypterOffset( mnRecSize ); +#endif } } @@ -477,24 +487,29 @@ sal_uInt32 XclImpStream::GetRecSize() void XclImpStream::ReadAtom( sal_Int8& rnValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) mpDecrypter->ReadDecrypt( mrStrm, &rnValue, 1 ); else +#endif mrStrm >> rnValue; --mnRecLeft; } void XclImpStream::ReadAtom( sal_uInt8& rnValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) mpDecrypter->ReadDecrypt( mrStrm, &rnValue, 1 ); else +#endif mrStrm >> rnValue; --mnRecLeft; } void XclImpStream::ReadAtom( sal_Int16& rnValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) { SVBT16 pBuffer; @@ -502,12 +517,14 @@ void XclImpStream::ReadAtom( sal_Int16& rnValue ) rnValue = static_cast< sal_Int16 >( SVBT16ToShort( pBuffer ) ); } else +#endif mrStrm >> rnValue; mnRecLeft -= 2; } void XclImpStream::ReadAtom( sal_uInt16& rnValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) { SVBT16 pBuffer; @@ -515,12 +532,14 @@ void XclImpStream::ReadAtom( sal_uInt16& rnValue ) rnValue = SVBT16ToShort( pBuffer ); } else +#endif mrStrm >> rnValue; mnRecLeft -= 2; } void XclImpStream::ReadAtom( sal_Int32& rnValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) { SVBT32 pBuffer; @@ -528,12 +547,14 @@ void XclImpStream::ReadAtom( sal_Int32& rnValue ) rnValue = static_cast< sal_Int32 >( SVBT32ToLong( pBuffer ) ); } else +#endif mrStrm >> rnValue; mnRecLeft -= 4; } void XclImpStream::ReadAtom( sal_uInt32& rnValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) { SVBT32 pBuffer; @@ -541,12 +562,14 @@ void XclImpStream::ReadAtom( sal_uInt32& rnValue ) rnValue = SVBT32ToLong( pBuffer ); } else +#endif mrStrm >> rnValue; mnRecLeft -= 4; } void XclImpStream::ReadAtom( float& rfValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) { SVBT32 pBuffer; @@ -555,12 +578,14 @@ void XclImpStream::ReadAtom( float& rfValue ) memcpy( &rfValue, &nValue, 4 ); } else +#endif mrStrm >> rfValue; mnRecLeft -= 4; } void XclImpStream::ReadAtom( double& rfValue ) { +#if SC_XCL_USEDECR if( mbUseDecr ) { SVBT64 pBuffer; @@ -568,14 +593,19 @@ void XclImpStream::ReadAtom( double& rfValue ) rfValue = SVBT64ToDouble( pBuffer ); } else +#endif mrStrm >> rfValue; mnRecLeft -= 8; } sal_uInt32 XclImpStream::ReadData( void* pData, sal_uInt32 nBytes ) { +#if SC_XCL_USEDECR sal_uInt32 nRet = mbUseDecr ? mpDecrypter->ReadDecrypt( mrStrm, pData, nBytes ) : mrStrm.Read( pData, nBytes ); +#else + sal_uInt32 nRet = mrStrm.Read( pData, nBytes ); +#endif mnRecLeft -= nRet; return nRet; } diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index e0a489fa9e35..f7c5eb32fe3e 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xistyle.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,10 +161,16 @@ // PALETTE record - color information ========================================= XclImpPalette::XclImpPalette( const XclImpRoot& rRoot ) : - XclDefaultPalette( rRoot.GetBiff() ) + XclDefaultPalette( rRoot.GetBiff() ), + XclImpRoot( rRoot ) { } +void XclImpPalette::OnChangeBiff() +{ + SetDefaultColors( GetBiff() ); +} + ColorData XclImpPalette::GetColorData( sal_uInt16 nXclIndex, ColorData nDefault ) const { if( nXclIndex >= GetIndexOffset() ) @@ -244,6 +250,19 @@ XclImpFont::XclImpFont( const XclImpRoot& rRoot, const XclFontData& rFontData ) Update(); /// sets internal font charset/family and script types } +long XclImpFont::GetCharWidth() const +{ + if( SfxPrinter* pPrinter = GetPrinter() ) + { + Font aFont( maData.maName, Size( 0, maData.mnHeight ) ); + aFont.SetFamily( meFontFamily ); + aFont.SetCharSet( meFontCharSet ); + pPrinter->SetFont( aFont ); + return pPrinter->GetTextWidth( String( '0' ) ); + } + return 11 * maData.mnHeight / 20; +} + void XclImpFont::ReadFont( XclImpStream& rStrm ) { switch( GetBiff() ) @@ -274,35 +293,6 @@ void XclImpFont::ReadFont( XclImpStream& rStrm ) Update(); } -double XclImpFont::CalcColumnScale() const -{ - double fScale; - switch( maData.mnHeight ) - { - case 240: fScale = 1.21860; break; // 12pt - case 320: fScale = 1.61040; break; // 16pt - default: - { - SfxPrinter* pPrinter = GetPrinter(); - if( pPrinter ) - { - Font aFont( maData.maName, Size( 0, maData.mnHeight ) ); - aFont.SetFamily( meFontFamily ); - aFont.SetCharSet( meFontCharSet ); - pPrinter->SetFont( aFont ); - fScale = pPrinter->GetTextWidth( String( '0' ) ); - fScale /= 111.0; - } - else - { - fScale = maData.mnHeight; - fScale /= 200.0; // default height = 10pt = 200twips - } - } - } - return fScale; -} - void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontWhichIDMode eMode ) const { bool bEE = (eMode == xlFontEEIDs) || (eMode == xlFontHFIDs); @@ -469,15 +459,7 @@ FontFamily XclImpFont::GetScFontFamily( sal_uInt8 nXclFamily, const String& rNam CharSet XclImpFont::GetScFontCharSet( sal_uInt8 nXclCharSet ) { - CharSet eScCharSet; - switch( nXclCharSet ) - { - case EXC_FONTCSET_MS_1252: eScCharSet = RTL_TEXTENCODING_MS_1252; break; - case EXC_FONTCSET_IBM_850: eScCharSet = RTL_TEXTENCODING_IBM_850; break; - case EXC_FONTCSET_SYMBOL: eScCharSet = RTL_TEXTENCODING_SYMBOL; break; - default: eScCharSet = ScfTools::GetSystemCharSet(); - } - return eScCharSet; + return rtl_getTextEncodingFromWindowsCharset(nXclCharSet); } FontItalic XclImpFont::GetScFontPosture( bool bXclItalic ) @@ -531,19 +513,31 @@ SvxEscapement XclImpFont::GetScFontEscapement( XclEscapement eXclEscapem ) // ---------------------------------------------------------------------------- +XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) : + XclImpRoot( rRoot ) +{ + // application font for column width calculation, filled with first font from font list + maAppFont.maName.AssignAscii( "Arial" ); + maAppFont.mnHeight = 200; + SetCharWidth( 110 ); +} + void XclImpFontBuffer::ReadFont( XclImpStream& rStrm ) { // Font with index 4 is not stored in an Excel file -> create a dummy font. if( maFontList.Count() == 4 ) - maFontList.Append( new XclImpFont( *maFontList.GetObject( 0 ) ) ); + maFontList.Append( new XclImpFont( *GetFont( 0 ) ) ); - XclImpFont* pFont = new XclImpFont( *this ); + XclImpFont* pFont = new XclImpFont( GetRoot() ); pFont->ReadFont( rStrm ); maFontList.Append( pFont ); - // Calculate the column scale from first font and current printer. if( maFontList.Count() == 1 ) - mpRD->fColScale *= pFont->CalcColumnScale(); + { + maAppFont = pFont->GetFontData(); + // #i3006# Calculate the width of '0' from first font and current printer. + SetCharWidth( pFont->GetCharWidth() ); + } } void XclImpFontBuffer::FillToItemSet( sal_uInt16 nFontIndex, SfxItemSet& rItemSet, XclFontWhichIDMode eMode ) const @@ -613,7 +607,7 @@ static const XclImpBuiltInFormat pBuiltInFormats[] = XclImpNumFmtBuffer::XclImpNumFmtBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), - mnDefault( GetFormatter().GetStandardFormat( GetDefLanguage() ) ) + mnStdFmt( GetFormatter().GetStandardFormat( GetDefLanguage() ) ) { } @@ -622,7 +616,7 @@ sal_uInt32 XclImpNumFmtBuffer::GetFormat( sal_uInt32 nIndex ) if( maKeyVec.empty() ) InsertBuiltinFormats(); - return (nIndex < maKeyVec.size()) ? maKeyVec[ nIndex ] : mnDefault; + return (nIndex < maKeyVec.size()) ? maKeyVec[ nIndex ] : mnStdFmt; } void XclImpNumFmtBuffer::ReadFormat( XclImpStream& rStrm ) @@ -676,7 +670,7 @@ void XclImpNumFmtBuffer::ReadFormat( XclImpStream& rStrm ) void XclImpNumFmtBuffer::InsertBuiltinFormats() { - const XclImpBuiltInFormat* pEnd = pBuiltInFormats + STATIC_TABLE_SIZE( pBuiltInFormats ); + const XclImpBuiltInFormat* pEnd = STATIC_TABLE_END( pBuiltInFormats ); String aFormat; xub_StrLen nCheckPos; @@ -700,122 +694,87 @@ void XclImpNumFmtBuffer::InsertBuiltinFormats() void XclImpNumFmtBuffer::InsertKey( sal_uInt32 nIndex, sal_uInt32 nFormatKey ) { if( nIndex >= maKeyVec.size() ) - maKeyVec.resize( nIndex + 1, mnDefault ); + maKeyVec.resize( nIndex + 1, mnStdFmt ); maKeyVec[ nIndex ] = nFormatKey; } // XF, STYLE record - Cell formatting ========================================= -/** Contains color and line style for each cell border line. */ -struct XclImpXFBorder -{ - sal_uInt16 mnLeftColor; /// Index to color for left line. - sal_uInt16 mnRightColor; /// Index to color for right line. - sal_uInt16 mnTopColor; /// Index to color for top line. - sal_uInt16 mnBottomColor; /// Index to color for bottom line. - sal_uInt8 mnLeftLine; /// Style of left line. - sal_uInt8 mnRightLine; /// Style of right line. - sal_uInt8 mnTopLine; /// Style of top line. - sal_uInt8 mnBottomLine; /// Style of bottom line. - - void SetBorder2( sal_uInt8 nFlags ); - void SetBorder34( sal_uInt32 nBorder ); - void SetBorder5( sal_uInt32 nBorder, sal_uInt32 nArea ); - void SetBorder8( sal_uInt32 nBorder1, sal_uInt32 nBorder2 ); -}; - -void XclImpXFBorder::SetBorder2( sal_uInt8 nFlags ) +void lcl_SetBorder2( XclImpXFBorder& rBorder, sal_uInt8 nFlags ) { - ::extract_value( mnLeftLine, nFlags, 3, 1 ); - ::extract_value( mnRightLine, nFlags, 4, 1 ); - ::extract_value( mnTopLine, nFlags, 5, 1 ); - ::extract_value( mnBottomLine, nFlags, 6, 1 ); - mnLeftColor = mnRightColor = mnTopColor = mnBottomColor = 0; // black + rBorder.mnLeftLine = ::get_flagvalue( nFlags, EXC_XF2_LEFTLINE, EXC_LINE_THIN, EXC_LINE_NONE ); + rBorder.mnRightLine = ::get_flagvalue( nFlags, EXC_XF2_RIGHTLINE, EXC_LINE_THIN, EXC_LINE_NONE ); + rBorder.mnTopLine = ::get_flagvalue( nFlags, EXC_XF2_TOPLINE, EXC_LINE_THIN, EXC_LINE_NONE ); + rBorder.mnBottomLine = ::get_flagvalue( nFlags, EXC_XF2_BOTTOMLINE, EXC_LINE_THIN, EXC_LINE_NONE ); + rBorder.mnLeftColor = rBorder.mnRightColor = rBorder.mnTopColor = rBorder.mnBottomColor = EXC_COLOR_BIFF2_BLACK; } -void XclImpXFBorder::SetBorder34( sal_uInt32 nBorder ) +void lcl_SetBorder3( XclImpXFBorder& rBorder, sal_uInt32 nBorder ) { - ::extract_value( mnTopLine, nBorder, 0, 3 ); - ::extract_value( mnLeftLine, nBorder, 8, 3 ); - ::extract_value( mnBottomLine, nBorder, 16, 3 ); - ::extract_value( mnRightLine, nBorder, 24, 3 ); - ::extract_value( mnTopColor, nBorder, 3, 5 ); - ::extract_value( mnLeftColor, nBorder, 11, 5 ); - ::extract_value( mnBottomColor, nBorder, 19, 5 ); - ::extract_value( mnRightColor, nBorder, 27, 5 ); + ::extract_value( rBorder.mnTopLine, nBorder, 0, 3 ); + ::extract_value( rBorder.mnLeftLine, nBorder, 8, 3 ); + ::extract_value( rBorder.mnBottomLine, nBorder, 16, 3 ); + ::extract_value( rBorder.mnRightLine, nBorder, 24, 3 ); + ::extract_value( rBorder.mnTopColor, nBorder, 3, 5 ); + ::extract_value( rBorder.mnLeftColor, nBorder, 11, 5 ); + ::extract_value( rBorder.mnBottomColor, nBorder, 19, 5 ); + ::extract_value( rBorder.mnRightColor, nBorder, 27, 5 ); } -void XclImpXFBorder::SetBorder5( sal_uInt32 nBorder, sal_uInt32 nArea ) +void lcl_SetBorder5( XclImpXFBorder& rBorder, sal_uInt32 nBorder, sal_uInt32 nArea ) { - ::extract_value( mnTopLine, nBorder, 0, 3 ); - ::extract_value( mnLeftLine, nBorder, 3, 3 ); - ::extract_value( mnBottomLine, nArea, 22, 3 ); - ::extract_value( mnRightLine, nBorder, 6, 3 ); - ::extract_value( mnTopColor, nBorder, 9, 7 ); - ::extract_value( mnLeftColor, nBorder, 16, 7 ); - ::extract_value( mnBottomColor, nArea, 25, 7 ); - ::extract_value( mnRightColor, nBorder, 23, 7 ); + ::extract_value( rBorder.mnTopLine, nBorder, 0, 3 ); + ::extract_value( rBorder.mnLeftLine, nBorder, 3, 3 ); + ::extract_value( rBorder.mnBottomLine, nArea, 22, 3 ); + ::extract_value( rBorder.mnRightLine, nBorder, 6, 3 ); + ::extract_value( rBorder.mnTopColor, nBorder, 9, 7 ); + ::extract_value( rBorder.mnLeftColor, nBorder, 16, 7 ); + ::extract_value( rBorder.mnBottomColor, nArea, 25, 7 ); + ::extract_value( rBorder.mnRightColor, nBorder, 23, 7 ); } -void XclImpXFBorder::SetBorder8( sal_uInt32 nBorder1, sal_uInt32 nBorder2 ) +void lcl_SetBorder8( XclImpXFBorder& rBorder, sal_uInt32 nBorder1, sal_uInt32 nBorder2 ) { - ::extract_value( mnLeftLine, nBorder1, 0, 4 ); - ::extract_value( mnRightLine, nBorder1, 4, 4 ); - ::extract_value( mnTopLine, nBorder1, 8, 4 ); - ::extract_value( mnBottomLine, nBorder1, 12, 4 ); - ::extract_value( mnLeftColor, nBorder1, 16, 7 ); - ::extract_value( mnRightColor, nBorder1, 23, 7 ); - ::extract_value( mnTopColor, nBorder2, 0, 7 ); - ::extract_value( mnBottomColor, nBorder2, 7, 7 ); + ::extract_value( rBorder.mnLeftLine, nBorder1, 0, 4 ); + ::extract_value( rBorder.mnRightLine, nBorder1, 4, 4 ); + ::extract_value( rBorder.mnTopLine, nBorder1, 8, 4 ); + ::extract_value( rBorder.mnBottomLine, nBorder1, 12, 4 ); + ::extract_value( rBorder.mnLeftColor, nBorder1, 16, 7 ); + ::extract_value( rBorder.mnRightColor, nBorder1, 23, 7 ); + ::extract_value( rBorder.mnTopColor, nBorder2, 0, 7 ); + ::extract_value( rBorder.mnBottomColor, nBorder2, 7, 7 ); } // ---------------------------------------------------------------------------- -/** Contains background colors and pattern. */ -struct XclImpXFArea -{ - sal_uInt16 mnForeColor; /// Index to foreground color. - sal_uInt16 mnBackColor; /// Index to background color. - sal_uInt8 mnPattern; /// Fill pattern. - - void SetArea2( sal_uInt8 nFlags ); - void SetArea34( sal_uInt16 nArea ); - void SetArea5( sal_uInt32 nArea ); - void SetArea8( sal_uInt32 nBorder2, sal_uInt16 nArea ); -}; - -void XclImpXFArea::SetArea2( sal_uInt8 nFlags ) +void lcl_SetArea2( XclImpXFArea& rArea, sal_uInt8 nFlags ) { - mnPattern = EXC_PATT_NONE; - if( nFlags & EXC_XF2_BACKGROUND ) - { - mnPattern = EXC_PATT_12_5_PERC; - mnForeColor = EXC_COLOR_BIFF2_BLACK; - mnBackColor = EXC_COLOR_BIFF2_WHITE; - } + rArea.mnPattern = ::get_flagvalue( nFlags, EXC_XF2_BACKGROUND, EXC_PATT_12_5_PERC, EXC_PATT_NONE ); + rArea.mnForeColor = EXC_COLOR_BIFF2_BLACK; + rArea.mnBackColor = EXC_COLOR_BIFF2_WHITE; } -void XclImpXFArea::SetArea34( sal_uInt16 nArea ) +void lcl_SetArea3( XclImpXFArea& rArea, sal_uInt16 nArea ) { - ::extract_value( mnPattern, nArea, 0, 6 ); - ::extract_value( mnForeColor, nArea, 6, 5 ); - ::extract_value( mnBackColor, nArea, 11, 5 ); + ::extract_value( rArea.mnPattern, nArea, 0, 6 ); + ::extract_value( rArea.mnForeColor, nArea, 6, 5 ); + ::extract_value( rArea.mnBackColor, nArea, 11, 5 ); } -void XclImpXFArea::SetArea5( sal_uInt32 nArea ) +void lcl_SetArea5( XclImpXFArea& rArea, sal_uInt32 nArea ) { - ::extract_value( mnPattern, nArea, 16, 6 ); - ::extract_value( mnForeColor, nArea, 0, 7 ); - ::extract_value( mnBackColor, nArea, 7, 7 ); + ::extract_value( rArea.mnPattern, nArea, 16, 6 ); + ::extract_value( rArea.mnForeColor, nArea, 0, 7 ); + ::extract_value( rArea.mnBackColor, nArea, 7, 7 ); } -void XclImpXFArea::SetArea8( sal_uInt32 nBorder2, sal_uInt16 nArea ) +void lcl_SetArea8( XclImpXFArea& rArea, sal_uInt32 nBorder2, sal_uInt16 nArea ) { - ::extract_value( mnPattern, nBorder2, 26, 6 ); - ::extract_value( mnForeColor, nArea, 0, 7 ); - ::extract_value( mnBackColor, nArea, 7, 7 ); + ::extract_value( rArea.mnPattern, nBorder2, 26, 6 ); + ::extract_value( rArea.mnForeColor, nArea, 0, 7 ); + ::extract_value( rArea.mnBackColor, nArea, 7, 7 ); } @@ -823,22 +782,25 @@ void XclImpXFArea::SetArea8( sal_uInt32 nBorder2, sal_uInt16 nArea ) XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), - meHorAlign( xlHAlignParent ), - meVerAlign( xlVAlignParent ), - meWrap( xlTextWrapParent ), - meOrient( xlTextOrientParent ), - meTextDir( xlTextDirParent ), - mnRotation( 0 ), - mnValFormat( 0 ), - mnIndent( 0 ), - mnFont( 0 ), + meHorAlign( xlHAlignGeneral ), + meVerAlign( xlVAlignBottom ), + meOrient( xlTextOrientNoRot ), + meTextDir( xlTextDirContext ), mnParent( 0 ), + mnNumFmt( 0 ), + mnFont( 0 ), + mnIndent( 0 ), + mnRotation( 0 ), mbCellXF( true ), // default is cell XF mbLocked( true ), // default in Excel and Calc mbHidden( false ), - mbFontValid( false ), - mbFmtValid( false ), - mbProtValid( false ) + mbWrapped( false ), + mbProtUsed( false ), + mbFontUsed( false ), + mbFmtUsed( false ), + mbAlignUsed( false ), + mbBorderUsed( false ), + mbAreaUsed( false ) { } @@ -848,136 +810,160 @@ XclImpXF::~XclImpXF() void XclImpXF::ReadXF2( XclImpStream& rStrm ) { - sal_uInt8 nValFmt, nFlags; + sal_uInt8 nNumFmt, nFlags; mnFont = rStrm.ReaduInt8(); rStrm.Ignore( 1 ); - rStrm >> nValFmt >> nFlags; + rStrm >> nNumFmt >> nFlags; - GetBorder().SetBorder2( nFlags ); - GetArea().SetArea2( nFlags ); - mnValFormat = GetNumFmtBuffer().GetFormat( nValFmt & EXC_XF2_VALFMT_MASK ); + lcl_SetBorder2( maBorder, nFlags ); + lcl_SetArea2( maArea, nFlags ); + mnNumFmt = GetNumFmtBuffer().GetFormat( nNumFmt & EXC_XF2_VALFMT_MASK ); ::extract_value( meHorAlign, nFlags, 0, 3 ); - meVerAlign = xlVAlignTop; - meWrap = xlTextWrapNo; - meOrient = xlTextOrientNoRot; - mbLocked = ::get_flag( nValFmt, EXC_XF2_LOCKED ); - mbHidden = ::get_flag( nValFmt, EXC_XF2_HIDDEN ); + mbLocked = ::get_flag( nNumFmt, EXC_XF2_LOCKED ); + mbHidden = ::get_flag( nNumFmt, EXC_XF2_HIDDEN ); - mbFontValid = mbFmtValid = mbProtValid = true; + //! TODO flags + mbProtUsed = mbFontUsed = mbFmtUsed = mbAlignUsed = mbBorderUsed = mbAreaUsed = true; } void XclImpXF::ReadXF3( XclImpStream& rStrm ) { sal_uInt32 nBorder; sal_uInt16 nFlags, nAlign, nArea; - sal_uInt8 nValFmt; + sal_uInt8 nNumFmt; mnFont = rStrm.ReaduInt8(); - rStrm >> nValFmt >> nFlags >> nAlign >> nArea >> nBorder; + rStrm >> nNumFmt >> nFlags >> nAlign >> nArea >> nBorder; mbCellXF = !::get_flag( nFlags, EXC_XF_STYLE ); // new in BIFF3 ::extract_value( mnParent, nAlign, 4, 12 ); // new in BIFF3 - GetBorder().SetBorder34( nBorder ); - GetArea().SetArea34( nArea ); // new in BIFF3 - mnValFormat = GetNumFmtBuffer().GetFormat( nValFmt ); + lcl_SetBorder3( maBorder, nBorder ); + lcl_SetArea3( maArea, nArea ); // new in BIFF3 + mnNumFmt = GetNumFmtBuffer().GetFormat( nNumFmt ); ::extract_value( meHorAlign, nAlign, 0, 3 ); - meVerAlign = xlVAlignTop; - ::extract_value( meWrap, nAlign, 3, 1 ); // new in BIFF3 - meOrient = xlTextOrientNoRot; + mbWrapped = ::get_flag( nAlign, EXC_XF_WRAPPED ); // new in BIFF3 mbLocked = ::get_flag( nFlags, EXC_XF_LOCKED ); mbHidden = ::get_flag( nFlags, EXC_XF_HIDDEN ); - mbFontValid = mbFmtValid = mbProtValid = true; + //! TODO flags + mbProtUsed = mbFontUsed = mbFmtUsed = mbAlignUsed = mbBorderUsed = mbAreaUsed = true; } void XclImpXF::ReadXF4( XclImpStream& rStrm ) { sal_uInt32 nBorder; sal_uInt16 nFlags, nAlign, nArea; - sal_uInt8 nValFmt; + sal_uInt8 nNumFmt; mnFont = rStrm.ReaduInt8(); - rStrm >> nValFmt >> nFlags >> nAlign >> nArea >> nBorder; + rStrm >> nNumFmt >> nFlags >> nAlign >> nArea >> nBorder; mbCellXF = !::get_flag( nFlags, EXC_XF_STYLE ); ::extract_value( mnParent, nFlags, 4, 12 ); - GetBorder().SetBorder34( nBorder ); - GetArea().SetArea34( nArea ); - mnValFormat = GetNumFmtBuffer().GetFormat( nValFmt ); + lcl_SetBorder3( maBorder, nBorder ); + lcl_SetArea3( maArea, nArea ); + mnNumFmt = GetNumFmtBuffer().GetFormat( nNumFmt ); ::extract_value( meHorAlign, nAlign, 0, 3 ); ::extract_value( meVerAlign, nAlign, 4, 2 ); // new in BIFF4 - ::extract_value( meWrap, nAlign, 3, 1 ); + mbWrapped = ::get_flag( nAlign, EXC_XF_WRAPPED ); ::extract_value( meOrient, nAlign, 6, 2 ); // new in BIFF4 mbLocked = ::get_flag( nFlags, EXC_XF_LOCKED ); mbHidden = ::get_flag( nFlags, EXC_XF_HIDDEN ); - mbFontValid = mbFmtValid = mbProtValid = true; + //! TODO flags + mbProtUsed = mbFontUsed = mbFmtUsed = mbAlignUsed = mbBorderUsed = mbAreaUsed = true; } void XclImpXF::ReadXF5( XclImpStream& rStrm ) { sal_uInt32 nArea, nBorder; - sal_uInt16 nValFmt, nFlags, nAlign; - rStrm >> mnFont >> nValFmt >> nFlags >> nAlign >> nArea >> nBorder; + sal_uInt16 nNumFmt, nFlags, nAlign; + rStrm >> mnFont >> nNumFmt >> nFlags >> nAlign >> nArea >> nBorder; mbCellXF = !::get_flag( nFlags, EXC_XF_STYLE ); ::extract_value( mnParent, nFlags, 4, 12 ); - GetBorder().SetBorder5( nBorder, nArea ); - GetArea().SetArea5( nArea ); - mnValFormat = GetNumFmtBuffer().GetFormat( nValFmt ); + lcl_SetBorder5( maBorder, nBorder, nArea ); + lcl_SetArea5( maArea, nArea ); + mnNumFmt = GetNumFmtBuffer().GetFormat( nNumFmt ); ::extract_value( meHorAlign, nAlign, 0, 3 ); ::extract_value( meVerAlign, nAlign, 4, 3 ); - ::extract_value( meWrap, nAlign, 3, 1 ); + mbWrapped = ::get_flag( nAlign, EXC_XF_WRAPPED ); ::extract_value( meOrient, nAlign, 8, 2 ); mbLocked = ::get_flag( nFlags, EXC_XF_LOCKED ); mbHidden = ::get_flag( nFlags, EXC_XF_HIDDEN ); - mbFontValid = mbFmtValid = mbProtValid = true; + //! TODO flags + mbProtUsed = mbFontUsed = mbFmtUsed = mbAlignUsed = mbBorderUsed = mbAreaUsed = true; } void XclImpXF::ReadXF8( XclImpStream& rStrm ) { sal_uInt32 nBorder1, nBorder2; - sal_uInt16 nReadFont, nValFmt, nFlags1, nAlign, nFlags2, nArea; - rStrm >> nReadFont >> nValFmt >> nFlags1 >> nAlign >> nFlags2 >> nBorder1 >> nBorder2 >> nArea; + sal_uInt16 nReadFont, nReadNumFmt, nTypeProt, nAlign, nMiscAttrib, nArea; + rStrm >> nReadFont >> nReadNumFmt >> nTypeProt >> nAlign >> nMiscAttrib >> nBorder1 >> nBorder2 >> nArea; - mbCellXF = !::get_flag( nFlags1, EXC_XF_STYLE ); + mbCellXF = !::get_flag( nTypeProt, EXC_XF_STYLE ); if( mbCellXF ) - ::extract_value( mnParent, nFlags1, 4, 12 ); - // Border - if( mbCellXF || !::get_flag( nFlags2, EXC_XF_DIFF_BORDER ) ) - GetBorder().SetBorder8( nBorder1, nBorder2 ); - // Area - if( mbCellXF || !::get_flag( nFlags2, EXC_XF_DIFF_AREA ) ) - GetArea().SetArea8( nBorder2, nArea ); - // Font - mbFontValid = mbCellXF || !::get_flag( nFlags2, EXC_XF_DIFF_FONT ); - if( mbFontValid ) + ::extract_value( mnParent, nTypeProt, 4, 12 ); + + // Remark about finding the mb***Used flags: + // - In cell XFs a *set* bit means a used attribute. + // - In style XFs a *cleared* bit means a used attribute. + // The mb***Used members always store true, if the attribute is used. + // The "mbCellXF == ::get_flag(...)" construct evaluates to true in + // both mentioned cases: cell XF and set bit; or style XF and cleared bit. + sal_uInt8 nUsedFlags; + ::extract_value( nUsedFlags, nMiscAttrib, 10, 6 ); + + // Remark about using the attributes from the XFs: + // Cell XF flag used (set) -> take from cell XF + // Cell XF flag unused (cleared): + // Parent style XF flag used (cleared) -> take from style XF + // Parent style XF flag unused (set) -> take from cell XF (!) + //! TODO not implemented yet + + // cell border + mbBorderUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_BORDER )); + if( mbCellXF || mbBorderUsed ) //! always in cell XFs until the parent XF is really read + lcl_SetBorder8( maBorder, nBorder1, nBorder2 ); + + // background area + mbAreaUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_AREA )); + if( mbCellXF || mbAreaUsed ) + lcl_SetArea8( maArea, nBorder2, nArea ); + + // font + mbFontUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_FONT )); + if( mbCellXF || mbFontUsed ) mnFont = nReadFont; - // Value format - mbFmtValid = mbCellXF || !::get_flag( nFlags2, EXC_XF_DIFF_VALFMT ); - if( mbFmtValid ) - mnValFormat = GetNumFmtBuffer().GetFormat( nValFmt ); - // Alignment - if( mbCellXF || !::get_flag( nFlags2, EXC_XF_DIFF_ALIGN ) ) + + // number format + mbFmtUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_VALFMT )); + if( mbCellXF || mbFmtUsed ) + mnNumFmt = GetNumFmtBuffer().GetFormat( nReadNumFmt ); + + // alignment + mbAlignUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_ALIGN )); + if( mbCellXF || mbAlignUsed ) { ::extract_value( meHorAlign, nAlign, 0, 3 ); ::extract_value( meVerAlign, nAlign, 4, 3 ); - ::extract_value( meWrap, nAlign, 3, 1 ); - ::extract_value( mnRotation, nAlign, 8, 8 ); // new in BIFF8 - meOrient = (mnRotation == EXC_ROT_STACKED) ? xlTextOrientTopBottom : xlTextOrientRot; - ::extract_value( meTextDir, nFlags2, 6, 2 ); // new in BIFF8X + mbWrapped = ::get_flag( nAlign, EXC_XF_WRAPPED ); + ::extract_value( mnRotation, nAlign, 8, 8 ); // new in BIFF8 + meOrient = (mnRotation == EXC_XF8_STACKED) ? xlTextOrientTopBottom : xlTextOrientRot; + ::extract_value( mnIndent, nMiscAttrib, 0, 4 ); // new in BIFF8 + mnIndent *= 200; + ::extract_value( meTextDir, nMiscAttrib, 6, 2 ); // new in BIFF8X } - // Cell protection - mbProtValid = mbCellXF || !::get_flag( nFlags2, EXC_XF_DIFF_PROT ); - if( mbProtValid ) + + // cell protection + mbProtUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_PROT )); + if( mbCellXF || mbProtUsed ) { - mbLocked = ::get_flag( nFlags1, EXC_XF_LOCKED ); - mbHidden = ::get_flag( nFlags1, EXC_XF_HIDDEN ); + mbLocked = ::get_flag( nTypeProt, EXC_XF_LOCKED ); + mbHidden = ::get_flag( nTypeProt, EXC_XF_HIDDEN ); } - ::extract_value( mnIndent, nFlags2, 0, 4 ); // new in BIFF8 - mnIndent *= 200; } void XclImpXF::ReadXF( XclImpStream& rStrm ) @@ -994,7 +980,7 @@ void XclImpXF::ReadXF( XclImpStream& rStrm ) } } -const ScPatternAttr& XclImpXF::GetPattern() +const ScPatternAttr& XclImpXF::GetPattern() const { if( mpPattern.get() ) return *mpPattern; @@ -1003,87 +989,71 @@ const ScPatternAttr& XclImpXF::GetPattern() mpPattern.reset( new ScPatternAttr( GetDoc().GetPool() ) ); SfxItemSet& rItemSet = mpPattern->GetItemSet(); - // value format - if( mbCellXF || mbFmtValid ) - { - rItemSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, static_cast< sal_uInt32 >( mnValFormat ) ) ); - ScGlobal::AddLanguage( rItemSet, GetFormatter() ); - } + // locked/hidden + if( mbCellXF || mbProtUsed ) + rItemSet.Put( ScProtectionAttr( mbLocked, mbHidden ) ); // font - if( mbCellXF || mbFontValid ) + if( mbCellXF || mbFontUsed ) GetFontBuffer().FillToItemSet( mnFont, rItemSet, xlFontScIDs ); - // locked/hidden - if( mbCellXF || mbProtValid ) - rItemSet.Put( ScProtectionAttr( mbLocked, mbHidden ) ); + // value format + if( mbCellXF || mbFmtUsed ) + { + rItemSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, static_cast< sal_uInt32 >( mnNumFmt ) ) ); + ScGlobal::AddLanguage( rItemSet, GetFormatter() ); + } // border - if( mpBorder.get() ) - SetBorder( rItemSet, GetPalette(), - mpBorder->mnLeftLine, mpBorder->mnLeftColor, - mpBorder->mnRightLine, mpBorder->mnRightColor, - mpBorder->mnTopLine, mpBorder->mnTopColor, - mpBorder->mnBottomLine, mpBorder->mnBottomColor ); + if( mbCellXF || mbBorderUsed ) + SetBorder( rItemSet, GetPalette(), maBorder ); // area - if( mpArea.get() ) - SetArea( rItemSet, GetPalette(), mpArea->mnPattern, mpArea->mnForeColor, mpArea->mnBackColor ); + if( mbCellXF || mbAreaUsed ) + SetArea( rItemSet, GetPalette(), maArea ); - // horizontal alignment - if( mbCellXF || (meHorAlign != xlHAlignParent) ) + // alignment + if( mbCellXF || mbAlignUsed ) { + // horizontal alignment SvxCellHorJustify eHorJust = SVX_HOR_JUSTIFY_STANDARD; switch( meHorAlign ) { - case xlHAlignParent: case xlHAlignGeneral: eHorJust = SVX_HOR_JUSTIFY_STANDARD; break; case xlHAlignLeft: eHorJust = SVX_HOR_JUSTIFY_LEFT; break; case xlHAlignCenterAcrSel: case xlHAlignCenter: eHorJust = SVX_HOR_JUSTIFY_CENTER; break; case xlHAlignRight: eHorJust = SVX_HOR_JUSTIFY_RIGHT; break; case xlHAlignFill: eHorJust = SVX_HOR_JUSTIFY_REPEAT; break; - case xlHAlignJustify: eHorJust = SVX_HOR_JUSTIFY_BLOCK; break; - default: - DBG_ERRORFILE( "XclImpXF::GetPattern - unknown horizontal adjustment" ); + case xlHAlignJustify: + case xlHAlignDistrib: eHorJust = SVX_HOR_JUSTIFY_BLOCK; break; + default: DBG_ERRORFILE( "XclImpXF::GetPattern - unknown horizontal adjustment" ); } rItemSet.Put( SvxHorJustifyItem( eHorJust ) ); - } - // text wrap - if( mbCellXF || (meWrap != xlTextWrapParent) ) - { + // text wrap SfxBoolItem aWrap( ATTR_LINEBREAK ); - aWrap.SetValue( meWrap == xlTextWrapYes ); + aWrap.SetValue( mbWrapped ); rItemSet.Put( aWrap ); - } - // vertical alignment - if( mbCellXF || (meVerAlign != xlVAlignParent) ) - { + // vertical alignment SvxCellVerJustify eVertJust = SVX_VER_JUSTIFY_STANDARD; switch( meVerAlign ) { - case xlVAlignParent: case xlVAlignTop: eVertJust = SVX_VER_JUSTIFY_TOP; break; case xlVAlignCenter: eVertJust = SVX_VER_JUSTIFY_CENTER; break; case xlVAlignBottom: eVertJust = SVX_VER_JUSTIFY_BOTTOM; break; case xlVAlignJustify: case xlVAlignDistrib: eVertJust = SVX_VER_JUSTIFY_TOP; break; - default: - DBG_ERRORFILE( "XclImpXF::GetPattern - unknown vertical adjustment" ); + default: DBG_ERRORFILE( "XclImpXF::GetPattern - unknown vertical adjustment" ); } rItemSet.Put( SvxVerJustifyItem( eVertJust ) ); - } - // indent - if( mnIndent > 0 ) + // indent rItemSet.Put( SfxUInt16Item( ATTR_INDENT, mnIndent ) ); - // text orientation - if( mbCellXF || (meOrient != xlTextOrientParent) ) - { - if( (meOrient == xlTextOrientRot) && (mnRotation != EXC_ROT_STACKED) ) + // text orientation + if( (meOrient == xlTextOrientRot) && (mnRotation != EXC_XF8_STACKED) ) { // set an angle in the range from -90 to 90 degrees DBG_ASSERT( mnRotation <= 180, "XclImpXF::GetPattern - illegal rotation angle" ); @@ -1101,33 +1071,27 @@ const ScPatternAttr& XclImpXF::GetPattern() SvxCellOrientation eSvxOrient = SVX_ORIENTATION_STANDARD; switch( meOrient ) { - case xlTextOrientParent: case xlTextOrientNoRot: eSvxOrient = SVX_ORIENTATION_STANDARD; break; case xlTextOrientRot: - DBG_ASSERT( mnRotation == EXC_ROT_STACKED, + DBG_ASSERT( mnRotation == EXC_XF8_STACKED, "XclImpXF::GetPattern - stacked expected (0xFF)" ); + // run through case xlTextOrientTopBottom: eSvxOrient = SVX_ORIENTATION_STACKED; break; case xlTextOrient90ccw: eSvxOrient = SVX_ORIENTATION_BOTTOMTOP; break; case xlTextOrient90cw: eSvxOrient = SVX_ORIENTATION_TOPBOTTOM; break; - default: - DBG_ERRORFILE( "XclImpXF::GetPattern - unknown text orientation" ); + default: DBG_ERRORFILE( "XclImpXF::GetPattern - unknown text orientation" ); } rItemSet.Put( SvxOrientationItem( eSvxOrient ) ); } - } - // CTL text direction - if( mbCellXF || (meTextDir != xlTextDirParent) ) - { + // CTL text direction SvxFrameDirection eFrameDir = FRMDIR_ENVIRONMENT; switch( meTextDir ) { - case xlTextDirParent: case xlTextDirContext: eFrameDir = FRMDIR_ENVIRONMENT; break; case xlTextDirLTR: eFrameDir = FRMDIR_HORI_LEFT_TOP; break; case xlTextDirRTL: eFrameDir = FRMDIR_HORI_RIGHT_TOP; break; - default: - DBG_ERRORFILE( "XclImpXF::GetPattern - unknown CTL text direction" ); + default: DBG_ERRORFILE( "XclImpXF::GetPattern - unknown CTL text direction" ); } rItemSet.Put( SvxFrameDirectionItem( eFrameDir, ATTR_WRITINGDIR ) ); } @@ -1135,26 +1099,12 @@ const ScPatternAttr& XclImpXF::GetPattern() return *mpPattern; } -XclImpXFBorder& XclImpXF::GetBorder() +SvxBorderLine* XclImpXF::CreateBorderLine( const XclImpPalette& rPalette, sal_uInt8 nXclLine, sal_uInt16 nXclColor ) { - if( !mpBorder.get() ) - mpBorder.reset( new XclImpXFBorder ); - return *mpBorder; -} - -XclImpXFArea& XclImpXF::GetArea() -{ - if( !mpArea.get() ) - mpArea.reset( new XclImpXFArea ); - return *mpArea; -} - -SvxBorderLine* XclImpXF::CreateBorderItem( const XclImpPalette& rPalette, sal_uInt8 nXclLine, sal_uInt16 nXclColor ) -{ - if( !nXclLine ) + if( nXclLine == EXC_LINE_NONE ) return NULL; - static const sal_uInt16 ppLineParam[][ 3 ] = + static const sal_uInt16 ppnLineParam[][ 3 ] = { // outer width, inner width, distance { 0, 0, 0 }, // 0 = none @@ -1173,44 +1123,37 @@ SvxBorderLine* XclImpXF::CreateBorderItem( const XclImpPalette& rPalette, sal_uI { DEF_LINE_WIDTH_2, 0, 0 } // D = med slant dashdot }; - if( nXclLine >= STATIC_TABLE_SIZE( ppLineParam ) ) - nXclLine = 1; + if( nXclLine >= STATIC_TABLE_SIZE( ppnLineParam ) ) + nXclLine = EXC_LINE_THIN; SvxBorderLine* pItem = new SvxBorderLine; pItem->SetColor( rPalette.GetColor( nXclColor, COL_BLACK ) ); - pItem->SetOutWidth( ppLineParam[ nXclLine ][ 0 ] ); - pItem->SetInWidth( ppLineParam[ nXclLine ][ 1 ] ); - pItem->SetDistance( ppLineParam[ nXclLine ][ 2 ] ); + pItem->SetOutWidth( ppnLineParam[ nXclLine ][ 0 ] ); + pItem->SetInWidth( ppnLineParam[ nXclLine ][ 1 ] ); + pItem->SetDistance( ppnLineParam[ nXclLine ][ 2 ] ); return pItem; } -void XclImpXF::SetBorder( - SfxItemSet& rItemSet, const XclImpPalette& rPalette, - sal_uInt8 nXclLeftLine, sal_uInt16 nXclLeftColor, - sal_uInt8 nXclRightLine, sal_uInt16 nXclRightColor, - sal_uInt8 nXclTopLine, sal_uInt16 nXclTopColor, - sal_uInt8 nXclBottomLine, sal_uInt16 nXclBottomColor ) +void XclImpXF::SetBorder( SfxItemSet& rItemSet, const XclImpPalette& rPalette, const XclImpXFBorder& rBorder ) { SvxBoxItem aBox( ATTR_BORDER ); - ::std::auto_ptr< SvxBorderLine > pLineItem; - pLineItem.reset( CreateBorderItem( rPalette, nXclLeftLine, nXclLeftColor ) ); - aBox.SetLine( pLineItem.get(), BOX_LINE_LEFT ); - pLineItem.reset( CreateBorderItem( rPalette, nXclRightLine, nXclRightColor ) ); - aBox.SetLine( pLineItem.get(), BOX_LINE_RIGHT ); - pLineItem.reset( CreateBorderItem( rPalette, nXclTopLine, nXclTopColor ) ); - aBox.SetLine( pLineItem.get(), BOX_LINE_TOP ); - pLineItem.reset( CreateBorderItem( rPalette, nXclBottomLine, nXclBottomColor ) ); - aBox.SetLine( pLineItem.get(), BOX_LINE_BOTTOM ); + ::std::auto_ptr< SvxBorderLine > pLine; + pLine.reset( CreateBorderLine( rPalette, rBorder.mnLeftLine, rBorder.mnLeftColor ) ); + aBox.SetLine( pLine.get(), BOX_LINE_LEFT ); + pLine.reset( CreateBorderLine( rPalette, rBorder.mnRightLine, rBorder.mnRightColor ) ); + aBox.SetLine( pLine.get(), BOX_LINE_RIGHT ); + pLine.reset( CreateBorderLine( rPalette, rBorder.mnTopLine, rBorder.mnTopColor ) ); + aBox.SetLine( pLine.get(), BOX_LINE_TOP ); + pLine.reset( CreateBorderLine( rPalette, rBorder.mnBottomLine, rBorder.mnBottomColor ) ); + aBox.SetLine( pLine.get(), BOX_LINE_BOTTOM ); rItemSet.Put( aBox ); } -void XclImpXF::SetArea( - SfxItemSet& rItemSet, const XclImpPalette& rPalette, - sal_uInt8 nXclPattern, sal_uInt16 nXclForeColor, sal_uInt16 nXclBackColor ) +void XclImpXF::SetArea( SfxItemSet& rItemSet, const XclImpPalette& rPalette, const XclImpXFArea& rArea ) { - static const sal_uInt16 pRatioTable[] = + static const sal_uInt16 pnRatioTable[] = { // 0x8000 = 100% 0x8000, 0x0000, 0x4000, 0x2000, // 00 - 03 0x6000, 0x4000, 0x4000, 0x4000, // 04 - 07 @@ -1220,23 +1163,20 @@ void XclImpXF::SetArea( }; // no background -> set nothing! - if( nXclPattern != EXC_PATT_NONE ) + if( rArea.mnPattern != EXC_PATT_NONE ) { - Color aFore( rPalette.GetColor( nXclForeColor, COL_WHITE ) ); - if( nXclForeColor == 64 ) + Color aFore( rPalette.GetColor( rArea.mnForeColor, COL_WHITE ) ); + if( rArea.mnForeColor == 64 ) aFore.SetColor( COL_BLACK ); - Color aBack( rPalette.GetColor( nXclBackColor, COL_WHITE ) ); - if( nXclBackColor == 64 ) + Color aBack( rPalette.GetColor( rArea.mnBackColor, COL_WHITE ) ); + if( rArea.mnBackColor == 64 ) aBack.SetColor( COL_BLACK ); - if( nXclPattern < STATIC_TABLE_SIZE( pRatioTable ) ) - { - sal_uInt16 nRatio = pRatioTable[ nXclPattern ]; - rItemSet.Put( SvxBrushItem( ScfTools::GetMixedColor( aFore, aBack, nRatio ) ) ); - } - else - rItemSet.Put( SvxBrushItem( aFore ) ); + if( rArea.mnPattern < STATIC_TABLE_SIZE( pnRatioTable ) ) + aFore = ScfTools::GetMixedColor( aFore, aBack, pnRatioTable[ rArea.mnPattern ] ); + + rItemSet.Put( SvxBrushItem( aFore ) ); } } @@ -1251,7 +1191,7 @@ XclImpXFBuffer::XclImpXFBuffer( const XclImpRoot& rRoot ) : void XclImpXFBuffer::ReadXF( XclImpStream& rStrm ) { - XclImpXF* pXF = new XclImpXF( *this ); + XclImpXF* pXF = new XclImpXF( GetRoot() ); pXF->ReadXF( rStrm ); maXFList.Append( pXF ); } @@ -1285,7 +1225,7 @@ void XclImpXFBuffer::ReadStyle( XclImpStream& rStrm ) } } -const ScPatternAttr& XclImpXFBuffer::GetPattern( sal_uInt32 nXFIndex ) +const ScPatternAttr& XclImpXFBuffer::GetPattern( sal_uInt32 nXFIndex ) const { XclImpXF* pXF = maXFList.GetObject( nXFIndex ); DBG_ASSERT( pXF || (GetBiff() == xlBiff2), "XclImpXFBuffer::GetPattern - XF not found" ); diff --git a/sc/source/filter/excel/xlocx.cxx b/sc/source/filter/excel/xlocx.cxx new file mode 100644 index 000000000000..77155a00028b --- /dev/null +++ b/sc/source/filter/excel/xlocx.cxx @@ -0,0 +1,286 @@ +/************************************************************************* + * + * $RCSfile: xlocx.cxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-26 18:04:37 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifdef PCH +#include "filt_pch.hxx" +#endif +#pragma hdrstop + +// ============================================================================ + +#ifndef SC_XLOCX_HXX +#include "xlocx.hxx" +#endif + +#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ +#include <com/sun/star/lang/XComponent.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif +#ifndef _COM_SUN_STAR_CONTAINER_XINDEXCONTAINER_HPP_ +#include <com/sun/star/container/XIndexContainer.hpp> +#endif +#ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGE_HPP_ +#include <com/sun/star/drawing/XDrawPage.hpp> +#endif +#ifndef _COM_SUN_STAR_DRAWING_XCONTROLSHAPE_HPP_ +#include <com/sun/star/drawing/XControlShape.hpp> +#endif +#ifndef _COM_SUN_STAR_FORM_XFORMCOMPONENT_HPP_ +#include <com/sun/star/form/XFormComponent.hpp> +#endif + +#ifndef _SVDPAGE_HXX +#include <svx/svdpage.hxx> +#endif +#ifndef _SVX_UNOAPI_HXX_ +#include <svx/unoapi.hxx> +#endif + +#ifndef SC_DOCUMENT_HXX +#include "document.hxx" +#endif +#ifndef SC_DRWLAYER_HXX +#include "drwlayer.hxx" +#endif + +#include "XclImpObjects.hxx" +#include "xcl97rec.hxx" + + +using ::com::sun::star::uno::Reference; +using ::com::sun::star::uno::Any; +using ::com::sun::star::uno::XInterface; +using ::com::sun::star::uno::UNO_QUERY; +using ::com::sun::star::container::XIndexContainer; +using ::com::sun::star::lang::XMultiServiceFactory; +using ::com::sun::star::awt::XControlModel; +using ::com::sun::star::form::XFormComponent; +using ::com::sun::star::drawing::XDrawPage; +using ::com::sun::star::drawing::XShape; +using ::com::sun::star::drawing::XControlShape; + + +#define EXC_STREAMNAME_CTLS String( RTL_CONSTASCII_USTRINGPARAM( "Ctls" ) ) + + +// OCX controls =============================================================== + +XclOcxConverter::XclOcxConverter( const XclRoot& rRoot ) : + SvxMSConvertOCXControls( rRoot.GetDocShell(), NULL ), + XclRoot( rRoot ), + mnCurrTab( 0 ), + mnCachedTab( 0 ) +{ +} + +XclOcxConverter::~XclOcxConverter() +{ +} + +void XclOcxConverter::SetCurrTab( sal_uInt16 nTab ) +{ + mnCurrTab = nTab; +} + +const Reference< XDrawPage >& XclOcxConverter::GetDrawPage() +{ + // find and cache draw page if uninitialized or sheet index has been changed + if( !xDrawPage.is() || (mnCachedTab != mnCurrTab) ) + { + if( ScDrawLayer* pDrawLayer = GetDoc().GetDrawLayer() ) + { + // mnCurrTab set in ReadControl() contains sheet index of current control + if( SdrPage* pPage = pDrawLayer->GetPage( mnCurrTab ) ) + { + xDrawPage = Reference< XDrawPage >( pPage->getUnoPage(), UNO_QUERY ); + mnCachedTab = mnCurrTab; + } + } + } + + return xDrawPage; +} + + +// ---------------------------------------------------------------------------- + +XclImpOcxConverter::XclImpOcxConverter( const XclRoot& rRoot ) : + XclOcxConverter( rRoot ) +{ + mxStrm = ScfTools::OpenStorageStreamRead( GetRootStorage(), EXC_STREAMNAME_CTLS ); +} + +void XclImpOcxConverter::ReadControl( XclImpEscherOle& rObj ) +{ + DBG_ASSERT( rObj.GetObjType() == otCtrl, "XclOcxConverter::ReadControl - no control object" ); + if( mxStrm.Is() && (rObj.GetObjType() == otCtrl) ) + { + // virtual call of GetDrawPage() needs current sheet index + SetCurrTab( rObj.GetTab() ); + + // stream position of the extra data for this control + sal_uInt32 nStrmPos = rObj.GetCtrlStreamPos(); + mxStrm->Seek( nStrmPos ); + + // the shape to fill + Reference< XShape > xShape = ::GetXShapeForSdrObject( const_cast< SdrObject* >( rObj.GetSdrObj() ) ); + + // reads from mxStrm into xShape, inserts the control into the document + if( ReadOCXExcelKludgeStream( mxStrm, &xShape, TRUE ) ) + { + if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( xShape ) ) + rObj.SetSdrObj( pSdrObj ); + } + } +} + +sal_Bool XclImpOcxConverter::InsertControl( + const Reference< XFormComponent >& rxFormComp, + const ::com::sun::star::awt::Size& rSize, + Reference< XShape >* pxShape, + BOOL bFloatingCtrl ) +{ + sal_Bool bRet = sal_False; + XShapeRef xShape; + + const Reference< XIndexContainer >& rxFormCompsIC = GetFormComps(); + const Reference< XMultiServiceFactory >& rxServiceFactory = GetServiceFactory(); + if( rxFormCompsIC.is() && rxServiceFactory.is() ) + { + Any aFormCompAny; + aFormCompAny <<= rxFormComp; + rxFormCompsIC->insertByIndex( rxFormCompsIC->getCount(), aFormCompAny ); + + // create the control shape + Reference< XInterface > xCreate = rxServiceFactory->createInstance( + String( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ControlShape" ) ) ); + xShape = Reference< XShape >( xCreate, UNO_QUERY ); + if( xShape.is() ) + { + xShape->setSize( rSize ); + // set control model at the shape + Reference< XControlShape > xControlShape( xShape, UNO_QUERY ); + Reference< XControlModel > xControlModel( rxFormComp, UNO_QUERY ); + if( xControlShape.is() && xControlModel.is() ) + { + xControlShape->setControl( xControlModel ); + if( pxShape ) + *pxShape = xShape; + bRet = sal_True; + } + } + } + + return bRet; +} + + +// ---------------------------------------------------------------------------- + +#if EXC_INCL_EXP_OCX + +XclExpOcxConverter::XclExpOcxConverter( const XclRoot& rRoot ) : + XclOcxConverter( rRoot ) +{ +} + +XclExpObjControl* XclExpOcxConverter::CreateObjRec( const Reference< XShape >& rxShape ) +{ + XclExpObjControl* pObjRec = NULL; + + // the shape to export + const SdrObject* pSdrObj = ::GetSdrObjectFromXShape( rxShape ); + Reference< XControlShape > xControlShape( rxShape, UNO_QUERY ); + + if( pSdrObj && xControlShape.is() ) + { + // the control model + Reference< XControlModel > xControlModel = xControlShape->getControl(); + if( xControlModel.is() ) + { + // output stream + if( !mxStrm.Is() ) + mxStrm = ScfTools::OpenStorageStreamWrite( GetRootStorage(), EXC_STREAMNAME_CTLS ); + if( mxStrm.Is() ) + { + String aClassName; + sal_uInt32 nStrmStart = mxStrm->Tell(); + + // writes from xControlModel into mxStrm, raw class name returned in aClassName + if( WriteOCXExcelKludgeStream( mxStrm, xControlModel, rxShape->getSize(), aClassName ) ) + { + sal_uInt32 nStrmSize = mxStrm->Tell() - nStrmStart; + // adjust the class name to "Forms.***.1" + aClassName.InsertAscii( "Forms.", 0 ).AppendAscii( ".1" ); + pObjRec = new XclExpObjControl( *this, rxShape, aClassName, nStrmStart, nStrmSize ); + } + } + } + } + return pObjRec; +} + +#endif + +// ============================================================================ + diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 3a3a998c3bf8..fcf67866f763 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xlroot.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:12:53 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,14 +111,21 @@ XclRootData::XclRootData( XclBiff eBiff, ScDocument& rDocument, const String& rB meLang( ScGlobal::eLnge ), maScMaxPos( MAXCOL, MAXROW, MAXTAB ), maXclMaxPos( EXC_MAXCOL_BIFF2, EXC_MAXROW_BIFF2, EXC_MAXTAB_BIFF2 ), + mnCharWidth( 110 ), mnScTab( 0 ), mbTruncated( false ), mpRDP( new RootData )//! { +#ifdef DBG_UTIL + mnObjCnt = 0; +#endif } XclRootData::~XclRootData() { +#ifdef DBG_UTIL + DBG_ASSERT( mnObjCnt == 0, "XclRootData::~XclRootData - wrong object count" ); +#endif } @@ -128,20 +135,30 @@ XclRoot::XclRoot( XclRootData& rRootData ) : mrData( rRootData ), mpRD( rRootData.mpRDP.get() )//! { +#ifdef DBG_UTIL + ++mrData.mnObjCnt; +#endif } XclRoot::XclRoot( const XclRoot& rRoot ) : mrData( rRoot.mrData ), mpRD( rRoot.mpRD )//! { +#ifdef DBG_UTIL + ++mrData.mnObjCnt; +#endif } XclRoot::~XclRoot() { +#ifdef DBG_UTIL + --mrData.mnObjCnt; +#endif } XclRoot& XclRoot::operator=( const XclRoot& rRoot ) { + // allowed for assignment in derived classes - but test if the same root data is used DBG_ASSERT( &mrData == &rRoot.mrData, "XclRoot::operator= - incompatible root data" ); return *this; } @@ -187,6 +204,11 @@ ScRangeName& XclRoot::GetNamedRanges() const return *GetDoc().GetRangeName(); } +SvStorage* XclRoot::GetRootStorage() const +{ + return mpRD->pRootStorage; +} + ScEditEngineDefaulter& XclRoot::GetEditEngine() const { if( !mrData.mpEditEngine.get() ) diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 150f52a5461d..ab1a70419d0c 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xlstyle.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:12:53 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,10 +116,10 @@ XclDefaultPalette::XclDefaultPalette( XclBiff eBiff ) : mnIndexOffset( 0 ) { if( eBiff != xlBiffUnknown ) - SetBiff( eBiff ); + SetDefaultColors( eBiff ); } -void XclDefaultPalette::SetBiff( XclBiff eBiff ) +void XclDefaultPalette::SetDefaultColors( XclBiff eBiff ) { switch( eBiff ) { diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 127c56376228..6183b5376e83 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xltools.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:39:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,10 +82,6 @@ #include <svx/editstat.hxx> #endif -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ -#include <com/sun/star/uno/Reference.hxx> -#endif - #ifndef SC_DOCUMENT_HXX #include "document.hxx" #endif @@ -110,13 +106,6 @@ #endif -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } - - -using ::com::sun::star::uno::Reference; -using ::com::sun::star::frame::XModel; - - // GUID import/export ========================================================= XclGuid::XclGuid() @@ -124,16 +113,12 @@ XclGuid::XclGuid() memset( mpData, 0, 16 ); } -XclGuid::XclGuid( const XclGuid& rSrc ) -{ - operator=( rSrc ); -} - XclGuid::XclGuid( sal_uInt32 nData1, sal_uInt16 nData2, sal_uInt16 nData3, sal_uInt8 nData41, sal_uInt8 nData42, sal_uInt8 nData43, sal_uInt8 nData44, sal_uInt8 nData45, sal_uInt8 nData46, sal_uInt8 nData47, sal_uInt8 nData48 ) { + // convert to little endian -> makes streaming easy LongToSVBT32( nData1, mpData ); ShortToSVBT16( nData2, mpData + 4 ); ShortToSVBT16( nData3, mpData + 6 ); @@ -147,12 +132,6 @@ XclGuid::XclGuid( mpData[ 15 ] = nData48; } -XclGuid& XclGuid::operator=( const XclGuid& rSrc ) -{ - memcpy( mpData, rSrc.mpData, 16 ); - return *this; -} - bool operator==( const XclGuid& rCmp1, const XclGuid& rCmp2 ) { return memcmp( rCmp1.mpData, rCmp2.mpData, 16 ) == 0; @@ -160,13 +139,13 @@ bool operator==( const XclGuid& rCmp1, const XclGuid& rCmp2 ) XclImpStream& operator>>( XclImpStream& rStrm, XclGuid& rGuid ) { - rStrm.Read( rGuid.mpData, 16 ); + rStrm.Read( rGuid.mpData, 16 ); // mpData always in little endian return rStrm; } XclExpStream& operator<<( XclExpStream& rStrm, const XclGuid& rGuid ) { - rStrm.Write( rGuid.mpData, 16 ); + rStrm.Write( rGuid.mpData, 16 ); // mpData already in little endian return rStrm; } @@ -238,24 +217,24 @@ bool XclTools::GetRKFromDouble( sal_Int32& rnRKValue, double fValue ) } -sal_Int32 XclTools::GetScRotation( sal_uInt16 nExcRot ) +sal_Int32 XclTools::GetScRotation( sal_uInt16 nXclRot ) { - if( nExcRot > 180 ) + if( nXclRot > 180 ) return 27000; - return static_cast< sal_Int32 >( 100 * ((nExcRot > 90) ? 450 - nExcRot : nExcRot) ); + return static_cast< sal_Int32 >( 100 * ((nXclRot > 90) ? 450 - nXclRot : nXclRot) ); } -sal_uInt16 XclTools::GetExcRotation( sal_Int32 nScRot ) +sal_uInt8 XclTools::GetXclRotation( sal_Int32 nScRot ) { - sal_Int32 nExcRot = nScRot / 100; - if( (0 <= nExcRot) && (nExcRot <= 90) ) - return static_cast< sal_uInt16 >( nExcRot ); - if( nExcRot < 180 ) - return static_cast< sal_uInt16 >( 270 - nExcRot ); - if( nExcRot < 270 ) - return static_cast< sal_uInt16 >( nExcRot - 180 ); - if( nExcRot < 360 ) - return static_cast< sal_uInt16 >( 450 - nExcRot ); + sal_Int32 nXclRot = nScRot / 100; + if( (0 <= nXclRot) && (nXclRot <= 90) ) + return static_cast< sal_uInt8 >( nXclRot ); + if( nXclRot < 180 ) + return static_cast< sal_uInt8 >( 270 - nXclRot ); + if( nXclRot < 270 ) + return static_cast< sal_uInt8 >( nXclRot - 180 ); + if( nXclRot < 360 ) + return static_cast< sal_uInt8 >( 450 - nXclRot ); return 0; } @@ -316,6 +295,19 @@ double XclTools::GetInchFromTwips( sal_uInt16 nTwips ) } +sal_uInt16 XclTools::GetScColumnWidth( sal_uInt16 nXclWidth, long nScCharWidth ) +{ + double fScWidth = static_cast< double >( nXclWidth ) / 256.0 * nScCharWidth + 0.5; + return static_cast< sal_uInt16 >( ::std::min( fScWidth, 65535.0 ) ); +} + +sal_uInt16 XclTools::GetXclColumnWidth( sal_uInt16 nScWidth, long nScCharWidth ) +{ + double fXclWidth = static_cast< double >( nScWidth ) * 256.0 / nScCharWidth + 0.5; + return static_cast< sal_uInt16 >( ::std::min( fXclWidth, 65535.0 ) ); +} + + // built-in names ------------------------------------------------------------- static const sal_Char* ppNames[] = @@ -422,7 +414,7 @@ bool XclTools::GetScLanguage( LanguageType& reScLang, sal_uInt16 nXclCountry ) { const XclLanguageEntry* pLast = pLanguages + STATIC_TABLE_SIZE( pLanguages ); const XclLanguageEntry* pResult = ::std::lower_bound( pLanguages, pLast, nXclCountry, XclLanguageEntrySWO() ); - if( pResult != pLast ) + if( (pResult != pLast) && (pResult->mnXclCountry == nXclCountry) ) { reScLang = pResult->meLanguage; return true; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 66f30846266c..560d29d700cd 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fapihelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:09:09 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,8 +105,10 @@ bool getPropAny( Any& rAny, const Reference< XPropertySet >& rxProp, const OUStr { Reference< XPropertySetInfo > xInfo = rxProp->getPropertySetInfo(); if( xInfo.is() && xInfo->hasPropertyByName( rName ) ) + { rAny = rxProp->getPropertyValue( rName ); - bSuccess = true; + bSuccess = true; + } } catch( Exception& ) { diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index 4f9ccda49500..4aea61460bad 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fprogressbar.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:09:09 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,11 @@ // ============================================================================ +const sal_Int32 SCF_INVALID_SEG = -1; + + +// ============================================================================ + ScfProgressBar::ScfProgressSegment::ScfProgressSegment( sal_uInt32 nSize ) : mpProgress( NULL ), mnSize( nSize ), @@ -95,40 +100,41 @@ ScfProgressBar::ScfProgressSegment::~ScfProgressSegment() // ============================================================================ -ScfProgressBar::ScfProgressBar( const String& rText ) : - maText( rText ), - mpSysProgress( NULL ), - mpParentProgress( NULL ), - mpParentSegment( NULL ), - mpCurrSegment( NULL ), - mnTotalSize( 0 ), - mnTotalPos( 0 ), - mnUnitSize( 0 ), - mnNextUnitPos( 0 ), - mbInProgress( false ) +ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, const String& rText ) : + maText( rText ) +{ + Init( pDocShell ); +} + +ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ) : + maText( ScGlobal::GetRscString( nResId ) ) { + Init( pDocShell ); } -ScfProgressBar::ScfProgressBar( ScfProgressBar* pParProgress, ScfProgressSegment* pParSegment ) : - mpSysProgress( NULL ), - mpParentProgress( pParProgress ), - mpParentSegment( pParSegment ), - mpCurrSegment( NULL ), - mnTotalSize( 0 ), - mnTotalPos( 0 ), - mnUnitSize( 0 ), - mnNextUnitPos( 0 ), - mbInProgress( false ) +ScfProgressBar::ScfProgressBar( ScfProgressBar& rParProgress, ScfProgressSegment* pParSegment ) { + Init( rParProgress.mpDocShell ); + mpParentProgress = &rParProgress; + mpParentSegment = pParSegment; } ScfProgressBar::~ScfProgressBar() { } -ScfProgressBar::ScfProgressSegment* ScfProgressBar::GetSegment( sal_uInt32 nSegment ) const +void ScfProgressBar::Init( SfxObjectShell* pDocShell ) +{ + mpDocShell = pDocShell; + mpParentProgress = NULL; + mpParentSegment = mpCurrSegment = NULL; + mnTotalSize = mnTotalPos = mnUnitSize = mnNextUnitPos = 0; + mbInProgress = false; +} + +ScfProgressBar::ScfProgressSegment* ScfProgressBar::GetSegment( sal_Int32 nSegment ) const { - if( nSegment == ~0UL ) + if( nSegment < 0 ) return NULL; DBG_ASSERT( maSegments.GetObject( nSegment ), "ScfProgressBar::GetSegment - invalid segment index" ); return maSegments.GetObject( nSegment ); @@ -143,7 +149,7 @@ void ScfProgressBar::SetCurrSegment( ScfProgressSegment* pSegment ) if( mpParentProgress && mpParentSegment ) mpParentProgress->SetCurrSegment( mpParentSegment ); else if( !mpSysProgress.get() && mnTotalSize ) - mpSysProgress.reset( new ScProgress( NULL, maText, mnTotalSize ) ); + mpSysProgress.reset( new ScProgress( mpDocShell, maText, mnTotalSize ) ); if( !mbInProgress && mpCurrSegment && mnTotalSize ) { @@ -181,26 +187,31 @@ void ScfProgressBar::IncreaseProgressBar( sal_uInt32 nDelta ) mnTotalPos = nNewPos; } -sal_uInt32 ScfProgressBar::AddSegment( sal_uInt32 nSize ) +sal_Int32 ScfProgressBar::AddSegment( sal_uInt32 nSize ) { DBG_ASSERT( !mbInProgress, "ScfProgressBar::AddSegment - already in progress mode" ); if( !nSize ) - return ~0UL; + return SCF_INVALID_SEG; maSegments.Append( new ScfProgressSegment( nSize ) ); mnTotalSize += nSize; return maSegments.Count() - 1; } -ScfProgressBar& ScfProgressBar::GetSegmentProgressBar( sal_uInt32 nSegment ) +ScfProgressBar& ScfProgressBar::GetSegmentProgressBar( sal_Int32 nSegment ) { ScfProgressSegment* pSegment = GetSegment( nSegment ); - if( pSegment && !pSegment->mpProgress.get() ) - pSegment->mpProgress.reset( new ScfProgressBar( this, pSegment ) ); - return pSegment ? *pSegment->mpProgress : *this; + DBG_ASSERT( !pSegment || !pSegment->mnPos, "ScfProgressBar::GetSegmentProgressBar - segment already started" ); + if( pSegment && !pSegment->mnPos ) + { + if( !pSegment->mpProgress.get() ) + pSegment->mpProgress.reset( new ScfProgressBar( *this, pSegment ) ); + return *pSegment->mpProgress; + } + return *this; } -void ScfProgressBar::ActivateSegment( sal_uInt32 nSegment ) +void ScfProgressBar::ActivateSegment( sal_Int32 nSegment ) { DBG_ASSERT( mnTotalSize, "ScfProgressBar::ActivateSegment - progress range is zero" ); if( mnTotalSize ) @@ -212,6 +223,7 @@ void ScfProgressBar::Progress( sal_uInt32 nPos ) DBG_ASSERT( mbInProgress && mpCurrSegment, "ScfProgressBar::Progress - no segment started" ); if( mpCurrSegment ) { + DBG_ASSERT( !mpCurrSegment->mpProgress.get(), "ScfProgressBar::Progress - contains sub progress" ); DBG_ASSERT( mpCurrSegment->mnPos <= nPos, "ScfProgressBar::Progress - delta pos < 0" ); DBG_ASSERT( nPos <= mpCurrSegment->mnSize, "ScfProgressBar::Progress - segment overflow" ); if( (mpCurrSegment->mnPos < nPos) && (nPos <= mpCurrSegment->mnSize) ) @@ -230,3 +242,56 @@ void ScfProgressBar::Progress() // ============================================================================ +ScfSimpleProgressBar::ScfSimpleProgressBar( sal_uInt32 nSize, SfxObjectShell* pDocShell, const String& rText ) : + maProgress( pDocShell, rText ) +{ + Init( nSize ); +} + +ScfSimpleProgressBar::ScfSimpleProgressBar( sal_uInt32 nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ) : + maProgress( pDocShell, nResId ) +{ + Init( nSize ); +} + +void ScfSimpleProgressBar::Init( sal_uInt32 nSize ) +{ + sal_Int32 nSegment = maProgress.AddSegment( nSize ); + if( nSegment >= 0 ) + maProgress.ActivateSegment( nSegment ); +} + + +// ============================================================================ + +ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ) : + mrStrm( rStrm ) +{ + Init( pDocShell, rText ); +} + +ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, sal_uInt16 nResId ) : + mrStrm( rStrm ) +{ + Init( pDocShell, ScGlobal::GetRscString( nResId ) ); +} + +void ScfStreamProgressBar::Progress() +{ + mpProgress->Progress( mrStrm.Tell() ); +} + +void ScfStreamProgressBar::Init( SfxObjectShell* pDocShell, const String& rText ) +{ + sal_uInt32 nPos = mrStrm.Tell(); + mrStrm.Seek( STREAM_SEEK_TO_END ); + sal_uInt32 nSize = mrStrm.Tell(); + mrStrm.Seek( nPos ); + + mpProgress.reset( new ScfSimpleProgressBar( nSize, pDocShell, rText ) ); + Progress(); +} + + +// ============================================================================ + diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index aca8c1686fa1..71b65cbfb347 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ftools.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:09:10 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,9 @@ #include "ftools.hxx" #endif +#ifndef _SVSTOR_HXX +#include <so3/svstor.hxx> +#endif #ifndef _UNOTOOLS_CHARCLASS_HXX #include <unotools/charclass.hxx> #endif @@ -80,6 +83,9 @@ #ifndef SC_SCGLOB_HXX #include "global.hxx" #endif +#ifndef SC_COMPILER_HXX +#include "compiler.hxx" +#endif #include "excdefs.hxx" @@ -225,39 +231,44 @@ void ScfTools::EraseQuotes( String& rString, sal_Unicode cQuote ) // *** conversion of names *** ------------------------------------------------ -void ScfTools::ConvertName( String& rName, bool bCheckPeriod ) +void ScfTools::ConvertToScSheetName( String& rName ) { - if( !rName.Len() ) return; + for( xub_StrLen nPos = 0, nLen = rName.Len(); nPos < nLen; ++nPos ) + { + sal_Unicode cChar = rName.GetChar( nPos ); + bool bSpace = (cChar == ' '); + if( (!ScGlobal::pCharClass->isLetterNumeric( rName, nPos ) && !bSpace) || (!nPos && bSpace) ) + rName.SetChar( nPos, '_' ); + } +} - const sal_Unicode cUnderSc = '_'; - const sal_Unicode cBlank = ' '; - const sal_Unicode cPoint = '.'; +void ScfTools::ConvertToScDefinedName( String& rName ) +{ + xub_StrLen nLen = rName.Len(); + if( nLen && !ScCompiler::IsCharWordChar( rName.GetChar( 0 ) ) ) + rName.SetChar( 0, '_' ); + for( xub_StrLen nPos = 1; nPos < nLen; ++nPos ) + if( !ScCompiler::IsWordChar( rName.GetChar( nPos ) ) ) + rName.SetChar( nPos, '_' ); +} - String aNewTable; - bool bSpace = false; - for( const sal_Unicode* pChar = rName.GetBuffer(); *pChar; pChar++ ) - { - if( !(ScGlobal::pCharClass->isLetterNumeric( rName, pChar - rName.GetBuffer() ) || - (*pChar == cUnderSc) || (*pChar == cBlank) || (bCheckPeriod && (*pChar == cPoint))) ) - { - aNewTable += cUnderSc; - bSpace = false; - } - else if( *pChar == cBlank ) - { - if( bSpace ) - aNewTable += cUnderSc; - else - bSpace = true; - } - else - { - aNewTable += *pChar; - bSpace = false; - } - } - rName = aNewTable; +// *** streams and storages *** ----------------------------------------------- + +const SvStorageStreamRef ScfTools::OpenStorageStreamRead( SvStorage* pStorage, const String& rStrmName ) +{ + SvStorageStreamRef xStrm; + if( pStorage && pStorage->IsContained( rStrmName ) && pStorage->IsStream( rStrmName ) ) + xStrm = pStorage->OpenStream( rStrmName, STREAM_READ | STREAM_SHARE_DENYALL ); + return xStrm; +} + +const SvStorageStreamRef ScfTools::OpenStorageStreamWrite( SvStorage* pStorage, const String& rStrmName ) +{ + SvStorageStreamRef xStrm; + if( pStorage ) + xStrm = pStorage->OpenStream( rStrmName/*, STREAM_READWRITE | STREAM_TRUNC*/ ); + return xStrm; } @@ -316,36 +327,66 @@ void ScfTools::AppendCString( SvStream& rStrm, String& rString, CharSet eSrc ) // *** HTML table names <-> named range names *** ----------------------------- -const String ScfTools::maHTMLDoc( RTL_CONSTASCII_USTRINGPARAM( "HTML_all" ) ); -const String ScfTools::maHTMLTables( RTL_CONSTASCII_USTRINGPARAM( "HTML_tables" ) ); -const String ScfTools::maHTMLTableIndex( RTL_CONSTASCII_USTRINGPARAM( "HTML_" ) ); -const String ScfTools::maHTMLTableName( RTL_CONSTASCII_USTRINGPARAM( "HTML__" ) ); +const String& ScfTools::GetHTMLDocName() +{ + static const String saHTMLDoc( RTL_CONSTASCII_USTRINGPARAM( "HTML_all" ) ); + return saHTMLDoc; +} + +const String& ScfTools::GetHTMLTablesName() +{ + static const String saHTMLTables( RTL_CONSTASCII_USTRINGPARAM( "HTML_tables" ) ); + return saHTMLTables; +} + +const String& ScfTools::GetHTMLIndexPrefix() +{ + static const String saHTMLIndexPrefix( RTL_CONSTASCII_USTRINGPARAM( "HTML_" ) ); + return saHTMLIndexPrefix; + +} + +const String& ScfTools::GetHTMLNamePrefix() +{ + static const String saHTMLNamePrefix( RTL_CONSTASCII_USTRINGPARAM( "HTML__" ) ); + return saHTMLNamePrefix; +} String ScfTools::GetNameFromHTMLIndex( sal_uInt32 nIndex ) { - String aName( maHTMLTableIndex ); + String aName( GetHTMLIndexPrefix() ); aName += String::CreateFromInt32( static_cast< sal_Int32 >( nIndex ) ); return aName; } String ScfTools::GetNameFromHTMLName( const String& rTabName ) { - String aName( maHTMLTableName ); + String aName( GetHTMLNamePrefix() ); aName += rTabName; return aName; } +bool ScfTools::IsHTMLDocName( const String& rSource ) +{ + return rSource.EqualsIgnoreCaseAscii( GetHTMLDocName() ) == TRUE; +} + +bool ScfTools::IsHTMLTablesName( const String& rSource ) +{ + return rSource.EqualsIgnoreCaseAscii( GetHTMLTablesName() ) == TRUE; +} + bool ScfTools::GetHTMLNameFromName( const String& rSource, String& rName ) { rName.Erase(); - if( rSource.EqualsIgnoreCaseAscii( maHTMLTableName, 0, maHTMLTableName.Len() ) ) + if( rSource.EqualsIgnoreCaseAscii( GetHTMLNamePrefix(), 0, GetHTMLNamePrefix().Len() ) ) { - rName = rSource.Copy( maHTMLTableName.Len() ); + rName = rSource.Copy( GetHTMLNamePrefix().Len() ); AddQuotes( rName ); } - else if( rSource.EqualsIgnoreCaseAscii( maHTMLTableIndex, 0, maHTMLTableIndex.Len() ) ) + else if( rSource.EqualsIgnoreCaseAscii( GetHTMLIndexPrefix(), 0, GetHTMLIndexPrefix().Len() ) ) { - String aIndex( rSource.Copy( maHTMLTableIndex.Len() ) ); + String aIndex( rSource.Copy( GetHTMLIndexPrefix().Len() ) ); if( CharClass::isAsciiNumeric( aIndex ) && (aIndex.ToInt32() > 0) ) rName = aIndex; } diff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mk index f4265fc0558e..0c36c6101a47 100644 --- a/sc/source/filter/ftools/makefile.mk +++ b/sc/source/filter/ftools/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: dr $ $Date: 2002-11-21 12:09:10 $ +# last change: $Author: hr $ $Date: 2003-03-26 18:04:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 99f8ad890af2..9e8555e0f7b4 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlimp.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:17:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -139,7 +139,10 @@ ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const ScRange& rRange, BOOL bCalc aPageSize = pDefaultDev->LogicToPixel( SvxPaperInfo::GetPaperSize( SVX_PAPER_A4 ), MapMode( MAP_TWIP ) ); } - pParser = new ScHTMLParser( pEngine, aPageSize, pDocP, bCalcWidthHeight ); + if( bCalcWidthHeight ) + pParser = new ScHTMLLayoutParser( pEngine, aPageSize, pDocP ); + else + pParser = new ScHTMLQueryParser( pEngine, pDocP ); } @@ -167,12 +170,12 @@ void ScHTMLImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor ) ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor ); const ScHTMLParser* pParser = GetParser(); - ScHTMLTableDataTable* pHTMLTables = pParser->GetHTMLTables(); - if( !pHTMLTables ) + const ScHTMLTable* pGlobTable = pParser->GetGlobalTable(); + if( !pGlobTable ) return; // set cell borders for HTML table cells - pHTMLTables->SetCellBorders( pDoc, aRange.aStart ); + pGlobTable->ApplyCellBorders( pDoc, aRange.aStart ); // correct cell borders for merged cells for ( ScEEParseEntry* pEntry = pParser->First(); pEntry; pEntry = pParser->Next() ) @@ -209,10 +212,8 @@ void ScHTMLImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor ) // create ranges for HTML tables // 1 - entire document ScRange aNewRange( aRange.aStart ); - USHORT nColDim, nRowDim; - pParser->GetDimensions( nColDim, nRowDim ); - aNewRange.aEnd.IncCol( nColDim - 1 ); - aNewRange.aEnd.IncRow( nRowDim - 1 ); + aNewRange.aEnd.IncCol( pGlobTable->GetDocSize( tdCol ) - 1 ); + aNewRange.aEnd.IncRow( pGlobTable->GetDocSize( tdRow ) - 1 ); InsertRangeName( pDoc, ScfTools::GetHTMLDocName(), aNewRange ); // 2 - all tables @@ -223,14 +224,14 @@ void ScHTMLImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor ) short nRowDiff = (short)aRange.aStart.Row(); short nTabDiff = (short)aRange.aStart.Tab(); - ScHTMLTableData* pTable = NULL; - ULONG nTab = 0; - while( pTable = pHTMLTables->GetTable( ++nTab ) ) + ScHTMLTable* pTable = NULL; + ScHTMLTableId nTableId = SC_HTML_GLOBAL_TABLE; + while( pTable = pGlobTable->FindNestedTable( ++nTableId ) ) { - pTable->GetRange( aNewRange ); + pTable->GetDocRange( aNewRange ); aNewRange.Move( nColDiff, nRowDiff, nTabDiff ); // insert table number as name - InsertRangeName( pDoc, ScfTools::GetNameFromHTMLIndex( nTab ), aNewRange ); + InsertRangeName( pDoc, ScfTools::GetNameFromHTMLIndex( nTableId ), aNewRange ); // insert table id as name if( pTable->GetTableName().Len() ) { diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 01405399551f..984b657880b2 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlpars.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: er $ $Date: 2002-10-01 19:10:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,8 @@ //------------------------------------------------------------------------ +#include <boost/shared_ptr.hpp> + #define SC_HTMLPARS_CXX #include "scitems.hxx" #include <svx/eeitem.hxx> @@ -120,344 +122,39 @@ #include "flttools.hxx" #include "document.hxx" #include "rangelst.hxx" +#include "ftools.hxx" SV_IMPL_VARARR_SORT( ScHTMLColOffset, ULONG ); -//------------------------------------------------------------------------ - -ScHTMLTableData::ScHTMLTableData( - const String& rTabName, USHORT _nFirstCol, USHORT _nFirstRow, - USHORT _nColSpan, USHORT _nRowSpan, BOOL bBorder ) : - aTableName( rTabName ), - nFirstCol( _nFirstCol ), - nFirstRow( _nFirstRow ), - nLastCol( _nFirstCol ), - nLastRow( _nFirstRow ), - nColSpan( _nColSpan ), - nRowSpan( _nRowSpan ), - nDocCol( _nFirstCol ), - nDocRow( _nFirstRow ), - bBorderOn( bBorder ), - pNestedTables( NULL ) -{ -} - -ScHTMLTableData::~ScHTMLTableData() -{ - if( pNestedTables ) - delete pNestedTables; -} - -USHORT ScHTMLTableData::GetCount( const Table& rTab, ULONG nIndex ) -{ - USHORT nCount = (USHORT)(ULONG) rTab.Get( nIndex ); - return Max( nCount, (USHORT)1 ); // width/height is at least 1 cell -} - -USHORT ScHTMLTableData::GetSize( const Table& rDataTab, ULONG nStart, ULONG nEnd ) -{ - USHORT nSize = 0; - for( ULONG nIndex = nStart; nIndex <= nEnd; nIndex++ ) - nSize += GetCount( rDataTab, nIndex ); - return nSize; -} - -USHORT ScHTMLTableData::CalcDocPos( ScHTMLTableDataKey eCRKey, ULONG nIndex ) const -{ - USHORT nFirst = GetFirst( eCRKey ); - return GetDocPos( eCRKey ) + ((nFirst < nIndex) ? GetSize( GetDataTable( eCRKey ), nFirst, nIndex - 1 ) : 0); -} -USHORT ScHTMLTableData::CalcSpan( ScHTMLTableDataKey eCRKey, ULONG nIndex, USHORT nSpan ) const -{ - return GetSize( GetDataTable( eCRKey ), nIndex, nIndex + nSpan - 1 ); -} - -void ScHTMLTableData::GetRange( ScRange& rRange ) const -{ - USHORT nCol = CalcDocCol( nFirstCol ); - USHORT nRow = CalcDocRow( nFirstRow ); - rRange.aStart.Set( nCol, nRow, 0 ); - rRange.aEnd.Set( nCol + GetSize( tdCol ) - 1, nRow + GetSize( tdRow ) - 1, 0 ); -} +// ============================================================================ +// BASE class for HTML parser classes +// ============================================================================ -ScHTMLTableData* ScHTMLTableData::GetNestedTable( ULONG nTab ) const +ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ) : + ScEEParser( pEditEngine ), + mpDoc( pDoc ) { - return pNestedTables ? pNestedTables->GetTable( nTab ) : NULL; -} - -void ScHTMLTableData::SetMaxCount( Table& rDataTab, ULONG nIndex, USHORT nCount ) -{ - if( GetCount( rDataTab, nIndex ) < nCount ) - { - if( rDataTab.IsKeyValid( nIndex ) ) - rDataTab.Replace( nIndex, (void*) nCount ); - else - rDataTab.Insert( nIndex, (void*) nCount ); - } -} - -ScHTMLTableData* ScHTMLTableData::InsertNestedTable( - ULONG nTab, const String& rTabName, USHORT _nFirstCol, USHORT _nFirstRow, - USHORT _nColSpan, USHORT _nRowSpan, BOOL bBorder ) -{ - if( !pNestedTables ) - pNestedTables = new ScHTMLTableDataTable; - return pNestedTables->InsertTable( nTab, rTabName, _nFirstCol, _nFirstRow, _nColSpan, _nRowSpan, bBorder ); -} - -void ScHTMLTableData::ChangeDocCoord( short nColDiff, short nRowDiff ) -{ - nDocCol += nColDiff; - nDocRow += nRowDiff; - if( pNestedTables ) - for( ScHTMLTableData* pTable = pNestedTables->GetFirst(); pTable; pTable = pNestedTables->GetNext() ) - pTable->ChangeDocCoord( nColDiff, nRowDiff ); -} - -void ScHTMLTableData::SetDocCoord( USHORT nCol, USHORT nRow ) -{ - short nColDiff = nCol - nFirstCol; - short nRowDiff = nRow - nFirstRow; - ChangeDocCoord( nColDiff, nRowDiff ); -} - -void ScHTMLTableData::RecalcSizeDim( ScHTMLTableDataKey eCRKey ) -{ - if( !pNestedTables ) return; - for( ScHTMLTableData* pTable = pNestedTables->GetFirstInOrder( eCRKey ); - pTable; pTable = pNestedTables->GetNextInOrder() ) - { - USHORT nIndex = pTable->GetFirst( eCRKey ); - USHORT nSpan = pTable->GetSpan( eCRKey ); - USHORT nSize = pTable->GetSize( eCRKey ); - Table& rDataTab = GetDataTable( eCRKey ); - while( nSpan > 1 ) - { - nSize -= Min( nSize, GetCount( rDataTab, nIndex ) ); - nIndex++; - nSpan--; - } - SetMaxCount( rDataTab, nIndex, nSize ); - } -} - -void ScHTMLTableData::RecalcSize() -{ - if( !pNestedTables ) return; - pNestedTables->RecalcSizes(); - // all nested tables have the right size now -> calculate it for this table - RecalcSizeDim( tdCol ); - RecalcSizeDim( tdRow ); - // set correct position of nested tables inside of THIS table - for( ScHTMLTableData* pTable = pNestedTables->GetFirst(); pTable; pTable = pNestedTables->GetNext() ) - pTable->SetDocCoord( CalcDocCol( pTable->GetFirstCol() ), CalcDocRow( pTable->GetFirstRow() ) ); -} - -void ScHTMLTableData::SetCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos ) -{ - if( bBorderOn ) - { - const USHORT nOuterLine = DEF_LINE_WIDTH_2; - const USHORT nInnerLine = DEF_LINE_WIDTH_0; - SvxBorderLine aOuterLine, aInnerLine; - aOuterLine.SetColor( Color( COL_BLACK ) ); - aOuterLine.SetOutWidth( nOuterLine ); - aInnerLine.SetColor( Color( COL_BLACK ) ); - aInnerLine.SetOutWidth( nInnerLine ); - SvxBoxItem aBorderItem; - - for( USHORT nCol = nFirstCol; nCol <= nLastCol; nCol++ ) - { - SvxBorderLine* pLeftLine = (nCol == nFirstCol) ? &aOuterLine : &aInnerLine; - SvxBorderLine* pRightLine = (nCol == nLastCol) ? &aOuterLine : &aInnerLine; - USHORT nCellCol1 = CalcDocCol( nCol ) + rFirstPos.Col(); - USHORT nCellCol2 = nCellCol1 + GetCount( aColCount, nCol ) - 1; - for( USHORT nRow = nFirstRow; nRow <= nLastRow; nRow++ ) - { - SvxBorderLine* pTopLine = (nRow == nFirstRow) ? &aOuterLine : &aInnerLine; - SvxBorderLine* pBottomLine = (nRow == nLastRow) ? &aOuterLine : &aInnerLine; - USHORT nCellRow1 = CalcDocRow( nRow ) + rFirstPos.Row(); - USHORT nCellRow2 = nCellRow1 + GetCount( aRowCount, nRow ) - 1; - for( USHORT nCellCol = nCellCol1; nCellCol <= nCellCol2; nCellCol++ ) - { - aBorderItem.SetLine( (nCellCol == nCellCol1) ? pLeftLine : NULL, BOX_LINE_LEFT ); - aBorderItem.SetLine( (nCellCol == nCellCol2) ? pRightLine : NULL, BOX_LINE_RIGHT ); - for( USHORT nCellRow = nCellRow1; nCellRow <= nCellRow2; nCellRow++ ) - { - aBorderItem.SetLine( (nCellRow == nCellRow1) ? pTopLine : NULL, BOX_LINE_TOP ); - aBorderItem.SetLine( (nCellRow == nCellRow2) ? pBottomLine : NULL, BOX_LINE_BOTTOM ); - pDoc->ApplyAttr( nCellCol, nCellRow, rFirstPos.Tab(), aBorderItem ); - } - } - } - } - } - - if( pNestedTables ) - pNestedTables->SetCellBorders( pDoc, rFirstPos ); -} - - - -ScHTMLTableDataTable::ScHTMLTableDataTable() : - pCurrTab( NULL ), - nCurrTab( 0 ) -{ -} - -ScHTMLTableDataTable::~ScHTMLTableDataTable() -{ - for( ScHTMLTableData* pData = GetFirst(); pData; pData = GetNext() ) - delete pData; -} - -ScHTMLTableData* ScHTMLTableDataTable::GetTable( ULONG nTab ) -{ - if( nTab == nCurrTab ) - return pCurrTab; - if( !nTab ) - return NULL; - - ScHTMLTableData* pTable = _Get( nTab ); - if( pTable ) - { - SetCurrTable( nTab, pTable ); - return pTable; - } - - ScHTMLTableData* pNested = NULL; - for( pTable = GetFirst(); pTable; pTable = GetNext() ) - { - pNested = pTable->GetNestedTable( nTab ); - if( pNested ) - { - SetCurrTable( nTab, pNested ); - return pNested; - } - } - return NULL; -} - -ScHTMLTableData* ScHTMLTableDataTable::GetFirstInOrder( ScHTMLTableDataKey eKey ) -{ - nSearchMin1 = nSearchMin2 = 0; - eSearchKey = eKey; - return GetNextInOrder(); -} - -ScHTMLTableData* ScHTMLTableDataTable::GetNextInOrder() -{ - ScHTMLTableDataKey eOppKey = (eSearchKey == tdCol) ? tdRow : tdCol; - ScHTMLTableData* pTableFound = NULL; - USHORT nFoundPos1 = (USHORT)~0; - USHORT nFoundPos2 = (USHORT)~0; - - for( ScHTMLTableData* pTable = GetFirst(); pTable; pTable = GetNext() ) - { - USHORT nTablePos1 = pTable->GetFirst( eSearchKey ) + pTable->GetSpan( eSearchKey ) - 1; - USHORT nTablePos2 = pTable->GetFirst( eOppKey ); - if( ((nTablePos1 > nSearchMin1) || ((nTablePos1 == nSearchMin1) && (nTablePos2 > nSearchMin2))) && - ((nTablePos1 < nFoundPos1) || ((nTablePos1 == nFoundPos1) && (nTablePos2 < nFoundPos2))) ) - { // position of this table is between min position and last found position - pTableFound = pTable; - nFoundPos1 = nTablePos1; - nFoundPos2 = nTablePos2; - } - } - nSearchMin1 = nFoundPos1; - nSearchMin2 = nFoundPos2; - return pTableFound; -} - -USHORT ScHTMLTableDataTable::GetNextFreeRow( ULONG nTab ) -{ - ScHTMLTableData* pTable = _Get( nTab ); - if( pTable ) - return pTable->GetFirstRow() + pTable->GetSize( tdRow ); - - for( pTable = GetFirst(); pTable; pTable = GetNext() ) - if( pTable->GetNestedTable( nTab ) ) - return pTable->GetFirstRow() + pTable->GetSize( tdRow ); - - return 0; -} - -ScHTMLTableData* ScHTMLTableDataTable::InsertTable( - ULONG nTab, const String& rTabName, USHORT nFirstCol, USHORT nFirstRow, - USHORT nColSpan, USHORT nRowSpan, BOOL bBorder, ULONG nNestedIn ) -{ - ScHTMLTableData* pTable = GetTable( nTab ); - // table already exists - if( pTable ) - return pTable; - // insert in nested table - if( nNestedIn ) - { - pTable = GetTable( nNestedIn ); - if( pTable ) - { - ScHTMLTableData* pNewTab = pTable->InsertNestedTable( - nTab, rTabName, nFirstCol, nFirstRow, nColSpan, nRowSpan, bBorder ); - SetCurrTable( nTab, pNewTab ); - return pNewTab; - } - } - // insert in this table - _Insert( nTab, pTable = new ScHTMLTableData( - rTabName, nFirstCol, nFirstRow, nColSpan, nRowSpan, bBorder ) ); - SetCurrTable( nTab, pTable ); - return pTable; -} - -void ScHTMLTableDataTable::SetCellCoord( ULONG nTab, USHORT nCol, USHORT nRow ) -{ - ScHTMLTableData* pTable = GetTable( nTab ); - if( pTable ) - pTable->SetCellCoord( nCol, nRow ); -} - -void ScHTMLTableDataTable::RecalcSizes() -{ - for( ScHTMLTableData* pTable = GetFirst(); pTable; pTable = GetNext() ) - pTable->RecalcSize(); + OfaHtmlOptions* pHtmlOptions = ((OfficeApplication*)SFX_APP())->GetHtmlOptions(); + for( sal_uInt16 nIndex = 0; nIndex < SC_HTML_FONTSIZES; ++nIndex ) + maFontHeights[ nIndex ] = pHtmlOptions->GetFontSize( nIndex ) * 20; } -void ScHTMLTableDataTable::Recalc() +ScHTMLParser::~ScHTMLParser() { - // table sizes - RecalcSizes(); - // table positions (move tables down) - USHORT nDocRow; - USHORT nRowDiff = 0; - for( ScHTMLTableData* pTable = GetFirst(); pTable; pTable = GetNext() ) - { - nDocRow = pTable->GetFirstRow() + nRowDiff; - pTable->SetDocCoord( pTable->GetFirstCol(), nDocRow ); - nRowDiff += (pTable->GetSize( tdRow ) + pTable->GetFirstRow() - pTable->GetLastRow() - 1); - } } -void ScHTMLTableDataTable::SetCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos ) -{ - DBG_ASSERT( pDoc, "ScHTMLTableDataTable::SetCellBorders - no document" ); - for( ScHTMLTableData* pTable = GetFirst(); pTable; pTable = GetNext() ) - pTable->SetCellBorders( pDoc, rFirstPos ); -} -//------------------------------------------------------------------------ +// ============================================================================ -ScHTMLParser::ScHTMLParser( EditEngine* pEditP, const Size& aPageSizeP, - ScDocument* pDocP, BOOL _bCalcWidthHeight ) : - ScEEParser( pEditP ), +ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const Size& aPageSizeP, ScDocument* pDocP ) : + ScHTMLParser( pEditP, pDocP ), aPageSize( aPageSizeP ), xLockedList( new ScRangeList ), - pDoc( pDocP ), pTables( NULL ), - pTableData( _bCalcWidthHeight ? NULL : new ScHTMLTableDataTable ), - pColOffset( _bCalcWidthHeight ? new ScHTMLColOffset : NULL ), - pLocalColOffset( _bCalcWidthHeight ? new ScHTMLColOffset : NULL ), + pColOffset( new ScHTMLColOffset ), + pLocalColOffset( new ScHTMLColOffset ), nFirstTableCell(0), nTableLevel(0), nTable(0), @@ -468,29 +165,17 @@ ScHTMLParser::ScHTMLParser( EditEngine* pEditP, const Size& aPageSizeP, nColOffset(0), nColOffsetStart(0), nMetaCnt(0), - bCalcWidthHeight( _bCalcWidthHeight ), bTabInTabCell( FALSE ), bFirstRow( TRUE ), bInCell( FALSE ), bInTitle( FALSE ) { - // neue Konfiguration setzen - OfaHtmlOptions* pHtmlOptions = ((OfficeApplication*)SFX_APP())->GetHtmlOptions(); - for ( USHORT j=0; j < SC_HTML_FONTSIZES; j++ ) - { - // in Twips merken, wie unser SvxFontHeightItem - aFontHeights[j] = pHtmlOptions->GetFontSize( j ) * 20; - } - - if( bCalcWidthHeight ) - { - MakeColNoRef( pLocalColOffset, 0, 0, 0, 0 ); - MakeColNoRef( pColOffset, 0, 0, 0, 0 ); - } + MakeColNoRef( pLocalColOffset, 0, 0, 0, 0 ); + MakeColNoRef( pColOffset, 0, 0, 0, 0 ); } -ScHTMLParser::~ScHTMLParser() +ScHTMLLayoutParser::~ScHTMLLayoutParser() { ScHTMLTableStackEntry* pS; while ( pS = aTableStack.Pop() ) @@ -511,17 +196,15 @@ ScHTMLParser::~ScHTMLParser() delete pT; delete pTables; } - if ( pTableData ) - delete pTableData; } -ULONG ScHTMLParser::Read( SvStream& rStream ) +ULONG ScHTMLLayoutParser::Read( SvStream& rStream ) { Link aOldLink = pEdit->GetImportHdl(); - pEdit->SetImportHdl( LINK( this, ScHTMLParser, HTMLImportHdl ) ); + pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) ); - SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); + SfxObjectShell* pObjSh = mpDoc->GetDocumentShell(); BOOL bLoading = pObjSh && pObjSh->IsLoading(); SvKeyValueIteratorRef xValues; @@ -549,29 +232,30 @@ ULONG ScHTMLParser::Read( SvStream& rStream ) pEdit->SetImportHdl( aOldLink ); // Spaltenbreiten erzeugen - if( bCalcWidthHeight ) + Adjust(); + OutputDevice* pDefaultDev = Application::GetDefaultDevice(); + USHORT nCount = pColOffset->Count(); + const ULONG* pOff = (const ULONG*) pColOffset->GetData(); + ULONG nOff = *pOff++; + Size aSize; + for ( USHORT j = 1; j < nCount; j++, pOff++ ) { - Adjust(); - OutputDevice* pDefaultDev = Application::GetDefaultDevice(); - USHORT nCount = pColOffset->Count(); - const ULONG* pOff = (const ULONG*) pColOffset->GetData(); - ULONG nOff = *pOff++; - Size aSize; - for ( USHORT j = 1; j < nCount; j++, pOff++ ) - { - aSize.Width() = *pOff - nOff; - aSize = pDefaultDev->PixelToLogic( aSize, MapMode( MAP_TWIP ) ); - pColWidths->Insert( j-1, (void*)aSize.Width() ); - nOff = *pOff; - } + aSize.Width() = *pOff - nOff; + aSize = pDefaultDev->PixelToLogic( aSize, MapMode( MAP_TWIP ) ); + pColWidths->Insert( j-1, (void*)aSize.Width() ); + nOff = *pOff; } - else - AdjustNoWidthHeight(); return nErr; } -void ScHTMLParser::NewActEntry( ScEEParseEntry* pE ) +const ScHTMLTable* ScHTMLLayoutParser::GetGlobalTable() const +{ + return 0; +} + + +void ScHTMLLayoutParser::NewActEntry( ScEEParseEntry* pE ) { ScEEParser::NewActEntry( pE ); if ( pE ) @@ -587,7 +271,7 @@ void ScHTMLParser::NewActEntry( ScEEParseEntry* pE ) } -void ScHTMLParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) +void ScHTMLLayoutParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) { if ( rSel.nEndPara >= pE->aSel.nStartPara ) { @@ -604,7 +288,7 @@ void ScHTMLParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) } -void ScHTMLParser::NextRow( ImportInfo* pInfo ) +void ScHTMLLayoutParser::NextRow( ImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); @@ -616,10 +300,10 @@ void ScHTMLParser::NextRow( ImportInfo* pInfo ) } -BOOL ScHTMLParser::SeekOffset( ScHTMLColOffset* pOffset, USHORT nOffset, +BOOL ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, USHORT nOffset, USHORT* pCol, USHORT nOffsetTol ) { - DBG_ASSERT( pOffset, "ScHTMLParser::SeekOffset - illegal call" ); + DBG_ASSERT( pOffset, "ScHTMLLayoutParser::SeekOffset - illegal call" ); if ( pOffset->Seek_Entry( nOffset, pCol ) ) return TRUE; USHORT nCount = pOffset->Count(); @@ -639,10 +323,10 @@ BOOL ScHTMLParser::SeekOffset( ScHTMLColOffset* pOffset, USHORT nOffset, } -void ScHTMLParser::MakeCol( ScHTMLColOffset* pOffset, USHORT& nOffset, +void ScHTMLLayoutParser::MakeCol( ScHTMLColOffset* pOffset, USHORT& nOffset, USHORT& nWidth, USHORT nOffsetTol, USHORT nWidthTol ) { - DBG_ASSERT( pOffset, "ScHTMLParser::MakeCol - illegal call" ); + DBG_ASSERT( pOffset, "ScHTMLLayoutParser::MakeCol - illegal call" ); USHORT nPos; if ( SeekOffset( pOffset, nOffset, &nPos, nOffsetTol ) ) nOffset = (USHORT)(*pOffset)[nPos]; @@ -658,10 +342,10 @@ void ScHTMLParser::MakeCol( ScHTMLColOffset* pOffset, USHORT& nOffset, } -void ScHTMLParser::MakeColNoRef( ScHTMLColOffset* pOffset, USHORT nOffset, +void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, USHORT nOffset, USHORT nWidth, USHORT nOffsetTol, USHORT nWidthTol ) { - DBG_ASSERT( pOffset, "ScHTMLParser::MakeColNoRef - illegal call" ); + DBG_ASSERT( pOffset, "ScHTMLLayoutParser::MakeColNoRef - illegal call" ); USHORT nPos; if ( SeekOffset( pOffset, nOffset, &nPos, nOffsetTol ) ) nOffset = (USHORT)(*pOffset)[nPos]; @@ -675,10 +359,10 @@ void ScHTMLParser::MakeColNoRef( ScHTMLColOffset* pOffset, USHORT nOffset, } -void ScHTMLParser::ModifyOffset( ScHTMLColOffset* pOffset, USHORT& nOldOffset, +void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, USHORT& nOldOffset, USHORT& nNewOffset, USHORT nOffsetTol ) { - DBG_ASSERT( pOffset, "ScHTMLParser::ModifyOffset - illegal call" ); + DBG_ASSERT( pOffset, "ScHTMLLayoutParser::ModifyOffset - illegal call" ); USHORT nPos; if ( !SeekOffset( pOffset, nOldOffset, &nPos, nOffsetTol ) ) { @@ -716,7 +400,7 @@ void ScHTMLParser::ModifyOffset( ScHTMLColOffset* pOffset, USHORT& nOldOffset, } -void ScHTMLParser::SkipLocked( ScEEParseEntry* pE, BOOL bJoin ) +void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, BOOL bJoin ) { if ( pE->nCol <= MAXCOL ) { // wuerde sonst bei ScAddress falschen Wert erzeugen, evtl. Endlosschleife! @@ -751,7 +435,7 @@ void ScHTMLParser::SkipLocked( ScEEParseEntry* pE, BOOL bJoin ) } -void ScHTMLParser::Adjust() +void ScHTMLLayoutParser::Adjust() { for ( ScRange* pR = xLockedList->First(); pR; pR = xLockedList->Next() ) delete pR; @@ -871,57 +555,8 @@ void ScHTMLParser::Adjust() } -void ScHTMLParser::AdjustNoWidthHeight() -{ - DBG_ASSERT( pTableData, "ScHTMLParser::AdjustNoWidthHeight - no table data" ); - pTableData->Recalc(); - - USHORT nLastCol = 0; - USHORT nLastRow = 0; - USHORT nLastTab = 0; - USHORT nDocCol = 0; - USHORT nDocRow = 0; - - for ( ScEEParseEntry* pEntry = pList->First(); pEntry; pEntry = pList->Next() ) - { - ScHTMLTableData* pTable = pTableData->GetTable( pEntry->nTab ); - - if( pTable ) - { - nDocCol = pTable->CalcDocCol( pEntry->nCol ); - nDocRow = pTable->CalcDocRow( pEntry->nRow ); - pEntry->nColOverlap = pTable->CalcColSpan( pEntry->nCol, pEntry->nColOverlap ); - pEntry->nRowOverlap = pTable->CalcRowSpan( pEntry->nRow, pEntry->nRowOverlap ); - } - else if( nLastTab ) - { - nDocCol = pEntry->nCol; - nDocRow = pTableData->GetNextFreeRow( nLastTab ); - } - else - { - nDocCol += pEntry->nCol - nLastCol; - nDocRow += pEntry->nRow - nLastRow; - } - - nLastCol = pEntry->nCol; - nLastRow = pEntry->nRow; - nLastTab = pEntry->nTab; - - pEntry->nCol = nDocCol; - pEntry->nRow = nDocRow; - - nColMax = Max( nColMax, (USHORT)(pEntry->nCol + pEntry->nColOverlap) ); - nRowMax = Max( nRowMax, (USHORT)(pEntry->nRow + pEntry->nRowOverlap) ); - } -} - - -USHORT ScHTMLParser::GetWidth( ScEEParseEntry* pE ) +USHORT ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE ) { - if( !bCalcWidthHeight ) - return 0; - if ( pE->nWidth ) return pE->nWidth; USHORT nPos = Min( pE->nCol - nColCntStart + pE->nColOverlap, @@ -933,10 +568,8 @@ USHORT ScHTMLParser::GetWidth( ScEEParseEntry* pE ) } -void ScHTMLParser::SetWidths() +void ScHTMLLayoutParser::SetWidths() { - if( !bCalcWidthHeight ) return; - ScEEParseEntry* pE; USHORT nCol; if ( !nTableWidth ) @@ -1053,7 +686,7 @@ void ScHTMLParser::SetWidths() if ( pE->nTab == nTable ) { nCol = pE->nCol - nColCntStart; - DBG_ASSERT( nCol < nColsPerRow, "ScHTMLParser::SetWidths: column overflow" ); + DBG_ASSERT( nCol < nColsPerRow, "ScHTMLLayoutParser::SetWidths: column overflow" ); if ( nCol < nColsPerRow ) { pE->nOffset = pOffsets[nCol]; @@ -1093,35 +726,32 @@ void ScHTMLParser::SetWidths() } -void ScHTMLParser::Colonize( ScEEParseEntry* pE ) +void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE ) { USHORT nCol = pE->nCol; SkipLocked( pE ); // Spaltenverdraengung nach rechts - if( bCalcWidthHeight ) - { - if ( nCol < pE->nCol ) - { // verdraengt - nCol = pE->nCol - nColCntStart; - USHORT nCount = pLocalColOffset->Count(); - if ( nCol < nCount ) - nColOffset = (USHORT) (*pLocalColOffset)[nCol]; - else - nColOffset = (USHORT) (*pLocalColOffset)[nCount - 1]; - } - pE->nOffset = nColOffset; - USHORT nWidth = GetWidth( pE ); - MakeCol( pLocalColOffset, pE->nOffset, nWidth ); - if ( pE->nWidth ) - pE->nWidth = nWidth; - nColOffset = pE->nOffset + nWidth; - if ( nTableWidth < nColOffset - nColOffsetStart ) - nTableWidth = nColOffset - nColOffsetStart; + if ( nCol < pE->nCol ) + { // verdraengt + nCol = pE->nCol - nColCntStart; + USHORT nCount = pLocalColOffset->Count(); + if ( nCol < nCount ) + nColOffset = (USHORT) (*pLocalColOffset)[nCol]; + else + nColOffset = (USHORT) (*pLocalColOffset)[nCount - 1]; } + pE->nOffset = nColOffset; + USHORT nWidth = GetWidth( pE ); + MakeCol( pLocalColOffset, pE->nOffset, nWidth ); + if ( pE->nWidth ) + pE->nWidth = nWidth; + nColOffset = pE->nOffset + nWidth; + if ( nTableWidth < nColOffset - nColOffsetStart ) + nTableWidth = nColOffset - nColOffsetStart; } -void ScHTMLParser::CloseEntry( ImportInfo* pInfo ) +void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) { bInCell = FALSE; if ( bTabInTabCell ) @@ -1161,14 +791,14 @@ void ScHTMLParser::CloseEntry( ImportInfo* pInfo ) DBG_ERRORFILE( "CloseEntry: EditEngine ESelection Start > End" ); rSel.nEndPara = rSel.nStartPara; } - if ( rSel.HasRange() && bCalcWidthHeight ) + if ( rSel.HasRange() ) pActEntry->aItemSet.Put( SfxBoolItem( ATTR_LINEBREAK, TRUE ) ); pList->Insert( pActEntry, LIST_APPEND ); NewActEntry( pActEntry ); // neuer freifliegender pActEntry } -IMPL_LINK( ScHTMLParser, HTMLImportHdl, ImportInfo*, pInfo ) +IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo ) { #if defined(erDEBUG) //|| 1 static ESelection aDebugSel; @@ -1338,7 +968,7 @@ USHORT lcl_KGV( USHORT a, USHORT b ) } -void ScHTMLParser::TableDataOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); @@ -1427,24 +1057,37 @@ void ScHTMLParser::TableDataOn( ImportInfo* pInfo ) pActEntry->nRow = nRowCnt; pActEntry->nTab = nTable; - if( pTableData ) - { - SkipLocked( pActEntry, FALSE ); - nColCnt = pActEntry->nCol; - nRowCnt = pActEntry->nRow; - pTableData->SetCellCoord( nTable, pActEntry->nCol, pActEntry->nRow ); - } - if ( bHorJustifyCenterTH ) pActEntry->aItemSet.Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY) ); } -void ScHTMLParser::TableOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableRowOn( ImportInfo* pInfo ) +{ + if ( nColCnt > nColCntStart ) + NextRow( pInfo ); // das optionale TableRowOff war nicht + nColOffset = nColOffsetStart; +} + + +void ScHTMLLayoutParser::TableRowOff( ImportInfo* pInfo ) +{ + NextRow( pInfo ); +} + + +void ScHTMLLayoutParser::TableDataOff( ImportInfo* pInfo ) +{ + if ( bInCell ) + CloseEntry( pInfo ); // aber nur wenn's auch eine war +} + + +void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) { String aTabName; - BOOL bBorderOn = FALSE; + bool bBorderOn = false; if ( ++nTableLevel > 1 ) { // Table in Table @@ -1499,10 +1142,6 @@ void ScHTMLParser::TableOn( ImportInfo* pInfo ) nColOffsetStart = nColOffset; } - if( pTableData ) - pTableData->InsertTable( nMaxTable + 1, aTabName, pActEntry->nCol, pActEntry->nRow, - pActEntry->nColOverlap, pActEntry->nRowOverlap, bBorderOn, nTable ); - ScEEParseEntry* pE = pList->Last(); NewActEntry( pE ); // neuer freifliegender pActEntry xLockedList = new ScRangeList; @@ -1544,28 +1183,22 @@ void ScHTMLParser::TableOn( ImportInfo* pInfo ) } } } - - if( pTableData ) - pTableData->InsertTable( nMaxTable + 1, aTabName, nColCnt, nRowCnt, 1, 1, bBorderOn ); } nTable = ++nMaxTable; bFirstRow = TRUE; nFirstTableCell = pList->Count(); - if( bCalcWidthHeight ) - { - pLocalColOffset = new ScHTMLColOffset; - MakeColNoRef( pLocalColOffset, nColOffsetStart, 0, 0, 0 ); - } + pLocalColOffset = new ScHTMLColOffset; + MakeColNoRef( pLocalColOffset, nColOffsetStart, 0, 0, 0 ); } -void ScHTMLParser::TableOff( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); if ( nColCnt > nColCntStart ) - NextRow( pInfo ); // das optionale TableRowOff war nicht + TableRowOff( pInfo ); // das optionale TableRowOff war nicht if ( !nTableLevel ) { DBG_ERROR( "Dummbatz-Dok! </TABLE> ohne oeffnendes <TABLE>" ); @@ -1578,7 +1211,7 @@ void ScHTMLParser::TableOff( ImportInfo* pInfo ) { ScEEParseEntry* pE = pS->pCellEntry; USHORT nRows = nRowCnt - pS->nRowCnt; - if ( nRows > 1 && bCalcWidthHeight ) + if ( nRows > 1 ) { // Groesse der Tabelle an dieser Position eintragen USHORT j; USHORT nCol = nColCntStart; @@ -1668,23 +1301,20 @@ void ScHTMLParser::TableOff( ImportInfo* pInfo ) } } - if( bCalcWidthHeight ) - { - SetWidths(); + SetWidths(); - if ( !pE->nWidth ) - pE->nWidth = nTableWidth; - else if ( pE->nWidth < nTableWidth ) - { - USHORT nOldOffset = pE->nOffset + pE->nWidth; - USHORT nNewOffset = pE->nOffset + nTableWidth; - ModifyOffset( pS->pLocalColOffset, nOldOffset, nNewOffset ); - USHORT nTmp = nNewOffset - pE->nOffset - pE->nWidth; - pE->nWidth = nNewOffset - pE->nOffset; - pS->nTableWidth += nTmp; - if ( pS->nColOffset >= nOldOffset ) - pS->nColOffset += nTmp; - } + if ( !pE->nWidth ) + pE->nWidth = nTableWidth; + else if ( pE->nWidth < nTableWidth ) + { + USHORT nOldOffset = pE->nOffset + pE->nWidth; + USHORT nNewOffset = pE->nOffset + nTableWidth; + ModifyOffset( pS->pLocalColOffset, nOldOffset, nNewOffset ); + USHORT nTmp = nNewOffset - pE->nOffset - pE->nWidth; + pE->nWidth = nNewOffset - pE->nOffset; + pS->nTableWidth += nTmp; + if ( pS->nColOffset >= nOldOffset ) + pS->nColOffset += nTmp; } nColCnt = pE->nCol + pE->nColOverlap; @@ -1728,10 +1358,8 @@ void ScHTMLParser::TableOff( ImportInfo* pInfo ) } -void ScHTMLParser::Image( ImportInfo* pInfo ) +void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) { - if( !bCalcWidthHeight ) return; - if ( !pActEntry->pImageList ) pActEntry->pImageList = new ScHTMLImageList; ScHTMLImageList* pIL = pActEntry->pImageList; @@ -1827,10 +1455,8 @@ void ScHTMLParser::Image( ImportInfo* pInfo ) } -void ScHTMLParser::ColOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo ) { - if( !bCalcWidthHeight ) return; - const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions(); USHORT nArrLen = pOptions->Count(); for ( USHORT i = 0; i < nArrLen; i++ ) @@ -1850,11 +1476,8 @@ void ScHTMLParser::ColOn( ImportInfo* pInfo ) } -USHORT ScHTMLParser::GetWidthPixel( const HTMLOption* pOption ) +USHORT ScHTMLLayoutParser::GetWidthPixel( const HTMLOption* pOption ) { - if( !bCalcWidthHeight ) - return 0; - const String& rOptVal = pOption->GetString(); if ( rOptVal.Search('%') != STRING_NOTFOUND ) { // Prozent @@ -1874,7 +1497,7 @@ USHORT ScHTMLParser::GetWidthPixel( const HTMLOption* pOption ) } -void ScHTMLParser::AnchorOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) { const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions(); USHORT nArrLen = pOptions->Count(); @@ -1893,7 +1516,7 @@ void ScHTMLParser::AnchorOn( ImportInfo* pInfo ) } -BOOL ScHTMLParser::IsAtBeginningOfText( ImportInfo* pInfo ) +BOOL ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo ) { ESelection& rSel = pActEntry->aSel; return rSel.nStartPara == rSel.nEndPara && @@ -1902,7 +1525,7 @@ BOOL ScHTMLParser::IsAtBeginningOfText( ImportInfo* pInfo ) } -void ScHTMLParser::FontOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) { if ( IsAtBeginningOfText( pInfo ) ) { // nur am Anfang des Textes, gilt dann fuer gesamte Zelle @@ -1940,7 +1563,7 @@ void ScHTMLParser::FontOn( ImportInfo* pInfo ) else if ( nSize > SC_HTML_FONTSIZES ) nSize = SC_HTML_FONTSIZES; pActEntry->aItemSet.Put( SvxFontHeightItem( - aFontHeights[nSize-1], 100, ATTR_FONT_HEIGHT ) ); + maFontHeights[nSize-1], 100, ATTR_FONT_HEIGHT ) ); } break; case HTML_O_COLOR : @@ -1956,7 +1579,7 @@ void ScHTMLParser::FontOn( ImportInfo* pInfo ) } -void ScHTMLParser::ProcToken( ImportInfo* pInfo ) +void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) { #ifdef DEBUG HTML_TOKEN_IDS eTokenId = (HTML_TOKEN_IDS)pInfo->nToken; @@ -1971,8 +1594,8 @@ void ScHTMLParser::ProcToken( ImportInfo* pInfo ) HTMLParser* pParser = (HTMLParser*) pInfo->pParser; const HTMLOptions* pOptions = pParser->GetOptions( &nContentOpt ); SfxFrameHTMLParser::ParseMetaOptions( - &pDoc->GetDocumentShell()->GetDocInfo(), - pDoc->GetDocumentShell()->GetHeaderAttributes(), + &mpDoc->GetDocumentShell()->GetDocInfo(), + mpDoc->GetDocumentShell()->GetHeaderAttributes(), pOptions, nMetaCnt, eEnc ); // If the encoding is set by a META tag, it may only overwrite the // current encoding if both, the current and the new encoding, are 1-BYTE @@ -1998,7 +1621,7 @@ void ScHTMLParser::ProcToken( ImportInfo* pInfo ) // Leerzeichen von Zeilenumbruechen raus aString.EraseLeadingChars(); aString.EraseTrailingChars(); - pDoc->GetDocumentShell()->GetDocInfo().SetTitle( aString ); + mpDoc->GetDocumentShell()->GetDocInfo().SetTitle( aString ); } bInTitle = FALSE; } @@ -2029,20 +1652,17 @@ void ScHTMLParser::ProcToken( ImportInfo* pInfo ) case HTML_TABLEHEADER_OFF: case HTML_TABLEDATA_OFF: // schliesst Zelle { - if ( bInCell ) - CloseEntry( pInfo ); // aber nur wenn's auch eine war + TableDataOff( pInfo ); } break; case HTML_TABLEROW_ON: // vor erster Zelle in Row { - if ( nColCnt > nColCntStart ) - NextRow( pInfo ); // das optionale TableRowOff war nicht - nColOffset = nColOffsetStart; + TableRowOn( pInfo ); } break; case HTML_TABLEROW_OFF: // nach letzter Zelle in Row { - NextRow( pInfo ); + TableRowOff( pInfo ); } break; case HTML_TABLE_OFF: @@ -2076,7 +1696,7 @@ void ScHTMLParser::ProcToken( ImportInfo* pInfo ) //2do: aktuelle Fontgroesse merken und einen groesser if ( IsAtBeginningOfText( pInfo ) ) pActEntry->aItemSet.Put( SvxFontHeightItem( - aFontHeights[3], 100, ATTR_FONT_HEIGHT ) ); + maFontHeights[3], 100, ATTR_FONT_HEIGHT ) ); } break; case HTML_SMALLPRINT_ON : @@ -2084,7 +1704,7 @@ void ScHTMLParser::ProcToken( ImportInfo* pInfo ) //2do: aktuelle Fontgroesse merken und einen kleiner if ( IsAtBeginningOfText( pInfo ) ) pActEntry->aItemSet.Put( SvxFontHeightItem( - aFontHeights[0], 100, ATTR_FONT_HEIGHT ) ); + maFontHeights[0], 100, ATTR_FONT_HEIGHT ) ); } break; case HTML_BOLD_ON : @@ -2143,3 +1763,1313 @@ void ScHTMLParser::ProcToken( ImportInfo* pInfo ) +// ============================================================================ +// HTML DATA QUERY PARSER +// ============================================================================ + +template< typename Type > +inline Type bound( const Type& rValue, const Type& rMin, const Type& rMax ) +{ return ::std::max( ::std::min( rValue, rMax ), rMin ); } + + +// ============================================================================ + +/** Iterates through all HTML tag options of the passed ImportInfo struct. */ +class ScHTMLOptionIterator +{ +private: + const HTMLOptions* mpOptions; /// The options array. + const HTMLOption* mpCurrOption; /// Current option. + sal_uInt16 mnCount; /// Size of the options array. + sal_uInt16 mnIndex; /// Next option to return. + +public: + explicit ScHTMLOptionIterator( const ImportInfo& rInfo ); + + inline bool is() const { return mnIndex < mnCount; } + inline const HTMLOption* operator->() const { return mpCurrOption; } + inline const HTMLOption& operator*() const { return *mpCurrOption; } + ScHTMLOptionIterator& operator++(); +}; + + +// ---------------------------------------------------------------------------- + +ScHTMLOptionIterator::ScHTMLOptionIterator( const ImportInfo& rInfo ) : + mpOptions( 0 ), + mpCurrOption( 0 ), + mnCount( 0 ), + mnIndex( 0 ) +{ + const HTMLParser* pParser = static_cast< const HTMLParser* >( rInfo.pParser ); + if( pParser ) + mpOptions = pParser->GetOptions(); + if( mpOptions ) + mnCount = mpOptions->Count(); + if( mnCount ) + mpCurrOption = mpOptions->GetObject( 0 ); +} + +ScHTMLOptionIterator& ScHTMLOptionIterator::operator++() +{ + if( mnIndex < mnCount ) ++mnIndex; + mpCurrOption = (mnIndex < mnCount) ? mpOptions->GetObject( mnIndex ) : 0; + return *this; +} + + +// ============================================================================ + +ScHTMLEntry::ScHTMLEntry( const SfxItemSet& rItemSet, ScHTMLTableId nTableId ) : + ScEEParseEntry( rItemSet ), + mbImportAlways( false ) +{ + nTab = nTableId; + bEntirePara = false; +} + +bool ScHTMLEntry::HasContents() const +{ + return mbImportAlways || aSel.HasRange() || aAltText.Len() || IsTable(); +} + +void ScHTMLEntry::AdjustStart( const ImportInfo& rInfo ) +{ + // set start position + aSel.nStartPara = rInfo.aSelection.nStartPara; + aSel.nStartPos = rInfo.aSelection.nStartPos; + // adjust end position + if( (aSel.nEndPara < aSel.nStartPara) || ((aSel.nEndPara == aSel.nStartPara) && (aSel.nEndPos < aSel.nStartPos)) ) + { + aSel.nEndPara = aSel.nStartPara; + aSel.nEndPos = aSel.nStartPos; + } +} + +void ScHTMLEntry::AdjustEnd( const ImportInfo& rInfo ) +{ + DBG_ASSERT( (aSel.nEndPara < rInfo.aSelection.nEndPara) || + ((aSel.nEndPara == rInfo.aSelection.nEndPara) && (aSel.nEndPos <= rInfo.aSelection.nEndPos)), + "ScHTMLQueryParser::AdjustEntryEnd - invalid end position" ); + // set end position + aSel.nEndPara = rInfo.aSelection.nEndPara; + aSel.nEndPos = rInfo.aSelection.nEndPos; +} + +void ScHTMLEntry::Strip( const EditEngine& rEditEngine ) +{ + // strip leading empty paragraphs + while( (aSel.nStartPara < aSel.nEndPara) && (rEditEngine.GetTextLen( aSel.nStartPara ) <= aSel.nStartPos) ) + { + ++aSel.nStartPara; + aSel.nStartPos = 0; + } + // strip trailing empty paragraphs + while( (aSel.nStartPara < aSel.nEndPara) && (aSel.nEndPos == 0) ) + { + --aSel.nEndPara; + aSel.nEndPos = rEditEngine.GetTextLen( aSel.nEndPara ); + } +} + + +// ============================================================================ + +/** A map of ScHTMLTable objects. + @descr Organizes the tables with a unique table key. Stores nested tables inside + the parent table and forms in this way a tree structure of tables. + An instance of this class ownes the contained table objects and deletes them + on destruction. */ +class ScHTMLTableMap +{ +private: + typedef ::boost::shared_ptr< ScHTMLTable > ScHTMLTablePtr; + typedef ::std::map< ScHTMLTableId, ScHTMLTablePtr > ScHTMLTableStdMap; + +public: + typedef ScHTMLTableStdMap::iterator iterator; + typedef ScHTMLTableStdMap::const_iterator const_iterator; + +private: + ScHTMLTable& mrParentTable; /// Reference to parent table. + ScHTMLTableStdMap maTables; /// Container for all table objects. + mutable ScHTMLTable* mpCurrTable; /// Current table, used for fast search. + +public: + explicit ScHTMLTableMap( ScHTMLTable& rParentTable ); + virtual ~ScHTMLTableMap(); + + inline iterator begin() { return maTables.begin(); } + inline const_iterator begin() const { return maTables.begin(); } + inline iterator end() { return maTables.end(); } + inline const_iterator end() const { return maTables.end(); } + inline bool empty() const { return maTables.empty(); } + + /** Returns the specified table. + @param nTableId Unique identifier of the table. + @param bDeep true = searches deep in all nested table; false = only in this container. */ + ScHTMLTable* FindTable( ScHTMLTableId nTableId, bool bDeep = true ) const; + + /** Inserts a new table into the container. This container owns the created table. + @param bPreFormText true = New table is based on preformatted text (<pre> tag). */ + ScHTMLTable* CreateTable( const ImportInfo& rInfo, bool bPreFormText ); + +private: + /** Sets a working table with its index for search optimization. */ + inline void SetCurrTable( ScHTMLTable* pTable ) const + { if( pTable ) mpCurrTable = pTable; } +}; + + +// ---------------------------------------------------------------------------- + +ScHTMLTableMap::ScHTMLTableMap( ScHTMLTable& rParentTable ) : + mrParentTable( rParentTable ) +{ +} + +ScHTMLTableMap::~ScHTMLTableMap() +{ +} + +ScHTMLTable* ScHTMLTableMap::FindTable( ScHTMLTableId nTableId, bool bDeep ) const +{ + ScHTMLTable* pResult = 0; + if( mpCurrTable && (nTableId == mpCurrTable->GetTableId()) ) + pResult = mpCurrTable; // cached table + else + { + const_iterator aFind = maTables.find( nTableId ); + if( aFind != maTables.end() ) + pResult = aFind->second.get(); // table from this container + } + + // not found -> search deep in nested tables + if( !pResult && bDeep ) + for( const_iterator aIter = begin(), aEnd = end(); !pResult && (aIter != aEnd); ++aIter ) + pResult = aIter->second->FindNestedTable( nTableId ); + + SetCurrTable( pResult ); + return pResult; +} + +ScHTMLTable* ScHTMLTableMap::CreateTable( const ImportInfo& rInfo, bool bPreFormText ) +{ + ScHTMLTable* pTable = new ScHTMLTable( mrParentTable, rInfo, bPreFormText ); + maTables[ pTable->GetTableId() ].reset( pTable ); + SetCurrTable( pTable ); + return pTable; +} + + +// ---------------------------------------------------------------------------- + +/** Simplified forward iterator for convenience. + @descr Before the iterator can be dereferenced, it must be tested with the + is() method. The iterator may be invalid directly after construction + (i.e. empty container). */ +class ScHTMLTableIterator +{ +private: + ScHTMLTableMap::const_iterator maIter; + ScHTMLTableMap::const_iterator maEnd; + +public: + /** Constructs the iterator for the passed table map. + @param pTableMap Pointer to the table map (is allowed to be NULL). */ + explicit ScHTMLTableIterator( const ScHTMLTableMap* pTableMap ); + + inline bool is() const { return maIter != maEnd; } + inline ScHTMLTable* operator->() { return maIter->second.get(); } + inline ScHTMLTable& operator*() { return *maIter->second; } + inline ScHTMLTableIterator& operator++() { ++maIter; return *this; } +}; + +ScHTMLTableIterator::ScHTMLTableIterator( const ScHTMLTableMap* pTableMap ) +{ + if( pTableMap ) + { + maIter = pTableMap->begin(); + maEnd = pTableMap->end(); + } +} + + +// ============================================================================ + +ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) : + mnTableId( rnUnusedId ), + mrnUnusedId( rnUnusedId ) +{ + ++mrnUnusedId; +} + + +// ---------------------------------------------------------------------------- + +ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bool bPreFormText ) : + mpParentTable( &rParentTable ), + maTableId( rParentTable.maTableId.mrnUnusedId ), + maTableItemSet( rParentTable.GetCurrItemSet() ), + mrEditEngine( rParentTable.mrEditEngine ), + mrEEParseList( rParentTable.mrEEParseList ), + mpCurrEntryList( 0 ), + maSize( 1, 1 ), + mbBorderOn( false ), + mbPreFormText( bPreFormText ), + mbRowOn( false ), + mbDataOn( false ), + mbPushEmptyLine( false ) +{ + if( mbPreFormText ) + { + ImplRowOn(); + ImplDataOn( ScHTMLSize( 1, 1 ) ); + } + else + { + ProcessFormatOptions( maTableItemSet, rInfo ); + for( ScHTMLOptionIterator aIter( rInfo ); aIter.is(); ++aIter ) + { + switch( aIter->GetToken() ) + { + case HTML_O_BORDER: + mbBorderOn = ((aIter->GetString().Len() == 0) || (aIter->GetNumber() != 0)); + break; + case HTML_O_ID: + maTableName = aIter->GetString(); + break; + } + } + } + + CreateNewEntry( rInfo ); +} + +ScHTMLTable::ScHTMLTable( SfxItemPool& rPool, EditEngine& rEditEngine, ScEEParseList& rEEParseList, ScHTMLTableId& rnUnusedId ) : + mpParentTable( 0 ), + maTableId( rnUnusedId ), + maTableItemSet( rPool ), + mrEditEngine( rEditEngine ), + mrEEParseList( rEEParseList ), + mpCurrEntryList( 0 ), + maSize( 1, 1 ), + mbBorderOn( false ), + mbPreFormText( false ), + mbRowOn( false ), + mbDataOn( false ), + mbPushEmptyLine( false ) +{ + // open the first "cell" of the document + ImplRowOn(); + ImplDataOn( ScHTMLSize( 1, 1 ) ); + mpCurrEntry.reset( CreateEntry() ); +} + +ScHTMLTable::~ScHTMLTable() +{ +} + +const SfxItemSet& ScHTMLTable::GetCurrItemSet() const +{ + // first try cell item set, then row item set, then table item set + return mpDataItemSet.get() ? *mpDataItemSet : (mpRowItemSet.get() ? *mpRowItemSet : maTableItemSet); +} + +ScHTMLSize ScHTMLTable::GetSpan( const ScHTMLPos& rCellPos ) +{ + ScHTMLSize aSpan( 1, 1 ); + if( ScRange* pRange = maLockList.Find( rCellPos.MakeAddr() ) ) + aSpan.Set( pRange->aEnd.Col() - pRange->aStart.Col() + 1, pRange->aEnd.Row() - pRange->aStart.Row() + 1 ); + return aSpan; +} + +ScHTMLTable* ScHTMLTable::FindNestedTable( ScHTMLTableId nTableId ) const +{ + return mpNestedTables.get() ? mpNestedTables->FindTable( nTableId, true ) : 0; +} + +void ScHTMLTable::PutItem( const SfxPoolItem& rItem ) +{ + DBG_ASSERT( mpCurrEntry.get(), "ScHTMLTable::PutItem - no current entry" ); + if( mpCurrEntry.get() && mpCurrEntry->IsEmpty() ) + mpCurrEntry->aItemSet.Put( rItem ); +} + +void ScHTMLTable::PutText( const ImportInfo& rInfo ) +{ + DBG_ASSERT( mpCurrEntry.get(), "ScHTMLTable::PutText - no current entry" ); + if( mpCurrEntry.get() ) + { + if( !mpCurrEntry->HasContents() && IsSpaceCharInfo( rInfo ) ) + mpCurrEntry->AdjustStart( rInfo ); + else + mpCurrEntry->AdjustEnd( rInfo ); + } +} + +void ScHTMLTable::InsertPara( const ImportInfo& rInfo ) +{ + if( mpCurrEntry.get() && mbDataOn && !IsEmptyCell() ) + mpCurrEntry->SetImportAlways(); + PushEntry( rInfo ); + CreateNewEntry( rInfo ); + InsertLeadingEmptyLine(); +} + +void ScHTMLTable::BreakOn() +{ + // empty line, if <br> is at start of cell + mbPushEmptyLine = !mbPreFormText && mbDataOn && IsEmptyCell(); +} + +void ScHTMLTable::HeadingOn() +{ + // call directly, InsertPara() has not been called before + InsertLeadingEmptyLine(); +} + +void ScHTMLTable::InsertLeadingEmptyLine() +{ + // empty line, if <p>, </p>, <h?>, or </h*> are not at start of cell + mbPushEmptyLine = !mbPreFormText && mbDataOn && !IsEmptyCell(); +} + +void ScHTMLTable::AnchorOn() +{ + DBG_ASSERT( mpCurrEntry.get(), "ScHTMLTable::AnchorOn - no current entry" ); + // don't skip entries with single hyperlinks + if( mpCurrEntry.get() ) + mpCurrEntry->SetImportAlways(); +} + +ScHTMLTable* ScHTMLTable::TableOn( const ImportInfo& rInfo ) +{ + PushEntry( rInfo ); + return InsertNestedTable( rInfo, false ); +} + +ScHTMLTable* ScHTMLTable::TableOff( const ImportInfo& rInfo ) +{ + return mbPreFormText ? this : CloseTable( rInfo ); +} + +ScHTMLTable* ScHTMLTable::PreOn( const ImportInfo& rInfo ) +{ + PushEntry( rInfo ); + return InsertNestedTable( rInfo, true ); +} + +ScHTMLTable* ScHTMLTable::PreOff( const ImportInfo& rInfo ) +{ + return mbPreFormText ? CloseTable( rInfo ) : this; +} + +void ScHTMLTable::RowOn( const ImportInfo& rInfo ) +{ + PushEntry( rInfo, true ); + if( mpParentTable && !mbPreFormText ) // no rows allowed in global and preformatted tables + { + ImplRowOn(); + ProcessFormatOptions( *mpRowItemSet, rInfo ); + } + CreateNewEntry( rInfo ); +} + +void ScHTMLTable::RowOff( const ImportInfo& rInfo ) +{ + PushEntry( rInfo, true ); + if( mpParentTable && !mbPreFormText ) // no rows allowed in global and preformatted tables + ImplRowOff(); + CreateNewEntry( rInfo ); +} + +void ScHTMLTable::DataOn( const ImportInfo& rInfo ) +{ + PushEntry( rInfo, true ); + if( mpParentTable && !mbPreFormText ) // no cells allowed in global and preformatted tables + { + // read needed options from the <td> tag + ScHTMLSize aSpanSize( 1, 1 ); + ::std::auto_ptr< String > pValStr, pNumStr; + for( ScHTMLOptionIterator aIter( rInfo ); aIter.is(); ++aIter ) + { + switch( aIter->GetToken() ) + { + case HTML_O_COLSPAN: + aSpanSize.mnCols = static_cast< sal_uInt16 >( bound( aIter->GetString().ToInt32(), 1L, 256L ) ); + break; + case HTML_O_ROWSPAN: + aSpanSize.mnRows = static_cast< sal_uInt16 >( bound( aIter->GetString().ToInt32(), 1L, 256L ) ); + break; + case HTML_O_SDVAL: + pValStr.reset( new String( aIter->GetString() ) ); + break; + case HTML_O_SDNUM: + pNumStr.reset( new String( aIter->GetString() ) ); + break; + } + } + + ImplDataOn( aSpanSize ); + ProcessFormatOptions( *mpDataItemSet, rInfo ); + CreateNewEntry( rInfo ); + mpCurrEntry->pValStr = pValStr.release(); + mpCurrEntry->pNumStr = pNumStr.release(); + } + else + CreateNewEntry( rInfo ); +} + +void ScHTMLTable::DataOff( const ImportInfo& rInfo ) +{ + PushEntry( rInfo, true ); + if( mpParentTable && !mbPreFormText ) // no cells allowed in global and preformatted tables + ImplDataOff(); + CreateNewEntry( rInfo ); +} + +void ScHTMLTable::BodyOn( const ImportInfo& rInfo ) +{ + PushEntry( rInfo ); + if( !mpParentTable ) + { + ImplRowOn(); + ProcessFormatOptions( *mpRowItemSet, rInfo ); + ImplDataOn( ScHTMLSize( 1, 1 ) ); + } + CreateNewEntry( rInfo ); +} + +void ScHTMLTable::BodyOff( const ImportInfo& rInfo ) +{ + PushEntry( rInfo ); + if( !mpParentTable ) + { + ImplDataOff(); + ImplRowOff(); + } + CreateNewEntry( rInfo ); +} + +sal_uInt16 ScHTMLTable::GetDocSize( ScHTMLOrient eOrient, sal_uInt16 nCellPos ) const +{ + const ScSizeVec& rSizes = maSizes[ eOrient ]; + return (nCellPos < rSizes.size()) ? rSizes[ nCellPos ] : 0; +} + +sal_uInt16 ScHTMLTable::GetDocSize( ScHTMLOrient eOrient, sal_uInt16 nCellBegin, sal_uInt16 nCellEnd ) const +{ + sal_uInt16 nSize = 0; + for( sal_uInt16 nCellPos = nCellBegin; nCellPos < nCellEnd; ++nCellPos ) + nSize += GetDocSize( eOrient, nCellPos ); + return nSize; +} + +sal_uInt16 ScHTMLTable::GetDocSize( ScHTMLOrient eOrient ) const +{ + return GetDocSize( eOrient, 0, maSize.Get( eOrient ) ); +} + +sal_uInt16 ScHTMLTable::GetDocPos( ScHTMLOrient eOrient, sal_uInt16 nCellPos ) const +{ + return maDocBasePos.Get( eOrient ) + GetDocSize( eOrient, 0, nCellPos ); +} + +ScHTMLPos ScHTMLTable::GetDocPos( const ScHTMLPos& rCellPos ) const +{ + return ScHTMLPos( GetDocPos( tdCol, rCellPos.mnCol ), GetDocPos( tdRow, rCellPos.mnRow ) ); +} + +void ScHTMLTable::GetDocRange( ScRange& rRange ) const +{ + rRange.aStart = rRange.aEnd = maDocBasePos.MakeAddr(); + rRange.aEnd.Move( GetDocSize( tdCol ) - 1, GetDocSize( tdRow ) - 1, 0 ); +} + +void ScHTMLTable::ApplyCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos ) const +{ + DBG_ASSERT( pDoc, "ScHTMLTable::ApplyCellBorders - no document" ); + if( pDoc && mbBorderOn ) + { + const sal_uInt16 nLastCol = maSize.mnCols - 1; + const sal_uInt16 nLastRow = maSize.mnRows - 1; + const sal_uInt16 nOuterLine = DEF_LINE_WIDTH_2; + const sal_uInt16 nInnerLine = DEF_LINE_WIDTH_0; + SvxBorderLine aOuterLine, aInnerLine; + aOuterLine.SetColor( Color( COL_BLACK ) ); + aOuterLine.SetOutWidth( nOuterLine ); + aInnerLine.SetColor( Color( COL_BLACK ) ); + aInnerLine.SetOutWidth( nInnerLine ); + SvxBoxItem aBorderItem; + + for( sal_uInt16 nCol = 0; nCol <= nLastCol; ++nCol ) + { + SvxBorderLine* pLeftLine = (nCol == 0) ? &aOuterLine : &aInnerLine; + SvxBorderLine* pRightLine = (nCol == nLastCol) ? &aOuterLine : &aInnerLine; + sal_uInt16 nCellCol1 = GetDocPos( tdCol, nCol ) + rFirstPos.Col(); + sal_uInt16 nCellCol2 = nCellCol1 + GetDocSize( tdCol, nCol ) - 1; + for( sal_uInt16 nRow = 0; nRow <= nLastRow; ++nRow ) + { + SvxBorderLine* pTopLine = (nRow == 0) ? &aOuterLine : &aInnerLine; + SvxBorderLine* pBottomLine = (nRow == nLastRow) ? &aOuterLine : &aInnerLine; + sal_uInt16 nCellRow1 = GetDocPos( tdRow, nRow ) + rFirstPos.Row(); + sal_uInt16 nCellRow2 = nCellRow1 + GetDocSize( tdRow, nRow ) - 1; + for( sal_uInt16 nCellCol = nCellCol1; nCellCol <= nCellCol2; ++nCellCol ) + { + aBorderItem.SetLine( (nCellCol == nCellCol1) ? pLeftLine : 0, BOX_LINE_LEFT ); + aBorderItem.SetLine( (nCellCol == nCellCol2) ? pRightLine : 0, BOX_LINE_RIGHT ); + for( sal_uInt16 nCellRow = nCellRow1; nCellRow <= nCellRow2; ++nCellRow ) + { + aBorderItem.SetLine( (nCellRow == nCellRow1) ? pTopLine : 0, BOX_LINE_TOP ); + aBorderItem.SetLine( (nCellRow == nCellRow2) ? pBottomLine : 0, BOX_LINE_BOTTOM ); + pDoc->ApplyAttr( nCellCol, nCellRow, rFirstPos.Tab(), aBorderItem ); + } + } + } + } + } + + for( ScHTMLTableIterator aIter( mpNestedTables.get() ); aIter.is(); ++aIter ) + aIter->ApplyCellBorders( pDoc, rFirstPos ); +} + + +// ---------------------------------------------------------------------------- + +bool ScHTMLTable::IsEmptyCell() const +{ + return mpCurrEntryList && mpCurrEntryList->empty(); +} + +bool ScHTMLTable::IsSpaceCharInfo( const ImportInfo& rInfo ) +{ + return (rInfo.nToken == HTML_TEXTTOKEN) && (rInfo.aText.Len() == 1) && (rInfo.aText.GetChar( 0 ) == ' '); +} + +ScHTMLEntry* ScHTMLTable::CreateEntry() const +{ + return new ScHTMLEntry( GetCurrItemSet() ); +} + +void ScHTMLTable::CreateNewEntry( const ImportInfo& rInfo ) +{ + DBG_ASSERT( !mpCurrEntry.get(), "ScHTMLTable::CreateNewEntry - old entry still present" ); + mpCurrEntry.reset( CreateEntry() ); + mpCurrEntry->aSel = rInfo.aSelection; +} + +void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryPtr& rpEntry ) +{ + // HTML entry list does not own the entries + rEntryList.push_back( rpEntry.get() ); + // mrEEParseList (reference to member of ScEEParser) owns the entries + mrEEParseList.Insert( rpEntry.release(), LIST_APPEND ); +} + +void ScHTMLTable::PushEntry( ScHTMLEntryPtr& rpEntry ) +{ + if( rpEntry.get() && rpEntry->HasContents() ) + { + if( mpCurrEntryList ) + { + if( mbPushEmptyLine ) + { + ScHTMLEntryPtr pEmptyEntry( CreateEntry() ); + ImplPushEntryToList( *mpCurrEntryList, pEmptyEntry ); + mbPushEmptyLine = false; + } + ImplPushEntryToList( *mpCurrEntryList, rpEntry ); + } + else if( mpParentTable ) + mpParentTable->PushEntry( rpEntry ); + else + DBG_ERRORFILE( "ScHTMLTable::PushEntry - cannot push entry, no parent found" ); + } +} + +void ScHTMLTable::PushEntry( const ImportInfo& rInfo, bool bLastInCell ) +{ + DBG_ASSERT( mpCurrEntry.get(), "ScHTMLTable::PushEntry - no current entry" ); + if( mpCurrEntry.get() ) + { + mpCurrEntry->AdjustEnd( rInfo ); + mpCurrEntry->Strip( mrEditEngine ); + + // import entry always, if it is the last in cell, and cell is still empty + if( bLastInCell && IsEmptyCell() ) + { + mpCurrEntry->SetImportAlways(); + // don't insert empty lines before single empty entries + if( mpCurrEntry->IsEmpty() ) + mbPushEmptyLine = false; + } + + PushEntry( mpCurrEntry ); + mpCurrEntry.reset(); + } +} + +void ScHTMLTable::PushTableEntry( ScHTMLTableId nTableId ) +{ + DBG_ASSERT( nTableId != SC_HTML_GLOBAL_TABLE, "ScHTMLTable::PushTableEntry - cannot push global table" ); + if( nTableId != SC_HTML_GLOBAL_TABLE ) + { + ScHTMLEntryPtr pEntry( new ScHTMLEntry( maTableItemSet, nTableId ) ); + PushEntry( pEntry ); + } +} + +ScHTMLTable* ScHTMLTable::GetExistingTable( ScHTMLTableId nTableId ) const +{ + ScHTMLTable* pTable = ((nTableId != SC_HTML_GLOBAL_TABLE) && mpNestedTables.get()) ? + mpNestedTables->FindTable( nTableId, false ) : 0; + DBG_ASSERT( pTable || (nTableId == SC_HTML_GLOBAL_TABLE), "ScHTMLTable::GetExistingTable - table not found" ); + return pTable; +} + +ScHTMLTable* ScHTMLTable::InsertNestedTable( const ImportInfo& rInfo, bool bPreFormText ) +{ + if( !mpNestedTables.get() ) + mpNestedTables.reset( new ScHTMLTableMap( *this ) ); + if( bPreFormText ) // enclose new preformatted table with empty lines + InsertLeadingEmptyLine(); + return mpNestedTables->CreateTable( rInfo, bPreFormText ); +} + +ScHTMLTable* ScHTMLTable::CloseTable( const ImportInfo& rInfo ) +{ + if( mpParentTable ) // not allowed to close global table + { + PushEntry( rInfo, mbDataOn ); + ImplDataOff(); + ImplRowOff(); + mpParentTable->PushTableEntry( GetTableId() ); + mpParentTable->CreateNewEntry( rInfo ); + if( mbPreFormText ) // enclose preformatted table with empty lines in parent table + mpParentTable->InsertLeadingEmptyLine(); + return mpParentTable; + } + return this; +} + +void ScHTMLTable::InsertNewCell( const ScHTMLSize& rSpanSize ) +{ + ScRange* pRange; + + // find an unused cell + while( (pRange = maLockList.Find( maCurrCell.MakeAddr() )) != 0 ) + maCurrCell.mnCol = pRange->aEnd.Col() + 1; + mpCurrEntryList = &maEntryMap[ maCurrCell ]; + + // try to find collisions, shrink existing ranges + sal_uInt16 nColEnd = maCurrCell.mnCol + rSpanSize.mnCols; + for( ScAddress aAddr( maCurrCell.MakeAddr() ); aAddr.Col() < nColEnd; aAddr.IncCol() ) + if( (pRange = maLockList.Find( aAddr )) != 0 ) + pRange->aEnd.SetRow( maCurrCell.mnRow - 1 ); + + // insert the new range into the lock list + ScRange aNewRange( maCurrCell.MakeAddr() ); + aNewRange.aEnd.Move( rSpanSize.mnCols - 1, rSpanSize.mnRows - 1, 0 ); + maLockList.Append( aNewRange ); + + // adjust table size + maSize.mnCols = ::std::max< sal_uInt16 >( maSize.mnCols, aNewRange.aEnd.Col() + 1 ); + maSize.mnRows = ::std::max< sal_uInt16 >( maSize.mnRows, aNewRange.aEnd.Row() + 1 ); +} + +void ScHTMLTable::ImplRowOn() +{ + if( mbRowOn ) + ImplRowOff(); + mpRowItemSet.reset( new SfxItemSet( maTableItemSet ) ); + maCurrCell.mnCol = 0; + mbRowOn = true; + mbDataOn = false; +} + +void ScHTMLTable::ImplRowOff() +{ + if( mbDataOn ) + ImplDataOff(); + if( mbRowOn ) + { + mpRowItemSet.reset(); + ++maCurrCell.mnRow; + mbRowOn = mbDataOn = false; + } +} + +void ScHTMLTable::ImplDataOn( const ScHTMLSize& rSpanSize ) +{ + if( mbDataOn ) + ImplDataOff(); + if( !mbRowOn ) + ImplRowOn(); + mpDataItemSet.reset( new SfxItemSet( *mpRowItemSet ) ); + InsertNewCell( rSpanSize ); + mbDataOn = true; + mbPushEmptyLine = false; +} + +void ScHTMLTable::ImplDataOff() +{ + if( mbDataOn ) + { + mpDataItemSet.reset(); + ++maCurrCell.mnCol; + mpCurrEntryList = 0; + mbDataOn = false; + } +} + +void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo ) +{ + // special handling for table header cells + if( rInfo.nToken == HTML_TABLEHEADER_ON ) + { + rItemSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) ); + rItemSet.Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) ); + } + + for( ScHTMLOptionIterator aIter( rInfo ); aIter.is(); ++aIter ) + { + switch( aIter->GetToken() ) + { + case HTML_O_ALIGN: + { + SvxCellHorJustify eVal = SVX_HOR_JUSTIFY_STANDARD; + const String& rOptVal = aIter->GetString(); + if( rOptVal.EqualsIgnoreCaseAscii( sHTML_AL_right ) ) + eVal = SVX_HOR_JUSTIFY_RIGHT; + else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_AL_center ) ) + eVal = SVX_HOR_JUSTIFY_CENTER; + else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_AL_left ) ) + eVal = SVX_HOR_JUSTIFY_LEFT; + if( eVal != SVX_HOR_JUSTIFY_STANDARD ) + rItemSet.Put( SvxHorJustifyItem( eVal, ATTR_HOR_JUSTIFY ) ); + } + break; + + case HTML_O_VALIGN: + { + SvxCellVerJustify eVal = SVX_VER_JUSTIFY_STANDARD; + const String& rOptVal = aIter->GetString(); + if( rOptVal.EqualsIgnoreCaseAscii( sHTML_VA_top ) ) + eVal = SVX_VER_JUSTIFY_TOP; + else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_VA_middle ) ) + eVal = SVX_VER_JUSTIFY_CENTER; + else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_VA_bottom ) ) + eVal = SVX_VER_JUSTIFY_BOTTOM; + if( eVal != SVX_VER_JUSTIFY_STANDARD ) + rItemSet.Put( SvxVerJustifyItem( eVal, ATTR_VER_JUSTIFY ) ); + } + break; + + case HTML_O_BGCOLOR: + { + Color aColor; + aIter->GetColor( aColor ); + rItemSet.Put( SvxBrushItem( aColor, ATTR_BACKGROUND ) ); + } + break; + } + } +} + +void ScHTMLTable::SetDocSize( ScHTMLOrient eOrient, sal_uInt16 nCellPos, sal_uInt16 nSize ) +{ + ScSizeVec& rSizes = maSizes[ eOrient ]; + if( nCellPos >= rSizes.size() ) + rSizes.resize( nCellPos + 1, 1 ); // expand with minimum height/width == 1 + if( rSizes[ nCellPos ] < nSize ) + rSizes[ nCellPos ] = nSize; +} + +void ScHTMLTable::CalcNeededDocSize( + ScHTMLOrient eOrient, sal_uInt16 nCellPos, sal_uInt16 nCellSpan, sal_uInt16 nRealDocSize ) +{ + sal_uInt16 nDiffSize = 0; + // in merged columns/rows: reduce needed size by size of leading columns + while( nCellSpan > 1 ) + { + nDiffSize += GetDocSize( eOrient, nCellPos ); + --nCellSpan; + ++nCellPos; + } + // set remaining needed size to last column/row + nRealDocSize -= ::std::min< sal_uInt16 >( nRealDocSize - 1, nDiffSize ); + SetDocSize( eOrient, nCellPos, nRealDocSize ); +} + + +// ---------------------------------------------------------------------------- + +void ScHTMLTable::FillEmptyCells() +{ + for( ScHTMLTableIterator aIter( mpNestedTables.get() ); aIter.is(); ++aIter ) + aIter->FillEmptyCells(); + + for( ScAddress aAddr; aAddr.Row() < maSize.mnRows; aAddr.IncRow() ) + { + for( aAddr.SetCol( 0 ); aAddr.Col() < maSize.mnCols; aAddr.IncCol() ) + { + if( !maLockList.Find( aAddr ) ) + { + // create a range for the lock list (used to calc. cell span) + ScRange aRange( aAddr ); + do + aRange.aEnd.IncCol(); + while( (aRange.aEnd.Col() < maSize.mnCols) && !maLockList.Find( aRange.aEnd ) ); + aRange.aEnd.IncCol( -1 ); + maLockList.Append( aRange ); + + // insert a dummy entry + ScHTMLEntryPtr pEntry( CreateEntry() ); + ImplPushEntryToList( maEntryMap[ ScHTMLPos( aAddr ) ], pEntry ); + } + } + } +} + +void ScHTMLTable::RecalcDocSize() +{ + // recalc table sizes recursively from inner to outer + for( ScHTMLTableIterator aIter( mpNestedTables.get() ); aIter.is(); ++aIter ) + aIter->RecalcDocSize(); + + /* Two passes: first calculates the sizes of single columns/rows, then + the sizes of spanned columns/rows. This allows to fill nested tables + into merged cells optimally. */ + static const sal_uInt16 PASS_SINGLE = 0; + static const sal_uInt16 PASS_SPANNED = 1; + for( sal_uInt16 nPass = PASS_SINGLE; nPass <= PASS_SPANNED; ++nPass ) + { + // iterate through every table cell + ScHTMLEntryMap::const_iterator aMapIterEnd = maEntryMap.end(); + for( ScHTMLEntryMap::const_iterator aMapIter = maEntryMap.begin(); aMapIter != aMapIterEnd; ++aMapIter ) + { + const ScHTMLPos& rCellPos = aMapIter->first; + ScHTMLSize aCellSpan( GetSpan( rCellPos ) ); + + const ScHTMLEntryList& rEntryList = aMapIter->second; + ScHTMLEntryList::const_iterator aListIter; + ScHTMLEntryList::const_iterator aListIterEnd = rEntryList.end(); + + // process the dimension of the current cell in this pass? + // (pass is single and span is 1) or (pass is not single and span is not 1) + bool bProcessColWidth = ((nPass == PASS_SINGLE) == (aCellSpan.mnCols == 1)); + bool bProcessRowHeight = ((nPass == PASS_SINGLE) == (aCellSpan.mnRows == 1)); + if( bProcessColWidth || bProcessRowHeight ) + { + ScHTMLSize aDocSize( 1, 0 ); // resulting size of the cell in document + + // expand the cell size for each cell parse entry + for( aListIter = rEntryList.begin(); aListIter != aListIterEnd; ++aListIter ) + { + ScHTMLTable* pTable = GetExistingTable( (*aListIter)->GetTableId() ); + // find entry with maximum width + if( bProcessColWidth && pTable ) + aDocSize.mnCols = ::std::max( aDocSize.mnCols, pTable->GetDocSize( tdCol ) ); + // add up height of each entry + if( bProcessRowHeight ) + aDocSize.mnRows += pTable ? pTable->GetDocSize( tdRow ) : 1; + } + if( !aDocSize.mnRows ) + aDocSize.mnRows = 1; + + if( bProcessColWidth ) + CalcNeededDocSize( tdCol, rCellPos.mnCol, aCellSpan.mnCols, aDocSize.mnCols ); + if( bProcessRowHeight ) + CalcNeededDocSize( tdRow, rCellPos.mnRow, aCellSpan.mnRows, aDocSize.mnRows ); + } + } + } +} + +void ScHTMLTable::RecalcDocPos( const ScHTMLPos& rBasePos ) +{ + maDocBasePos = rBasePos; + // after the previous assignment it is allowed to call GetDocPos() methods + + // iterate through every table cell + ScHTMLEntryMap::iterator aMapIterEnd = maEntryMap.end(); + for( ScHTMLEntryMap::iterator aMapIter = maEntryMap.begin(); aMapIter != aMapIterEnd; ++aMapIter ) + { + const ScHTMLPos& rCellPos = aMapIter->first; + ScHTMLSize aCellSpan( GetSpan( rCellPos ) ); + ScHTMLPos aEntryDocPos( GetDocPos( rCellPos ) ); + + ScHTMLEntryList& rEntryList = aMapIter->second; + ScHTMLEntry* pEntry = 0; + ScHTMLEntryList::iterator aListIterEnd = rEntryList.end(); + for( ScHTMLEntryList::iterator aListIter = rEntryList.begin(); aListIter != aListIterEnd; ++aListIter ) + { + pEntry = *aListIter; + if( ScHTMLTable* pTable = GetExistingTable( pEntry->GetTableId() ) ) + { + pTable->RecalcDocPos( aEntryDocPos ); // recalc nested table + pEntry->nCol = pEntry->nRow = 0xFFFF; + sal_uInt16 nRows = pTable->GetDocSize( tdRow ); + + // use this entry to pad empty space right of table + if( mpParentTable ) // ... but not in global table + { + sal_uInt16 nStartCol = GetDocPos( tdCol, rCellPos.mnCol ) + pTable->GetDocSize( tdCol ); + sal_uInt16 nNextCol = GetDocPos( tdCol, rCellPos.mnCol + 1 ); + if( nStartCol < nNextCol ) + { + pEntry->nCol = nStartCol; + pEntry->nRow = aEntryDocPos.mnRow; + pEntry->nColOverlap = nNextCol - nStartCol; + pEntry->nRowOverlap = nRows; + } + } + aEntryDocPos.mnRow += nRows; + } + else + { + pEntry->nCol = aEntryDocPos.mnCol; + pEntry->nRow = aEntryDocPos.mnRow; + if( mpParentTable ) // do not merge in global table + pEntry->nColOverlap = GetDocSize( tdCol, rCellPos.mnCol, rCellPos.mnCol + aCellSpan.mnCols ); + ++aEntryDocPos.mnRow; + } + } + + /* pEntry points now to last entry - test if it is the only entry in this cell. + Merge rows of cell with single non-table entry. */ + if( pEntry && (pEntry == rEntryList.front()) && (pEntry->GetTableId() == SC_HTML_NO_TABLE) ) + pEntry->nRowOverlap = GetDocSize( tdRow, rCellPos.mnRow, rCellPos.mnRow + aCellSpan.mnRows ); + } +} + + +// ============================================================================ + +ScHTMLGlobalTable::ScHTMLGlobalTable( SfxItemPool& rPool, EditEngine& rEditEngine, ScEEParseList& rEEParseList, ScHTMLTableId& rnUnusedId ) : + ScHTMLTable( rPool, rEditEngine, rEEParseList, rnUnusedId ) +{ +} + +ScHTMLGlobalTable::~ScHTMLGlobalTable() +{ +} + +void ScHTMLGlobalTable::Recalc() +{ + // Fills up empty cells with a dummy entry. */ + FillEmptyCells(); + // recalc table sizes of all nested tables and this table + RecalcDocSize(); + // recalc document positions of all entries in this table and in nested tables + RecalcDocPos( GetDocPos() ); +} + + +// ============================================================================ + +ScHTMLQueryParser::ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ) : + ScHTMLParser( pEditEngine, pDoc ), + mnUnusedId( SC_HTML_GLOBAL_TABLE ), + mbTitleOn( false ) +{ + mpGlobTable.reset( new ScHTMLGlobalTable( *pPool, *pEdit, *pList, mnUnusedId ) ); + mpCurrTable = mpGlobTable.get(); +} + +ScHTMLQueryParser::~ScHTMLQueryParser() +{ +} + +sal_uInt32 ScHTMLQueryParser::Read( SvStream& rStrm ) +{ + SvKeyValueIteratorRef xValues; + SvKeyValueIterator* pAttributes = 0; + + SfxObjectShell* pObjSh = mpDoc->GetDocumentShell(); + if( pObjSh && pObjSh->IsLoading() ) + { + pAttributes = pObjSh->GetHeaderAttributes(); + } + else + { + /* When not loading, set up fake HTTP headers to force the SfxHTMLParser + to use UTF8 (used when pasting from clipboard) */ + const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); + if( pCharSet ) + { + String aContentType = String::CreateFromAscii( "text/html; charset=" ); + aContentType.AppendAscii( pCharSet ); + + xValues = new SvKeyValueIterator; + xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) ); + pAttributes = xValues; + } + } + + Link aOldLink = pEdit->GetImportHdl(); + pEdit->SetImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) ); + sal_uInt32 nErr = pEdit->Read( rStrm, EE_FORMAT_HTML, pAttributes ); + pEdit->SetImportHdl( aOldLink ); + + mpGlobTable->Recalc(); + nColMax = mpGlobTable->GetDocSize( tdCol ) - 1; + nRowMax = mpGlobTable->GetDocSize( tdRow ) - 1; + + return nErr; +} + +const ScHTMLTable* ScHTMLQueryParser::GetGlobalTable() const +{ + return mpGlobTable.get(); +} + + +// ---------------------------------------------------------------------------- + +ScHTMLTable* ScHTMLQueryParser::GetTable( ScHTMLTableId nTableId ) const +{ + if( nTableId == SC_HTML_GLOBAL_TABLE ) + return mpGlobTable.get(); + ScHTMLTable* pTable = mpGlobTable->FindNestedTable( nTableId ); + DBG_ASSERT( pTable, "ScHTMLQueryParser::GetTable - table not found" ); + if( !pTable ) + return mpGlobTable.get(); + return pTable; +} + +void ScHTMLQueryParser::ProcessToken( const ImportInfo& rInfo ) +{ +#ifdef DEBUG + HTML_TOKEN_IDS eTokenId = static_cast< HTML_TOKEN_IDS >( rInfo.nToken ); +#endif + switch( rInfo.nToken ) + { +// --- meta data --- + case HTML_META: MetaOn( rInfo ); break; // <meta> + +// --- title handling --- + case HTML_TITLE_ON: TitleOn( rInfo ); break; // <title> + case HTML_TITLE_OFF: TitleOff( rInfo ); break; // </title> + +// --- body handling --- + case HTML_BODY_ON: mpCurrTable->BodyOn( rInfo ); break; // <body> + case HTML_BODY_OFF: mpCurrTable->BodyOff( rInfo ); break; // </body> + +// --- insert text --- + case HTML_TEXTTOKEN: InsertText( rInfo ); break; // any text + case HTML_LINEBREAK: mpCurrTable->BreakOn(); break; // <br> + case HTML_HEAD1_ON: // <h1> + case HTML_HEAD2_ON: // <h2> + case HTML_HEAD3_ON: // <h3> + case HTML_HEAD4_ON: // <h4> + case HTML_HEAD5_ON: // <h5> + case HTML_HEAD6_ON: // <h6> + case HTML_PARABREAK_ON: mpCurrTable->HeadingOn(); break; // <p> + +// --- misc. contents --- + case HTML_ANCHOR_ON: mpCurrTable->AnchorOn(); break; // <a> + +// --- table handling --- + case HTML_TABLE_ON: TableOn( rInfo ); break; // <table> + case HTML_TABLE_OFF: TableOff( rInfo ); break; // </table> + case HTML_TABLEROW_ON: mpCurrTable->RowOn( rInfo ); break; // <tr> + case HTML_TABLEROW_OFF: mpCurrTable->RowOff( rInfo ); break; // </tr> + case HTML_TABLEHEADER_ON: // <th> + case HTML_TABLEDATA_ON: mpCurrTable->DataOn( rInfo ); break; // <td> + case HTML_TABLEHEADER_OFF: // </th> + case HTML_TABLEDATA_OFF: mpCurrTable->DataOff( rInfo ); break; // </td> + case HTML_PREFORMTXT_ON: PreOn( rInfo ); break; // <pre> + case HTML_PREFORMTXT_OFF: PreOff( rInfo ); break; // </pre> + +// --- formatting --- + case HTML_FONT_ON: FontOn( rInfo ); break; // <font> + + case HTML_BIGPRINT_ON: // <big> + //! TODO: store current font size, use following size + mpCurrTable->PutItem( SvxFontHeightItem( maFontHeights[ 3 ], 100, ATTR_FONT_HEIGHT ) ); + break; + case HTML_SMALLPRINT_ON: // <small> + //! TODO: store current font size, use preceding size + mpCurrTable->PutItem( SvxFontHeightItem( maFontHeights[ 0 ], 100, ATTR_FONT_HEIGHT ) ); + break; + + case HTML_BOLD_ON: // <b> + case HTML_STRONG_ON: // <strong> + mpCurrTable->PutItem( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) ); + break; + + case HTML_ITALIC_ON: // <i> + case HTML_EMPHASIS_ON: // <em> + case HTML_ADDRESS_ON: // <address> + case HTML_BLOCKQUOTE_ON: // <blockquote> + case HTML_BLOCKQUOTE30_ON: // <bq> + case HTML_CITIATION_ON: // <cite> + case HTML_VARIABLE_ON: // <var> + mpCurrTable->PutItem( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); + break; + + case HTML_DEFINSTANCE_ON: // <dfn> + mpCurrTable->PutItem( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) ); + mpCurrTable->PutItem( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); + break; + + case HTML_UNDERLINE_ON: // <u> + mpCurrTable->PutItem( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) ); + break; + } +} + +void ScHTMLQueryParser::InsertText( const ImportInfo& rInfo ) +{ + mpCurrTable->PutText( rInfo ); + if( mbTitleOn ) + maTitle.Append( rInfo.aText ); +} + +void ScHTMLQueryParser::FontOn( const ImportInfo& rInfo ) +{ + for( ScHTMLOptionIterator aIter( rInfo ); aIter.is(); ++aIter ) + { + switch( aIter->GetToken() ) + { + case HTML_O_FACE : + { + const String& rFace = aIter->GetString(); + String aFontName; + xub_StrLen nPos = 0; + while( nPos != STRING_NOTFOUND ) + { + // font list separator: VCL = ';' HTML = ',' + String aFName = rFace.GetToken( 0, ',', nPos ); + aFName.EraseLeadingAndTrailingChars(); + ScfTools::AddToken( aFontName, aFName, ';' ); + } + if ( aFontName.Len() ) + mpCurrTable->PutItem( SvxFontItem( FAMILY_DONTKNOW, + aFontName, EMPTY_STRING, PITCH_DONTKNOW, + RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) ); + } + break; + case HTML_O_SIZE : + { + sal_uInt32 nSize = bound( aIter->GetNumber(), 1UL, SC_HTML_FONTSIZES ); + mpCurrTable->PutItem( SvxFontHeightItem( maFontHeights[ nSize - 1 ], 100, ATTR_FONT_HEIGHT ) ); + } + break; + case HTML_O_COLOR : + { + Color aColor; + aIter->GetColor( aColor ); + mpCurrTable->PutItem( SvxColorItem( aColor, ATTR_FONT_COLOR ) ); + } + break; + } + } +} + +void ScHTMLQueryParser::MetaOn( const ImportInfo& rInfo ) +{ + if( mpDoc->GetDocumentShell() ) + { + sal_uInt16 nContentOpt = HTML_O_CONTENT; + rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; + HTMLParser* pParser = static_cast< HTMLParser* >( rInfo.pParser ); + const HTMLOptions* pOptions = pParser->GetOptions( &nContentOpt ); + sal_uInt16 nMetaCnt = 0; + SfxFrameHTMLParser::ParseMetaOptions( + &mpDoc->GetDocumentShell()->GetDocInfo(), + mpDoc->GetDocumentShell()->GetHeaderAttributes(), + pOptions, nMetaCnt, eEnc ); + // If the encoding is set by a META tag, it may only overwrite the + // current encoding if both, the current and the new encoding, are 1-BYTE + // encodings. Everything else cannot lead to reasonable results. + if( rtl_isOctetTextEncoding( eEnc ) && + rtl_isOctetTextEncoding( pParser->GetSrcEncoding() ) ) + { + eEnc = GetExtendedCompatibilityTextEncoding( eEnc ); + pParser->SetSrcEncoding( eEnc ); + } + } +} + +void ScHTMLQueryParser::TitleOn( const ImportInfo& rInfo ) +{ + mbTitleOn = true; + maTitle.Erase(); +} + +void ScHTMLQueryParser::TitleOff( const ImportInfo& rInfo ) +{ + if( mbTitleOn ) + { + maTitle.EraseLeadingAndTrailingChars(); + if( maTitle.Len() && mpDoc->GetDocumentShell() ) + mpDoc->GetDocumentShell()->GetDocInfo().SetTitle( maTitle ); + InsertText( rInfo ); + mbTitleOn = false; + } +} + +void ScHTMLQueryParser::TableOn( const ImportInfo& rInfo ) +{ + mpCurrTable = mpCurrTable->TableOn( rInfo ); +} + +void ScHTMLQueryParser::TableOff( const ImportInfo& rInfo ) +{ + mpCurrTable = mpCurrTable->TableOff( rInfo ); +} + +void ScHTMLQueryParser::PreOn( const ImportInfo& rInfo ) +{ + mpCurrTable = mpCurrTable->PreOn( rInfo ); +} + +void ScHTMLQueryParser::PreOff( const ImportInfo& rInfo ) +{ + mpCurrTable = mpCurrTable->PreOff( rInfo ); +} + + +// ---------------------------------------------------------------------------- + +IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo ) +{ +#ifdef DEBUG + HTML_TOKEN_IDS eTokenId = static_cast< HTML_TOKEN_IDS >( pInfo->nToken ); +#endif + switch( pInfo->eState ) + { + case HTMLIMP_START: + break; + + case HTMLIMP_NEXTTOKEN: + case HTMLIMP_UNKNOWNATTR: + ProcessToken( *pInfo ); + break; + + case HTMLIMP_INSERTPARA: + mpCurrTable->InsertPara( *pInfo ); + break; + + case HTMLIMP_SETATTR: + case HTMLIMP_INSERTTEXT: + case HTMLIMP_INSERTFIELD: + break; + + case HTMLIMP_END: + while( mpCurrTable->GetTableId() != SC_HTML_GLOBAL_TABLE ) + TableOff( *pInfo ); + break; + + default: + DBG_ERRORFILE( "ScHTMLQueryParser::HTMLImportHdl - unknown ImportInfo::eState" ); + } + return 0; +} + + +// ============================================================================ + diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index c12705f29523..984e6c001cc8 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XclExpChangeTrack.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:20:39 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 2687d934ea83..309f1d532a19 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XclImpChangeTrack.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:07 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 22054edc126f..313a2eac48a5 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -2,9 +2,9 @@ * * $RCSfile: colrowst.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:20:41 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 3fae570e6e1c..bc71287788ad 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dif.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,15 +86,17 @@ class SvNumberFormatter; class ScDocument; class ScPatternAttr; -extern const sal_Char* pKeyTABLE; -extern const sal_Char* pKeyVECTORS; -extern const sal_Char* pKeyTUPLES; -extern const sal_Char* pKeyDATA; -extern const sal_Char* pKeyBOT; -extern const sal_Char* pKeyEOD; -extern const sal_Char* pKeyTRUE; -extern const sal_Char* pKeyFALSE; -extern const sal_Char* pKeyNA; +extern const sal_Unicode pKeyTABLE[]; +extern const sal_Unicode pKeyVECTORS[]; +extern const sal_Unicode pKeyTUPLES[]; +extern const sal_Unicode pKeyDATA[]; +extern const sal_Unicode pKeyBOT[]; +extern const sal_Unicode pKeyEOD[]; +extern const sal_Unicode pKeyTRUE[]; +extern const sal_Unicode pKeyFALSE[]; +extern const sal_Unicode pKeyNA[]; +extern const sal_Unicode pKeyV[]; +extern const sal_Unicode pKey1_0[]; enum TOPIC @@ -112,7 +114,7 @@ enum DATASET { D_BOT, D_EOD, D_NUMERIC, D_STRING, D_UNKNOWN, D_SYNT_ERROR }; class DifParser { public: - ByteString aData; + String aData; double fVal; UINT32 nVector; UINT32 nVal; @@ -122,31 +124,10 @@ private: SvNumberFormatter* pNumFormatter; SvStream& rIn; BOOL bPlain; -#if __ALIGNMENT4 == 1 - static UINT32 nBOT; - static UINT32 nEOD; - static UINT32 n1_0; - static UINT16 nV; -#else - static sal_Char cBOT_0; - static sal_Char cEOD_0; - static sal_Char c1_0_0; - static sal_Char cBOT_1; - static sal_Char cEOD_1; - static sal_Char c1_0_1; - static sal_Char cBOT_2; - static sal_Char cEOD_2; - static sal_Char c1_0_2; - static sal_Char cBOT_3; - static sal_Char cEOD_3; - static sal_Char c1_0_3; - static sal_Char cV_0; - static sal_Char cV_1; -#endif - static inline BOOL IsBOT( const sal_Char* pRef ); - static inline BOOL IsEOD( const sal_Char* pRef ); - static inline BOOL Is1_0( const sal_Char* pRef ); + static inline BOOL IsBOT( const sal_Unicode* pRef ); + static inline BOOL IsEOD( const sal_Unicode* pRef ); + static inline BOOL Is1_0( const sal_Unicode* pRef ); public: DifParser( SvStream&, const UINT32 nOption, ScDocument&, CharSet ); @@ -154,75 +135,59 @@ public: DATASET GetNextDataset( void ); - const sal_Char* ScanIntVal( const sal_Char* pStart, UINT32& rRet ); - BOOL ScanFloatVal( const sal_Char* pStart ); + const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, UINT32& rRet ); + BOOL ScanFloatVal( const sal_Unicode* pStart ); - inline BOOL IsNumber( const sal_Char cChar ); - inline BOOL IsNumberEnding( const sal_Char cChar ); + inline BOOL IsNumber( const sal_Unicode cChar ); + inline BOOL IsNumberEnding( const sal_Unicode cChar ); - static inline BOOL IsV( const sal_Char* pRef ); + static inline BOOL IsV( const sal_Unicode* pRef ); inline BOOL IsPlain( void ) const; }; -inline BOOL DifParser::IsBOT( const sal_Char* pRef ) +inline BOOL DifParser::IsBOT( const sal_Unicode* pRef ) { -#if __ALIGNMENT4 == 1 - return ( nBOT == *( ( UINT32* ) pRef ) ); -#else - return ( pRef[ 0 ] == cBOT_0 && - pRef[ 1 ] == cBOT_1 && - pRef[ 2 ] == cBOT_2 && - pRef[ 3 ] == cBOT_3 ); -#endif + return ( pRef[ 0 ] == pKeyBOT[0] && + pRef[ 1 ] == pKeyBOT[1] && + pRef[ 2 ] == pKeyBOT[2] && + pRef[ 3 ] == pKeyBOT[3] ); } -inline BOOL DifParser::IsEOD( const sal_Char* pRef ) +inline BOOL DifParser::IsEOD( const sal_Unicode* pRef ) { -#if __ALIGNMENT4 == 1 - return ( nEOD == *( ( UINT32* ) pRef ) ); -#else - return ( pRef[ 0 ] == cEOD_0 && - pRef[ 1 ] == cEOD_1 && - pRef[ 2 ] == cEOD_2 && - pRef[ 3 ] == cEOD_3 ); -#endif + return ( pRef[ 0 ] == pKeyEOD[0] && + pRef[ 1 ] == pKeyEOD[1] && + pRef[ 2 ] == pKeyEOD[2] && + pRef[ 3 ] == pKeyEOD[3] ); } -inline BOOL DifParser::Is1_0( const sal_Char* pRef ) +inline BOOL DifParser::Is1_0( const sal_Unicode* pRef ) { -#if __ALIGNMENT4 == 1 - return ( n1_0 == *( ( UINT32* ) pRef ) ); -#else - return ( pRef[ 0 ] == c1_0_0 && - pRef[ 1 ] == c1_0_1 && - pRef[ 2 ] == c1_0_2 && - pRef[ 3 ] == c1_0_3 ); -#endif + return ( pRef[ 0 ] == pKey1_0[0] && + pRef[ 1 ] == pKey1_0[1] && + pRef[ 2 ] == pKey1_0[2] && + pRef[ 3 ] == pKey1_0[3] ); } -inline BOOL DifParser::IsV( const sal_Char* pRef ) +inline BOOL DifParser::IsV( const sal_Unicode* pRef ) { -#if __ALIGNMENT4 == 1 - return ( nV == *( ( UINT16 * ) pRef ) ); -#else - return ( pRef[ 0 ] == cV_0 && - pRef[ 1 ] == cV_1 ); -#endif + return ( pRef[ 0 ] == pKeyV[0] && + pRef[ 1 ] == pKeyV[1] ); } -inline BOOL DifParser::IsNumber( const sal_Char cChar ) +inline BOOL DifParser::IsNumber( const sal_Unicode cChar ) { return ( cChar >= '0' && cChar <= '9' ); } -inline BOOL DifParser::IsNumberEnding( const sal_Char cChar ) +inline BOOL DifParser::IsNumberEnding( const sal_Unicode cChar ) { return ( cChar == 0x00 ); } diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 90384518866d..e9b482a65f37 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -2,9 +2,9 @@ * * $RCSfile: eeparser.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,13 +120,21 @@ struct ScEEParseEntry USHORT nOffset; // HTML PixelOffset USHORT nWidth; // HTML PixelWidth BOOL bHasGraphic; // HTML any image loaded + bool bEntirePara; // TRUE = use entire paragraph, false = use selection ScEEParseEntry( SfxItemPool* pPool ) : aItemSet( *pPool ), pValStr( NULL ), pNumStr( NULL ), pName( NULL ), pImageList( NULL ), nCol((USHORT)~0), nRow((USHORT)~0), nTab(0), nColOverlap(1), nRowOverlap(1), - nOffset(0), nWidth(0), bHasGraphic(FALSE) + nOffset(0), nWidth(0), bHasGraphic(FALSE), bEntirePara(true) + {} + ScEEParseEntry( const SfxItemSet& rItemSet ) : + aItemSet( rItemSet ), pValStr( NULL ), + pNumStr( NULL ), pName( NULL ), pImageList( NULL ), + nCol((USHORT)~0), nRow((USHORT)~0), nTab(0), + nColOverlap(1), nRowOverlap(1), + nOffset(0), nWidth(0), bHasGraphic(FALSE), bEntirePara(true) {} ~ScEEParseEntry() { diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx index 1aca20f52dcc..58fc05d568e7 100644 --- a/sc/source/filter/inc/excdefs.hxx +++ b/sc/source/filter/inc/excdefs.hxx @@ -2,9 +2,9 @@ * * $RCSfile: excdefs.hxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:20:41 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,11 +70,6 @@ #define EXC_TABBUF_INVALID 0xFFFF -// Style info ================================================================= - -#define EXC_ROT_STACKED 0xFF - - // (0x001C) NOTE ============================================================== #define EXC_NOTE5_MAXTEXT 2048 diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index b79baa869e4a..a1be69b8de34 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: excdoc.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:20:41 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index d787fd48fca3..f6423f171812 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -2,9 +2,9 @@ * * $RCSfile: excform.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:20:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:04:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,7 @@ #ifndef _EXCFORM_HXX #define _EXCFORM_HXX -#ifndef _XLTOOLS_HXX +#ifndef SC_XLTOOLS_HXX #include "xltools.hxx" #endif diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 4eee3395e38a..4f2812158d9e 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -2,9 +2,9 @@ * * $RCSfile: excimp8.hxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-10 14:05:37 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,8 +107,6 @@ class XclImpAutoFilterBuffer; class XclImpWebQueryBuffer; -class FilterProgressBar; - class ExcCondForm : private ExcRoot, private XclImpRoot @@ -151,9 +149,6 @@ class ExcCondFormList : protected List class ImportExcel8 : public ImportExcel { protected: - XclImpObjectManager aObjManager; - BOOL bObjSection; - ExcScenarioList aScenList; XclImpPivotTableList aPivotTabList; @@ -165,6 +160,8 @@ class ImportExcel8 : public ImportExcel XclImpAutoFilterBuffer* pAutoFilterBuffer; // ranges for autofilter and advanced filter + BOOL bObjSection; + BOOL bHasBasic; BOOL bFirstScl; // only one Scl-Record has to be read per chart! @@ -225,9 +222,7 @@ class ImportExcel8 : public ImportExcel virtual void EndAllChartObjects( void ); // -> excobj.cxx virtual void PostDocLoad( void ); - virtual FltError ReadChart8( ScfProgressBar&, const BOOL bOwnTab ); - void CreateTmpCtrlStorage( void ); - // if possible generate a SvxMSConvertOCXControls compatibel storage + virtual FltError ReadChart8( ScfSimpleProgressBar&, const BOOL bOwnTab ); public: ImportExcel8( @@ -256,10 +251,15 @@ private: BOOL bActive; BOOL bHasDropDown; BOOL bHasConflict; + BOOL bCriteria; + BOOL bAutoOrAdvanced; + ScRange aCriteriaRange; + String aFilterName; void CreateFromDouble( String& rStr, double fVal ); void SetCellAttribs(); void InsertQueryParam(); + void AmendAFName(const BOOL bUseUnNamed); protected: public: @@ -280,13 +280,18 @@ public: inline void Activate() { bActive = TRUE; } void SetAdvancedRange( const ScRange* pRange ); void SetExtractPos( const ScAddress& rAddr ); - void Apply(); + inline void SetAutoOrAdvanced() { bAutoOrAdvanced = TRUE; } + void Apply( const BOOL bUseUnNamed = FALSE ); + void CreateScDBData( const BOOL bUseUnNamed ); + void EnableRemoveFilter(); }; class XclImpAutoFilterBuffer : private List { private: + UINT16 nAFActiveCount; + inline XclImpAutoFilterData* _First() { return (XclImpAutoFilterData*) List::First(); } inline XclImpAutoFilterData* _Next() { return (XclImpAutoFilterData*) List::Next(); } @@ -294,6 +299,7 @@ private: { List::Insert( pData, LIST_APPEND ); } protected: public: + XclImpAutoFilterBuffer(); virtual ~XclImpAutoFilterBuffer(); void Insert( RootData* pRoot, const ScRange& rRange, @@ -304,6 +310,8 @@ public: XclImpAutoFilterData* GetByTab( UINT16 nTab ); BOOL HasDropDown( UINT16 nCol, UINT16 nRow, UINT16 nTab ); + inline void IncrementActiveAF() { nAFActiveCount++; } + inline BOOL UseUnNamed() { return nAFActiveCount == 1; } }; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 897f8b80d676..d2487e6eaa46 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -2,9 +2,9 @@ * * $RCSfile: excrecds.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:07 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -354,34 +354,6 @@ public: }; -//--------------------------------------------------------- class ExcDummy_XF - -// Ersatz fuer Default XF Records - -class ExcDummy_XF : public ExcDummyRec -{ -private: - static const BYTE pMyData[]; - static const ULONG nMyLen; -public: - virtual ULONG GetLen( void ) const; - virtual const BYTE* GetData( void ) const; -}; - - -//------------------------------------------------------ class ExcDummy_Style - -// Ersatz fuer Default Style Records - -class ExcDummy_Style : public ExcDummyRec -{ -private: - static const BYTE pMyData[]; - static const ULONG nMyLen; -public: - virtual ULONG GetLen( void ) const; - virtual const BYTE* GetData( void ) const; -}; - - //------------------------------------------------------ class ExcBundlesheet - class ExcBundlesheetBase : public ExcRecord @@ -493,8 +465,7 @@ protected: const ScAddress rPos, const ScPatternAttr* pAttr, RootData& rRootData, - const ULONG nAltNumForm = NUMBERFORMAT_ENTRY_NOT_FOUND, - BOOL bForceAltNumForm = FALSE ); + const ULONG nAltNumForm = NUMBERFORMAT_ENTRY_NOT_FOUND ); virtual void SaveCont( XclExpStream& rStrm ); virtual void SaveDiff( XclExpStream& rStrm ); @@ -697,6 +668,21 @@ public: virtual UINT16 GetNum( void ) const; }; +/*----------------------------------------------------------------------*/ + +class ExcFmlaResultStr : public XclExpRecord +{ +private: + XclExpString maResultText; + +public: + + ExcFmlaResultStr(const XclExpString &aFmlaText); + virtual ~ExcFmlaResultStr(); + +private: + virtual void WriteBody( XclExpStream& rStrm ); +}; //---------------------------------------------------------- class ExcFormula - @@ -706,6 +692,7 @@ private: sal_Char* pData; UINT16 nFormLen; BOOL bShrdFmla; + ScFormulaCell* pFCell; virtual void SaveDiff( XclExpStream& rStrm ); // instead of SaveCont() virtual ULONG GetDiffLen( void ) const; @@ -716,12 +703,13 @@ public: const ScPatternAttr *pAttr, RootData& rRootData, const ULONG nAltNumForm, - BOOL bForceAltNumForm, const ScTokenArray& rCode, ExcArray** ppArray = NULL, ScMatrixMode eMM = MM_NONE, ExcShrdFmla** ppShrdFmla = NULL, - ExcArrays* pShrdFmlas = NULL ); + ExcArrays* pShrdFmlas = NULL, + ScFormulaCell* pFCell = NULL, + ExcFmlaResultStr **pFormulaResult = NULL); ~ExcFormula(); inline const ScAddress& GetPosition() const { return aPos; } // from ExcCell @@ -729,6 +717,8 @@ public: void SetTableOp( USHORT nCol, USHORT nRow ); // for TableOp export virtual UINT16 GetNum( void ) const; + + static BYTE ScErrorCodeToExc(UINT16 nErrorCode); }; @@ -838,6 +828,7 @@ private: void SetName( const String& rRangeName ); void SetUniqueName( const String& rRangeName ); BOOL SetBuiltInName( const String& rName, UINT8 nKey ); + BOOL IsBuiltInAFName( const String& rName, UINT8 nKey ); virtual void SaveCont( XclExpStream& rStrm ); @@ -1076,7 +1067,6 @@ private: public: ExcColinfo( UINT16 nCol, UINT16 nTab, UINT16 nXF, RootData&, ExcEOutline& rOutline ); - void SetWidth( UINT16 nWidth, double fColScale ); // if expandable, delete rpExp and set to NULL void Expand( ExcColinfo*& rpExp ); @@ -1086,68 +1076,6 @@ public: }; -//--------------------------------------------------------------- class ExcXf - - -class ExcXf : public ExcRecord, protected XclExpRoot -{ -protected: - UINT16 nIfnt; - UINT16 nIfmt; - - UINT16 nOffs8; - - UINT32 nIcvForeSer; - UINT32 nIcvBackSer; - UINT16 nFls; - - UINT32 nIcvTopSer; - UINT32 nIcvBotSer; - UINT32 nIcvLftSer; - UINT32 nIcvRigSer; - - UINT16 nDgTop; - UINT16 nDgBottom; - UINT16 nDgLeft; - UINT16 nDgRight; - - XclHorAlign eAlc; - XclVerAlign eAlcV; - XclTextOrient eOri; - BOOL bFWrap; - BOOL bFSxButton; - - BOOL bStyle; - - BOOL bAtrNum; - BOOL bAtrFnt; - BOOL bAtrAlc; - BOOL bAtrBdr; - BOOL bAtrPat; - BOOL bAtrProt; - -#ifdef DBG_UTIL - static UINT16 nObjCnt; -#endif - - virtual void SaveCont( XclExpStream& rStrm ); - -public: - ExcXf( const XclExpRoot& rRoot, - UINT16 nFont, UINT16 nForm, const ScPatternAttr*, BOOL& rbLineBreak, - BOOL bStyle = FALSE ); - // rbLineBreak = TRUE erzwingt Wrap, - // return von rbLineBreak enthaelt immer tatsaechliches Wrap -#ifdef DBG_UTIL - virtual ~ExcXf(); -#endif - - virtual UINT16 GetNum( void ) const; - virtual ULONG GetLen( void ) const; - - static void ScToExcBorderLine( XclExpPalette& rPalette, const SvxBorderLine*, UINT32& rIcvSer, UINT16& rDg ); -}; - - //------------------------------------------------------ class ExcExterncount - class ExcExterncount : public ExcRecord, ExcRoot @@ -1250,68 +1178,6 @@ public: }; -//------------------------------------------------------------ class UsedList - - -class UsedList : public List, public ExcEmptyRec -{ -private: -protected: - UINT16 nBaseIndex; - -public: - inline UsedList() {} - - inline void SetBaseIndex( UINT16 nNewVal ) { nBaseIndex = nNewVal; } - - virtual void Save( XclExpStream& rStrm ); -}; - - -//-------------------------------------------------------- class UsedAttrList - -// a list of ENTRY structs - -class UsedAttrList : public UsedList, ExcRoot -{ -private: - struct ENTRY - { - const ScPatternAttr* pPattAttr; - ExcXf* pXfRec; - BOOL bLineBreak; - ULONG nAltNumForm; - - inline ENTRY() : nAltNumForm( NUMBERFORMAT_ENTRY_NOT_FOUND ), pXfRec( NULL ) {} - inline ~ENTRY() { if( pXfRec ) delete pXfRec; } - - inline BOOL Equal( const ScPatternAttr* p, const ULONG n ) const - { - return pPattAttr == p && nAltNumForm == n; - } - }; - - inline ENTRY* _First() { return (ENTRY*) List::First(); } - inline ENTRY* _Next() { return (ENTRY*) List::Next(); } - - XclExpFontBuffer& rFntLst; - XclExpNumFmtBuffer& rFrmLst; - - void AddNewXF( const ScPatternAttr* pAttr, - const BOOL bStyle, const BOOL bExplLineBreak, - const ULONG nAltNumForm = NUMBERFORMAT_ENTRY_NOT_FOUND, - BOOL bForceAltNumForm = FALSE ); - -public: - UsedAttrList( RootData* pRD ); - virtual ~UsedAttrList(); - UINT16 Find( const ScPatternAttr* pSearch, const BOOL bStyle = FALSE, - const ULONG nAltNumForm = NUMBERFORMAT_ENTRY_NOT_FOUND, - BOOL bForceAltNumForm = FALSE ); - UINT16 FindWithLineBreak( const ScPatternAttr* pSearch ); - - virtual void Save( XclExpStream& rStrm ); // overloaded to get ExcRecord from ENTRY -}; - - // XclExpWsbool =============================================================== class XclExpWsbool : public XclExpUInt16Record @@ -1685,6 +1551,7 @@ public: }; + //--------------------------- class XclExpTableOp, class XclExpTableOpManager - // multiple operations aka table operations (record TABLE) diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 803bf2a200bc..4232eb93bde2 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -2,9 +2,9 @@ * * $RCSfile: exp_op.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:20:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 28068cc40556..c2603a89c059 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fapihelper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index 9a31b219d7df..cd34460dce80 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -2,9 +2,9 @@ * * $RCSfile: filt_pch.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dr $ $Date: 2001-10-18 14:55:34 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -348,8 +348,6 @@ #include <tools/urlobj.hxx> #include <svx/colritem.hxx> #include <vcl/wrkwin.hxx> -#include <fltprgrs.hxx> -#include <excsst.hxx> #include <excimp8.hxx> #include <excscen.hxx> #include <com/sun/star/frame/XFrameActionListener.hpp> diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 8bfe4c50f8fb..a13096323656 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fprogressbar.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:09 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,21 +64,89 @@ #ifndef SC_FPROGRESSBAR_HXX #define SC_FPROGRESSBAR_HXX +#include "globstr.hrc" + #ifndef SC_FTOOLS_HXX #include "ftools.hxx" #endif +class SfxObjectShell; class ScProgress; // ============================================================================ -/** Progress bar for complex progress representation. */ +/** Progress bar for complex progress representation. + @descr The progress bar contains one or more segments, each with customable + size. Each segment is represented by a unique identifier. While showing the + progress bar, several segments can be started simultaneously. The progress + bar displays the sum of all started segments on screen. + + It is possible to create a full featured ScfProgressBar object from + any segment. This sub progress bar works only on that parent segment, with + the effect, that if the sub progress bar reaches 100%, the parent segment is + filled completely. + + After adding segments, the progress bar has to be activated. In this step the + total size of all segments is calculated. Therefore it is not possible to add + more segments from here. + + If a sub progress bar is created from a segment, and the main progress bar + has been started (but not the sub progress bar), it is still possible to add + segments to the sub progress bar. It is not allowed to get the sub progress bar + of a started segment. And it is not allowed to modify the segment containing + a sub progress bar directly. + + Following a few code examples, how to use the progress bar. + + Example 1: Simple progress bar (see also ScfSimpleProgressBar below). + + ScfProgressBar aProgress( ... ); + sal_Int32 nSeg = aProgress.AddSegment( 50 ); // segment with 50 steps (1 step = 2%) + + aProgress.ActivateSegment( nSeg ); // start segment nSeg + aProgress.Progress(); // 0->1; display: 2% + aProgress.Progress( 9 ); // 1->9; display: 18% + + Example 2: Progress bar with 2 segments. + + ScfProgressBar aProgress( ... ); + sal_Int32 nSeg1 = aProgress.AddSegment( 70 ); // segment with 70 steps + sal_Int32 nSeg2 = aProgress.AddSegment( 30 ); // segment with 30 steps + // both segments: 100 steps (1 step = 1%) + + aProgress.ActivateSegment( nSeg1 ); // start first segment + aProgress.Progress(); // 0->1, display: 1% + aProgress.Progress( 3 ); // 1->3, display: 3% + aProgress.ActivateSegment( nSeg2 ); // start second segment + aProgress.Progress( 5 ); // 0->5, display: 8% (5+3 steps) + aProgress.ActivateSegment( nSeg1 ); // continue with first segment + aProgress.Progress(); // 3->4, display: 9% (5+4 steps) + + Example 3: Progress bar with 2 segments, one contains a sub progress bar. + + ScfProgressBar aProgress( ... ); + sal_Int32 nSeg1 = aProgress.AddSegment( 75 ); // segment with 75 steps + sal_Int32 nSeg2 = aProgress.AddSegment( 25 ); // segment with 25 steps + // both segments: 100 steps (1 step = 1%) + + aProgress.ActivateSegment( nSeg1 ); // start first segment + aProgress.Progress(); // 0->1, display: 1% + + ScfProgressBar& rSubProgress = aProgress.GetSegmentProgressBar( nSeg2 ); + // sub progress bar from second segment + sal_Int32 nSubSeg = rSubProgress.AddSegment( 5 ); // 5 steps, mapped to second segment + // => 1 step = 5 steps in parent = 5% + + rSubProgress.ActivateSegment( nSubSeg ); // start the segment (auto activate parent segment) + rSubProgress.Progress(); // 0->1 (0->5 in parent); display: 6% (1+5) + + // not allowed (second segment active): aProgress.Progress(); + // not allowed (first segment not empty): aProgress.GetSegmentProgressBar( nSeg1 ); + */ class ScfProgressBar : ScfNoCopy { private: - typedef ::std::auto_ptr< ScProgress > ScProgressPtr; - /** Contains all data of a segment of the progress bar. */ struct ScfProgressSegment { @@ -92,10 +160,14 @@ private: ~ScfProgressSegment(); }; - ScfDelList< ScfProgressSegment > maSegments; /// List of progress segments. + typedef ::std::auto_ptr< ScProgress > ScProgressPtr; + typedef ScfDelList< ScfProgressSegment > ScfSegmentList; + + ScfSegmentList maSegments; /// List of progress segments. String maText; /// UI string for system progress. ScProgressPtr mpSysProgress; /// System progress bar. + SfxObjectShell* mpDocShell; /// The document shell for the progress bar. ScfProgressBar* mpParentProgress; /// Parent progress bar, if this is a segment progress bar. ScfProgressSegment* mpParentSegment; /// Parent segment, if this is a segment progress bar. ScfProgressSegment* mpCurrSegment; /// Current segment for progress. @@ -107,24 +179,24 @@ private: bool mbInProgress; /// true = progress bar started. public: - /** Creates a system progress bar with a resource string. */ - explicit ScfProgressBar( const String& rText ); - ~ScfProgressBar(); + explicit ScfProgressBar( SfxObjectShell* pDocShell, const String& rText ); + explicit ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ); + virtual ~ScfProgressBar(); /** Adds a new segment to the progress bar. @return the identifier of the segment. */ - sal_uInt32 AddSegment( sal_uInt32 nSize ); + sal_Int32 AddSegment( sal_uInt32 nSize ); /** Returns a complete progress bar for the specified segment. @descr The progress bar can be used to create sub segments inside of the segment. Do not delete it (done by root progress bar)! @return A reference to an ScfProgressBar connected to the segment. */ - ScfProgressBar& GetSegmentProgressBar( sal_uInt32 nSegment ); + ScfProgressBar& GetSegmentProgressBar( sal_Int32 nSegment ); /** Returns true, if any progress segment has been started. */ inline bool IsStarted() const { return mbInProgress; } /** Starts the progress bar or activates another segment. */ - void ActivateSegment( sal_uInt32 nSegment ); + void ActivateSegment( sal_Int32 nSegment ); /** Starts the progress bar (with first segment). */ inline void Activate() { ActivateSegment( 0 ); } /** Set current segment to the specified position. */ @@ -135,15 +207,16 @@ public: private: /** Used to create sub progress bars. */ explicit ScfProgressBar( - ScfProgressBar* pParProgress, + ScfProgressBar& rParProgress, ScfProgressSegment* pParSegment ); - /** Returns the segment specified by list index. */ - ScfProgressSegment* GetSegment( sal_uInt32 nSegment ) const; + /** Initializes all members on construction. */ + void Init( SfxObjectShell* pDocShell ); + /** Returns the segment specified by list index. */ + ScfProgressSegment* GetSegment( sal_Int32 nSegment ) const; /** Activates progress bar and sets current segment. */ void SetCurrSegment( ScfProgressSegment* pSegment ); - /** Increases mnTotalPos and calls the system progress bar. */ void IncreaseProgressBar( sal_uInt32 nDelta ); }; @@ -151,5 +224,52 @@ private: // ============================================================================ +/** A simplified progress bar with only one segment. */ +class ScfSimpleProgressBar +{ +private: + ScfProgressBar maProgress; /// The used progress bar. + +public: + explicit ScfSimpleProgressBar( sal_uInt32 nSize, SfxObjectShell* pDocShell, const String& rText ); + explicit ScfSimpleProgressBar( sal_uInt32 nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ); + + /** Set progress bar to the specified position. */ + inline void Progress( sal_uInt32 nPos ) { maProgress.Progress( nPos ); } + /** Increase progress bar by 1. */ + inline void Progress() { maProgress.Progress(); } + +private: + /** Initializes and starts the progress bar. */ + void Init( sal_uInt32 nSize ); +}; + + +// ============================================================================ + +/** A simplified progress bar based on the stream position of an existing stream. */ +class ScfStreamProgressBar +{ +private: + typedef ::std::auto_ptr< ScfSimpleProgressBar > ScfSimpleProgressBarPtr; + + ScfSimpleProgressBarPtr mpProgress; /// The used progress bar. + SvStream& mrStrm; /// The used stream. + +public: + explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ); + explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, sal_uInt16 nResId = STR_LOAD_DOC ); + + /** Sets the progress bar to the current stream position. */ + void Progress(); + +private: + /** Initializes and starts the progress bar. */ + void Init( SfxObjectShell* pDocShell, const String& rText ); +}; + + +// ============================================================================ + #endif diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 86c8c4798ec4..31545eebe12e 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ftools.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:09 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,13 +83,12 @@ #include <memory> -class SvStream; - - // Global static helpers ====================================================== -/** Returns the size of a STATIC data array. */ +/** Expands to the size of a STATIC data array. */ #define STATIC_TABLE_SIZE( array ) (sizeof(array)/sizeof(*(array))) +/** Expands to a pointer behind the last element of a STATIC data array (like STL end()). */ +#define STATIC_TABLE_END( array ) ((array)+STATIC_TABLE_SIZE(array)) // Read from bitfields -------------------------------------------------------- @@ -130,8 +129,8 @@ inline void set_flag( Type& rnBitField, Type nMask, bool bSet = true ) template< typename Type, typename InsertType > void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal_uInt8 nBitCount ) { - Type nMask = ((1UL << nBitCount) - 1); - Type nNewValue = static_cast< Type >( nValue ) & nMask; + sal_uInt32 nMask = ((1UL << nBitCount) - 1); + Type nNewValue = static_cast< Type >( nValue & nMask ); (rnBitField &= ~(nMask << nStartBit)) |= (nNewValue << nStartBit); } @@ -196,15 +195,13 @@ class ScfNoInstance : private ScfNoCopy {}; // ============================================================================ +class SvStorage; +class SvStorageStreamRef; +class SvStream; + /** Contains static methods used anywhere in the filters. */ class ScfTools : ScfNoInstance { -private: - static const String maHTMLDoc; /// Built-in name for an HTML document. - static const String maHTMLTables; /// Built-in name for all HTML tables. - static const String maHTMLTableIndex; /// Built-in prefix for an HTML table index. - static const String maHTMLTableName; /// Built-in prefix for an HTML table name. - public: // *** common methods *** @@ -232,22 +229,35 @@ public: // *** conversion of names *** - /** Converts an Excel name to a valid Calc name. - @param bKeepPeriod false = '.' will be converted to '_'; true = '.' leaves unmodified. */ - static void ConvertName( String& rName, bool bKeepPeriod = false ); + /** Converts an external name to a valid Calc sheet name. + @descr Sheet names in Calc may contain letters, digits, underscores, and spaces + (space characters are not allowed at first position). */ + static void ConvertToScSheetName( String& rName ); + /** Converts an external name to a valid Calc defined name or database range name. + @descr Defined names in Calc may contain letters, digits (*), underscores, periods (*), + colons (*), question marks, and dollar signs. + (*) = not allowed at first position. */ + static void ConvertToScDefinedName( String& rName ); + +// *** streams and storages *** + + /** Tries to open the stream with the specified name in the passed storage (read-only). */ + static const SvStorageStreamRef OpenStorageStreamRead( SvStorage* pStorage, const String& rStrmName ); + /** Tries to create or open a stream with the specified name in the passed storage (read/write). */ + static const SvStorageStreamRef OpenStorageStreamWrite( SvStorage* pStorage, const String& rStrmName ); // *** byte string import operations *** /** Reads and returns a zero terminted byte string. */ static ByteString ReadCString( SvStream& rStrm ); /** Reads and returns a zero terminted byte string. */ - static inline String ReadCString( SvStream& rStrm, CharSet eSrc ) + inline static String ReadCString( SvStream& rStrm, CharSet eSrc ) { return String( ReadCString( rStrm ), eSrc ); } /** Reads and returns a zero terminted byte string and decreases a stream counter. */ static ByteString ReadCString( SvStream& rStrm, sal_Int32& rnBytesLeft ); /** Reads and returns a zero terminted byte string and decreases a stream counter. */ - static inline String ReadCString( SvStream& rStrm, sal_Int32& rnBytesLeft, CharSet eSrc ) + inline static String ReadCString( SvStream& rStrm, sal_Int32& rnBytesLeft, CharSet eSrc ) { return String( ReadCString( rStrm, rnBytesLeft ), eSrc ); } /** Appends a zero terminted byte string. */ @@ -258,25 +268,29 @@ public: // *** HTML table names <-> named range names *** /** Returns the built-in range name for an HTML document. */ - static inline const String& GetHTMLDocName() { return maHTMLDoc; } + static const String& GetHTMLDocName(); /** Returns the built-in range name for all HTML tables. */ - static inline const String& GetHTMLTablesName() { return maHTMLTables; } + static const String& GetHTMLTablesName(); /** Returns the built-in range name for an HTML table, specified by table index. */ static String GetNameFromHTMLIndex( sal_uInt32 nIndex ); /** Returns the built-in range name for an HTML table, specified by table name. */ static String GetNameFromHTMLName( const String& rTabName ); /** Returns true, if rSource is the built-in range name for an HTML document. */ - static inline bool IsHTMLDocName( const String& rSource ) - { return rSource.EqualsIgnoreCaseAscii( maHTMLDoc ) == TRUE; } + static bool IsHTMLDocName( const String& rSource ); /** Returns true, if rSource is the built-in range name for all HTML tables. */ - static inline bool IsHTMLTablesName( const String& rSource ) - { return rSource.EqualsIgnoreCaseAscii( maHTMLTables ) == TRUE; } + static bool IsHTMLTablesName( const String& rSource ); /** Converts a built-in range name to an HTML table name. @param rSource The string to be determined. @param rName The HTML table name. @return true, if conversion was successful. */ static bool GetHTMLNameFromName( const String& rSource, String& rName ); + +private: + /** Returns the prefix for table index names. */ + static const String& GetHTMLIndexPrefix(); + /** Returns the prefix for table names. */ + static const String& GetHTMLNamePrefix(); }; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 541d158d2939..73563659e433 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlpars.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dr $ $Date: 2001-04-06 12:38:30 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,12 +66,43 @@ #include <tools/stack.hxx> #endif +#include <memory> +#include <vector> +#include <list> +#include <map> + #include "rangelst.hxx" #include "eeparser.hxx" -#define SC_HTML_FONTSIZES 7 // wie Export, HTML-Options +const sal_uInt32 SC_HTML_FONTSIZES = 7; // wie Export, HTML-Options #define SC_HTML_OFFSET_TOL 10 // Pixeltoleranz fuer SeekOffset +// ============================================================================ +// BASE class for HTML parser classes +// ============================================================================ + +class ScHTMLTable; + +/** Base class for HTML parser classes. */ +class ScHTMLParser : public ScEEParser +{ +protected: + sal_uInt32 maFontHeights[ SC_HTML_FONTSIZES ]; + ScDocument* mpDoc; /// The destination document. + +public: + explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); + virtual ~ScHTMLParser(); + + virtual sal_uInt32 Read( SvStream& rStrm ) = 0; + + /** Returns the "global table" which contains the entire HTML document. */ + virtual const ScHTMLTable* GetGlobalTable() const = 0; +}; + + +// ============================================================================ + SV_DECL_VARARR_SORT( ScHTMLColOffset, ULONG, 16, 4); struct ScHTMLTableStackEntry @@ -123,161 +154,20 @@ struct ScHTMLAdjustStackEntry DECLARE_STACK( ScHTMLAdjustStack, ScHTMLAdjustStackEntry* ); -//------------------------------------------------------------------------ - -enum ScHTMLTableDataKey { tdCol, tdRow }; - -class ScHTMLTableDataTable; - -class ScHTMLTableData // data for one HTML table -{ -private: - String aTableName; // <TABLE ID="name"> - Table aColCount; // count of cells per HTML column - Table aRowCount; // count of cells per HTML row - USHORT nFirstCol; // first column index - USHORT nFirstRow; // first row index - USHORT nLastCol; // last column index - USHORT nLastRow; // last row index - USHORT nColSpan; // column spanning of the parent cell - USHORT nRowSpan; // row spanning of the parent cell - USHORT nDocCol; // resulting position in ScDoc - USHORT nDocRow; // resulting position in ScDoc - BOOL bBorderOn; // table borders - - ScHTMLTableDataTable* pNestedTables; // table of nested HTML tables - - inline Table& GetDataTable( ScHTMLTableDataKey eCRKey ) - { return (eCRKey == tdCol) ? aColCount : aRowCount; } - inline const Table& GetDataTable( ScHTMLTableDataKey eCRKey ) const - { return (eCRKey == tdCol) ? aColCount : aRowCount; } - - static USHORT GetCount( const Table& rDataTab, ULONG nIndex ); - static USHORT GetSize( const Table& rDataTab, ULONG nStart, ULONG nEnd ); - - USHORT CalcDocPos( ScHTMLTableDataKey eCRKey, ULONG nIndex ) const; - USHORT CalcSpan( ScHTMLTableDataKey eCRKey, ULONG nIndex, USHORT nSpan ) const; - - void SetMaxCount( Table& rDataTab, ULONG nIndex, USHORT nCount ); - void ChangeDocCoord( short nColDiff, short nRowDiff ); - - void RecalcSizeDim( ScHTMLTableDataKey eCRKey ); - -public: - ScHTMLTableData( - const String& rTabName, - USHORT _nFirstCol, USHORT _nFirstRow, - USHORT _nColSpan, USHORT _nRowSpan, - BOOL bBorder ); - ~ScHTMLTableData(); - - inline USHORT GetFirstCol() const { return nFirstCol; } - inline USHORT GetFirstRow() const { return nFirstRow; } - inline USHORT GetLastCol() const { return nLastCol; } - inline USHORT GetLastRow() const { return nLastRow; } - inline const String& GetTableName() const { return aTableName; } - void GetRange( ScRange& rRange ) const; - - inline USHORT GetFirst( ScHTMLTableDataKey eCRKey ) const - { return (eCRKey == tdCol) ? nFirstCol : nFirstRow; } - inline USHORT GetLast( ScHTMLTableDataKey eCRKey ) const - { return (eCRKey == tdCol) ? nLastCol : nLastRow; } - inline USHORT GetDocPos( ScHTMLTableDataKey eCRKey ) const - { return (eCRKey == tdCol) ? nDocCol : nDocRow; } - inline USHORT GetSpan( ScHTMLTableDataKey eCRKey ) const - { return (eCRKey == tdCol) ? nColSpan : nRowSpan; } - inline USHORT GetCount( ScHTMLTableDataKey eCRKey, ULONG nIndex ) const - { return GetCount( GetDataTable( eCRKey ), nIndex ); } - inline USHORT GetSize( ScHTMLTableDataKey eCRKey ) const - { return GetSize( GetDataTable( eCRKey ), GetFirst( eCRKey ), GetLast( eCRKey ) ); } - - inline USHORT CalcDocCol( ULONG nIndex ) const { return CalcDocPos( tdCol, nIndex ); } - inline USHORT CalcDocRow( ULONG nIndex ) const { return CalcDocPos( tdRow, nIndex ); } - inline USHORT CalcColSpan( ULONG nIndex, USHORT nSpan ) const { return CalcSpan( tdCol, nIndex, nSpan ); } - inline USHORT CalcRowSpan( ULONG nIndex, USHORT nSpan ) const { return CalcSpan( tdRow, nIndex, nSpan ); } - - ScHTMLTableData* GetNestedTable( ULONG nTab ) const; - - ScHTMLTableData* InsertNestedTable( - ULONG nTab, const String& rTabName, - USHORT _nFirstCol, USHORT _nFirstRow, - USHORT _nColSpan, USHORT _nRowSpan, - BOOL bBorder ); - inline void SetCellCoord( USHORT nCol, USHORT nRow ); - void SetDocCoord( USHORT nCol, USHORT nRow ); - - void RecalcSize(); - void SetCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos ); -}; - -inline void ScHTMLTableData::SetCellCoord( USHORT nCol, USHORT nRow ) -{ - nLastCol = Max( nLastCol, nCol ); - nLastRow = Max( nLastRow, nRow ); -} - - - -class ScHTMLTableDataTable : private Table -{ -private: - ScHTMLTableData* pCurrTab; - ULONG nCurrTab; - - USHORT nSearchMin1; - USHORT nSearchMin2; - ScHTMLTableDataKey eSearchKey; - - inline void _Insert( ULONG nTab, ScHTMLTableData* pTable ) - { Table::Insert( nTab, pTable ); } - - inline ScHTMLTableData* _Get( ULONG nTab ) const - { return (ScHTMLTableData*) Table::Get( nTab ); } - - inline void SetCurrTable( ULONG nTab, ScHTMLTableData* pTab ) - { nCurrTab = nTab; pCurrTab = pTab; } -public: - ScHTMLTableDataTable(); - virtual ~ScHTMLTableDataTable(); - - ScHTMLTableData* GetTable( ULONG nTab ); - inline ScHTMLTableData* GetFirst() { return (ScHTMLTableData*) Table::First(); } - inline ScHTMLTableData* GetNext() { return (ScHTMLTableData*) Table::Next(); } - ScHTMLTableData* GetFirstInOrder( ScHTMLTableDataKey eKey ); - ScHTMLTableData* GetNextInOrder(); - - USHORT GetNextFreeRow( ULONG nTab ); - - ScHTMLTableData* InsertTable( - ULONG nTab, const String& rTabName, - USHORT nFirstCol, USHORT nFirstRow, - USHORT nColSpan, USHORT nRowSpan, - BOOL bBorder, ULONG nNestedIn = 0 ); - void SetCellCoord( ULONG nTab, USHORT nCol, USHORT nRow ); - void RecalcSizes(); - - void Recalc(); - void SetCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos ); -}; - -//------------------------------------------------------------------------ - +// ============================================================================ class EditEngine; class ScDocument; class HTMLOption; -class ScHTMLParser : public ScEEParser +class ScHTMLLayoutParser : public ScHTMLParser { private: - ULONG aFontHeights[SC_HTML_FONTSIZES]; + Size aPageSize; ScHTMLTableStack aTableStack; - Size aPageSize; // in Pixeln String aString; ScRangeListRef xLockedList; // je Table - ScDocument* pDoc; Table* pTables; - ScHTMLTableDataTable* pTableData; // data for each HTML table ScHTMLColOffset* pColOffset; ScHTMLColOffset* pLocalColOffset; // je Table ULONG nFirstTableCell; // je Table @@ -322,28 +212,450 @@ private: USHORT GetWidth( ScEEParseEntry* ); void SetWidths(); void Adjust(); - void AdjustNoWidthHeight(); USHORT GetWidthPixel( const HTMLOption* ); BOOL IsAtBeginningOfText( ImportInfo* ); void TableOn( ImportInfo* ); void ColOn( ImportInfo* ); + void TableRowOn( ImportInfo* ); + void TableRowOff( ImportInfo* ); void TableDataOn( ImportInfo* ); + void TableDataOff( ImportInfo* ); void TableOff( ImportInfo* ); void Image( ImportInfo* ); void AnchorOn( ImportInfo* ); void FontOn( ImportInfo* ); public: - ScHTMLParser( EditEngine*, const Size& aPageSize, - ScDocument*, BOOL _bCalcWidthHeight ); - virtual ~ScHTMLParser(); + ScHTMLLayoutParser( EditEngine*, const Size& aPageSize, ScDocument* ); + virtual ~ScHTMLLayoutParser(); virtual ULONG Read( SvStream& ); + virtual const ScHTMLTable* GetGlobalTable() const; +}; + + + +// ============================================================================ +// HTML DATA QUERY PARSER +// ============================================================================ + +/** Declares the orientation in or for a table: column or row. */ +enum ScHTMLOrient { tdCol = 0 , tdRow = 1 }; + +/** Type for a unique identifier for each table. */ +typedef sal_uInt16 ScHTMLTableId; +/** Identifier of the "global table" (the entire HTML document). */ +const ScHTMLTableId SC_HTML_GLOBAL_TABLE = 0; +/** Used as table index for normal (non-table) entries in ScHTMLEntry structs. */ +const ScHTMLTableId SC_HTML_NO_TABLE = 0; + + +// ============================================================================ + +/** A 2D cell position in an HTML table. */ +struct ScHTMLPos +{ + sal_uInt16 mnCol; + sal_uInt16 mnRow; + + inline explicit ScHTMLPos() : mnCol( 0 ), mnRow( 0 ) {} + inline explicit ScHTMLPos( sal_uInt16 nCol, sal_uInt16 nRow ) : + mnCol( nCol ), mnRow( nRow ) {} + inline explicit ScHTMLPos( const ScAddress& rAddr ) { Set( rAddr ); } + + inline sal_uInt16 Get( ScHTMLOrient eOrient ) const + { return (eOrient == tdCol) ? mnCol : mnRow; } + inline void Set( sal_uInt16 nCol, sal_uInt16 nRow ) + { mnCol = nCol; mnRow = nRow; } + inline void Set( const ScAddress& rAddr ) + { Set( rAddr.Col(), rAddr.Row() ); } + inline void Move( sal_Int16 nColDiff, sal_Int16 nRowDiff ) + { mnCol += nColDiff; mnRow += nRowDiff; } + inline ScAddress MakeAddr() const + { return ScAddress( mnCol, mnRow, 0 ); } +}; - ScHTMLTableDataTable* GetHTMLTables() const { return pTableData; } +inline bool operator==( const ScHTMLPos& rPos1, const ScHTMLPos& rPos2 ) +{ + return (rPos1.mnRow == rPos2.mnRow) && (rPos1.mnCol == rPos2.mnCol); +} + +inline bool operator<( const ScHTMLPos& rPos1, const ScHTMLPos& rPos2 ) +{ + return (rPos1.mnRow < rPos2.mnRow) || ((rPos1.mnRow == rPos2.mnRow) && (rPos1.mnCol < rPos2.mnCol)); +} + + +// ---------------------------------------------------------------------------- + +/** A 2D cell size in an HTML table. */ +struct ScHTMLSize +{ + sal_uInt16 mnCols; + sal_uInt16 mnRows; + + inline explicit ScHTMLSize() : mnCols( 0 ), mnRows( 0 ) {} + inline explicit ScHTMLSize( sal_uInt16 nCols, sal_uInt16 nRows ) : + mnCols( nCols ), mnRows( nRows ) {} + + inline sal_uInt16 Get( ScHTMLOrient eOrient ) const + { return (eOrient == tdCol) ? mnCols : mnRows; } + inline void Set( sal_uInt16 nCols, sal_uInt16 nRows ) + { mnCols = nCols; mnRows = nRows; } + inline void Expand( sal_Int16 nColDiff, sal_Int16 nRowDiff ) + { mnCols += nColDiff; mnRows += nRowDiff; } +}; + +inline bool operator==( const ScHTMLSize& rSize1, const ScHTMLSize& rSize2 ) +{ + return (rSize1.mnRows == rSize2.mnRows) && (rSize1.mnCols == rSize2.mnCols); +} + + +// ============================================================================ + +/** A single entry containing a line of text or representing a table. */ +struct ScHTMLEntry : public ScEEParseEntry +{ +private: + bool mbImportAlways; /// true = Always import this entry. + +public: + explicit ScHTMLEntry( + const SfxItemSet& rItemSet, + ScHTMLTableId nTableId = SC_HTML_NO_TABLE ); + + /** Returns true, if the selection of the entry is empty. */ + inline bool IsEmpty() const { return !aSel.HasRange(); } + /** Returns true, if the entry has any content to be imported. */ + bool HasContents() const; + /** Returns true, if the entry represents a table. */ + inline bool IsTable() const { return nTab != SC_HTML_NO_TABLE; } + /** Returns true, if the entry represents a table. */ + inline ScHTMLTableId GetTableId() const { return nTab; } + + /** Sets or cleares the import always state. */ + inline void SetImportAlways( bool bSet = true ) { mbImportAlways = bSet; } + /** Sets start point of the entry selection to the start of the import info object. */ + void AdjustStart( const ImportInfo& rInfo ); + /** Sets end point of the entry selection to the end of the import info object. */ + void AdjustEnd( const ImportInfo& rInfo ); + /** Deletes leading and trailing empty paragraphs from the entry. */ + void Strip( const EditEngine& rEditEngine ); +}; + + +// ============================================================================ + +/** This struct handles creation of unique table identifiers. */ +struct ScHTMLTableAutoId +{ + const ScHTMLTableId mnTableId; /// The created unique table identifier. + ScHTMLTableId& mrnUnusedId; /// Reference to global unused identifier variable. + + /** The constructor assigns an unused identifier to member mnTableId. */ + explicit ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ); +}; + + +// ---------------------------------------------------------------------------- + +class ScHTMLTableMap; + +/** Stores data for one table in an HTML document. + @descr This class does the main work for importing an HTML document. It manages + the correct insertion of parse entries into the correct cells and the creation + of nested tables. Recalculation of resulting document size and position is done + recursively in all nested tables. */ +class ScHTMLTable +{ +private: + typedef ::std::auto_ptr< ScHTMLTableMap > ScHTMLTableMapPtr; + typedef ::std::auto_ptr< SfxItemSet > SfxItemSetPtr; + typedef ::std::vector< sal_uInt16 > ScSizeVec; + typedef ::std::list< ScHTMLEntry* > ScHTMLEntryList; + typedef ::std::map< ScHTMLPos, ScHTMLEntryList > ScHTMLEntryMap; + typedef ::std::auto_ptr< ScHTMLEntry > ScHTMLEntryPtr; + + ScHTMLTable* mpParentTable; /// Pointer to parent table. + ScHTMLTableMapPtr mpNestedTables; /// Table of nested HTML tables. + String maTableName; /// Table name from <table id> option. + ScHTMLTableAutoId maTableId; /// Unique identifier of this table. + SfxItemSet maTableItemSet; /// Items for the entire table. + SfxItemSetPtr mpRowItemSet; /// Items for the current table row. + SfxItemSetPtr mpDataItemSet; /// Items for the current cell. + ScRangeList maLockList; /// Locked cells (needed for merged cells). + EditEngine& mrEditEngine; /// Edit engine (from ScEEParser). + ScEEParseList& mrEEParseList; /// List that owns the parse entries (from ScEEParser). + ScHTMLEntryMap maEntryMap; /// List of entries for each cell. + ScHTMLEntryList* mpCurrEntryList; /// Current entry list from map for faster access. + ScHTMLEntryPtr mpCurrEntry; /// Working entry, not yet inserted in a list. + ScSizeVec maSizes[ 2 ]; /// Calc cell count of each HTML table column/row. + ScHTMLSize maSize; /// Size of the table. + ScHTMLPos maCurrCell; /// Address of current cell to fill. + ScHTMLPos maDocBasePos; /// Resulting base address in a Calc document. + bool mbBorderOn; /// true = Table borders on. + bool mbPreFormText; /// true = Table from preformatted text (<pre> tag). + bool mbRowOn; /// true = Inside of <tr> </tr>. + bool mbDataOn; /// true = Inside of <td> </td> or <th> </th>. + bool mbPushEmptyLine; /// true = Insert empty line before current entry. + +public: + /** Creates a new HTML table without content. + @descr Internally handles a current cell position. This position is invalid + until first calls of RowOn() and DataOn(). + @param rParentTable Reference to the parent table that owns this table. + @param bPreFormText true = Table is based on preformatted text (<pre> tag). */ + explicit ScHTMLTable( + ScHTMLTable& rParentTable, + const ImportInfo& rInfo, + bool bPreFormText ); + + virtual ~ScHTMLTable(); + + /** Returns the name of the table, specified in the TABLE tag. */ + inline const String& GetTableName() const { return maTableName; } + /** Returns the unique identifier of the table. */ + inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; } + /** Returns the table size. */ + inline const ScHTMLSize& GetSize() const { return maSize; } + /** Returns the cell spanning of the specified cell. */ + ScHTMLSize GetSpan( const ScHTMLPos& rCellPos ); + + /** Searches in all nested tables for the specified table. + @param nTableId Unique identifier of the table. */ + ScHTMLTable* FindNestedTable( ScHTMLTableId nTableId ) const; + + /** Puts the item into the item set of the current entry. */ + void PutItem( const SfxPoolItem& rItem ); + /** Inserts a text portion into current entry. */ + void PutText( const ImportInfo& rInfo ); + /** Inserts a new line, if in preformatted text, else does nothing. */ + void InsertPara( const ImportInfo& rInfo ); + + /** Inserts a line break (<br> tag). + @descr Inserts the current entry regardless if it is empty. */ + void BreakOn(); + /** Inserts a heading line (<p> and <h*> tags). */ + void HeadingOn(); + /** Processes a hyperlink (<a> tag). */ + void AnchorOn(); + + /** Starts a *new* table nested in this table (<table> tag). + @return Pointer to the new table. */ + ScHTMLTable* TableOn( const ImportInfo& rInfo ); + /** Closes *this* table (</table> tag). + @return Pointer to the parent table. */ + ScHTMLTable* TableOff( const ImportInfo& rInfo ); + /** Starts a *new* table based on preformatted text (<pre> tag). + @return Pointer to the new table. */ + ScHTMLTable* PreOn( const ImportInfo& rInfo ); + /** Closes *this* table based on preformatted text (</pre> tag). + @return Pointer to the parent table. */ + ScHTMLTable* PreOff( const ImportInfo& rInfo ); + + /** Starts next row (<tr> tag). + @descr Cell address is invalid until first call of DataOn(). */ + void RowOn( const ImportInfo& rInfo ); + /** Closes the current row (<tr> tag). + @descr Cell address is invalid until call of RowOn() and DataOn(). */ + void RowOff( const ImportInfo& rInfo ); + /** Starts the next cell (<td> or <th> tag). */ + void DataOn( const ImportInfo& rInfo ); + /** Closes the current cell (</td> or </th> tag). + @descr Cell address is invalid until next call of DataOn(). */ + void DataOff( const ImportInfo& rInfo ); + + /** Starts the body of the HTML document (<body> tag). */ + void BodyOn( const ImportInfo& rInfo ); + /** Closes the body of the HTML document (</body> tag). */ + void BodyOff( const ImportInfo& rInfo ); + + /** Returns the resulting document row/column count of the specified HTML row/column. */ + sal_uInt16 GetDocSize( ScHTMLOrient eOrient, sal_uInt16 nCellPos ) const; + /** Returns the resulting document row/column count in the range [nCellBegin, nCellEnd). */ + sal_uInt16 GetDocSize( ScHTMLOrient eOrient, sal_uInt16 nCellBegin, sal_uInt16 nCellEnd ) const; + /** Returns the total document row/column count in the specified direction. */ + sal_uInt16 GetDocSize( ScHTMLOrient eOrient ) const; + + /** Returns the resulting Calc position of the top left edge of the table. */ + inline const ScHTMLPos& GetDocPos() const { return maDocBasePos; } + /** Calculates the resulting Calc position of the specified HTML column/row. */ + sal_uInt16 GetDocPos( ScHTMLOrient eOrient, sal_uInt16 nCellPos = 0 ) const; + /** Calculates the resulting Calc position of the specified HTML cell. */ + ScHTMLPos GetDocPos( const ScHTMLPos& rCellPos ) const; + /** Calculates the current Calc document area of this table. */ + void GetDocRange( ScRange& rRange ) const; + + /** Applies border formatting to the passed document. */ + void ApplyCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos ) const; + +private: + /** Returns true, if the current cell does not contain an entry yet. */ + bool IsEmptyCell() const; + /** Returns the item set from cell, row, or table, depending on current state. */ + const SfxItemSet& GetCurrItemSet() const; + + /** Returns true, if import info represents a space character. */ + static bool IsSpaceCharInfo( const ImportInfo& rInfo ); + + /** Creates and returns a new empty flying entry at position (0,0). */ + ScHTMLEntry* CreateEntry() const; + /** Creates a new flying entry. + @param rInfo Contains the initial edit engine selection for the entry. */ + void CreateNewEntry( const ImportInfo& rInfo ); + + /** Inserts an empty line in front of the next entry. */ + void InsertLeadingEmptyLine(); + + /** Pushes the passed entry into the list of the current cell. */ + void ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryPtr& rpEntry ); + /** Tries to insert the entry into the current cell. + @descr If insertion is not possible (i.e., currently no cell open), the + entry will be inserted into the parent table. */ + void PushEntry( ScHTMLEntryPtr& rpEntry ); + /** Puts the current entry into the entry list, if it is not empty. + @param rInfo The import info struct containing the end position of the current entry. + @param bLastInCell true = If cell is still empty, put this entry always. */ + void PushEntry( const ImportInfo& rInfo, bool bLastinCell = false ); + /** Pushes a new entry into current cell which references a nested table. */ + void PushTableEntry( ScHTMLTableId nTableId ); + + /** Tries to find a table from the table container. + @descr Assumes that the table is located in the current container or + that the passed table identifier is 0. + @param nTableId Unique identifier of the table or 0. */ + ScHTMLTable* GetExistingTable( ScHTMLTableId nTableId ) const; + /** Inserts a nested table in the current cell at the specified position. + @param bPreFormText true = New table is based on preformatted text (<pre> tag). */ + ScHTMLTable* InsertNestedTable( const ImportInfo& rInfo, bool bPreFormText ); + /** Closes this table and inserts it into parent table. + @return Pointer to the parent table, or this, if no parent found. */ + ScHTMLTable* CloseTable( const ImportInfo& rInfo ); + + /** Inserts a new cell in an unused position, starting from current cell position. */ + void InsertNewCell( const ScHTMLSize& rSpanSize ); + + /** Set internal states for a new table row. */ + void ImplRowOn(); + /** Set internal states for leaving a table row. */ + void ImplRowOff(); + /** Set internal states for entering a new table cell. */ + void ImplDataOn( const ScHTMLSize& rSpanSize ); + /** Set internal states for leaving a table cell. */ + void ImplDataOff(); + + /** Inserts additional formatting options from import info into the item set. */ + void ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo ); + + /** Updates the document column/row size of the specified column or row. + @descr Only increases the present count, never decreases. */ + void SetDocSize( ScHTMLOrient eOrient, sal_uInt16 nCellPos, sal_uInt16 nSize ); + /** Calculates and sets the resulting size the cell needs in the document. + @descr Reduces the needed size in merged cells. + @param nCellPos The first column/row position of the (merged) cell. + @param nCellSpan The cell spanning in the specified orientation. + @param nRealDocSize The raw document size of all entries of the cell. */ + void CalcNeededDocSize( + ScHTMLOrient eOrient, sal_uInt16 nCellPos, + sal_uInt16 nCellSpan, sal_uInt16 nRealDocSize ); + +protected: + /** Creates a new HTML table without parent. + @descr This constructor is used to create the "global table". */ + explicit ScHTMLTable( + SfxItemPool& rPool, + EditEngine& rEditEngine, + ScEEParseList& rEEParseList, + ScHTMLTableId& rnUnusedId ); + + /** Fills all empty cells in this and nested tables with dummy parse entries. */ + void FillEmptyCells(); + /** Recalculates the size of all columns/rows in the table, regarding nested tables. */ + void RecalcDocSize(); + /** Recalculates the position of all cell entries and nested tables. + @param rBasePos The origin of the table in the Calc document. */ + void RecalcDocPos( const ScHTMLPos& rBasePos ); +}; + + +// ---------------------------------------------------------------------------- + +/** The "global table" representing the entire HTML document. */ +class ScHTMLGlobalTable : public ScHTMLTable +{ +public: + explicit ScHTMLGlobalTable( + SfxItemPool& rPool, + EditEngine& rEditEngine, + ScEEParseList& rEEParseList, + ScHTMLTableId& rnUnusedId ); + + virtual ~ScHTMLGlobalTable(); + + /** Recalculates sizes and resulting positions of all document entries. */ + void Recalc(); }; +// ============================================================================ + +/** The HTML parser for data queries. Focuses on data import, not on layout. + @descr Builds the table structure correctly, ignores extended formatting + like pictures or column widths. */ +class ScHTMLQueryParser : public ScHTMLParser +{ +private: + typedef ::std::auto_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr; + + String maTitle; /// The title of the document. + ScHTMLGlobalTablePtr mpGlobTable; /// Contains the entire imported document. + ScHTMLTable* mpCurrTable; /// Pointer to current table (performance). + ScHTMLTableId mnUnusedId; /// First unused table identifier. + bool mbTitleOn; /// true = Inside of <title> </title>. + +public: + explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); + virtual ~ScHTMLQueryParser(); + + virtual sal_uInt32 Read( SvStream& rStrm ); + + /** Returns the "global table" which contains the entire HTML document. */ + virtual const ScHTMLTable* GetGlobalTable() const; + +private: + /** Returns the specified table (may be maGlobTable, if no real table can be found). */ + ScHTMLTable* GetTable( ScHTMLTableId nTableId ) const; + + /** Handles all possible tags in the HTML document. */ + void ProcessToken( const ImportInfo& rInfo ); + /** Inserts a text portion into current entry. */ + void InsertText( const ImportInfo& rInfo ); + /** Processes the <font> tag. */ + void FontOn( const ImportInfo& rInfo ); + + /** Processes the <meta> tag. */ + void MetaOn( const ImportInfo& rInfo ); + /** Opens the title of the HTML document (<title> tag). */ + void TitleOn( const ImportInfo& rInfo ); + /** Closes the title of the HTML document (</title> tag). */ + void TitleOff( const ImportInfo& rInfo ); + + /** Opens a new table at the current position. */ + void TableOn( const ImportInfo& rInfo ); + /** Closes the current table. */ + void TableOff( const ImportInfo& rInfo ); + /** Opens a new table based on preformatted text. */ + void PreOn( const ImportInfo& rInfo ); + /** Closes the current preformatted text table. */ + void PreOff( const ImportInfo& rInfo ); + + DECL_LINK( HTMLImportHdl, const ImportInfo* ); +}; + + +// ============================================================================ + #endif diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index e56ef6d36387..fd0d5b94423b 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -2,9 +2,9 @@ * * $RCSfile: imp_op.hxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-06 16:03:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -359,7 +359,6 @@ protected: virtual void SetTextCell( const UINT16 nCol, const UINT16 nRow, String& rUnconvertedText, const UINT16 nXF ); // Achtung: rUnconvertedText wird moeglicherweise veraendert - UINT16 CalcColWidth( const UINT16 nExcColWidth ); /** Sets a margin item into an item set. @param rItemSet The destination item set. diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index ffe2063e5d89..be02c442d78b 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -2,9 +2,9 @@ * * $RCSfile: lotimpop.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:20:43 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 2acff65591c2..dfe0b6b27ed6 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -2,9 +2,9 @@ * * $RCSfile: namebuff.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dr $ $Date: 2001-10-31 10:52:49 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,6 +77,8 @@ #include "root.hxx" #endif +#include "rangenam.hxx" + class ScDocument; class ScTokenArray; class NameBuffer; @@ -218,9 +220,9 @@ public: inline RangeNameBuffer( RootData* p ); // Name, Definition void Store( ByteString&, const ScTokenArray*, - UINT16 nAltSheet = 0, const BOOL bPrintarea = FALSE ); + UINT16 nAltSheet = 0, const RangeType eNameType = RT_ABSAREA ); void Store( String&, const ScTokenArray*, - UINT16 nAltSheet = 0, const BOOL bPrintarea = FALSE ); + UINT16 nAltSheet = 0, const RangeType eNameType = RT_ABSAREA ); inline UINT16 operator[]( UINT16 nExcInd ) const; inline UINT16 GetPos( void ) const; }; diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index 38b2ecb6a6ef..d0535139d696 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -2,9 +2,9 @@ * * $RCSfile: root.hxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:07 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,9 +102,7 @@ class XclExpUserBViewList; class XclExpCellMerging; class ExcNameList; -class UsedAttrList; class XclObjList; -class XclNoteList; class XclEscher; class XclPivotCacheList; class SfxStyleSheet; @@ -119,7 +117,6 @@ class XclExpRoot; struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! { SvStorage* pRootStorage; // THE storage - double fColScale; // Skalierungs-Faktoren fuer double fRowScale; // Spaltenbreiten / Zeilenhoehen ScDocument* pDoc; ScRangeName* pScRangeName; @@ -144,9 +141,6 @@ struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! SvStorage* pPivotCacheStorage; XclImpPivotCacheList* pImpPivotCacheList; // pivot caches for import - SvStorageRef xCtrlStorage; // SvxMSConvertOCXControls compatibel storage -// SvStorage* pCtrlStorage; // SvxMSConvertOCXControls compatibel storage - UINT32 nCondRangeCnt; UINT16 nLastCond; String GetCondFormStyleName( const UINT16 nCondCnt ); // -> exctools.cxx @@ -158,13 +152,11 @@ struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! ExcNameList* pNameList; ScRangeName* pScNameList; // stores range names and DB ranges - UsedAttrList* pXFRecs; ExcExternDup* pExtSheetCntAndRecs; UINT16 nColMax; UINT16 nRowMax; // Biff8 XclObjList* pObjRecs; - XclNoteList* pNoteRecs; String sAddNoteText; // text to append at current note (multiple hyperlinks) XclEscher* pEscher; diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 74dff29b267d..898653e46795 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scflt.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2002-12-06 17:44:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -732,7 +732,7 @@ public: }; -class FilterProgressBar; +class ScfStreamProgressBar; // Import-Klasse class Sc10Import @@ -752,7 +752,7 @@ class Sc10Import INT16 TabCount; USHORT nShowTab; ScViewOptions aSc30ViewOpt; - FilterProgressBar* pPrgrsBar; + ScfStreamProgressBar* pPrgrsBar; public: Sc10Import( SvStream& rStr, ScDocument* pDocument ); diff --git a/sc/source/filter/inc/xcl97dum.hxx b/sc/source/filter/inc/xcl97dum.hxx index 308e98d892b5..c1a09297d36d 100644 --- a/sc/source/filter/inc/xcl97dum.hxx +++ b/sc/source/filter/inc/xcl97dum.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xcl97dum.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:07 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,28 +112,6 @@ public: }; -class ExcDummy8_XF : public ExcDummyRec -{ -private: - static const BYTE pMyData[]; - static const ULONG nMyLen; -public: - virtual ULONG GetLen() const; - virtual const BYTE* GetData() const; -}; - - -class ExcDummy8_Style : public ExcDummyRec -{ -private: - static const BYTE pMyData[]; - static const ULONG nMyLen; -public: - virtual ULONG GetLen() const; - virtual const BYTE* GetData() const; -}; - - class ExcDummy8_UsesElfs : public ExcDummyRec { private: diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 952e09c6c626..9747016ad277 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xcl97esc.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dr $ $Date: 2002-12-12 11:50:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,10 @@ #include <tools/stack.hxx> #endif +#ifndef SC_XLOCX_HXX +#include "xlocx.hxx" +#endif + namespace utl { class TempFile; } // --- class XclEscherEx --------------------------------------------- @@ -89,6 +93,9 @@ class XclEscherEx : public EscherEx private: List aOffsetMap; Stack aStack; +#if EXC_INCL_EXP_OCX + XclExpOcxConverter aOcxConverter; /// Export of form controls. +#endif RootData& rRootData; utl::TempFile* pPicTempFile; SvStream* pPicStrm; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 77942f548f63..959900a3854f 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xcl97rec.hxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:07 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -228,7 +228,11 @@ protected: UINT16 nGrbit; BOOL bFirstOnSheet; - XclObj( ObjType eObjType, RootData& rRoot ); + bool mbOwnEscher; /// true = Escher part created on the fly. + + /** @param bOwnEscher If set to true, this object will create its escher data. + See SetOwnEscher() for details. */ + explicit XclObj( ObjType eObjType, RootData& rRoot, bool bOwnEscher = false ); // overwritten for writing MSODRAWING record virtual void SaveCont( XclExpStream& rStrm ); @@ -252,6 +256,17 @@ public: void SetEscherShapeType( UINT16 nType ); inline void SetEscherShapeTypeGroup() { eObjType = otGroup; } + /** If set to true, this object has created its own escher data. This causes the + function EscherEx::EndShape() to not post process this object. This is used + i.e. for form controls. They are not handled in the svx base code, so the + XclExpObjControl c'tor creates the escher data itself. The svx base code does + not receive the correct shape ID after the EscherEx::StartShape() call, which + would result in deleting the object in EscherEx::EndShape(). */ + inline void SetOwnEscher( bool bOwnEscher = true ) { mbOwnEscher = bOwnEscher; } + /** Returns true, if the object has created the escher data itself. + See SetOwnEscher() for details. */ + inline bool IsOwnEscher() const { return mbOwnEscher; } + //! actually writes ESCHER_ClientTextbox void SetText( RootData& rRoot, const SdrTextObj& rObj ); @@ -282,7 +297,7 @@ private: public: XclObjComment( RootData& rRoot, - const ScAddress& rPos, const String& rStr ); + const ScAddress& rPos, const String& rStr, bool bVisible ); virtual ~XclObjComment(); virtual void Save( XclExpStream& rStrm ); @@ -356,6 +371,34 @@ public: }; +// ---------------------------------------------------------------------------- + +#if EXC_INCL_EXP_OCX + +/** Represents an OBJ record for a form control. */ +class XclExpObjControl : public XclObj +{ +private: + String maClassName; /// Class name of the control. + sal_uInt32 mnStrmStart; /// Start position in 'Ctls' stream. + sal_uInt32 mnStrmSize; /// Size in 'Ctls' stream. + +public: + XclExpObjControl( + const XclRoot& rRoot, + const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XShape >& rxShape, + const String& rClassName, + sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); + + virtual sal_uInt32 GetLen() const; + +private: + virtual void SaveCont( XclExpStream& rStrm ); +}; + +#endif + // --- class XclObjAny ----------------------------------------------- class XclObjAny : public XclObj @@ -372,48 +415,45 @@ public: }; -// --- class XclNoteList --------------------------------------------- +// ============================================================================ -class XclNote; - -class XclNoteList : public List, public ExcEmptyRec +/** Represents a NOTE record containing the author and the note object ID. + @descr Creates the note Escher object internally. */ +class XclExpNote : public XclExpRecord { private: -public: - XclNoteList(); - virtual ~XclNoteList(); - - XclNote* First() { return (XclNote*) List::First(); } - XclNote* Next() { return (XclNote*) List::Next(); } - - void Add( XclNote* ); - + XclExpString maAuthor; /// Name of the author. + ScAddress maPos; /// Cell address of the note. + sal_uInt16 mnObjId; /// Escher object ID. + bool mbVisible; /// true = permanently visible. + +public: + /** Constructs a NOTE record from the passed note object and/or the text. + @descr The additional text will be separated from the note text with an empty line. + Creates the Escher object containing the drawing information and the note text. + @param rPos The Calc cell address of the note. + @param pScNote The Calc note object. + @param rAddText Additional text appended to the note text. */ + explicit XclExpNote( + const XclExpRoot& rRoot, + const ScAddress& rPos, + const ScPostIt* pScNote, + const String& rAddText ); + + /** Writes the NOTE record, if the respective Escher object is present. */ virtual void Save( XclExpStream& rStrm ); -}; - -// --- class XclNote ------------------------------------------------- - -class XclNote : public ExcRecord -{ private: - XclExpUniString aAuthor; - ScAddress aPos; - UINT16 nGrbit; - UINT16 nObjId; + /** Writes the body of the NOTE record. */ + virtual void WriteBody( XclExpStream& rStrm ); +}; - virtual void SaveCont( XclExpStream& rStrm ); -public: - XclNote( RootData& rD, const ScAddress& rPos, - const String& rNoteText, const String& rNoteAuthor ); - virtual ~XclNote(); +/** A list of NOTE record objects. */ +typedef XclExpRecordList< XclExpNote > XclExpNoteList; - virtual void Save( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; - virtual ULONG GetLen() const; -}; +// ============================================================================ // --- class ExcBof8_Base -------------------------------------------- @@ -490,34 +530,6 @@ public: }; -// --- class ExcXf8 -------------------------------------------------- - -class ExcXf8 : public ExcXf -{ -private: - XclTextDirection eTextDir; - UINT16 nTrot; - UINT16 nCIndent; - - UINT16 nGrbitDiag; - UINT32 nIcvDiagSer; - UINT16 nDgDiag; - - BOOL bFShrinkToFit; - BOOL bFMergeCell; - - virtual void SaveCont( XclExpStream& rStrm ); - -public: - ExcXf8( const XclExpRoot& rRoot, UINT16 nFont, UINT16 nForm, - const ScPatternAttr* pPattAttr, - BOOL& rbLineBreak, BOOL bStyle = FALSE ); - - virtual UINT16 GetNum() const; - virtual ULONG GetLen() const; -}; - - // --- class ExcBundlesheet8 ----------------------------------------- class ExcBundlesheet8 : public ExcBundlesheetBase @@ -609,7 +621,7 @@ class ScRangeList; struct RootData; class XclCf; -class XclCondFormat : public ExcEmptyRec, protected List +class XclCondFormat : public ExcEmptyRec, protected ScfDelList< XclCf > { // writes multiple cf _and_ condfmt records! private: @@ -618,9 +630,6 @@ private: UINT16 nTabNum; ULONG nComplLen; - inline XclCf* _First() { return (XclCf*) List::First(); } - inline XclCf* _Next() { return (XclCf*) List::Next(); } - void WriteCondfmt( XclExpStream& rStrm ); public: @@ -661,17 +670,10 @@ private: UINT32 nIcvTextSer; BOOL bHasLine; - UINT8 nLineData1; - UINT8 nLineData2; - UINT32 nIcvTopSer; - UINT32 nIcvBotSer; - UINT32 nIcvLftSer; - UINT32 nIcvRigSer; + XclExpXFBorder maBorder; BOOL bHasPattern; - UINT16 nPatt; - UINT32 nIcvForeSer; - UINT32 nIcvBackSer; + XclExpXFArea maArea; virtual void SaveCont( XclExpStream& rStrm ); diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index d55b51921696..f2f3f9804407 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xecontent.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:10 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 65589f48c50b..1db07acad757 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xehelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -316,8 +316,10 @@ class EditEngine; &N page count &D current date &T current time - &F file name without path (converted to full file name) &A table name + &F file name without path + &Z file path without file name + &Z&F file path and name &U underlining on/off &E double underlining on/off &S strikeout characters on/off @@ -327,7 +329,6 @@ class EditEngine; Known but unsupported control sequences: &X superscript on/off &Y subscript on/off - &Z file path without file name &G picture */ class XclExpHFConverter : protected XclExpRoot, ScfNoCopy diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index c6e2b1936211..f3ef7eddd71d 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xelink.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index f57150df8f8c..55526628b5b9 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xerecord.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,6 +86,9 @@ public: /** Overwrite this method to do any operation while saving the record list. */ virtual void Save( XclExpStream& rStrm ); + + /** Calls Save(XclExpStream&) nCount times. */ + void SaveRepeated( XclExpStream& rStrm, sal_uInt32 nCount ); }; @@ -106,7 +109,7 @@ private: public: /** @param nRecId The record ID of this record. May be set later with SetRecId(). @param nRecSize The predicted record size. May be set later with SetRecSize(). */ - XclExpRecord( + explicit XclExpRecord( sal_uInt16 nRecId = EXC_ID_UNKNOWN, sal_uInt32 nRecSize = 0 ); @@ -114,13 +117,15 @@ public: /** Returns the current record ID. */ inline sal_uInt16 GetRecId() const { return mnRecId; } - /** Sets a new record ID. */ - inline void SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; } - /** Returns the current record size prediction. */ inline sal_uInt32 GetRecSize() const { return mnRecSize; } + + /** Sets a new record ID. */ + inline void SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; } /** Sets a new record size prediction. */ inline void SetRecSize( sal_uInt32 nRecSize ) { mnRecSize = nRecSize; } + /** Sets record ID and size with one call. */ + void SetRecHeader( sal_uInt16 nRecId, sal_uInt32 nRecSize ); /** Writes the record header and calls WriteBody(). */ virtual void Save( XclExpStream& rStrm ); @@ -139,10 +144,7 @@ class XclExpEmptyRecord : public XclExpRecord { public: /** @param nRecId The record ID of this record. */ - inline XclExpEmptyRecord( sal_uInt16 nRecId ); - -private: - void SetRecSize( sal_uInt32 ); + inline explicit XclExpEmptyRecord( sal_uInt16 nRecId ); }; inline XclExpEmptyRecord::XclExpEmptyRecord( sal_uInt16 nRecId ) : @@ -165,7 +167,7 @@ public: /** @param nRecId The record ID of this record. @param rValue The value for the record body. @param nSize Record size. Uses sizeof( Type ), if this parameter is omitted. */ - inline XclExpValueRecord( + inline explicit XclExpValueRecord( sal_uInt16 nRecId, const Type& rValue, sal_uInt32 nSize = sizeof( Type ) ); @@ -218,7 +220,7 @@ private: public: /** @param nRecId The record ID of this record. @param nValue The value for the record body. */ - inline XclExpBoolRecord( sal_uInt16 nRecId, bool bValue ) : + inline explicit XclExpBoolRecord( sal_uInt16 nRecId, bool bValue ) : XclExpRecord( nRecId, 2 ), mbValue( bValue ) {} /** Returns the Boolean value of the record. */ @@ -234,6 +236,30 @@ private: // ---------------------------------------------------------------------------- +/** Record which exports a memory data array. */ +class XclExpDummyRecord : public XclExpRecord +{ +private: + const void* mpData; /// The record data. + +public: + /** @param nRecId The record ID of this record. + @param nRecData Pointer to the data array representing the record body. + @param nRecSize Size of the data array. */ + explicit XclExpDummyRecord( + sal_uInt16 nRecId, const void* pRecData, sal_uInt32 nRecSize ); + + /** Sets a data array. */ + void SetData( const void* pRecData, sal_uInt32 nRecSize ); + +private: + /** Writes the body of the record. */ + virtual void WriteBody( XclExpStream& rStrm ); +}; + + +// ---------------------------------------------------------------------------- + /** A record that stores a reference to an existing record object. @descr The record object does not take ownership of the passed record. This class should be used to insert an existing record into another record list. @@ -244,7 +270,7 @@ protected: XclExpRecordBase& mrRec; /// Reference to the record. public: - inline XclExpRefRecord( XclExpRecordBase& rRec ) : mrRec( rRec ) {} + inline explicit XclExpRefRecord( XclExpRecordBase& rRec ) : mrRec( rRec ) {} /** Writes the entire record. */ virtual void Save( XclExpStream& rStrm ); diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 30c6940393d8..dbf69624dc1e 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xeroot.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,7 @@ class XclExpSst; class XclExpPalette; class XclExpFontBuffer; class XclExpNumFmtBuffer; +class XclExpXFBuffer; class XclExpTabIdBuffer; class XclExpLinkManager; @@ -85,6 +86,7 @@ struct XclExpRootData : public XclRootData typedef ::std::auto_ptr< XclExpPalette > XclExpPalettePtr; typedef ::std::auto_ptr< XclExpFontBuffer > XclExpFontBufferPtr; typedef ::std::auto_ptr< XclExpNumFmtBuffer > XclExpNumFmtBufferPtr; + typedef ::std::auto_ptr< XclExpXFBuffer > XclExpXFBufferPtr; typedef ::std::auto_ptr< XclExpTabIdBuffer > XclExpTabIdBufferPtr; typedef ::std::auto_ptr< XclExpLinkManager > XclExpLinkManagerPtr; @@ -93,6 +95,7 @@ struct XclExpRootData : public XclRootData XclExpPalettePtr mpPalette; /// The color buffer. XclExpFontBufferPtr mpFontBuffer; /// All fonts in the file. XclExpNumFmtBufferPtr mpNumFmtBuffer; /// All number formats in the file. + XclExpXFBufferPtr mpXFBuffer; /// All XF records in the file. XclExpTabIdBufferPtr mpTabIdBuffer; /// Calc->Excel sheet index conversion. XclExpLinkManagerPtr mpLinkManager; /// Manager for internal/external links. @@ -121,6 +124,8 @@ public: XclExpRoot& operator=( const XclExpRoot& rRoot ); + /** Returns this root instance - for code readability in derived classes. */ + inline const XclExpRoot& GetRoot() const { return *this; } /** Returns true, if URLs should be stored relative to the document location. */ inline bool IsRelUrl() const { return mrExpData.mbRelUrl; } @@ -133,6 +138,8 @@ public: XclExpFontBuffer& GetFontBuffer() const; /** Returns the number format buffer. */ XclExpNumFmtBuffer& GetNumFmtBuffer() const; + /** Returns the cell formatting attributes buffer. */ + XclExpXFBuffer& GetXFBuffer() const; /** Returns the buffer for Calc->Excel sheet index conversion. */ XclExpTabIdBuffer& GetTabIdBuffer() const; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index f876dd9e8481..14de4e71e5e8 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xestream.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index e9e56e37e0c5..9eb2f0330549 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xestyle.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:37:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,9 @@ #ifndef _SVX_SVXENUM_HXX #include <svx/svxenum.hxx> #endif +#ifndef _ZFORLIST_HXX +#include <svtools/zforlist.hxx> +#endif #ifndef INCLUDED_SVTOOLS_NFKEYTAB_HXX #include <svtools/nfkeytab.hxx> #endif @@ -112,8 +115,14 @@ enum XclColorType // ---------------------------------------------------------------------------- /** Stores all used colors in the document. - @descr Supports color reduction to the maximum count of the current BIFF version. */ -class XclExpPalette : public XclExpRecord, public XclDefaultPalette + @descr Supports color reduction to the maximum count of the current BIFF version. + An instance of this class collects all colors in the conversion phase of the export, + using the InsertColor() function. It returns a unique identidier for each passed color. + After the entire document is converted, the palette will be reduced to the number of + colors supported by the current BIFF version, using the function ReduceColors(). + Then, in the streaming phase, the functions GetColorIndex() and GetMixedColors() + return the real Excel palette index for all color identifiers. */ +class XclExpPalette : public XclExpRecord, public XclDefaultPalette, protected XclExpRoot { private: /** Represents an entry in a color list. @@ -126,16 +135,16 @@ private: private: Color maColor; /// The color value of this palette entry. - sal_uInt32 mnCID; /// Unique color ID (CID) for color reduction. + sal_uInt32 mnColorId; /// Unique color ID for color reduction. sal_uInt32 mnWeight; /// Weighting for color reduction. public: - explicit XclListColor( const Color& rColor, sal_uInt32 nCID ); + explicit XclListColor( const Color& rColor, sal_uInt32 nColorId ); /** Returns the RGB color value of the color. */ inline const Color& GetColor() const { return maColor; } /** Returns the unique ID of the color. */ - inline sal_uInt32 GetCID() const { return mnCID; } + inline sal_uInt32 GetColorId() const { return mnColorId; } /** Returns the current weighting of the color. */ inline sal_uInt32 GetWeighting() const { return mnWeight; } /** Returns true, if this color value is greater than rColor (simple arithmetic comparison). */ @@ -151,11 +160,11 @@ private: void Merge( const XclListColor& rColor ); }; - /** Data for each inserted original color, represented by a CID (color ID). */ - struct XclCIDData + /** Data for each inserted original color, represented by a color ID. */ + struct XclColorIdData { - Color maColor; /// The original inserted color. - sal_uInt32 mnIndex; /// Maps current CID to color list or export color vector. + Color maColor; /// The original inserted color. + sal_uInt32 mnIndex; /// Maps current color ID to color list or export color vector. /** Sets the contents of this struct. */ inline void Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; } }; @@ -163,27 +172,27 @@ private: /** A color that will be written to the Excel file. */ struct XclPaletteColor { - Color maColor; /// Resulting color to export. - bool mbDefault; /// true = Entry is a default color. + Color maColor; /// Resulting color to export. + bool mbDefault; /// true = Entry is a default color. /** Sets a new color. @param bDefault true = Color is a color from default palette. */ inline void SetColor( const Color& rColor, bool bDefault = false ) { maColor = rColor; mbDefault = bDefault; } }; typedef ScfDelList< XclListColor > XclListColorList; - typedef ::std::vector< XclCIDData > XclCIDDataVec; + typedef ::std::vector< XclColorIdData > XclColorIdDataVec; typedef ::std::vector< XclPaletteColor > XclPaletteColorVec; - XclListColorList maColorList; /// Working color list. - XclCIDDataVec maCIDDataVec; /// Data of all CIDs. - XclPaletteColorVec maPalette; /// Contains resulting colors to export. - sal_uInt32 mnLastIx; /// Last insertion index for search opt. + XclListColorList maColorList; /// Working color list. + XclColorIdDataVec maColorIdDataVec; /// Data of all CIDs. + XclPaletteColorVec maPalette; /// Contains resulting colors to export. + sal_uInt32 mnLastIx; /// Last insertion index for search opt. public: explicit XclExpPalette( const XclExpRoot& rRoot ); - /** Activates the default colors for the passed BIFF version. */ - void SetBiff( XclBiff eBiff ); + /** Activates the default colors for the current BIFF version. */ + void OnChangeBiff(); /** Inserts the color into the list and updates weighting. @param nAutoDefault The Excel palette index for automatic color. @@ -196,19 +205,19 @@ public: /** Reduces the color list to the maximum count of the current BIFF version. */ void ReduceColors(); - /** Returns the Excel palette index of the color with passed color ID (CID). */ - sal_uInt16 GetColorIndex( sal_uInt32 nCID ) const; + /** Returns the Excel palette index of the color with passed color ID. */ + sal_uInt16 GetColorIndex( sal_uInt32 nColorId ) const; /** Returns the Excel palette index of the passed color (searches for nearest color). @param nAutoDefault The Excel palette index for automatic color. */ sal_uInt16 GetColorIndex( const Color& rColor, sal_uInt16 nAutoDefault = 0 ) const; - /** Returns a foreground and background color for the two passed CIDs. + /** Returns a foreground and background color for the two passed color IDs. @descr If rnXclPattern contains a solid pattern, this function tries to find - the two best fitting colors and a mix pattern (25%, 50% or 75%) for nCIDForegr. + the two best fitting colors and a mix pattern (25%, 50% or 75%) for nForeColorId. This will result in a better approximation to the passed foreground color. */ void GetMixedColors( - sal_uInt16& rnXclForeIx, sal_uInt16& rnXclBackIx, sal_uInt16& rnXclPattern, - sal_uInt32 nCIDForegr, sal_uInt32 nCIDBackgr ) const; + sal_uInt16& rnXclForeIx, sal_uInt16& rnXclBackIx, sal_uInt8& rnXclPattern, + sal_uInt32 nForeColorId, sal_uInt32 nBackColorId ) const; /** Returns the RGB color data for a (non-zero-based) Excel palette entry. @param nDefault Is returned, if nothing else could be found. */ @@ -218,8 +227,8 @@ public: inline Color GetColor( sal_uInt16 nXclIndex, ColorData nDefault = COL_AUTO ) const; private: - /** Returns the original inserted color represented by nCID. */ - const Color& GetOriginalColor( sal_uInt32 nCID ) const; + /** Returns the original inserted color represented by the color ID nColorId. */ + const Color& GetOriginalColor( sal_uInt32 nColorId ) const; /** Returns the ordered insertion index for rColor in rnIndex. @param rbIsEqual Returns true, if the color already exists. */ @@ -271,7 +280,7 @@ class XclExpFont : public XclExpRecord, protected XclExpRoot { private: XclFontData maData; /// All font attributes. - sal_uInt32 mnCID; /// Unique color ID for text color. + sal_uInt32 mnColorId; /// Unique color ID for text color. sal_uInt32 mnHash; /// Hash value for fast comparison. bool mbHasColor; /// false = Font does not use a color (i.e. chart). @@ -285,7 +294,7 @@ public: inline void SetFamily( FontFamily eFamily ) { maData.mnFamily = GetXclFamily( eFamily ); } inline void SetCharSet( rtl_TextEncoding eCharSet ) { maData.mnCharSet = GetXclCharSet( eCharSet ); } void SetColor( const Color& rColor ); - void SetCID( sal_uInt32 nCID ); + void SetColorId( sal_uInt32 nColorId ); void SetHeight( sal_Int32 nTwips ); inline void SetWeight( FontWeight eWeight ) { maData.mnWeight = GetXclWeight( eWeight ); } inline void SetUnderline( FontUnderline eUnderl ) { maData.meUnderline = GetXclUnderline( eUnderl ); } @@ -308,7 +317,7 @@ public: /** Returns true, if this font contains a specific color (if SetColor was called before). */ inline bool HasColor() const { return mbHasColor; } /** Returns the unique color ID of the font color from palette. */ - inline sal_uInt32 GetCID() const { return mnCID; } + inline sal_uInt32 GetColorId() const { return mnColorId; } /** Converts a font family to Excel font family. */ static sal_uInt8 GetXclFamily( FontFamily eFamily ); @@ -335,14 +344,17 @@ class ScPatternAttr; class XclExpFontBuffer : public XclExpRecordBase, protected XclExpRoot { private: - XclExpRecordList< XclExpFont > maFontList; /// List of all FONT records. - sal_uInt32 mnMaxCount; /// Maximum possible count of fonts. + typedef XclExpRecordList< XclExpFont > XclExpFontList; + + XclExpFontList maFontList; /// List of all FONT records. + XclFontData maAppFont; /// Application font (for column width). + sal_uInt32 mnXclMaxCount; /// Maximum number of fonts. public: explicit XclExpFontBuffer( const XclExpRoot& rRoot ); - /** Activates the default colors for the passed BIFF version. */ - void SetBiff( XclBiff eBiff ); + /** Finds the maximum number of fonts for the current BIFF version. */ + void OnChangeBiff(); /** Returns the specified font from font list. */ inline const XclExpFont* GetFont( sal_uInt32 nIndex ) const @@ -368,7 +380,7 @@ private: /** Initializes the default fonts for the current BIFF version. */ void InitDefaultFonts(); /** Converts a list index into Excel font index. */ - sal_uInt16 GetXclIndex( sal_uInt32 nIndex ); + sal_uInt16 GetXclIndex( sal_uInt32 nIndex ) const; /** Tries to find the passed font and returns the current list index. */ sal_uInt32 Find( const XclExpFont& rFont ); }; @@ -402,6 +414,7 @@ private: SvNumberFormatterPtr mpFormatter; /// Special number formatter for conversion. NfKeywordTablePtr mpKeywordTable; /// Replacement table. XclExpNumFmtVec maFormatMap; /// Maps core formats to Excel indexes. + sal_uInt32 mnStdFmt; /// Key for standard number format. sal_uInt16 mnXclOffset; /// Offset to first user defined format. public: @@ -409,13 +422,16 @@ public: virtual ~XclExpNumFmtBuffer(); - /** Sets internal data for the passed BIFF version. */ - void SetBiff( XclBiff eBiff ); + /** Sets internal data for the current BIFF version. */ + void OnChangeBiff(); + + /** Returns the core index of the current standard number format. */ + inline sal_uInt32 GetStandardFormat() const { return mnStdFmt; } /** Inserts a number format into the format buffer. @param nFormatIx The core index of the number format. @return The resulting Excel format index. */ - sal_uInt16 Insert( sal_uInt32 nFormatIx ); + sal_uInt16 Insert( sal_uInt32 nScFormatIx ); /** Writes all FORMAT records contained in this buffer. */ virtual void Save( XclExpStream& rStrm ); @@ -432,6 +448,206 @@ private: // XF, STYLE record - Cell formatting ========================================= +/** Contains color and line style for each cell border line. */ +struct XclExpXFBorder +{ + sal_uInt32 mnLeftColorId; /// Color ID for left line. + sal_uInt32 mnRightColorId; /// Color ID for right line. + sal_uInt32 mnTopColorId; /// Color ID for top line. + sal_uInt32 mnBottomColorId; /// Color ID for bottom line. + sal_uInt8 mnLeftLine; /// Style of left line. + sal_uInt8 mnRightLine; /// Style of right line. + sal_uInt8 mnTopLine; /// Style of top line. + sal_uInt8 mnBottomLine; /// Style of bottom line. + + explicit XclExpXFBorder(); +}; + + +// ---------------------------------------------------------------------------- + +/** Contains background colors and pattern. */ +struct XclExpXFArea +{ + sal_uInt32 mnForeColorId; /// Foreground color ID. + sal_uInt32 mnBackColorId; /// Background color ID. + sal_uInt8 mnPattern; /// Fill pattern. + + explicit XclExpXFArea(); +}; + + +// ---------------------------------------------------------------------------- + +class SfxStyleSheetBase; +class SvxBoxItem; +class SvxBorderLine; + +/** Represents an XF record which contains all formatting data of a cell or cell style. */ +class XclExpXF : public XclExpRecord +{ +private: + typedef ::std::auto_ptr< ScPatternAttr > ScPatternAttrPtr; + + ScPatternAttrPtr mpOwnPattern; /// An own item set (used for cell styles). + const ScPatternAttr* mpPattern; /// Pointer to Calc item set (we do not own it). + + XclExpXFBorder maBorder; /// Border line style. + XclExpXFArea maArea; /// Background area style. + XclHorAlign meHorAlign; /// Horizontal alignment. + XclVerAlign meVerAlign; /// Vertical alignment. + XclTextOrient meOrient; /// Text orientation. + XclTextDirection meTextDir; /// CTL text direction. + + sal_uInt16 mnParent; /// Index to parent style XF. + sal_uInt16 mnFont; /// Excel font index. + sal_uInt16 mnNumFmt; /// Excel number format index. + sal_uInt8 mnIndent; /// Text indent. + sal_uInt8 mnRotation; /// Rotation angle. + + bool mbCellXF; /// true = cell XF, false = style XF. + bool mbLocked; /// true = cell is locked. + bool mbHidden; /// true = formulas are hidden. + bool mbWrapped; /// true = wrap text on cell border. + bool mbProtUsed; /// true = locked/hidden flags used. + bool mbFontUsed; /// true = font index used. + bool mbFmtUsed; /// true = number format used. + bool mbAlignUsed; /// true = alignment used. + bool mbBorderUsed; /// true = border data used. + bool mbAreaUsed; /// true = area data used. + +public: + /** Constructs a cell XF record from the passed Calc item set. + @param nForcedNumFmt If not set to NUMBERFORMAT_ENTRY_NOT_FOUND, it will overwrite + the number format of the passed item set. + @param bForcedWrap true = set text wrap flag unconditionally. */ + explicit XclExpXF( + const XclExpRoot& rRoot, + const ScPatternAttr* pPattern, + sal_uInt32 nForcedNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND, + bool bForceWrapped = false ); + /** Constructs a style XF record from the passed cell style sheet. */ + explicit XclExpXF( const XclExpRoot& rRoot, SfxStyleSheetBase& rStyleSheet ); + + /** Returns true, if the passed cell formatting is represented by this XF record. + @descr Searches for cell XFs only. */ + bool Equals( + const ScPatternAttr* pPattern, + sal_uInt32 nForcedNumFmt, + bool bForceWrapped ) const; + + /** Sets the border line styles from the item set into the passed struct. */ + static void GetBorder( + XclExpXFBorder& rBorder, + XclExpPalette& rPalette, + const ScPatternAttr& rPattern ); + + /** Sets the area styles from the brush item into the passed struct. */ + static void GetArea( + XclExpXFArea& rArea, + XclExpPalette& rPalette, + const ScPatternAttr& rPattern ); + +private: + /** Fills all members from the passed item set. */ + void Init( + const XclExpRoot& rRoot, + const ScPatternAttr* pPattern, + sal_uInt32 nForcedNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND, + bool bForceWrapped = false ); + + /** Returns the bits specifying the used attributes. + @descr In cell XFs a set bit means a used attribute, in style XF a cleared + bit means a used attribute. This method regards the cell/style state. + @return The mask based on bit 0 (not yet bit-shifted as needed for export). */ + sal_uInt8 GetUsedAttribMask() const; + + void WriteBody5( XclExpStream& rStrm ); + void WriteBody8( XclExpStream& rStrm ); + + /** Writes the contents of the XF record. */ + virtual void WriteBody( XclExpStream& rStrm ); + + /** Reads the passed border line struct and converts to Excel line style and color. */ + static void GetBorderLine( + sal_uInt8& rnXclLine, sal_uInt32& rnColorId, + XclExpPalette& rPalette, const SvxBorderLine* pLine ); +}; + + +// ---------------------------------------------------------------------------- + +/** Represents a STYLE record containing the name of a user-defined cell style. */ +class XclExpStyle : public XclExpRecord +{ +private: + String maName; /// Name of the cell style. + sal_uInt16 mnXFIndex; /// Index to XF record with style formatting. + +public: + explicit XclExpStyle( const String& rName, sal_uInt16 nXFIndex ); + +private: + /** Writes the contents of the STYLE record. */ + virtual void WriteBody( XclExpStream& rStrm ); +}; + + +// ---------------------------------------------------------------------------- + +/** Stores all XF records (cell formats) in the document. */ +class XclExpXFBuffer : public XclExpRecordBase, protected XclExpRoot +{ +private: + typedef XclExpRecordList< XclExpXF > XclExpXFList; + typedef XclExpRecordList< XclExpStyle > XclExpStyleList; + + XclExpXFList maXFList; /// List of all XF records. + XclExpStyleList maStyleList; /// List of all STYLE records. + sal_uInt32 mnXclMaxCount; /// Maximum number of XF records. + sal_uInt16 mnXclOffset; /// Offset to first user defined XF. + +public: + explicit XclExpXFBuffer( const XclExpRoot& rRoot ); + + /** Inserts all user-defined styles into the XF record list. */ + void InsertUserStyles(); + + /** Finds or creates a cell XF record for the passed item set. + @param bForceWrapped true = cell contains hard newlines. + In this case the text wrap flag must be set in the XF record. + @return The resulting Excel XF record index. */ + sal_uInt16 Insert( const ScPatternAttr* pPattern, bool bForceWrapped = false ); + /** Finds or creates a cell XF record for the passed item set, with custom number format. + @param nForcedNumFmt The number format to be exported, i.e. formula result type. + This format will always overwrite the cell's number format. + @return The resulting Excel XF record index. */ + sal_uInt16 Insert( const ScPatternAttr* pPattern, sal_uInt32 nForcedNumFmt ); + /** Inserts the passed cell style. Creates a style XF record and a STYLE record. + @return The resulting Excel XF record index. */ + sal_uInt16 InsertStyle( SfxStyleSheetBase& rStyleSheet ); + + /** Writes all XF records contained in this buffer. */ + virtual void Save( XclExpStream& rStrm ); + +private: + /** Converts a list index into Excel XF index. */ + sal_uInt16 GetXclIndex( sal_uInt32 nIndex ) const; + + /** Tries to find the XF record containing the passed format or inserts a new record. + @return The Excel XF index. */ + sal_uInt16 InsertCellXF( + const ScPatternAttr* pPattern, + sal_uInt32 nForcedNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND, + bool bForceWrapped = false ); + + void WriteDefaultXFs5( XclExpStream& rStrm ); + void WriteDefaultXFs8( XclExpStream& rStrm ); + + void WriteDefaultStyles5( XclExpStream& rStrm ); +}; + + // ============================================================================ #endif diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 0a0f449d5a37..c8b611391865 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xicontent.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:14 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,7 +185,7 @@ class XclImpValidation : ScfNoInstance { public: /** Reads a DVAL record and sets marks the dropdown arrow control to be ignored. */ - static void ReadDval( XclImpStream& rStrm, XclImpRoot& rRoot ); + static void ReadDval( XclImpStream& rStrm ); /** Reads a DV record and inserts validation data into the document. */ static void ReadDv( XclImpStream& rStrm, ExcelToSc& rFmlaConv ); }; diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 56cb73fc453c..182dfb995f1d 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xihelper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:14 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,8 +168,10 @@ struct XclFontData; &N page count &D current date &T current time - &F file name without path (converted to full file name) &A table name + &F file name without path (see also &Z&F) + &Z file path without file name (converted to full file name, see also &Z&F) + &Z&F file path and name &U underlining on/off &E double underlining on/off &S strikeout characters on/off @@ -179,7 +181,6 @@ struct XclFontData; &fontheight set font height in points ('fontheight' is a decimal value) Known but unsupported control sequences: - &Z file path without file name &G picture */ class XclImpHFConverter : protected XclImpRoot, ScfNoCopy diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index b04a4567f01a..e0561886b91a 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xilink.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:15 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -128,6 +128,7 @@ class XclImpExtName { private: String maName; /// The name of the external name. + String maAddInName; /// The converted Calc add-in function name. sal_uInt32 mnStorageId; /// Storage ID for OLE object storages. XclImpExtNameType meType; /// Type of the external name. @@ -137,6 +138,7 @@ public: inline XclImpExtNameType GetType() const { return meType; } inline const String& GetName() const { return maName; } + inline const String& GetAddInName() const { return maAddInName; } inline sal_uInt32 GetStorageId() const { return mnStorageId; } }; @@ -210,6 +212,7 @@ private: String maUrl; /// URL of the external document. sal_uInt16 mnCurrExcTab; /// Current Excel sheet index of external cells. bool mbSelf; /// true = internal 3D references. + bool mbAddIn; /// true = Add-in function names. public: /** Reads the SUPBOOK record from stream. */ @@ -229,6 +232,8 @@ public: /** Returns true, if this SUPBOOK contains internal 3D references. */ inline bool IsSelf() const { return mbSelf; } + /** Returns true, if this SUPBOOK contains add-in function names. */ + inline bool IsAddIn() const { return mbAddIn; } /** Returns the URL of the external document. */ inline const String& GetUrl() const { return maUrl; } diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index a9df4df6d331..223703778a30 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xiroot.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:16 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,7 @@ class XclImpXFBuffer; class XclImpXFIndexBuffer; class XclImpTabIdBuffer; class XclImpLinkManager; +class XclImpObjectManager; class XclImpWebQueryBuffer; /** Stores global buffers and data needed for Excel import filter. */ @@ -92,6 +93,7 @@ struct XclImpRootData : public XclRootData typedef ::std::auto_ptr< XclImpXFIndexBuffer > XclImpXFIndexBufferPtr; typedef ::std::auto_ptr< XclImpTabIdBuffer > XclImpTabIdBufferPtr; typedef ::std::auto_ptr< XclImpLinkManager > XclImpLinkManagerPtr; + typedef ::std::auto_ptr< XclImpObjectManager > XclImpObjectManagerPtr; typedef ::std::auto_ptr< XclImpWebQueryBuffer > XclImpWebQueryBufferPtr; XclImpSstPtr mpSst; /// The shared string table. @@ -105,11 +107,9 @@ struct XclImpRootData : public XclRootData XclImpTabIdBufferPtr mpTabIdBuffer; /// Sheet creation order list. XclImpLinkManagerPtr mpLinkManager; /// Manager for internal/external links. + XclImpObjectManagerPtr mpObjManager; /// All drawing objects. XclImpWebQueryBufferPtr mpWebQBuffer; /// All web queries. - ScfUInt32Vec maIgnoreObj; /// ID's of objects to ignore. - bool mbIgnoreObjSorted; /// Vector of ignored objects sorted? - explicit XclImpRootData( XclBiff eBiff, ScDocument& rDocument, @@ -132,6 +132,9 @@ public: XclImpRoot& operator=( const XclImpRoot& rRoot ); + /** Returns this root instance - for code readability in derived classes. */ + inline const XclImpRoot& GetRoot() const { return *this; } + /** Returns the shared string table. */ XclImpSst& GetSst() const; @@ -151,6 +154,8 @@ public: /** Returns the link manager. */ XclImpLinkManager& GetLinkManager() const; + /** Returns the drawing object manager. */ + XclImpObjectManager& GetObjectManager() const; /** Returns the web query buffer. */ XclImpWebQueryBuffer& GetWebQueryBuffer() const; @@ -164,11 +169,6 @@ public: @descr See XclRoot::CheckCellRangeList for details. */ void CheckCellRangeList( ScRangeList& rRanges ) const; - /** Sets the object with ID nObjId to be ignored on import. */ - void SetIgnoreObject( sal_uInt32 nObjId ); - /** Returns true, if the object with ID nObjId will be ignored. */ - bool IsIgnoreObject( sal_uInt32 nObjId ) const; - protected: explicit XclImpRoot( XclImpRootData& rImpRootData ); diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index f969713536f8..aa3396555860 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xistream.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:16 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,9 @@ Input stream class for Excel import // Decryption ================================================================= +#define SC_XCL_USEDECR 0 + +#if SC_XCL_USEDECR /** Base class for BIFF stream decryption. */ class XclImpDecrypter : ScfNoCopy { @@ -146,6 +149,7 @@ public: @return Count of bytes really read. */ virtual sal_uInt32 ReadDecrypt( SvStream& rStrm, void* pData, sal_uInt32 nBytes ); }; +#endif // ============================================================================ @@ -231,14 +235,18 @@ class XclImpRoot; class XclImpStream { private: +#if SC_XCL_USEDECR typedef ::std::auto_ptr< XclImpDecrypter > XclImpDecrypterPtr; +#endif typedef ScfDelStack< XclImpStreamPos > XclImpStreamPosStack; private: SvStream& mrStrm; /// Reference to the system input stream. const XclImpRoot& mrRoot; /// Filter root data. +#if SC_XCL_USEDECR XclImpDecrypterPtr mpDecrypter; /// Provides methods to decrypt data. +#endif XclImpStreamPos maFirstRec; /// Start position of current record. XclImpStreamPosStack maPosStack; /// Stack for record positions. @@ -260,7 +268,9 @@ private: sal_uInt32 mnRecLeft; /// Count of bytes left in current record. bool mbCont; /// Automatic CONTINUE lookup on/off. +#if SC_XCL_USEDECR bool mbUseDecr; /// Usage of decryption. +#endif bool mbValidRec; /// Read state: false = no record available. bool mbValid; /// Read state: false = record overread. bool mbWarnings; /// Enable/disable assertions. @@ -296,11 +306,13 @@ public: @param bWarnMode false = no overread assertions. */ inline void SetWarningMode( bool bWarnMode ) { mbWarnings = bWarnMode; } +#if SC_XCL_USEDECR /** Enables decryption of record contents for the rest of the stream. @descr Stream takes ownership of the decrypter object. */ void EnableDecryption( XclImpDecrypter* pDecrypter ); /** Switches usage of current decryption algorithm on/off. */ void UseDecryption( bool bUse ); +#endif /** Pushes current position on user position stack. @descr This stack is emptied at every start of a new record. */ @@ -452,8 +464,10 @@ public: inline sal_uInt32 GetStreamSize() const { return mnStreamSize; } private: +#if SC_XCL_USEDECR /** Initializes the key/stream offset of the decrypter. */ inline void SetDecrypterOffset( sal_uInt16 nRecSize ); +#endif /** Reads and decrypts a sal_Int8 value. */ void ReadAtom( sal_Int8& rnValue ); @@ -605,11 +619,13 @@ inline void XclImpStream::IgnoreByteString( bool b16BitLen ) // ---------------------------------------------------------------------------- +#if SC_XCL_USEDECR inline void XclImpStream::SetDecrypterOffset( sal_uInt16 nRecSize ) { if( mpDecrypter.get() ) mpDecrypter->SetOffset( nRecSize ); } +#endif // ============================================================================ diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index c5a82429e1f5..ad80a1ac0ff1 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xistyle.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:17 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,7 +99,7 @@ and a container for XF indexes for every used cell in a sheet. /** Stores the default colors for the current BIFF version and the contents of a PALETTE record. */ -class XclImpPalette : public XclDefaultPalette +class XclImpPalette : public XclDefaultPalette, protected XclImpRoot { private: typedef ::std::vector< ColorData > ColorDataVec; @@ -109,6 +109,9 @@ private: public: explicit XclImpPalette( const XclImpRoot& rRoot ); + /** Activates the default colors for the current BIFF version. */ + void OnChangeBiff(); + /** Returns the RGB color data for a (non-zero-based) Excel palette entry. @descr First looks for a color read from file, then looks for a default color. @param nDefault Is returned, if nothing else could be found. */ @@ -164,13 +167,12 @@ public: inline const XclFontData& GetFontData() const { return maData; } /** Returns true, if the font contains superscript or subscript. */ inline bool HasEscapement() const { return maData.meEscapem != xlEscNone; } + /** Returns the width of the '0' character on current printer (twips). */ + long GetCharWidth() const; /** Reads a FONT record for all BIFF versions. */ void ReadFont( XclImpStream& rStrm ); - /** Calculates a column scaling factor using the current printer settings. */ - double CalcColumnScale() const; - /** Fills all font properties to the item set. @param rItemSet The destination item set. @param eMode The type of which IDs. */ @@ -217,13 +219,16 @@ class XclImpFontBuffer : protected XclImpRoot, ScfNoCopy { private: ScfDelList< XclImpFont > maFontList; /// List of all FONT records in the Excel file. + XclFontData maAppFont; /// Application font (for column width). public: - inline explicit XclImpFontBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) {} + explicit XclImpFontBuffer( const XclImpRoot& rRoot ); /** Returns the object that stores all contents of a FONT record. */ inline const XclImpFont* GetFont( sal_uInt16 nFontIndex ) const { return maFontList.GetObject( nFontIndex ); } + /** Returns the application font data of this file, needed i.e. for column width. */ + inline const XclFontData& GetAppFontData() const { return maAppFont; } /** Reads a FONT record. */ void ReadFont( XclImpStream& rStrm ); @@ -246,7 +251,7 @@ class XclImpNumFmtBuffer : protected XclImpRoot, ScfNoCopy { private: ScfUInt32Vec maKeyVec; /// Array of SvNumberFomatter format keys. - sal_uInt32 mnDefault; /// Key for default format. + sal_uInt32 mnStdFmt; /// Key for standard number format. public: explicit XclImpNumFmtBuffer( const XclImpRoot& rRoot ); @@ -269,40 +274,66 @@ private: // XF, STYLE record - Cell formatting ========================================= -struct XclImpXFBorder; -struct XclImpXFArea; +/** Contains color and line style for each cell border line. */ +struct XclImpXFBorder +{ + sal_uInt16 mnLeftColor; /// Index to color for left line. + sal_uInt16 mnRightColor; /// Index to color for right line. + sal_uInt16 mnTopColor; /// Index to color for top line. + sal_uInt16 mnBottomColor; /// Index to color for bottom line. + sal_uInt8 mnLeftLine; /// Style of left line. + sal_uInt8 mnRightLine; /// Style of right line. + sal_uInt8 mnTopLine; /// Style of top line. + sal_uInt8 mnBottomLine; /// Style of bottom line. +}; + + +// ---------------------------------------------------------------------------- + +/** Contains background colors and pattern. */ +struct XclImpXFArea +{ + sal_uInt16 mnForeColor; /// Index to foreground color. + sal_uInt16 mnBackColor; /// Index to background color. + sal_uInt8 mnPattern; /// Fill pattern. +}; + + +// ---------------------------------------------------------------------------- + class SvxBorderLine; -/** Contains all data of a XF record and an ScPatternAttr (SetItem). */ +/** Contains all data of a XF record and a Calc item set. */ class XclImpXF : protected XclImpRoot, ScfNoCopy { private: typedef ::std::auto_ptr< ScPatternAttr > ScPatternAttrPtr; - typedef ::std::auto_ptr< XclImpXFBorder > XclImpXFBorderPtr; - typedef ::std::auto_ptr< XclImpXFArea > XclImpXFAreaPtr; - ScPatternAttrPtr mpPattern; /// Calc SetItem. - XclImpXFBorderPtr mpBorder; /// Border line style. - XclImpXFAreaPtr mpArea; /// Background area style. + mutable ScPatternAttrPtr mpPattern; /// Calc item set. + XclImpXFBorder maBorder; /// Border line style. + XclImpXFArea maArea; /// Background area style. XclHorAlign meHorAlign; /// Horizontal alignment. XclVerAlign meVerAlign; /// Vertical alignment. - XclTextWrap meWrap; /// Automatic line break. XclTextOrient meOrient; /// Text orientation. XclTextDirection meTextDir; /// CTL text direction. - sal_uInt8 mnRotation; /// Rotation angle. - sal_uInt32 mnValFormat; /// Id for value format. - sal_uInt16 mnIndent; /// Text indent. - sal_uInt16 mnFont; /// Index to font record. sal_uInt16 mnParent; /// Index to parent style XF. + sal_uInt32 mnNumFmt; /// Id for value format. + sal_uInt16 mnFont; /// Index to font record. + sal_uInt16 mnIndent; /// Text indent. + sal_uInt8 mnRotation; /// Rotation angle. - bool mbCellXF; /// true = cell XF, sal_False = style XF. + bool mbCellXF; /// true = cell XF, false = style XF. bool mbLocked; /// true = cell is locked. bool mbHidden; /// true = formulas are hidden. - bool mbFontValid; /// mnFont != parent->mnFont? - bool mbFmtValid; /// mnValFormat != parent->mnValFormat? - bool mbProtValid; /// mbLocked != parent->mbLocked or mbHidden != parent->mbHidden? + bool mbWrapped; /// true = automatic line break. + bool mbProtUsed; /// true = locked/hidden flags used. + bool mbFontUsed; /// true = font index used. + bool mbFmtUsed; /// true = number format used. + bool mbAlignUsed; /// true = alignment used. + bool mbBorderUsed; /// true = border data used. + bool mbAreaUsed; /// true = area data used. public: explicit XclImpXF( const XclImpRoot& rRoot ); @@ -311,9 +342,9 @@ public: /** Reads an XF record. */ void ReadXF( XclImpStream& rStrm ); - /** Creates a Calc SetItem containing an item set with all cell properties. - @return A read-only reference to the SetItem stored internally. */ - const ScPatternAttr& GetPattern(); + /** Creates a Calc item set containing an item set with all cell properties. + @return A read-only reference to the item set stored internally. */ + const ScPatternAttr& GetPattern() const; inline bool IsCellXF() const { return mbCellXF; } inline bool IsStyleXF() const { return !IsCellXF(); } @@ -322,34 +353,27 @@ public: inline XclVerAlign GetVerAlign() const { return meVerAlign; } inline sal_uInt16 GetFont() const { return mnFont; } - /** Inserts Excel border line styles into the item set. */ + /** Inserts the border line styles into the item set. */ static void SetBorder( - SfxItemSet& rItemSet, const XclImpPalette& rPalette, - sal_uInt8 nXclLeftLine, sal_uInt16 nXclLeftColor, - sal_uInt8 nXclRightLine, sal_uInt16 nXclRightColor, - sal_uInt8 nXclTopLine, sal_uInt16 nXclTopColor, - sal_uInt8 nXclBottomLine, sal_uInt16 nXclBottomColor ); + SfxItemSet& rItemSet, + const XclImpPalette& rPalette, + const XclImpXFBorder& rBorder ); - /** Inserts an Excel area style into the item set. */ + /** Inserts the area style into the item set. */ static void SetArea( - SfxItemSet& rItemSet, const XclImpPalette& rPalette, - sal_uInt8 nXclPattern, - sal_uInt16 nXclForeColor, sal_uInt16 nXclBackColor ); + SfxItemSet& rItemSet, + const XclImpPalette& rPalette, + const XclImpXFArea& rArea ); private: - /** Creates and returns the border data struct. */ - XclImpXFBorder& GetBorder(); - /** Creates and returns the area data struct. */ - XclImpXFArea& GetArea(); - void ReadXF2( XclImpStream& rStrm ); void ReadXF3( XclImpStream& rStrm ); void ReadXF4( XclImpStream& rStrm ); void ReadXF5( XclImpStream& rStrm ); void ReadXF8( XclImpStream& rStrm ); - /** Creates a new border line item. */ - static SvxBorderLine* CreateBorderItem( + /** Creates a new border line struct from passed line style. */ + static SvxBorderLine* CreateBorderLine( const XclImpPalette& rPalette, sal_uInt8 nXclLine, sal_uInt16 nXclColor ); }; @@ -363,7 +387,7 @@ class XclImpXFBuffer : protected XclImpRoot, ScfNoCopy { private: ScfDelList< XclImpXF > maXFList; /// List of contents of all XF record. - ScPatternAttr maDefPattern; /// This SetItem is used if no other could be found or created. + ScPatternAttr maDefPattern; /// Used if no styles could be found or created. public: explicit XclImpXFBuffer( const XclImpRoot& rRoot ); @@ -373,9 +397,9 @@ public: /** Reads a STYLE record. */ void ReadStyle( XclImpStream& rStrm ); - /** Creates a SetItem with all properties stored in the XF record. - @return A read-only reference to the SetItem stored internally. */ - const ScPatternAttr& GetPattern( sal_uInt32 nXFIndex ); + /** Creates a item set with all properties stored in the XF record. + @return A read-only reference to the item set stored internally. */ + const ScPatternAttr& GetPattern( sal_uInt32 nXFIndex ) const; /** Returns the object that stores all contents of an XF record. */ inline const XclImpXF* GetXF( sal_uInt32 nXFIndex ) const diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx index 3106b6858bd3..b09227458898 100644 --- a/sc/source/filter/inc/xlconst.hxx +++ b/sc/source/filter/inc/xlconst.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xlconst.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,15 +145,25 @@ const sal_Int32 EXC_POINTS_PER_INCH = 72; const sal_Int32 EXC_TWIPS_PER_INCH = EXC_POINTS_PER_INCH * 20; +// Line styles ---------------------------------------------------------------- + +const sal_uInt8 EXC_LINE_NONE = 0x00; +const sal_uInt8 EXC_LINE_THIN = 0x01; +const sal_uInt8 EXC_LINE_MEDIUM = 0x02; +const sal_uInt8 EXC_LINE_THICK = 0x05; +const sal_uInt8 EXC_LINE_DOUBLE = 0x06; +const sal_uInt8 EXC_LINE_HAIR = 0x07; + + // Background patterns -------------------------------------------------------- -const sal_uInt16 EXC_PATT_NONE = 0x0000; -const sal_uInt16 EXC_PATT_SOLID = 0x0001; -const sal_uInt16 EXC_PATT_50_PERC = 0x0002; -const sal_uInt16 EXC_PATT_75_PERC = 0x0003; -const sal_uInt16 EXC_PATT_25_PERC = 0x0004; -const sal_uInt16 EXC_PATT_12_5_PERC = 0x0011; -const sal_uInt16 EXC_PATT_6_25_PERC = 0x0012; +const sal_uInt8 EXC_PATT_NONE = 0x00; +const sal_uInt8 EXC_PATT_SOLID = 0x01; +const sal_uInt8 EXC_PATT_50_PERC = 0x02; +const sal_uInt8 EXC_PATT_75_PERC = 0x03; +const sal_uInt8 EXC_PATT_25_PERC = 0x04; +const sal_uInt8 EXC_PATT_12_5_PERC = 0x11; +const sal_uInt8 EXC_PATT_6_25_PERC = 0x12; // Miscellaneous --------------------------------------------------------------- @@ -164,6 +174,11 @@ const sal_Unicode EXC_NEWLINE = EXC_NEWLINE_CHAR; // Records (ordered by lowest record ID) ====================================== +// (0x0007, 0x0207) STRING ---------------------------------------------------- + +const sal_uInt16 EXC_ID_STRING = 0x0207; + + // (0x0014, 0x0015) HEADER, FOOTER -------------------------------------------- const sal_uInt16 EXC_ID_HEADER = 0x0014; @@ -211,6 +226,12 @@ const sal_uInt16 EXC_ID_VERTPAGEBREAKS = 0x001A; const sal_uInt16 EXC_ID_HORPAGEBREAKS = 0x001B; +// (0x001C) NOTE -------------------------------------------------------------- + +const sal_uInt16 EXC_ID_NOTE = 0x001C; +const sal_uInt16 EXC_NOTE_VISIBLE = 0x0002; + + // (0x001E, 0x041E) FORMAT ---------------------------------------------------- const sal_uInt16 EXC_ID_FORMAT = 0x041E; @@ -300,26 +321,43 @@ const sal_uInt8 EXC_FONTCSET_SYMBOL = 0x02; const sal_uInt16 EXC_FONT_AUTOCOLOR = 0x7FFF; -// (0x0043, 0x00E0) XF -------------------------------------------------------- +// (0x0043, 0x0243, 0x0443, 0x00E0) XF ---------------------------------------- + +const sal_uInt16 EXC_ID2_XF = 0x0043; +const sal_uInt16 EXC_ID3_XF = 0x0243; +const sal_uInt16 EXC_ID4_XF = 0x0443; +const sal_uInt16 EXC_ID_XF = 0x00E0; + +const sal_uInt16 EXC_XF_OFFSET = 21; /// Index to first user defined record. +const sal_uInt32 EXC_XF_MAXCOUNT = 4029; /// Maximum number of user defined records. +const sal_uInt16 EXC_XF_DEFAULTSTYLE = 0; /// Excel index to cefault style XF. +const sal_uInt16 EXC_XF_DEFAULTCELL = 15; /// Excel index to cefault cell XF. const sal_uInt16 EXC_XF_LOCKED = 0x0001; const sal_uInt16 EXC_XF_HIDDEN = 0x0002; const sal_uInt16 EXC_XF_STYLE = 0x0004; +const sal_uInt16 EXC_XF_STYLEPARENT = 0x0FFF; /// Syles don't have a parent. +const sal_uInt16 EXC_XF_WRAPPED = 0x0008; /// Automatic line break. -const sal_uInt16 EXC_XF_DIFF_VALFMT = 0x0400; -const sal_uInt16 EXC_XF_DIFF_FONT = 0x0800; -const sal_uInt16 EXC_XF_DIFF_ALIGN = 0x1000; -const sal_uInt16 EXC_XF_DIFF_BORDER = 0x2000; -const sal_uInt16 EXC_XF_DIFF_AREA = 0x4000; -const sal_uInt16 EXC_XF_DIFF_PROT = 0x8000; +const sal_uInt8 EXC_XF_DIFF_VALFMT = 0x01; +const sal_uInt8 EXC_XF_DIFF_FONT = 0x02; +const sal_uInt8 EXC_XF_DIFF_ALIGN = 0x04; +const sal_uInt8 EXC_XF_DIFF_BORDER = 0x08; +const sal_uInt8 EXC_XF_DIFF_AREA = 0x10; +const sal_uInt8 EXC_XF_DIFF_PROT = 0x20; const sal_uInt8 EXC_XF2_VALFMT_MASK = 0x3F; const sal_uInt8 EXC_XF2_LOCKED = 0x40; const sal_uInt8 EXC_XF2_HIDDEN = 0x80; +const sal_uInt8 EXC_XF2_LEFTLINE = 0x08; +const sal_uInt8 EXC_XF2_RIGHTLINE = 0x10; +const sal_uInt8 EXC_XF2_TOPLINE = 0x20; +const sal_uInt8 EXC_XF2_BOTTOMLINE = 0x40; const sal_uInt8 EXC_XF2_BACKGROUND = 0x80; const sal_uInt16 EXC_XF8_SHRINKTOFIT = 0x0010; const sal_uInt16 EXC_XF8_MERGE = 0x0020; +const sal_uInt8 EXC_XF8_STACKED = 0xFF; /// Special rotation angle. // (0x0059, 0x005A) XCT, CRN -------------------------------------------------- @@ -364,12 +402,6 @@ const sal_uInt16 EXC_COLOR_BIFF2_BLACK = 0; const sal_uInt16 EXC_COLOR_BIFF2_WHITE = 1; -// (0x0093) STYLE ------------------------------------------------------------- - -const sal_uInt16 EXC_STYLE_BUILTIN = 0x8000; -const sal_uInt16 EXC_STYLE_MASK = 0x0FFF; - - // (0x00E9) BITMAP ------------------------------------------------------------ const sal_uInt16 EXC_ID_BITMAP = 0x00E9; @@ -459,6 +491,13 @@ const sal_uInt32 EXC_HLINK_FRAME = 0x00000080; /// Target frame. const sal_uInt32 EXC_HLINK_UNC = 0x00000100; /// UNC path. +// (0x0293) STYLE ------------------------------------------------------------- + +const sal_uInt16 EXC_ID_STYLE = 0x0293; +const sal_uInt16 EXC_STYLE_BUILTIN = 0x8000; +const sal_uInt16 EXC_STYLE_MASK = 0x0FFF; + + // web queries ================================================================ #define EXC_WEBQRY_FILTER "calc_HTML_WebQuery" diff --git a/sc/source/filter/inc/xlocx.hxx b/sc/source/filter/inc/xlocx.hxx new file mode 100644 index 000000000000..9c26776c03ae --- /dev/null +++ b/sc/source/filter/inc/xlocx.hxx @@ -0,0 +1,158 @@ +/************************************************************************* + * + * $RCSfile: xlocx.hxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-26 18:05:13 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +// ============================================================================ + +#ifndef SC_XLOCX_HXX +#define SC_XLOCX_HXX + +#ifndef _MSOCXIMEX_HXX +#include <svx/msocximex.hxx> +#endif + +#ifndef SC_XLROOT_HXX +#include "xlroot.hxx" +#endif + +const int EXC_INCL_EXP_OCX = 1; /// 1 = Compile with OCX export. + +// OCX controls =============================================================== + +/** Converter base class for import and export of OXC controls. + @descr The purpose of this class is to manage all the draw pages occuring in a + spreadsheet document. Derived classes implement import or export of the controls. */ +class XclOcxConverter : protected SvxMSConvertOCXControls, public XclRoot +{ +protected: + typedef ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > XFormComponentRef; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > XShapeRef; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > XDrawPageRef; + +private: + sal_uInt16 mnCurrTab; /// Stores sheet index of an object for GetDrawPage(). + sal_uInt16 mnCachedTab; /// Sheet index of cached draw page. + +protected: + explicit XclOcxConverter( const XclRoot& rRoot ); + virtual ~XclOcxConverter(); + + /** Sets the sheet index of the currently processed object. GetDrawPage() needs this. */ + void SetCurrTab( sal_uInt16 nTab ); + +private: + /** Returns the current draw page. */ + virtual const XDrawPageRef& GetDrawPage(); +}; + + +// ---------------------------------------------------------------------------- + +class XclImpEscherOle; + +/** Converter for import of OXC controls. */ +class XclImpOcxConverter : public XclOcxConverter +{ +private: + SvStorageStreamRef mxStrm; /// The 'Ctls' strem. + +public: + explicit XclImpOcxConverter( const XclRoot& rRoot ); + + /** Reads the form control data of the passed control object and creates it in the document. */ + void ReadControl( XclImpEscherOle& rObj ); + +private: + /** Inserts the passed control rxFComp into the document. */ + virtual sal_Bool InsertControl( + const XFormComponentRef& rxFComp, + const ::com::sun::star::awt::Size& rSize, + XShapeRef* pxShape, + BOOL bFloatingCtrl ); +}; + + +// ---------------------------------------------------------------------------- + +#if EXC_INCL_EXP_OCX + +class SdrObject; +class XclExpObjControl; + +/** Converter for export of OXC controls. */ +class XclExpOcxConverter : public XclOcxConverter +{ +private: + SvStorageStreamRef mxStrm; /// The 'Ctls' stream. + +public: + explicit XclExpOcxConverter( const XclRoot& rRoot ); + + /** Creates an OBJ record for the passed form control object. + @descr Writes the form control data to the 'Ctls' stream. */ + XclExpObjControl* CreateObjRec( const XShapeRef& rxShape ); +}; + +#endif + +// ============================================================================ + +#endif + diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index c2d067759f03..8133821cee92 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xlroot.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,6 +95,7 @@ struct XclRootData LanguageType meLang; /// Document language. ScAddress maScMaxPos; /// Highest Calc cell position. ScAddress maXclMaxPos; /// Highest Excel cell position. + long mnCharWidth; /// Width of '0' in default font (twips). sal_uInt16 mnScTab; /// Current Calc sheet index. bool mbTruncated; /// Flag for the table truncated warning box. @@ -104,6 +105,10 @@ struct XclRootData ::std::auto_ptr< RootData > mpRDP;//! +#ifdef DBG_UTIL + sal_Int32 mnObjCnt; /// Object counter for mem leak tests. +#endif + explicit XclRootData( XclBiff eBiff, ScDocument& rDocument, @@ -120,8 +125,10 @@ class ScModelObj; class SfxPrinter; class SvNumberFormatter; class ScRangeName; +class SvStorage; -/** Access to global data from other classes. */ +/** Access to global data for a filter object (imported or exported document) + from other classes. */ class XclRoot { private: @@ -135,6 +142,8 @@ public: RootData* mpRD;//! + /** Returns this root instance - for code readability in derived classes. */ + inline const XclRoot& GetRoot() const { return *this; } /** Returns the current BIFF version of the importer/exporter. */ inline XclBiff GetBiff() const { return mrData.meBiff; } /** Returns the document language. */ @@ -150,9 +159,13 @@ public: inline const String& GetBasePath() const { return mrData.maBasePath; } /** Returns the character set to import/export byte strings. */ inline CharSet GetCharSet() const { return mrData.meCharSet; } + /** Returns the width of the '0' character (default font) for the current printer (twips). */ + inline long GetCharWidth() const { return mrData.mnCharWidth; } /** Returns the destination document (import) or source document (export). */ inline ScDocument& GetDoc() const { return mrData.mrDoc; } + /** Returns pointer to the destination document (import) or source document (export). */ + inline ScDocument* GetDocPtr() const { return &mrData.mrDoc; } /** Returns the object shell of the Calc document. May be NULL (i.e. import from clipboard). */ SfxObjectShell* GetDocShell() const; /** Returns the object model of the Calc document. */ @@ -164,6 +177,10 @@ public: /** Returns the defined names container of the Calc document. */ ScRangeName& GetNamedRanges() const; + /** Returns the OLE2 root storage of the imported/exported file. + @return Pointer to root storage or 0, if the file is a simple stream. */ + SvStorage* GetRootStorage() const; + /** Returns the edit engine for import/export of rich strings etc. */ ScEditEngineDefaulter& GetEditEngine() const; /** Returns the edit engine for import/export of headers/footers. */ @@ -186,6 +203,8 @@ protected: inline void SetLanguage( LanguageType eLang ) { mrData.meLang = eLang; } /** Sets the character set to import/export byte strings. */ inline void SetCharSet( CharSet eCharSet ) { mrData.meCharSet = eCharSet; } + /** Sets the width of the '0' character (default font) for the current printer (twips). */ + inline void SetCharWidth( long nCharWidth ) { mrData.mnCharWidth = nCharWidth; } /** Increases the current Calc sheet index by 1. */ inline void IncScTab() { ++mrData.mnScTab; } diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index c974559c4cc7..7cfccacfc9e2 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xlstyle.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:11:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,7 +72,7 @@ // Color data ================================================================= /** Stores all default colors for a specific BIFF version. */ -class XclDefaultPalette : ScfNoCopy +class XclDefaultPalette { private: const ColorData* mpColorTable; /// The table with RGB values. @@ -83,7 +83,7 @@ public: explicit XclDefaultPalette( XclBiff eBiff = xlBiffUnknown ); /** Activates the default colors for the passed BIFF version. */ - void SetBiff( XclBiff eBiff ); + void SetDefaultColors( XclBiff eBiff ); /** Returns the color count in the current palette. */ inline sal_uInt32 GetColorCount() const { return mnTableSize; } @@ -110,7 +110,7 @@ inline Color XclDefaultPalette::GetDefColor( sal_uInt16 nXclIndex, ColorData nDe } -// Font Data ================================================================== +// Font data ================================================================== /** Text underline style. */ enum XclUnderline @@ -172,7 +172,7 @@ enum XclHorAlign xlHAlignFill = 0x04, xlHAlignJustify = 0x05, xlHAlignCenterAcrSel = 0x06, - xlHAlignParent = 0xFF + xlHAlignDistrib = 0x07 }; /** Vertical alignment of cell contents. */ @@ -182,8 +182,7 @@ enum XclVerAlign xlVAlignCenter = 0x01, xlVAlignBottom = 0x02, xlVAlignJustify = 0x03, - xlVAlignDistrib = 0x04, - xlVAlignParent = 0xFF + xlVAlignDistrib = 0x04 }; /** Text orientation. */ @@ -193,16 +192,7 @@ enum XclTextOrient xlTextOrientTopBottom = 0x01, xlTextOrient90ccw = 0x02, xlTextOrient90cw = 0x03, - xlTextOrientRot = 0x04, - xlTextOrientParent = 0xFF -}; - -/** Text wrap (automatic line break). */ -enum XclTextWrap -{ - xlTextWrapNo = 0x00, - xlTextWrapYes = 0x01, - xlTextWrapParent = 0xFF + xlTextOrientRot = 0x04 }; /** CTL text direction. */ @@ -210,8 +200,7 @@ enum XclTextDirection { xlTextDirContext = 0x00, xlTextDirLTR = 0x01, - xlTextDirRTL = 0x02, - xlTextDirParent = 0xFF + xlTextDirRTL = 0x02 }; diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 195e11382a71..8027132e6fcc 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xltools.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:41:09 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ /** An enumeration for all Excel file format types (BIFF types). */ enum XclBiff { - xlBiff2, /// MS Excel 2.1 + xlBiff2 = 0, /// MS Excel 2.1 xlBiff3, /// MS Excel 3.x xlBiff4, /// MS Excel 4.x xlBiff5, /// MS Excel 5.x @@ -117,14 +117,12 @@ enum XclBoolError class XclImpStream; class XclExpStream; -/** This struct stores a GUID (class ID) and supports reading, writing and - comparison. */ +/** This struct stores a GUID (class ID) and supports reading, writing and comparison. */ struct XclGuid { - sal_uInt8 mpData[ 16 ]; + sal_uInt8 mpData[ 16 ]; /// Stores GUID always in little endian. explicit XclGuid(); - XclGuid( const XclGuid& rSrc ); explicit XclGuid( sal_uInt32 nData1, sal_uInt16 nData2, sal_uInt16 nData3, @@ -132,8 +130,6 @@ struct XclGuid sal_uInt8 nData43, sal_uInt8 nData44, sal_uInt8 nData45, sal_uInt8 nData46, sal_uInt8 nData47, sal_uInt8 nData48 ); - - XclGuid& operator=( const XclGuid& rSrc ); }; bool operator==( const XclGuid& rCmp1, const XclGuid& rCmp2 ); @@ -172,9 +168,9 @@ public: static bool GetRKFromDouble( sal_Int32& rnRKValue, double fValue ); /** Calculates an angle (in 1/100 of degrees) from an Excel angle value. */ - static sal_Int32 GetScRotation( sal_uInt16 nExcRot ); + static sal_Int32 GetScRotation( sal_uInt16 nXclRot ); /** Calculates the Excel angle value from an angle in 1/100 of degrees. */ - static sal_uInt16 GetExcRotation( sal_Int32 nScRot ); + static sal_uInt8 GetXclRotation( sal_Int32 nScRot ); /** Gets a translated error code or Boolean value from Excel error codes. @param rfDblValue Returns 0.0 for error codes or the value of a Boolean (0.0 or 1.0). @@ -192,6 +188,13 @@ public: /** Returns the length in inches calculated from a length in twips. */ static double GetInchFromTwips( sal_uInt16 nTwips ); + /** Returns the Calc column width (twips) for the passed Excel width. + @param nScCharWidth Width of the '0' character in Calc (twips). */ + static sal_uInt16 GetScColumnWidth( sal_uInt16 nXclWidth, long nScCharWidth ); + /** Returns the Excel column width for the passed Calc width (twips). + @param nScCharWidth Width of the '0' character in Calc (twips). */ + static sal_uInt16 GetXclColumnWidth( sal_uInt16 nScWidth, long nScCharWidth ); + // built-in names ------------------------------------------------------------- /** Returns an Excel built-in name used in NAME records. */ diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx index 56f8f8c6fea7..9fb48aaf750a 100644 --- a/sc/source/filter/lotus/filter.cxx +++ b/sc/source/filter/lotus/filter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filter.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:14 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,6 @@ #include "compiler.hxx" #include "scerrors.hxx" -#include "fltprgrs.hxx" #include "root.hxx" #include "lotrange.hxx" #include "optab.h" @@ -86,6 +85,11 @@ #include "decl.h" #include "tool.h" +#ifndef SC_FPROGRESSBAR_HXX +#include "fprogressbar.hxx" +#endif + + // Konstanten ------------------------------------------------------------ const UINT16 nBOF = 0x0000; @@ -144,7 +148,7 @@ FltError ScImportLotus123old( SvStream& aStream, ScDocument* pDocument, CharSet InitPage(); // Seitenformat initialisieren (nur Tab 0!) // Progressbar starten - FilterProgressBar aPrgrsBar( aStream ); + ScfStreamProgressBar aPrgrsBar( aStream, pDocument->GetDocumentShell() ); // Datei-Typ ermitteln eTyp = ScanVersion( aStream ); diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 595eb9c213bf..db2a7c0f12f6 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lotform.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:21:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index 9009abc033e8..523a6e95c030 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lotimpop.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:21:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index afcb7bfa51c0..e5c6ade5154e 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lotread.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2001-05-18 12:28:04 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,9 +72,12 @@ #include "scerrors.hxx" #include "root.hxx" #include "lotimpop.hxx" -#include "fltprgrs.hxx" #include "lotattr.hxx" +#ifndef SC_FPROGRESSBAR_HXX +#include "fprogressbar.hxx" +#endif + class ScFormulaCell; @@ -106,7 +109,7 @@ FltError ImportLotus::Read() pIn->Seek( nNextRec ); // Progressbar starten - FilterProgressBar aPrgrsBar( *pIn ); + ScfStreamProgressBar aPrgrsBar( *pIn, pD->GetDocumentShell() ); while( eAkt != S_END ) { @@ -292,7 +295,7 @@ FltError ImportLotus::Read( SvStream& rIn ) pIn->Seek( nNextRec ); // Progressbar starten - FilterProgressBar aPrgrsBar( *pIn ); + ScfStreamProgressBar aPrgrsBar( *pIn, pD->GetDocumentShell() ); while( bRead ) { diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 81c1069e9498..156a3ec5afa2 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -2,9 +2,9 @@ * * $RCSfile: op.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: er $ $Date: 2002-12-06 17:47:41 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ //------------------------------------------------------------------------ #include <tools/solar.h> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <stdio.h> #include <string.h> #include <ctype.h> @@ -150,7 +150,7 @@ void OP_Number( SvStream& r, UINT16 n ) r >> nFormat >> nCol >> nRow >> fValue; - fValue = SolarMath::Round( fValue, 15 ); + fValue = ::rtl::math::round( fValue, 15 ); ScValueCell* pZelle = new ScValueCell( fValue ); pDoc->PutCell( nCol, nRow, nTab, pZelle, ( BOOL ) TRUE ); @@ -275,7 +275,7 @@ void OP_NamedRange( SvStream& r, UINT16 n ) String aTmp( pAnsi, pLotusRoot->eCharsetQ ); - ScfTools::ConvertName( aTmp ); + ScfTools::ConvertToScDefinedName( aTmp ); pLotusRoot->pRangeNames->Append( pRange, aTmp ); } @@ -313,7 +313,7 @@ void OP_SymphNamedRange( SvStream& r, UINT16 n ) DosToSystem( pAnsi ); String aTmp( pAnsi, pLotusRoot->eCharsetQ ); - ScfTools::ConvertName( aTmp ); + ScfTools::ConvertToScDefinedName( aTmp ); pLotusRoot->pRangeNames->Append( pRange, aTmp ); } diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 3c125df9ee02..ad40e615d7d7 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tool.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:21:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -601,7 +601,7 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ComplRefData& rCRD ) static UINT16 nDouble = 0; String aScName( rOrgName ); - ScfTools::ConvertName( aScName ); + ScfTools::ConvertToScDefinedName( aScName ); register ENTRY* pInsert = new ENTRY( rOrgName, aScName, rCRD ); diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index c7704308f5d5..84dbf893c766 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eeimpars.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: er $ $Date: 2002-11-12 18:24:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,7 +166,7 @@ ULONG ScEEImport::Read( SvStream& rStream ) void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor ) { - ScProgress* pProgress = new ScProgress( NULL, + ScProgress* pProgress = new ScProgress( pDoc->GetDocumentShell(), ScGlobal::GetRscString( STR_LOAD_DOC ), pParser->Count() ); ULONG nProgress = 0; @@ -369,7 +369,16 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor ) } else { - String aStr( pEngine->GetText( pE->aSel.nStartPara ) ); + String aStr; + if( pE->bEntirePara ) + { + aStr = pEngine->GetText( pE->aSel.nStartPara ); + } + else + { + aStr = pEngine->GetText( pE->aSel ); + aStr.EraseLeadingAndTrailingChars(); + } const sal_Unicode cDecSepEng = '.'; const sal_Unicode cThoSepEng = ','; if ( cDecSep != cDecSepEng @@ -411,6 +420,12 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor ) } } } + + // #105460#, #i4180# String cells can't contain tabs or linebreaks + // -> replace with spaces + aStr.SearchAndReplaceAll( (sal_Unicode)'\t', (sal_Unicode)' ' ); + aStr.SearchAndReplaceAll( (sal_Unicode)'\n', (sal_Unicode)' ' ); + pDoc->SetString( nCol, nRow, nTab, aStr ); } } diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index c77fcb23e2c7..f3430c2e0b73 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scflt.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: er $ $Date: 2002-12-06 17:52:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,10 +113,13 @@ #include "scfobj.hxx" #include "docoptio.hxx" #include "viewopti.hxx" -#include "fltprgrs.hxx" #include "globstr.hrc" #include "ftools.hxx" +#ifndef SC_FPROGRESSBAR_HXX +#include "fprogressbar.hxx" +#endif + using namespace com::sun::star; @@ -1070,7 +1073,7 @@ Sc10Import::~Sc10Import() ULONG Sc10Import::Import() { - pPrgrsBar = new FilterProgressBar( rStream ); + pPrgrsBar = new ScfStreamProgressBar( rStream, pDoc->GetDocumentShell() ); ScDocOptions aOpt = pDoc->GetDocOptions(); aOpt.SetDate( 1, 1, 1900 ); @@ -1079,19 +1082,19 @@ ULONG Sc10Import::Import() pDoc->GetFormatTable()->ChangeNullDate( 1, 1, 1900 ); LoadFileHeader(); pPrgrsBar->Progress(); - if (!nError) { LoadFileInfo(); pPrgrsBar->Progress(); } - if (!nError) { LoadEditStateInfo(); pPrgrsBar->Progress(); } + if (!nError) { LoadFileInfo(); pPrgrsBar->Progress(); } + if (!nError) { LoadEditStateInfo(); pPrgrsBar->Progress(); } if (!nError) { LoadProtect(); pPrgrsBar->Progress(); } - if (!nError) { LoadViewColRowBar(); pPrgrsBar->Progress(); } + if (!nError) { LoadViewColRowBar(); pPrgrsBar->Progress(); } if (!nError) { LoadScrZoom(); pPrgrsBar->Progress(); } if (!nError) { LoadPalette(); pPrgrsBar->Progress(); } if (!nError) { LoadFontCollection(); pPrgrsBar->Progress(); } if (!nError) { LoadNameCollection(); pPrgrsBar->Progress(); } - if (!nError) { LoadPatternCollection(); pPrgrsBar->Progress(); } + if (!nError) { LoadPatternCollection(); pPrgrsBar->Progress(); } if (!nError) { LoadDataBaseCollection(); pPrgrsBar->Progress(); } if (!nError) { LoadTables(); pPrgrsBar->Progress(); } if (!nError) { LoadObjects(); pPrgrsBar->Progress(); } - if (!nError) { ImportNameCollection(); pPrgrsBar->Progress(); } + if (!nError) { ImportNameCollection(); pPrgrsBar->Progress(); } pDoc->SetViewOptions( aSc30ViewOpt ); #ifdef DBG_UTIL diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 0dc9838b6413..4ef8d9af53f6 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XclExpChangeTrack.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:42:28 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 0840b12cd09c..731b60720780 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XclImpChangeTrack.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: dr $ $Date: 2002-11-21 12:22:29 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/xcl97/makefile.mk b/sc/source/filter/xcl97/makefile.mk index c5296d01b87c..6a2a4b405e06 100644 --- a/sc/source/filter/xcl97/makefile.mk +++ b/sc/source/filter/xcl97/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: dr $ $Date: 2002-11-21 12:22:29 $ +# last change: $Author: hr $ $Date: 2003-03-26 18:05:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -89,6 +89,7 @@ SLOFILES = \ $(SLO)$/XclExpPivotTables.obj \ $(SLO)$/XclExpChangeTrack.obj + # --- Targets ------------------------------------------------------- .INCLUDE : target.mk diff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxx index e5ac815de071..4247bfc20e2b 100644 --- a/sc/source/filter/xcl97/xcl97dum.cxx +++ b/sc/source/filter/xcl97/xcl97dum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xcl97dum.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dr $ $Date: 2002-12-06 16:42:29 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,107 +127,6 @@ const BYTE ExcDummy8_041::pMyData[] = { const ULONG ExcDummy8_041::nMyLen = sizeof(ExcDummy8_041::pMyData); -// 21 default XF Records (8*) -const BYTE ExcDummy8_XF::pMyData[] = { - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x01, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x01, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x02, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x02, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x01, 0x00, 0x2B, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x01, 0x00, 0x29, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x01, 0x00, 0x09, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x01, 0x00, 0x2C, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, - - 0xe0, 0x00, 0x14, 0x00, - 0x01, 0x00, 0x2A, 0x00, 0xF5, 0xFF, 0x20, 0x00, - 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20 - -}; -const ULONG ExcDummy8_XF::nMyLen = sizeof(ExcDummy8_XF::pMyData); - - -// 6 default STYLE Records (8*) -const BYTE ExcDummy8_Style::pMyData[] = { - 0x93, 0x02, 0x04, 0x00, 0x10, 0x80, 0x03, 0xFF, - 0x93, 0x02, 0x04, 0x00, 0x11, 0x80, 0x06, 0xFF, - 0x93, 0x02, 0x04, 0x00, 0x12, 0x80, 0x05, 0xFF, - 0x93, 0x02, 0x04, 0x00, 0x00, 0x80, 0x00, 0xFF, - 0x93, 0x02, 0x04, 0x00, 0x13, 0x80, 0x04, 0xFF, - 0x93, 0x02, 0x04, 0x00, 0x14, 0x80, 0x07, 0xFF -}; -const ULONG ExcDummy8_Style::nMyLen = sizeof(ExcDummy8_Style::pMyData); - // Natural Language Formulas Flag (8+) 0 := nein, 1:= ja const BYTE ExcDummy8_UsesElfs::pMyData[] = { @@ -309,32 +208,6 @@ const BYTE* ExcDummy8_041::GetData() const -ULONG ExcDummy8_XF::GetLen() const -{ - return nMyLen; -} - - -const BYTE* ExcDummy8_XF::GetData() const -{ - return pMyData; -} - - - -ULONG ExcDummy8_Style::GetLen() const -{ - return nMyLen; -} - - -const BYTE* ExcDummy8_Style::GetData() const -{ - return pMyData; -} - - - ULONG ExcDummy8_UsesElfs::GetLen() const { return nMyLen; diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 3566c0463c23..4cff3d99a5b7 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xcl97esc.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dr $ $Date: 2002-12-12 13:14:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,9 @@ #ifndef _SVDOOLE2_HXX //autogen wg. SdrOle2Obj #include <svx/svdoole2.hxx> #endif +#ifndef _SVX_FMGLOB_HXX +#include <svx/fmglob.hxx> +#endif #ifndef _IPOBJ_HXX //autogen wg. SvInPlaceObject #include <so3/ipobj.hxx> #endif @@ -113,6 +116,9 @@ XclEscherEx::XclEscherEx( SvStream& rStrm, UINT32 nDrawings, RootData& rRoot ) : EscherEx( rStrm, nDrawings ), +#if EXC_INCL_EXP_OCX + aOcxConverter( *rRoot.pER ), +#endif rRootData( rRoot ), pPicTempFile( NULL ), pPicStrm( NULL ), @@ -218,30 +224,41 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen pCurrXclObj = new XclObjAny( rRootData ); // just what is it?!? else { - switch ( pObj->GetObjIdentifier() ) + pCurrXclObj = NULL; + sal_uInt16 nObjType = pObj->GetObjIdentifier(); + + if( nObjType == OBJ_OLE2 ) { - case OBJ_OLE2 : + //! not-const because GetObjRef may load the OLE object + SvInPlaceObjectRef xObj( ((SdrOle2Obj*)pObj)->GetObjRef() ); + if ( xObj.Is() ) { - //! not-const because GetObjRef may load the OLE object - SvInPlaceObjectRef xObj( ((SdrOle2Obj*)pObj)->GetObjRef() ); - if ( xObj.Is() ) - { - SvGlobalName aObjClsId( *xObj->GetSvFactory() ); - if ( SchModuleDummy::HasID( aObjClsId ) ) - { // yes, it's a chart diagram - rRootData.pObjRecs->Add( new XclObjChart( rRootData, rShape ) ); - pCurrXclObj = NULL; // no metafile or whatsoever - } - else // metafile and OLE object - pCurrXclObj = new XclObjOle( rRootData, *pObj ); + SvGlobalName aObjClsId( *xObj->GetSvFactory() ); + if ( SchModuleDummy::HasID( aObjClsId ) ) + { // yes, it's a chart diagram + rRootData.pObjRecs->Add( new XclObjChart( rRootData, rShape ) ); + pCurrXclObj = NULL; // no metafile or whatsoever } - else // just a metafile - pCurrXclObj = new XclObjAny( rRootData ); + else // metafile and OLE object + pCurrXclObj = new XclObjOle( rRootData, *pObj ); } - break; - default: + else // just a metafile pCurrXclObj = new XclObjAny( rRootData ); } + else if( nObjType == OBJ_CAPTION ) // #107540# ignore permanent note shapes + { + pCurrXclObj = NULL; + } +#if EXC_INCL_EXP_OCX + else if( nObjType >= OBJ_FM_CONTROL ) + { + pCurrXclObj = aOcxConverter.CreateObjRec( rShape ); + if( !pCurrXclObj ) + pCurrXclObj = new XclObjAny( rRootData ); // just a metafile + } +#endif + else + pCurrXclObj = new XclObjAny( rRootData ); // just a metafile } if ( pCurrXclObj ) { @@ -295,31 +312,42 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen void XclEscherEx::EndShape( UINT16 nShapeType, UINT32 nShapeID ) { - if ( !nShapeID && pCurrXclObj ) - { // shape not written - XclObj* p = (XclObj*) rRootData.pObjRecs->Last(); - DBG_ASSERT( p == pCurrXclObj, "XclEscherEx::EndShape: what object?" ); - if ( p == pCurrXclObj ) + // own escher data created? -> never delete such objects + bool bOwnEscher = pCurrXclObj && pCurrXclObj->IsOwnEscher(); + + // post process the current object - not for objects with own escher data + if( pCurrXclObj && !bOwnEscher ) + { + // escher data of last shape not written? -> delete it from object list + if( nShapeID == 0 ) { - rRootData.pObjRecs->Remove(); - delete pCurrXclObj; - pCurrXclObj = NULL; + XclObj* pLastObj = static_cast< XclObj* >( rRootData.pObjRecs->Last() ); + DBG_ASSERT( pLastObj == pCurrXclObj, "XclEscherEx::EndShape - wrong object" ); + if ( pLastObj == pCurrXclObj ) + { + rRootData.pObjRecs->Remove(); + DELETEZ( pCurrXclObj ); + } } - } - if ( pCurrXclObj ) - { - if ( pCurrAppData->IsStackedGroup() ) - pCurrXclObj->SetEscherShapeTypeGroup(); - else + + if( pCurrXclObj ) { - pCurrXclObj->SetEscherShapeType( nShapeType ); - pCurrXclObj->UpdateStopPos(); + // set shape type + if ( pCurrAppData->IsStackedGroup() ) + pCurrXclObj->SetEscherShapeTypeGroup(); + else + { + pCurrXclObj->SetEscherShapeType( nShapeType ); + pCurrXclObj->UpdateStopPos(); + } } } + + // get next object from stack DeleteCurrAppData(); - pCurrAppData = (XclEscherHostAppData*) aStack.Pop(); - pCurrXclObj = (XclObj*) aStack.Pop(); - if ( nAdditionalText == 3 ) + pCurrAppData = static_cast< XclEscherHostAppData* >( aStack.Pop() ); + pCurrXclObj = static_cast< XclObj* >( aStack.Pop() ); + if( nAdditionalText == 3 ) nAdditionalText = 0; } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index a96dba9da87f..7360ffa8cafe 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xcl97rec.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-13 12:06:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,9 +93,12 @@ #ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet #include <svtools/itemset.hxx> #endif +#ifndef _SVX_UNOAPI_HXX_ +#include <svx/unoapi.hxx> +#endif -#ifndef _TOOLS_SOLMATH_HXX // DoubleToString() -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _ZFORMAT_HXX // SvNumberformat #include <svtools/zformat.hxx> @@ -108,6 +111,9 @@ #include "xcl97esc.hxx" #include "excupn.hxx" +#ifndef SC_FAPIHELPER_HXX +#include "fapihelper.hxx" +#endif #ifndef SC_XECONTENT_HXX #include "xecontent.hxx" #endif @@ -145,6 +151,12 @@ #include "docoptio.hxx" #include "patattr.hxx" +using ::com::sun::star::uno::UNO_QUERY; +using ::com::sun::star::uno::Reference; +using ::com::sun::star::beans::XPropertySet; +using ::com::sun::star::drawing::XShape; + + //___________________________________________________________________ // --- class XclMsodrawing_Base -------------------------------------- @@ -377,14 +389,15 @@ void XclObjList::Save( XclExpStream& rStrm ) // --- class XclObj -------------------------------------------------- -XclObj::XclObj( ObjType eType, RootData& rRoot ) +XclObj::XclObj( ObjType eType, RootData& rRoot, bool bOwnEscher ) : pClientTextbox( NULL ), pTxo( NULL ), eObjType( eType ), nObjId(0), nGrbit( 0x6011 ), // AutoLine, AutoFill, Printable, Locked - bFirstOnSheet( rRoot.pObjRecs->Count() == 0 ) + bFirstOnSheet( rRoot.pObjRecs->Count() == 0 ), + mbOwnEscher( bOwnEscher ) { //! first object continues the first MSODRAWING record if ( bFirstOnSheet ) @@ -493,9 +506,9 @@ ULONG XclObj::GetLen() const // --- class XclObjComment ------------------------------------------- -XclObjComment::XclObjComment( RootData& rRoot, const ScAddress& rPos, const String& rStr ) +XclObjComment::XclObjComment( RootData& rRoot, const ScAddress& rPos, const String& rStr, bool bVisible ) : - XclObj( otComment, rRoot ) + XclObj( otComment, rRoot, true ) { nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked XclEscherEx* pEx = pMsodrawing->GetEscherEx(); @@ -510,7 +523,9 @@ XclObjComment::XclObjComment( RootData& rRoot, const ScAddress& rPos, const Stri aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field aPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x00000000 ); aPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x000A0002 ); // bool field + sal_uInt32 nFlags = 0x000A0000; + ::set_flag( nFlags, 2UL, !bVisible ); + aPropOpt.AddOpt( ESCHER_Prop_fPrint, nFlags ); // bool field aPropOpt.Commit( pEx->GetStream() ); XclEscherClientAnchor( rRoot.pDoc, rPos ).WriteData( *pEx ); @@ -576,7 +591,7 @@ ULONG XclObjComment::GetLen() const // --- class XclObjDropDown ------------------------------------------ XclObjDropDown::XclObjDropDown( RootData& rRoot, const ScAddress& rPos, BOOL bFilt ) : - XclObj( otComboBox, rRoot ), + XclObj( otComboBox, rRoot, true ), bIsFiltered( bFilt ) { SetLocked( TRUE ); @@ -875,6 +890,106 @@ ULONG XclObjOle::GetLen() const } +// ---------------------------------------------------------------------------- + +#if EXC_INCL_EXP_OCX + +XclExpObjControl::XclExpObjControl( + const XclRoot& rRoot, + const Reference< XShape >& rxShape, + const String& rClassName, + sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ) : + XclObj( otPicture, *rRoot.mpRD, true ), + maClassName( rClassName ), + mnStrmStart( nStrmStart ), + mnStrmSize( nStrmSize ) +{ + SetAutoLine( FALSE ); + + XclEscherEx& rEscherEx = *pMsodrawing->GetEscherEx(); + rEscherEx.OpenContainer( ESCHER_SpContainer ); + rEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_OLESHAPE ); + Rectangle aDummyRect; + EscherPropertyContainer aPropOpt( rEscherEx, rEscherEx.QueryPicStream(), aDummyRect ); + aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_lineColor, 0x08000040 ); + aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field + + Reference< XPropertySet > xShapePS( rxShape, UNO_QUERY ); + if( xShapePS.is() ) + { + // meta file + if( aPropOpt.CreateGraphicProperties( xShapePS, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) ) + { + sal_uInt32 nBlipId; + if( aPropOpt.GetOpt( ESCHER_Prop_pib, nBlipId ) ) + aPropOpt.AddOpt( ESCHER_Prop_pictureId, nBlipId ); + } + + // name of the control + ::rtl::OUString aCtrlName; + //! TODO - this does not work - property is empty + if( ::getPropValue( aCtrlName, xShapePS, PROPNAME( "Name" ) ) && aCtrlName.getLength() ) + { + XclExpString aCtrlNameEx( aCtrlName, EXC_STR_FORCEUNICODE ); + sal_uInt32 nBufferSize = aCtrlNameEx.GetBufferSize() + 2; // plus trailing zero + sal_uInt8* pBuffer = new sal_uInt8[ nBufferSize ]; + aCtrlNameEx.WriteBuffer( pBuffer ); + pBuffer[ nBufferSize - 2 ] = pBuffer[ nBufferSize - 1 ] = 0; + // aPropOpt takes ownership of pBuffer + aPropOpt.AddOpt( ESCHER_Prop_wzName, TRUE, nBufferSize, pBuffer, nBufferSize ); + } + } + + aPropOpt.Commit( rEscherEx.GetStream() ); + + if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( rxShape ) ) + XclEscherClientAnchor( *rRoot.mpRD, *pSdrObj ).WriteData( rEscherEx ); + rEscherEx.AddAtom( 0, ESCHER_ClientData ); // OBJ record + rEscherEx.CloseContainer(); // ESCHER_SpContainer + + pMsodrawing->UpdateStopPos(); +} + +void XclExpObjControl::SaveCont( XclExpStream& rStrm ) +{ + // ftCmo + XclObj::SaveCont( rStrm ); + // ftCf (clipboard format) + rStrm << sal_uInt16( ftCf ) << sal_uInt16( 2 ) << sal_uInt16( 2 ); + // ftPioGrbit + rStrm << sal_uInt16( ftPioGrbit ) << sal_uInt16( 2 ) << sal_uInt16( 0x0031 ); + + // ftPictFmla + XclExpString aClass( maClassName ); + sal_uInt16 nClassNameSize = static_cast< sal_uInt16 >( aClass.GetSize() ); + sal_uInt16 nClassNamePad = nClassNameSize & 1; + sal_uInt16 nFirstPartSize = 12 + nClassNameSize + nClassNamePad; + sal_uInt16 nPictFmlaSize = nFirstPartSize + 18; + + rStrm << sal_uInt16( ftPictFmla ) << sal_uInt16( nPictFmlaSize ) + << sal_uInt16( nFirstPartSize ) // size of first part + << sal_uInt16( 5 ) // formula size + << sal_uInt32( 0 ) // unknown ID + << sal_uInt8( 0x02 ) << sal_uInt32( 0 ) // tTbl token with unknown ID + << sal_uInt8( 3 ) // pad to word + << aClass; // "Forms.***.1" + rStrm.WriteZeroBytes( nClassNamePad ); // pad to word + rStrm << mnStrmStart // start in 'Ctls' stream + << mnStrmSize // size in 'Ctls' stream + << sal_uInt32( 0 ) << sal_uInt32( 0 ); // unknown + + // ftEnd + rStrm << sal_uInt16( ftEnd ) << sal_uInt16( 0 ); +} + +sal_uInt32 XclExpObjControl::GetLen() const +{ + return 0; // calculated by XclExpStream +} + +#endif + // --- class XclObjAny ------------------------------------------- XclObjAny::XclObjAny( RootData& rRoot ) @@ -925,81 +1040,50 @@ ULONG XclObjAny::GetLen() const -// --- class XclNoteList ---------------------------------------------- +// ---------------------------------------------------------------------------- -XclNoteList::XclNoteList() +XclExpNote::XclExpNote( + const XclExpRoot& rRoot, const ScAddress& rPos, + const ScPostIt* pScNote, const String& rAddText ) : + XclExpRecord( EXC_ID_NOTE ), + maPos( rPos ), + mnObjId( 0 ), + mbVisible( pScNote && pScNote->IsShown() ) { -} - + String aNoteText; -XclNoteList::~XclNoteList() -{ - for ( XclNote* p = First(); p; p = Next() ) + // read strings from note object, if present + if( pScNote ) { - delete p; + aNoteText = pScNote->GetText(); + maAuthor.Assign( pScNote->GetAuthor() ); } -} - - -void XclNoteList::Add( XclNote* pNote ) -{ - // limitation on 64kB is done in XclObjList, - // more notes get no ID and will not save themselfs - Insert( pNote, LIST_APPEND ); -} - -void XclNoteList::Save( XclExpStream& rStrm ) -{ - for ( XclNote* p = First(); p; p = Next() ) + // append additional text + if( rAddText.Len() ) { - p->Save( rStrm ); + if( aNoteText.Len() ) + aNoteText.Append( EXC_NEWLINE ).Append( EXC_NEWLINE ); + aNoteText.Append( rAddText ); } -} + // create the Escher object + mnObjId = rRoot.mpRD->pObjRecs->Add( new XclObjComment( *rRoot.mpRD, maPos, aNoteText, mbVisible ) ); - -// --- class XclNote ------------------------------------------------- - -XclNote::XclNote( RootData& rRoot, const ScAddress& rPos, const String& rNoteText, const String& rNoteAuthor ) : - aAuthor( rNoteAuthor ), - aPos( rPos ), - nGrbit(0) -{ - XclObjComment* pObj = new XclObjComment( rRoot, rPos, rNoteText ); - nObjId = rRoot.pObjRecs->Add( pObj ); + SetRecSize( 9 + maAuthor.GetSize() ); } - -XclNote::~XclNote() +void XclExpNote::Save( XclExpStream& rStrm ) { + if( mnObjId ) + XclExpRecord::Save( rStrm ); } - -void XclNote::SaveCont( XclExpStream& rStrm ) +void XclExpNote::WriteBody( XclExpStream& rStrm ) { - rStrm << (UINT16) aPos.Row() << (UINT16) aPos.Col() << nGrbit << nObjId - << aAuthor - << UINT8(0); // pad byte goes here (always) -} - - -void XclNote::Save( XclExpStream& rStrm ) -{ - if ( nObjId ) - ExcRecord::Save( rStrm ); -} - - -UINT16 XclNote::GetNum() const -{ - return 0x001C; -} - - -ULONG XclNote::GetLen() const -{ - return nObjId ? 9 + aAuthor.GetSize() : 0; + sal_uInt16 nFlags = mbVisible ? EXC_NOTE_VISIBLE : 0; + rStrm << (sal_uInt16) maPos.Row() << (sal_uInt16) maPos.Col() + << nFlags << mnObjId << maAuthor << sal_uInt8( 0 ); } @@ -1074,15 +1158,14 @@ ExcLabelSst::ExcLabelSst( ExcLabelSst::ExcLabelSst( const ScAddress& rPos, const ScPatternAttr* pAttr, - RootData& rRoot, + RootData& rRootData, const ScEditCell& rEdCell ) : - ExcCell( rPos, pAttr, rRoot ) + ExcCell( rPos, pAttr, rRootData ) { - XclExpString* pStr = XclExpStringHelper::CreateString( *rRoot.pER, rEdCell, pAttr ); - UsedAttrList& rXFBuffer = *rRoot.pXFRecs; - const ScPatternAttr& rAttr = pAttr ? *pAttr : *rRoot.pER->GetDoc().GetDefPattern(); - SetXF( pStr->IsWrapped() ? rXFBuffer.FindWithLineBreak( &rAttr ) : rXFBuffer.Find( &rAttr ) ); - nIsst = rRoot.pER->GetSst().Insert( pStr ); + const XclExpRoot& rRoot = *rRootData.pER; + XclExpString* pString = XclExpStringHelper::CreateString( rRoot, rEdCell, pAttr ); + SetXF( rRoot.GetXFBuffer().Insert( pAttr, pString->IsWrapped() ) ); + nIsst = rRoot.GetSst().Insert( pString ); } @@ -1110,113 +1193,6 @@ ULONG ExcLabelSst::GetDiffLen() const -// --- class ExcXf8 -------------------------------------------------- - -ExcXf8::ExcXf8( const XclExpRoot& rRoot, UINT16 nFont, UINT16 nForm, const ScPatternAttr* pPattAttr, - BOOL& rbLineBreak, BOOL bSt ) : - ExcXf( rRoot, nFont, nForm, pPattAttr, rbLineBreak, bSt ), - eTextDir( xlTextDirContext ), - nTrot( 0 ), - nCIndent( 0 ), - bFShrinkToFit( FALSE ), - bFMergeCell( FALSE ), - nGrbitDiag( 0 ), - nIcvDiagSer( 0 ), - nDgDiag( 0 ) -{ - if( eOri == xlTextOrientTopBottom ) - nTrot = 0x00FF; - else if( eOri != xlTextOrientNoRot ) // see #i4378 - nTrot = (eOri == xlTextOrient90ccw) ? 90 : 180; - else if( pPattAttr ) - nTrot = XclTools::GetExcRotation( ((const SfxInt32Item&) pPattAttr->GetItem( ATTR_ROTATE_VALUE )).GetValue() ); - - if( pPattAttr ) - { - nCIndent = (UINT16)((const SfxUInt16Item&) pPattAttr->GetItem( ATTR_INDENT )).GetValue(); - nCIndent += 100; - nCIndent /= 200; - if( nCIndent > 15 ) - nCIndent = 15; - - switch( (SvxFrameDirection)((const SvxFrameDirectionItem&)pPattAttr->GetItem( ATTR_WRITINGDIR )).GetValue() ) - { - case FRMDIR_ENVIRONMENT: eTextDir = xlTextDirContext; break; - case FRMDIR_HORI_LEFT_TOP: eTextDir = xlTextDirLTR; break; - case FRMDIR_HORI_RIGHT_TOP: eTextDir = xlTextDirRTL; break; - default: DBG_ERRORFILE( "ExcXf8::ExcXf8 - unknown CTL text direction" ); - } - } -} - - -void ExcXf8::SaveCont( XclExpStream& rStrm ) -{ - register UINT16 nTmp; - register UINT32 nTmp32; - - rStrm << nIfnt << nIfmt // Offs 4 + 6 - << nOffs8; // Offs 8 - - nTmp = ( UINT16 ) eAlc; // Offs 10 - if( bFWrap ) - nTmp |= 0x0008; - nTmp |= ( ( UINT16 ) eAlcV ) << 4; - nTmp |= nTrot << 8; - rStrm << nTmp; - - nTmp = nCIndent; // Offs 12 - if( bFShrinkToFit ) - nTmp |= 0x0010; - if( bFMergeCell ) - nTmp |= 0x0020; - nTmp |= ((UINT16)eTextDir) << 6; - // Bit 9-8 reserved, Bit 15-10 fAtr... alle 0 (keine Parent Styles) - rStrm << nTmp; - - nTmp = nDgLeft; // Offs 14 - nTmp |= nDgRight << 4; - nTmp |= nDgTop << 8; - nTmp |= nDgBottom << 12; - rStrm << nTmp; - - nTmp = GetPalette().GetColorIndex( nIcvLftSer ); // Offs 16 - nTmp |= GetPalette().GetColorIndex( nIcvRigSer ) << 7; - nTmp |= nGrbitDiag << 14; - rStrm << nTmp; - - nTmp32 = GetPalette().GetColorIndex( nIcvTopSer ); // Offs 18 - nTmp32 |= (UINT32) GetPalette().GetColorIndex( nIcvBotSer ) << 7; - nTmp32 |= (UINT32) GetPalette().GetColorIndex( nIcvDiagSer ) << 14; - nTmp32 |= (UINT32) nDgDiag << 21; - - UINT16 nForeInd, nBackInd; - GetPalette().GetMixedColors( nForeInd, nBackInd, nFls, nIcvForeSer, nIcvBackSer ); - - nTmp32 |= (UINT32) nFls << 26; - rStrm << nTmp32; - - nTmp = nForeInd | (nBackInd << 7); // Offs 22 - - if( bFSxButton ) - nTmp |= 0x4000; - rStrm << nTmp; -} - - -UINT16 ExcXf8::GetNum() const -{ - return 0x00E0; -} - - -ULONG ExcXf8::GetLen() const -{ - return 20; -} - - - // --- class ExcBundlesheet8 ----------------------------------------- ExcBundlesheet8::ExcBundlesheet8( RootData& rRootData, UINT16 nTab ) : @@ -1422,25 +1398,24 @@ XclCondFormat::XclCondFormat( const ScConditionalFormat& _rCF, ScRangeList* _pRL { pCFE = _rCF.GetEntry( n ); if( pCFE ) - List::Insert( new XclCf( *rER.pER, *pCFE ), LIST_APPEND ); + Append( new XclCf( *rER.pER, *pCFE ) ); } } XclCondFormat::~XclCondFormat() { - if( pRL ) - delete pRL; + delete pRL; } void XclCondFormat::WriteCondfmt( XclExpStream& rStrm ) { - DBG_ASSERT( List::Count() < 65536, "XclCondFormat::SaveCont - to much CFs!" ); + DBG_ASSERT( Count() < 65536, "XclCondFormat::SaveCont - to much CFs!" ); rStrm.StartRecord( 0x01B0, 0 ); // real size calculated by XclExpStream - rStrm << (UINT16) List::Count() << (UINT16) 0x0000; + rStrm << (UINT16) Count() << (UINT16) 0x0001; ULONG nMinMaxPos = rStrm.GetStreamPos(); UINT16 nRowFirst = 0xFFFF; @@ -1491,7 +1466,7 @@ void XclCondFormat::Save( XclExpStream& rStrm ) WriteCondfmt( rStrm ); // write list of CF records - for( XclCf* pCf = _First(); pCf; pCf = _Next() ) + for( XclCf* pCf = First(); pCf; pCf = Next() ) pCf->Save( rStrm ); } @@ -1596,28 +1571,11 @@ XclCf::XclCf( const XclExpRoot& rRoot, const ScCondFormatEntry& r ) : // border data if( bHasLine ) - { - const SvxBoxItem& rBox = ((const SvxBoxItem&)aAttr.GetItem( ATTR_BORDER )); - UINT16 nDgTop, nDgBottom, nDgLeft, nDgRight; - - ExcXf::ScToExcBorderLine( rPal, rBox.GetTop(), nIcvTopSer, nDgTop ); - ExcXf::ScToExcBorderLine( rPal, rBox.GetBottom(), nIcvBotSer, nDgBottom ); - ExcXf::ScToExcBorderLine( rPal, rBox.GetLeft(), nIcvLftSer, nDgLeft ); - ExcXf::ScToExcBorderLine( rPal, rBox.GetRight(), nIcvRigSer, nDgRight ); - - nLineData1 = (UINT8)((nDgLeft & 0x0F) | (nDgRight << 4)); - nLineData2 = (UINT8)((nDgTop & 0x0F) | (nDgBottom << 4)); - } + XclExpXF::GetBorder( maBorder, rPal, aAttr ); // background / foreground data if( bHasPattern ) - { - const SvxBrushItem& rBrushItem = (const SvxBrushItem&)aAttr.GetItem( ATTR_BACKGROUND ); - Color aColor( rBrushItem.GetColor() ); - nPatt = aColor.GetTransparency() ? 0x0000 : 0x0001; - nIcvForeSer = rPal.InsertColor( aColor, xlColorCellArea ); - nIcvBackSer = rPal.InsertColor( Color( COL_BLACK ), xlColorCellArea ); - } + XclExpXF::GetArea( maArea, rPal, aAttr ); } ScTokenArray* pScTokArry1 = r.CreateTokenArry( 0 ); @@ -1699,22 +1657,26 @@ void XclCf::SaveCont( XclExpStream& rStrm ) } if( bHasLine ) { - UINT16 nLineData3, nLineData4; - nLineData3 = rPal.GetColorIndex( nIcvLftSer ) & 0x007F; - nLineData3 |= (rPal.GetColorIndex( nIcvRigSer ) & 0x007F) << 7; - nLineData4 = rPal.GetColorIndex( nIcvTopSer ) & 0x007F; - nLineData4 |= (rPal.GetColorIndex( nIcvBotSer ) & 0x007F) << 7; + sal_uInt8 nLineData1, nLineData2; + sal_uInt16 nLineData3, nLineData4; + nLineData1 = (UINT8)((maBorder.mnLeftLine & 0x0F) | (maBorder.mnRightLine << 4)); + nLineData2 = (UINT8)((maBorder.mnTopLine & 0x0F) | (maBorder.mnBottomLine << 4)); + nLineData3 = rPal.GetColorIndex( maBorder.mnLeftColorId ) & 0x007F; + nLineData3 |= (rPal.GetColorIndex( maBorder.mnRightColorId ) & 0x007F) << 7; + nLineData4 = rPal.GetColorIndex( maBorder.mnTopColorId ) & 0x007F; + nLineData4 |= (rPal.GetColorIndex( maBorder.mnBottomColorId ) & 0x007F) << 7; rStrm << nLineData1 << nLineData2 << nLineData3 << nLineData4 << (UINT16)0xBA00; } if( bHasPattern ) { - UINT16 nForeInd, nBackInd; - rPal.GetMixedColors( nForeInd, nBackInd, nPatt, nIcvForeSer, nIcvBackSer ); + sal_uInt16 nXclForeIx, nXclBackIx; + sal_uInt8 nPattern = maArea.mnPattern; + rPal.GetMixedColors( nXclForeIx, nXclBackIx, nPattern, maArea.mnForeColorId, maArea.mnBackColorId ); - UINT8 nPattData1 = (nPatt == 1) ? 0 : (UINT8) nPatt; - UINT16 nPattData2 = ((nForeInd & 0x007F ) << 7) | (nBackInd & 0x007F); + UINT8 nPattData1 = (nPattern == EXC_PATT_SOLID) ? 0 : nPattern; + UINT16 nPattData2 = ((nXclForeIx & 0x007F ) << 7) | (nXclBackIx & 0x007F); rStrm << (UINT8)0 << nPattData1 << nPattData2; } @@ -1939,9 +1901,11 @@ ExcEScenario::ExcEScenario( ScDocument& rDoc, UINT16 nTab ) if( rDoc.HasValueData( nCol, nRow, nTab ) ) { rDoc.GetValue( nCol, nRow, nTab, fVal ); - sText.Erase(); - SolarMath::DoubleToString( sText, fVal, 'A', INT_MAX, - ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE ); + sText = ::rtl::math::doubleToUString( fVal, + rtl_math_StringFormat_Automatic, + rtl_math_DecimalPlaces_Max, + ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), + TRUE ); } else rDoc.GetString( nCol, nRow, nTab, sText ); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index fed7ad2e9d8d..bdc878816632 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLChangeTrackingImportHelper.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: er $ $Date: 2002-04-15 11:04:14 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -900,6 +900,9 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc) if (aProtect.getLength()) pTrack->SetProtection(aProtect); + if ( pTrack->GetLast() ) + pTrack->SetLastSavedActionNumber(pTrack->GetLast()->GetActionNumber()); + pDoc->SetChangeTrack(pTrack); } } diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 90665dc11f4a..79f4c9f02cf2 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLConverter.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: sab $ $Date: 2001-11-15 11:36:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -725,7 +725,8 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const sal_Bool bIsFormula) sal_Unicode chPrevious('='); for (sal_Int32 i = 0; i < sFormula.getLength(); i++) { - if (sFormula[i] == '\'' && !bInDoubleQuotationMarks) + if (sFormula[i] == '\'' && !bInDoubleQuotationMarks && + chPrevious != '\\') bInQuotationMarks = !bInQuotationMarks; else if (sFormula[i] == '"' && !bInQuotationMarks) bInDoubleQuotationMarks = !bInDoubleQuotationMarks; @@ -741,6 +742,8 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const sal_Bool bIsFormula) sBuffer.append(sFormula[i]); chPrevious = sFormula[i]; } + + DBG_ASSERT(nCountBraces == 0, "there are some braces still open"); sFormula = sBuffer.makeStringAndClear(); } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index b58baf734d61..55f669dad3d4 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLStylesExportHelper.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: hr $ $Date: 2002-02-08 18:28:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 263d2570c203..6880b9ecf831 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLStylesExportHelper.hxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2002-02-08 18:28:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index e82b0a865193..526e81bad44d 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableMasterPageExport.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sab $ $Date: 2003-03-10 11:15:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,7 +136,7 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - aName, sal_True, sal_True ); + aName, sal_True, sal_True ); if (sCenter.getLength() && !sLeft.getLength() && !sRight.getLength()) exportHeaderFooterContent( xCenter, sal_False, sal_False ); else @@ -145,19 +145,19 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_REGION_LEFT, sal_True, sal_True ); - exportHeaderFooterContent( xLeft, sal_False, sal_False ); + exportHeaderFooterContent( xLeft, sal_False, sal_False ); } if (sCenter.getLength()) { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_REGION_CENTER, sal_True, sal_True ); - exportHeaderFooterContent( xCenter, sal_False, sal_False ); + exportHeaderFooterContent( xCenter, sal_False, sal_False ); } if (sRight.getLength()) { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_REGION_RIGHT, sal_True, sal_True ); - exportHeaderFooterContent( xRight, sal_False, sal_False ); + exportHeaderFooterContent( xRight, sal_False, sal_False ); } } } diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index b637947495b3..293005ea7a6b 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcelli.cxx,v $ * - * $Revision: 1.70 $ + * $Revision: 1.71 $ * - * last change: $Author: sab $ $Date: 2002-09-26 12:08:41 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -164,9 +164,6 @@ #ifndef _DATE_HXX #include <tools/date.hxx> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> -#endif #ifndef _ISOLANG_HXX #include <tools/isolang.hxx> #endif diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 51deb74f5775..3464c4a07d6c 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmldrani.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: sab $ $Date: 2002-03-22 16:02:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -470,14 +470,14 @@ void ScXMLDatabaseRangeContext::EndElement() xFilterPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_USEREGEX)), aTemp); aTemp <<= aFilterOutputPosition; xFilterPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)), aTemp); - if (bFilterConditionSourceRange) - { - ScRange aAdvSource; - ScUnoConversion::FillScRange( aAdvSource, aFilterConditionSourceRangeAddress ); - pDBData->SetAdvancedQuerySource(&aAdvSource); - } } xSheetFilterDescriptor->setFilterFields(aFilterFields); + if (bFilterConditionSourceRange) + { + ScRange aAdvSource; + ScUnoConversion::FillScRange( aAdvSource, aFilterConditionSourceRangeAddress ); + pDBData->SetAdvancedQuerySource(&aAdvSource); + } } if (bContainsSubTotal) { diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 3dc869871fc1..bea415afc45a 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexprt.cxx,v $ * - * $Revision: 1.164 $ + * $Revision: 1.165 $ * - * last change: $Author: sab $ $Date: 2002-12-06 05:59:14 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,8 +185,8 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _ZFORLIST_HXX #include <svtools/zforlist.hxx> @@ -509,6 +509,21 @@ ScXMLExport::ScXMLExport(const sal_uInt16 nExportFlag) : xRowStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), xTableStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + + if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) + { + sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME)); + sAttrStyleName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_STYLE_NAME)); + sAttrColumnsRepeated = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NUMBER_COLUMNS_REPEATED)); + sAttrFormula = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_FORMULA)); + sAttrStringValue = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_STRING_VALUE)); + sElemCell = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_CELL)); + sElemCoveredCell = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_COVERED_TABLE_CELL)); + sElemCol = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_COLUMN)); + sElemRow = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_ROW)); + sElemTab = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE)); + sElemP = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(XML_P)); + } } @@ -840,17 +855,17 @@ void ScXMLExport::WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_In const sal_Int32 nIndex, const sal_Bool bIsAutoStyle, const sal_Bool bIsVisible) { CheckAttrList(); - AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, *pColumnStyles->GetStyleNameByIndex(nStyleIndex)); + AddAttribute(sAttrStyleName, *pColumnStyles->GetStyleNameByIndex(nStyleIndex)); if (!bIsVisible) AddAttribute(XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_COLLAPSE); if (nRepeatColumns > 1) { OUString sOUEndCol = OUString::valueOf(static_cast <sal_Int32> (nRepeatColumns)); - AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, sOUEndCol); + AddAttribute(sAttrColumnsRepeated, sOUEndCol); } if (nIndex != -1) AddAttribute(XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, *pCellStyles->GetStyleNameByIndex(nIndex, bIsAutoStyle)); - SvXMLElementExport aElemR(*this, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True); + SvXMLElementExport aElemC(*this, sElemCol, sal_True, sal_True); } void ScXMLExport::WriteColumn(const sal_Int32 nColumn, const sal_Int32 nRepeatColumns, @@ -1023,16 +1038,16 @@ void ScXMLExport::WriteRowContent() else { if (nIndex != -1) - AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, *pCellStyles->GetStyleNameByIndex(nIndex, bIsAutoStyle)); + AddAttribute(sAttrStyleName, *pCellStyles->GetStyleNameByIndex(nIndex, bIsAutoStyle)); if (nPrevValidationIndex > -1) AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { rtl::OUStringBuffer aBuf; GetMM100UnitConverter().convertNumber(aBuf, nCols); - AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aBuf.makeStringAndClear()); + AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } - SvXMLElementExport aElemC(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemC(*this, sElemCell, sal_True, sal_True); nIndex = aRange.nIndex; bIsAutoStyle = aRange.bIsAutoStyle; nCols = aRange.nRepeatColumns; @@ -1047,23 +1062,23 @@ void ScXMLExport::WriteRowContent() { table::CellAddress aCellAddress; if (nIndex != -1) - AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, *pCellStyles->GetStyleNameByIndex(nIndex, bIsAutoStyle)); + AddAttribute(sAttrStyleName, *pCellStyles->GetStyleNameByIndex(nIndex, bIsAutoStyle)); if (nPrevValidationIndex > -1) AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { rtl::OUStringBuffer aBuf; GetMM100UnitConverter().convertNumber(aBuf, nCols); - AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aBuf.makeStringAndClear()); + AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } - SvXMLElementExport aElemC(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemC(*this, sElemCell, sal_True, sal_True); } } void ScXMLExport::WriteRowStartTag(const sal_Int32 nRow, const sal_Int32 nIndex, const sal_Int8 nFlag, const sal_Int32 nEqualRows) { - AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, *pRowStyles->GetStyleNameByIndex(nIndex)); + AddAttribute(sAttrStyleName, *pRowStyles->GetStyleNameByIndex(nIndex)); if (nFlag) if (nFlag & CR_HIDDEN) { @@ -1083,7 +1098,7 @@ void ScXMLExport::WriteRowStartTag(const sal_Int32 nRow, const sal_Int32 nIndex, AddAttribute(XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, *pCellStyles->GetStyleNameByIndex(nCellStyleIndex, (*pDefaults->GetRowDefaults())[nRow].bIsAutoStyle)); - StartElement( XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True); + StartElement( sElemRow, sal_True); } void ScXMLExport::OpenHeaderRows() @@ -1200,7 +1215,7 @@ void ScXMLExport::CloseRow(const sal_Int32 nRow) { if (nOpenRow > -1) { - EndElement(XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True); + EndElement(sElemRow, sal_True); if (bHasRowHeader && nRow == aRowHeaderRange.EndRow) { CloseHeaderRows(); @@ -1430,8 +1445,8 @@ void ScXMLExport::_ExportContent() { nCurrentTable = nTable; rtl::OUString sOUTableName = xName->getName(); - AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, sOUTableName); - AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, aTableStyles[nTable]); + AddAttribute(sAttrName, sOUTableName); + AddAttribute(sAttrStyleName, aTableStyles[nTable]); uno::Reference<util::XProtectable> xProtectable (xTable, uno::UNO_QUERY); if (xProtectable.is()) if (xProtectable->isProtected()) @@ -1446,7 +1461,7 @@ void ScXMLExport::_ExportContent() rtl::OUString sPrintRanges( GetPrintRanges() ); if( sPrintRanges.getLength() ) AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT_RANGES, sPrintRanges ); - SvXMLElementExport aElemT(*this, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); + SvXMLElementExport aElemT(*this, sElemTab, sal_True, sal_True); CheckAttrList(); WriteTableSource(); WriteScenario(); @@ -2242,7 +2257,7 @@ OUString ScXMLExport::GetPrintRanges() void ScXMLExport::WriteCell (ScMyCell& aCell) { if (aCell.nStyleIndex != -1) - AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, *pCellStyles->GetStyleNameByIndex(aCell.nStyleIndex, aCell.bIsAutoStyle)); + AddAttribute(sAttrStyleName, *pCellStyles->GetStyleNameByIndex(aCell.nStyleIndex, aCell.bIsAutoStyle)); if (aCell.nValidationIndex > -1) AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(aCell.nValidationIndex)); sal_Bool bIsMatrix(aCell.bIsMatrixBase || aCell.bIsMatrixCovered); @@ -2274,7 +2289,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) aCell.bHasDoubleValue = sal_True; } GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - aCell.nNumberFormat, aCell.fValue, XML_NAMESPACE_TABLE); + aCell.nNumberFormat, aCell.fValue); } break; case table::CellContentType_TEXT : @@ -2285,7 +2300,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) if (sFormula[0] == '\'') sFormula = sFormula.copy(1); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - sFormula, aCell.sStringValue, XML_NAMESPACE_TABLE, sal_True, sal_False); + sFormula, aCell.sStringValue, sal_True, sal_False); } } break; @@ -2304,11 +2319,11 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) pFormulaCell->GetEnglishFormula(sFormula, sal_True); rtl::OUString sOUFormula(sFormula.makeStringAndClear()); if (!bIsMatrix) - AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sOUFormula); + AddAttribute(sAttrFormula, sOUFormula); else { rtl::OUString sMatrixFormula = sOUFormula.copy(1, sOUFormula.getLength() - 2); - AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sMatrixFormula); + AddAttribute(sAttrFormula, sMatrixFormula); } } if (pFormulaCell->IsValue()) @@ -2321,28 +2336,29 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) if (pDoc) GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0), - aCell.xCell->getValue(), XML_NAMESPACE_TABLE); + aCell.xCell->getValue()); } else GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - aCell.nNumberFormat, aCell.xCell->getValue(), XML_NAMESPACE_TABLE); + aCell.nNumberFormat, aCell.xCell->getValue()); } else { if (GetCellText(aCell)) if (aCell.sStringValue.getLength()) - AddAttribute(XML_NAMESPACE_TABLE, XML_STRING_VALUE, aCell.sStringValue); + AddAttribute(sAttrStringValue, aCell.sStringValue); } } } break; } - XMLTokenEnum nCellType; + rtl::OUString* pCellString = &sElemCell; if (aCell.bIsCovered) - nCellType = XML_COVERED_TABLE_CELL; + { + pCellString = &sElemCoveredCell; + } else { - nCellType = XML_TABLE_CELL; if (aCell.bIsMergedBase) { sal_Int32 nColumns = aCell.aMergeRange.EndColumn - aCell.aMergeRange.StartColumn + 1; @@ -2355,7 +2371,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, sRows.makeStringAndClear()); } } - SvXMLElementExport aElemC(*this, XML_NAMESPACE_TABLE, nCellType, sal_True, sal_True); + SvXMLElementExport aElemC(*this, *pCellString, sal_True, sal_True); CheckAttrList(); WriteAreaLink(aCell); WriteAnnotation(aCell); @@ -2374,7 +2390,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) } else { - SvXMLElementExport aElemC(*this, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); + SvXMLElementExport aElemC(*this, sElemP, sal_True, sal_False); sal_Bool bPrevCharWasSpace(sal_True); if (GetCellText(aCell)) GetTextParagraphExport()->exportText(aCell.sStringValue, bPrevCharWasSpace); @@ -2585,7 +2601,7 @@ void ScXMLExport::WriteAnnotation(const ScMyCell& rMyCell) { if (sOUText2[i] == '\n') { - SvXMLElementExport aElemP(*this, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); + SvXMLElementExport aElemP(*this, sElemP, sal_True, sal_False); GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace); } else @@ -2594,7 +2610,7 @@ void ScXMLExport::WriteAnnotation(const ScMyCell& rMyCell) } if (sTemp.getLength()) { - SvXMLElementExport aElemP(*this, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); + SvXMLElementExport aElemP(*this, sElemP, sal_True, sal_False); GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace); } CheckAttrList(); @@ -2651,7 +2667,7 @@ void ScXMLExport::SetRepeatAttribute (const sal_Int32 nEqualCellCount) { sal_Int32 nTemp = nEqualCellCount + 1; OUString sOUEqualCellCount = OUString::valueOf(nTemp); - AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, sOUEqualCellCount); + AddAttribute(sAttrColumnsRepeated, sOUEqualCellCount); GetProgressBarHelper()->Increment(nEqualCellCount); } } @@ -2831,7 +2847,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads util::Date aNullDate; aAny >>= aNullDate; if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions || - bIsIterationEnabled || nIterationCount != 100 || !SolarMath::ApproxEqual(fIterationEpsilon, 0.001) || + bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) { if (bIgnoreCase) @@ -2859,7 +2875,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_VALUE, sDate.makeStringAndClear()); SvXMLElementExport aElemNullDate(*this, XML_NAMESPACE_TABLE, XML_NULL_DATE, sal_True, sal_True); } - if (bIsIterationEnabled || nIterationCount != 100 || !SolarMath::ApproxEqual(fIterationEpsilon, 0.001)) + if (bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001)) { rtl::OUStringBuffer sBuffer; if (bIsIterationEnabled) @@ -2869,7 +2885,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads GetMM100UnitConverter().convertNumber(sBuffer, nIterationCount); AddAttribute(XML_NAMESPACE_TABLE, XML_STEPS, sBuffer.makeStringAndClear()); } - if (!SolarMath::ApproxEqual(fIterationEpsilon, 0.001)) + if (!::rtl::math::approxEqual(fIterationEpsilon, 0.001)) { GetMM100UnitConverter().convertDouble(sBuffer, fIterationEpsilon); AddAttribute(XML_NAMESPACE_TABLE, XML_MAXIMUM_DIFFERENCE, sBuffer.makeStringAndClear()); @@ -3068,7 +3084,7 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference <co if (xNamed.is() && xCellRangeReferrer.is()) { rtl::OUString sOUName = xNamed->getName(); - AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, sOUName); + AddAttribute(sAttrName, sOUName); OUString sOUBaseCellAddress; ScXMLConverter::GetStringFromAddress( sOUBaseCellAddress, @@ -3286,10 +3302,7 @@ void ScXMLExport::CreateSharedData(const sal_Int32 nTableCount) XMLNumberFormatAttributesExportHelper* ScXMLExport::GetNumberFormatAttributesExportHelper() { if (!pNumberFormatAttributesExportHelper) - { - pNumberFormatAttributesExportHelper = new XMLNumberFormatAttributesExportHelper(GetNumberFormatsSupplier()); - pNumberFormatAttributesExportHelper->SetExport(this); - } + pNumberFormatAttributesExportHelper = new XMLNumberFormatAttributesExportHelper(GetNumberFormatsSupplier(), *this, XML_NAMESPACE_TABLE); return pNumberFormatAttributesExportHelper; } diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 59b0c16378fc..aa3a1ffcbe60 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexprt.hxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: sab $ $Date: 2001-10-19 09:17:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -139,6 +139,17 @@ class ScXMLExport : public SvXMLExport ScChangeTrackingExportHelper* pChangeTrackingExportHelper; const rtl::OUString sLayerID; const rtl::OUString sCaptionShape; + rtl::OUString sAttrName; + rtl::OUString sAttrStyleName; + rtl::OUString sAttrColumnsRepeated; + rtl::OUString sAttrFormula; + rtl::OUString sAttrStringValue; + rtl::OUString sElemCell; + rtl::OUString sElemCoveredCell; + rtl::OUString sElemCol; + rtl::OUString sElemRow; + rtl::OUString sElemTab; + rtl::OUString sElemP; sal_Int32 nOpenRow; sal_uInt16 nCurrentTable; sal_Bool bHasRowHeader : 1; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index e97b614261b5..077944507e3c 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlwrap.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: sab $ $Date: 2002-09-26 12:08:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,6 +118,9 @@ #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> #endif +#ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_ +#include <com/sun/star/packages/zip/ZipIOException.hpp> +#endif #ifndef _XMLEOHLP_HXX #include <svx/xmleohlp.hxx> @@ -358,6 +361,15 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe nReturn = SCERR_IMPORT_FORMAT; } } + catch( packages::zip::ZipIOException& r ) + { +#ifdef DBG_UTIL + ByteString aError( "Zip exception catched while importing:\n" ); + aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR( aError.GetBuffer() ); +#endif + nReturn = ERRCODE_IO_BROKENPACKAGE; + } catch( io::IOException& r ) { #ifdef DBG_UTIL diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 67c5b7d8be18..f16b01334292 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleCell.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: sab $ $Date: 2002-11-27 14:21:16 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,6 +148,8 @@ ScAccessibleCell::ScAccessibleCell( meSplitPos(eSplitPos), mpAccDoc(pAccDoc) { + if (pViewShell) + pViewShell->AddAccessibilityObject(*this); } ScAccessibleCell::~ScAccessibleCell() @@ -174,6 +176,13 @@ void SAL_CALL ScAccessibleCell::disposing() // #100593# dispose in AccessibleStaticTextBase Dispose(); + if (mpViewShell) + { + mpViewShell->RemoveAccessibilityObject(*this); + mpViewShell = NULL; + } + mpAccDoc = NULL; + ScAccessibleCellBase::disposing(); } diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 2ff503aabfa4..510d0b678510 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleContextBase.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: sab $ $Date: 2002-12-04 15:39:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,6 +111,9 @@ #ifndef _TOOLS_COLOR_HXX #include <tools/color.hxx> #endif +#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER +#include <comphelper/accessibleeventnotifier.hxx> +#endif using namespace ::rtl; using namespace ::com::sun::star; @@ -127,7 +130,7 @@ ScAccessibleContextBase::ScAccessibleContextBase( ScAccessibleContextBaseWeakImpl(m_aMutex), maRole(aRole), mxParent(rxParent), - mpEventListeners(NULL) + mnClientId(0) { DBG_CTOR(ScAccessibleContextBase, NULL); } @@ -169,15 +172,11 @@ void SAL_CALL ScAccessibleContextBase::disposing() // hold reference to make sure that the destructor is not called uno::Reference< XAccessibleContext > xOwnContext(this); - if (mpEventListeners) + if ( mnClientId ) { - lang::EventObject aEvent; - aEvent.Source = static_cast<cppu::OWeakObject*>(this); - if (mpEventListeners) - { - mpEventListeners->disposeAndClear(aEvent); - DELETEZ( mpEventListeners ); - } + sal_Int32 nTemClientId(mnClientId); + mnClientId = 0; + comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nTemClientId, *this ); } if (mxParent.is()) @@ -496,9 +495,9 @@ void SAL_CALL IsObjectValid(); if (!IsDefunc()) { - if (!mpEventListeners) - mpEventListeners = new cppu::OInterfaceContainerHelper(m_aMutex); - mpEventListeners->addInterface(xListener); + if (!mnClientId) + mnClientId = comphelper::AccessibleEventNotifier::registerClient( ); + comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener ); } } } @@ -511,8 +510,19 @@ void SAL_CALL if (xListener.is()) { ScUnoGuard aGuard; - if (!IsDefunc() && mpEventListeners) - mpEventListeners->removeInterface(xListener); + if (!IsDefunc() && mnClientId) + { + sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener ); + if ( !nListenerCount ) + { + // no listeners anymore + // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client), + // and at least to us not firing any events anymore, in case somebody calls + // NotifyAccessibleEvent, again + comphelper::AccessibleEventNotifier::revokeClient( mnClientId ); + mnClientId = 0; + } + } } } @@ -616,38 +626,8 @@ uno::Sequence<sal_Int8> SAL_CALL void ScAccessibleContextBase::CommitChange(const AccessibleEventObject& rEvent) const { - if (mpEventListeners) - { - // Call all listeners. - uno::Sequence< uno::Reference< uno::XInterface > > aListeners = mpEventListeners->getElements(); - sal_uInt32 nLength(aListeners.getLength()); - if (nLength) - { - const uno::Reference< uno::XInterface >* pInterfaces = aListeners.getConstArray(); - if (pInterfaces) - { - sal_uInt32 i(0); - while (i < nLength) - { - try - { - while(i < nLength) - { - static_cast< XAccessibleEventListener* >(pInterfaces->get())->notifyEvent(rEvent); - ++pInterfaces; - ++i; - } - } - catch(uno::RuntimeException&) - { -// DBG_ERROR("a object is gone without to remove from Broadcaster"); - ++pInterfaces; - ++i; - } - } - } - } - } + if (mnClientId) + comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent ); } void ScAccessibleContextBase::ChangeName() diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index f4b12ebc39e0..f2fdda6775c2 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleCsvControl.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: sab $ $Date: 2002-11-15 09:34:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,8 +146,8 @@ #ifndef SC_SCMOD_HXX #include "scmod.hxx" #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif using ::rtl::OUString; @@ -615,8 +615,8 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const AwtPoint& rPoint ScUnoGuard aGuard; ensureAlive(); ScCsvRuler& rRuler = implGetRuler(); - Point aPos( implGetRelPos( VCLPoint( rPoint ) ) ); - return ::std::min( ::std::max( rRuler.GetPosFromX( aPos.X() ), 0L ), rRuler.GetPosCount() ); + // #107054# use object's coordinate system + return ::std::min( ::std::max( rRuler.GetPosFromX( rPoint.X ), 0L ), rRuler.GetPosCount() ); } OUString SAL_CALL ScAccessibleCsvRuler::getSelectedText() throw( RuntimeException ) @@ -1002,9 +1002,11 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAt( const Aw ensureAlive(); const ScCsvGrid& rGrid = implGetGrid(); - // #102679#; use >= instead of >, because the offset is the size and not the point - sal_Int32 nColumn = (rPoint.X >= rGrid.GetOffsetX()) ? lcl_GetApiColumn( rGrid.GetColumnFromX( rPoint.X ) ) : 0; - sal_Int32 nRow = (rPoint.Y >= rGrid.GetOffsetY()) ? (rGrid.GetLineFromY( rPoint.Y ) - rGrid.GetFirstVisLine() + 1) : 0; + // #102679#; use <= instead of <, because the offset is the size and not the point + sal_Int32 nColumn = ((rGrid.GetFirstX() <= rPoint.X) && (rPoint.X <= rGrid.GetLastX())) ? + lcl_GetApiColumn( rGrid.GetColumnFromX( rPoint.X ) ) : 0; + sal_Int32 nRow = (rPoint.Y >= rGrid.GetHdrHeight()) ? + (rGrid.GetLineFromY( rPoint.Y ) - rGrid.GetFirstVisLine() + 1) : 0; xRet = implCreateCellObj( nRow, nColumn ); } return xRet; @@ -1023,7 +1025,7 @@ throw (RuntimeException) { ScUnoGuard aGuard; ensureAlive(); - return SC_MOD()->GetColorConfig().GetColorValue( ::svx::DOCCOLOR ).nColor; + return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor; } // XAccessibleContext --------------------------------------------------------- @@ -1571,7 +1573,7 @@ throw (RuntimeException) { ScUnoGuard aGuard; ensureAlive(); - return SC_MOD()->GetColorConfig().GetColorValue( ::svx::DOCCOLOR ).nColor; + return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor; } // XAccessibleContext ----------------------------------------------------- @@ -1707,7 +1709,7 @@ Point ScAccessibleCsvCell::implGetRealPos() const { ScCsvGrid& rGrid = implGetGrid(); return Point( - (mnColumn == CSV_COLUMN_HEADER) ? 0 : rGrid.GetColumnX( mnColumn ), + (mnColumn == CSV_COLUMN_HEADER) ? rGrid.GetHdrX() : rGrid.GetColumnX( mnColumn ), (mnLine == CSV_LINE_HEADER) ? 0 : rGrid.GetY( mnLine ) ); } @@ -1721,8 +1723,8 @@ Size ScAccessibleCsvCell::implGetRealSize() const { ScCsvGrid& rGrid = implGetGrid(); return Size( - (mnColumn == CSV_COLUMN_HEADER) ? rGrid.GetOffsetX() : implCalcPixelWidth(rGrid.GetColumnWidth( mnColumn )), - (mnLine == CSV_LINE_HEADER) ? rGrid.GetOffsetY() : rGrid.GetLineHeight() ); + (mnColumn == CSV_COLUMN_HEADER) ? rGrid.GetHdrWidth() : implCalcPixelWidth( rGrid.GetColumnWidth( mnColumn ) ), + (mnLine == CSV_LINE_HEADER) ? rGrid.GetHdrHeight() : rGrid.GetLineHeight() ); } Rectangle ScAccessibleCsvCell::implGetBoundingBox() const @@ -1730,9 +1732,12 @@ Rectangle ScAccessibleCsvCell::implGetBoundingBox() const ScCsvGrid& rGrid = implGetGrid(); Rectangle aClipRect( Point( 0, 0 ), rGrid.GetSizePixel() ); if( mnColumn != CSV_COLUMN_HEADER ) - aClipRect.Left() = rGrid.GetOffsetX(); + { + aClipRect.Left() = rGrid.GetFirstX(); + aClipRect.Right() = rGrid.GetLastX(); + } if( mnLine != CSV_LINE_HEADER ) - aClipRect.Top() = rGrid.GetOffsetY(); + aClipRect.Top() = rGrid.GetHdrHeight(); Rectangle aRect( implGetRealPos(), implGetRealSize() ); aRect.Intersection( aClipRect ); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index f3f2f21d8dcb..1c5ca2093d5a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleDocument.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: sab $ $Date: 2002-10-01 15:18:06 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,13 +178,14 @@ using namespace ::drafts::com::sun::star::accessibility; struct ScAccessibleShapeData { - ScAccessibleShapeData() : pAccShape(NULL), pRelationCell(NULL), bSelected(sal_False) {} + ScAccessibleShapeData() : pAccShape(NULL), pRelationCell(NULL), bSelected(sal_False), bSelectable(sal_True) {} ~ScAccessibleShapeData(); mutable accessibility::AccessibleShape* pAccShape; mutable ScAddress* pRelationCell; // if it is NULL this shape is anchored on the table // SdrObject* pShape; com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape; mutable sal_Bool bSelected; + sal_Bool bSelectable; }; ScAccessibleShapeData::~ScAccessibleShapeData() @@ -298,7 +299,7 @@ struct SelectShape SelectShape(uno::Reference<drawing::XShapes>& xTemp) : xShapes(xTemp) {} void operator() (const ScAccessibleShapeData* pAccShapeData) const { - if (pAccShapeData) + if (pAccShapeData && pAccShapeData->bSelectable) { pAccShapeData->bSelected = sal_True; if (pAccShapeData->pAccShape) @@ -591,10 +592,10 @@ uno::Reference< XAccessible > ScChildrenShapes::Get(const ScAccessibleShapeData* pData->pAccShape->acquire(); pData->pAccShape->Init(); if (pData->bSelected) - { pData->pAccShape->SetState(AccessibleStateType::SELECTED); - pData->pAccShape->SetRelationSet(GetRelationSet(pData)); - } + if (!pData->bSelectable) + pData->pAccShape->ResetState(AccessibleStateType::SELECTABLE); + pData->pAccShape->SetRelationSet(GetRelationSet(pData)); } } return pData->pAccShape; @@ -747,7 +748,7 @@ void ScChildrenShapes::Select(sal_Int32 nIndex) return; uno::Reference<drawing::XShape> xShape; - if (!IsSelected(nIndex, xShape)) + if (!IsSelected(nIndex, xShape) && maZOrderedShapes[nIndex]->bSelectable) { uno::Reference<drawing::XShapes> xShapes; xSelectionSupplier->getSelection() >>= xShapes; @@ -1192,6 +1193,21 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s SortedShapes::iterator aNewItr = maZOrderedShapes.insert(aFindItr, pShape); SetAnchor(xShape, pShape); + uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); + if (xShapeProp.is()) + { + uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerID" ))); + sal_Int16 nLayerID; + if( aPropAny >>= nLayerID ) + { + if( nLayerID == SC_LAYER_INTERN ) + pShape->bSelectable = sal_False; + else + pShape->bSelectable = sal_True; + } + } + + if (!xSelectionSupplier.is()) throw uno::RuntimeException(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 1b2853daec04..4ea2c1fbf3ef 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleDocumentPagePreview.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: sab $ $Date: 2002-11-21 16:54:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,6 +99,18 @@ #ifndef SC_SC_HRC #include "sc.hrc" #endif +#ifndef _SC_DRAWMODELBROADCASTER_HXX +#include "DrawModelBroadcaster.hxx" +#endif +#ifndef SC_DOCSHELL_HXX +#include "docsh.hxx" +#endif +#ifndef SC_DRAWVIEW_HXX +#include "drawview.hxx" +#endif +#ifndef SC_PREVIEW_HXX +#include "preview.hxx" +#endif #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_ #include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp> @@ -600,6 +612,121 @@ inline ScDocument* ScNotesChilds::GetDocument() const return pDoc; } +class ScIAccessibleViewForwarder : public accessibility::IAccessibleViewForwarder +{ +public: + ScIAccessibleViewForwarder(); + ScIAccessibleViewForwarder(ScPreviewShell* pViewShell, + ScAccessibleDocumentPagePreview* pAccDoc, + const MapMode& aMapMode); + ~ScIAccessibleViewForwarder(); + + ///===== IAccessibleViewForwarder ======================================== + + virtual sal_Bool IsValid (void) const; + virtual Rectangle GetVisibleArea() const; + virtual Point LogicToPixel (const Point& rPoint) const; + virtual Size LogicToPixel (const Size& rSize) const; + virtual Point PixelToLogic (const Point& rPoint) const; + virtual Size PixelToLogic (const Size& rSize) const; + +private: + ScPreviewShell* mpViewShell; + ScAccessibleDocumentPagePreview* mpAccDoc; + MapMode maMapMode; + sal_Bool mbValid; +}; + +ScIAccessibleViewForwarder::ScIAccessibleViewForwarder() + : mbValid(sal_False) +{ +} + +ScIAccessibleViewForwarder::ScIAccessibleViewForwarder(ScPreviewShell* pViewShell, + ScAccessibleDocumentPagePreview* pAccDoc, + const MapMode& aMapMode) + : mpViewShell(pViewShell), + mpAccDoc(pAccDoc), + maMapMode(aMapMode), + mbValid(sal_True) +{ +} + +ScIAccessibleViewForwarder::~ScIAccessibleViewForwarder() +{ +} + +///===== IAccessibleViewForwarder ======================================== + +sal_Bool ScIAccessibleViewForwarder::IsValid (void) const +{ + ScUnoGuard aGuard; + return mbValid; +} + +Rectangle ScIAccessibleViewForwarder::GetVisibleArea() const +{ + ScUnoGuard aGuard; + Rectangle aVisRect; + Window* pWin = mpViewShell->GetWindow(); + if (pWin) + { + aVisRect.SetSize(pWin->GetOutputSizePixel()); + aVisRect.SetPos(Point(0, 0)); + + aVisRect = pWin->PixelToLogic(aVisRect, maMapMode); + } + + return aVisRect; +} + +Point ScIAccessibleViewForwarder::LogicToPixel (const Point& rPoint) const +{ + ScUnoGuard aGuard; + Point aPoint; + Window* pWin = mpViewShell->GetWindow(); + if (pWin && mpAccDoc) + { + Rectangle aRect(mpAccDoc->GetBoundingBoxOnScreen()); + aPoint = pWin->LogicToPixel(rPoint, maMapMode) + aRect.TopLeft(); + } + + return aPoint; +} + +Size ScIAccessibleViewForwarder::LogicToPixel (const Size& rSize) const +{ + ScUnoGuard aGuard; + Size aSize; + Window* pWin = mpViewShell->GetWindow(); + if (pWin) + aSize = pWin->LogicToPixel(rSize, maMapMode); + return aSize; +} + +Point ScIAccessibleViewForwarder::PixelToLogic (const Point& rPoint) const +{ + ScUnoGuard aGuard; + Point aPoint; + Window* pWin = mpViewShell->GetWindow(); + if (pWin && mpAccDoc) + { + Rectangle aRect(mpAccDoc->GetBoundingBoxOnScreen()); + aPoint = pWin->PixelToLogic(rPoint - aRect.TopLeft(), maMapMode); + } + return aPoint; +} + +Size ScIAccessibleViewForwarder::PixelToLogic (const Size& rSize) const +{ + ScUnoGuard aGuard; + Size aSize; + Window* pWin = mpViewShell->GetWindow(); + if (pWin) + aSize = pWin->PixelToLogic(rSize, maMapMode); + return aSize; +} + struct ScShapeChild { ScShapeChild() : mpAccShape(NULL) {} @@ -607,12 +734,14 @@ struct ScShapeChild ~ScShapeChild(); mutable accessibility::AccessibleShape* mpAccShape; com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + sal_Int32 mnRangeId; }; ScShapeChild::ScShapeChild(const ScShapeChild& rOld) : mpAccShape(rOld.mpAccShape), -mxShape(rOld.mxShape) +mxShape(rOld.mxShape), +mnRangeId(rOld.mnRangeId) { if (mpAccShape) mpAccShape->acquire(); @@ -644,12 +773,12 @@ struct ScShapeRange ScShapeChildVec maControls; Rectangle maPixelRect; MapMode maMapMode; + ScIAccessibleViewForwarder maViewForwarder; }; typedef std::vector<ScShapeRange> ScShapeRangeVec; class ScShapeChilds : public SfxListener, - public accessibility::IAccessibleViewForwarder, public accessibility::IAccessibleParent { public: @@ -660,15 +789,6 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - ///===== IAccessibleViewForwarder ======================================== - - virtual sal_Bool IsValid (void) const; - virtual Rectangle GetVisibleArea() const; - virtual Point LogicToPixel (const Point& rPoint) const; - virtual Size LogicToPixel (const Size& rSize) const; - virtual Point PixelToLogic (const Point& rPoint) const; - virtual Size PixelToLogic (const Size& rSize) const; - ///===== IAccessibleParent ============================================== virtual sal_Bool ReplaceChild ( @@ -688,7 +808,8 @@ public: uno::Reference<XAccessible> GetForeShape(sal_Int32 nIndex) const; sal_Int32 GetControlCount() const; uno::Reference<XAccessible> GetControl(sal_Int32 nIndex) const; - uno::Reference<XAccessible> GetAt(const awt::Point& rPoint) const; + uno::Reference<XAccessible> GetForegroundShapeAt(const awt::Point& rPoint) const; // inclusive controls + uno::Reference<XAccessible> GetBackgroundShapeAt(const awt::Point& rPoint) const; void DataChanged(); void VisAreaChanged() const; @@ -698,7 +819,6 @@ private: ScAccessibleDocumentPagePreview* mpAccDoc; ScPreviewShell* mpViewShell; ScShapeRangeVec maShapeRanges; - mutable accessibility::AccessibleShapeTreeInfo maShapeTreeInfo; void FindChanged(ScShapeChildVec& aOld, ScShapeChildVec& aNew) const; void FindChanged(ScShapeRange& aOld, ScShapeRange& aNew) const; @@ -861,13 +981,13 @@ void ScShapeChilds::DataChanged() struct ScVisAreaChanged { - const ScShapeChilds* mpAccDoc; - ScVisAreaChanged(const ScShapeChilds* pAccDoc) : mpAccDoc(pAccDoc) {} + const ScIAccessibleViewForwarder* mpViewForwarder; + ScVisAreaChanged(const ScIAccessibleViewForwarder* pViewForwarder) : mpViewForwarder(pViewForwarder) {} void operator() (const ScShapeChild& rAccShapeData) const { if (rAccShapeData.mpAccShape) { - rAccShapeData.mpAccShape->ViewForwarderChanged(accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpAccDoc); + rAccShapeData.mpAccShape->ViewForwarderChanged(accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpViewForwarder); } } }; @@ -876,9 +996,9 @@ void ScShapeChilds::VisAreaChanged() const { ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end(); ScShapeRangeVec::const_iterator aItr = maShapeRanges.begin(); - ScVisAreaChanged aVisAreaChanged(this); while (aItr != aEndItr) { + ScVisAreaChanged aVisAreaChanged(&(aItr->maViewForwarder)); std::for_each(aItr->maBackShapes.begin(), aItr->maBackShapes.end(), aVisAreaChanged); std::for_each(aItr->maControls.begin(), aItr->maControls.end(), aVisAreaChanged); std::for_each(aItr->maForeShapes.begin(), aItr->maForeShapes.end(), aVisAreaChanged); @@ -886,71 +1006,6 @@ void ScShapeChilds::VisAreaChanged() const } } -///===== IAccessibleViewForwarder ======================================== - -sal_Bool ScShapeChilds::IsValid (void) const -{ - ScUnoGuard aGuard; - return (mpViewShell != NULL); -} - -Rectangle ScShapeChilds::GetVisibleArea() const -{ - ScUnoGuard aGuard; - Rectangle aVisRect; - - Window* pWin = mpViewShell->GetWindow(); - if (pWin) - { - aVisRect.SetSize(pWin->GetOutputSizePixel()); - aVisRect.SetPos(Point(0, 0)); - - aVisRect = pWin->PixelToLogic(aVisRect, maShapeRanges[0].maMapMode); - } - - return aVisRect; -} - -Point ScShapeChilds::LogicToPixel (const Point& rPoint) const -{ - ScUnoGuard aGuard; - Point aPoint; - Window* pWin = mpViewShell->GetWindow(); - if (pWin) - aPoint = pWin->LogicToPixel(rPoint, maShapeRanges[0].maMapMode); - return aPoint; -} - -Size ScShapeChilds::LogicToPixel (const Size& rSize) const -{ - ScUnoGuard aGuard; - Size aSize; - Window* pWin = mpViewShell->GetWindow(); - if (pWin) - aSize = pWin->LogicToPixel(rSize, maShapeRanges[0].maMapMode); - return aSize; -} - -Point ScShapeChilds::PixelToLogic (const Point& rPoint) const -{ - ScUnoGuard aGuard; - Point aPoint; - Window* pWin = mpViewShell->GetWindow(); - if (pWin) - aPoint = pWin->PixelToLogic(rPoint, maShapeRanges[0].maMapMode); - return aPoint; -} - -Size ScShapeChilds::PixelToLogic (const Size& rSize) const -{ - ScUnoGuard aGuard; - Size aSize; - Window* pWin = mpViewShell->GetWindow(); - if (pWin) - aSize = pWin->PixelToLogic(rSize, maShapeRanges[0].maMapMode); - return aSize; -} - ///===== IAccessibleParent ============================================== sal_Bool ScShapeChilds::ReplaceChild (accessibility::AccessibleShape* pCurrentChild, @@ -1001,10 +1056,8 @@ uno::Reference<XAccessible> ScShapeChilds::GetBackShape(sal_Int32 nIndex) const if(nIndex < nCount) xAccessible = GetAccShape(aItr->maBackShapes, nIndex); else - { - nIndex -= nCount; ++aItr; - } + nIndex -= nCount; } if (nIndex >= 0) @@ -1033,10 +1086,8 @@ uno::Reference<XAccessible> ScShapeChilds::GetForeShape(sal_Int32 nIndex) const if(nIndex < nCount) xAccessible = GetAccShape(aItr->maForeShapes, nIndex); else - { - nIndex -= nCount; ++aItr; - } + nIndex -= nCount; } if (nIndex >= 0) @@ -1065,10 +1116,8 @@ uno::Reference<XAccessible> ScShapeChilds::GetControl(sal_Int32 nIndex) const if(nIndex < nCount) xAccessible = GetAccShape(aItr->maControls, nIndex); else - { - nIndex -= nCount; ++aItr; - } + nIndex -= nCount; } if (nIndex >= 0) @@ -1079,18 +1128,18 @@ uno::Reference<XAccessible> ScShapeChilds::GetControl(sal_Int32 nIndex) const struct ScShapePointFound { - Rectangle maPoint; - ScShapePointFound(const awt::Point& rPoint) : maPoint(VCLPoint(rPoint), Size(0, 0)) {} + Point maPoint; + ScShapePointFound(const awt::Point& rPoint) : maPoint(VCLPoint(rPoint)) {} sal_Bool operator() (const ScShapeChild& rShape) { sal_Bool bResult(sal_False); - if (maPoint.IsInside(VCLRectangle(rShape.mpAccShape->getBounds()))) + if ((VCLRectangle(rShape.mpAccShape->getBounds())).IsInside(maPoint)) bResult = sal_True; return bResult; } }; -uno::Reference<XAccessible> ScShapeChilds::GetAt(const awt::Point& rPoint) const +uno::Reference<XAccessible> ScShapeChilds::GetForegroundShapeAt(const awt::Point& rPoint) const //inclusive Controls { uno::Reference<XAccessible> xAcc; @@ -1107,15 +1156,25 @@ uno::Reference<XAccessible> ScShapeChilds::GetAt(const awt::Point& rPoint) const if (aFindItr != aItr->maControls.end()) xAcc = GetAccShape(*aFindItr); else - { - ScShapeChildVec::const_iterator aFindItr = std::find_if(aItr->maBackShapes.begin(), aItr->maBackShapes.end(), ScShapePointFound(rPoint)); - if (aFindItr != aItr->maBackShapes.end()) - xAcc = GetAccShape(*aFindItr); - else - ++aItr; - } + ++aItr; } - if (!xAcc.is()) + } + + return xAcc; +} + +uno::Reference<XAccessible> ScShapeChilds::GetBackgroundShapeAt(const awt::Point& rPoint) const +{ + uno::Reference<XAccessible> xAcc; + + ScShapeRangeVec::const_iterator aItr = maShapeRanges.begin(); + ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end(); + while((aItr != aEndItr) && !xAcc.is()) + { + ScShapeChildVec::const_iterator aFindItr = std::find_if(aItr->maBackShapes.begin(), aItr->maBackShapes.end(), ScShapePointFound(rPoint)); + if (aFindItr != aItr->maBackShapes.end()) + xAcc = GetAccShape(*aFindItr); + else ++aItr; } @@ -1128,11 +1187,20 @@ accessibility::AccessibleShape* ScShapeChilds::GetAccShape(const ScShapeChild& r { accessibility::ShapeTypeHandler& rShapeHandler = accessibility::ShapeTypeHandler::Instance(); accessibility::AccessibleShapeInfo aShapeInfo(rShape.mxShape, mpAccDoc, const_cast<ScShapeChilds*>(this)); - rShape.mpAccShape = rShapeHandler.CreateAccessibleObject(aShapeInfo, maShapeTreeInfo); - if (rShape.mpAccShape) + + if (mpViewShell) { - rShape.mpAccShape->acquire(); - rShape.mpAccShape->Init(); + accessibility::AccessibleShapeTreeInfo aShapeTreeInfo; + aShapeTreeInfo.SetSdrView(mpViewShell->GetPreview()->GetDrawView()); + aShapeTreeInfo.SetController(NULL); + aShapeTreeInfo.SetWindow(mpViewShell->GetWindow()); + aShapeTreeInfo.SetViewForwarder(&(maShapeRanges[rShape.mnRangeId].maViewForwarder)); + rShape.mpAccShape = rShapeHandler.CreateAccessibleObject(aShapeInfo, aShapeTreeInfo); + if (rShape.mpAccShape) + { + rShape.mpAccShape->acquire(); + rShape.mpAccShape->Init(); + } } } return rShape.mpAccShape; @@ -1153,9 +1221,16 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& sal_Bool bForeAdded(sal_False); sal_Bool bBackAdded(sal_False); sal_Bool bControlAdded(sal_False); - Rectangle aLogicPaintRect(pWin->PixelToLogic(aPixelPaintRect, aMapMode)); - maShapeRanges[nRangeId].maPixelRect = aPixelPaintRect; + Rectangle aClippedPixelPaintRect(aPixelPaintRect); + if (mpAccDoc) + { + Rectangle aRect2(Point(0,0), mpAccDoc->GetBoundingBoxOnScreen().GetSize()); + aClippedPixelPaintRect = aPixelPaintRect.GetIntersection(aRect2); + } + maShapeRanges[nRangeId].maPixelRect = aClippedPixelPaintRect; maShapeRanges[nRangeId].maMapMode = aMapMode; + ScIAccessibleViewForwarder aViewForwarder(mpViewShell, mpAccDoc, aMapMode); + maShapeRanges[nRangeId].maViewForwarder = aViewForwarder; sal_uInt32 nCount(pPage->GetObjCount()); for (sal_uInt32 i = 0; i < nCount; ++i) { @@ -1165,11 +1240,12 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& uno::Reference< drawing::XShape > xShape(pObj->getUnoShape(), uno::UNO_QUERY); if (xShape.is()) { - Rectangle aRect(VCLPoint(xShape->getPosition()), VCLSize(xShape->getSize())); - if(!aRect.GetIntersection(aLogicPaintRect).IsEmpty()) + Rectangle aRect(pWin->LogicToPixel(VCLPoint(xShape->getPosition()), aMapMode), pWin->LogicToPixel(VCLSize(xShape->getSize()), aMapMode)); + if(!aClippedPixelPaintRect.GetIntersection(aRect).IsEmpty()) { ScShapeChild aShape; aShape.mxShape = xShape; + aShape.mnRangeId = nRangeId; switch (pObj->GetLayer()) { case SC_LAYER_INTERN: @@ -1608,11 +1684,25 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces if ( mpViewShell ) { - const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); - ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); - - if ( rData.HasCellsInRange( Rectangle( rPoint.X, rPoint.Y, rPoint.X, rPoint.Y ) ) ) + xAccessible = GetShapeChilds()->GetForegroundShapeAt(rPoint); + if (!xAccessible.is()) { + const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); + ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); + +/* if ( rData.HasCellsInRange( Rectangle( rPoint, rPoint ) ) ) + { + if ( !mpTable && (aCount.nTables > 0) ) + { + //! order is background shapes, header, table or notes, footer, foreground shapes, controls + sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders); + + mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex ); + mpTable->acquire(); + mpTable->Init(); + } + xAccessible = mpTable; + }*/ if ( !mpTable && (aCount.nTables > 0) ) { //! order is background shapes, header, table or notes, footer, foreground shapes, controls @@ -1622,40 +1712,39 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces mpTable->acquire(); mpTable->Init(); } - xAccessible = mpTable; + if (mpTable && VCLRectangle(mpTable->getBounds()).IsInside(VCLPoint(rPoint))) + xAccessible = mpTable; } - else - { + if (!xAccessible.is()) xAccessible = GetNotesChilds()->GetAt(rPoint); - if (!xAccessible.is()) - xAccessible = GetShapeChilds()->GetAt(rPoint); - if (!xAccessible.is()) + if (!xAccessible.is()) + { + if (!mpHeader || !mpFooter) { - if (!mpHeader || !mpFooter) - { - const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); - ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); + const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); + ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); - if (!mpHeader) - { - mpHeader = new ScAccessiblePageHeader( this, mpViewShell, sal_True, aCount.nBackShapes + aCount.nHeaders - 1); - mpHeader->acquire(); - } - if (!mpFooter) - { - mpFooter = new ScAccessiblePageHeader( this, mpViewShell, sal_False, aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters - 1 ); - mpFooter->acquire(); - } + if (!mpHeader) + { + mpHeader = new ScAccessiblePageHeader( this, mpViewShell, sal_True, aCount.nBackShapes + aCount.nHeaders - 1); + mpHeader->acquire(); + } + if (!mpFooter) + { + mpFooter = new ScAccessiblePageHeader( this, mpViewShell, sal_False, aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters - 1 ); + mpFooter->acquire(); } + } - Point aPoint(VCLPoint(rPoint)); + Point aPoint(VCLPoint(rPoint)); - if (VCLRectangle(mpHeader->getBounds()).IsInside(aPoint)) - xAccessible = mpHeader; - else if (VCLRectangle(mpFooter->getBounds()).IsInside(aPoint)) - xAccessible = mpFooter; - } + if (VCLRectangle(mpHeader->getBounds()).IsInside(aPoint)) + xAccessible = mpHeader; + else if (VCLRectangle(mpFooter->getBounds()).IsInside(aPoint)) + xAccessible = mpFooter; } + if (!xAccessible.is()) + xAccessible = GetShapeChilds()->GetBackgroundShapeAt(rPoint); } } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index cea2d295f128..5e7ed22a5504 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessiblePreviewHeaderCell.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: sab $ $Date: 2002-11-27 14:21:16 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,6 +101,9 @@ #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> #endif +#ifndef _TOOLKIT_HELPER_CONVERT_HXX_ +#include <toolkit/helper/convert.hxx> +#endif using namespace ::com::sun::star; using namespace ::drafts::com::sun::star::accessibility; @@ -111,15 +114,15 @@ ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const ::com::sun:: ::drafts::com::sun::star::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const ScAddress& rCellPos, sal_Bool bIsColHdr, sal_Bool bIsRowHdr, - sal_Int32 nIndex, const Rectangle& rPosition ) : + sal_Int32 nIndex ) : ScAccessibleContextBase( rxParent, AccessibleRole::TABLE_CELL ), mpViewShell( pViewShell ), maCellPos( rCellPos ), mbColumnHeader( bIsColHdr ), mbRowHeader( bIsRowHdr ), mnIndex( nIndex ), - maPosition( rPosition ), - mpTextHelper( NULL ) + mpTextHelper( NULL ), + mpTableInfo( NULL ) { if (mpViewShell) mpViewShell->AddAccessibilityObject(*this); @@ -140,6 +143,9 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::disposing() mpViewShell = NULL; } + if (mpTableInfo) + DELETEZ (mpTableInfo); + ScAccessibleContextBase::disposing(); } @@ -151,11 +157,17 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint& { const SfxSimpleHint& rRef = (const SfxSimpleHint&)rHint; ULONG nId = rRef.GetId(); - if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED) + if (nId == SC_HINT_ACC_VISAREACHANGED) { if (mpTextHelper) mpTextHelper->UpdateChildren(); } + else if ( nId == SFX_HINT_DATACHANGED ) + { + // column / row layout may change with any document change, + // so it must be invalidated + DELETEZ( mpTableInfo ); + } } ScAccessibleContextBase::Notify(rBC, rHint); @@ -186,27 +198,48 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::release() uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::RuntimeException) { - // column or row headers don't have a value - return uno::Any(); + ScUnoGuard aGuard; + IsObjectValid(); + + double fValue(0.0); + if (mbColumnHeader) + fValue = maCellPos.Col(); + else + fValue = maCellPos.Row(); + + uno::Any aAny; + aAny <<= fValue; + return aAny; } sal_Bool SAL_CALL ScAccessiblePreviewHeaderCell::setCurrentValue( const uno::Any& aNumber ) throw (uno::RuntimeException) { - // column or row headers don't have a value + // it is not possible to set a value return sal_False; } uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::RuntimeException) { - // column or row headers don't have a value - return uno::Any(); + ScUnoGuard aGuard; + IsObjectValid(); + + double fValue(0.0); + if (mbColumnHeader) + fValue = MAXCOL; + else + fValue = MAXROW; + uno::Any aAny; + aAny <<= fValue; + return aAny; } uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::RuntimeException) { - // column or row headers don't have a value - return uno::Any(); + double fValue(0.0); + uno::Any aAny; + aAny <<= fValue; + return aAny; } //===== XAccessibleComponent ============================================ @@ -341,7 +374,18 @@ uno::Sequence<sal_Int8> SAL_CALL Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) { - Rectangle aCellRect(GetBoundingBox()); + Rectangle aCellRect; + + FillTableInfo(); + + if (mpTableInfo) + { + const ScPreviewColRowInfo& rColInfo = mpTableInfo->GetColInfo()[maCellPos.Col()]; + const ScPreviewColRowInfo& rRowInfo = mpTableInfo->GetRowInfo()[maCellPos.Row()]; + + aCellRect = Rectangle( rColInfo.nPixelStart, rRowInfo.nPixelStart, rColInfo.nPixelEnd, rRowInfo.nPixelEnd ); + } + if (mpViewShell) { Window* pWindow = mpViewShell->GetWindow(); @@ -357,7 +401,29 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (u Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::RuntimeException) { - return maPosition; + FillTableInfo(); + + if (mpTableInfo) + { + const ScPreviewColRowInfo& rColInfo = mpTableInfo->GetColInfo()[maCellPos.Col()]; + const ScPreviewColRowInfo& rRowInfo = mpTableInfo->GetRowInfo()[maCellPos.Row()]; + + Rectangle aCellRect( rColInfo.nPixelStart, rRowInfo.nPixelStart, rColInfo.nPixelEnd, rRowInfo.nPixelEnd ); + uno::Reference<XAccessible> xAccParent = const_cast<ScAccessiblePreviewHeaderCell*>(this)->getAccessibleParent(); + if (xAccParent.is()) + { + uno::Reference<XAccessibleContext> xAccParentContext = xAccParent->getAccessibleContext(); + uno::Reference<XAccessibleComponent> xAccParentComp (xAccParentContext, uno::UNO_QUERY); + if (xAccParentComp.is()) + { + Rectangle aParentRect (VCLRectangle(xAccParentComp->getBounds())); + aCellRect.setX(aCellRect.getX() - aParentRect.getX()); + aCellRect.setY(aCellRect.getY() - aParentRect.getY()); + } + } + return aCellRect; + } + return Rectangle(); } rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException) @@ -411,3 +477,19 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper() mpTextHelper->SetEventSource(this); } } + +void ScAccessiblePreviewHeaderCell::FillTableInfo() const +{ + if ( mpViewShell && !mpTableInfo ) + { + Size aOutputSize; + Window* pWindow = mpViewShell->GetWindow(); + if ( pWindow ) + aOutputSize = pWindow->GetOutputSizePixel(); + Point aPoint; + Rectangle aVisRect( aPoint, aOutputSize ); + + mpTableInfo = new ScPreviewTableInfo; + mpViewShell->GetLocationData().GetTableInfo( aVisRect, *mpTableInfo ); + } +} diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 338d679e864e..5705aec0818d 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessiblePreviewTable.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: sab $ $Date: 2002-11-15 09:34:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,6 +237,11 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa else throw lang::IndexOutOfBoundsException();*/ + ScUnoGuard aGuard; + FillTableInfo(); + if ( nRow < 0 || (mpTableInfo && nRow >= mpTableInfo->GetRows()) ) + throw lang::IndexOutOfBoundsException(); + return rtl::OUString(); } @@ -268,6 +273,11 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( else throw lang::IndexOutOfBoundsException();*/ + ScUnoGuard aGuard; + FillTableInfo(); + if ( nColumn < 0 || (mpTableInfo && nColumn >= mpTableInfo->GetCols()) ) + throw lang::IndexOutOfBoundsException(); + return rtl::OUString(); } @@ -367,6 +377,12 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 n throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { // in the page preview, there is no selection + + ScUnoGuard aGuard; + FillTableInfo(); + if ( nRow < 0 || (mpTableInfo && nRow >= mpTableInfo->GetRows()) ) + throw lang::IndexOutOfBoundsException(); + return sal_False; } @@ -374,6 +390,12 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int3 throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { // in the page preview, there is no selection + + ScUnoGuard aGuard; + FillTableInfo(); + if ( nColumn < 0 || (mpTableInfo && nColumn >= mpTableInfo->GetCols()) ) + throw lang::IndexOutOfBoundsException(); + return sal_False; } @@ -397,9 +419,8 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCe ScAddress aCellPos( rColInfo.nDocIndex, rRowInfo.nDocIndex, mpTableInfo->GetTab() ); if ( rColInfo.bIsHeader || rRowInfo.bIsHeader ) { - Rectangle aPosition( rColInfo.nPixelStart, rRowInfo.nPixelStart, rColInfo.nPixelEnd, rRowInfo.nPixelEnd ); ScAccessiblePreviewHeaderCell* pHeaderCell = new ScAccessiblePreviewHeaderCell( this, mpViewShell, aCellPos, - rRowInfo.bIsHeader, rColInfo.bIsHeader, nNewIndex, aPosition ); + rRowInfo.bIsHeader, rColInfo.bIsHeader, nNewIndex ); xRet = pHeaderCell; pHeaderCell->Init(); } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index c520adfc3e3f..8ae9b0f26d2c 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleSpreadsheet.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: sab $ $Date: 2002-11-15 09:34:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,8 +111,8 @@ #ifndef _SV_GEN_HXX #include <tools/gen.hxx> #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #include <algorithm> @@ -345,7 +345,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint else if (rHint.ISA( ScUpdateRefHint )) { const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint; - if (rRef.GetMode() == URM_INSDEL) + if (rRef.GetMode() == URM_INSDEL && rRef.GetDz() == 0) //#107250# test whether table is inserted or deleted { if (((rRef.GetRange().aStart.Col() == maRange.aStart.Col()) && (rRef.GetRange().aEnd.Col() == maRange.aEnd.Col())) || @@ -592,7 +592,7 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) { ScUnoGuard aGuard; IsObjectValid(); - return SC_MOD()->GetColorConfig().GetColorValue( ::svx::DOCCOLOR ).nColor; + return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor; } //===== XAccessibleContext ============================================== @@ -700,7 +700,9 @@ sal_Int32 SAL_CALL if (!mpMarkedRanges) { mpMarkedRanges = new ScRangeList(); - mpViewShell->GetViewData()->GetMarkData().FillRangeListWithMarks(mpMarkedRanges, sal_False); + ScMarkData aMarkData(mpViewShell->GetViewData()->GetMarkData()); + aMarkData.MarkToMulti(); + aMarkData.FillRangeListWithMarks(mpMarkedRanges, sal_False); } // is possible, because there shouldn't be overlapped ranges in it if (mpMarkedRanges) @@ -983,4 +985,4 @@ Rectangle ScAccessibleSpreadsheet::GetVisCells(const Rectangle& rVisArea) } else return Rectangle(); -}
\ No newline at end of file +} diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 0b89e60e45e6..e9cfc788aeaa 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleTableBase.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: sab $ $Date: 2002-09-24 13:01:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,6 +169,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { DBG_ERROR("Here should be a implementation to fill the description"); + + if ((nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0)) + throw lang::IndexOutOfBoundsException(); + //setAccessibleRowDescription(nRow, xAccessible); // to remember the created Description return rtl::OUString(); } @@ -177,6 +181,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { DBG_ERROR("Here should be a implementation to fill the description"); + + if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0)) + throw lang::IndexOutOfBoundsException(); + //setAccessibleColumnDescription(nColumn, xAccessible); // to remember the created Description return rtl::OUString(); } @@ -244,6 +252,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible { uno::Reference< XAccessibleTable > xAccessibleTable; DBG_ERROR("Here should be a implementation to fill the row headers"); + //CommitChange return xAccessibleTable; } @@ -253,6 +262,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible { uno::Reference< XAccessibleTable > xAccessibleTable; DBG_ERROR("Here should be a implementation to fill the column headers"); + //CommitChange return xAccessibleTable; } diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 6cb16424e79c..153aff8908bb 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleText.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: sab $ $Date: 2002-11-11 09:56:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,6 +136,8 @@ public: virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + + void SetInvalid(); }; ScViewForwarder::ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell) @@ -207,6 +209,10 @@ Point ScViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod return Point(); } +void ScViewForwarder::SetInvalid() +{ + mpViewShell = NULL; +} // ============================================================================ @@ -221,6 +227,8 @@ public: virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + + void SetInvalid(); }; ScEditObjectViewForwarder::ScEditObjectViewForwarder(Window* pWindow) @@ -272,6 +280,10 @@ Point ScEditObjectViewForwarder::PixelToLogic( const Point& rPoint, const MapMod return Point(); } +void ScEditObjectViewForwarder::SetInvalid() +{ + mpWindow = NULL; +} // ============================================================================ @@ -289,6 +301,8 @@ public: virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + void SetInvalid(); + Rectangle GetVisRect() const; void FillTableInfo() const; @@ -358,6 +372,11 @@ Point ScPreviewViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& return Point(); } +void ScPreviewViewForwarder::SetInvalid() +{ + mpViewShell = NULL; +} + Rectangle ScPreviewViewForwarder::GetVisRect() const { if ( mpViewShell ) @@ -600,6 +619,8 @@ public: virtual sal_Bool Paste(); void GrabFocus(); + + void SetInvalid(); }; ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, Window* pWin) @@ -724,6 +745,11 @@ void ScEditViewForwarder::GrabFocus() { } +void ScEditViewForwarder::SetInvalid() +{ + mpWindow = NULL; + mpEditView = NULL; +} // ============================================================================ @@ -758,6 +784,10 @@ void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint if ( nId == SFX_HINT_DYING ) { mpViewShell = NULL; // invalid now + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); + if (mpEditViewForwarder) + mpEditViewForwarder->SetInvalid(); } } ScAccessibleCellBaseTextData::Notify(rBC, rHint); @@ -942,6 +972,10 @@ void ScAccessibleEditObjectTextData::Notify( SfxBroadcaster& rBC, const SfxHint& mpEditView = NULL; mpEditEngine = NULL; DELETEZ(mpForwarder); + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); + if (mpEditViewForwarder) + mpEditViewForwarder->SetInvalid(); } } ScAccessibleTextData::Notify(rBC, rHint); @@ -1204,6 +1238,8 @@ void ScAccessiblePreviewCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint if ( nId == SFX_HINT_DYING ) { mpViewShell = NULL; // invalid now + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } } ScAccessibleCellBaseTextData::Notify(rBC, rHint); @@ -1295,6 +1331,8 @@ void ScAccessiblePreviewHeaderCellTextData::Notify( SfxBroadcaster& rBC, const S if ( nId == SFX_HINT_DYING ) { mpViewShell = NULL; // invalid now + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } } ScAccessibleCellBaseTextData::Notify(rBC, rHint); @@ -1439,6 +1477,8 @@ void ScAccessibleHeaderTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHi { mpViewShell = NULL;// invalid now mpDocSh = NULL; + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } } } @@ -1554,6 +1594,8 @@ void ScAccessibleNoteTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint { mpViewShell = NULL;// invalid now mpDocSh = NULL; + if (mpViewForwarder) + mpViewForwarder->SetInvalid(); } } } @@ -1638,6 +1680,8 @@ public: virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + + void SetInvalid(); }; ScCsvViewForwarder::ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox ) : @@ -1668,6 +1712,10 @@ Point ScCsvViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMap return mpWindow->PixelToLogic( rPoint, rMapMode ); } +void ScCsvViewForwarder::SetInvalid() +{ + mpWindow = NULL; +} // ---------------------------------------------------------------------------- @@ -1695,8 +1743,8 @@ void ScAccessibleCsvTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint { mpWindow = NULL; mpEditEngine = NULL; - mpTextForwarder.reset( NULL ); - mpViewForwarder.reset( NULL ); + if (mpViewForwarder.get()) + mpViewForwarder->SetInvalid(); } } ScAccessibleTextData::Notify( rBC, rHint ); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index c959523afbb0..e0e029941d80 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inputhdl.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: nn $ $Date: 2002-12-04 18:53:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ #include <svx/algitem.hxx> #include <svx/adjitem.hxx> #include <svx/brshitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/colritem.hxx> #include <svx/editobj.hxx> #include <svx/editstat.hxx> @@ -1549,7 +1549,7 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand ) // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) if ( aBackCol.GetTransparency() > 0 || Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) - aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); pEngine->SetBackgroundColor( aBackCol ); // Ausrichtung @@ -2030,7 +2030,21 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode ) BOOL bSpellErrors = !bFormulaMode && pEngine->HasOnlineSpellErrors(); if ( bSpellErrors ) { - // Test, ob Zahl, dann Fehler ignorieren + // #i3820# If the spell checker flags numerical input as error, + // it still has to be treated as number, not EditEngine object. + + if ( pLastPattern && pActiveViewSh ) + { + ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocument(); + SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); + // without conditional format, as in ScColumn::SetString + ULONG nFormat = pLastPattern->GetNumberFormat( pFormatter ); + double nVal; + if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) ) + { + bSpellErrors = FALSE; // ignore the spelling errors + } + } } // After RemoveAdjust, the EditView must not be repainted (has wrong font size etc). @@ -2647,12 +2661,17 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE if (pTableView) { pTableView->GetEditEngine()->SetText( aStrLoP ); - pTableView->SetSelection( ESelection(0,0, 0,0) ); + if ( aStrLoP.Len() ) + pTableView->SetSelection( ESelection(0,0, 0,0) ); // before the '%' + + // don't call SetSelection if the string is empty anyway, + // to avoid breaking the bInitial handling in ScViewData::EditGrowY } if (pTopView) { pTopView->GetEditEngine()->SetText( aStrLoP ); - pTopView->SetSelection( ESelection(0,0, 0,0) ); + if ( aStrLoP.Len() ) + pTopView->SetSelection( ESelection(0,0, 0,0) ); // before the '%' } } SyncViews(); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a86ccca2237b..9e26da8243e4 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inputwin.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: sab $ $Date: 2002-11-29 13:46:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,11 +68,15 @@ //------------------------------------------------------------------ #include "scitems.hxx" +#include "eetext.hxx" #include <svx/eeitem.hxx> #define ITEMID_FIELD EE_FEATURE_FIELD +#include <svx/adjitem.hxx> #include <svx/editview.hxx> #include <svx/editstat.hxx> +#include <svx/frmdiritem.hxx> +#include <svx/lspcitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/event.hxx> @@ -738,6 +742,10 @@ ScTextWnd::ScTextWnd( Window* pParent ) bFormulaMode ( FALSE ), bInputMode ( FALSE ) { + EnableRTL( FALSE ); // #106269# EditEngine can't be used with VCL EnableRTL + + bIsRTL = GetSettings().GetLayoutRTL(); + // #79096# always use application font, so a font with cjk chars can be installed Font aAppFont = GetFont(); aTextFont = aAppFont; @@ -781,8 +789,17 @@ void __EXPORT ScTextWnd::Paint( const Rectangle& rRec ) - LogicToPixel( Size( 0, GetTextHeight() ) ).Height(); // if (nDiff<2) nDiff=2; // mind. 1 Pixel - //! Clipping am rechten Rand? - DrawText( PixelToLogic( Point( TEXT_STARTPOS, nDiff/2 ) ), aString ); + long nStartPos = TEXT_STARTPOS; + if ( bIsRTL ) + { + // right-align + nStartPos += GetOutputSizePixel().Width() - 2*TEXT_STARTPOS - + LogicToPixel( Size( GetTextWidth( aString ), 0 ) ).Width(); + + // LayoutMode isn't changed as long as ModifyRTLDefaults doesn't include SvxFrameDirectionItem + } + + DrawText( PixelToLogic( Point( nStartPos, nDiff/2 ) ), aString ); } } @@ -799,7 +816,7 @@ void __EXPORT ScTextWnd::Resize() // passt sonst nicht zur normalen Textausgabe #endif - aSize.Width() -= 4; + aSize.Width() -= 2 * TEXT_STARTPOS - 1; pEditView->SetOutputArea( PixelToLogic( Rectangle( Point( TEXT_STARTPOS, (nDiff > 0) ? nDiff/2 : 1 ), @@ -988,6 +1005,31 @@ void lcl_ExtendEditFontAttribs( SfxItemSet& rSet ) rSet.Put( rLangItem, EE_CHAR_LANGUAGE_CTL ); } +void lcl_ModifyRTLDefaults( SfxItemSet& rSet ) +{ + rSet.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); + + // always using rtl writing direction would break formulas + //rSet.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) ); + + // PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's + // USHORT values in EditLine), so the text may be wrapped and line spacing must be + // increased to not see the beginning of the next line. + SvxLineSpacingItem aItem( SVX_LINESPACE_TWO_LINES, EE_PARA_SBL ); + aItem.SetPropLineSpace( 200 ); + rSet.Put( aItem ); +} + +void lcl_ModifyRTLVisArea( EditView* pEditView ) +{ + Rectangle aVisArea = pEditView->GetVisArea(); + Size aPaper = pEditView->GetEditEngine()->GetPaperSize(); + long nDiff = aPaper.Width() - aVisArea.Right(); + aVisArea.Left() += nDiff; + aVisArea.Right() += nDiff; + pEditView->SetVisArea(aVisArea); +} + void ScTextWnd::StartEditEngine() { // #31147# Bei "eigener Modalitaet" (Doc-modale Dialoge) nicht aktivieren @@ -1010,7 +1052,7 @@ void ScTextWnd::StartEditEngine() pEditEngine = pNew; pEditEngine->SetUpdateMode( FALSE ); - pEditEngine->SetPaperSize( Size( THESIZE, 300 ) ); //!!! size + pEditEngine->SetPaperSize( Size( bIsRTL ? USHRT_MAX : THESIZE, 300 ) ); pEditEngine->SetWordDelimiters( ScEditUtil::ModifyDelimiters( pEditEngine->GetWordDelimiters() ) ); @@ -1022,6 +1064,8 @@ void ScTextWnd::StartEditEngine() lcl_ExtendEditFontAttribs( *pSet ); // turn off script spacing to match DrawText output pSet->Put( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) ); + if ( bIsRTL ) + lcl_ModifyRTLDefaults( *pSet ); pEditEngine->SetDefaults( pSet ); } @@ -1052,10 +1096,24 @@ void ScTextWnd::StartEditEngine() Resize(); + if ( bIsRTL ) + lcl_ModifyRTLVisArea( pEditView ); + pEditEngine->SetModifyHdl(LINK(this, ScTextWnd, NotifyHdl)); if (pAccTextData) pAccTextData->StartEdit(); + + // as long as EditEngine and DrawText sometimes differ for CTL text, + // repaint now to have the EditEngine's version visible + SfxObjectShell* pObjSh = SfxObjectShell::Current(); + if ( pObjSh && pObjSh->ISA(ScDocShell) ) + { + ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); // any document + BYTE nScript = pDoc->GetStringScriptType( aString ); + if ( nScript & SCRIPTTYPE_COMPLEX ) + Invalidate(); + } } SC_MOD()->SetInputMode( SC_INPUT_TOP ); @@ -1126,19 +1184,26 @@ void ScTextWnd::SetTextString( const String& rNewString ) if (!pEditEngine) { - // test if CTL script type is involved - BYTE nOldScript = 0; - BYTE nNewScript = 0; - SfxObjectShell* pObjSh = SfxObjectShell::Current(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + BOOL bPaintAll; + if ( bIsRTL ) + bPaintAll = TRUE; + else { - // any document can be used (used only for its break iterator) - ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); - nOldScript = pDoc->GetStringScriptType( aString ); - nNewScript = pDoc->GetStringScriptType( rNewString ); + // test if CTL script type is involved + BYTE nOldScript = 0; + BYTE nNewScript = 0; + SfxObjectShell* pObjSh = SfxObjectShell::Current(); + if ( pObjSh && pObjSh->ISA(ScDocShell) ) + { + // any document can be used (used only for its break iterator) + ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); + nOldScript = pDoc->GetStringScriptType( aString ); + nNewScript = pDoc->GetStringScriptType( rNewString ); + } + bPaintAll = ( nOldScript & SCRIPTTYPE_COMPLEX ) || ( nNewScript & SCRIPTTYPE_COMPLEX ); } - if ( ( nOldScript & SCRIPTTYPE_COMPLEX ) || ( nNewScript & SCRIPTTYPE_COMPLEX ) ) + if ( bPaintAll ) { // if CTL is involved, the whole text has to be redrawn Invalidate(); @@ -1224,11 +1289,13 @@ void ScTextWnd::MakeDialogEditView() pEditEngine->SetUpdateMode( FALSE ); pEditEngine->SetWordDelimiters( pEditEngine->GetWordDelimiters() += '=' ); - pEditEngine->SetPaperSize( Size( THESIZE, 300 ) ); + pEditEngine->SetPaperSize( Size( bIsRTL ? USHRT_MAX : THESIZE, 300 ) ); SfxItemSet* pSet = new SfxItemSet( pEditEngine->GetEmptyItemSet() ); pEditEngine->SetFontInfoInItemSet( *pSet, aTextFont ); lcl_ExtendEditFontAttribs( *pSet ); + if ( bIsRTL ) + lcl_ModifyRTLDefaults( *pSet ); pEditEngine->SetDefaults( pSet ); pEditEngine->SetUpdateMode( TRUE ); @@ -1237,12 +1304,17 @@ void ScTextWnd::MakeDialogEditView() Resize(); + if ( bIsRTL ) + lcl_ModifyRTLVisArea( pEditView ); + if (pAccTextData) pAccTextData->StartEdit(); } void ScTextWnd::ImplInitSettings() { + bIsRTL = GetSettings().GetLayoutRTL(); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor= rStyleSettings.GetWindowColor(); diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index d00face575be..e59520a2f302 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: msgpool.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,7 +134,7 @@ __EXPORT ScMessagePool::~ScMessagePool() SetSecondaryPool( NULL ); // before deleting defaults (accesses defaults) for ( USHORT i=0; i <= MSGPOOL_END-MSGPOOL_START; i++ ) - SetRef( *ppPoolDefaults[i], 0 ); + SetRefCount( *ppPoolDefaults[i], 0 ); delete[] ppPoolDefaults; diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 18b5c40923c1..99195f086b3c 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scdll.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: os $ $Date: 2002-09-13 13:47:00 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -156,12 +156,10 @@ void ScDLL::Init() // the ScModule must be created ScModuleDummy **ppShlPtr = (ScModuleDummy**) GetAppData(SHL_CALC); SvFactory *pFact = (SvFactory*)(*ppShlPtr)->pScDocShellFactory; - ScLibSignalFunc pFunc = (*ppShlPtr)->pSignalFunc; delete (*ppShlPtr); ScModule* pMod = new ScModule((SfxObjectFactory*)pFact); (*ppShlPtr) = pMod; (*ppShlPtr)->pScDocShellFactory = pFact; - (*ppShlPtr)->pSignalFunc = pFunc; ScGlobal::Init(); // erst wenn der ResManager initialisiert ist // erst nach ScGlobal::Init duerfen die App-Optionen diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 24768f998a41..81fb98d4ce0c 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scmod.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: nn $ $Date: 2002-10-24 17:17:41 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ #include <sfx2/request.hxx> #include <sfx2/macrconf.hxx> #include <svx/langitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svtools/whiter.hxx> #include <offmgr/app.hxx> @@ -148,7 +148,7 @@ static USHORT nIdleCount = 0; SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) { - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_CLIENT, + SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, ScResId(RID_OBJECTBAR_APP) ); SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() ); @@ -244,12 +244,12 @@ void ScModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) // (if the detective colors haven't been used yet, there's nothing to update) if ( ScDetectiveFunc::IsColorsInitialized() ) { - const svx::ColorConfig& rColors = GetColorConfig(); + const svtools::ColorConfig& rColors = GetColorConfig(); BOOL bArrows = - ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svx::CALCDETECTIVE).nColor || - ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svx::CALCDETECTIVEERROR).nColor ); + ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor || + ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor ); BOOL bComments = - ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svx::CALCNOTESBACKGROUND).nColor ); + ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor ); if ( bArrows || bComments ) { ScDetectiveFunc::InitializeColors(); // get the new colors @@ -914,11 +914,11 @@ ScNavipiCfg& ScModule::GetNavipiCfg() return *pNavipiCfg; } -svx::ColorConfig& ScModule::GetColorConfig() +svtools::ColorConfig& ScModule::GetColorConfig() { if ( !pColorConfig ) { - pColorConfig = new svx::ColorConfig; + pColorConfig = new svtools::ColorConfig; StartListening(*pColorConfig); } @@ -2097,8 +2097,8 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) break; } - svx::ColorConfigEntry eEntry = - INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svx::LINKSVISITED : svx::LINKS; + svtools::ColorConfigEntry eEntry = + INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS; pInfo->SetTxtColor( GetColorConfig().GetColorValue(eEntry).nColor ); } else diff --git a/sc/source/ui/app/template.cxx b/sc/source/ui/app/template.cxx index 58a3a6ca9539..539bbbd9a526 100644 --- a/sc/source/ui/app/template.cxx +++ b/sc/source/ui/app/template.cxx @@ -2,9 +2,9 @@ * * $RCSfile: template.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,36 +125,6 @@ void ScTemplateDlg::ToggleApplyTemplate() // STATIC DATA ----------------------------------------------------------- -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.7 2000/09/17 14:08:54 willem.vandorp - OpenOffice header added. - - Revision 1.6 2000/08/31 16:38:18 willem.vandorp - Header and footer replaced - - Revision 1.5 1995/01/30 21:25:46 MO - + Dtor implementiert - - - Rev 1.4 30 Jan 1995 22:25:46 MO - + Dtor implementiert - - Rev 1.3 17 Jan 1995 17:02:22 TRI - Pragmas zur Segmentierung eingebaut - - Rev 1.2 06 Dec 1994 11:26:22 MO - SfxTemplateDlg -> SfxTemplateDialog - - Rev 1.1 09 Nov 1994 19:54:18 NN - SfxTemplateDlg Konstruktor angepasst - - Rev 1.0 08 Nov 1994 16:42:30 NN - Initial revision. - -------------------------------------------------------------------------*/ - #pragma SEG_EOFMODULE diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index fbe23312faea..b223cbae82d9 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: typemap.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mba $ $Date: 2002-07-12 13:51:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,6 +146,7 @@ #include <svx/charreliefitem.hxx> #include <svx/rotmodit.hxx> #include <svtools/ilstitem.hxx> +#include <svtools/globalnameitem.hxx> #include "attrib.hxx" diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index b2f345a1f4fe..b42b5e5efadd 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -2,9 +2,9 @@ * * $RCSfile: uiitems.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -760,168 +760,6 @@ SfxPoolItem* __EXPORT ScCondFrmtItem::Clone( SfxItemPool * ) const } -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.50 2000/09/17 14:08:54 willem.vandorp - OpenOffice header added. - - Revision 1.49 2000/08/31 16:38:18 willem.vandorp - Header and footer replaced - - Revision 1.48 2000/08/27 18:18:18 er - MUST/602: EditEngine - - Revision 1.47 2000/06/06 17:35:07 nn - ScQueryItem: advanced filter source range - - Revision 1.46 2000/04/17 13:26:28 nn - unicode changes - - Revision 1.45 2000/03/03 20:14:06 nn - PivotItem: SaveData as pointer - - Revision 1.44 1999/10/25 17:19:33 nn - ScPivotItem changed - - Revision 1.43 1997/12/05 19:07:44 ANK - Includes geaendert - - - Rev 1.42 05 Dec 1997 20:07:44 ANK - Includes geaendert - - Rev 1.41 09 Jun 1997 12:00:26 NN - ScIndexHint - - Rev 1.40 16 Oct 1996 16:15:32 RJ - Item fuer bedingte Fomatierung - - Rev 1.39 25 Sep 1996 12:50:40 NN - ScPaintHint nach hints verschoben - - Rev 1.38 15 Aug 1996 15:28:24 NN - tabvwsh.hxx raus - - Rev 1.37 04 Jul 1996 16:51:52 NN - ScTablesHint mit 2.Tabelle fuer Copy/Move - - Rev 1.36 15 Mar 1996 14:29:08 NN - ScTablesHint - - Rev 1.35 27 Nov 1995 09:27:12 MO - Pos-Item entfernt - - Rev 1.34 24 Nov 1995 17:08:32 MO - ScTripel durch ScAddress ersetzt - - Rev 1.33 30 Jun 1995 10:57:58 STE - Typeinit fuer ScTabOpItem dazu - - Rev 1.32 29 Jun 1995 12:35:16 STE - tabop dazu - - Rev 1.31 23 Jun 1995 14:50:40 MO - ViewOptionsItem entfernt - - Rev 1.30 02 Jun 1995 16:32:48 MO - ScViewOptionsItem - - Rev 1.29 21 May 1995 18:06:32 MO - Zusaetzlich CursorPos - - Rev 1.28 21 May 1995 13:55:34 MO - aus aPos wird aEndPos, zusaetzlich aStartPos - - Rev 1.27 20 May 1995 16:04:38 MO - ScUserListItem: Listen kopieren - - Rev 1.26 12 May 1995 10:58:44 MO - Items fuer Seitenformat nach attrib - - Rev 1.25 10 May 1995 20:13:04 MO - Bugfix: ==-Operatoren, Ctor von UserListItem - - Rev 1.24 08 May 1995 20:49:48 MO - Seitendialog - - Rev 1.23 19 Apr 1995 16:30:56 MO - ScSolveItem - - Rev 1.22 24 Mar 1995 13:06:36 TRI - Segmentierung - - Rev 1.21 24 Mar 1995 13:05:26 TRI - Segmentierung - - Rev 1.20 22 Mar 1995 19:31:14 NN - EditData am InputStatusIten - - Rev 1.19 20 Mar 1995 16:38:04 MO - + Pivot-Item - - Rev 1.18 01 Mar 1995 19:00:52 MO - + ScConsolidateItem - - Rev 1.17 01 Feb 1995 11:20:30 MO - * __EXORT -> __EXPORT - - - Rev 1.16 31 Jan 1995 14:44:26 TRI - __EXPORT vor virtuelle Funktion eingebaut - - Rev 1.15 29 Jan 1995 20:20:08 MO - UserListItem - - Rev 1.14 24 Jan 1995 14:57:14 MO - ScSortItem an ScSortParam angepasst - - Rev 1.13 19 Jan 1995 11:26:50 MO - ScSubTotalItem - - Rev 1.12 17 Jan 1995 17:02:14 TRI - Pragmas zur Segmentierung eingebaut - - Rev 1.11 12 Jan 1995 14:34:04 MO - Zusaetzliche Konstruktoren fuer Query/Sort-Item fuer Rueckgabe aus - dem Dialog. - - Rev 1.10 10 Jan 1995 16:14:36 MO - ScSortItem um Kopier-Position und Header-Flag erweitert - - Rev 1.9 09 Jan 1995 11:13:44 MO - ScSortItem: ScSortParam als Member - ScQueryItem: wie ScSortItem - - Rev 1.8 21 Dec 1994 12:15:02 MO - SortItem - - Rev 1.7 19 Dec 1994 16:23:36 MO - ScSortItem mit FeldNamensliste - - Rev 1.6 07 Nov 1994 14:39:32 MM - Clone() angepasst - - Rev 1.5 26 Oct 1994 12:30:56 NN - neue Precompiled Header-Methode - - Rev 1.4 17 Oct 1994 18:34:12 NN - Edit-Engine - - Rev 1.3 06 Oct 1994 13:58:16 NN - Eingabezeile / Referenzeingabe - - Rev 1.2 04 Oct 1994 16:07:04 NN - Hints statt Requests - - Rev 1.1 22 Sep 1994 17:37:48 NN - Bildschirm-Update - - Rev 1.0 14 Sep 1994 12:26:44 NN - Bloecke markieren und attributieren - -------------------------------------------------------------------------*/ - #pragma SEG_EOFMODULE diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx index 974511b2b95c..19d5985fc8c5 100644 --- a/sc/source/ui/cctrl/popmenu.cxx +++ b/sc/source/ui/cctrl/popmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: popmenu.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mh $ $Date: 2001-10-23 10:42:31 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,14 +67,28 @@ #pragma hdrstop +#ifndef PCH +#include <segmentc.hxx> +#endif + // INCLUDE --------------------------------------------------------------- #include "popmenu.hxx" +// STATIC DATA ----------------------------------------------------------- + +SEG_EOFGLOBALS() + //------------------------------------------------------------------ +#pragma SEG_FUNCDEF(popmenu_01) + void __EXPORT ScPopupMenu::Select() { nSel = GetCurItemId(); bHit = TRUE; } + +#pragma SEG_EOFMODULE + + diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 1a096a72ac8e..399ea05e6191 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: asciiopt.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: dr $ $Date: 2002-08-15 09:28:07 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -651,6 +651,13 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, break; } nStreamPosUnicode = pDatStream->Tell(); + + // #107455# If the file content isn't unicode, ReadUniStringLine + // may try to seek beyond the file's end and cause a CANTSEEK error + // (depending on the stream type). The error code has to be cleared, + // or further read operations (including non-unicode) will fail. + if ( pDatStream->GetError() == ERRCODE_IO_CANTSEEK ) + pDatStream->ResetError(); } aNfRow.SetModifyHdl( LINK( this, ScImportAsciiDlg, FirstRowHdl ) ); @@ -796,6 +803,9 @@ void ScImportAsciiDlg::UpdateVertical( bool bSwitchToFromUnicode ) *pPtrRowPos++ = pDatStream->Tell(); } nStreamPosUnicode = pDatStream->Tell(); + + if ( pDatStream->GetError() == ERRCODE_IO_CANTSEEK ) // #107455# reset seek error + pDatStream->ResetError(); } else { @@ -842,6 +852,9 @@ void ScImportAsciiDlg::UpdateVertical( bool bSwitchToFromUnicode ) } } nStreamPosUnicode = pDatStream->Tell(); + + if ( pDatStream->GetError() == ERRCODE_IO_CANTSEEK ) // #107455# reset seek error + pDatStream->ResetError(); } else { diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src index 2723a1a07d07..0a1407c7ec38 100644 --- a/sc/source/ui/dbgui/asciiopt.src +++ b/sc/source/ui/dbgui/asciiopt.src @@ -2,9 +2,9 @@ * * $RCSfile: asciiopt.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:32:41 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -488,7 +488,7 @@ ModalDialog RID_SCDLG_ASCII Text[ dutch ] = "~Spatie"; Text[ chinese_simplified ] = "ç©ºæ ¼(~P)"; Text[ greek ] = "Êåíü"; - Text[ korean ] = "간격(~P)"; + Text[ korean ] = "공백(~P)"; Text[ turkish ] = "B~oþluk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Es~pai"; @@ -611,7 +611,7 @@ ModalDialog RID_SCDLG_ASCII Text[ dutch ] = "Vel~dscheidingstekens samenvatten"; Text[ chinese_simplified ] = "压缩显示(~D)"; Text[ greek ] = "Óýíïøç äéá÷ùñéóôéêþí ðåäßùí"; - Text[ korean ] = "í•„ë“œ 구분 기호 요약(~D)"; + Text[ korean ] = "í•„ë“œ 구분 기호 병합(~D)"; Text[ turkish ] = "Ay~ýrma iþaretlerini özetle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Fusiona els ~delimitadors"; @@ -648,3 +648,8 @@ ModalDialog RID_SCDLG_ASCII + + + + + diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src index 5db90163f35f..2a5fb75f1c0d 100644 --- a/sc/source/ui/dbgui/consdlg.src +++ b/sc/source/ui/dbgui/consdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: consdlg.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:37:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -254,8 +254,8 @@ ModelessDialog RID_SCDLG_CONSOLIDATE < "Cantidad (sólo números)" ; Default ; > ; < "DesvEst (Muestra)" ; Default ; > ; < "DesvEstP (Población)" ; Default ; > ; - < "Varianza (Muestra)" ; Default ; > ; - < "VarP (Población)" ; Default ; > ; + < "Variancia (muestra)" ; Default ; > ; + < "VarP (población)" ; Default ; > ; }; StringList [ english_us ] = { @@ -373,7 +373,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE { < "합계" ; Default ; > ; < "ê°’" ; Default ; > ; - < "í‰ê· " ; Default ; > ; + < "í‰ê· ê°’" ; Default ; > ; < "최대" ; Default ; > ; < "최소" ; Default ; > ; < "ê³±" ; Default ; > ; @@ -564,7 +564,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text[ chinese_traditional ] = "計算è¦å‰‡(~F)"; Text[ arabic ] = "ÇáÏÇáÉ"; Text[ greek ] = "Êáíüíáò õðïëïãéóìïý"; - Text[ korean ] = "기능(~F)"; + Text[ korean ] = "함수(~F)"; Text[ turkish ] = "Fonksi~yon"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Funció"; @@ -594,7 +594,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text[ chinese_traditional ] = "åˆä½µè¨ˆç®—å€åŸŸ(~C)"; Text[ arabic ] = "äØÇÞÇÊ ÇáÏãÌ"; Text[ greek ] = "Ðå~ñéï÷Ýò åíïðïßçóçò"; - Text[ korean ] = "통합 ì˜ì—(~C)"; + Text[ korean ] = "통합 범위(~C)"; Text[ turkish ] = "Bir~leþtirme aralýklarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrees de ~consolidació"; @@ -624,7 +624,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text[ chinese_traditional ] = "æºè³‡æ–™å€åŸŸ(~S)"; Text[ arabic ] = "äØÇÞ ÈíÇäÇÊ ÇáãÕÏÑ"; Text[ greek ] = "Ðåñéï÷Þ ðñïÝëåõóçò äåäïìÝíùí"; - Text[ korean ] = "소스 ë°ì´í„° ì˜ì—(~S)"; + Text[ korean ] = "ì›ë³¸ ë°ì´í„° 범위(~S)"; Text[ turkish ] = "Kaynak veri a~ralýklarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "F~ont de l'àrea de dades"; @@ -654,7 +654,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text[ chinese_traditional ] = "複製çµæžœåˆ°(~T)"; Text[ arabic ] = "äÓÎ ÇáäÊÇÆÌ Åáì"; Text[ greek ] = "ÅìöÜíéóç áðïôåëåóìÜôùí áðü"; - Text[ korean ] = "결과를 복사하는 위치(~T)"; + Text[ korean ] = "ê²°ê³¼ 복사 위치(~T)"; Text[ turkish ] = "Sonuc~un gösterileceði yer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Co~pia els resultats a"; @@ -672,20 +672,20 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text [ portuguese ] = "Legenda para ~linhas" ; Text [ finnish ] = "~Riviselitteet" ; Text [ danish ] = "Rækkeetiketter" ; - Text [ french ] = "É~tiquette de ligne" ; - Text [ swedish ] = "Ra~detikett" ; + Text [ french ] = "Étiquettes de ligne" ; + Text [ swedish ] = "Ra~detiketter" ; Text [ dutch ] = "~Rijkoppen" ; Text [ spanish ] = "Títulos ~de fila" ; Text [ english_us ] = "~Row labels" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "行数æ®æ ‡å¿—(~R)"; + Text[ chinese_simplified ] = "è¡Œæ ‡é¢˜(~R)"; Text[ russian ] = "Ïîäïèñè ñòðîê"; Text[ polish ] = "Etykiety wierszy"; - Text[ japanese ] = "左端列(~R)"; - Text[ chinese_traditional ] = "列標題(~R)"; + Text[ japanese ] = "è¡Œã®é …目欄(~R)"; + Text[ chinese_traditional ] = "列標籤(~R)"; Text[ arabic ] = "ÚäÇæíä ÇáÕÝæÝ"; Text[ greek ] = "ÅðéãñáöÞ ãñáììÞò"; - Text[ korean ] = "첫 í–‰(~R)"; + Text[ korean ] = "í–‰ ë ˆì´ë¸”(~R)"; Text[ turkish ] = "Sa~týr etiketleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Eti~quetes de fila"; @@ -703,20 +703,20 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text [ portuguese ] = "~Cabeçalhos de colunas" ; Text [ finnish ] = "~Sarakeotsikot" ; Text [ danish ] = "Kolonneoverskrifter" ; - Text [ french ] = "En-têtes de colonne" ; - Text [ swedish ] = "Kolum~nhuvuden" ; + Text [ french ] = "Étiquettes de colonne" ; + Text [ swedish ] = "Kolum~netiketter" ; Text [ dutch ] = "~Kolomkoppen" ; - Text [ spanish ] = "Títulos de ~columna" ; + Text [ spanish ] = "~Títulos de columna" ; Text [ english_us ] = "C~olumn labels" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ—æ ‡é¢˜(~O)"; Text[ russian ] = "Çàãîëîâêè ñòîëáöîâ"; Text[ polish ] = "Nag³ówki kolumn"; - Text[ japanese ] = "上端行(~O)"; - Text[ chinese_traditional ] = "欄標題(~O)"; + Text[ japanese ] = "列ã®é …目欄(~O)"; + Text[ chinese_traditional ] = "欄標籤(~O)"; Text[ arabic ] = "ÑÄæÓ ÇáÃÚãÏÉ"; Text[ greek ] = "Êåöáëßäåò óôçëþí"; - Text[ korean ] = "왼쪽 첫 ì—´(~O)"; + Text[ korean ] = "ì—´ ë ˆì´ë¸”(~O)"; Text[ turkish ] = "S~ütun baþlýklarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Capçaleres de c~olumna"; @@ -812,7 +812,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text[ chinese_traditional ] = "å’Œæºè³‡æ–™é€£çµ(~L)"; Text[ arabic ] = "ÑÈØ ÈÈíÇäÇÊ ÇáãÕÏÑ"; Text[ greek ] = "Óýíäåóç ìå äåäïìÝíá ðñïÝëåõóçò"; - Text[ korean ] = "소스 ë°ì´í„°ì— ì—°ê²°(~L)"; + Text[ korean ] = "ì›ë³¸ ë°ì´í„°ì— ì—°ê²°(~L)"; Text[ turkish ] = "Kaynak verilerine ~baðla"; Text[ language_user1 ] = " "; Text[ catalan ] = "En~llaç a la font de dades"; @@ -860,7 +860,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text [ french ] = "Supprimer" ; Text [ swedish ] = "R~adera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; @@ -921,3 +921,8 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Text[ thai ] = "รวบรวม"; }; + + + + + diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 1492fa88858b..b295ba5fe476 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: csvcontrol.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dr $ $Date: 2002-08-16 12:59:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif #ifndef _SC_ACCESSIBLECSVCONTROL_HXX #include "AccessibleCsvControl.hxx" @@ -85,16 +88,17 @@ ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), mnPosOffset( 0 ), mnWinWidth( 1 ), - mnOffsetX( 0 ), + mnHdrWidth( 0 ), mnCharWidth( 1 ), mnLineCount( 1 ), mnLineOffset( 0 ), mnWinHeight( 1 ), - mnOffsetY( 0 ), + mnHdrHeight( 0 ), mnLineHeight( 1 ), mnPosCursor( CSV_POS_INVALID ), mnColCursor( 0 ), - mnNoRepaint( 0 ) + mnNoRepaint( 0 ), + mbAppRTL( !!Application::GetSettings().GetLayoutRTL() ) { } @@ -103,11 +107,11 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const ScCsvDiff nRet = CSV_DIFF_EQUAL; if( mnPosCount != rData.mnPosCount ) nRet |= CSV_DIFF_POSCOUNT; if( mnPosOffset != rData.mnPosOffset ) nRet |= CSV_DIFF_POSOFFSET; - if( mnOffsetX != rData.mnOffsetX ) nRet |= CSV_DIFF_OFFSETX; + if( mnHdrWidth != rData.mnHdrWidth ) nRet |= CSV_DIFF_HDRWIDTH; if( mnCharWidth != rData.mnCharWidth ) nRet |= CSV_DIFF_CHARWIDTH; if( mnLineCount != rData.mnLineCount ) nRet |= CSV_DIFF_LINECOUNT; if( mnLineOffset != rData.mnLineOffset ) nRet |= CSV_DIFF_LINEOFFSET; - if( mnOffsetY != rData.mnOffsetY ) nRet |= CSV_DIFF_OFFSETY; + if( mnHdrHeight != rData.mnHdrHeight ) nRet |= CSV_DIFF_HDRHEIGHT; if( mnLineHeight != rData.mnLineHeight ) nRet |= CSV_DIFF_LINEHEIGHT; if( mnPosCursor != rData.mnPosCursor ) nRet |= CSV_DIFF_RULERCURSOR; if( mnColCursor != rData.mnColCursor ) nRet |= CSV_DIFF_GRIDCURSOR; @@ -241,7 +245,7 @@ void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPa sal_Int32 ScCsvControl::GetVisPosCount() const { - return (mrData.mnWinWidth - GetOffsetX()) / GetCharWidth() + 1; + return (mrData.mnWinWidth - GetHdrWidth()) / GetCharWidth(); } sal_Int32 ScCsvControl::GetMaxPosOffset() const @@ -259,19 +263,34 @@ bool ScCsvControl::IsVisibleSplitPos( sal_Int32 nPos ) const return IsValidSplitPos( nPos ) && (GetFirstVisPos() <= nPos) && (nPos <= GetLastVisPos()); } +sal_Int32 ScCsvControl::GetHdrX() const +{ + return IsRTL() ? (mrData.mnWinWidth - GetHdrWidth()) : 0; +} + +sal_Int32 ScCsvControl::GetFirstX() const +{ + return IsRTL() ? 0 : GetHdrWidth(); +} + +sal_Int32 ScCsvControl::GetLastX() const +{ + return mrData.mnWinWidth - (IsRTL() ? GetHdrWidth() : 0) - 1; +} + sal_Int32 ScCsvControl::GetX( sal_Int32 nPos ) const { - return GetOffsetX() + (nPos - GetFirstVisPos()) * GetCharWidth(); + return GetFirstX() + (nPos - GetFirstVisPos()) * GetCharWidth(); } sal_Int32 ScCsvControl::GetPosFromX( sal_Int32 nX ) const { - return (nX - GetOffsetX() + GetCharWidth() / 2) / GetCharWidth() + GetFirstVisPos(); + return (nX - GetFirstX() + GetCharWidth() / 2) / GetCharWidth() + GetFirstVisPos(); } sal_Int32 ScCsvControl::GetVisLineCount() const { - return (mrData.mnWinHeight - GetOffsetY() - 2) / GetLineHeight() + 1; + return (mrData.mnWinHeight - GetHdrHeight() - 2) / GetLineHeight() + 1; } sal_Int32 ScCsvControl::GetLastVisLine() const @@ -296,12 +315,12 @@ bool ScCsvControl::IsVisibleLine( sal_Int32 nLine ) const sal_Int32 ScCsvControl::GetY( sal_Int32 nLine ) const { - return GetOffsetY() + (nLine - GetFirstVisLine()) * GetLineHeight(); + return GetHdrHeight() + (nLine - GetFirstVisLine()) * GetLineHeight(); } sal_Int32 ScCsvControl::GetLineFromY( sal_Int32 nY ) const { - return (nY - GetOffsetY()) / GetLineHeight() + GetFirstVisLine(); + return (nY - GetHdrHeight()) / GetLineHeight() + GetFirstVisLine(); } diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 6ad3b35578c1..4bb3d521ff38 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: csvgrid.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: dr $ $Date: 2002-10-22 10:35:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,8 +72,8 @@ #include <algorithm> -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef _SFXSMPLHINT_HXX #include <svtools/smplhint.hxx> @@ -147,6 +147,7 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : maPopup.SetMenuFlags( maPopup.GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS ); + EnableRTL( false ); // #107812# RTL InitColors(); InitFonts(); ImplClearSplits(); @@ -168,7 +169,7 @@ void ScCsvGrid::UpdateLayoutData() Execute( CSVCMD_SETCHARWIDTH, GetTextWidth( String( 'X' ) ) ); Execute( CSVCMD_SETLINEHEIGHT, GetTextHeight() + 1 ); SetFont( maHeaderFont ); - Execute( CSVCMD_SETOFFSETY, GetTextHeight() + 1 ); + Execute( CSVCMD_SETHDRHEIGHT, GetTextHeight() + 1 ); UpdateOffsetX(); EnableRepaint(); } @@ -179,7 +180,7 @@ void ScCsvGrid::UpdateOffsetX() sal_Int32 nDigits = 2; while( nLastLine /= 10 ) ++nDigits; nDigits = Max( nDigits, 3L ); - Execute( CSVCMD_SETOFFSETX, GetTextWidth( String( '0' ) ) * nDigits ); + Execute( CSVCMD_SETHDRWIDTH, GetTextWidth( String( '0' ) ) * nDigits ); } void ScCsvGrid::ApplyLayout( const ScCsvLayoutData& rOldData ) @@ -256,10 +257,10 @@ sal_Int32 ScCsvGrid::GetNoScrollCol( sal_Int32 nPos ) const void ScCsvGrid::InitColors() { - maBackColor = Color( mrColorConfig.GetColorValue( ::svx::DOCCOLOR ).nColor ); - maGridColor = Color( mrColorConfig.GetColorValue( ::svx::CALCGRID ).nColor ); - maGridPBColor = Color( mrColorConfig.GetColorValue( ::svx::CALCPAGEBREAK ).nColor ); - maAppBackColor = Color( mrColorConfig.GetColorValue( ::svx::APPBACKGROUND ).nColor ); + maBackColor = Color( mrColorConfig.GetColorValue( ::svtools::DOCCOLOR ).nColor ); + maGridColor = Color( mrColorConfig.GetColorValue( ::svtools::CALCGRID ).nColor ); + maGridPBColor = Color( mrColorConfig.GetColorValue( ::svtools::CALCPAGEBREAK ).nColor ); + maAppBackColor = Color( mrColorConfig.GetColorValue( ::svtools::APPBACKGROUND ).nColor ); const StyleSettings& rSett = GetSettings().GetStyleSettings(); maTextColor = rSett.GetButtonTextColor(); @@ -471,8 +472,9 @@ sal_Int32 ScCsvGrid::GetColumnX( sal_uInt32 nColIndex ) const sal_uInt32 ScCsvGrid::GetColumnFromX( sal_Int32 nX ) const { - sal_Int32 nPos = (nX - GetOffsetX()) / GetCharWidth() + GetFirstVisPos(); - return (nPos >= GetFirstVisPos()) ? GetColumnFromPos( nPos ) : CSV_COLUMN_INVALID; + sal_Int32 nPos = (nX - GetFirstX()) / GetCharWidth() + GetFirstVisPos(); + return ((GetFirstVisPos() <= nPos) && (nPos <= GetLastVisPos())) ? + GetColumnFromPos( nPos ) : CSV_COLUMN_INVALID; } sal_uInt32 ScCsvGrid::GetColumnFromPos( sal_Int32 nPos ) const @@ -889,9 +891,9 @@ void ScCsvGrid::MouseButtonDown( const MouseEvent& rMEvt ) if( rMEvt.IsLeft() ) { - if( aPos.X() < GetOffsetX() ) + if( (GetFirstX() > aPos.X()) || (aPos.X() > GetLastX()) ) // in header column { - if( aPos.Y() <= GetOffsetY() ) + if( aPos.Y() <= GetHdrHeight() ) SelectAll(); } else if( IsValidColumn( nColIx ) ) @@ -912,7 +914,7 @@ void ScCsvGrid::Tracking( const TrackingEvent& rTEvt ) DisableRepaint(); const MouseEvent& rMEvt = rTEvt.GetMouseEvent(); - sal_Int32 nPos = (rMEvt.GetPosPixel().X() - GetOffsetX()) / GetCharWidth() + GetFirstVisPos(); + sal_Int32 nPos = (rMEvt.GetPosPixel().X() - GetFirstX()) / GetCharWidth() + GetFirstVisPos(); // on mouse tracking: keep position valid nPos = Max( Min( nPos, GetPosCount() - 1L ), 0L ); Execute( CSVCMD_MAKEPOSVISIBLE, nPos ); @@ -991,7 +993,7 @@ void ScCsvGrid::Command( const CommandEvent& rCEvt ) { Point aPos( rCEvt.GetMousePosPixel() ); sal_uInt32 nColIx = GetColumnFromX( aPos.X() ); - if( IsValidColumn( nColIx ) && (aPos.X() >= GetOffsetX()) ) + if( IsValidColumn( nColIx ) && (GetFirstX() <= aPos.X()) && (aPos.X() <= GetLastX()) ) { if( !IsSelected( nColIx ) ) DoSelectAction( nColIx, 0 ); // focus & select @@ -1003,7 +1005,7 @@ void ScCsvGrid::Command( const CommandEvent& rCEvt ) sal_uInt32 nColIx = GetFocusColumn(); if( !IsSelected( nColIx ) ) Select( nColIx ); - sal_Int32 nX1 = Max( GetColumnX( nColIx ), GetOffsetX() ); + sal_Int32 nX1 = Max( GetColumnX( nColIx ), GetFirstX() ); sal_Int32 nX2 = Min( GetColumnX( nColIx + 1 ), GetWidth() ); ExecutePopup( Point( (nX1 + nX2) / 2, GetHeight() / 2 ) ); } @@ -1079,18 +1081,19 @@ EditEngine* ScCsvGrid::GetEditEngine() void ScCsvGrid::ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex ) { rOutDev.SetClipRegion( Region( Rectangle( - Max( GetColumnX( nColIndex ), GetOffsetX() ) + 1, 0, - GetColumnX( nColIndex + 1 ), GetHeight() - 1 ) ) ); + Max( GetColumnX( nColIndex ), GetFirstX() ) + 1, 0, + Min( GetColumnX( nColIndex + 1 ), GetLastX() ), GetHeight() - 1 ) ) ); } void ScCsvGrid::ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColIndex, Color aFillColor ) { sal_Int32 nX1 = GetColumnX( nColIndex ) + 1; sal_Int32 nX2 = GetColumnX( nColIndex + 1 ); + sal_Int32 nHdrHt = GetHdrHeight(); rOutDev.SetLineColor(); rOutDev.SetFillColor( aFillColor ); - rOutDev.DrawRect( Rectangle( nX1, 0, nX2, GetOffsetY() ) ); + rOutDev.DrawRect( Rectangle( nX1, 0, nX2, nHdrHt ) ); rOutDev.SetFont( maHeaderFont ); rOutDev.SetTextColor( maTextColor ); @@ -1098,8 +1101,8 @@ void ScCsvGrid::ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColInde rOutDev.DrawText( Point( nX1 + 1, 0 ), GetColumnTypeName( nColIndex ) ); rOutDev.SetLineColor( maHeaderGridColor ); - rOutDev.DrawLine( Point( nX1, GetOffsetY() ), Point( nX2, GetOffsetY() ) ); - rOutDev.DrawLine( Point( nX2, 0 ), Point( nX2, GetOffsetY() ) ); + rOutDev.DrawLine( Point( nX1, nHdrHt ), Point( nX2, nHdrHt ) ); + rOutDev.DrawLine( Point( nX2, 0 ), Point( nX2, nHdrHt ) ); } void ScCsvGrid::ImplDrawCellText( const Point& rPos, const String& rText ) @@ -1133,9 +1136,9 @@ void ScCsvGrid::ImplDrawFirstLineSep( bool bSet ) if( IsVisibleLine( mnFirstImpLine ) && (mnFirstImpLine != GetFirstVisLine() ) ) { sal_Int32 nY = GetY( mnFirstImpLine ); - sal_Int32 nX = GetColumnX( GetLastVisColumn() + 1 ); + sal_Int32 nX = Min( GetColumnX( GetLastVisColumn() + 1 ), GetLastX() ); maBackgrDev.SetLineColor( bSet ? maGridPBColor : maGridColor ); - maBackgrDev.DrawLine( Point( GetOffsetX() + 1, nY ), Point( nX, nY ) ); + maBackgrDev.DrawLine( Point( GetFirstX() + 1, nY ), Point( nX, nY ) ); } } @@ -1149,15 +1152,16 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex ) sal_Int32 nX1 = GetColumnX( nColIndex ) + 1; sal_Int32 nX2 = GetColumnX( nColIndex + 1 ); sal_Int32 nY2 = GetY( GetLastVisLine() + 1 ); + sal_Int32 nHdrHt = GetHdrHeight(); // grid maBackgrDev.SetLineColor(); maBackgrDev.SetFillColor( maBackColor ); - Rectangle aRect( nX1, GetOffsetY(), nX2, nY2 ); + Rectangle aRect( nX1, nHdrHt, nX2, nY2 ); maBackgrDev.DrawRect( aRect ); maBackgrDev.SetLineColor( maGridColor ); maBackgrDev.DrawGrid( aRect, Size( 1, GetLineHeight() ), GRID_HORZLINES ); - maBackgrDev.DrawLine( Point( nX2, GetOffsetY() ), Point( nX2, nY2 ) ); + maBackgrDev.DrawLine( Point( nX2, nHdrHt ), Point( nX2, nY2 ) ); ImplDrawFirstLineSep( true ); // cell texts @@ -1180,7 +1184,8 @@ void ScCsvGrid::ImplDrawRowHeaders() { maBackgrDev.SetLineColor(); maBackgrDev.SetFillColor( maAppBackColor ); - Rectangle aRect( 0, 0, GetOffsetX(), GetHeight() - 1 ); + Point aPoint( GetHdrX(), 0 ); + Rectangle aRect( aPoint, Size( GetHdrWidth() + 1, GetHeight() ) ); maBackgrDev.DrawRect( aRect ); maBackgrDev.SetFillColor( maHeaderBackColor ); @@ -1195,14 +1200,20 @@ void ScCsvGrid::ImplDrawRowHeaders() for( sal_Int32 nLine = GetFirstVisLine(); nLine <= nLastLine; ++nLine ) { String aText( String::CreateFromInt32( nLine + 1 ) ); - sal_Int32 nX = (GetOffsetX() - maBackgrDev.GetTextWidth( aText )) / 2; + sal_Int32 nX = GetHdrX() + (GetHdrWidth() - maBackgrDev.GetTextWidth( aText )) / 2; maBackgrDev.DrawText( Point( nX, GetY( nLine ) ), aText ); } // grid maBackgrDev.SetLineColor( maHeaderGridColor ); - maBackgrDev.DrawLine( aRect.TopRight(), aRect.BottomRight() ); - aRect.Top() = GetOffsetY(); + if( IsRTL() ) + { + maBackgrDev.DrawLine( Point( 0, 0 ), Point( 0, GetHeight() - 1 ) ); + maBackgrDev.DrawLine( aRect.TopLeft(), aRect.BottomLeft() ); + } + else + maBackgrDev.DrawLine( aRect.TopRight(), aRect.BottomRight() ); + aRect.Top() = GetHdrHeight(); maBackgrDev.DrawGrid( aRect, Size( 1, GetLineHeight() ), GRID_HORZLINES ); } @@ -1210,7 +1221,8 @@ void ScCsvGrid::ImplDrawBackgrDev() { maBackgrDev.SetLineColor(); maBackgrDev.SetFillColor( maAppBackColor ); - maBackgrDev.DrawRect( Rectangle( Point( GetOffsetX() + 1, 0 ), maWinSize ) ); + maBackgrDev.DrawRect( Rectangle( + Point( GetFirstX() + 1, 0 ), Size( GetWidth() - GetHdrWidth(), GetHeight() ) ) ); sal_uInt32 nLastCol = GetLastVisColumn(); for( sal_uInt32 nColIx = GetFirstVisColumn(); nColIx <= nLastCol; ++nColIx ) @@ -1231,7 +1243,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex ) sal_Int32 nX2 = GetColumnX( nColIndex + 1 ); // header - Rectangle aRect( nX1, 0, nX2, GetOffsetY() ); + Rectangle aRect( nX1, 0, nX2, GetHdrHeight() ); maGridDev.SetLineColor(); if( maHeaderBackColor.IsDark() ) // redraw with light gray background in dark mode @@ -1244,7 +1256,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex ) } // column selection - aRect = Rectangle( nX1, GetOffsetY() + 1, nX2, GetY( GetLastVisLine() + 1 ) - 1 ); + aRect = Rectangle( nX1, GetHdrHeight() + 1, nX2, GetY( GetLastVisLine() + 1 ) - 1 ); ImplInvertRect( maGridDev, aRect ); } @@ -1282,30 +1294,37 @@ void ScCsvGrid::ImplDrawHorzScrolled( sal_Int32 nOldPos ) sal_uInt32 nFirstColIx, nLastColIx; if( nPos < nOldPos ) { - aSrc = Point( GetOffsetX() + 1, 0 ); - aDest = Point( GetOffsetX() + GetCharWidth() * (nOldPos - nPos) + 1, 0 ); + aSrc = Point( GetFirstX() + 1, 0 ); + aDest = Point( GetFirstX() + GetCharWidth() * (nOldPos - nPos) + 1, 0 ); nFirstColIx = GetColumnFromPos( nPos ); nLastColIx = GetColumnFromPos( nOldPos ); } else { - aSrc = Point( GetOffsetX() + GetCharWidth() * (nPos - nOldPos) + 1, 0 ); - aDest = Point( GetOffsetX() + 1, 0 ); + aSrc = Point( GetFirstX() + GetCharWidth() * (nPos - nOldPos) + 1, 0 ); + aDest = Point( GetFirstX() + 1, 0 ); nFirstColIx = GetColumnFromPos( Min( nOldPos + GetVisPosCount(), GetPosCount() ) - 1 ); nLastColIx = GetColumnFromPos( Min( nPos + GetVisPosCount(), GetPosCount() ) - 1 ); } ImplInvertCursor( GetRulerCursorPos() + (nPos - nOldPos) ); + Rectangle aRectangle( GetFirstX(), 0, GetLastX(), GetHeight() - 1 ); + Region aClipReg( aRectangle ); + maBackgrDev.SetClipRegion( aClipReg ); maBackgrDev.CopyArea( aDest, aSrc, maWinSize ); + maBackgrDev.SetClipRegion(); + maGridDev.SetClipRegion( aClipReg ); maGridDev.CopyArea( aDest, aSrc, maWinSize ); + maGridDev.SetClipRegion(); ImplInvertCursor( GetRulerCursorPos() ); + for( sal_uInt32 nColIx = nFirstColIx; nColIx <= nLastColIx; ++nColIx ) ImplDrawColumn( nColIx ); sal_Int32 nLastX = GetX( GetPosCount() ) + 1; - if( nLastX < GetWidth() ) + if( nLastX <= GetLastX() ) { - Rectangle aRect( nLastX, 0, GetWidth() - 1, GetHeight() - 1 ); + Rectangle aRect( nLastX, 0, GetLastX(), GetHeight() - 1 ); maBackgrDev.SetLineColor(); maBackgrDev.SetFillColor( maAppBackColor ); maBackgrDev.DrawRect( aRect ); @@ -1320,9 +1339,9 @@ void ScCsvGrid::ImplInvertCursor( sal_Int32 nPos ) if( IsVisibleSplitPos( nPos ) ) { sal_Int32 nX = GetX( nPos ) - 1; - Rectangle aRect( Point( nX, 0 ), Size( 3, GetOffsetY() ) ); + Rectangle aRect( Point( nX, 0 ), Size( 3, GetHdrHeight() ) ); ImplInvertRect( maGridDev, aRect ); - aRect.Top() = GetOffsetY() + 1; + aRect.Top() = GetHdrHeight() + 1; aRect.Bottom() = GetY( GetLastVisLine() + 1 ); ImplInvertRect( maGridDev, aRect ); } @@ -1332,8 +1351,8 @@ void ScCsvGrid::ImplDrawTrackingRect( sal_uInt32 nColIndex ) { if( HasFocus() && IsVisibleColumn( nColIndex ) ) { - sal_Int32 nX1 = Max( GetColumnX( nColIndex ), GetOffsetX() ) + 1; - sal_Int32 nX2 = Min( GetColumnX( nColIndex + 1 ), GetWidth() ) - 1; + sal_Int32 nX1 = Max( GetColumnX( nColIndex ), GetFirstX() ) + 1; + sal_Int32 nX2 = Min( GetColumnX( nColIndex + 1 ) - 1L, GetLastX() ); sal_Int32 nY2 = Min( GetY( GetLastVisLine() + 1 ), GetHeight() ) - 1; InvertTracking( Rectangle( nX1, 0, nX2, nY2 ), SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); } diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 1012da5f0ba4..18ab6b4048c0 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: csvruler.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dr $ $Date: 2002-10-22 10:35:31 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,7 @@ ScCsvRuler::ScCsvRuler( ScCsvControl& rParent ) : ScCsvControl( rParent ), mnPosCursorLast( 1 ) { + EnableRTL( false ); // #107812# RTL InitColors(); InitSizeData(); maBackgrDev.SetFont( GetFont() ); @@ -137,10 +138,10 @@ void ScCsvRuler::InitSizeData() mnSplitSize = (GetCharWidth() * 3 / 5) | 1; // make an odd number - sal_Int32 nActiveWidth = Min( GetWidth() - GetOffsetX(), GetPosCount() * GetCharWidth() ); + sal_Int32 nActiveWidth = Min( GetWidth() - GetHdrWidth(), GetPosCount() * GetCharWidth() ); sal_Int32 nActiveHeight = GetTextHeight(); - maActiveRect.SetPos( Point( GetOffsetX(), (GetHeight() - nActiveHeight - 1) / 2 ) ); + maActiveRect.SetPos( Point( GetFirstX(), (GetHeight() - nActiveHeight - 1) / 2 ) ); maActiveRect.SetSize( Size( nActiveWidth, nActiveHeight ) ); maBackgrDev.SetOutputSizePixel( maWinSize ); @@ -511,8 +512,8 @@ void ScCsvRuler::ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth ) maBackgrDev.DrawRect( aRect ); aRect = maActiveRect; - aRect.Left() = Max( GetOffsetX(), nPosX ); - aRect.Right() = Min( GetX( GetPosCount() ), nPosX + nWidth - 1L ); + aRect.Left() = Max( GetFirstX(), nPosX ); + aRect.Right() = Min( Min( GetX( GetPosCount() ), GetLastX() ), nPosX + nWidth - 1L ); if( aRect.Left() <= aRect.Right() ) { maBackgrDev.SetFillColor( maActiveColor ); @@ -534,7 +535,7 @@ void ScCsvRuler::ImplDrawBackgrDev() sal_Int32 nPos; sal_Int32 nFirstPos = Max( GetPosFromX( 0 ) - 1L, 0L ); - sal_Int32 nLastPos = GetLastVisPos(); + sal_Int32 nLastPos = GetPosFromX( GetWidth() ); sal_Int32 nY = (maActiveRect.Top() + maActiveRect.Bottom()) / 2; for( nPos = nFirstPos; nPos <= nLastPos; ++nPos ) { diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index c0f03d5b7f5a..aa2e0b4c270e 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: csvtablebox.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dr $ $Date: 2002-08-16 12:59:09 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,6 +149,7 @@ void ScCsvTableBox::Init() mbFixedMode = false; mnFixedWidth = 1; + maHScroll.EnableRTL( false ); // #107812# RTL maHScroll.SetLineSize( 1 ); maVScroll.SetLineSize( 1 ); @@ -236,7 +237,7 @@ void ScCsvTableBox::MakePosVisible( sal_Int32 nPos ) if( nPos - CSV_SCROLL_DIST + 1 <= GetFirstVisPos() ) Execute( CSVCMD_SETPOSOFFSET, nPos - CSV_SCROLL_DIST ); else if( nPos + CSV_SCROLL_DIST >= GetLastVisPos() ) - Execute( CSVCMD_SETPOSOFFSET, nPos - GetVisPosCount() + CSV_SCROLL_DIST + 1 ); + Execute( CSVCMD_SETPOSOFFSET, nPos - GetVisPosCount() + CSV_SCROLL_DIST ); } } @@ -412,8 +413,8 @@ IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl*, pCtrl ) case CSVCMD_SETPOSOFFSET: ImplSetPosOffset( nParam1 ); break; - case CSVCMD_SETOFFSETX: - maData.mnOffsetX = Max( nParam1, 0L ); + case CSVCMD_SETHDRWIDTH: + maData.mnHdrWidth = Max( nParam1, 0L ); ImplSetPosOffset( GetFirstVisPos() ); break; case CSVCMD_SETCHARWIDTH: @@ -427,8 +428,8 @@ IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl*, pCtrl ) case CSVCMD_SETLINEOFFSET: ImplSetLineOffset( nParam1 ); break; - case CSVCMD_SETOFFSETY: - maData.mnOffsetY = Max( nParam1, 0L ); + case CSVCMD_SETHDRHEIGHT: + maData.mnHdrHeight = Max( nParam1, 0L ); ImplSetLineOffset( GetFirstVisLine() ); break; case CSVCMD_SETLINEHEIGHT: diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src index 0a0e27d06125..275f0153ca9b 100644 --- a/sc/source/ui/dbgui/dapitype.src +++ b/sc/source/ui/dbgui/dapitype.src @@ -2,9 +2,9 @@ * * $RCSfile: dapitype.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: kz $ $Date: 2002-09-05 18:48:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ ModalDialog RID_SCDLG_DAPITYPE Text[ portuguese ] = "Selecção ~activa"; Text[ russian ] = "~Òåêóùåå âûäåëåíèå"; Text[ greek ] = "ÔñÝ÷ïõóá åðéëïãÞ"; - Text[ dutch ] = "~Actuele selectie"; + Text[ dutch ] = "~Huidige selectie"; Text[ french ] = "Sélection ~active"; Text[ spanish ] = "Selección a~ctual"; Text[ italian ] = "Selezione ~attuale"; @@ -120,6 +120,7 @@ ModalDialog RID_SCDLG_DAPITYPE Text[ language_user1 ] = " "; Text[ catalan ] = "Sele~cció actual"; Text[ finnish ] = "~Nykyinen valinta"; + Text[ thai ] = "à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸~ปัจจุบัน"; }; RadioButton BTN_DATABASE { @@ -130,7 +131,7 @@ ModalDialog RID_SCDLG_DAPITYPE TabStop = TRUE ; Text[ english_us ] = "~Data source registered in %PRODUCTNAME"; Text[ portuguese ] = "~Fonte de dados ligada ao %PRODUCTNAME"; - Text[ russian ] = "~Èñõîäíûå äàííûå, çàðåã. â %PRODUCTNAME"; + Text[ russian ] = "~Èñõîäíûå äàííûå, çàðåãèñòðèðîâàííûå â %PRODUCTNAME"; Text[ greek ] = "Óôï %PRODUCTNAME äçëùìÝíï áñ÷åßï ðñïÝëåõóçò äåäïìÝíùí"; Text[ dutch ] = "~In %PRODUCTNAME aangemelde gegevensbron"; Text[ french ] = "Source de données sous %PRODUCTNAME"; @@ -141,14 +142,15 @@ ModalDialog RID_SCDLG_DAPITYPE Text[ polish ] = "Zarejestr. ~w %PRODUCTNAME Ÿród³o danych"; Text[ portuguese_brazilian ] = "Database source"; Text[ japanese ] = "%PRODUCTNAME ã«ç™»éŒ²ã—ãŸãƒ‡ãƒ¼ã‚¿ã‚½ãƒ¼ã‚¹(~D)"; - Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ 소스(~D)"; + Text[ korean ] = "%PRODUCTNAMEì— ë“±ë¡ëœ ë°ì´í„° ì›ë³¸(~D)"; Text[ chinese_simplified ] = "在 %PRODUCTNAME ä¸ç™»è®°çš„æ•°æ®æº(~D)"; Text[ chinese_traditional ] = "%PRODUCTNAME 已經登記的資料æº(~D)"; Text[ arabic ] = "ãÕÏÑ ÇáÈíÇäÇÊ ÇáãÓÌá Ýí %PRODUCTNAME"; Text[ turkish ] = "%PRODUCTNAME'de kayýtlý veri kaynaðý"; Text[ language_user1 ] = " "; Text[ catalan ] = "F~ont de dades registrada a %PRODUCTNAME"; - Text[ finnish ] = "~Tietolähde rekisteröity ohjelmaan %PRODUCTNAME"; + Text[ finnish ] = "~Tietolähde rekisteröity %PRODUCTNAMEeen"; + Text[ thai ] = "à¹à¸«à¸¥à¹ˆà¸‡~ข้à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¸—ะเบียนใน %PRODUCTNAME"; }; RadioButton BTN_EXTERNAL { @@ -163,21 +165,22 @@ ModalDialog RID_SCDLG_DAPITYPE Text[ greek ] = "Åîùôåñéêü áñ÷åßï ðñïÝëåõóçò/Äéáóýíäåóç"; Text[ dutch ] = "~Externe bron/interface"; Text[ french ] = "Source/interface ~externe"; - Text[ spanish ] = "~Fuente externa/Interfaz"; + Text[ spanish ] = "~Fuente externa/interfaz"; Text[ italian ] = "Sorgente ~esterna/interfaccia"; Text[ danish ] = "Ekstern kilde/grænseflade"; Text[ swedish ] = "Extern källa/gränssnitt"; Text[ polish ] = "~Zewnêtrzne(y) Ÿród³o/interfejs"; Text[ portuguese_brazilian ] = "External source/interface"; Text[ japanese ] = "外部ソース/インターフェイス(~E)"; - Text[ korean ] = "외부 소스/ì¸í„° 페ì´ìŠ¤(~E)"; + Text[ korean ] = "외부 ì›ë³¸/ì¸í„°íŽ˜ì´ìŠ¤(~E)"; Text[ chinese_simplified ] = "外部æº/ç•Œé¢(~E)"; Text[ chinese_traditional ] = "外部資料æº/ç•Œé¢(~E)"; Text[ arabic ] = "ãÕÏÑ ÎÇÑÌí/æÇÌåÉ ÎÇÑÌíÉ"; Text[ turkish ] = "~Dýþ kaynak/arabirim"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font/interfície ~externa"; - Text[ finnish ] = "~Ulkoinen lähde/liittymä"; + Text[ finnish ] = "~Ulkoinen lähde tai liittymä"; + Text[ thai ] = "ที่มา~ภายนà¸à¸/ส่วนต่à¸à¸›à¸£à¸°à¸ªà¸²à¸™"; }; FixedLine FL_FRAME { @@ -206,6 +209,7 @@ ModalDialog RID_SCDLG_DAPITYPE Text[ language_user1 ] = " "; Text[ catalan ] = "Selecció"; Text[ finnish ] = "Valinta"; + Text[ thai ] = "เลืà¸à¸"; }; Text[ english_us ] = "Select Source"; Text[ portuguese ] = "Seleccionar fonte"; @@ -220,7 +224,7 @@ ModalDialog RID_SCDLG_DAPITYPE Text[ polish ] = "Wybierz Ÿród³o"; Text[ portuguese_brazilian ] = "Select source"; Text[ japanese ] = "ソースã®é¸æŠž"; - Text[ korean ] = "소스 ì„ íƒ"; + Text[ korean ] = "ì›ë³¸ ì„ íƒ"; Text[ chinese_simplified ] = "选择æº"; Text[ chinese_traditional ] = "é¸æ“‡è³‡æ–™æº"; Text[ arabic ] = "ÊÍÏíÏ ãÕÏÑ"; @@ -228,6 +232,7 @@ ModalDialog RID_SCDLG_DAPITYPE Text[ language_user1 ] = " "; Text[ catalan ] = "Seleccioneu la font"; Text[ finnish ] = "Valitse lähde"; + Text[ thai ] = "เลืà¸à¸à¸—ี่มา"; }; @@ -290,6 +295,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ language_user1 ] = " "; Text[ catalan ] = "~Servei"; Text[ finnish ] = "~Palvelu"; + Text[ thai ] = "~บริà¸à¸²à¸£"; }; ListBox LB_SERVICE { @@ -318,7 +324,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ polish ] = "ród³o"; Text[ portuguese_brazilian ] = "Source"; Text[ japanese ] = "ソース(~U)"; - Text[ korean ] = "소스(~U)"; + Text[ korean ] = "ì›ë³¸(~U)"; Text[ chinese_simplified ] = "æº(~U)"; Text[ chinese_traditional ] = "資料æº(~U)"; Text[ arabic ] = "ÇáãÕÏÑ"; @@ -326,6 +332,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ language_user1 ] = " "; Text[ catalan ] = "F~ont"; Text[ finnish ] = "Läh~de"; + Text[ thai ] = "ที่~มา"; }; Edit ED_SOURCE { @@ -361,6 +368,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ language_user1 ] = " "; Text[ catalan ] = "~Nom"; Text[ finnish ] = "~Nimi"; + Text[ thai ] = "~ชื่à¸"; }; Edit ED_NAME { @@ -396,6 +404,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ language_user1 ] = " "; Text[ catalan ] = "U~suari"; Text[ finnish ] = "Käyt~täjä"; + Text[ thai ] = "ผู้ใ~ช้"; }; Edit ED_USER { @@ -423,7 +432,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ polish ] = "Has³o"; Text[ portuguese_brazilian ] = "Password"; Text[ japanese ] = "パスワード(~P)"; - Text[ korean ] = "패스워드(~P)"; + Text[ korean ] = "암호(~P)"; Text[ chinese_simplified ] = "密ç (~P)"; Text[ chinese_traditional ] = "密碼(~P)"; Text[ arabic ] = "ßáãÉ ÇáÓÑ"; @@ -431,6 +440,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ language_user1 ] = " "; Text[ catalan ] = "Con~trasenya"; Text[ finnish ] = "~Salasana"; + Text[ thai ] = "~รหัสผ่าน"; }; Edit ED_PASSWD { @@ -467,10 +477,11 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ language_user1 ] = " "; Text[ catalan ] = "Selecció"; Text[ finnish ] = "Valinta"; + Text[ thai ] = "เลืà¸à¸"; }; Text[ english_us ] = "External Source"; Text[ portuguese ] = "Fonte de dados externa"; - Text[ russian ] = "Âíåøíèå èñõîäíûå äàííûå"; + Text[ russian ] = "Âíåøíèé èñòî÷íèê äàííûõ"; Text[ greek ] = "Åîùôåñéêü áñ÷åßï ðñïÝëåõóçò äåäïìÝíùí"; Text[ dutch ] = "Externe bron"; Text[ french ] = "Source de données externe"; @@ -481,7 +492,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ polish ] = "Zewnêtrzne Ÿród³o danych"; Text[ portuguese_brazilian ] = "External source"; Text[ japanese ] = "外部データソース"; - Text[ korean ] = "외부 ë°ì´í„°ì†ŒìŠ¤"; + Text[ korean ] = "외부 ë°ì´í„° ì›ë³¸"; Text[ chinese_simplified ] = "外部数æ®æº"; Text[ chinese_traditional ] = "外部資料æº"; Text[ arabic ] = "ãÕÏÑ ÈíÇäÇÊ ÎÇÑÌí"; @@ -489,6 +500,7 @@ ModalDialog RID_SCDLG_DAPISERVICE Text[ language_user1 ] = " "; Text[ catalan ] = "Font externa"; Text[ finnish ] = "Ulkoinen lähde"; + Text[ thai ] = "ที่มาภายนà¸à¸"; }; @@ -552,6 +564,7 @@ ModalDialog RID_SCDLG_DAPIDATA Text[ language_user1 ] = " "; Text[ catalan ] = "~Base de dades"; Text[ finnish ] = "~Tietokanta"; + Text[ thai ] = "~à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; ListBox LB_DATABASE { @@ -570,7 +583,7 @@ ModalDialog RID_SCDLG_DAPIDATA Text [ ENGLISH ] = "Data source" ; Text[ english_us ] = "Data so~urce"; Text[ portuguese ] = "Fonte de ~dados"; - Text[ russian ] = "Èñõîäíûå äàííûå"; + Text[ russian ] = "Èñòî÷íèê äàííûõ"; Text[ greek ] = "ÐñïÝëåõóç äåäïìÝíùí"; Text[ dutch ] = "~Gegevensbron"; Text[ french ] = "~Source de données"; @@ -581,7 +594,7 @@ ModalDialog RID_SCDLG_DAPIDATA Text[ polish ] = "ród³o danych"; Text[ portuguese_brazilian ] = "Data source"; Text[ japanese ] = "データソース(~U)"; - Text[ korean ] = "ë°ì´í„° 관리(~U)"; + Text[ korean ] = "ë°ì´í„° ì›ë³¸(~U)"; Text[ chinese_simplified ] = "æ•°æ®æº(~U)"; Text[ chinese_traditional ] = "資料æº(~U)"; Text[ arabic ] = "ãÕÏÑ ÇáÈíÇäÇÊ"; @@ -589,6 +602,7 @@ ModalDialog RID_SCDLG_DAPIDATA Text[ language_user1 ] = " "; Text[ catalan ] = "~Font de dades"; Text[ finnish ] = "Tieto~lähde"; + Text[ thai ] = "à¹à¸«~ล่งข้à¸à¸¡à¸¹à¸¥"; }; ComboBox CB_OBJECT { @@ -626,6 +640,7 @@ ModalDialog RID_SCDLG_DAPIDATA Text[ language_user1 ] = " "; Text[ catalan ] = "~Tipus"; Text[ finnish ] = "~Tyyppi"; + Text[ thai ] = "~ชนิด"; }; ListBox LB_OBJTYPE { @@ -671,7 +686,7 @@ ModalDialog RID_SCDLG_DAPIDATA }; StringList [ russian ] = { - < "Òàáëèöà" ; Default ; > ; + < "Ëèñò" ; Default ; > ; < "Çàïðîñ" ; Default ; > ; < "Sql" ; Default ; > ; < "Sql [Native]" ; Default ; > ; @@ -749,7 +764,7 @@ ModalDialog RID_SCDLG_DAPIDATA StringList [ korean ] = { < "시트" ; Default ; > ; - < "질ì˜" ; Default ; > ; + < "쿼리" ; Default ; > ; < "Sql" ; Default ; > ; < "Sql [Native]" ; Default ; > ; }; @@ -785,15 +800,22 @@ ModalDialog RID_SCDLG_DAPIDATA { < "Full" ; Default ; > ; < "Consulta" ; Default ; > ; - < "Sql" ; Default ; > ; + < "SQL" ; Default ; > ; < "SQL [natiu]" ; Default ; > ; }; StringList [ finnish ] = { - < "Lomake" ; Default ; > ; + < "Taulukko" ; Default ; > ; < "Kysely" ; Default ; > ; < "Sql" ; Default ; > ; - < "Sql [alkuperäinen]" ; Default ; > ; + < "Sql [suora]" ; Default ; > ; + }; + StringList [ thai ] = + { + < "à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™" ; Default ; > ; + < "à¹à¸šà¸šà¸ªà¸à¸šà¸–าม" ; Default ; > ; + < "Sql" ; Default ; > ; + < "Sql [โดยà¸à¸³à¹€à¸™à¸´à¸”]" ; Default ; > ; }; }; @@ -824,6 +846,7 @@ ModalDialog RID_SCDLG_DAPIDATA Text[ language_user1 ] = " "; Text[ catalan ] = "Selecció"; Text[ finnish ] = "Valinta"; + Text[ thai ] = "เลืà¸à¸"; }; Text[ english_us ] = "Select Data Source"; Text[ portuguese ] = "Seleccionar fonte de dados"; @@ -838,7 +861,7 @@ ModalDialog RID_SCDLG_DAPIDATA Text[ polish ] = "Wybierz Ÿród³o danych"; Text[ portuguese_brazilian ] = "Select data source"; Text[ japanese ] = "データソースã®é¸æŠž"; - Text[ korean ] = "ë°ì´í„° 소스 ì„ íƒ"; + Text[ korean ] = "ë°ì´í„° ì›ë³¸ ì„ íƒ"; Text[ chinese_simplified ] = "选择数æ®æº"; Text[ chinese_traditional ] = "é¸æ“‡è³‡æ–™æº"; Text[ arabic ] = "ÊÍÏíÏ ãÕÏÑ ÇáÈíÇäÇÊ"; @@ -846,5 +869,11 @@ ModalDialog RID_SCDLG_DAPIDATA Text[ language_user1 ] = " "; Text[ catalan ] = "Seleccioneu la font de dades"; Text[ finnish ] = "Valitse tietolähde"; + Text[ thai ] = "เลืà¸à¸à¹à¸«à¸¥à¹ˆà¸‡à¸‚้à¸à¸¡à¸¹à¸¥"; }; + + + + + diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 21559517027d..891bcbd8191f 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fieldwnd.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dr $ $Date: 2002-10-21 17:48:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,7 @@ ScDPFieldWindow::ScDPFieldWindow( eType( eFieldType ), nFieldCount( 0 ), nFieldSelected( 0 ), + mbAppRTL( !!Application::GetSettings().GetLayoutRTL() ), pAccessible( NULL ) { Init(); @@ -167,6 +168,7 @@ void ScDPFieldWindow::GetStyleSettings() aFaceColor = rStyleSet.GetFaceColor(); aWinColor = rStyleSet.GetWindowColor(); aTextColor = rStyleSet.GetButtonTextColor(); + aWinTextColor = rStyleSet.GetWindowTextColor(); } //------------------------------------------------------------------- @@ -247,11 +249,14 @@ void ScDPFieldWindow::DrawBackground( OutputDevice& rDev ) } else { - rDev.SetLineColor( aTextColor ); + rDev.SetLineColor( aWinTextColor ); rDev.SetFillColor( aWinColor ); rDev.DrawRect( Rectangle( aPos0, aSize ) ); - rDev.SetTextColor( aTextColor ); + rDev.SetTextColor( aWinTextColor ); + BOOL bOldRTL = rDev.IsRTLEnabled(); + rDev.EnableRTL( false ); rDev.DrawCtrlText( aTextPos, GetText() ); + rDev.EnableRTL( bOldRTL ); } } @@ -262,6 +267,8 @@ void ScDPFieldWindow::DrawField( BOOL bSelected ) { VirtualDevice aVirDev( rDev ); + aVirDev.EnableRTL( true ); + Size aDevSize( rRect.GetSize() ); long nWidth = aDevSize.Width(); long nHeight = aDevSize.Height(); @@ -274,19 +281,21 @@ void ScDPFieldWindow::DrawField( aVirDev.SetOutputSizePixel( aDevSize ); aVirDev.SetFont( rDev.GetFont() ); DecorationView aDecoView( &aVirDev ); - aDecoView.DrawButton( Rectangle( Point(), aDevSize ), bSelected ? BUTTON_DRAW_DEFAULT : 0 ); + aDecoView.DrawButton( Rectangle( Point( 0, 0 ), aDevSize ), bSelected ? BUTTON_DRAW_DEFAULT : 0 ); aVirDev.SetTextColor( aTextColor ); - aVirDev.DrawText( aLabelPos, rText ); // text - rDev.DrawBitmap( rRect.TopLeft(), aVirDev.GetBitmap( Point(), aDevSize ) ); + aVirDev.EnableRTL( false ); + aVirDev.DrawText( aLabelPos, rText ); + rDev.DrawBitmap( rRect.TopLeft(), aVirDev.GetBitmap( Point( 0, 0 ), aDevSize ) ); } void ScDPFieldWindow::Redraw() { VirtualDevice aVirDev; + aVirDev.EnableRTL( true ); + Point aPos0; Size aSize( GetSizePixel() ); Font aFont( GetFont() ); // Font vom Window - aFont.SetTransparent( TRUE ); aVirDev.SetFont( aFont ); aVirDev.SetOutputSizePixel( aSize ); @@ -513,6 +522,10 @@ void __EXPORT ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt ) USHORT nCode = rKeyCode.GetCode(); BOOL bKeyEvaluated = FALSE; + // revert wrong cursor direction (left/right) in RTL windows + if( ((nCode == KEY_LEFT) || (nCode == KEY_RIGHT)) && mbAppRTL && IsRTLEnabled() ) + nCode = (nCode == KEY_LEFT) ? KEY_RIGHT : KEY_LEFT; + if( rKeyCode.IsMod1() && (eType != TYPE_SELECT) ) { bKeyEvaluated = TRUE; diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src index f7c8ca906c3c..deb1829b1471 100644 --- a/sc/source/ui/dbgui/imoptdlg.src +++ b/sc/source/ui/dbgui/imoptdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: imoptdlg.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:40:34 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -287,3 +287,5 @@ ModalDialog RID_SCDLG_IMPORTOPT Text[ thai ] = "นำเข้าà¹à¸Ÿà¹‰à¸¡"; }; + + diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src index 4669d7e3391b..9ebe83d30a35 100644 --- a/sc/source/ui/dbgui/pivot.src +++ b/sc/source/ui/dbgui/pivot.src @@ -2,9 +2,9 @@ * * $RCSfile: pivot.src,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:41:39 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -219,18 +219,18 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text[ russian ] = "Selection area"; Text[ greek ] = "Selection area"; Text[ dutch ] = "Selection area"; - Text[ french ] = "Selection area"; - Text[ spanish ] = "Selection area"; + Text[ french ] = "Zone de sélection"; + Text[ spanish ] = "Área de selección"; Text[ finnish ] = "Selection area"; - Text[ italian ] = "Selection area"; + Text[ italian ] = "Area di selezione"; Text[ danish ] = "Selection area"; - Text[ swedish ] = "Selection area"; + Text[ swedish ] = "Markeringsområde"; Text[ polish ] = "Selection area"; Text[ portuguese_brazilian ] = "Selection area"; - Text[ japanese ] = "Selection area"; - Text[ korean ] = "Selection area"; - Text[ chinese_simplified ] = "Selection area"; - Text[ chinese_traditional ] = "Selection area"; + Text[ japanese ] = "é¸æŠžç¯„囲"; + Text[ korean ] = "ì˜ì— ì„ íƒ"; + Text[ chinese_simplified ] = "选择区域"; + Text[ chinese_traditional ] = "é¸å–å€åŸŸ"; Text[ turkish ] = "Selection area"; Text[ arabic ] = "Selection area"; Text[ catalan ] = "Selection area"; @@ -334,7 +334,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text[ greek ] = "Remove"; Text[ dutch ] = "Remove"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "Eliminar"; + Text[ spanish ] = "Borrar"; Text[ finnish ] = "Remove"; Text[ italian ] = "Deinstallazione"; Text[ danish ] = "Remove"; @@ -342,7 +342,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text[ polish ] = "Remove"; Text[ portuguese_brazilian ] = "Remove"; Text[ japanese ] = "削除"; - Text[ korean ] = "ì‚ì œ"; + Text[ korean ] = "ì œê±°"; Text[ chinese_simplified ] = "移除"; Text[ chinese_traditional ] = "移除"; Text[ turkish ] = "Remove"; @@ -517,7 +517,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text = "Leerzeilen ~ignorieren" ; Text [ ENGLISH ] = "~Ignore empty rows" ; Text [ norwegian ] = "~Ignorer tomme rader " ; - Text [ italian ] = "~Ignorare le righe vuote" ; + Text [ italian ] = "~Ignora le righe vuote" ; Text [ portuguese_brazilian ] = "~Ignorar fileiras vazias" ; Text [ portuguese ] = "~Ignorar linhas vazias" ; Text [ finnish ] = "~Ohita tyhjät rivit" ; @@ -549,7 +549,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text = "~Kategorieerkennung" ; Text [ ENGLISH ] = "~Detect Categories" ; Text [ norwegian ] = "~Finn Kategorier " ; - Text [ italian ] = "~Individuare categorie" ; + Text [ italian ] = "~Individua categorie" ; Text [ portuguese_brazilian ] = "~Detectar Categorias" ; Text [ portuguese ] = "~Indicar categorias" ; Text [ finnish ] = "~Tunnista luokat" ; @@ -627,7 +627,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text[ chinese_traditional ] = "總計的列(~T)"; Text[ arabic ] = "ÕÝæÝ ÇáãÌãæÚ"; Text[ greek ] = "Óõíïëéêü Üèñïéóìá ãñáììþí"; - Text[ korean ] = "ëª¨ë“ í–‰(~T)"; + Text[ korean ] = "í–‰ 합계(~T)"; Text[ turkish ] = "Satýr t~oplamý"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Total de files"; @@ -712,7 +712,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text[ chinese_traditional ] = "å¹³å‡å€¼ - "; Text[ arabic ] = "Ü Average"; Text[ greek ] = "ÌÝóç ôéìÞ - "; - Text[ korean ] = "ì˜ë¯¸- "; + Text[ korean ] = "í‰ê· ê°’ - "; Text[ turkish ] = "Ortalama - "; Text[ language_user1 ] = " "; Text[ catalan ] = "Mitjana - "; @@ -927,7 +927,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text [ french ] = "VarP - " ; Text [ swedish ] = "VariansP - " ; Text [ dutch ] = "Varianties -" ; - Text [ spanish ] = "Var2 - " ; + Text [ spanish ] = "VarP - " ; Text [ english_us ] = "VarP - " ; Text[ chinese_simplified ] = "方差 - "; Text[ russian ] = "Íåñìåùåííàÿ äèñïåðñèÿ - "; @@ -945,3 +945,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥à¸™à¸³à¸£à¹ˆà¸à¸‡"; }; + + + + + diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index a350104e5748..0033ab1b9189 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -2,9 +2,9 @@ * * $RCSfile: pvfundlg.src,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:01:19 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,16 +86,16 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text [ italian ] = "~Nessuna" ; Text [ portuguese_brazilian ] = "~Nenhum" ; Text [ portuguese ] = "~Nenhum" ; - Text [ finnish ] = "~Ei mit??n" ; + Text [ finnish ] = "~Ei mitään" ; Text [ danish ] = "Ingen" ; - Text [ french ] = "~Aucun(e)" ; + Text [ french ] = "Aucun(e)" ; Text [ swedish ] = "~Inga" ; Text [ dutch ] = "~Geen" ; Text [ spanish ] = "~Ningún" ; Text [ english_us ] = "~None" ; TabStop = TRUE ; Text[ chinese_simplified ] = "æ— (~N)"; - Text[ russian ] = "áåç"; + Text[ russian ] = "Íåò"; Text[ polish ] = "Brak"; Text[ japanese ] = "ãªã—(~N)"; Text[ chinese_traditional ] = "ç„¡(~N)"; @@ -104,7 +104,8 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ korean ] = "ì—†ìŒ(~N)"; Text[ turkish ] = "~Yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ningún"; + Text[ catalan ] = "~Cap"; + Text[ thai ] = "ไ~ม่มี"; }; RadioButton BTN_AUTO { @@ -113,13 +114,13 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text = "~Automatisch" ; Text [ ENGLISH ] = "~Auto" ; Text [ norwegian ] = "~Auto" ; - Text [ italian ] = "~Automatico" ; + Text [ italian ] = "Automatico" ; Text [ portuguese_brazilian ] = "~Auto" ; Text [ portuguese ] = "~Automaticamente" ; Text [ finnish ] = "~Automaattinen" ; Text [ danish ] = "Automatisk" ; - Text [ french ] = "~Automatique" ; - Text [ swedish ] = "~Automatisk" ; + Text [ french ] = "Automatique" ; + Text [ swedish ] = "~Automatiskt" ; Text [ dutch ] = "~Automatisch" ; Text [ spanish ] = "~Automático" ; Text [ english_us ] = "~Automatic" ; @@ -134,7 +135,8 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ korean ] = "ìžë™(~A)"; Text[ turkish ] = "~Otomatik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Automático"; + Text[ catalan ] = "~Automàtic"; + Text[ thai ] = "~à¸à¸±à¸•à¹‚นมัติ"; }; RadioButton BTN_USER { @@ -146,9 +148,9 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text [ italian ] = "Definito dall'utente" ; Text [ portuguese_brazilian ] = "~Definido pelo usu?rio" ; Text [ portuguese ] = "Definido pelo ~utilizador" ; - Text [ finnish ] = "~K?ytt?j?n m??ritt?m?t" ; + Text [ finnish ] = "~Käyttäjän määrittämät" ; Text [ danish ] = "Brugerdefineret" ; - Text [ french ] = "Défini par l'~utilisateur" ; + Text [ french ] = "Défini par l'utilisateur" ; Text [ swedish ] = "~Användardefinierade" ; Text [ dutch ] = "Ge~bruikergedefinieerd" ; Text [ spanish ] = "Definido por el ~usuario" ; @@ -157,14 +159,15 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ chinese_simplified ] = "使用者自设(~U)"; Text[ russian ] = "Îïðåäåëÿåìûé ïîëüçîâàòåëåì"; Text[ polish ] = "Ustawienia indywidualne"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義(~U)"; + Text[ japanese ] = "ユーザー定義(~U)"; Text[ chinese_traditional ] = "使用者自訂(~U)"; Text[ arabic ] = "ãÚÑÝ ãä ÞÈá ÇáãÓÊÎÏã"; Text[ greek ] = "Ïñéæüìåíï áðü ôïí ÷ñÞóôç"; Text[ korean ] = "ì‚¬ìš©ìž ì •ì˜(~U)"; Text[ turkish ] = "~Kullanýcý tanýmlý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Definido por el ~usuario"; + Text[ catalan ] = "Definit per l'~usuari"; + Text[ thai ] = "ระบุ~ผู้ใช้"; }; MultiListBox LB_FUNC { @@ -262,15 +265,15 @@ ModalDialog RID_SCDLG_PIVOTSUBT }; StringList [ finnish ] = { - < "Sum" ; Default ; > ; - < "Lukum??r?" ; Default ; > ; + < "Summa" ; Default ; > ; + < "LASKE" ; Default ; > ; < "Keskiarvo" ; Default ; > ; - < "Enint" ; Default ; > ; - < "V?h" ; Default ; > ; - < "Tuote" ; Default ; > ; - < "M??r? (vain numerot)" ; Default ; > ; - < "StDev (vakiopoikkeama, Otos)" ; Default ; > ; - < "StDevP (vakiopoikkeama, populaatio)" ; Default ; > ; + < "MAKS" ; Default ; > ; + < "MIN" ; Default ; > ; + < "Tulo" ; Default ; > ; + < "LASKE (vain luvut)" ; Default ; > ; + < "KESKIHAJONTA (otos)" ; Default ; > ; + < "KESKIHAJONTA (populaatio)" ; Default ; > ; < "Var (Otos)" ; Default ; > ; < "VarP (populaatio)" ; Default ; > ; }; @@ -341,8 +344,8 @@ ModalDialog RID_SCDLG_PIVOTSUBT < "Cantidad2 (solo números)" ; Default ; > ; < "DesvEst (Muestra)" ; Default ; > ; < "DesvEstP (Población)" ; Default ; > ; - < "Varianza (Muestra)" ; Default ; > ; - < "Varianzas (Población)" ; Default ; > ; + < "Variancia (muestra)" ; Default ; > ; + < "VarP (población)" ; Default ; > ; }; StringList [ english_us ] = { @@ -381,7 +384,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT < "Ìàêñèìóì" ; Default ; > ; < "Ìèíèìóì" ; Default ; > ; < "Ïðîèçâåäåíèå" ; Default ; > ; - < "Êîëè÷åñòâî (òîëüêî ÷èñåë)" ; Default ; > ; + < "Êîëè÷åñòâî (òîëüêî ÷èñëà)" ; Default ; > ; < "Ñìåùåííîå îòêëîíåíèå (Îáðàçåö)" ; Default ; > ; < "Íåñìåùåííîå îòêëîíåíèå (Ñîâîêóïíîñòü)" ; Default ; > ; < "Ñìåùåííàÿ äèñïåðñèÿ (Îáðàçåö)" ; Default ; > ; @@ -460,16 +463,16 @@ ModalDialog RID_SCDLG_PIVOTSUBT StringList [ korean ] = { < "합계" ; Default ; > ; - < "수" ; Default ; > ; - < "í‰ê· " ; Default ; > ; + < "ê°’" ; Default ; > ; + < "í‰ê· ê°’" ; Default ; > ; < "최대" ; Default ; > ; < "최소" ; Default ; > ; < "ê³±" ; Default ; > ; - < "수 (숫ìžë§Œ)" ; Default ; > ; - < "StDev (샘플)" ; Default ; > ; - < "ï¼³tDevP (모집단)" ; Default ; > ; - < "분산 (샘플)" ; Default ; > ; - < "분산 (모집단)" ; Default ; > ; + < "ê°’(숫ìžë§Œ)" ; Default ; > ; + < "StDev(샘플)" ; Default ; > ; + < "ï¼³tDevP(모집단)" ; Default ; > ; + < "분산(샘플)" ; Default ; > ; + < "분산(모집단)" ; Default ; > ; }; StringList [ turkish ] = { @@ -502,16 +505,30 @@ ModalDialog RID_SCDLG_PIVOTSUBT StringList [ catalan ] = { < "Suma" ; Default ; > ; - < "Cantidad" ; Default ; > ; - < "Promedio" ; Default ; > ; - < "Máx" ; Default ; > ; - < "Mín" ; Default ; > ; - < "Producto" ; Default ; > ; - < "Cantidad2 (solo números)" ; Default ; > ; - < "DesvEst (Muestra)" ; Default ; > ; - < "DesvEstP (Población)" ; Default ; > ; - < "Varianza (Muestra)" ; Default ; > ; - < "Varianzas (Población)" ; Default ; > ; + < "Compta" ; Default ; > ; + < "Mitjana" ; Default ; > ; + < "Màx." ; Default ; > ; + < "Mín." ; Default ; > ; + < "Producte" ; Default ; > ; + < "Compta (només els números)" ; Default ; > ; + < "StDev (mostra)" ; Default ; > ; + < "StDevP (població)" ; Default ; > ; + < "Var (mostra)" ; Default ; > ; + < "VarP (població)" ; Default ; > ; + }; + StringList [ thai ] = + { + < "ผลรวม" ; Default ; > ; + < "นับ" ; Default ; > ; + < "เฉลี่ย" ; Default ; > ; + < "มาà¸à¸—ี่สุด" ; Default ; > ; + < "น้à¸à¸¢à¸—ี่สุด" ; Default ; > ; + < "ผลิตภัณฑ์" ; Default ; > ; + < "นับ (ตัวเลขเท่านั้น)" ; Default ; > ; + < "StDev (ตัวà¸à¸¢à¹ˆà¸²à¸‡)" ; Default ; > ; + < "StDevP (ประชาà¸à¸£)" ; Default ; > ; + < "Var (ตัวà¸à¸¢à¹ˆà¸²à¸‡)" ; Default ; > ; + < "VarP (ประชาà¸à¸£)" ; Default ; > ; }; }; FixedLine FL_FUNC @@ -538,15 +555,16 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ swedish ] = "Visa objekt utan data"; Text[ polish ] = "Poka¿ elementy bez danych"; Text[ portuguese_brazilian ] = "Show elements without data"; - Text[ japanese ] = "ﾃﾞｰﾀã®ãªã„è¦ç´ を表示ã™ã‚‹(~E)"; + Text[ japanese ] = "データã®ãªã„è¦ç´ を表示ã™ã‚‹(~E)"; Text[ korean ] = "ë°ì´í„° ì—†ì´ ìš”ì†Œ 보기(~E)"; Text[ chinese_simplified ] = "显示ä¸å«æ•°æ®çš„æ¡ç›®(~E)"; Text[ chinese_traditional ] = "顯示無數據的單元(~E)"; Text[ arabic ] = "ÅÙåÇÑ ÇáÚäÇÕÑ ÈÏæä ÈíÇäÇÊ"; Text[ turkish ] = "~Ögeleri veriler olmadan görüntüle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mostrar elementos sin datos"; - Text[ finnish ] = "N?yt? ~elementit ilman tietoja"; + Text[ catalan ] = "Mostra els ~elements sense dades"; + Text[ finnish ] = "Näytä ~elementit ilman tietoja"; + Text[ thai ] = "à¹à¸ªà¸”ง~à¸à¸‡à¸„์ประà¸à¸à¸šà¸—ี่ไม่มีข้à¸à¸¡à¸¹à¸¥"; }; FixedText FT_NAMELABEL { @@ -575,7 +593,8 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ korean ] = "ì´ë¦„:"; Text[ turkish ] = "Ad:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre:"; + Text[ catalan ] = "Nom:"; + Text[ thai ] = "ชื่à¸:"; }; FixedText FT_NAME { @@ -609,7 +628,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text [ italian ] = "Subtotali" ; Text [ portuguese_brazilian ] = "Sub Totais" ; Text [ portuguese ] = "Subtotais" ; - Text [ finnish ] = "V?lisummat" ; + Text [ finnish ] = "Välisummat" ; Text [ danish ] = "Subtotaler" ; Text [ french ] = "Sous-totaux" ; Text [ swedish ] = "Delresultat" ; @@ -623,10 +642,11 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ chinese_traditional ] = "å°è¨ˆ"; Text[ arabic ] = "Subtotals"; Text[ greek ] = "ÌåñéêÜ áèñïßóìáôá"; - Text[ korean ] = "소계"; + Text[ korean ] = "부분합"; Text[ turkish ] = "Ara toplam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Subtotales"; + Text[ catalan ] = "Subtotals"; + Text[ thai ] = "ผลรวมย่à¸à¸¢"; }; String STR_DATAFUNC { @@ -650,10 +670,11 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ chinese_traditional ] = "函數"; Text[ arabic ] = "Function"; Text[ greek ] = "ÓõíÜñôçóç"; - Text[ korean ] = "함수"; + Text[ korean ] = "계산 방법"; Text[ turkish ] = "Fonksiyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Función"; + Text[ catalan ] = "Funció"; + Text[ thai ] = "ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™"; }; Text [ spanish ] = "Campo de datos" ; Text [ french ] = "Champ de données" ; @@ -663,15 +684,16 @@ ModalDialog RID_SCDLG_PIVOTSUBT Text[ chinese_simplified ] = "æ•°æ®å—段"; Text[ russian ] = "Ïîëå äàííûõ"; Text[ polish ] = "Pole danych"; - Text[ japanese ] = "ﾃﾞｰﾀﾌｨｰﾙﾄﾞ"; + Text[ japanese ] = "データフィールド"; Text[ chinese_traditional ] = "資料欄ä½"; Text[ arabic ] = "ÍÞá ÈíÇäÇÊ"; Text[ greek ] = "Ðåäßï äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„° í•„ë“œ"; Text[ turkish ] = "Veri alaný"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de datos"; - Text[ finnish ] = "Tietokentt?"; + Text[ catalan ] = "Camp de dades"; + Text[ finnish ] = "Tietokenttä"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥"; }; @@ -685,3 +707,10 @@ ModalDialog RID_SCDLG_PIVOTSUBT + + + + + + + diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 6cd48bbc629e..ac1d361c3905 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pvlaydlg.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dr $ $Date: 2002-11-20 08:56:45 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -917,12 +917,16 @@ void ScDPLayoutDlg::NotifyDoubleClick( ScDPFieldType eType, long nFieldIndex ) //---------------------------------------------------------------------------- -void ScDPLayoutDlg::NotifyFieldFocus( ScDPFieldType eType, BOOL bActive ) +void ScDPLayoutDlg::NotifyFieldFocus( ScDPFieldType eType, BOOL bGotFocus ) { - BOOL bEnable = bActive && (eType != TYPE_SELECT); + /* Enable Remove/Options buttons on GetFocus in field window. + #107616# Enable them also, if dialog is deactivated (click into document). + The !IsActive() condition handles the case that a LoseFocus event of a + field window would follow the Deactivate event of this dialog. */ + BOOL bEnable = (bGotFocus || !IsActive()) && (eType != TYPE_SELECT); aBtnRemove.Enable( bEnable ); aBtnOptions.Enable( bEnable ); - if( bActive ) + if( bGotFocus ) eLastActiveType = eType; } @@ -972,6 +976,17 @@ BOOL ScDPLayoutDlg::NotifyMoveSlider( USHORT nKeyCode ) //---------------------------------------------------------------------------- +void ScDPLayoutDlg::Deactivate() +{ + /* #107616# If the dialog has been deactivated (click into document), the LoseFocus + event from field window disables Remove/Options buttons. Re-enable them here by + simulating a GetFocus event. Event order of LoseFocus and Deactivate is not important. + The last event will enable the buttons in both cases (see NotifyFieldFocus). */ + NotifyFieldFocus( eLastActiveType, TRUE ); +} + +//---------------------------------------------------------------------------- + BOOL ScDPLayoutDlg::Contains( FuncData** pArr, short nCol, long& nAt ) { if ( !pArr ) diff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src index 4f53bdba585c..76d37e1c60ac 100644 --- a/sc/source/ui/dbgui/scendlg.src +++ b/sc/source/ui/dbgui/scendlg.src @@ -2,9 +2,9 @@ * * $RCSfile: scendlg.src,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:03:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,9 +129,9 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ dutch ] = "~Kader weergeven"; Text[ french ] = "Afficher le cadre"; Text[ spanish ] = "Mostrar borde"; - Text[ finnish ] = "Näytä reunus"; + Text[ finnish ] = "Näytä reuna"; Text[ italian ] = "Mostra cornice in"; - Text[ danish ] = "Vis ramme i"; + Text[ danish ] = "Vis ~ramme"; Text[ swedish ] = "Visa ~ram"; Text[ polish ] = "Poka¿ ramkê"; Text[ portuguese_brazilian ] = "Rahmen anzeigen in"; @@ -141,8 +141,9 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ chinese_traditional ] = "顯示邊框"; Text[ turkish ] = "Çerçeve rengi"; Text[ arabic ] = "ÅÙåÇÑ ÇáßÇÏÑ ÈÇááæä"; - Text[ catalan ] = "Mostrar borde en"; + Text[ catalan ] = "Visualitza la vora en"; Text[ language_user1 ] = " "; + Text[ thai ] = "à¹à¸ªà¸”งผลเส้นขà¸à¸šà¹ƒà¸™"; }; ListBox LB_COLOR { @@ -178,8 +179,9 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ greek ] = "Åêôýðùóç ðëáéóßïõ"; Text[ korean ] = "í…Œë‘리 ì¸ì‡„"; Text[ turkish ] = "Çerçeveyi yazdýr"; - Text[ catalan ] = "Imprimir borde"; + Text[ catalan ] = "Imprimeix la vora"; Text[ finnish ] = "Tulosta reunus"; + Text[ thai ] = "พิมพ์เส้นขà¸à¸š"; }; CheckBox CB_TWOWAY { @@ -191,7 +193,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text [ english_us ] = "Copy back" ; Text [ portuguese_brazilian ] = "Zur?ckkopieren" ; Text [ swedish ] = "Kopiera t~illbaka" ; - Text [ danish ] = "Kopier tilbage" ; + Text [ danish ] = "Kopier til~bage" ; Text [ italian ] = "Ricopia all'indietro" ; Text [ spanish ] = "Volver a copiar" ; Text [ french ] = "~Recopier" ; @@ -204,11 +206,12 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ chinese_traditional ] = "複製回來"; Text[ arabic ] = "ÅÚÇÏÉ ÇáäÓÎ"; Text[ greek ] = "ÁíôéãñáöÞ ðßó~ù"; - Text[ korean ] = "ì—으로 복사"; + Text[ korean ] = "ì—순으로 복사"; Text[ turkish ] = "Geri kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Actualizar escenario con valores modificados"; - Text[ finnish ] = "Kopioi takaisin"; + Text[ catalan ] = "Copia enrere"; + Text[ finnish ] = "Kopioi tausta"; + Text[ thai ] = "คัดลà¸à¸à¸à¸¥à¸±à¸š"; }; CheckBox CB_ATTRIB { @@ -236,8 +239,9 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ korean ] = "ì†ì„±"; Text[ turkish ] = "Öznitelik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Atributos"; - Text[ finnish ] = "M??ritteet"; + Text[ catalan ] = "Atributs"; + Text[ finnish ] = "Määritteet"; + Text[ thai ] = "คุณลัà¸à¸©à¸“ะ"; }; CheckBox CB_VALUE { @@ -258,15 +262,16 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ chinese_simplified ] = "åªå¤åˆ¶æ•°å€¼"; Text[ russian ] = "Êîïèðîâàòü òîëüêî çíà÷åíèÿ"; Text[ polish ] = "Kopiuj tylko wartoœci"; - Text[ japanese ] = "数値ã®ã¿ï½ºï¾‹ï¾Ÿï½°"; + Text[ japanese ] = "数値ã®ã¿ã‚³ãƒ”ー"; Text[ chinese_traditional ] = "åªè¤‡è£½æ•¸å€¼"; Text[ arabic ] = "äÓÎ ÇáÞíã ÝÞØ"; Text[ greek ] = "ÁíôéãñáöÞ ìüíï ôùí ôéìþí"; Text[ korean ] = "값만 복사"; Text[ turkish ] = "Yalnýzca deðerleri kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar solo valores"; + Text[ catalan ] = "Copia només els valors"; Text[ finnish ] = "Kopioi vain arvot"; + Text[ thai ] = "คัดลà¸à¸à¸„่าà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸”ียว"; }; CheckBox CB_COPYALL { @@ -277,24 +282,25 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text [ english_us ] = "Copy entire sheet" ; Text [ portuguese_brazilian ] = "Ganze Tabelle kopieren" ; Text [ swedish ] = "Kopiera hel ~tabell" ; - Text [ danish ] = "Kopier hele arket" ; + Text [ danish ] = "Kopier hele ~tabellen" ; Text [ italian ] = "Copia intera tabella" ; Text [ spanish ] = "Copiar toda la hoja" ; - Text [ french ] = "~Copier la feuille entière" ; + Text [ french ] = "Copier la feuille entière" ; Text [ dutch ] = "Hele ~tabel kopiëren" ; Text [ portuguese ] = "Copiar ~tabela inteira" ; Text[ chinese_simplified ] = "å¤åˆ¶æ•´ä¸ªå·¥ä½œè¡¨"; Text[ russian ] = "Êîïèðîâàòü âåñü ëèñò"; Text[ polish ] = "Kopiuj ca³y arkusz"; - Text[ japanese ] = "表全体をｺﾋﾟｰ"; + Text[ japanese ] = "表全体をコピー"; Text[ chinese_traditional ] = "複製整個工作表"; Text[ arabic ] = "äÓÎ ßá ÇáÌÏæá"; Text[ greek ] = "Áí~ôéãñáöÞ ïëüêëçñïõ ðßíáêá"; - Text[ korean ] = "ëª¨ë“ í…Œì´ë¸” 복사"; + Text[ korean ] = "ëª¨ë“ í‘œ 복사"; Text[ turkish ] = "Tablonun tümünü kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar toda la hoja"; - Text[ finnish ] = "Kopioi koko lomake"; + Text[ catalan ] = "Copia tot el full"; + Text[ finnish ] = "Kopioi koko taulukko"; + Text[ thai ] = "คัดลà¸à¸à¸—ั้งà¹à¸œà¹ˆà¸™à¸‡à¸²à¸™"; }; String STR_EDIT { @@ -312,15 +318,16 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ chinese_simplified ] = "编辑方案"; Text[ russian ] = "Ïðàâêà ñöåíàðèÿ"; Text[ polish ] = "Edytuj scenariusz"; - Text[ japanese ] = "ｼﾅﾘｵã®ç·¨é›†"; + Text[ japanese ] = "シナリオã®ç·¨é›†"; Text[ chinese_traditional ] = "編輯分æžè—本"; Text[ arabic ] = "ÊÍÑíÑ ÇáÓíäÇÑíæ"; Text[ greek ] = "Åðåîåñãáóßá óåíáñßïõ"; Text[ korean ] = "시나리오 편집"; Text[ turkish ] = "Senaryoyu düzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar escenario"; - Text[ finnish ] = "Muokkaa skenaariota"; + Text[ catalan ] = "Edita l'escenari"; + Text[ finnish ] = "Muuta skenaariota"; + Text[ thai ] = "à¹à¸à¹‰à¹„ขสถานà¸à¸²à¸£à¸“์สมมติ"; }; String STR_CREATEDBY { @@ -330,7 +337,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text [ DANISH ] = "Oprettet af" ; Text [ ENGLISH_US ] = "Created by" ; Text [ SPANISH ] = "Creado por" ; - Text [ FINNISH ] = "Laatija" ; + Text [ FINNISH ] = "Tekijä" ; Text [ FRENCH ] = "Créé par" ; Text [ ITALIAN ] = "Creato da" ; Text [ DUTCH ] = "Gemaakt door" ; @@ -344,10 +351,11 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ chinese_traditional ] = "作者"; Text[ arabic ] = "ÃäÔà ÇáÓíäÇÑíæ"; Text[ greek ] = "ÄçìéïõñãÞèçêå áðü"; - Text[ korean ] = "ë¡œ 만들기"; + Text[ korean ] = "작성ìž"; Text[ turkish ] = "Yazan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Creado por"; + Text[ catalan ] = "Creat per"; + Text[ thai ] = "สร้างโดย"; }; String STR_ON { @@ -357,7 +365,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text [ DANISH ] = "den" ; Text [ ENGLISH_US ] = "on" ; Text [ SPANISH ] = "en" ; - Text [ FINNISH ] = "on" ; + Text [ FINNISH ] = "käytössä" ; Text [ FRENCH ] = "le" ; Text [ ITALIAN ] = "il" ; Text [ DUTCH ] = "op" ; @@ -371,10 +379,11 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ chinese_traditional ] = "日期："; Text[ arabic ] = "ÈÊÇÑíÎ"; Text[ greek ] = "ôéò"; - Text[ korean ] = "위치"; + Text[ korean ] = "ë‚ ì§œ"; Text[ turkish ] = "tarih:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "en"; + Text[ catalan ] = "el"; + Text[ thai ] = "บน"; }; FixedLine FL_NAME { @@ -386,7 +395,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ italian ] = "Nome dello scenario"; Text[ portuguese_brazilian ] = "Name des Szenarios"; Text[ portuguese ] = "~Nome do cenário"; - Text[ danish ] = "Scenariets navn"; + Text[ danish ] = "~Navn på scenario"; Text[ french ] = "~Nom du scénario"; Text[ swedish ] = "~Namn på scenariot"; Text[ dutch ] = "~Naam van het scenario"; @@ -394,15 +403,16 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ chinese_simplified ] = "方案å称"; Text[ russian ] = "Íàçâàíèå ñöåíàðèÿ"; Text[ polish ] = "Nazwa scenariusza"; - Text[ japanese ] = "ｼﾅﾘｵå"; + Text[ japanese ] = "シナリオå"; Text[ chinese_traditional ] = "分æžè—本的å稱"; Text[ arabic ] = "ÇÓã ÇáÓíäÇÑíæ"; Text[ greek ] = "¼~íïìá óåíáñßïõ"; Text[ korean ] = "시나리오 ì´ë¦„"; Text[ turkish ] = "Senaryonun adý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre del escenario"; + Text[ catalan ] = "Nom de l'escenari"; Text[ finnish ] = "Skenaarion nimi"; + Text[ thai ] = "ชื่à¸à¸ªà¸–านà¸à¸²à¸£à¸“์สมมติ"; }; FixedLine FL_COMMENT { @@ -414,23 +424,24 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ italian ] = "~Commento"; Text[ portuguese_brazilian ] = "Kommentar"; Text[ portuguese ] = "~Comentário"; - Text[ danish ] = "Kommentar"; - Text[ french ] = "~Commentaire"; + Text[ danish ] = "~Kommentar"; + Text[ french ] = "Commentaire"; Text[ swedish ] = "~Kommentar"; - Text[ dutch ] = "~Commentaar"; + Text[ dutch ] = "~Opmerkingen"; Text[ spanish ] = "Comentario"; Text[ chinese_simplified ] = "注解"; Text[ russian ] = "Êîììåíòàðèè"; Text[ polish ] = "Komentarz"; - Text[ japanese ] = "ｺﾒï¾ï¾„"; + Text[ japanese ] = "コメント"; Text[ chinese_traditional ] = "註解"; Text[ arabic ] = "ÇáÊÚáíÞ"; Text[ greek ] = "Ó÷üëéï"; - Text[ korean ] = "주ì„"; + Text[ korean ] = "설명"; Text[ turkish ] = "Açýklama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comentario"; - Text[ finnish ] = "Kommentti"; + Text[ catalan ] = "Comentari"; + Text[ finnish ] = "Huomautus"; + Text[ thai ] = "ข้à¸à¸„ิดเห็น"; }; FixedLine FL_OPTIONS { @@ -457,20 +468,22 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text[ korean ] = "ì„¤ì •"; Text[ turkish ] = "Ayarlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Configuración"; + Text[ catalan ] = "Configuració"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ค่า"; }; Text[ chinese_simplified ] = "建立方案"; Text[ russian ] = "Ñîçäàòü ñöåíàðèé"; Text[ polish ] = "Utwórz scenariusz"; - Text[ japanese ] = "ｼﾅﾘｵã®ä½œæˆ"; + Text[ japanese ] = "シナリオã®ä½œæˆ"; Text[ chinese_traditional ] = "建立分æžè—本"; Text[ arabic ] = "ÅäÔÇÁ ÓíäÇÑíæ"; Text[ greek ] = "Äçìéïõñãßá óåíáñßïõ"; Text[ korean ] = "시나리오 만들기"; Text[ turkish ] = "Senaryo oluþtur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Crear escenario"; + Text[ catalan ] = "Crea un escenari"; + Text[ thai ] = "สร้างสถานà¸à¸²à¸£à¸“์สมมติ"; }; @@ -485,3 +498,9 @@ ModalDialog RID_SCDLG_NEWSCENARIO + + + + + + diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 52fe17a56d6c..7bf91633223b 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpsort.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: nn $ $Date: 2001-08-03 16:43:02 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -712,15 +712,8 @@ void ScTabPageSortOptions::Init() // get available languages + aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE ); aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM ); - uno::Sequence<lang::Locale> xLoc = LocaleDataWrapper::getInstalledLocaleNames(); - sal_Int32 nCount = xLoc.getLength(); - for ( sal_Int32 i=0; i<nCount; i++ ) - { - LanguageType eLang = ConvertIsoNamesToLanguage( xLoc[i].Language, - xLoc[i].Country ); - aLbLanguage.InsertLanguage( eLang ); - } } //------------------------------------------------------------------------ diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src index cd9c6a11b1a8..2fb1abdfa413 100644 --- a/sc/source/ui/dbgui/validate.src +++ b/sc/source/ui/dbgui/validate.src @@ -2,9 +2,9 @@ * * $RCSfile: validate.src,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2001-11-16 22:53:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,14 +86,14 @@ TabDialog TAB_DLG_VALIDATION Text [ ENGLISH ] = "Criteria" ; Text[ english_us ] = "Criteria"; Text[ portuguese ] = "Critérios"; - Text[ russian ] = "Êðèòåðèè"; + Text[ russian ] = "Êðèòåðèé"; Text[ greek ] = "ÊñéôÞñéá"; Text[ dutch ] = "Criteria"; Text[ french ] = "Critères"; Text[ spanish ] = "Criterios"; - Text[ finnish ] = "Arvot"; + Text[ finnish ] = "Ehto"; Text[ italian ] = "Criteri"; - Text[ danish ] = "Værdier"; + Text[ danish ] = "Kriterier"; Text[ swedish ] = "Kriterier"; Text[ polish ] = "Kryteria"; Text[ portuguese_brazilian ] = "Werte"; @@ -103,7 +103,8 @@ TabDialog TAB_DLG_VALIDATION Text[ chinese_traditional ] = "æ¢ä»¶"; Text[ turkish ] = "Deðerler"; Text[ arabic ] = "ÇáÞíã"; - Text[ catalan ] = "Valores"; + Text[ catalan ] = "Valors"; + Text[ thai ] = "ค่า"; }; PageItem { @@ -121,16 +122,17 @@ TabDialog TAB_DLG_VALIDATION Text [ portuguese ] = "Ajuda de entrada" ; Text [ portuguese_brazilian ] = "Eingabehilfe" ; Text[ chinese_simplified ] = "输入帮助"; - Text[ russian ] = "Ïîìîùü ââîäà"; + Text[ russian ] = "Ïîìîùü ïðè ââîäå"; Text[ polish ] = "Pomoc przy wprow."; - Text[ japanese ] = "入力時ﾒｯｾｰｼﾞ"; + Text[ japanese ] = "入力時メッセージ"; Text[ chinese_traditional ] = "輸入說明"; Text[ arabic ] = "ãÓÇÚÏÉ ÇáÅÏÎÇá"; Text[ greek ] = "ÂïÞèåéá åéóáãùãÞò"; Text[ korean ] = "ë„ì›€ë§ ì‚½ìž…"; Text[ turkish ] = "Giriþ yardýmý"; - Text[ catalan ] = "Ayuda de entrada"; - Text[ finnish ] = "Sy?t?hje"; + Text[ catalan ] = "Ajuda de l'entrada"; + Text[ finnish ] = "Syöttöohje"; + Text[ thai ] = "ป้à¸à¸™à¸•à¸±à¸§à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸"; }; PageItem { @@ -148,16 +150,17 @@ TabDialog TAB_DLG_VALIDATION Text [ portuguese ] = "Mensagem de erro" ; Text [ portuguese_brazilian ] = "Fehlermeldung" ; Text[ chinese_simplified ] = "错误报告"; - Text[ russian ] = "Ñîîáùåíèå îá îøèáêå"; + Text[ russian ] = "Äåéñòâèÿ ïðè îøèáêå"; Text[ polish ] = "Komunikat o b³êdzie"; - Text[ japanese ] = "ｴﾗｰﾒｯｾｰｼﾞ"; + Text[ japanese ] = "エラーメッセージ"; Text[ chinese_traditional ] = "éŒ¯èª¤å ±å‘Š"; Text[ arabic ] = "ÑÓÇáÉ ÎØÃ"; Text[ greek ] = "ÌÞíõìá óöÜëìáôïò"; Text[ korean ] = "오류 메시지"; Text[ turkish ] = "Hata iletisi"; - Text[ catalan ] = "Mensaje de error"; - Text[ finnish ] = "Virheh?lytys"; + Text[ catalan ] = "Avís d'error"; + Text[ finnish ] = "Virhehälytys"; + Text[ thai ] = "เตืà¸à¸™à¸‚้à¸à¸œà¸´à¸”พลาด"; }; }; }; @@ -171,16 +174,17 @@ TabDialog TAB_DLG_VALIDATION Text [ portuguese ] = "Validade" ; Text [ portuguese_brazilian ] = "G?tigkeit" ; Text[ chinese_simplified ] = "有效性"; - Text[ russian ] = "Ïðîâåðêà"; + Text[ russian ] = "Ïðîâåðêà ââîäèìûõ çíà÷åíèé"; Text[ polish ] = "Wa¿noœæ"; - Text[ japanese ] = "ﾃﾞｰﾀã®å…¥åŠ›è¦å‰‡"; + Text[ japanese ] = "データã®å…¥åŠ›è¦å‰‡"; Text[ chinese_traditional ] = "有效"; Text[ arabic ] = "ÇáÕáÇÍíÉ"; Text[ greek ] = "Éó÷ýò"; Text[ korean ] = "ìœ íš¨ì„±"; Text[ turkish ] = "Geçerlilik"; - Text[ catalan ] = "Validez"; + Text[ catalan ] = "Validesa"; Text[ finnish ] = "Kelpoisuus"; + Text[ thai ] = "ใช้ได้"; }; TabPage TP_VALIDATION_VALUES @@ -199,14 +203,14 @@ TabPage TP_VALIDATION_VALUES Text [ dutch ] = "~Toestaan" ; Text [ english_us ] = "~Allow" ; Text [ swedish ] = "T~illåt" ; - Text [ danish ] = "Tillad" ; + Text [ danish ] = "T~illad" ; Text [ italian ] = "Permetti" ; Text [ spanish ] = "Per~mitir" ; Text [ french ] = "~Autoriser" ; Text [ portuguese_brazilian ] = "~Zulassen" ; Text [ portuguese ] = "~Permitir" ; Text[ chinese_simplified ] = "å…许(~A)"; - Text[ russian ] = "Ðàçðåøèòü"; + Text[ russian ] = "Äîïóñòèìûé òèï äàííûõ"; Text[ polish ] = "Pozwól"; Text[ japanese ] = "入力値ã®ç¨®é¡ž(~A)"; Text[ chinese_traditional ] = "å…許(~A)"; @@ -214,8 +218,9 @@ TabPage TP_VALIDATION_VALUES Text[ greek ] = "Íá åðéôñáðåß"; Text[ korean ] = "허용(~A)"; Text[ turkish ] = "~Geçerli"; - Text[ catalan ] = "Per~mitir"; + Text[ catalan ] = "~Permet"; Text[ finnish ] = "~Salli"; + Text[ thai ] = "~à¸à¸™à¸¸à¸à¸²à¸•"; }; ListBox LB_ALLOW { @@ -300,7 +305,7 @@ TabPage TP_VALIDATION_VALUES }; stringlist [ spanish ] = { - < "Cada valor" ; Default ; > ; + < "Todos los valores" ; Default ; > ; < "Entero" ; Default ; > ; < "Decimal" ; Default ; > ; < "Fecha" ; Default ; > ; @@ -318,7 +323,7 @@ TabPage TP_VALIDATION_VALUES }; stringlist [ dutch ] = { - < "Iedere waarde" ; Default ; > ; + < "Elke waarde" ; Default ; > ; < "Geheel getal" ; Default ; > ; < "Decimaal" ; Default ; > ; < "Datum" ; Default ; > ; @@ -338,7 +343,7 @@ TabPage TP_VALIDATION_VALUES { < "Âñå çíà÷åíèÿ" ; Default ; > ; < "Öåëîå ÷èñëî" ; Default ; > ; - < "Äðîáü" ; Default ; > ; + < "Äåñÿòè÷íûé" ; Default ; > ; < "Äàòà" ; Default ; > ; < "Âðåìÿ" ; Default ; > ; < "Äëèíà òåêñòà" ; Default ; > ; @@ -359,7 +364,7 @@ TabPage TP_VALIDATION_VALUES < "å°æ•°" ; Default ; > ; < "日付" ; Default ; > ; < "時刻" ; Default ; > ; - < "ﾃｷｽﾄã®é•·ã•" ; Default ; > ; + < "テã‚ストã®é•·ã•" ; Default ; > ; }; StringList [ chinese_traditional ] = { @@ -391,11 +396,11 @@ TabPage TP_VALIDATION_VALUES StringList [ korean ] = { < "ëª¨ë“ ê°’" ; Default ; > ; - < "ì „ì²´ 수" ; Default ; > ; + < "ì „ì²´ ê°’" ; Default ; > ; < "소수" ; Default ; > ; < "ë‚ ì§œ" ; Default ; > ; < "시간" ; Default ; > ; - < "í…스트 í¬ê¸°" ; Default ; > ; + < "í…스트 길ì´" ; Default ; > ; }; StringList [ language_user1 ] = { @@ -417,22 +422,31 @@ TabPage TP_VALIDATION_VALUES }; StringList [ catalan ] = { - < "Cada valor" ; Default ; > ; - < "Entero" ; Default ; > ; + < "Tots els valors" ; Default ; > ; + < "Números complets" ; Default ; > ; < "Decimal" ; Default ; > ; - < "Fecha" ; Default ; > ; + < "Data" ; Default ; > ; < "Hora" ; Default ; > ; - < "Longitud del texto" ; Default ; > ; + < "Longitud del text" ; Default ; > ; }; StringList [ finnish ] = { < "Kaikki arvot" ; Default ; > ; < "Kokonaiset luvut" ; Default ; > ; < "Desimaali" ; Default ; > ; - < "P?iv?m??r?" ; Default ; > ; + < "PÄIVÄYS" ; Default ; > ; < "Aika" ; Default ; > ; < "Tekstin pituus" ; Default ; > ; }; + StringList [ thai ] = + { + < "ค่าทั้งหมด" ; Default ; > ; + < "ตัวเลขทั้งหมด" ; Default ; > ; + < "ทศนิยม" ; Default ; > ; + < "วันที่" ; Default ; > ; + < "เวลา" ; Default ; > ; + < "ความยาวข้à¸à¸„วาม" ; Default ; > ; + }; }; FixedText FT_VALUE { @@ -445,21 +459,22 @@ TabPage TP_VALIDATION_VALUES Text [ danish ] = "Data" ; Text [ italian ] = "~Dati" ; Text [ spanish ] = "~Datos" ; - Text [ french ] = "~Données" ; + Text [ french ] = "Données" ; Text [ dutch ] = "~Gegevens" ; Text [ portuguese ] = "~Dados" ; Text [ portuguese_brazilian ] = "~Daten" ; Text[ chinese_simplified ] = "æ•°æ®(~D)"; - Text[ russian ] = "Äàííûå"; + Text[ russian ] = "Óñëîâèå"; Text[ polish ] = "Dane"; - Text[ japanese ] = "ﾃﾞｰﾀ(~D)"; + Text[ japanese ] = "データ(~D)"; Text[ chinese_traditional ] = "資料(~D)"; Text[ arabic ] = "ÈíÇäÇÊ"; Text[ greek ] = "ÄåäïìÝíá"; Text[ korean ] = "ë°ì´í„°(~D)"; Text[ turkish ] = "~Veriler"; - Text[ catalan ] = "~Datos"; - Text[ finnish ] = "~Tiedot"; + Text[ catalan ] = "~Dades"; + Text[ finnish ] = "Tie~dot"; + Text[ thai ] = "~ข้à¸à¸¡à¸¹à¸¥"; }; ListBox LB_VALUE { @@ -610,7 +625,7 @@ TabPage TP_VALIDATION_VALUES < "áîëüøå ÷åì" ; Default ; > ; < "ìåíüøå èëè ðàâíî" ; Default ; > ; < "áîëüøå èëè ðàâíî" ; Default ; > ; - < "íåðàâíî" ; Default ; > ; + < "íå ðàâíî" ; Default ; > ; < "ìåæäó" ; Default ; > ; < "âíå" ; Default ; > ; }; @@ -671,14 +686,14 @@ TabPage TP_VALIDATION_VALUES }; StringList [ korean ] = { - < "다ìŒê³¼ ê°™ìŒ" ; Default ; > ; - < "..보다 작다" ; Default ; > ; - < "..보다 í¬ë‹¤" ; Default ; > ; - < "작거나 같다" ; Default ; > ; - < "í¬ê±°ë‚˜ ë™ì¼" ; Default ; > ; - < "같지 ì•ŠìŒ" ; Default ; > ; - < "다ìŒì˜ 사ì´ìž„" ; Default ; > ; - < "다ìŒì˜ 사ì´ê°€ 아님" ; Default ; > ; + < "ì§€ì •í•œ ê°’ê³¼ ê°™ìŒ" ; Default ; > ; + < "미만" ; Default ; > ; + < "초과" ; Default ; > ; + < "ì´í•˜" ; Default ; > ; + < "ë‹¤ìŒ ê°’ ì´ìƒ" ; Default ; > ; + < "ì§€ì •í•œ ì¡°ê±´ê³¼ 다름" ; Default ; > ; + < "ë‹¤ìŒ ë‚ ì§œ 사ì´" ; Default ; > ; + < "ë‹¤ìŒ ê°’ 사ì´ì— ì—†ìŒ" ; Default ; > ; }; StringList [ language_user1 ] = { @@ -705,24 +720,35 @@ TabPage TP_VALIDATION_VALUES StringList [ catalan ] = { < "igual" ; Default ; > ; - < "menor que" ; Default ; > ; - < "mayor que" ; Default ; > ; - < "menor o igual que" ; Default ; > ; - < "mayor o igual que" ; Default ; > ; - < "distinto de" ; Default ; > ; + < "més petit que" ; Default ; > ; + < "més gran que" ; Default ; > ; + < "més petit o igual" ; Default ; > ; + < "més gran o igual" ; Default ; > ; + < "diferent" ; Default ; > ; < "entre" ; Default ; > ; < "no entre" ; Default ; > ; }; StringList [ finnish ] = { - < "yht?suuri" ; Default ; > ; - < "v?hemm?n kuin" ; Default ; > ; + < "yhtä suuri" ; Default ; > ; + < "pienempi kuin" ; Default ; > ; < "suurempi kuin" ; Default ; > ; - < "pienempi tai yht?suuri" ; Default ; > ; - < "suurempi tai yhtäsuuri" ; Default ; > ; - < "ei yht?suuri" ; Default ; > ; - < "V?liss?" ; Default ; > ; - < "ei v?liss?" ; Default ; > ; + < "pienempi tai yhtä suuri kuin" ; Default ; > ; + < "suurempi tai yhtä suuri kuin" ; Default ; > ; + < "eri suuri" ; Default ; > ; + < "välillä" ; Default ; > ; + < "ei väliltä" ; Default ; > ; + }; + StringList [ thai ] = + { + < "เท่าà¸à¸±à¸š" ; Default ; > ; + < "น้à¸à¸¢à¸à¸§à¹ˆà¸²" ; Default ; > ; + < "มาà¸à¸à¸§à¹ˆà¸²" ; Default ; > ; + < "น้à¸à¸¢à¸à¸§à¹ˆà¸²à¸«à¸£à¸·à¸à¹€à¸—่าà¸à¸±à¸š" ; Default ; > ; + < "มาà¸à¸à¸§à¹ˆà¸²à¸«à¸£à¸·à¸à¹€à¸—่าà¸à¸±à¸š" ; Default ; > ; + < "ไม่เท่าà¸à¸±à¸š" ; Default ; > ; + < "ระหว่าง" ; Default ; > ; + < "ไม่à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡" ; Default ; > ; }; }; FixedText FT_MIN @@ -749,8 +775,9 @@ TabPage TP_VALIDATION_VALUES Text[ greek ] = "ÅëÜ÷éóôï"; Text[ korean ] = "최소(~M)"; Text[ turkish ] = "A~sgari"; - Text[ catalan ] = "~Mínimo"; - Text[ finnish ] = "~V?hint??n"; + Text[ catalan ] = "~Mínim"; + Text[ finnish ] = "~Vähintään"; + Text[ thai ] = "~น้à¸à¸¢à¸—ี่สุด"; }; Edit EDT_MIN { @@ -783,8 +810,9 @@ TabPage TP_VALIDATION_VALUES Text[ greek ] = "ÌÝãéóôï"; Text[ korean ] = "최대(~X)"; Text[ turkish ] = "A~zami"; - Text[ catalan ] = "M~áximo"; - Text[ finnish ] = "~Enint??n"; + Text[ catalan ] = "Mà~xim"; + Text[ finnish ] = "~Enintään"; + Text[ thai ] = "มา~à¸à¸—ี่สุด"; }; Edit EDT_MAX { @@ -810,16 +838,17 @@ TabPage TP_VALIDATION_VALUES Text [ portuguese_brazilian ] = "~Leerzellen zulassen" ; Text [ portuguese ] = "~Permitir células vazias" ; Text[ chinese_simplified ] = "å…许空å•å…ƒæ ¼(~B)"; - Text[ russian ] = "Ïðîïóñê ïóñòûõ ÿ÷ååê"; + Text[ russian ] = "Äîïóñêàòü ïóñòûå"; Text[ polish ] = "Dopuœæ puste komórki"; - Text[ japanese ] = "空白ｾﾙを許å¯ã™ã‚‹(~B)"; + Text[ japanese ] = "空白セルを許å¯ã™ã‚‹(~B)"; Text[ chinese_traditional ] = "å…è¨±ç©ºæ ¼(~B)"; Text[ arabic ] = "ÇáÓãÇÍ ÈÇáÎáÇíÇ ÇáÝÇÑÛÉ"; Text[ greek ] = "Íá åðéôñáðïýí êåíÜ êåëéÜ"; - Text[ korean ] = "블ëží¬ 허용(~B)"; + Text[ korean ] = "공백 허용(~B)"; Text[ turkish ] = "~Boþ hücre geçerli"; - Text[ catalan ] = "~Permitir celdas vacías"; - Text[ finnish ] = "~Salli tyhj?t merkit"; + Text[ catalan ] = "Permet espais en ~blanc"; + Text[ finnish ] = "Sa~lli tyhjät merkit"; + Text[ thai ] = "ให้มี~ช่à¸à¸‡à¸§à¹ˆà¸²à¸‡"; }; Text [ dutch ] = "Waarden" ; Text [ english_us ] = "Values" ; @@ -839,8 +868,9 @@ TabPage TP_VALIDATION_VALUES Text[ greek ] = "ÔéìÝò"; Text[ korean ] = "ê°’"; Text[ turkish ] = "Deðerler"; - Text[ catalan ] = "Valores"; + Text[ catalan ] = "Valors"; Text[ finnish ] = "Arvot"; + Text[ thai ] = "ค่า"; }; TabPage TP_VALIDATION_INPUTHELP @@ -859,23 +889,24 @@ TabPage TP_VALIDATION_INPUTHELP Text [ dutch ] = "I~nvoerhulp bij selectie van een cel aanbieden" ; Text [ english_us ] = "~Show input help when cell is selected" ; Text [ swedish ] = "Erbjud ~inmatningshjälp vid markering av en cell" ; - Text [ danish ] = "Tilbyd inputhjælp ved markering af en celle" ; + Text [ danish ] = "T~ilbyd inputhjælp ved markering af en celle" ; Text [ italian ] = "Offri aiuti per la digitazione nella cella" ; Text [ spanish ] = "~Mostrar Ayuda de entrada al seleccionar una celda" ; - Text [ french ] = "~Aide à la saisie lors de la sélection de cellules" ; + Text [ french ] = "Aide à la saisie si sélection d'une cellule" ; Text [ portuguese_brazilian ] = "E~ingabehilfen bei Selektion einer Zelle anbieten" ; Text [ portuguese ] = "~Mostrar ajuda de entrada quando seleccionar célula" ; Text[ chinese_simplified ] = "在选ä¸å•å…ƒæ ¼æ—¶æ˜¾ç¤ºè¾“入帮助(~S)"; - Text[ russian ] = "Ïðåäëàãàòü ïîìîùü ââîäà ïðè âûäåëåíèè ÿ÷åéêè"; + Text[ russian ] = "Ïîêàçûâàòü ïîìîùü ïðè ââîäå ïðè âûäåëåíèè ÿ÷åéêè"; Text[ polish ] = "Z~aproponuj pomoc przy wprowadzaniu w przypadku zaznaczonej komórki"; - Text[ japanese ] = "ｾﾙã®é¸æŠžæ™‚ã«ï¾’ｯｾｰｼﾞを表示ã™ã‚‹(~S)"; + Text[ japanese ] = "セルã®é¸æŠžæ™‚ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹(~S)"; Text[ chinese_traditional ] = "在é¸å–儲å˜æ ¼æ™‚顯示輸入說明(~S)"; Text[ arabic ] = "ÅÙåÇÑ ãÓÇÚÏÉ ÇáÅÏÎÇá ÚäÏ ÊÍÏíÏ ÇáÎáíÉ"; Text[ greek ] = "ÅìöÜí~éóç âïÞèåéáò åéóáãùãÞò êáôÜ ôçí åðéëïãÞ åíüò êåëéïý"; Text[ korean ] = "ì…€ ì„ íƒì‹œ ë„ì›€ë§ ìž…ë ¥ ì œê³µ(~S)"; Text[ turkish ] = "Hücre se~çildiðinde giriþ yardýmý öner"; - Text[ catalan ] = "~Mostrar Ayuda de entrada al seleccionar una celda"; - Text[ finnish ] = "~N?yt? sy?t?hje, kun solu on valittuna"; + Text[ catalan ] = "Mo~stra l'ajuda d'entrada quan se seleccioni la cel.la"; + Text[ finnish ] = "~Näytä syöttöohje, kun solu on valittuna"; + Text[ thai ] = "à¹~สดงà¸à¸²à¸£à¸›à¹‰à¸à¸™à¸•à¸±à¸§à¸Šà¹ˆà¸§à¸¢à¹€à¸¡à¸·à¹ˆà¸à¹€à¸¥à¸·à¸à¸à¹€à¸‹à¸¥à¸¥à¹Œ"; }; FixedLine FL_CONTENT { @@ -901,8 +932,9 @@ TabPage TP_VALIDATION_INPUTHELP Text[ greek ] = "Ðåñéå÷üìåíá"; Text[ korean ] = "ë‚´ìš©"; Text[ turkish ] = "Ýçerik"; - Text[ catalan ] = "Contenido"; + Text[ catalan ] = "Contingut"; Text[ finnish ] = "Sisältö"; + Text[ thai ] = "เนื้à¸à¸«à¸²"; }; FixedText FT_TITLE { @@ -915,21 +947,22 @@ TabPage TP_VALIDATION_INPUTHELP Text [ danish ] = "Titel" ; Text [ italian ] = "~Titolo" ; Text [ spanish ] = "~Título" ; - Text [ french ] = "~Titre" ; + Text [ french ] = "Titre" ; Text [ dutch ] = "~Titel" ; Text [ portuguese ] = "~Título" ; Text [ portuguese_brazilian ] = "~Titel" ; Text[ chinese_simplified ] = "æ ‡é¢˜(~T)"; Text[ russian ] = "Çàãîëîâîê"; Text[ polish ] = "Tytu³"; - Text[ japanese ] = "ﾀｲﾄﾙ(~T)"; + Text[ japanese ] = "タイトル(~T)"; Text[ chinese_traditional ] = "標題(~T)"; Text[ arabic ] = "ÇáÚäæÇä"; Text[ greek ] = "~Ôßôëïò"; Text[ korean ] = "ì œëª©(~T)"; Text[ turkish ] = "~Baþlýk"; - Text[ catalan ] = "~Título"; + Text[ catalan ] = "~Títol"; Text[ finnish ] = "~Otsikko"; + Text[ thai ] = "~ชื่à¸à¹€à¸£à¸·à¹ˆà¸à¸‡"; }; FixedText FT_INPUTHELP { @@ -943,20 +976,21 @@ TabPage TP_VALIDATION_INPUTHELP Text [ danish ] = "Inputhjælp" ; Text [ italian ] = "Aiuto per la digitazione" ; Text [ spanish ] = "Ayuda de ~entrada" ; - Text [ french ] = "~Aide à la saisie" ; + Text [ french ] = "Aide à la saisie" ; Text [ portuguese_brazilian ] = "~Eingabehilfe" ; Text [ portuguese ] = "~Ajuda de entradas" ; Text[ chinese_simplified ] = "输入帮助(~I)"; - Text[ russian ] = "Ïîìîùü ââîäà"; + Text[ russian ] = "Ïîìî~ùü ïðè ââîäå"; Text[ polish ] = "Pomoc przy wprow."; - Text[ japanese ] = "入力時ﾒｯｾｰｼﾞ(~I)"; + Text[ japanese ] = "入力時メッセージ(~I)"; Text[ chinese_traditional ] = "輸入說明(~I)"; Text[ arabic ] = "ãÓÇÚÏÉ ÇáÅÏÎÇá"; Text[ greek ] = "ÂïÞèåéá ~åéóáãùãÞò"; Text[ korean ] = "ë„ì›€ë§ ì‚½ìž…(~I)"; Text[ turkish ] = "~Giriþ yardýmý"; - Text[ catalan ] = "Ayuda de ~entrada"; - Text[ finnish ] = "~Sy?t?hje"; + Text[ catalan ] = "~Ajuda de l'entrada"; + Text[ finnish ] = "~Syöttöohje"; + Text[ thai ] = "~ป้à¸à¸™à¸•à¸±à¸§à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸"; }; Edit EDT_TITLE { @@ -1007,8 +1041,9 @@ TabPage TP_VALIDATION_ERROR Text[ greek ] = "Ðåñéå÷üìåíá"; Text[ korean ] = "ë‚´ìš©"; Text[ turkish ] = "Ýçerik"; - Text[ catalan ] = "Contenido"; + Text[ catalan ] = "Contingut"; Text[ finnish ] = "Sisältö"; + Text[ thai ] = "เนื้à¸à¸«à¸²"; }; TriStateBox TSB_SHOW { @@ -1021,23 +1056,24 @@ TabPage TP_VALIDATION_ERROR Text [ dutch ] = "Fout~melding bij invoer van ongeldige gegevens weergeven" ; Text [ english_us ] = "Show error ~message when invalid values are entered" ; Text [ swedish ] = "Visa fel~meddelande när ogiltiga värden matas in" ; - Text [ danish ] = "Vis fejlmelding ved input af ugyldige værdier" ; + Text [ danish ] = "Vis fejl~meddelelse ved indtastning af ugyldige værdier" ; Text [ italian ] = "~Mostra messaggio di errore se si digitano dei valori non validi" ; Text [ spanish ] = "Mostrar mensaje de ~error al introducir valores incorrectos" ; - Text [ french ] = "~Message d'erreur en cas de saisie de valeurs incorrectes" ; + Text [ french ] = "Message d'erreur en cas de saisie de valeurs incorrectes" ; Text [ portuguese_brazilian ] = "~Fehlermeldung bei Eingabe ung?tiger Werte anzeigen" ; Text [ portuguese ] = "~Mostrar mensagem de erro ao introduzir valores incorrectos" ; Text[ chinese_simplified ] = "è¾“å…¥æ— æ•ˆæ•°å€¼æ—¶æ˜¾ç¤ºé”™è¯¯æŠ¥å‘Š(~M)"; - Text[ russian ] = "Âûäàâàòü ñîîáùåíèå îá îøèáêå ïðè ââîäå íåäîïóñòèìûõ çíà÷åíèé"; + Text[ russian ] = "Ïîêàçûâàòü ñîîáùåíèå îá îøèáêå ïðè ââîäå íåäîïóñòèìûõ çíà÷åíèé"; Text[ polish ] = "Poka¿ ko~munikat o b³êdzie po wpisaniu nieprawid³owych wartoœci"; - Text[ japanese ] = "無効ãªå€¤ã®å…¥åŠ›æ™‚ã«ï½´ï¾—ｰﾒｯｾｰｼﾞを表示ã™ã‚‹(~M)"; + Text[ japanese ] = "無効ãªå€¤ã®å…¥åŠ›æ™‚ã«ã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹(~M)"; Text[ chinese_traditional ] = "åœ¨è¼¸å…¥ç„¡æ•ˆæ•¸å€¼æ™‚é¡¯ç¤ºéŒ¯èª¤å ±å‘Š(~M)"; Text[ arabic ] = "ÅÙåÇÑ ÑÓÇáÉ ÎØà ÚäÏ ÅÏÎÇá Þíã ÛíÑ ÕÇáÍÉ"; Text[ greek ] = "Å~ìöÜíéóç ìçíýìáôïò óöÜëìáôïò óå ðåñßðôùóç åéóáãùãÞò ìç Ýãêõñùí ôéìþí"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ê°’ ìž…ë ¥ì‹œ 오류 메시지 표시(~M)"; + Text[ korean ] = "ìž˜ëª»ëœ ê°’ ìž…ë ¥ì‹œ 오류 메시지 표시(~M)"; Text[ turkish ] = "~Geçersiz deðer girildiðinde hata iletisi görüntüle"; - Text[ catalan ] = "Mostrar mensaje de ~error al entrar valores incorrectos"; - Text[ finnish ] = "~Näytä virhesanoma, kun virheellisiä arvoja syötetään"; + Text[ catalan ] = "Mostra un ~missatge d'error quan s'introdueixen valors no vàlids"; + Text[ finnish ] = "Näytä virhe~sanoma virheellisten arvojen syöttämisestä"; + Text[ thai ] = "à¹à¸ªà¸”ง~ข้à¸à¸„วามที่ผิดพลาดเมื่à¸à¹ƒà¸ªà¹ˆà¸„่าที่ไม่ถูà¸à¸•à¹‰à¸à¸‡"; }; MultiLineEdit EDT_ERROR { @@ -1066,21 +1102,22 @@ TabPage TP_VALIDATION_ERROR Text [ danish ] = "Fejlmelding" ; Text [ italian ] = "Messaggio di errore" ; Text [ spanish ] = "~Mensaje de error" ; - Text [ french ] = "~Message d'erreur" ; + Text [ french ] = "Message d'erreur" ; Text [ dutch ] = "~Foutmelding" ; Text [ portuguese ] = "~Mensagem de erro" ; Text [ portuguese_brazilian ] = "~Fehlermeldung" ; Text[ chinese_simplified ] = "错误报告(~E)"; Text[ russian ] = "Ñîîáùåíèå îá îøèáêå"; Text[ polish ] = "Komunikat o b³êdzie"; - Text[ japanese ] = "ｴﾗｰﾒｯｾｰｼﾞ(~E)"; + Text[ japanese ] = "エラーメッセージ(~E)"; Text[ chinese_traditional ] = "éŒ¯èª¤å ±å‘Š(~E)"; Text[ arabic ] = "ÑÓÇáÉ ÎØÃ"; Text[ greek ] = "ÌÞíõìá óöÜëìáôïò"; Text[ korean ] = "오류 메시지(~E)"; Text[ turkish ] = "~Hata iletisi"; - Text[ catalan ] = "~Mensaje de error"; + Text[ catalan ] = "~Missatge d'error"; Text[ finnish ] = "~Virhesanoma"; + Text[ thai ] = "ข้à¸à¸„วาม~ผิดพลาด"; }; FixedText FT_TITLE { @@ -1090,24 +1127,25 @@ TabPage TP_VALIDATION_ERROR Text [ ENGLISH ] = "~Title" ; Text [ english_us ] = "~Title" ; Text [ swedish ] = "~Rubrik" ; - Text [ danish ] = "Titel" ; + Text [ danish ] = "T~itel" ; Text [ italian ] = "~Titolo" ; Text [ spanish ] = "~Título" ; - Text [ french ] = "~Titre" ; + Text [ french ] = "Titre" ; Text [ dutch ] = "~Titel" ; Text [ portuguese ] = "~Título" ; Text [ portuguese_brazilian ] = "~Titel" ; Text[ chinese_simplified ] = "æ ‡é¢˜(~T)"; Text[ russian ] = "Çàãîëîâîê"; Text[ polish ] = "Tytu³"; - Text[ japanese ] = "ﾀｲﾄﾙ(~T)"; + Text[ japanese ] = "タイトル(~T)"; Text[ chinese_traditional ] = "標題(~T)"; Text[ arabic ] = "ÇáÚäæÇä"; Text[ greek ] = "~Ôßôëïò"; Text[ korean ] = "ì œëª©(~T)"; Text[ turkish ] = "~Baþlýk"; - Text[ catalan ] = "~Título"; + Text[ catalan ] = "~Títol"; Text[ finnish ] = "~Otsikko"; + Text[ thai ] = "~ชื่à¸à¹€à¸£à¸·à¹ˆà¸à¸‡"; }; FixedText FT_ACTION { @@ -1117,7 +1155,7 @@ TabPage TP_VALIDATION_ERROR Text [ ENGLISH ] = "~Action" ; Text [ english_us ] = "~Action" ; Text [ swedish ] = "~Åtgärd" ; - Text [ danish ] = "Handling" ; + Text [ danish ] = "H~andling" ; Text [ italian ] = "Oper~azione" ; Text [ spanish ] = "~Acción" ; Text [ french ] = "~Action" ; @@ -1127,14 +1165,15 @@ TabPage TP_VALIDATION_ERROR Text[ chinese_simplified ] = "æ“作(~A)"; Text[ russian ] = "Äåéñòâèå"; Text[ polish ] = "Akcja"; - Text[ japanese ] = "ｱｸｼｮï¾(~A)"; + Text[ japanese ] = "アクション(~A)"; Text[ chinese_traditional ] = "動作(~A)"; Text[ arabic ] = "ÅÌÑÇÁ"; Text[ greek ] = "~ÅíÝñãåéá"; - Text[ korean ] = "실행(~A)"; + Text[ korean ] = "ìž‘ë™(~A)"; Text[ turkish ] = "~Ýþlem"; - Text[ catalan ] = "~Acción"; + Text[ catalan ] = "~Acció"; Text[ finnish ] = "~Toiminto"; + Text[ thai ] = "~à¸à¸²à¸£à¸à¸£à¸°à¸—ำ"; }; ListBox LB_ACTION { @@ -1247,7 +1286,7 @@ TabPage TP_VALIDATION_ERROR < "ä¸æ¢" ; Default ; > ; < "è¦å‘Š" ; Default ; > ; < "æƒ…å ±" ; Default ; > ; - < "ï¾ï½¸ï¾›" ; Default ; > ; + < "マクãƒ" ; Default ; > ; }; StringList [ chinese_traditional ] = { @@ -1293,9 +1332,9 @@ TabPage TP_VALIDATION_ERROR }; StringList [ catalan ] = { - < "Stop" ; Default ; > ; - < "Advertencia" ; Default ; > ; - < "Información" ; Default ; > ; + < "Atura" ; Default ; > ; + < "Advertiment" ; Default ; > ; + < "Informació" ; Default ; > ; < "Macro" ; Default ; > ; }; StringList [ finnish ] = @@ -1305,6 +1344,13 @@ TabPage TP_VALIDATION_ERROR < "Tiedot" ; Default ; > ; < "Makro" ; Default ; > ; }; + StringList [ thai ] = + { + < "หยุด" ; Default ; > ; + < "คำเตืà¸à¸™" ; Default ; > ; + < "ข้à¸à¸¡à¸¹à¸¥" ; Default ; > ; + < "มาโคร" ; Default ; > ; + }; }; PushButton BTN_SEARCH { @@ -1318,7 +1364,7 @@ TabPage TP_VALIDATION_ERROR Text [ swedish ] = "~Genomsök..." ; Text [ danish ] = "Gennemse..." ; Text [ italian ] = "~Sfoglia..." ; - Text [ spanish ] = "E~xaminar..." ; + Text [ spanish ] = "~Buscar..." ; Text [ french ] = "~Parcourir..." ; Text [ portuguese_brazilian ] = "~Durchsuchen..." ; Text [ portuguese ] = "~Pesquisar..." ; @@ -1329,10 +1375,11 @@ TabPage TP_VALIDATION_ERROR Text[ chinese_traditional ] = "ç€è¦½(~B)..."; Text[ arabic ] = "ÇÓÊÚÑÇÖ..."; Text[ greek ] = "ÁíáæÞôçóç..."; - Text[ korean ] = "검색(~B)..."; + Text[ korean ] = "찾아보기(~B)..."; Text[ turkish ] = "~Tara..."; - Text[ catalan ] = "E~xaminar..."; - Text[ finnish ] = "~Selaa"; + Text[ catalan ] = "~Navega..."; + Text[ finnish ] = "~Selaa..."; + Text[ thai ] = "เ~รียà¸à¸”ู..."; }; Text [ dutch ] = "Foutmelding" ; Text [ english_us ] = "Error Alert" ; @@ -1344,16 +1391,17 @@ TabPage TP_VALIDATION_ERROR Text [ portuguese_brazilian ] = "Fehlermeldung" ; Text [ portuguese ] = "Mensagem de erro" ; Text[ chinese_simplified ] = "错误报告"; - Text[ russian ] = "Ñîîáùåíèå îá îøèáêå"; + Text[ russian ] = "Äåéñòâèÿ ïðè îøèáêå"; Text[ polish ] = "Komunikat o b³êdzie"; - Text[ japanese ] = "ｴﾗｰﾒｯｾｰｼﾞ"; + Text[ japanese ] = "エラーメッセージ"; Text[ chinese_traditional ] = "éŒ¯èª¤å ±å‘Š"; Text[ arabic ] = "ÑÓÇáÉ ÎØÃ"; Text[ greek ] = "ÌÞíõìá óöÜëìáôïò"; Text[ korean ] = "오류 메시지"; Text[ turkish ] = "Hata iletisi"; - Text[ catalan ] = "Mensaje de error"; - Text[ finnish ] = "Virheh?lytys"; + Text[ catalan ] = "Avís d'error"; + Text[ finnish ] = "Virhehälytys"; + Text[ thai ] = "เตืà¸à¸™à¸‚้à¸à¸œà¸´à¸”พลาด"; }; @@ -1370,3 +1418,10 @@ TabPage TP_VALIDATION_ERROR + + + + + + + diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index ac947ca2796c..f175f7b17e05 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbdocimp.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: nn $ $Date: 2002-11-20 14:33:09 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index fb775b206b0f..0fd344b1bc21 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfunc.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: nn $ $Date: 2002-11-20 14:33:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -789,6 +789,10 @@ BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOO rDocShell.PostPaintCell( rPos.Col(), rPos.Row(), rPos.Tab() ); aModificator.SetDocumentModified(); + // #107160# notify input handler here the same way as in PutCell + if (bApi) + NotifyInputHandler( rPos ); + return TRUE; } @@ -839,21 +843,28 @@ BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi // #103934#; notify editline and cell in edit mode if (bApi) + NotifyInputHandler( rPos ); + + return TRUE; +} + +void ScDocFunc::NotifyInputHandler( const ScAddress& rPos ) +{ + ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); + if ( pViewSh && pViewSh->GetViewData()->GetDocShell() == &rDocShell ) { - ScViewData* pViewData = rDocShell.GetViewData(); - if (pViewData && pViewData->GetCurPos() == rPos && SC_MOD()->GetInputHdl()) + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); + if ( pInputHdl ) { - sal_Bool bIsEditMode(SC_MOD()->GetInputHdl()->IsEditMode()); + sal_Bool bIsEditMode(pInputHdl->IsEditMode()); // set modified if in editmode, because so the string is not set in the InputWindow like in the cell // (the cell shows the same like the InputWindow) if (bIsEditMode) - SC_MOD()->GetInputHdl()->SetModified(); - pViewData->UpdateInputHandler(FALSE, !bIsEditMode); + pInputHdl->SetModified(); + pViewSh->UpdateInputHandler(FALSE, !bIsEditMode); } } - - return TRUE; } struct ScMyRememberItem diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index acd9afba956f..59c0553c2014 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: er $ $Date: 2002-12-05 15:45:58 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -465,6 +465,8 @@ BOOL ScDocShell::SaveCalc( SvStorage* pStor ) // Calc 3, 4 or 5 file aPoolStm->SetVersion(pStor->GetVersion()); aPoolStm->SetSize(0); bRet = aDocument.SavePool( *aPoolStm ); + if ( aPoolStm->GetErrorCode() && !pStor->GetErrorCode() ) + pStor->SetError(aPoolStm->GetErrorCode()); } else { @@ -1428,11 +1430,11 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt USHORT nOldNumberFormatInt = rStream.GetNumberFormatInt(); ByteString aStrDelimEncoded; // only used if not Unicode UniString aStrDelimDecoded; // only used if context encoding - BOOL bContextEncoding; + BOOL bContextOrNotAsciiEncoding; if ( eCharSet == RTL_TEXTENCODING_UNICODE ) { rStream.StartWritingUnicodeText(); - bContextEncoding = FALSE; + bContextOrNotAsciiEncoding = FALSE; } else { @@ -1441,12 +1443,14 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt aInfo.StructSize = sizeof(aInfo); if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) { - bContextEncoding = ((aInfo.Flags & RTL_TEXTENCODING_INFO_CONTEXT) != 0); - if ( bContextEncoding ) + bContextOrNotAsciiEncoding = + (((aInfo.Flags & RTL_TEXTENCODING_INFO_CONTEXT) != 0) || + ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); + if ( bContextOrNotAsciiEncoding ) aStrDelimDecoded = String( aStrDelimEncoded, eCharSet ); } else - bContextEncoding = FALSE; + bContextOrNotAsciiEncoding = FALSE; } USHORT nStartCol = 0; @@ -1655,7 +1659,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt // have to convert forth and back and forth again. Same for // UTF-7 since it is a context sensitive encoding too. - if ( bContextEncoding ) + if ( bContextOrNotAsciiEncoding ) { // to byte encoding ByteString aStrEnc( aString, eCharSet ); @@ -1750,7 +1754,9 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() ); - DoEnterHandler(); // nicht abgeschlossene Zelle beenden + // #i6500# don't call DoEnterHandler here (doesn't work with AutoSave), + // it's already in ExecuteSave (as for Save and SaveAs) + if (pAutoStyleList) pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren if (eShellMode == SFX_CREATE_MODE_STANDARD) @@ -2276,6 +2282,7 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ ) SetDocumentModifiedPending( FALSE ); aDocument.InvalidateStyleSheetUsage(); aDocument.InvalidateTableArea(); + aDocument.InvalidateLastTableOpParams(); aDocument.Broadcast( SC_HINT_DATACHANGED, BCA_BRDCST_ALWAYS, NULL ); if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() ) aDocument.CalcFormulaTree( TRUE ); diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index e2225b42164a..e43ff6f5a364 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh3.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: sab $ $Date: 2002-10-21 11:28:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:05:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -174,10 +174,13 @@ void ScDocShell::PostPaint( USHORT nStartCol, USHORT nStartRow, USHORT nStartTab if (nExtFlags & SC_PF_TESTMERGE) aDocument.ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nStartTab ); - if ( nStartCol != 0 || nEndCol != MAXCOL ) // gedreht -> ganze Zeilen + if ( nStartCol != 0 || nEndCol != MAXCOL ) { + // If rotated text is involved, repaint the entire rows. + // #i9731# If there's right-to-left text to the left of the area, + // the displacement for clipping of that text may change. if ( aDocument.HasAttrib( 0,nStartRow,nStartTab, - MAXCOL,nEndRow,nEndTab, HASATTR_ROTATE ) ) + MAXCOL,nEndRow,nEndTab, HASATTR_ROTATE | HASATTR_RTL ) ) { nStartCol = 0; nEndCol = MAXCOL; @@ -489,7 +492,15 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags ) { SfxPrinter* pOldPrinter = aDocument.GetPrinter(); if (pOldPrinter) + { pOldPrinter->SetJobSetup( pNewPrinter->GetJobSetup() ); + + // #i6706# Call SetPrinter with the old printer again, so the drawing layer + // RefDevice is set (calling ReformatAllTextObjects and rebuilding charts), + // because the JobSetup (printer device settings) may affect text layout. + aDocument.SetPrinter( pOldPrinter ); + CalcOutputFactor(); // also with the new settings + } } if (nDiffFlags & SFX_PRINTER_OPTIONS) diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 9ca0dc474605..a7b8846b359c 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impex.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: er $ $Date: 2002-12-06 17:57:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,7 @@ class StarBASIC; #include <tools/list.hxx> #include <tools/string.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include <svtools/htmlout.hxx> #include <svtools/zforlist.hxx> #define _SVSTDARR_ULONGS @@ -507,7 +507,9 @@ BOOL ScImportExport::ImportStream( SvStream& rStrm, ULONG nFmt ) } if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE ) { - if( HTML2Doc( rStrm ) ) + MSE40HTMLClipFormatObj aMSE40ClpObj; // needed to skip the header data + SvStream* pHTML = aMSE40ClpObj.IsValid( rStrm ); + if ( pHTML && HTML2Doc( *pHTML ) ) return TRUE; } @@ -1351,8 +1353,9 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm ) pDoc->SetString( nCol, nRow, aRange.aStart.Tab(), aText ); else { - int nErr; - double fVal = SolarMath::StringToDouble( p, cGrpSep, cDecSep, nErr ); + double fVal = rtl_math_uStringToDouble( p, + aLine.GetBuffer() + aLine.Len(), + cDecSep, cGrpSep, NULL, NULL ); pDoc->SetValue( nCol, nRow, aRange.aStart.Tab(), fVal ); } } @@ -1499,8 +1502,9 @@ BOOL ScImportExport::Doc2Sylk( SvStream& rStrm ) hasvalue: pDoc->GetValue( nCol, nRow, aRange.aStart.Tab(), nVal ); - aValStr.Erase(); - SolarMath::DoubleToString( aValStr, nVal, 'A', INT_MAX, '.', TRUE ); + aValStr = ::rtl::math::doubleToUString( nVal, + rtl_math_StringFormat_Automatic, + rtl_math_DecimalPlaces_Max, '.', TRUE ); aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" )); aBufStr += String::CreateFromInt32( c ); diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index 72789f9cd3d2..d5dea0410b8c 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pagedata.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mh $ $Date: 2001-10-23 08:42:02 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,10 @@ #pragma hdrstop +#ifndef PCH +#include "segmentc.hxx" +#endif + #include "pagedata.hxx" //============================================================================ diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src index b059baad4e61..6e7ab05c801d 100644 --- a/sc/source/ui/docshell/tpstat.src +++ b/sc/source/ui/docshell/tpstat.src @@ -2,9 +2,9 @@ * * $RCSfile: tpstat.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2001-11-16 22:48:20 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ TabPage RID_SCPAGE_STAT Text [ italian ] = "Numero di tabelle:" ; Text [ portuguese_brazilian ] = "N?ero de tabelas:" ; Text [ portuguese ] = "Número de tabelas:" ; - Text [ finnish ] = "Lomakkeiden m??r?:" ; + Text [ finnish ] = "Taulukoiden määrä:" ; Text [ danish ] = "Antal tabeller:" ; Text [ french ] = "Nombre de feuilles :" ; Text [ swedish ] = "Antal tabeller:" ; @@ -84,7 +84,7 @@ TabPage RID_SCPAGE_STAT Text [ english_us ] = "Number of sheets:" ; Left = TRUE ; Text[ chinese_simplified ] = "工作表数目:"; - Text[ russian ] = "Êîëè÷åñòâî òàáëèö:"; + Text[ russian ] = "Êîëè÷åñòâî ëèñòîâ:"; Text[ polish ] = "Liczba tabel:"; Text[ japanese ] = "表ã®æ•°:"; Text[ chinese_traditional ] = "工作表數目："; @@ -95,7 +95,8 @@ TabPage RID_SCPAGE_STAT Text[ korean ] = "시트 수:"; Text[ turkish ] = "Tablo sayýsý:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Núm. de hojas:"; + Text[ catalan ] = "Nombre de fulls:"; + Text[ thai ] = "จำนวนà¹à¸œà¹ˆà¸™à¸‡à¸²à¸™:"; }; FixedText FT_TABLES { @@ -112,7 +113,7 @@ TabPage RID_SCPAGE_STAT Text [ english_us ] = "Number of cells:" ; Left = TRUE ; Text [ italian ] = "Numero di celle:" ; - Text [ spanish ] = "Cantidad de celdas:" ; + Text [ spanish ] = "Número de celdas:" ; Text [ french ] = "Nombre de cellules :" ; Text [ dutch ] = "Aantal cellen:" ; Text [ swedish ] = "Antal celler:" ; @@ -122,7 +123,7 @@ TabPage RID_SCPAGE_STAT Text[ chinese_simplified ] = "å•å…ƒæ ¼çš„数目："; Text[ russian ] = "Êîëè÷åñòâî ÿ÷ååê:"; Text[ polish ] = "Liczba komórek:"; - Text[ japanese ] = "ｾﾙã®æ•°ï¼š"; + Text[ japanese ] = "セルã®æ•°ï¼š"; Text[ chinese_traditional ] = "儲å˜æ ¼çš„數目："; Text[ arabic ] = "ÚÏÏ ÇáÎáÇíÇ:"; Text[ dutch ] = "Aantal cellen:"; @@ -131,8 +132,9 @@ TabPage RID_SCPAGE_STAT Text[ korean ] = "ì…€ 개수:"; Text[ turkish ] = "Hücre sayýsý:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cantidad de celdas:"; - Text[ finnish ] = "Solujen m??r?:"; + Text[ catalan ] = "Nombre de cel.les:"; + Text[ finnish ] = "Solujen määrä:"; + Text[ thai ] = "จำนวนเซลล์:"; }; FixedText FT_CELLS { @@ -149,9 +151,9 @@ TabPage RID_SCPAGE_STAT Text [ english_us ] = "Number of pages:" ; Left = TRUE ; Text [ italian ] = "Numero di pagine:" ; - Text [ spanish ] = "Cantidad de páginas:" ; + Text [ spanish ] = "Número de páginas:" ; Text [ french ] = "Nombre de pages :" ; - Text [ dutch ] = "Aantal pagina´s:" ; + Text [ dutch ] = "Aantal pagina's:" ; Text [ swedish ] = "Antal sidor:" ; Text [ danish ] = "Antal sider:" ; Text [ portuguese_brazilian ] = "Anzahl Seiten:" ; @@ -159,17 +161,18 @@ TabPage RID_SCPAGE_STAT Text[ chinese_simplified ] = "页数："; Text[ russian ] = "Êîëè÷åñòâî ñòðàíèö:"; Text[ polish ] = "Liczba stron:"; - Text[ japanese ] = "ï¾ï¾Ÿï½°ï½¼ï¾žç·æ•°:"; + Text[ japanese ] = "ページç·æ•°:"; Text[ chinese_traditional ] = "é 數："; Text[ arabic ] = "ÚÏÏ ÇáÕÝÍÇÊ:"; - Text[ dutch ] = "Aantal pagina´s:"; + Text[ dutch ] = "Aantal pagina's:"; Text[ chinese_simplified ] = "页数："; Text[ greek ] = "Áñéèìüò óåëéäþí:"; Text[ korean ] = "페ì´ì§€ 수:"; Text[ turkish ] = "Sayfa sayýsý:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cantidad de páginas:"; - Text[ finnish ] = "Sivujen m??r?:"; + Text[ catalan ] = "Nombre de pàgines:"; + Text[ finnish ] = "Sivujen määrä:"; + Text[ thai ] = "จำนวนหน้า:"; }; FixedText FT_PAGES { @@ -184,7 +187,7 @@ TabPage RID_SCPAGE_STAT Text = "Dokument: " ; Text [ ENGLISH ] = "Document: " ; Text [ english_us ] = "Document: " ; - Text [ dutch ] = "Document: " ; + Text [ dutch ] = "Document:" ; Text [ italian ] = "Documento: " ; Text [ spanish ] = "Documento: " ; Text [ french ] = "Document : " ; @@ -195,17 +198,18 @@ TabPage RID_SCPAGE_STAT Text[ chinese_simplified ] = "文档： "; Text[ russian ] = "Äîêóìåíò: "; Text[ polish ] = "Dokument:"; - Text[ japanese ] = "ﾄﾞｷï½ï¾’ï¾ï¾„: "; + Text[ japanese ] = "ドã‚ュメント: "; Text[ chinese_traditional ] = "文件： "; Text[ arabic ] = "ÇáãÓÊäÏ: "; - Text[ dutch ] = "Document: "; + Text[ dutch ] = "Document:"; Text[ chinese_simplified ] = "文档： "; Text[ greek ] = "¸ããñáöï:"; Text[ korean ] = "문서: "; Text[ turkish ] = "Belge: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento: "; + Text[ catalan ] = "Document: "; Text[ finnish ] = "Asiakirja: "; + Text[ thai ] = "เà¸à¸à¸ªà¸²à¸£: "; }; }; @@ -219,3 +223,10 @@ TabPage RID_SCPAGE_STAT + + + + + + + diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index 1480d725a7f9..d7f2d68a5c57 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -2,9 +2,9 @@ * * $RCSfile: drformsh.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-07-13 21:08:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ Text [ french ] = "~Disposition" ; \ Text [ swedish ] = "~Placering" ; \ Text [ dutch ] = "~Positie" ; \ - Text [ spanish ] = "~Posición" ; \ + Text [ spanish ] = "~Disposición" ; \ Text [ english_us ] = "~Arrange" ; \ SubMenu = Menu\ {\ @@ -119,18 +119,19 @@ Text [ french ] = "V~ers l'avant" ; \ Text [ swedish ] = "Flytta l~ängre fram" ; \ Text [ dutch ] = "Naar ~voren" ; \ - Text [ spanish ] = "Traer más a~delante" ; \ + Text [ spanish ] = "Traer a~delante" ; \ Text [ english_us ] = "Bring ~Forward" ; \ - Text[ chinese_simplified ] = "ÉÏÒÆÒ»²ã(~F)";\ + Text[ chinese_simplified ] = "上移一层(~F)";\ Text[ russian ] = "Ïåðåìåñòèòü ~âïåðåä";\ Text[ polish ] = "~Wysuñ do przodu";\ - Text[ japanese ] = "‘O–Ê‚ÖˆÚ“®(~F)";\ + Text[ japanese ] = "å‰é¢ã¸ç§»å‹•(~F)";\ Text[ greek ] = "Ì~åôáöïñÜ Ýíá åðßðåäï åìðñüò";\ - Text[ korean ] = "¾ÕÀ¸·Î °¡Á®¿À±â(~F)";\ - Text[ chinese_traditional ] = "¤W²¾¤@¼h(~F)";\ + Text[ korean ] = "앞으로 ì´ë™(~F)";\ + Text[ chinese_traditional ] = "上移一層(~F)";\ Text[ arabic ] = "ÅÍÖÇÑ ÃãÇãÇð";\ Text[ turkish ] = "~Bir öne getir";\ - Text[ catalan ] = "Traer más a~delante";\ + Text[ catalan ] = "Porta al ~davant";\ + Text[ thai ] = "นำ~ส่งต่à¸";\ };\ MenuItem\ {\ @@ -148,18 +149,19 @@ Text [ french ] = "~Vers l'arrière" ; \ Text [ swedish ] = "Flytta lä~ngre bak" ; \ Text [ dutch ] = "Naar ~achteren" ; \ - Text [ spanish ] = "Enviar hacia a~trás" ; \ + Text [ spanish ] = "Enviar a~trás" ; \ Text [ english_us ] = "Send Back~ward" ; \ - Text[ chinese_simplified ] = "ÏÂÒÆÒ»²ã(~W)";\ + Text[ chinese_simplified ] = "下移一层(~W)";\ Text[ russian ] = "Ïåðåìåñòèòü ~íàçàä";\ Text[ polish ] = "Przesuñ do ty³u";\ - Text[ japanese ] = "”w–ʂɈړ®(~W)";\ + Text[ japanese ] = "背é¢ã«ç§»å‹•(~W)";\ Text[ greek ] = "~ÌåôáöïñÜ ðßóù";\ - Text[ korean ] = "µÚ·Î º¸³»±â(~W)";\ - Text[ chinese_traditional ] = "¤U²¾¤@¼h(~W)";\ + Text[ korean ] = "뒤로 ì´ë™(~W)";\ + Text[ chinese_traditional ] = "下移一層(~W)";\ Text[ arabic ] = "ÅÑÓÇá ÎáÝÇð";\ Text[ turkish ] = "Bir alta gönder";\ - Text[ catalan ] = "Enviar hacia a~trás";\ + Text[ catalan ] = "Envia cap ~enrere";\ + Text[ thai ] = "ส่ง~à¸à¸¥à¸±à¸š";\ };\ MenuItem\ {\ @@ -176,16 +178,17 @@ };\ };\ };\ - Text[ chinese_simplified ] = "ÅÅÐò(~A)";\ - Text[ russian ] = "Ð~àñïîëîæåíèå";\ + Text[ chinese_simplified ] = "排åº(~A)";\ + Text[ russian ] = "Ð~àñïîëîæèòü";\ Text[ polish ] = "~Rozmieszczenie";\ - Text[ japanese ] = "®—ñ(~A)";\ + Text[ japanese ] = "整列(~A)";\ Text[ greek ] = "ÄéÜô~áîç";\ - Text[ korean ] = "Á¤·Ä(~A)";\ - Text[ chinese_traditional ] = "±Æ§Ç(~A)";\ + Text[ korean ] = "배치(~A)";\ + Text[ chinese_traditional ] = "排åº(~A)";\ Text[ arabic ] = "ÊÑÊíÈ~";\ Text[ turkish ] = "Düzen";\ - Text[ catalan ] = "~Posición";\ + Text[ catalan ] = "~Organitza";\ + Text[ thai ] = "~จัดเรียง";\ }; #define MN_ANCHORSUB \ @@ -197,7 +200,7 @@ Text [ ENGLISH ] = "Anchor" ; \ Text [ english_us ] = "An~chor" ; \ Text [ italian ] = "Anco~raggio" ; \ - Text [ spanish ] = "~Anclaje" ; \ + Text [ spanish ] = "~Ancla" ; \ Text [ french ] = "~Ancrage" ; \ Text [ dutch ] = "~Verankering" ; \ SubMenu = Menu\ @@ -219,17 +222,18 @@ Text [ danish ] = "Til ~siden" ; \ Text [ portuguese_brazilian ] = "An der ~Seite" ; \ Text [ portuguese ] = "~Na página" ; \ - Text[ chinese_simplified ] = "ÔÚÒ³ÃæÉÏ(~A)";\ + Text[ chinese_simplified ] = "在页é¢ä¸Š(~A)";\ Text[ russian ] = "~Ê ñòðàíèöå";\ Text[ polish ] = "~Na stronie";\ - Text[ japanese ] = "Íß°¼Þ‚É(~A)";\ + Text[ japanese ] = "ページã«(~A)";\ Text[ greek ] = "~Óôç óåëßäá";\ - Text[ korean ] = "ÆäÀÌÁö¿¡¼(~A)";\ - Text[ chinese_traditional ] = "¦b¶±¤W(~A)";\ + Text[ korean ] = "페ì´ì§€ì—(~A)";\ + Text[ chinese_traditional ] = "在é é¢ä¸Š(~A)";\ Text[ arabic ] = "Úáì ÇáÕÝÍÉ";\ Text[ turkish ] = "Sayfa";\ - Text[ catalan ] = "A la ~página";\ + Text[ catalan ] = "A la ~pàgina";\ Text[ finnish ] = "Sivul~le";\ + Text[ thai ] = "ไปยังห~น้า";\ };\ MenuItem\ {\ @@ -246,17 +250,18 @@ Text [ danish ] = "Til cellen" ; \ Text [ portuguese ] = "~Na célula" ; \ Text [ portuguese_brazilian ] = "An der ~Zelle" ; \ - Text[ chinese_simplified ] = "ÔÚµ¥Ôª¸ñÉÏ(~C)";\ + Text[ chinese_simplified ] = "在å•å…ƒæ ¼ä¸Š(~C)";\ Text[ russian ] = "Ê ÿ÷åéêå";\ Text[ polish ] = "Przy komórce";\ - Text[ japanese ] = "¾Ù‚É(~C)";\ + Text[ japanese ] = "セルã«(~C)";\ Text[ greek ] = "Óôï ~êåëß";\ - Text[ korean ] = "¼¿ ¿¡¼(~C)";\ - Text[ chinese_traditional ] = "¦bÀx¦s®æ¤W(~C)";\ + Text[ korean ] = "ì…€ì—ì„œ(~C)";\ + Text[ chinese_traditional ] = "在儲å˜æ ¼ä¸Š(~C)";\ Text[ arabic ] = "Úáì ÇáÎáíÉ";\ Text[ turkish ] = "Hücre";\ - Text[ catalan ] = "A la ~celda";\ + Text[ catalan ] = "A la ~cel.la";\ Text[ finnish ] = "So~luun";\ + Text[ thai ] = "ไปยังเ~ซลล์";\ };\ };\ };\ @@ -264,17 +269,18 @@ Text [ danish ] = "~Forankring" ; \ Text [ portuguese ] = "~Âncora" ; \ Text [ portuguese_brazilian ] = "~Verankerung" ; \ - Text[ chinese_simplified ] = "Ëø¶¨(~C)";\ - Text[ russian ] = "~Ïðèâÿçêà";\ + Text[ chinese_simplified ] = "é”定(~C)";\ + Text[ russian ] = "~ßêîðü";\ Text[ polish ] = "~Zakotwiczenie";\ - Text[ japanese ] = "±Ý¶°(~C)";\ + Text[ japanese ] = "アンカー(~C)";\ Text[ greek ] = "Áãêýñ~ùóç";\ - Text[ korean ] = "°íÁ¤(~C)";\ - Text[ chinese_traditional ] = "Âê©w(~C)";\ + Text[ korean ] = "기준 위치(~C)";\ + Text[ chinese_traditional ] = "鎖定(~C)";\ Text[ arabic ] = "~ÅÑÓÇÁ";\ Text[ turkish ] = "~Sabitleyici";\ - Text[ catalan ] = "~Anclaje";\ + Text[ catalan ] = "An~cora";\ Text[ finnish ] = "Ank~kuri";\ + Text[ thai ] = "ส~มà¸";\ }; #define MN_ALIGNSUB \ @@ -288,7 +294,7 @@ Text [ italian ] = "~Allineamento" ; \ Text [ portuguese_brazilian ] = "Ali~nhamento" ; \ Text [ portuguese ] = "Ali~nhamento" ; \ - Text [ finnish ] = "~Tasaus" ; \ + Text [ finnish ] = "T~asaus" ; \ Text [ danish ] = "~Justering" ; \ Text [ french ] = "~Alignement" ; \ Text [ swedish ] = "Juste~ring" ; \ @@ -329,16 +335,17 @@ };\ };\ };\ - Text[ chinese_simplified ] = "¶ÔÆë(~L)";\ + Text[ chinese_simplified ] = "对é½(~L)";\ Text[ russian ] = "~Âûðàâíèâàíèå";\ Text[ polish ] = "~Wyrównanie";\ - Text[ japanese ] = "”z’u(~L)";\ + Text[ japanese ] = "é…ç½®(~L)";\ Text[ greek ] = "Ó~ôïß÷éóç";\ - Text[ korean ] = "¸ÂÃã(~L)";\ - Text[ chinese_traditional ] = "¹ï»ô(~L)";\ + Text[ korean ] = "맞춤(~L)";\ + Text[ chinese_traditional ] = "å°é½Š(~L)";\ Text[ arabic ] = "~ãÍÇÐÇÉ";\ Text[ turkish ] = "Hi~zalama";\ - Text[ catalan ] = "Ali~neación";\ + Text[ catalan ] = "A~lineació";\ + Text[ thai ] = "จั~ดตำà¹à¸«à¸™à¹ˆà¸‡";\ }; @@ -360,20 +367,21 @@ String RID_OBJECTBAR_DRAWFORM Text [ italian ] = "Barra dei campi di controllo" ; Text [ spanish ] = "Barra de campos de control" ; Text [ french ] = "Barre de contrôles" ; - Text [ dutch ] = "Controlebalk" ; - Text[ chinese_simplified ] = "¿ØÖÆÀ¸"; + Text [ dutch ] = "Controleveldbalk" ; + Text[ chinese_simplified ] = "控制æ "; Text[ russian ] = "Ïàíåëü ýëåìåíòîâ óïðàâëåíèÿ"; Text[ polish ] = "Pasek formantów"; - Text[ japanese ] = "ºÝÄÛ°Ù°ÙÊÞ°"; - Text[ chinese_traditional ] = "±±¨î¶µ¦C"; + Text[ japanese ] = "コントãƒãƒ¼ãƒ«ãƒ„ールãƒãƒ¼"; + Text[ chinese_traditional ] = "æŽ§åˆ¶é …åˆ—"; Text[ arabic ] = "ÔÑíØ ÚäÇÕÑ ÇáÊÍßã"; - Text[ dutch ] = "Controlebalk"; - Text[ chinese_simplified ] = "¿ØÖÆÀ¸"; + Text[ dutch ] = "Controleveldbalk"; + Text[ chinese_simplified ] = "控制æ "; Text[ greek ] = "ÃñáììÞ ðåäßùí åëÝã÷ïõ"; - Text[ korean ] = "ÄÁÆ®·Ñ µµ±¸¸ðÀ½"; + Text[ korean ] = "컨트롤 ë„구 모ìŒ"; Text[ turkish ] = "Komut alaný çubuðu"; - Text[ catalan ] = "Barra de campos de control"; - Text[ finnish ] = "Ohjaintyökalurivi"; + Text[ catalan ] = "Barra d'eines Controls"; + Text[ finnish ] = "Ohjausobjektityökalurivi"; + Text[ thai ] = "ตัวควบคุมà¹à¸–บเครื่à¸à¸‡à¸¡à¸·à¸"; }; ToolBox RID_OBJECTBAR_DRAWFORM @@ -531,7 +539,7 @@ String RID_POPUP_DRAWFORM Text [ ENGLISH ] = "Toolbar for form objects" ; Text[ english_us ] = "Popup menu for form objects"; Text[ portuguese ] = "Menu instantâneo para objectos de formulário"; - Text[ russian ] = "Âñïëûâàþùåå ìåíþ äëÿ îáúåêòîâ ôîðìóëÿðà"; + Text[ russian ] = "Âñïëûâàþùåå ìåíþ äëÿ îáúåêòîâ ôîðìû"; Text[ dutch ] = "Popup-menu voor formulierobjecten"; Text[ french ] = "Menu Pop-up pour les objets de formulaire"; Text[ spanish ] = "Menú emergente para objetos de formulario"; @@ -540,17 +548,18 @@ String RID_POPUP_DRAWFORM Text[ swedish ] = "Popup-meny för formulärobjekt"; Text[ polish ] = "Menu podrêczne dla obiektów formularzy"; Text[ portuguese_brazilian ] = "Toolbar for form objects"; - Text[ japanese ] = "Ì«°ÑµÌÞ¼Þª¸Ä‚ÌÎ߯Ìß±¯ÌßÒÆ°"; - Text[ chinese_simplified ] = "±íµ¥¶ÔÏóµÄµ¯³öʽ²Ëµ¥"; - Text[ chinese_traditional ] = "ªí®æª«¥óªº§ÖÅã¥\\¯àªí"; + Text[ japanese ] = "フォームオブジェクトã®ãƒãƒƒãƒ—アップメニュー"; + Text[ chinese_simplified ] = "表å•å¯¹è±¡çš„弹出å¼èœå•"; + Text[ chinese_traditional ] = "è¡¨æ ¼ç‰©ä»¶çš„å¿«é¡¯åŠŸèƒ½è¡¨"; Text[ arabic ] = "ÞÇÆãÉ ãäÈËÞÉ áßÇÆäÇÊ ÇáÇÓÊãÇÑÉ"; Text[ dutch ] = "Popup-menu voor formulierobjecten"; - Text[ chinese_simplified ] = "±íµ¥¶ÔÏóµÄµ¯³öʽ²Ëµ¥"; + Text[ chinese_simplified ] = "表å•å¯¹è±¡çš„弹出å¼èœå•"; Text[ greek ] = "Áíáäõüìåíï ìåíïý ãéá áíôéêåßìåíá öüñìáò"; - Text[ korean ] = "¾ç½Ä°³Ã¼ÀÇ Æ˾÷ ¸Þ´º"; + Text[ korean ] = "ì–‘ì‹ ê°œì²´ì˜ íŒì—… 메뉴"; Text[ turkish ] = "Form nesneleri için popup mönü"; - Text[ catalan ] = "Menú emergente para objetos de formulario"; + Text[ catalan ] = "Menú emergent per a objectes de formulari"; Text[ finnish ] = "Lomakeobjektien ponnahdusvalikko"; + Text[ thai ] = "เมนูà¹à¸šà¸šà¸œà¸¸à¸”ขึ้นสำหรับวัตถุฟà¸à¸£à¹Œà¸¡"; }; // // Popup-Menue fuer (Uno-) Controls @@ -579,3 +588,16 @@ Menu RID_POPUP_DRAWFORM + + + + + + + + + + + + + diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index ad72d2a78d20..7ceaa703802a 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drtxtob.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: dr $ $Date: 2002-11-26 08:44:40 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,6 +104,9 @@ #include <svtools/cliplistener.hxx> #include <svtools/transfer.hxx> #include <svtools/whiter.hxx> +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #include <vcl/msgbox.hxx> #include "sc.hrc" @@ -856,6 +859,9 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) return; } + SvtLanguageOptions aLangOpt; + BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); + BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); SdrView* pView = pViewData->GetScDrawView(); SfxItemSet aAttrSet(pView->GetModel()->GetItemPool()); @@ -963,12 +969,20 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) else bLeftToRight = ( (const SvxWritingModeItem&) aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; - rDestSet.Put( SfxBoolItem( SID_TEXTDIRECTION_LEFT_TO_RIGHT, bLeftToRight ) ); - rDestSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) ); + if ( bDisableVerticalText ) + { + rDestSet.DisableItem( SID_TEXTDIRECTION_LEFT_TO_RIGHT ); + rDestSet.DisableItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM ); + } + else + { + rDestSet.Put( SfxBoolItem( SID_TEXTDIRECTION_LEFT_TO_RIGHT, bLeftToRight ) ); + rDestSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) ); + } // left-to-right or right-to-left - if ( !bLeftToRight ) + if ( !bLeftToRight || bDisableCTLFont ) { // disabled if vertical rDestSet.DisableItem( SID_ATTR_PARA_LEFT_TO_RIGHT ); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 243affe8f782..601e625dd1d0 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fudraw.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: aw $ $Date: 2002-07-18 09:54:43 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,7 +202,11 @@ BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt) BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt) { - DoModifiers( rMEvt ); + // #106438# evaluate modifiers only if in a drawing layer action + // (don't interfere with keyboard shortcut handling) + if (pView->IsAction()) + DoModifiers( rMEvt ); + return FALSE; } @@ -544,45 +548,49 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) if(0L == pHdl) { - // #90129# restrict movement to WorkArea - const Rectangle& rWorkArea = pView->GetWorkArea(); - - if(!rWorkArea.IsEmpty()) + // #107086# only take action when move is allowed + if(pView->IsMoveAllowed()) { - Rectangle aMarkRect(pView->GetMarkedObjRect()); - aMarkRect.Move(nX, nY); + // #90129# restrict movement to WorkArea + const Rectangle& rWorkArea = pView->GetWorkArea(); - if(!aMarkRect.IsInside(rWorkArea)) + if(!rWorkArea.IsEmpty()) { - if(aMarkRect.Left() < rWorkArea.Left()) - { - nX += rWorkArea.Left() - aMarkRect.Left(); - } - - if(aMarkRect.Right() > rWorkArea.Right()) - { - nX -= aMarkRect.Right() - rWorkArea.Right(); - } - - if(aMarkRect.Top() < rWorkArea.Top()) - { - nY += rWorkArea.Top() - aMarkRect.Top(); - } + Rectangle aMarkRect(pView->GetMarkedObjRect()); + aMarkRect.Move(nX, nY); - if(aMarkRect.Bottom() > rWorkArea.Bottom()) + if(!aMarkRect.IsInside(rWorkArea)) { - nY -= aMarkRect.Bottom() - rWorkArea.Bottom(); + if(aMarkRect.Left() < rWorkArea.Left()) + { + nX += rWorkArea.Left() - aMarkRect.Left(); + } + + if(aMarkRect.Right() > rWorkArea.Right()) + { + nX -= aMarkRect.Right() - rWorkArea.Right(); + } + + if(aMarkRect.Top() < rWorkArea.Top()) + { + nY += rWorkArea.Top() - aMarkRect.Top(); + } + + if(aMarkRect.Bottom() > rWorkArea.Bottom()) + { + nY -= aMarkRect.Bottom() - rWorkArea.Bottom(); + } } } - } - // now move the selected draw objects - pView->MoveAllMarked(Size(nX, nY)); + // now move the selected draw objects + pView->MoveAllMarked(Size(nX, nY)); - // #97016# II - pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow); + // #97016# II + pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow); - bReturn = TRUE; + bReturn = TRUE; + } } else { diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 8c36428f41d9..3d2c17d74598 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuins2.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: ka $ $Date: 2001-10-25 15:20:10 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,8 @@ //------------------------------------------------------------------------ +#include <so3/outplace.hxx> +#include <svtools/globalnameitem.hxx> #include <sfx2/frameobj.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/stritem.hxx> @@ -308,13 +310,34 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView, } else // SID_INSERT_OBJECT { - SvInsertOleObjectDialog aDlg; - aDlg.SetHelpId(nSlot); - SvObjectServerList aServerLst; - aDlg.FillObjectServerList(&aServerLst); - aServerLst.Remove( *ScDocShell::ClassFactory() ); // Starcalc nicht anzeigen - aIPObj = aDlg.Execute(pWin, aStor, &aServerLst ); - bIsFromFile = !aDlg.IsCreateNew(); + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + if ( pNameItem ) + { + SvGlobalName aName = pNameItem->GetValue(); + const SotFactory* pFact = SvFactory::Find( aName ); + if ( pFact ) + { + SvStorageRef aStor = new SvStorage( String() ); + aIPObj = &((SvFactory*)SvInPlaceObject::ClassFactory())->CreateAndInit( aName,aStor ); + } + else + { + SvStorageRef aStor = new SvStorage( FALSE, String() ); + String aFileName; + BOOL bOk; + aIPObj = SvOutPlaceObject::InsertObject( NULL, &aStor, bOk, aName, aFileName ); + } + } + else + { + SvInsertOleObjectDialog aDlg; + aDlg.SetHelpId(nSlot); + SvObjectServerList aServerLst; + aDlg.FillObjectServerList(&aServerLst); + aServerLst.Remove( *ScDocShell::ClassFactory() ); // Starcalc nicht anzeigen + aIPObj = aDlg.Execute(pWin, aStor, &aServerLst ); + bIsFromFile = !aDlg.IsCreateNew(); + } } // SvInsertObjectDialog (alles in einem Dialog) wird nicht mehr benutzt @@ -326,7 +349,10 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView, SvEmbeddedInfoObject* pInfoObj = pViewSh->GetViewFrame()->GetObjectShell()-> InsertObject(aIPObj, String()); if ( !pInfoObj ) + { pViewSh->ErrorMessage( STR_ERR_INSERTOBJ ); + rReq.Ignore(); + } else { String aName = pInfoObj->GetObjName(); @@ -394,8 +420,12 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView, pSkipPaintObj = NULL; } } + + rReq.Done(); } } + else + rReq.Ignore(); } /************************************************************************* diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index fe33f35a2736..69d06c728233 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: futext2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-09-22 18:49:37 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -310,6 +310,7 @@ //------------------------------------------------------------------------ +#include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <svx/svdetc.hxx> @@ -328,7 +329,9 @@ SdrOutliner* FuText::MakeOutliner() // Die EditEngine benutzt beim RTF Export (Clipboard / Drag&Drop) // den MapMode des RefDevices, um die Fontgroesse zu setzen - OutputDevice* pRef = pOutl->GetRefDevice(); // das sollte der Drucker sein + // #i10426# The ref device isn't set to the EditEngine before BegTextEdit now, + // so the device must be taken from the model here. + OutputDevice* pRef = pDrDoc->GetRefDevice(); if (pRef && pRef != pWindow) pRef->SetMapMode( MapMode(MAP_100TH_MM) ); diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 74d9bccf3021..8d0531c1fa76 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -2,9 +2,9 @@ * * $RCSfile: objdraw.src,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:25:01 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ Text[ chinese_traditional ] = "標準(~D)";\ Text[ arabic ] = "~ÞíÇÓí";\ Text[ greek ] = "~ÐñïåðéëïãÞ";\ - Text[ korean ] = "표준(~D)";\ + Text[ korean ] = "기본값(~D)";\ Text[ turkish ] = "Standar~t";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Per ~defecte";\ @@ -217,7 +217,7 @@ Text[ chinese_traditional ] = "樣å¼(~S)";\ Text[ arabic ] = "äãØ";\ Text[ greek ] = "Óôõ~ë";\ - Text[ korean ] = "ìœ í˜•(~S)";\ + Text[ korean ] = "스타ì¼(~S)";\ Text[ turkish ] = "Bi~çim";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "E~stil";\ @@ -434,7 +434,7 @@ Text[ chinese_traditional ] = "列間隔(~L)";\ Text[ arabic ] = "ÊÈÇÚÏ ÇáÃÓØÑ";\ Text[ greek ] = "ÄéÜóôé~÷ï";\ - Text[ korean ] = "í–‰ 간격(~L)";\ + Text[ korean ] = "줄 간격(~L)";\ Text[ turkish ] = "~Satýr aralýðý";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Inter~lineat";\ @@ -509,7 +509,7 @@ Text[ chinese_traditional ] = "原件大å°(~O)";\ Text[ arabic ] = "ÇáÍÌã ÇáÃÕáí";\ Text[ greek ] = "Áñ÷éêü ìÝ~ãåèïò";\ - Text[ korean ] = "기본 í¬ê¸°(~O)";\ + Text[ korean ] = "ì›ëž˜ í¬ê¸°(~O)";\ Text[ turkish ] = "Gerçek ~boyut";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Mida ~original";\ @@ -525,7 +525,7 @@ Text [ ENGLISH ] = "~Name Object..." ; \ Text[ english_us ] = "~Name Object...";\ Text[ portuguese ] = "~Name Object...";\ - Text[ russian ] = "~Îáúåêò èìåíè...";\ + Text[ russian ] = "~Èìÿ îáúåêòà...";\ Text[ greek ] = "~Name Object...";\ Text[ dutch ] = "Na~am geven aan object...";\ Text[ french ] = "~Nommer l'objet...";\ @@ -537,7 +537,7 @@ Text[ polish ] = "~Name Object...";\ Text[ portuguese_brazilian ] = "~Name Object...";\ Text[ japanese ] = "オブジェクトã«åå‰ã‚’付ã‘ã‚‹...";\ - Text[ korean ] = "개체 명ì¹(N)...";\ + Text[ korean ] = "개체 ì´ë¦„ ì§€ì •(~N)...";\ Text[ chinese_simplified ] = "命å对象...";\ Text[ chinese_traditional ] = "命å物件...";\ Text[ turkish ] = "~Name Object...";\ @@ -583,7 +583,7 @@ Text [ french ] = "À la ~verticale" ; \ Text [ swedish ] = "~Vertikalt" ; \ Text [ dutch ] = "~Verticaal" ; \ - Text [ spanish ] = "~Vertical" ; \ + Text [ spanish ] = "~Verticalmente" ; \ Text [ english_us ] = "~Vertically" ; \ Text[ chinese_simplified ] = "åž‚ç›´æ–¹å‘(~V)";\ Text[ russian ] = "~Ïî âåðòèêàëè";\ @@ -660,7 +660,7 @@ Text [ french ] = "~Disposition" ; \ Text [ swedish ] = "Pl~acering" ; \ Text [ dutch ] = "~Positie" ; \ - Text [ spanish ] = "Posición" ; \ + Text [ spanish ] = "~Disposición" ; \ Text [ english_us ] = "~Arrange" ; \ SubMenu = Menu\ {\ @@ -695,7 +695,7 @@ Text[ chinese_traditional ] = "上移一層(~F)";\ Text[ arabic ] = "ÅÍÖÇÑ ÃãÇãÇð";\ Text[ greek ] = "Ì~åôáöïñÜ Ýíá åðßðåäï åìðñüò";\ - Text[ korean ] = "앞으로 ê°€ì ¸ì˜¤ê¸°(~F)";\ + Text[ korean ] = "앞으로 ì´ë™(~F)";\ Text[ turkish ] = "B~ir öne getir";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Porta al ~davant";\ @@ -726,7 +726,7 @@ Text[ chinese_traditional ] = "下移一層(~W)";\ Text[ arabic ] = "ÅÑÓÇá ÎáÝÇð";\ Text[ greek ] = "~ÌåôáöïñÜ ðßóù";\ - Text[ korean ] = "뒤로 보내기(~W)";\ + Text[ korean ] = "뒤로 ì´ë™(~W)";\ Text[ turkish ] = "Bir ~geri gönder";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "En~via cap enrere";\ @@ -754,7 +754,7 @@ Text[ chinese_traditional ] = "排åº(~A)";\ Text[ arabic ] = "ÊÑÊíÈ~";\ Text[ greek ] = "ÄéÜô~áîç";\ - Text[ korean ] = "ë°°ì—´(~A)";\ + Text[ korean ] = "배치(~A)";\ Text[ turkish ] = "~Sýralama";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "~Organitza";\ @@ -770,7 +770,7 @@ Text [ ENGLISH ] = "Anchor" ; \ Text [ english_us ] = "An~chor" ; \ Text [ italian ] = "Anco~raggio" ; \ - Text [ spanish ] = "~Anclaje" ; \ + Text [ spanish ] = "~Ancla" ; \ Text [ french ] = "~Ancrage" ; \ Text [ dutch ] = "~Verankering" ; \ SubMenu = Menu\ @@ -799,7 +799,7 @@ Text[ chinese_traditional ] = "在é é¢ä¸Š(~A)";\ Text[ arabic ] = "Úáì Çá~ÕÝÍÉ";\ Text[ greek ] = "~Óôç óåëßäá";\ - Text[ korean ] = "페ì´ì§€ì—ì„œ(~A)";\ + Text[ korean ] = "페ì´ì§€ì—(~A)";\ Text[ turkish ] = "Sayfa~da";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "A la p~àgina";\ @@ -848,7 +848,7 @@ Text[ chinese_traditional ] = "鎖定(~C)";\ Text[ arabic ] = "~ÅÑÓÇÁ";\ Text[ greek ] = "Áãêýñ~ùóç";\ - Text[ korean ] = "위치 ê³ ì •(~C)";\ + Text[ korean ] = "기준 위치(~C)";\ Text[ turkish ] = "Sa~bitleyici";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "An~cora";\ @@ -1308,6 +1308,326 @@ ToolBox RID_TEXT_TOOLBOX HelpID = SID_PARA_DLG ; }; }; + ItemList[arabic] = + { + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_FONT ; + HelpId = SID_ATTR_CHAR_FONT ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_FONTHEIGHT ; + HelpId = SID_ATTR_CHAR_FONTHEIGHT ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_WEIGHT ; + HelpId = SID_ATTR_CHAR_WEIGHT ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_POSTURE ; + HelpId = SID_ATTR_CHAR_POSTURE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_UNDERLINE ; + HelpId = SID_ATTR_CHAR_UNDERLINE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ULINE_VAL_DOUBLE; + HelpId = SID_ULINE_VAL_DOUBLE; + AutoCheck = TRUE ; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_COLOR ; + HelpId = SID_ATTR_CHAR_COLOR ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LINESPACE_10 ; + HelpId = SID_ATTR_PARA_LINESPACE_10 ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LINESPACE_15 ; + HelpId = SID_ATTR_PARA_LINESPACE_15 ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LINESPACE_20 ; + HelpId = SID_ATTR_PARA_LINESPACE_20 ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ALIGNRIGHT ; + HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNCENTERHOR ; + HelpId = SID_ATTR_PARA_ADJUST_CENTER ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNLEFT ; + HelpId = SID_ATTR_PARA_ADJUST_LEFT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNBLOCK ; + HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; + HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; + RadioCheck = TRUE; + Hide = TRUE; + }; + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; + HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; + RadioCheck = TRUE; + Hide = TRUE; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_SET_SUPER_SCRIPT ; + HelpID = SID_SET_SUPER_SCRIPT ; + }; + ToolBoxItem + { + Identifier = SID_SET_SUB_SCRIPT ; + HelpID = SID_SET_SUB_SCRIPT ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_CHAR_DLG ; + HelpID = SID_CHAR_DLG ; + }; + ToolBoxItem + { + Identifier = SID_PARA_DLG ; + HelpID = SID_PARA_DLG ; + }; + }; + ItemList[hebrew] = + { + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_FONT ; + HelpId = SID_ATTR_CHAR_FONT ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_FONTHEIGHT ; + HelpId = SID_ATTR_CHAR_FONTHEIGHT ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_WEIGHT ; + HelpId = SID_ATTR_CHAR_WEIGHT ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_POSTURE ; + HelpId = SID_ATTR_CHAR_POSTURE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_UNDERLINE ; + HelpId = SID_ATTR_CHAR_UNDERLINE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ULINE_VAL_DOUBLE; + HelpId = SID_ULINE_VAL_DOUBLE; + AutoCheck = TRUE ; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_COLOR ; + HelpId = SID_ATTR_CHAR_COLOR ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LINESPACE_10 ; + HelpId = SID_ATTR_PARA_LINESPACE_10 ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LINESPACE_15 ; + HelpId = SID_ATTR_PARA_LINESPACE_15 ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LINESPACE_20 ; + HelpId = SID_ATTR_PARA_LINESPACE_20 ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ALIGNRIGHT ; + HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNCENTERHOR ; + HelpId = SID_ATTR_PARA_ADJUST_CENTER ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNLEFT ; + HelpId = SID_ATTR_PARA_ADJUST_LEFT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNBLOCK ; + HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; + HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; + RadioCheck = TRUE; + Hide = TRUE; + }; + ToolBoxItem + { + Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; + HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; + RadioCheck = TRUE; + Hide = TRUE; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_SET_SUPER_SCRIPT ; + HelpID = SID_SET_SUPER_SCRIPT ; + }; + ToolBoxItem + { + Identifier = SID_SET_SUB_SCRIPT ; + HelpID = SID_SET_SUB_SCRIPT ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + //--------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //--------------------------------------------- + ToolBoxItem + { + Identifier = SID_CHAR_DLG ; + HelpID = SID_CHAR_DLG ; + }; + ToolBoxItem + { + Identifier = SID_PARA_DLG ; + HelpID = SID_PARA_DLG ; + }; + }; }; // // Graphics toolbox @@ -1329,7 +1649,7 @@ String RID_GRAPHIC_OBJECTBAR Text[ polish ] = "Pasek obiektów graficznych"; Text[ portuguese_brazilian ] = "Toolbar for graphic objects"; Text[ japanese ] = "図オブジェクトãƒãƒ¼"; - Text[ korean ] = "그래픽 개체 모ìŒ"; + Text[ korean ] = "그림 개체 모ìŒ"; Text[ chinese_simplified ] = "图形对象æ "; Text[ chinese_traditional ] = "圖形物件列"; Text[ turkish ] = "Toolbar for graphic objects"; @@ -1753,7 +2073,7 @@ Menu RID_POPUP_CHART Text[ chinese_traditional ] = "修改資料å€åŸŸ(~M)..."; Text[ arabic ] = "...ÊÚÏíá äØÇÞ ÇáÈíÇäÇÊ"; Text[ greek ] = "ÁëëáãÞ ðåñéï÷Þò ~äåäïìÝíùí..."; - Text[ korean ] = "ë°ì´í„° ì˜ì— ìˆ˜ì •(~M)..."; + Text[ korean ] = "ë°ì´í„° 범위 ìˆ˜ì •(~M)..."; Text[ turkish ] = "~Veri alanýný deðiþtir..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Modifica l'àrea de dades..."; @@ -1829,3 +2149,8 @@ Menu RID_POPUP_DRAWTEXT }; }; + + + + + diff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src index 5650acc425ca..80ee4f53e578 100644 --- a/sc/source/ui/formdlg/dwfunctr.src +++ b/sc/source/ui/formdlg/dwfunctr.src @@ -2,9 +2,9 @@ * * $RCSfile: dwfunctr.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: os $ $Date: 2002-08-29 07:27:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -210,13 +210,13 @@ DockingWindow FID_FUNCTION_BOX < "Viimeksi käytetty" ; Default ; > ; < "Kaikki" ; Default ; > ; < "Tietokanta" ; Default ; > ; - < "Päivämäärä&Aika" ; Default ; > ; + < "Päivämäärä ja aika" ; Default ; > ; < "Rahoitus" ; Default ; > ; < "Tiedot" ; Default ; > ; < "Looginen" ; Default ; > ; < "Matemaattinen" ; Default ; > ; - < "Matriisi" ; Default ; > ; - < "Tilastolliset" ; Default ; > ; + < "Taulukko" ; Default ; > ; + < "Tilastollinen" ; Default ; > ; < "Laskentataulukko" ; Default ; > ; < "Teksti" ; Default ; > ; < "Lisäosa" ; Default ; > ; @@ -250,8 +250,8 @@ DockingWindow FID_FUNCTION_BOX < "Logique" ; Default ; > ; < "Mathématique" ; Default ; > ; < "Matrice" ; Default ; > ; - < "Statistique" ; Default ; > ; - < "Classeur" ; Default ; > ; + < "Statistiques" ; Default ; > ; + < "Feuille de calcul" ; Default ; > ; < "Texte" ; Default ; > ; < "Add-in" ; Default ; > ; // < "Défini par l'utilisateur"; Default; >; @@ -278,11 +278,11 @@ DockingWindow FID_FUNCTION_BOX < "Als laatste gebruikt" ; Default ; > ; < "Alle" ; Default ; > ; < "Database" ; Default ; > ; - < "Datum&Tijd" ; Default ; > ; + < "Datum & tijd" ; Default ; > ; < "Financieel" ; Default ; > ; < "Informatie" ; Default ; > ; < "Logisch" ; Default ; > ; - < "Wiskundig" ; Default ; > ; + < "Wiskunde" ; Default ; > ; < "Matrix" ; Default ; > ; < "Statistiek" ; Default ; > ; < "Werkblad" ; Default ; > ; @@ -295,11 +295,11 @@ DockingWindow FID_FUNCTION_BOX < "Última utilización" ; Default ; > ; < "Todas" ; Default ; > ; < "Base de datos" ; Default ; > ; - < "Fecha&Hora" ; Default ; > ; + < "Fecha y hora" ; Default ; > ; < "Finanzas" ; Default ; > ; < "Información" ; Default ; > ; < "Lógico" ; Default ; > ; - < "Matemáticas" ; Default ; > ; + < "Matemático" ; Default ; > ; < "Matriz" ; Default ; > ; < "Estadística" ; Default ; > ; < "Hoja de cálculo" ; Default ; > ; @@ -325,7 +325,7 @@ DockingWindow FID_FUNCTION_BOX }; StringList [ russian ] = { - < "Ïðèìåíåíî ïîñëåäíèì" ; Default ; > ; + < "Èñïîëüçîâàíî ïîñëåäíèì" ; Default ; > ; < "Âñå" ; Default ; > ; < "Áàçà äàííûõ" ; Default ; > ; < "Äàòà è âðåìÿ" ; Default ; > ; @@ -333,11 +333,11 @@ DockingWindow FID_FUNCTION_BOX < "Èíôîðìàöèÿ" ; Default ; > ; < "Ëîãè÷åñêèå" ; Default ; > ; < "Ìàòåìàòè÷åñêèå" ; Default ; > ; - < "Ìàòðèöà" ; Default ; > ; + < "Ìàññèâ" ; Default ; > ; < "Ñòàòèñòè÷åñêèå" ; Default ; > ; - < "Òàáëèöà" ; Default ; > ; - < "Òåêñò" ; Default ; > ; - < "Äîïîëíèòåëüíî (Add-in)" ; Default ; > ; + < "Ýëåêòðîííàÿ òàáëèöà" ; Default ; > ; + < "Òåêñòîâûå" ; Default ; > ; + < "Ïîäêëþ÷àåìûé ìîäóëü" ; Default ; > ; }; StringList [ polish ] = { @@ -408,11 +408,11 @@ DockingWindow FID_FUNCTION_BOX < "Als laatste gebruikt" ; Default ; > ; < "Alle" ; Default ; > ; < "Database" ; Default ; > ; - < "Datum&Tijd" ; Default ; > ; + < "Datum & tijd" ; Default ; > ; < "Financieel" ; Default ; > ; < "Informatie" ; Default ; > ; < "Logisch" ; Default ; > ; - < "Wiskundig" ; Default ; > ; + < "Wiskunde" ; Default ; > ; < "Matrix" ; Default ; > ; < "Statistiek" ; Default ; > ; < "Werkblad" ; Default ; > ; @@ -453,10 +453,10 @@ DockingWindow FID_FUNCTION_BOX }; StringList [ korean ] = { - < "마지막으로 사용ëœ" ; Default ; > ; - < "ì „ì²´" ; Default ; > ; + < "가장 ìµœê·¼ì— ì‚¬ìš©ëœ ì„œì‹" ; Default ; > ; + < "모ë‘" ; Default ; > ; < "ë°ì´í„°ë² ì´ìŠ¤" ; Default ; > ; - < "ë‚ ì§œ&시간" ; Default ; > ; + < "ë‚ ì§œ ë° ì‹œê°„" ; Default ; > ; < "회계" ; Default ; > ; < "ì •ë³´" ; Default ; > ; < "논리ì " ; Default ; > ; @@ -465,7 +465,7 @@ DockingWindow FID_FUNCTION_BOX < "통계" ; Default ; > ; < "ìŠ¤í”„ë ˆë“œì‹œíŠ¸" ; Default ; > ; < "í…스트" ; Default ; > ; - < "추가" ; Default ; > ; + < "Add-in" ; Default ; > ; }; StringList [ turkish ] = { @@ -626,10 +626,25 @@ DockingWindow FID_FUNCTION_BOX Text[ turkish ] = "Fonksiyon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Funcions"; - Text[ finnish ] = "Toiminnot"; + Text[ finnish ] = "Funktiot"; Text[ thai ] = "ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™"; }; // ********************************************************************** EOF + + + + + + + + + + + + + + + diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index b473988e1c89..dd24259a1883 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formdata.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:57 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.src index 4842440ab24d..2fcdf94bdd37 100644 --- a/sc/source/ui/formdlg/formdlgs.src +++ b/sc/source/ui/formdlg/formdlgs.src @@ -2,9 +2,9 @@ * * $RCSfile: formdlgs.src,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2002-11-27 16:34:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -272,8 +272,8 @@ TabPage RID_SCTAB_FUNCTION < "Logique" ; Default ; > ; < "Mathématique" ; Default ; > ; < "Matrice" ; Default ; > ; - < "Statistique" ; Default ; > ; - < "Classeur" ; Default ; > ; + < "Statistiques" ; Default ; > ; + < "Feuille de calcul" ; Default ; > ; < "Texte" ; Default ; > ; < "Add-in" ; Default ; > ; // < "Défini par l'utilisateur"; Default; >; @@ -317,11 +317,11 @@ TabPage RID_SCTAB_FUNCTION < "Última utilización" ; Default ; > ; < "Todas" ; Default ; > ; < "Base de datos" ; Default ; > ; - < "Fecha&Hora" ; Default ; > ; + < "Fecha y hora" ; Default ; > ; < "Finanzas" ; Default ; > ; < "Información" ; Default ; > ; < "Lógico" ; Default ; > ; - < "Matemática" ; Default ; > ; + < "Matemático" ; Default ; > ; < "Matriz" ; Default ; > ; < "Estadística" ; Default ; > ; < "Hoja de cálculo" ; Default ; > ; @@ -443,10 +443,10 @@ TabPage RID_SCTAB_FUNCTION }; StringList [ korean ] = { - < "마지막으로 사용ëœ" ; Default ; > ; + < "가장 ìµœê·¼ì— ì‚¬ìš©ëœ ì„œì‹" ; Default ; > ; < "모ë‘" ; Default ; > ; < "ë°ì´í„°ë² ì´ìŠ¤" ; Default ; > ; - < "ë‚ ì§œ&시간" ; Default ; > ; + < "ë‚ ì§œ ë° ì‹œê°„" ; Default ; > ; < "회계" ; Default ; > ; < "ì •ë³´" ; Default ; > ; < "논리ì " ; Default ; > ; @@ -455,7 +455,7 @@ TabPage RID_SCTAB_FUNCTION < "통계" ; Default ; > ; < "ìŠ¤í”„ë ˆë“œì‹œíŠ¸" ; Default ; > ; < "í…스트" ; Default ; > ; - < "추가" ; Default ; > ; + < "Add-in" ; Default ; > ; }; StringList [ turkish ] = { @@ -872,7 +872,7 @@ ModelessDialog RID_SCDLG_FORMULA Text [ swedish ] = "Delresultat" ; Text [ danish ] = "Delresultat" ; Text [ italian ] = "Subtotale" ; - Text [ spanish ] = "Subtotal" ; + Text [ spanish ] = "Resultado parcial" ; Text [ french ] = "Résultat partiel" ; Text [ dutch ] = "Tussenresultaat" ; Text [ portuguese ] = "Resultado de função" ; @@ -1092,16 +1092,16 @@ ModelessDialog RID_SCDLG_FORMULA Text [ french ] = "AutoPilote de fonctions" ; Text [ swedish ] = "Funktionsautopilot" ; Text [ dutch ] = "Functie-AutoPiloot" ; - Text [ spanish ] = "AutoPiloto de funciones" ; + Text [ spanish ] = "Piloto automático de funciones" ; Text [ english_us ] = "AutoPilot: Functions" ; - Text[ chinese_simplified ] = "函数自动助ç†"; + Text[ chinese_simplified ] = "自动文件助ç†ï¼šå‡½æ•°"; Text[ russian ] = "Ìàñòåð: Ôóíêöèè"; Text[ polish ] = "AutoPilot funkcji"; Text[ japanese ] = "関数オートパイãƒãƒƒãƒˆ"; Text[ chinese_traditional ] = "函數自動助ç†"; Text[ arabic ] = "ÇáãÑÔÏ ÇáÂáí ááÏÇáÇÊ"; Text[ greek ] = "AutoPilot óõíÜñôçóçò"; - Text[ korean ] = "ìžë™ 파ì¼ëŸ¿ 기능"; + Text[ korean ] = "ìžë™ 파ì¼ëŸ¿: 기능"; Text[ turkish ] = "Fonksiyon oto pilotu"; Text[ catalan ] = "AutoPilot: Funcions"; Text[ thai ] = "ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸™à¸³à¸£à¹ˆà¸à¸‡à¸à¸±à¸•à¹‚นมัติ"; @@ -1119,9 +1119,9 @@ ModelessDialog RID_SCDLG_FORMULA Text [ french ] = "AutoPilote de fonctions -" ; Text [ swedish ] = "Funktionsautopilot - " ; Text [ dutch ] = "Functie-AutoPiloot -" ; - Text [ spanish ] = "AutoPiloto de funciones - " ; + Text [ spanish ] = "Piloto automático: Funciones - " ; Text [ english_us ] = "AutoPilot: Functions -" ; - Text[ chinese_simplified ] = "å‡½æ•°è‡ªåŠ¨åŠ©ç† -"; + Text[ chinese_simplified ] = "自动文件助ç†ï¼šå‡½æ•° -"; Text[ russian ] = "Ìàñòåð: Ôóíêöèè -"; Text[ polish ] = "AutoPilot funkcji -"; Text[ japanese ] = "関数オートパイãƒãƒƒãƒˆ-"; @@ -1135,3 +1135,8 @@ ModelessDialog RID_SCDLG_FORMULA }; }; + + + + + diff --git a/sc/source/ui/formdlg/parawin.src b/sc/source/ui/formdlg/parawin.src index 517c4ddc00ae..3c77ee28607f 100644 --- a/sc/source/ui/formdlg/parawin.src +++ b/sc/source/ui/formdlg/parawin.src @@ -2,9 +2,9 @@ * * $RCSfile: parawin.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2002-11-27 16:36:31 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -236,3 +236,5 @@ TabPage RID_SCTAB_PARAMETER }; }; + + diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 4f162cb22036..054ccdbf2791 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleContextBase.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: sab $ $Date: 2002-12-04 15:39:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -397,8 +397,8 @@ private: */ ::rtl::OUString msName; - /// List of property change listeners. - cppu::OInterfaceContainerHelper* mpEventListeners; + /// client id in the AccessibleEventNotifier queue + sal_uInt32 mnClientId; /** This is the role of this object. */ diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index e92214255b86..0e6082a513e5 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleCsvControl.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2002-11-05 07:56:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -265,7 +265,7 @@ public: /** Returns the count of characters. */ virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException ); - /** Returns the character index at the specified screen coordinate. */ + /** Returns the character index at the specified coordinate (object's coordinate system). */ virtual sal_Int32 SAL_CALL getIndexAtPoint( const AwtPoint& rPoint ) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 1faa0472e54f..03042792bde2 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleDocumentPagePreview.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2002-05-24 15:22:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,10 +161,12 @@ protected: createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); +public: // needed in ScShapeChilds /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); +protected: /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 1d4454fff5a8..68ed80616543 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessiblePreviewHeaderCell.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2002-08-01 12:45:28 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,7 @@ #endif class ScPreviewShell; +class ScPreviewTableInfo; class accessibility::AccessibleTextHelper; typedef cppu::ImplHelper1< ::drafts::com::sun::star::accessibility::XAccessibleValue> @@ -98,7 +99,7 @@ public: ::drafts::com::sun::star::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const ScAddress& rCellPos, sal_Bool bIsColHdr, sal_Bool bIsRowHdr, - sal_Int32 nIndex, const Rectangle& rPosition ); + sal_Int32 nIndex ); protected: virtual ~ScAccessiblePreviewHeaderCell(); @@ -179,13 +180,14 @@ private: ScAddress maCellPos; sal_Bool mbColumnHeader; sal_Bool mbRowHeader; - Rectangle maPosition; + mutable ScPreviewTableInfo* mpTableInfo; sal_Bool IsDefunc( const com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); + void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 58bf0f9c98ad..853d5c55e2bd 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleText.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: sab $ $Date: 2002-10-01 16:47:28 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,6 +86,7 @@ class ScPreviewViewForwarder; class ScEditViewForwarder; class ScPreviewShell; class EditTextObject; +class ScCsvViewForwarder; // ============================================================================ @@ -359,7 +360,7 @@ class ScAccessibleCsvTextData : public ScAccessibleTextData { private: typedef ::std::auto_ptr< SvxTextForwarder > TextForwarderPtr; - typedef ::std::auto_ptr< SvxViewForwarder > ViewForwarderPtr; + typedef ::std::auto_ptr< ScCsvViewForwarder > ViewForwarderPtr; Window* mpWindow; EditEngine* mpEditEngine; diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 67e997657a99..35947de23a96 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -2,9 +2,9 @@ * * $RCSfile: csvcontrol.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dr $ $Date: 2002-08-16 13:00:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,21 +155,21 @@ enum ScMoveMode /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; -const ScCsvDiff CSV_DIFF_EQUAL = 0x00000000; -const ScCsvDiff CSV_DIFF_POSCOUNT = 0x00000001; -const ScCsvDiff CSV_DIFF_POSOFFSET = 0x00000002; -const ScCsvDiff CSV_DIFF_OFFSETX = 0x00000004; -const ScCsvDiff CSV_DIFF_CHARWIDTH = 0x00000008; -const ScCsvDiff CSV_DIFF_LINECOUNT = 0x00000010; -const ScCsvDiff CSV_DIFF_LINEOFFSET = 0x00000020; -const ScCsvDiff CSV_DIFF_OFFSETY = 0x00000040; -const ScCsvDiff CSV_DIFF_LINEHEIGHT = 0x00000080; -const ScCsvDiff CSV_DIFF_RULERCURSOR = 0x00000100; -const ScCsvDiff CSV_DIFF_GRIDCURSOR = 0x00000200; +const ScCsvDiff CSV_DIFF_EQUAL = 0x00000000; +const ScCsvDiff CSV_DIFF_POSCOUNT = 0x00000001; +const ScCsvDiff CSV_DIFF_POSOFFSET = 0x00000002; +const ScCsvDiff CSV_DIFF_HDRWIDTH = 0x00000004; +const ScCsvDiff CSV_DIFF_CHARWIDTH = 0x00000008; +const ScCsvDiff CSV_DIFF_LINECOUNT = 0x00000010; +const ScCsvDiff CSV_DIFF_LINEOFFSET = 0x00000020; +const ScCsvDiff CSV_DIFF_HDRHEIGHT = 0x00000040; +const ScCsvDiff CSV_DIFF_LINEHEIGHT = 0x00000080; +const ScCsvDiff CSV_DIFF_RULERCURSOR = 0x00000100; +const ScCsvDiff CSV_DIFF_GRIDCURSOR = 0x00000200; -const ScCsvDiff CSV_DIFF_HORIZONTAL = CSV_DIFF_POSCOUNT | CSV_DIFF_POSOFFSET | CSV_DIFF_OFFSETX | CSV_DIFF_CHARWIDTH; -const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFSET | CSV_DIFF_OFFSETY | CSV_DIFF_LINEHEIGHT; -const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; +const ScCsvDiff CSV_DIFF_HORIZONTAL = CSV_DIFF_POSCOUNT | CSV_DIFF_POSOFFSET | CSV_DIFF_HDRWIDTH | CSV_DIFF_CHARWIDTH; +const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFSET | CSV_DIFF_HDRHEIGHT | CSV_DIFF_LINEHEIGHT; +const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; // ---------------------------------------------------------------------------- @@ -183,7 +183,7 @@ struct ScCsvLayoutData sal_Int32 mnPosOffset; /// Horizontal scroll offset. sal_Int32 mnWinWidth; /// Width of ruler and data grid. - sal_Int32 mnOffsetX; /// X coordinate of first visible position. + sal_Int32 mnHdrWidth; /// Width of the header column. sal_Int32 mnCharWidth; /// Pixel width of one character. // vertical settings @@ -191,14 +191,15 @@ struct ScCsvLayoutData sal_Int32 mnLineOffset; /// Index of first visible line (0-based). sal_Int32 mnWinHeight; /// Height of entire data grid (incl. header). - sal_Int32 mnOffsetY; /// Y coordinate of first visible line. - sal_Int32 mnLineHeight; /// Height of one line. + sal_Int32 mnHdrHeight; /// Height of the header line. + sal_Int32 mnLineHeight; /// Height of a data line. // cursor settings sal_Int32 mnPosCursor; /// Position of ruler cursor. sal_Int32 mnColCursor; /// Position of grid column cursor. mutable sal_Int32 mnNoRepaint; /// >0 = no repaint. + bool mbAppRTL; /// true = application in RTL mode. explicit ScCsvLayoutData(); @@ -234,13 +235,13 @@ enum ScCsvCmdType // modify horizontal dimensions CSVCMD_SETPOSCOUNT, /// Change position/column count. [character count] CSVCMD_SETPOSOFFSET, /// Change position offset (scroll pos). [position] - CSVCMD_SETOFFSETX, /// Change X coordinate of first visible position. [X in pixel] + CSVCMD_SETHDRWIDTH, /// Change width of the header column. [width in pixel] CSVCMD_SETCHARWIDTH, /// Change character pixel width. [width in pixel] // modify vertical dimensions CSVCMD_SETLINECOUNT, /// Change number of data lines. [line count] CSVCMD_SETLINEOFFSET, /// Change first visible line. [line index] - CSVCMD_SETOFFSETY, /// Change Y coordinate of first visible line. [Y in pixel] + CSVCMD_SETHDRHEIGHT, /// Change height of top header line. [height in pixel] CSVCMD_SETLINEHEIGHT, /// Change data line pixel height. [height in pixel} // cursors/positions @@ -379,6 +380,8 @@ public: /** Returns a reference to the current layout data. */ inline const ScCsvLayoutData& GetLayoutData() const { return mrData; } + /** Returns true, if the Right-to-Left layout mode is active. */ + inline bool IsRTL() const { return mrData.mbAppRTL; } /** Returns the number of available positions. */ inline sal_Int32 GetPosCount() const { return mrData.mnPosCount; } @@ -396,10 +399,16 @@ public: /** Returns true, if nPos is an allowed AND visible split position. */ bool IsVisibleSplitPos( sal_Int32 nPos ) const; - /** Returns X coordinate of first visible position. */ - inline sal_Int32 GetOffsetX() const { return mrData.mnOffsetX; } + /** Returns the width of the header column. */ + inline sal_Int32 GetHdrWidth() const { return mrData.mnHdrWidth; } /** Returns the width of one character column. */ inline sal_Int32 GetCharWidth() const { return mrData.mnCharWidth; } + /** Returns the start position of the header column. */ + sal_Int32 GetHdrX() const; + /** Returns the X position of the first pixel of the data area. */ + sal_Int32 GetFirstX() const; + /** Returns the X position of the last pixel of the data area. */ + sal_Int32 GetLastX() const; /** Returns output X coordinate of the specified position. */ sal_Int32 GetX( sal_Int32 nPos ) const; /** Returns position from output coordinate. */ @@ -421,8 +430,8 @@ public: /** Returns true, if nLine is a valid and visible line index. */ bool IsVisibleLine( sal_Int32 nLine ) const; - /** Returns Y coordinate of first visible line. */ - inline sal_Int32 GetOffsetY() const { return mrData.mnOffsetY; } + /** Returns the height of the header line. */ + inline sal_Int32 GetHdrHeight() const { return mrData.mnHdrHeight; } /** Returns the height of one line. */ inline sal_Int32 GetLineHeight() const { return mrData.mnLineHeight; } /** Returns output Y coordinate of the specified line. */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 4871a3c069ba..b5d05c245f77 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -2,9 +2,9 @@ * * $RCSfile: csvgrid.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dr $ $Date: 2002-08-16 15:36:44 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ // ---------------------------------------------------------------------------- -namespace svx { class ColorConfig; } +namespace svtools { class ColorConfig; } class EditEngine; class ScEditEngineDefaulter; class ScAsciiOptions; @@ -148,7 +148,7 @@ private: VirtualDevice maGridDev; /// Data grid with selection and cursor. PopupMenu maPopup; /// Popup menu for column types. - ::svx::ColorConfig& mrColorConfig; /// Application color configuration. + ::svtools::ColorConfig& mrColorConfig; /// Application color configuration. Color maBackColor; /// Cell background color. Color maGridColor; /// Table grid color. Color maGridPBColor; /// Grid color for "first imported line" delimiter. diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 0e6f9eadf929..430c14e4b400 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: docfunc.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2002-10-22 13:29:36 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,7 @@ private: USHORT nPosX, USHORT nPosY, USHORT nTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2, BOOL& rCancel, BOOL bApi ); + void NotifyInputHandler( const ScAddress& rPos ); public: ScDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {} diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index 48dc45c76f3d..8e540dde1402 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fieldwnd.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2002-11-05 07:55:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,10 +112,12 @@ private: ScDPFieldType eType; /// Type of this area. Color aFaceColor; /// Color for dialog background. Color aWinColor; /// Color for window background. - Color aTextColor; /// Color for text output. + Color aTextColor; /// Color for text in buttons. + Color aWinTextColor; /// Color for text in field windows. long nFieldSize; /// Maximum count of fields. long nFieldCount; /// Count of existing fields. long nFieldSelected; /// Currently selected field. + bool mbAppRTL; /// true = Application in RTL display mode. com::sun::star::uno::WeakReference< ::drafts::com::sun::star::accessibility::XAccessible > xAccessible; ScAccessibleDataPilotControl* pAccessible; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index ee667fcaf3f0..905178b9c0ee 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inputwin.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: sab $ $Date: 2002-11-19 15:05:53 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,6 +146,7 @@ private: ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt EditView* pEditView; ScAccessibleEditLineTextData* pAccTextData; + BOOL bIsRTL; BOOL bIsInsertMode; BOOL bFormulaMode; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index b0eeecba6258..1c19586812fa 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: olinewin.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dr $ $Date: 2002-09-18 13:59:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,10 +86,15 @@ private: ScViewData& mrViewData; /// View data containing the document. ScSplitPos meWhich; /// Which area in split window. bool mbHoriz; /// true = Horizontal orientation. + bool mbAppRTL; /// true = Application in RTL display mode. + bool mbMirrorHdr; /// true = Header at end of the window (bottom or right). ImageList* mpSymbols; /// Symbols for buttons. Color maLineColor; /// Line color for expanded groups. - sal_Int32 mnHeaderSize; /// Width or height of header area. + sal_Int32 mnHeaderSize; /// Size of the header area in entry direction. + sal_Int32 mnHeaderPos; /// Position of the header area in entry direction. + sal_Int32 mnMainFirstPos; /// First position of main area in entry direction. + sal_Int32 mnMainLastPos; /// Last position of main area in entry direction. sal_uInt16 mnMTLevel; /// Mouse tracking: Level of active button. sal_uInt16 mnMTEntry; /// Mouse tracking: Entry index of active button. @@ -194,12 +199,23 @@ private: /** Collapses the specified entry (does nothing with header entries). */ void DoCollapse( sal_uInt16 nLevel, sal_uInt16 nEntry ) const; + /** Returns true, if the focused button is visible in the window. */ + bool IsFocusButtonVisible() const; + /** Calculates index of next/previous focus button in the current level (no paint). + @param bFindVisible true = repeats until a visible button has been found. @return true = focus wrapped from end to start or vice versa. */ - bool ImplMoveFocusByEntry( bool bForward ); + bool ImplMoveFocusByEntry( bool bForward, bool bFindVisible ); /** Calculates position of focus button in next/previous level (no paint). @return true = focus wrapped from end to start or vice versa. */ bool ImplMoveFocusByLevel( bool bForward ); + /** Calculates position of focus button in tab order. + @param bFindVisible true = repeats until a visible button has been found. + @return true = focus wrapped from end to start or vice versa. */ + bool ImplMoveFocusByTabOrder( bool bForward, bool bFindVisible ); + + /** If the focused entry is invisible, tries to move to visible position. */ + void ImplMoveFocusToVisible( bool bForward ); /** Focuses next/previous button in the current level. */ void MoveFocusByEntry( bool bForward ); diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 1d1b8835a719..d1c79f382263 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -2,9 +2,9 @@ * * $RCSfile: output.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2002-11-12 09:21:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,6 +170,7 @@ private: BOOL bAnyRotated; // intern BOOL bAnyClipped; // intern BOOL bTabProtected; + BYTE nTabTextDirection; // EEHorizontalTextDirection values // private Methoden @@ -180,6 +181,9 @@ private: BOOL IsEmptyCellText( RowInfo* pThisRowInfo, USHORT nX, USHORT nY ); void GetVisibleCell( USHORT nCol, USHORT nRow, USHORT nTab, ScBaseCell*& rpCell ); + BOOL IsAvailable( USHORT nX, USHORT nY ); + long GetAvailableWidth( USHORT nX, USHORT nY, long nNeeded ); + void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); @@ -187,6 +191,8 @@ private: double GetStretch(); + void DrawRotatedFrame( const Color* pForceColor ); // pixel + public: ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, RowInfo* pNewRowInfo, USHORT nNewCount, @@ -232,7 +238,6 @@ public: void DrawEdit(BOOL bPixelToLogic); void FindRotated(); - void DrawRotatedFrame(); // Pixel void DrawRotated(BOOL bPixelToLogic); // logisch void DrawClear(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index b32e940803e1..53dba57e003c 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: preview.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2002-09-02 14:34:56 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,6 +160,8 @@ public: DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* ); static void StaticInvalidate(); + + FmFormView* GetDrawView() { return pDrawView; } }; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index a139d641f15b..c1840ca13591 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: prevwsh.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: nn $ $Date: 2002-02-27 19:34:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,7 @@ class ScPreviewShell: public SfxViewShell Window* pCorner; String aSourceData; // ViewData + BYTE nSourceDesignMode; // form design mode from TabView SvxZoomType eZoom; SfxBroadcaster* pAccessibilityBroadcaster; @@ -150,6 +151,7 @@ public: void FillFieldData( ScHeaderFieldData& rData ); const String& GetSourceData() const { return aSourceData; } + BYTE GetSourceDesignMode() const { return nSourceDesignMode; } virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ); @@ -168,6 +170,7 @@ public: const ScPreviewLocationData& GetLocationData(); ScDocument* GetDocument(); + ScPreview* GetPreview() { return pPreview; } }; diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index bbf64819b7da..1c4a92d683ea 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pvlaydlg.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dr $ $Date: 2002-10-21 17:48:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,11 +140,14 @@ public: PointerStyle NotifyMouseButtonDown( ScDPFieldType eType, long nFieldIndex ); void NotifyMouseButtonUp ( const Point& rAt ); PointerStyle NotifyMouseMove ( const Point& rAt ); - void NotifyFieldFocus ( ScDPFieldType eType, BOOL bActive ); + void NotifyFieldFocus ( ScDPFieldType eType, BOOL bGotFocus ); void NotifyMoveField ( ScDPFieldType eToType ); void NotifyRemoveField ( ScDPFieldType eType, long nFieldIndex ); BOOL NotifyMoveSlider ( USHORT nKeyCode ); // return TRUE, if position changed +protected: + virtual void Deactivate(); + private: FixedLine aFlLayout; FixedText aFtCol; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index a824b1ca987d..a6b80d410ded 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: nn $ $Date: 2002-11-28 14:58:45 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,6 +105,7 @@ struct ChartSelectionInfo; class SdrHdlList; #define SPLIT_HANDLE_SIZE 3 +#define SC_FORCEMODE_NONE 0xff // --------------------------------------------------------------------------- // Hilfs - Fenster @@ -235,7 +236,7 @@ protected: void DrawEnableAnim(BOOL bSet); void DrawShowMarkHdl(BOOL bShow); - void MakeDrawView(); + void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); void HideNoteMarker(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 8a581cf73bdc..6c35a90b8dd9 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: sab $ $Date: 2002-10-18 12:29:38 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,7 +213,7 @@ private: private: - void Construct(); + void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); void SetMySubShell( SfxShell* pShell ); SfxShell* GetMySubShell() const; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 120427a83a21..cfb6d97528c8 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tphf.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:01 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6843d2438a8a..e8eb14c46c52 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewdata.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sab $ $Date: 2002-10-18 12:29:36 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -405,7 +405,7 @@ public: { return pEditView[eWhich]; } void EditGrowX(); - void EditGrowY(); + void EditGrowY( BOOL bInitial = FALSE ); USHORT GetEditViewCol() const { return nEditCol; } USHORT GetEditViewRow() const { return nEditRow; } diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index fffe5e91e296..2dc0df215926 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acredlin.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: nn $ $Date: 2002-10-28 15:31:02 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -304,6 +304,8 @@ void __EXPORT ScAcceptChgDlg::Init() ScChangeViewSettings* pViewSettings=pDoc->GetChangeViewSettings(); if ( pViewSettings!=NULL ) aChangeViewSet = *pViewSettings; + // adjust TimeField for filter tabpage + aChangeViewSet.AdjustDateMode( *pDoc ); pTPFilter->CheckDate(aChangeViewSet.HasDate()); pTPFilter->SetFirstDate(aChangeViewSet.GetTheFirstDateTime()); @@ -1192,7 +1194,7 @@ void ScAcceptChgDlg::RejectFiltered() { if(IsValidAction(pScChangeAction)) { - pChanges->Accept((ScChangeAction*)pScChangeAction); + pChanges->Reject((ScChangeAction*)pScChangeAction); } } pScChangeAction=pScChangeAction->GetPrev(); diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src index b9f9fad67cfc..41d0ab4ce010 100644 --- a/sc/source/ui/miscdlgs/acredlin.src +++ b/sc/source/ui/miscdlgs/acredlin.src @@ -2,9 +2,9 @@ * * $RCSfile: acredlin.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:30:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,20 +103,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ french ] = "Plage" ; Text [ dutch ] = "Bereik" ; Text [ portuguese ] = "Intervalo" ; - Text[ chinese_simplified ] = "ÇøÓò"; + Text[ chinese_simplified ] = "区域"; Text[ russian ] = "Äèàïàçîí"; Text[ polish ] = "Zakres"; - Text[ japanese ] = "”͈Í"; - Text[ chinese_traditional ] = "°Ï°ì"; + Text[ japanese ] = "範囲"; + Text[ chinese_traditional ] = "å€åŸŸ"; Text[ arabic ] = "äØÇÞ"; Text[ dutch ] = "Bereik"; - Text[ chinese_simplified ] = "ÇøÓò"; + Text[ chinese_simplified ] = "区域"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "¹üÀ§"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Área"; + Text[ catalan ] = "Àrea"; Text[ finnish ] = "Alue"; + Text[ thai ] = "ช่วง"; }; Edit ED_ASSIGN { @@ -145,20 +146,21 @@ ModelessDialog RID_SCDLG_CHANGES QuickHelpText [ portuguese ] = "Afastar/Aproximar" ; QuickHelpText[ russian ] = "Óìåíüøèòü/Óâåëè÷èòü"; QuickHelpText[ polish ] = "Pomniejsz/Powiêksz"; - QuickHelpText[ japanese ] = "k¬/Šg‘å"; - QuickHelpText[ chinese_simplified ] = "ËõС/·Å´ó"; - QuickHelpText[ chinese_traditional ] = "ÁY¤p/©ñ¤j"; + QuickHelpText[ japanese ] = "縮å°/拡大"; + QuickHelpText[ chinese_simplified ] = "缩å°/放大"; + QuickHelpText[ chinese_traditional ] = "縮å°/放大"; QuickHelpText[ arabic ] = "ÊÕÛíÑ/ÊßÈíÑ"; QuickHelpText[ dutch ] = "Verkleinen/vergroten"; - QuickHelpText[ chinese_simplified ] = "ËõС/·Å´ó"; + QuickHelpText[ chinese_simplified ] = "缩å°/放大"; QuickHelpText[ greek ] = "Óìßêñõíóç/ÌåãÝèõíóç"; - QuickHelpText[ korean ] = "Ãà¼Ò£¯È®´ë"; + QuickHelpText[ korean ] = "축소ï¼í™•ëŒ€"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern/Vergrößern"; - QuickHelpText[ catalan ] = "Reducir/Aumentar"; - QuickHelpText[ finnish ] = "Pienennä/Suurenna"; + QuickHelpText[ catalan ] = "Redueix/Augmenta"; + QuickHelpText[ finnish ] = "Pienennä/suurenna"; + QuickHelpText[ thai ] = "Minimize/Maximize"; }; String STR_INSERT_COLS { @@ -173,10 +175,10 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Columna insertada" ; Text [ french ] = "Colonne insérée" ; Text [ dutch ] = "Kolom ingevoegd" ; - Text[ chinese_simplified ] = "¼ÓÈëµÄÁÐ"; + Text[ chinese_simplified ] = "åŠ å…¥çš„åˆ—"; Text[ russian ] = "Ñòîëáåö âñòàâëåí"; Text[ polish ] = "Wstawiona kolumna"; - Text[ japanese ] = "—ñ‚ª‘}“ü‚³‚ê‚Ü‚µ‚½"; + Text[ japanese ] = "列ãŒæŒ¿å…¥ã•ã‚Œã¾ã—ãŸ"; Text[ english_us ] = "Column inserted"; Text[ portuguese ] = "Coluna inserida"; Text[ russian ] = "Ñòîëáåö âñòàâëåí"; @@ -188,18 +190,19 @@ ModelessDialog RID_SCDLG_CHANGES Text[ swedish ] = "Kolumn infogad"; Text[ polish ] = "Wstawiona kolumna"; Text[ portuguese_brazilian ] = "Spalte eingef?t"; - Text[ japanese ] = "—ñ‚ª‘}“ü‚³‚ê‚Ü‚µ‚½"; - Text[ chinese_simplified ] = "¼ÓÈëµÄÁÐ"; - Text[ chinese_traditional ] = "Äæ¤w¸g´¡¤J"; + Text[ japanese ] = "列ãŒæŒ¿å…¥ã•ã‚Œã¾ã—ãŸ"; + Text[ chinese_simplified ] = "åŠ å…¥çš„åˆ—"; + Text[ chinese_traditional ] = "欄已經æ’å…¥"; Text[ arabic ] = "ÚãæÏ ãÏÑÌ"; Text[ dutch ] = "Kolom ingevoegd"; - Text[ chinese_simplified ] = "¼ÓÈëµÄÁÐ"; + Text[ chinese_simplified ] = "åŠ å…¥çš„åˆ—"; Text[ greek ] = "Óõìðëçñþèçêå ç åéóáãùãÞ ôçò óôÞëçò"; - Text[ korean ] = "¿ÀÌ »ðÀԵǾú½À´Ï´Ù."; + Text[ korean ] = "ì—´ì´ ì‚½ìž…ë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Sütun eklendi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columna insertada"; + Text[ catalan ] = "S'ha inserit una columna"; Text[ finnish ] = "Sarake lisätty"; + Text[ thai ] = "à¹à¸—รà¸à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; String STR_INSERT_ROWS { @@ -214,20 +217,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Fila insertada" ; Text [ french ] = "Ligne insérée" ; Text [ dutch ] = "Rij ingevoegd" ; - Text[ chinese_simplified ] = "Ðб»²åÈë"; + Text[ chinese_simplified ] = "行被æ’å…¥"; Text[ russian ] = "Ñòðîêà âñòàâëåíà"; Text[ polish ] = "Usuniêty wiersz"; - Text[ japanese ] = "s‚ª‘}“ü‚³‚ê‚Ü‚µ‚½"; - Text[ chinese_traditional ] = "¦C³Q´¡¤J"; + Text[ japanese ] = "è¡ŒãŒæŒ¿å…¥ã•ã‚Œã¾ã—ãŸ"; + Text[ chinese_traditional ] = "列被æ’å…¥"; Text[ arabic ] = "ÓØÑ ãÏÑÌ"; Text[ dutch ] = "Rij ingevoegd"; - Text[ chinese_simplified ] = "Ðб»²åÈë"; + Text[ chinese_simplified ] = "行被æ’å…¥"; Text[ greek ] = "Ç óôÞëç åéóÜ÷èçêå"; - Text[ korean ] = "ÇàÀÌ »ðÀԵǾú½À´Ï´Ù."; + Text[ korean ] = "í–‰ì´ ì‚½ìž…ë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Satýr eklendi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fila insertada"; - Text[ finnish ] = "Rivi lisätty"; + Text[ catalan ] = "S'ha inserit una fila "; + Text[ finnish ] = "Rivi lisätty "; + Text[ thai ] = "à¹à¸—รà¸à¹à¸–ว "; }; String STR_INSERT_TABS { @@ -241,21 +245,22 @@ ModelessDialog RID_SCDLG_CHANGES Text [ italian ] = "Tabella inserita" ; Text [ spanish ] = "Hoja insertada" ; Text [ french ] = "Feuille insérée" ; - Text [ dutch ] = "Tabelle ingevoegd" ; - Text[ chinese_simplified ] = "¼ÓÈ빤×÷±í"; - Text[ russian ] = "Òàáëèöà âñòàâëåíà"; + Text [ dutch ] = "Tabel ingevoegd" ; + Text[ chinese_simplified ] = "åŠ å…¥å·¥ä½œè¡¨"; + Text[ russian ] = "Ëèñò âñòàâëåí"; Text[ polish ] = "Wstawiona tabela"; - Text[ japanese ] = "•\\‚ª‘}“ü‚³‚ê‚Ü‚µ‚½"; - Text[ chinese_traditional ] = "¥[¤J¤u§@ªí"; + Text[ japanese ] = "表ãŒæŒ¿å…¥ã•ã‚Œã¾ã—ãŸ"; + Text[ chinese_traditional ] = "åŠ å…¥å·¥ä½œè¡¨"; Text[ arabic ] = "ÌÏæá ãÏÑÌ"; - Text[ dutch ] = "Tabelle ingevoegd"; - Text[ chinese_simplified ] = "¼ÓÈ빤×÷±í"; + Text[ dutch ] = "Tabel ingevoegd"; + Text[ chinese_simplified ] = "åŠ å…¥å·¥ä½œè¡¨"; Text[ greek ] = "Ï ðßíáêáò åéóÜ÷èçêå"; - Text[ korean ] = "½ÃÆ®°¡ »ðÀԵǾú½À´Ï´Ù."; + Text[ korean ] = "시트가 삽입ë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Tablo eklendi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja insertada"; - Text[ finnish ] = "Lomake lisätty "; + Text[ catalan ] = "S'ha inserit un full "; + Text[ finnish ] = "Taulukko lisätty "; + Text[ thai ] = "à¹à¸—รà¸à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™ "; }; String STR_DELETE_COLS { @@ -267,23 +272,24 @@ ModelessDialog RID_SCDLG_CHANGES Text [ swedish ] = "Kolumn raderad" ; Text [ danish ] = "Kolonne slettet" ; Text [ italian ] = "Colonna cancellata" ; - Text [ spanish ] = "Columna eliminada" ; + Text [ spanish ] = "Columna borrada" ; Text [ french ] = "Colonne supprimée" ; Text [ dutch ] = "Kolom verwijderd" ; - Text[ chinese_simplified ] = "ɾ³ýµÄÁÐ"; + Text[ chinese_simplified ] = "åˆ é™¤çš„åˆ—"; Text[ russian ] = "Ñòîëáåö óäàëåí"; Text[ polish ] = "Usuniêta kolumna"; - Text[ japanese ] = "—ñ‚ªíœ‚³‚ê‚Ü‚µ‚½"; - Text[ chinese_traditional ] = "Äæ¤w¸g§R°£"; + Text[ japanese ] = "列ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ"; + Text[ chinese_traditional ] = "欄已經刪除"; Text[ arabic ] = "ÚãæÏ ãÍÐæÝ"; Text[ dutch ] = "Kolom verwijderd"; - Text[ chinese_simplified ] = "ɾ³ýµÄÁÐ"; + Text[ chinese_simplified ] = "åˆ é™¤çš„åˆ—"; Text[ greek ] = "Ç óôÞëç Ý÷åé äéáãñáöåß"; - Text[ korean ] = "¿ÀÌ »èÁ¦µÇ¾ú½À´Ï´Ù."; + Text[ korean ] = "ì—´ì´ ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Sütun silindi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columna eliminada"; + Text[ catalan ] = "S'ha suprimit la columna"; Text[ finnish ] = "Sarake poistettu"; + Text[ thai ] = "ลบคà¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; String STR_DELETE_ROWS { @@ -295,23 +301,24 @@ ModelessDialog RID_SCDLG_CHANGES Text [ swedish ] = "Rad raderad" ; Text [ danish ] = "Række slettet" ; Text [ italian ] = "Riga cancellata" ; - Text [ spanish ] = "Fila eliminada" ; + Text [ spanish ] = "Fila borrada" ; Text [ french ] = "Ligne supprimée" ; Text [ dutch ] = "Rij verwijderd" ; - Text[ chinese_simplified ] = "Ðб»É¾³ý"; + Text[ chinese_simplified ] = "è¡Œè¢«åˆ é™¤"; Text[ russian ] = "Ñòðîêà óäàëåíà"; Text[ polish ] = "Usuniêty wiersz"; - Text[ japanese ] = "s‚ªíœ‚³‚ê‚Ü‚µ‚½"; - Text[ chinese_traditional ] = "¦C³Q§R°£"; + Text[ japanese ] = "è¡ŒãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ"; + Text[ chinese_traditional ] = "列被刪除"; Text[ arabic ] = "ÓØÑ ãÍÐæÝ"; Text[ dutch ] = "Rij verwijderd"; - Text[ chinese_simplified ] = "Ðб»É¾³ý"; + Text[ chinese_simplified ] = "è¡Œè¢«åˆ é™¤"; Text[ greek ] = "Ç ãñáììÞ Ý÷åé äéáãñáöåß"; - Text[ korean ] = "ÇàÀÌ »èÁ¦µÇ¾ú½À´Ï´Ù."; + Text[ korean ] = "í–‰ì´ ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Satýr silindi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fila eliminada"; + Text[ catalan ] = "S'ha suprimit la fila"; Text[ finnish ] = "Rivi poistettu"; + Text[ thai ] = "ลบà¹à¸–ว"; }; String STR_DELETE_TABS { @@ -323,23 +330,24 @@ ModelessDialog RID_SCDLG_CHANGES Text [ swedish ] = "Tabell raderad" ; Text [ danish ] = "Ark slettet" ; Text [ italian ] = "Tabella cancellata" ; - Text [ spanish ] = "Hoja eliminada" ; + Text [ spanish ] = "Hoja borrada" ; Text [ french ] = "Feuille supprimée" ; Text [ dutch ] = "Tabel gewist" ; - Text[ chinese_simplified ] = "ɾ³ýµÄ¹¤×÷±í"; - Text[ russian ] = "Òàáëèöà óäàëåíà"; + Text[ chinese_simplified ] = "åˆ é™¤çš„å·¥ä½œè¡¨"; + Text[ russian ] = "Ëèñò óäàëåí"; Text[ polish ] = "Usuniêta tabela"; - Text[ japanese ] = "•\\‚ªíœ‚³‚ê‚Ü‚µ‚½"; - Text[ chinese_traditional ] = "§R°£ªº¤u§@ªí"; + Text[ japanese ] = "表ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ"; + Text[ chinese_traditional ] = "刪除的工作表"; Text[ arabic ] = "ÌÏæá ãÍÐæÝ"; Text[ dutch ] = "Tabel gewist"; - Text[ chinese_simplified ] = "ɾ³ýµÄ¹¤×÷±í"; + Text[ chinese_simplified ] = "åˆ é™¤çš„å·¥ä½œè¡¨"; Text[ greek ] = "ÄéáãñáììÝíïé ðßíáêåò"; - Text[ korean ] = "½ÃÆ®°¡ »èÁ¦µÇ¾ú½À´Ï´Ù."; + Text[ korean ] = "시트가 ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Tablo silindi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja eliminada"; - Text[ finnish ] = "Lomake poistettu"; + Text[ catalan ] = "S'ha suprimit el full"; + Text[ finnish ] = "Taulukko poistettu"; + Text[ thai ] = "ลบà¹à¸œà¹ˆà¸™à¸‡à¸²à¸™"; }; String STR_MOVE { @@ -354,20 +362,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Área desplazada" ; Text [ french ] = "Plage déplacée" ; Text [ dutch ] = "Bereik verplaatst" ; - Text[ chinese_simplified ] = "Òƶ¯ÇøÓò"; - Text[ russian ] = "Îáëàñòü ïåðåìåùåíà"; + Text[ chinese_simplified ] = "移动区域"; + Text[ russian ] = "Äèàïàçîí ïåðåìåùåí"; Text[ polish ] = "Przesuniêty obszar"; - Text[ japanese ] = "”͈͂̈ړ®"; - Text[ chinese_traditional ] = "²¾°Ê°Ï°ì"; + Text[ japanese ] = "範囲ã®ç§»å‹•"; + Text[ chinese_traditional ] = "移動å€åŸŸ"; Text[ arabic ] = "äØÇÞ ãÍÑß"; Text[ dutch ] = "Bereik verplaatst"; - Text[ chinese_simplified ] = "Òƶ¯ÇøÓò"; + Text[ chinese_simplified ] = "移动区域"; Text[ greek ] = "Ç ðåñéï÷Þ åðéëïãÞò ìåôáêéíÞèçêå"; - Text[ korean ] = "¹üÀ§°¡ À̵¿µÇ¾ú½À´Ï´Ù."; + Text[ korean ] = "범위가 ì´ë™ë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Aralýk kaydýrýldý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Área desplazada"; + Text[ catalan ] = "S'ha mogut l'àrea"; Text[ finnish ] = "Aluetta siirretty"; + Text[ thai ] = "ย้ายช่วง"; }; String STR_CONTENT { @@ -381,21 +390,22 @@ ModelessDialog RID_SCDLG_CHANGES Text [ italian ] = "Modifica contenuto" ; Text [ spanish ] = "Modificación de contenido" ; Text [ french ] = "Modification de contenu" ; - Text [ dutch ] = "Inhoudsverandering" ; - Text[ chinese_simplified ] = "ÄÚÈݸü¸Ä"; + Text [ dutch ] = "Inhoudswijziging" ; + Text[ chinese_simplified ] = "内容更改"; Text[ russian ] = "Èçìåíåíèå ñîäåðæèìîãî"; Text[ polish ] = "Zmiana zawartoœci"; - Text[ japanese ] = "“à—e‚Ì•ÏX"; - Text[ chinese_traditional ] = "¤º®eÅܧó"; + Text[ japanese ] = "内容ã®å¤‰æ›´"; + Text[ chinese_traditional ] = "內容變更"; Text[ arabic ] = "ÊÛííÑ ÇáãÍÊæíÇÊ"; - Text[ dutch ] = "Inhoudsverandering"; - Text[ chinese_simplified ] = "ÄÚÈݸü¸Ä"; + Text[ dutch ] = "Inhoudswijziging"; + Text[ chinese_simplified ] = "内容更改"; Text[ greek ] = "ÁëëáãÝò ðåñéå÷ïìÝíùí"; - Text[ korean ] = "³»¿ë º¯°æ"; + Text[ korean ] = "ë‚´ìš© 변경"; Text[ turkish ] = "Ýçerik deðiþikliði"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificación de contenido"; + Text[ catalan ] = "El contingut ha canviat"; Text[ finnish ] = "Muutettu sisältö"; + Text[ thai ] = "เปลี่ยนเนื้à¸à¸«à¸²"; }; String STR_CONTENT_WITH_CHILD { @@ -409,21 +419,22 @@ ModelessDialog RID_SCDLG_CHANGES Text [ italian ] = "Modifica contenuto" ; Text [ spanish ] = "Modificación de contenido" ; Text [ french ] = "Modification de contenu" ; - Text [ dutch ] = "Inhoudsverandering" ; - Text[ chinese_simplified ] = "ÄÚÈݸü¸Ä"; + Text [ dutch ] = "Inhoudswijziging" ; + Text[ chinese_simplified ] = "内容更改"; Text[ russian ] = "Èçìåíåíèå ñîäåðæèìîãî"; Text[ polish ] = "Zmiana zawartoœci"; - Text[ japanese ] = "“à—e‚Ì•ÏX"; - Text[ chinese_traditional ] = "¤º®eÅܧó"; + Text[ japanese ] = "内容ã®å¤‰æ›´"; + Text[ chinese_traditional ] = "內容變更"; Text[ arabic ] = "ÊÛííÑ ÇáãÍÊæíÇÊ"; - Text[ dutch ] = "Inhoudsverandering"; - Text[ chinese_simplified ] = "ÄÚÈݸü¸Ä"; + Text[ dutch ] = "Inhoudswijziging"; + Text[ chinese_simplified ] = "内容更改"; Text[ greek ] = "ÁëëáãÝò ðåñéå÷ïìÝíùí"; - Text[ korean ] = "³»¿ë º¯°æ"; + Text[ korean ] = "ë‚´ìš© 변경"; Text[ turkish ] = "Ýçerik deðiþikliði"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificación de contenido"; + Text[ catalan ] = "El contingut ha canviat"; Text[ finnish ] = "Muutettu sisältö"; + Text[ thai ] = "เปลี่ยนเนื้à¸à¸«à¸²"; }; String STR_CHILD_CONTENT { @@ -435,23 +446,24 @@ ModelessDialog RID_SCDLG_CHANGES Text [ swedish ] = "Ändring till " ; Text [ danish ] = "Ændring til " ; Text [ italian ] = "Modificato in " ; - Text [ spanish ] = "Cambiada a " ; + Text [ spanish ] = "Modificación en" ; Text [ french ] = "Modification dans " ; - Text [ dutch ] = "Wijziging in " ; - Text[ chinese_simplified ] = "¸ü¸Ä³É "; + Text [ dutch ] = "Wijziging bij" ; + Text[ chinese_simplified ] = "æ›´æ”¹æˆ "; Text[ russian ] = "Èçìåíåíèÿ ê "; Text[ polish ] = "Zmieniony na "; - Text[ japanese ] = "•ÏX "; - Text[ chinese_traditional ] = "Åܧó¦Ü "; + Text[ japanese ] = "変更 "; + Text[ chinese_traditional ] = "變更至 "; Text[ arabic ] = "ÊÛííÑ Åáì "; - Text[ dutch ] = "Wijziging in "; - Text[ chinese_simplified ] = "¸ü¸Ä³É "; + Text[ dutch ] = "Wijziging bij"; + Text[ chinese_simplified ] = "æ›´æ”¹æˆ "; Text[ greek ] = "ÁëëáãÞ ðñïò "; - Text[ korean ] = "·Î º¯°æ "; + Text[ korean ] = "변경 "; Text[ turkish ] = "Deðiþiklikler: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiada a "; + Text[ catalan ] = "S'ha canviat a "; Text[ finnish ] = "Muutos "; + Text[ thai ] = "เปลี่ยนไปที่ "; }; String STR_CHILD_ORGCONTENT { @@ -466,20 +478,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Original" ; Text [ french ] = "Original" ; Text [ dutch ] = "Origineel" ; - Text[ chinese_simplified ] = "Ô¼þ"; + Text[ chinese_simplified ] = "原件"; Text[ russian ] = "Îðèãèíàë"; Text[ polish ] = "Orygina³"; - Text[ japanese ] = "µØ¼ÞÅÙ"; - Text[ chinese_traditional ] = "ì¥ó"; + Text[ japanese ] = "オリジナル"; + Text[ chinese_traditional ] = "原件"; Text[ arabic ] = "ÇáÃÕá"; Text[ dutch ] = "Origineel"; - Text[ chinese_simplified ] = "Ô¼þ"; + Text[ chinese_simplified ] = "原件"; Text[ greek ] = "Áñ÷éêü"; - Text[ korean ] = "¿øº»"; + Text[ korean ] = "ì›ë³¸"; Text[ turkish ] = "Özgün hali"; Text[ language_user1 ] = " "; Text[ catalan ] = "Original"; Text[ finnish ] = "Alkuperäinen"; + Text[ thai ] = "ต้นฉบับ"; }; String STR_REJECT { @@ -494,20 +507,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Modificación rechazada" ; Text [ french ] = "Modification refusée" ; Text [ dutch ] = "Wijziging verworpen" ; - Text[ chinese_simplified ] = "È¡Ïû¸ü¸Ä"; + Text[ chinese_simplified ] = "å–消更改"; Text[ russian ] = "Èçìåíåíèÿ îòêëîíåíû"; Text[ polish ] = "Zmiany odrzucono"; - Text[ japanese ] = "•ÏX‚µ‚È‚¢"; - Text[ chinese_traditional ] = "¨ú®øÅܧó"; + Text[ japanese ] = "変更ã—ãªã„"; + Text[ chinese_traditional ] = "å–消變更"; Text[ arabic ] = "ÑÝÖ ÇáÊÛííÑÇÊ"; Text[ dutch ] = "Wijziging verworpen"; - Text[ chinese_simplified ] = "È¡Ïû¸ü¸Ä"; + Text[ chinese_simplified ] = "å–消更改"; Text[ greek ] = "ÁëëáãÝò áðïññßöèçêáí"; - Text[ korean ] = "º¯°æÀÌ Ãë¼ÒµÇ¾ú½À´Ï´Ù."; + Text[ korean ] = "ë³€ê²½ì´ ì·¨ì†Œë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Deðiþiklikler reddedildi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificación rechazada"; + Text[ catalan ] = "Els canvis s'han rebutjat"; Text[ finnish ] = "Muutokset hylätty"; + Text[ thai ] = "ปà¸à¸´à¹€à¸ªà¸˜à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡"; }; String STR_ACCEPTED { @@ -522,20 +536,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Aceptadas" ; Text [ french ] = "Acceptées" ; Text [ dutch ] = "Geaccepteerde" ; - Text[ chinese_simplified ] = "½ÓÊܵÄ"; + Text[ chinese_simplified ] = "接å—çš„"; Text[ russian ] = "Ïðèíÿòûå"; Text[ polish ] = "Zaakceptowane"; - Text[ japanese ] = "³”F"; - Text[ chinese_traditional ] = "±µ¨üªº"; + Text[ japanese ] = "承èª"; + Text[ chinese_traditional ] = "接å—çš„"; Text[ arabic ] = "ãÞÈæáÉ"; Text[ dutch ] = "Geaccepteerde"; - Text[ chinese_simplified ] = "½ÓÊܵÄ"; + Text[ chinese_simplified ] = "接å—çš„"; Text[ greek ] = "Áðïäå÷üìåíá"; - Text[ korean ] = "Àû¿ëµÊ"; + Text[ korean ] = "ì ìš©ë¨"; Text[ turkish ] = "Kabul edilenler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aceptadas"; + Text[ catalan ] = "Acceptat"; Text[ finnish ] = "Hyväksytty"; + Text[ thai ] = "ยà¸à¸¡à¸£à¸±à¸šà¹„ด้"; }; String STR_REJECTED { @@ -550,20 +565,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Rechazadas" ; Text [ french ] = "Refusées" ; Text [ dutch ] = "Geweigerde" ; - Text[ chinese_simplified ] = "±»¾Ü¾øµÄ"; + Text[ chinese_simplified ] = "被拒ç»çš„"; Text[ russian ] = "Îòêëîíåííûå"; Text[ polish ] = "Odrzucone"; - Text[ japanese ] = "”jŠü"; - Text[ chinese_traditional ] = "³Q©Úµ´ªº"; + Text[ japanese ] = "ç ´æ£„"; + Text[ chinese_traditional ] = "被拒絕的"; Text[ arabic ] = "ãÑÝæÖÉ"; Text[ dutch ] = "Geweigerde"; - Text[ chinese_simplified ] = "±»¾Ü¾øµÄ"; + Text[ chinese_simplified ] = "被拒ç»çš„"; Text[ greek ] = "Áðïññéðôüìåíá"; - Text[ korean ] = "°ÅºÎµÊ"; + Text[ korean ] = "거부"; Text[ turkish ] = "Reddedilenler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Rechazadas"; + Text[ catalan ] = "Rebutjat"; Text[ finnish ] = "Hylätty"; + Text[ thai ] = "ปà¸à¸´à¹€à¸ªà¸˜"; }; String STR_NO_ENTRY { @@ -578,20 +594,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "Ninguna entrada" ; Text [ french ] = "Pas d'entrée" ; Text [ dutch ] = "Geen item" ; - Text[ chinese_simplified ] = "ÎÞÌõÄ¿"; - Text[ russian ] = "Áåç çàïèñè"; + Text[ chinese_simplified ] = "æ— æ¡ç›®"; + Text[ russian ] = "Ïóñòî"; Text[ polish ] = "Nie ma wpisu"; - Text[ japanese ] = "“ü—Í‚È‚µ"; - Text[ chinese_traditional ] = "µL±ø¥Ø"; + Text[ japanese ] = "入力ãªã—"; + Text[ chinese_traditional ] = "ç„¡æ¢ç›®"; Text[ arabic ] = "áÇ íæÌÏ ÅÏÎÇá"; Text[ dutch ] = "Geen item"; - Text[ chinese_simplified ] = "ÎÞÌõÄ¿"; + Text[ chinese_simplified ] = "æ— æ¡ç›®"; Text[ greek ] = "Êáìßá êáôá÷þñéóç"; - Text[ korean ] = "µî·ÏÀÌ ¾ÈµÇ¾ú½À´Ï´Ù"; + Text[ korean ] = "í•ëª© ì—†ìŒ"; Text[ turkish ] = "Giriþ yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ninguna entrada"; + Text[ catalan ] = "Cap entrada"; Text[ finnish ] = "Ei merkintää"; + Text[ thai ] = "ไม่มีรายà¸à¸²à¸£"; }; String STR_EMPTY { @@ -606,20 +623,21 @@ ModelessDialog RID_SCDLG_CHANGES Text [ spanish ] = "<vacío>" ; Text [ french ] = "<vide>" ; Text [ dutch ] = "<leeg>" ; - Text[ chinese_simplified ] = "<¿Õȱ>"; + Text[ chinese_simplified ] = "<空缺>"; Text[ russian ] = "<ïóñòî>"; Text[ polish ] = "<pusty>"; - Text[ japanese ] = "<‹ó”’>"; - Text[ chinese_traditional ] = "<ªÅ¯Ê>"; + Text[ japanese ] = "<空白>"; + Text[ chinese_traditional ] = "<空缺>"; Text[ arabic ] = "<ÝÇÑÛ>"; Text[ dutch ] = "<leeg>"; - Text[ chinese_simplified ] = "<¿Õȱ>"; + Text[ chinese_simplified ] = "<空缺>"; Text[ greek ] = "<êåíü>"; - Text[ korean ] = "<°ø¹é>"; + Text[ korean ] = "<빈>"; Text[ turkish ] = "<Boþ>"; Text[ language_user1 ] = " "; - Text[ catalan ] = "<vacío>"; + Text[ catalan ] = "<buit>"; Text[ finnish ] = "<tyhjä>"; + Text[ thai ] = "<ว่าง>"; }; Bitmap BMP_STR_CLOSE { @@ -639,27 +657,28 @@ ModelessDialog RID_SCDLG_CHANGES }; Text [ english_us ] = "Accept or Reject Changes" ; Text [ portuguese_brazilian ] = "?nderungen akzeptieren" ; - Text [ swedish ] = "Acceptera eller avslå ändringar" ; + Text [ swedish ] = "Acceptera eller ignorera ändringar" ; Text [ danish ] = "Accepter eller forkast ændringerne" ; Text [ italian ] = "Accetta o annulla modifiche" ; Text [ spanish ] = "Aceptar o rechazar modificaciones" ; Text [ french ] = "Accepter ou rejeter les modifications" ; Text [ dutch ] = "Wijzigingen accepteren of verwerpen" ; Text [ portuguese ] = "Aceitar ou rejeitar modificações" ; - Text[ chinese_simplified ] = "½ÓÊÜ»òÉáÆú¸ü¸ÄÄÚÈÝ"; + Text[ chinese_simplified ] = "接å—或èˆå¼ƒæ›´æ”¹å†…容"; Text[ russian ] = "Ïðèíÿòü èëè îòêëîíèòü èçìåíåíèÿ"; Text[ polish ] = "Zaakceptuj albo odrzuæ zmiany"; - Text[ japanese ] = "•ÏX‰ÓŠ‚ÌŠm”F"; - Text[ chinese_traditional ] = "±µ¨ü©Î±Ë±óÅܧó?®e"; + Text[ japanese ] = "変更箇所ã®ç¢ºèª"; + Text[ chinese_traditional ] = "接å—或æ¨æ£„變更內容"; Text[ arabic ] = "ÞÈæá Ãæ ÑÝÖ ÊÛííÑÇÊ"; Text[ dutch ] = "Wijzigingen accepteren of verwerpen"; - Text[ chinese_simplified ] = "½ÓÊÜ»òÉáÆú¸ü¸ÄÄÚÈÝ"; + Text[ chinese_simplified ] = "接å—或èˆå¼ƒæ›´æ”¹å†…容"; Text[ greek ] = "Áðïäï÷Þ Þ áðüññéøç áëëáãþí"; - Text[ korean ] = "º¯°æ»çÇ× Àû¿ë ¶Ç´Â Ãë¼Ò"; + Text[ korean ] = "변경 ì‚¬í• ì ìš© ë˜ëŠ” 취소"; Text[ turkish ] = "Deðiþiklikleri kabul/redd et"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aceptar o rechazar modificaciones"; + Text[ catalan ] = "Accepta o rebutja els canvis"; Text[ finnish ] = "Hyväksy tai hylkää muutokset"; + Text[ thai ] = "ยà¸à¸¡à¸£à¸±à¸šà¸«à¸£à¸·à¸à¸›à¸à¸´à¹€à¸ªà¸˜à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡"; }; Menu RID_POPUP_CHANGES { @@ -676,25 +695,26 @@ Menu RID_POPUP_CHANGES Text [ swedish ] = "Redigera kommentar..." ; Text [ danish ] = "Rediger kommentar..." ; Text [ italian ] = "Modifica commento..." ; - Text [ spanish ] = "Modificar comentario..." ; + Text [ spanish ] = "Editar comentario..." ; Text [ french ] = "Éditer le commentaire..." ; - Text [ dutch ] = "Commentaar bewerken..." ; + Text [ dutch ] = "Opmerkingen bewerken..." ; Text [ portuguese ] = "Editar comentário..." ; - Text[ chinese_simplified ] = "±à¼×¢½â..."; - Text[ russian ] = "Ïðàâêà êîììåíòàðèÿ..."; + Text[ chinese_simplified ] = "编辑注解..."; + Text[ russian ] = "Ïðàâêà êîììåíòàðèåâ..."; Text[ polish ] = "Edytuj komentarz..."; - Text[ japanese ] = "ºÒÝÄ‚Ì•ÒW..."; - Text[ chinese_traditional ] = "½s¿èµù¸Ñ..."; + Text[ japanese ] = "コメントã®ç·¨é›†..."; + Text[ chinese_traditional ] = "編輯註解..."; Text[ arabic ] = "ÊÍÑíÑ ÊÚáíÞ..."; - Text[ dutch ] = "Commentaar bewerken..."; - Text[ chinese_simplified ] = "±à¼×¢½â..."; + Text[ dutch ] = "Opmerkingen bewerken..."; + Text[ chinese_simplified ] = "编辑注解..."; Text[ greek ] = "Åðåîåñãáóßá ó÷ïëßïõ..."; - Text[ korean ] = "ÁÖ¼® ÆíÁý..."; + Text[ korean ] = "설명 편집..."; Text[ turkish ] = "Açýklamayý düzenle..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar comentario..."; - Text[ finnish ] = "Muokkaa huomautusta"; + Text[ catalan ] = "Edita el comentari..."; + Text[ finnish ] = "Muuta huomautusta..."; + Text[ thai ] = "à¹à¸à¹‰à¹„ขข้à¸à¸„ิดเห็น..."; }; MenuItem { @@ -722,20 +742,21 @@ Menu RID_POPUP_CHANGES Text [ french ] = "Action" ; Text [ dutch ] = "Activiteit" ; Text [ portuguese ] = "Acção" ; - Text[ chinese_simplified ] = "²Ù×÷"; + Text[ chinese_simplified ] = "æ“作"; Text[ russian ] = "Äåéñòâèå"; Text[ polish ] = "Akcja"; - Text[ japanese ] = "±¸¼®Ý"; - Text[ chinese_traditional ] = "°Ê§@"; + Text[ japanese ] = "アクション"; + Text[ chinese_traditional ] = "動作"; Text[ arabic ] = "ÅÌÑÇÁ"; Text[ dutch ] = "Activiteit"; - Text[ chinese_simplified ] = "²Ù×÷"; + Text[ chinese_simplified ] = "æ“作"; Text[ greek ] = "ÅíÝñãåéá"; - Text[ korean ] = "ÀÛµ¿"; + Text[ korean ] = "ìž‘ë™"; Text[ turkish ] = "Ýþlem"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Acción"; + Text[ catalan ] = "Acció"; Text[ finnish ] = "Toiminto"; + Text[ thai ] = "à¸à¸²à¸£à¸à¸£à¸°à¸—ำ"; }; MenuItem { @@ -753,20 +774,21 @@ Menu RID_POPUP_CHANGES Text [ french ] = "Position" ; Text [ dutch ] = "Positie" ; Text [ portuguese ] = "Posição" ; - Text[ chinese_simplified ] = "λÖÃ"; + Text[ chinese_simplified ] = "ä½ç½®"; Text[ russian ] = "Ïîëîæåíèå"; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "ˆÊ’u"; - Text[ chinese_traditional ] = "¦ì¸m"; + Text[ japanese ] = "ä½ç½®"; + Text[ chinese_traditional ] = "ä½ç½®"; Text[ arabic ] = "ãæÖÚ"; Text[ dutch ] = "Positie"; - Text[ chinese_simplified ] = "λÖÃ"; + Text[ chinese_simplified ] = "ä½ç½®"; Text[ greek ] = "ÈÝóç"; - Text[ korean ] = "À§Ä¡"; + Text[ korean ] = "위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posición"; + Text[ catalan ] = "Posició"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡"; }; MenuItem { @@ -784,20 +806,21 @@ Menu RID_POPUP_CHANGES Text [ french ] = "Auteur" ; Text [ dutch ] = "Auteur" ; Text [ portuguese ] = "Autor" ; - Text[ chinese_simplified ] = "×÷Õß"; + Text[ chinese_simplified ] = "作者"; Text[ russian ] = "Àâòîð"; Text[ polish ] = "Autor"; - Text[ japanese ] = "쬎Ò"; - Text[ chinese_traditional ] = "§@ªÌ"; + Text[ japanese ] = "作æˆè€…"; + Text[ chinese_traditional ] = "作者"; Text[ arabic ] = "ÇáãÄáÝ"; Text[ dutch ] = "Auteur"; - Text[ chinese_simplified ] = "×÷Õß"; + Text[ chinese_simplified ] = "作者"; Text[ greek ] = "ÓõíôÜêôçò"; - Text[ korean ] = "ÀÛ¼ºÀÚ"; + Text[ korean ] = "작성ìž"; Text[ turkish ] = "Yazan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Autor"; - Text[ finnish ] = "Laatija"; + Text[ finnish ] = "Tekijä"; + Text[ thai ] = "ผู้เขียน"; }; MenuItem { @@ -815,20 +838,21 @@ Menu RID_POPUP_CHANGES Text [ french ] = "Date" ; Text [ dutch ] = "Datum" ; Text [ portuguese ] = "Data" ; - Text[ chinese_simplified ] = "ÈÕÆÚ"; + Text[ chinese_simplified ] = "日期"; Text[ russian ] = "Äàòà"; Text[ polish ] = "Data"; - Text[ japanese ] = "“ú•t"; - Text[ chinese_traditional ] = "¤é´Á"; + Text[ japanese ] = "日付"; + Text[ chinese_traditional ] = "日期"; Text[ arabic ] = "ÇáÊÇÑíÎ"; Text[ dutch ] = "Datum"; - Text[ chinese_simplified ] = "ÈÕÆÚ"; + Text[ chinese_simplified ] = "日期"; Text[ greek ] = "Çìåñïìçíßá"; - Text[ korean ] = "³¯Â¥"; + Text[ korean ] = "ë‚ ì§œ"; Text[ turkish ] = "Tarih"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fecha"; + Text[ catalan ] = "Data"; Text[ finnish ] = "Päivämäärä"; + Text[ thai ] = "วันที่"; }; MenuItem { @@ -846,46 +870,48 @@ Menu RID_POPUP_CHANGES Text [ french ] = "Description" ; Text [ dutch ] = "Beschrijving" ; Text [ portuguese ] = "Descrição" ; - Text[ chinese_simplified ] = "˵Ã÷"; - Text[ russian ] = "Îïèñàíèå"; + Text[ chinese_simplified ] = "说明"; + Text[ russian ] = "Êîììåíòàðèé"; Text[ polish ] = "Opis"; - Text[ japanese ] = "à–¾"; - Text[ chinese_traditional ] = "´yz"; + Text[ japanese ] = "説明"; + Text[ chinese_traditional ] = "æè¿°"; Text[ arabic ] = "ÇáæÕÝ"; Text[ dutch ] = "Beschrijving"; - Text[ chinese_simplified ] = "˵Ã÷"; + Text[ chinese_simplified ] = "说明"; Text[ greek ] = "ÐåñéãñáöÞ"; - Text[ korean ] = "¼³¸í"; + Text[ korean ] = "설명"; Text[ turkish ] = "Açýklama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Descripción"; + Text[ catalan ] = "Descripció"; Text[ finnish ] = "Kuvaus"; + Text[ thai ] = "คำà¸à¸˜à¸´à¸šà¸²à¸¢"; }; }; }; Text [ english_us ] = "Sorting" ; Text [ portuguese_brazilian ] = "Sortiere" ; - Text [ swedish ] = "Sorterar" ; + Text [ swedish ] = "Sortera efter" ; Text [ danish ] = "Sorter" ; Text [ italian ] = "Ordina" ; Text [ spanish ] = "Ordenar" ; Text [ french ] = "Trier" ; Text [ dutch ] = "Sorteer" ; Text [ portuguese ] = "Ordenar" ; - Text[ chinese_simplified ] = "ÅÅÐò"; + Text[ chinese_simplified ] = "排åº"; Text[ russian ] = "Ñîðòèðîâêà"; Text[ polish ] = "Sortowanie"; - Text[ japanese ] = "•À‚בւ¦"; - Text[ chinese_traditional ] = "±Æ§Ç"; + Text[ japanese ] = "並ã¹æ›¿ãˆ"; + Text[ chinese_traditional ] = "排åº"; Text[ arabic ] = "ÝÑÒ"; Text[ dutch ] = "Sorteer"; - Text[ chinese_simplified ] = "ÅÅÐò"; + Text[ chinese_simplified ] = "排åº"; Text[ greek ] = "Ôáîéíüìçóç"; - Text[ korean ] = "Á¤·Ä"; + Text[ korean ] = "ì •ë ¬"; Text[ turkish ] = "Sýrala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ordenar"; + Text[ catalan ] = "S'està ordenant"; Text[ finnish ] = "Lajitellaan"; + Text[ thai ] = "เรียง"; }; }; }; @@ -895,3 +921,16 @@ Menu RID_POPUP_CHANGES + + + + + + + + + + + + + diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 51b2da5d02f5..2303b9f2e3a8 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -2,9 +2,9 @@ * * $RCSfile: highred.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mh $ $Date: 2001-10-22 17:13:20 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -316,15 +316,6 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) Time aFirstTime( aFilterCtr.GetFirstTime() ); Date aLastDate( aFilterCtr.GetLastDate() ); Time aLastTime( aFilterCtr.GetLastTime() ); - switch ( eMode ) - { // korrespondiert mit ScViewUtil::IsActionShown - case SCDM_DATE_EQUAL : - case SCDM_DATE_NOTEQUAL : - aFirstTime.SetTime( 0 ); - aLastDate = aFirstDate; - aLastTime.SetTime( 23595999 ); - break; - } aChangeViewSet.SetTheFirstDateTime( DateTime( aFirstDate, aFirstTime ) ); aChangeViewSet.SetTheLastDateTime( DateTime( aLastDate, aLastTime ) ); aChangeViewSet.SetHasAuthor(aFilterCtr.IsAuthor()); @@ -337,6 +328,7 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) ScRangeList aRangeList; aRangeList.Parse(aFilterCtr.GetRange(), pDoc); aChangeViewSet.SetTheRangeList(aRangeList); + aChangeViewSet.AdjustDateMode( *pDoc ); pDoc->SetChangeViewSettings(aChangeViewSet); pViewData->GetDocShell()->PostPaintGridAll(); Close(); diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index 06f0ce391d1b..5718eb4408ff 100644 --- a/sc/source/ui/miscdlgs/highred.src +++ b/sc/source/ui/miscdlgs/highred.src @@ -2,9 +2,9 @@ * * $RCSfile: highred.src,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2001-11-16 22:50:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,21 +85,22 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES Text [ danish ] = "Vis ændringerne i regnearket" ; Text [ italian ] = "Mostra modifiche nella tabella" ; Text [ spanish ] = "~Mostrar las modificaciones en la hoja" ; - Text [ french ] = "~Afficher les modifications dans la feuille de calcul" ; + Text [ french ] = "Afficher les modifications dans la feuille de calcul" ; Text [ dutch ] = "W~ijzigingen op het werkblad weergeven." ; Text [ portuguese ] = "Mostrar modificações na folha de cálculo" ; Text[ chinese_simplified ] = "显示工作表内的更改内容(~S)"; - Text[ russian ] = "Ïîêàçàòü èçìåíåíèÿ â ëèñòå"; + Text[ russian ] = "Ïîêàçàòü èçìåíåíèÿ â ýëåêòðîííîé òàáëèöå"; Text[ polish ] = "Poka¿ zmiany w tabeli"; Text[ japanese ] = "表内ã®å¤‰æ›´ç®‡æ‰€ã‚’表示(~S)"; Text[ chinese_traditional ] = "顯示工作表內的變更(~S)"; Text[ arabic ] = "ÅÙåÇÑ ÇáÊÛííÑÇÊ Ýí ÇáÌÏæá"; Text[ greek ] = "ÅìöÜíéóç áëëáãþí ðßíáêá"; - Text[ korean ] = "ìŠ¤í”„ë ˆë“œì‹œíŠ¸ì— ë³€ê²½ì‚¬í• ë³´ì´ê¸°(~S)"; + Text[ korean ] = "ìŠ¤í”„ë ˆë“œì‹œíŠ¸ì— ë³€ê²½ ì‚¬í• í‘œì‹œ(~S)"; Text[ turkish ] = "~Tablodaki deðiþiklikleri görüntüle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mostrar las modificaciones en la hoja"; - Text[ finnish ] = "~N?yt? muutokset laskentataulukossa"; + Text[ catalan ] = "~Mostra els canvis al full de càlcul"; + Text[ finnish ] = "~Näytä muutokset laskentataulukossa"; + Text[ thai ] = "à¹~สดงà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹ƒà¸™à¸à¸£à¸°à¸”าษคำนวณ"; }; FixedLine FL_FILTER { @@ -114,19 +115,20 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES Text[ dutch ] = "Filterinstellingen"; Text[ french ] = "Paramètres de filtre"; Text[ spanish ] = "Configuración de filtros"; - Text[ finnish ] = "Filter options"; + Text[ finnish ] = "Suodatusasetukset"; Text[ italian ] = "Impostazioni filtro"; - Text[ danish ] = "Filter options"; + Text[ danish ] = "Filterindstillinger"; Text[ swedish ] = "Filterinställningar"; Text[ polish ] = "Ustawienia filtra"; Text[ portuguese_brazilian ] = "Filter options"; - Text[ japanese ] = "ﾌｨﾙﾀã®è¨å®š"; + Text[ japanese ] = "フィルタã®è¨å®š"; Text[ korean ] = "í•„í„° 옵션"; Text[ chinese_simplified ] = "选项设定"; Text[ chinese_traditional ] = "è¨å®šç¯©é¸"; Text[ turkish ] = "Filter options"; Text[ arabic ] = "Filter options"; - Text[ catalan ] = "Filter options"; + Text[ catalan ] = "Opcions del filtre"; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ค่าตัวà¸à¸£à¸à¸‡"; }; CheckBox CB_HIGHLIGHT_ACCEPT { @@ -137,10 +139,10 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES TabStop = TRUE ; Text [ english_us ] = "Show ~accepted changes" ; Text [ portuguese_brazilian ] = "A~kzeptierte ?nderungen anzeigen" ; - Text [ swedish ] = "Visa a~ccepterade ändringar" ; + Text [ swedish ] = "Visa acc~epterade ändringar" ; Text [ danish ] = "Vis accepterede ændringer" ; - Text [ italian ] = "Mostra i cambiamenti a~ccettati" ; - Text [ spanish ] = "~Mostrar las modificaciones aceptadas" ; + Text [ italian ] = "Mostra le modifiche a~ccettate" ; + Text [ spanish ] = "Mostrar las modificaciones aceptadas" ; Text [ french ] = "Afficher les modifications acceptées" ; Text [ dutch ] = "Geac~cepteerde wijzigingen weergeven" ; Text [ portuguese ] = "Mostrar mo~dificações aceites" ; @@ -151,11 +153,12 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES Text[ chinese_traditional ] = "顯示接å—的變更(~A)"; Text[ arabic ] = "ÅÙåÇÑ ÇáÊÛííÑÇÊ ÇáãÞÈæáÉ"; Text[ greek ] = "ÅìöÜíéóç áðïäå÷ïìÝíùí áëëáãþí"; - Text[ korean ] = "ì ìš©ëœ ë³€ê²½ ë³´ì´ê¸°(~A)"; + Text[ korean ] = "ì ìš©ëœ ë³€ê²½ 표시(~A)"; Text[ turkish ] = "~Kabul edilen deðiþiklikleri görüntüle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mostrar las modificaciones aceptadas"; - Text[ finnish ] = "~N?yt? hyv?ksytyt muutokset"; + Text[ catalan ] = "Mostra els canvis ~acceptats"; + Text[ finnish ] = "Näytä hyväksytyt muutokset"; + Text[ thai ] = "à¹à¸ªà¸”งà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸—ี่~ยà¸à¸¡à¸£à¸±à¸šà¹„ด้"; }; CheckBox CB_HIGHLIGHT_REJECT { @@ -166,25 +169,26 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES TabStop = TRUE ; Text [ english_us ] = "Show ~rejected changes" ; Text [ portuguese_brazilian ] = "A~bgelehnte ?nderungen anzeigen" ; - Text [ swedish ] = "Visa ~ej accepterade ändringar" ; - Text [ danish ] = "Vis forkastede ændringer" ; - Text [ italian ] = "Mostra i cambiamenti accettati" ; - Text [ spanish ] = "~Mostrar las modificaciones rechazadas" ; - Text [ french ] = "Afficher les modifications ~refusées" ; + Text [ swedish ] = "Visa i~gnorerade ändringar" ; + Text [ danish ] = "Vis for~kastede ændringer" ; + Text [ italian ] = "Mostra le modifiche ri~fiutate" ; + Text [ spanish ] = "Mostrar las modificaciones rechazadas" ; + Text [ french ] = "Afficher les modifications refusées" ; Text [ dutch ] = "Niet-ge~accepteerde wijzigingen weergeven" ; Text [ portuguese ] = "Mostrar modificações ~rejeitadas" ; Text[ chinese_simplified ] = "显示拒ç»çš„更改内容(~R)"; Text[ russian ] = "Ïîêàçàòü îòêëîíåííûå èçìåíåíèÿ"; Text[ polish ] = "Poka¿ odrzucone zmiany"; Text[ japanese ] = "ç ´æ£„ã—ãŸå¤‰æ›´ç®‡æ‰€ã‚’表示(~R)"; - Text[ chinese_traditional ] = "顯示已拒絕的變更内容(~R)"; + Text[ chinese_traditional ] = "顯示已拒絕的變更內容(~R)"; Text[ arabic ] = "ÅÙåÇÑ ÇáÊÛííÑÇÊ ÇáãÑÝæÖÉ"; Text[ greek ] = "ÐñïâïëÞ áðïññéðôÝùí áëëáãþí"; - Text[ korean ] = "ê±°ë¶€ëœ ë³€ê²½ì‚¬í• í‘œì‹œ(~R)"; + Text[ korean ] = "ê±°ë¶€ëœ ë³€ê²½ 표시(~R)"; Text[ turkish ] = "~Reddedilen deðiþiklikleri görüntüle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mostrar las modificaciones rechazadas"; - Text[ finnish ] = "~Näytä hylätyt muutokset"; + Text[ catalan ] = "Mostra els canvis ~rebutjats"; + Text[ finnish ] = "Näytä hylätyt muutokset"; + Text[ thai ] = "à¹à¸ªà¸”งà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸—ี่~ปà¸à¸´à¹€à¸ªà¸˜"; }; OKButton BTN_OK { @@ -241,8 +245,9 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern/Vergrößern"; - QuickHelpText[ catalan ] = "Reducir/Aumentar"; - QuickHelpText[ finnish ] = "Pienenn?/suurenna!"; + QuickHelpText[ catalan ] = "Redueix/Augmenta"; + QuickHelpText[ finnish ] = "Pienennä/suurenna"; + QuickHelpText[ thai ] = "Minimize/Maximize"; }; Text [ english_us ] = "Show Changes" ; Text [ portuguese_brazilian ] = "?nderungen anzeigen" ; @@ -260,11 +265,12 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES Text[ chinese_traditional ] = "顯示變更"; Text[ arabic ] = "ÅÙåÇÑ ÇáÊÛííÑÇÊ"; Text[ greek ] = "ÅìöÜíéóç áëëáãþí"; - Text[ korean ] = "변경 ë³´ì´ê¸°"; + Text[ korean ] = "변경 표시"; Text[ turkish ] = "Deðiþiklikleri görüntüle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar modificaciones"; - Text[ finnish ] = "N?yt? muutokset"; + Text[ catalan ] = "Mostra els canvis"; + Text[ finnish ] = "Näytä muutokset"; + Text[ thai ] = "à¹à¸ªà¸”งà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡"; }; @@ -276,3 +282,9 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES + + + + + + diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src index 1717652663c8..f42396fee0af 100644 --- a/sc/source/ui/miscdlgs/instbdlg.src +++ b/sc/source/ui/miscdlgs/instbdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: instbdlg.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: rt $ $Date: 2001-08-24 13:40:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,8 +87,8 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ korean ] = "시트 삽입"; Text[ turkish ] = "Tablo ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar hoja"; - Text[ finnish ] = "Lisää lomake"; + Text[ catalan ] = "Insereix un full"; + Text[ finnish ] = "Lisää taulukko"; Moveable = TRUE ; Closeable = TRUE ; OKButton BTN_OK @@ -132,8 +132,9 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ korean ] = "위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posición"; + Text[ catalan ] = "Posició"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡"; }; RadioButton RB_BEFORE { @@ -150,19 +151,20 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text [ italian ] = "~Prima della tabella corrente" ; Text [ spanish ] = "~Delante de la hoja actual" ; Text [ french ] = "A~vant la feuille courante" ; - Text [ dutch ] = "~Voor actuele tabel" ; + Text [ dutch ] = "~Voor huidige tabel" ; Text[ chinese_simplified ] = "在当å‰çš„工作表之å‰(~E)"; Text[ russian ] = "Ïåðåä òåêóùèì ëèñòîì"; Text[ polish ] = "Przed zaz~naczonym arkuszem"; Text[ japanese ] = "表示ä¸ã®è¡¨ã®å‰ã«(~E)"; - Text[ chinese_traditional ] = "在當å‰çš„工作表之å‰(~E)"; + Text[ chinese_traditional ] = "在目å‰çš„工作表之å‰(~E)"; Text[ arabic ] = "ÞÈá ÇáÌÏæá ÇáÍÇáí"; Text[ greek ] = "Ðñéí áðü ôïí åíåñãü ðßíáêá"; - Text[ korean ] = "현재 í‘œ ì•žì—(~E)"; + Text[ korean ] = "현재 시트 ì•žì—(~E)"; Text[ turkish ] = "Açýk tablonun ~önüne"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Delante de la hoja actual"; - Text[ finnish ] = "~Ennen nykyistä lomaketta"; + Text[ catalan ] = "A~bans del full actual"; + Text[ finnish ] = "~Ennen nykyistä taulukkoa"; + Text[ thai ] = "à¸à¹ˆ~à¸à¸™à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™"; }; RadioButton RB_BEHIND { @@ -179,19 +181,20 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text [ italian ] = "~Dopo la tabella corrente" ; Text [ spanish ] = "Detrás de la ~hoja actual" ; Text [ french ] = "~Après la feuille courante" ; - Text [ dutch ] = "~Na actuele tabel" ; + Text [ dutch ] = "~Na huidige tabel" ; Text[ chinese_simplified ] = "在当å‰çš„工作表之åŽ(~A)"; Text[ russian ] = "Ïîñëå òåêóùåãî ëèñòà"; Text[ polish ] = "Za ~zaznaczonym arkuszem"; Text[ japanese ] = "表示ä¸ã®è¡¨ã®å¾Œã«(~A)"; - Text[ chinese_traditional ] = "在當å‰çš„工作表之後(~A)"; + Text[ chinese_traditional ] = "在目å‰çš„工作表之後(~A)"; Text[ arabic ] = "ÈÚÏ ÇáÌÏæá ÇáÍÇáí"; Text[ greek ] = "ÌåôÜ áðü ôïí åíåñãü ðßíáêá"; - Text[ korean ] = "현재 í‘œ ë’¤ì—(~A)"; + Text[ korean ] = "현재 시트 ë’¤ì—(~A)"; Text[ turkish ] = "Açýk tablonun ~arkasýna"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Detrás de la ~hoja actual"; - Text[ finnish ] = "~Nykyisen lomakkeen perään"; + Text[ catalan ] = "~Després del full actual"; + Text[ finnish ] = "Nykyisen taulukon ~perään"; + Text[ thai ] = "~หลังà¹à¸œà¹ˆà¸™à¸‡à¸²à¸™à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™"; }; FixedLine FL_TABLE { @@ -199,10 +202,10 @@ ModalDialog RID_SCDLG_INSERT_TABLE Size = MAP_APPFONT ( 206 , 8 ) ; Text = "Tabelle" ; Text [ ENGLISH ] = "Table" ; - Text [ english_us ] = "Table" ; + Text [ english_us ] = "Sheet" ; Text [ portuguese_brazilian ] = "Tabelle" ; Text [ swedish ] = "Tabell" ; - Text [ danish ] = "Ark" ; + Text [ danish ] = "Tabel" ; Text [ italian ] = "Tabella" ; Text [ spanish ] = "Hoja" ; Text [ french ] = "Feuille" ; @@ -218,8 +221,9 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ korean ] = "시트"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja"; - Text[ finnish ] = "Luo"; + Text[ catalan ] = "Crea"; + Text[ finnish ] = "Taulukko"; + Text[ thai ] = "สร้าง"; }; RadioButton RB_NEW { @@ -227,10 +231,10 @@ ModalDialog RID_SCDLG_INSERT_TABLE Size = MAP_APPFONT ( 197 , 10 ) ; Text = "Neu ~erstellen" ; Text [ ENGLISH ] = "~Create new" ; - Text [ DANISH ] = "Opret nyt" ; + Text [ DANISH ] = "~Opret ny" ; Text [ ENGLISH_US ] = "~New sheet" ; - Text [ SPANISH ] = "~Crear nueva" ; - Text [ FRENCH ] = "C~réer" ; + Text [ SPANISH ] = "~Hoja nueva" ; + Text [ FRENCH ] = "Créer" ; Text [ ITALIAN ] = "Crea nuovo" ; Text [ DUTCH ] = "~Nieuw" ; Text [ PORTUGUESE_BRAZILIAN ] = "~Neu erstellen" ; @@ -246,8 +250,9 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ korean ] = "새로 만들기(~N)"; Text[ turkish ] = "~Yeni tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Crear una nueva"; - Text[ finnish ] = "~Uusi lomake"; + Text[ catalan ] = "~Full nou"; + Text[ finnish ] = "~Uusi taulukko"; + Text[ thai ] = "à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™à¹ƒ~หม่"; }; FixedText FT_COUNT { @@ -265,7 +270,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text [ french ] = "N~ombre" ; Text [ dutch ] = "Aan~tal" ; Text[ chinese_simplified ] = "æ•°ç›®(~O)"; - Text[ russian ] = "×èñëî ëèñòîâ"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "Iloœæ"; Text[ japanese ] = "表ã®æ•°(~O)"; Text[ chinese_traditional ] = "數目(~O)"; @@ -274,8 +279,9 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ korean ] = "개수(~O)"; Text[ turkish ] = "A~det"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Núm. de hojas"; - Text[ finnish ] = "~Lomakkeiden määrä"; + Text[ catalan ] = "Nú~m. de fulls"; + Text[ finnish ] = "~Taulukoiden määrä"; + Text[ thai ] = "ห~มายเลขà¹à¸œà¹ˆà¸™à¸‡à¸²à¸™"; }; NumericField NF_COUNT { @@ -300,7 +306,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ russian ] = "Èìÿ"; Text[ greek ] = "¼íï~ìá"; Text[ dutch ] = "~Naam"; - Text[ french ] = "No~m"; + Text[ french ] = "Nom"; Text[ spanish ] = "No~mbre"; Text[ italian ] = "No~me"; Text[ danish ] = "Navn"; @@ -313,8 +319,9 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ chinese_traditional ] = "å稱(~M)"; Text[ turkish ] = "~Ad"; Text[ arabic ] = "ÇáÇÓã"; - Text[ catalan ] = "No~mbre"; - Text[ finnish ] = "Ni~mi"; + Text[ catalan ] = "N~om"; + Text[ finnish ] = "~Nimi"; + Text[ thai ] = "ชื่~à¸"; }; Edit ED_TABNAME { @@ -328,7 +335,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE Size = MAP_APPFONT ( 197 , 10 ) ; Text = "~Aus Datei erstellen" ; Text [ ENGLISH ] = "F~rom file" ; - Text [ DANISH ] = "Opret fra fil" ; + Text [ DANISH ] = "Opret fr~a fil" ; Text [ ENGLISH_US ] = "~From file" ; Text [ SPANISH ] = "~A partir de archivo" ; Text [ FRENCH ] = "~Création à partir d'un fichier" ; @@ -338,17 +345,18 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text [ SWEDISH ] = "Sk~apa från fil" ; Text [ PORTUGUESE ] = "~Criar a partir do ficheiro" ; Text[ chinese_simplified ] = "从文件创建(~F)"; - Text[ russian ] = "Ñîçäàòü èç ôàéëà"; + Text[ russian ] = "Èç ôàéëà"; Text[ polish ] = "Utwórz z pliku"; - Text[ japanese ] = "ﾌｧｲﾙã‹ã‚‰ä½œæˆ(~F)"; + Text[ japanese ] = "ファイルã‹ã‚‰ä½œæˆ(~F)"; Text[ chinese_traditional ] = "從檔案新增(~F)"; Text[ arabic ] = "ÅäÔÇÁ ãä ÇáãáÝ"; Text[ greek ] = "Äçìéïõñãß~á áðü áñ÷åßï"; - Text[ korean ] = "．．파ì¼ë¡œë¶€í„°ã€€ë§Œë“¤ê¸°(~F)"; + Text[ korean ] = "파ì¼ë¡œë¶€í„°(~F)"; Text[ turkish ] = "~Dosyadan oluþtur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~A partir de archivo"; + Text[ catalan ] = "~Des d'un fitxer"; Text[ finnish ] = "~Tiedostosta"; + Text[ thai ] = "~จาà¸à¹à¸Ÿà¹‰à¸¡"; }; MultiListBox LB_TABLES { @@ -366,7 +374,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text [ ENGLISH ] = "~Browse..." ; Text [ DANISH ] = "Gennemse..." ; Text [ ENGLISH_US ] = "~Browse..." ; - Text [ SPANISH ] = "E~xaminar..." ; + Text [ SPANISH ] = "~Buscar..." ; Text [ FRENCH ] = "~Parcourir..." ; Text [ ITALIAN ] = "~Sfoglia..." ; Text [ DUTCH ] = "~Bladeren..." ; @@ -380,11 +388,12 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text[ chinese_traditional ] = "ç€è¦½(~B)..."; Text[ arabic ] = "ÇÓÊÚÑÇÖ..."; Text[ greek ] = "ÁíáæÞôçóç..."; - Text[ korean ] = "검색(~B)..."; + Text[ korean ] = "찾아보기(~B)..."; Text[ turkish ] = "~Tara..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "E~xaminar..."; - Text[ finnish ] = "~Selaa"; + Text[ catalan ] = "~Navega..."; + Text[ finnish ] = "~Selaa..."; + Text[ thai ] = "เ~รียà¸à¸”ู..."; }; CheckBox CB_LINK { @@ -393,7 +402,7 @@ ModalDialog RID_SCDLG_INSERT_TABLE /* ### ACHTUNG: Neuer Text in Resource? Ver~knüpfen : Ver~kn³pfen */ Text = "Ver~knüpfen" ; Text [ ENGLISH ] = "Lin~k" ; - Text [ DANISH ] = "Kæd" ; + Text [ DANISH ] = "~Kæd" ; Text [ ENGLISH_US ] = "Lin~k" ; Text [ SPANISH ] = "~Vincular" ; Text [ FRENCH ] = "~Lier" ; @@ -403,23 +412,25 @@ ModalDialog RID_SCDLG_INSERT_TABLE Text [ SWEDISH ] = "Län~ka" ; Text [ PORTUGUESE ] = "~Ligar" ; Text[ chinese_simplified ] = "链接(~K)"; - Text[ russian ] = "Ñâÿçàòü"; + Text[ russian ] = "Ñâÿçü ñ ôàéëîì"; Text[ polish ] = "Po³¹cz"; - Text[ japanese ] = "ﾘï¾ï½¸(~K)"; + Text[ japanese ] = "リンク(~K)"; Text[ chinese_traditional ] = "æ·å¾‘(~K)"; Text[ arabic ] = "ÑÈØ"; Text[ greek ] = "Óýíäåóç"; - Text[ korean ] = "ë§í¬(~K)"; + Text[ korean ] = "ì—°ê²°(~K)"; Text[ turkish ] = "Bað~la"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Vincular"; - Text[ finnish ] = "~Linkki "; + Text[ catalan ] = "Enlla~ç"; + Text[ finnish ] = "Lin~kki"; + Text[ thai ] = "เชื่à¸à¸¡à¹‚~ยง "; }; FixedText FT_PATH { Pos = MAP_APPFONT ( 20 , 176 ) ; Size = MAP_APPFONT ( 192 , 8 ) ; }; + Text[ thai ] = "à¹à¸—รà¸à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™"; }; @@ -428,3 +439,13 @@ ModalDialog RID_SCDLG_INSERT_TABLE + + + + + + + + + + diff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.src index 8aefa43fe6c9..cb49a30dbc57 100644 --- a/sc/source/ui/miscdlgs/linkarea.src +++ b/sc/source/ui/miscdlgs/linkarea.src @@ -2,9 +2,9 @@ * * $RCSfile: linkarea.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:38:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,7 +105,7 @@ ModalDialog RID_SCDLG_LINKAREA Text[ polish ] = "Adres URL zewnêtrznego Ÿród³a danych"; Text[ portuguese_brazilian ] = "External Data Source Location"; Text[ japanese ] = "外部データソース㮠URL(~E)"; - Text[ korean ] = "외부 ë°ì´í„° ì†ŒìŠ¤ì˜ URL(~E)"; + Text[ korean ] = "외부 ë°ì´í„° ì›ë³¸ì˜ URL(~E)"; Text[ chinese_simplified ] = "外部数æ®æºçš„ URL(~E)"; Text[ chinese_traditional ] = "外部資料æºçš„ URL(~E)"; Text[ turkish ] = "External Data Source Location"; @@ -147,7 +147,7 @@ ModalDialog RID_SCDLG_LINKAREA Text[ polish ] = "(Adres URL dokumentu Ÿród³owego w lokalnym systemie plików lub w Internecie)"; Text[ portuguese_brazilian ] = "(Insert a local file location or an URL from a web site here)"; Text[ japanese ] = "(ãƒãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã€ã‚ã‚‹ã„ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«ã‚るソースドã‚ュメント㮠URL)"; - Text[ korean ] = "(로컬 íŒŒì¼ ì‹œìŠ¤í…œ ë˜ëŠ” 웹사ì´íŠ¸ ë‚´ 소스 ë¬¸ì„œì˜ URL)"; + Text[ korean ] = "(로컬 íŒŒì¼ ì‹œìŠ¤í…œ ë˜ëŠ” 웹사ì´íŠ¸ ë‚´ ì›ë³¸ ë¬¸ì„œì˜ URL)"; Text[ chinese_simplified ] = "(本机文件系统或国际互è”网之ä¸æºæ–‡æœ¬çš„ URL)"; Text[ chinese_traditional ] = "(本機檔案系統或 internet 之ä¸æºæ–‡ä»¶çš„ URL)"; Text[ turkish ] = "(Insert a local file location or an URL from a web site here)"; @@ -175,7 +175,7 @@ ModalDialog RID_SCDLG_LINKAREA Text[ polish ] = "Dostêpne tabele/obszary"; Text[ portuguese_brazilian ] = "Available Tables/Ranges"; Text[ japanese ] = "使用ã§ãる表ã¨ç¯„囲(~A)"; - Text[ korean ] = "사용 가능한 시트/범위(~A)"; + Text[ korean ] = "사용 가능한 í‘œ/범위(~A)"; Text[ chinese_simplified ] = "çŽ°æœ‰çš„è¡¨æ ¼/区域(~A)"; Text[ chinese_traditional ] = "ç¾æœ‰çš„è¡¨æ ¼æˆ–å€åŸŸ(~A)"; Text[ turkish ] = "Available Tables/Ranges"; @@ -212,7 +212,7 @@ ModalDialog RID_SCDLG_LINKAREA Text[ polish ] = "Aktualizuj co"; Text[ portuguese_brazilian ] = "Auto reload data every"; Text[ japanese ] = "次ã®æ™‚é–“é–“éš”ã§æ›´æ–°(~U)"; - Text[ korean ] = "ëª¨ë‘ ì—…ë°ì´íŠ¸(~U)"; + Text[ korean ] = "ì—…ë°ì´íŠ¸ 시간 간격(~U)"; Text[ chinese_simplified ] = "更新时间间隔为æ¯(~U)"; Text[ chinese_traditional ] = "更新時間間隔為æ¯(~U)"; Text[ turkish ] = "Auto reload data every"; @@ -297,3 +297,8 @@ ModalDialog RID_SCDLG_LINKAREA + + + + + diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 16cfddd0ef35..87db66afc8d2 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabopdlg.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dr $ $Date: 2002-03-13 11:44:14 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -386,7 +386,7 @@ IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) else if( (pCtrl == (Control*)&aEdColCell) || (pCtrl == (Control*)&aRBColCell) ) pEdActive = &aEdColCell; else - pEdActive == NULL; + pEdActive = NULL; if( pEdActive ) pEdActive->SetSelection( Selection( 0, SELECTION_MAX ) ); diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index 881e02a46dbd..2c44787daeeb 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -2,9 +2,9 @@ * * $RCSfile: navipi.src,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:34:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -354,7 +354,7 @@ Window RID_SCDLG_NAVIGATOR Text[ dutch ] = "Gegevensbereik"; Text[ chinese_simplified ] = "æ•°æ®åŒºåŸŸ"; Text[ greek ] = "Ðåñéï÷Þ äåäïìÝíùí"; - Text[ korean ] = "ë°ì´í„° ì˜ì—"; + Text[ korean ] = "ë°ì´í„° 범위"; Text[ turkish ] = "Veri alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea de dades"; @@ -439,14 +439,14 @@ Window RID_SCDLG_NAVIGATOR Text [ dutch ] = "Inhoud" ; Text [ english_us ] = "Contents" ; Text [ italian ] = "Contenuti" ; - Text [ spanish ] = "Contenidos" ; + Text [ spanish ] = "Contenido" ; Text [ french ] = "Contenu" ; Text [ swedish ] = "Innehåll" ; Text [ danish ] = "Indhold" ; Text [ portuguese ] = "Conteúdos" ; Text [ portuguese_brazilian ] = "Inhalte" ; Text[ chinese_simplified ] = "内容"; - Text[ russian ] = "Ñîäåðæèìîå"; + Text[ russian ] = "Ñïèñîê"; Text[ polish ] = "Zawartoœci"; Text[ japanese ] = "内容"; Text[ chinese_traditional ] = "內容"; @@ -477,7 +477,7 @@ Window RID_SCDLG_NAVIGATOR Text [ portuguese ] = "Comutar" ; Text [ portuguese_brazilian ] = "Umschalten" ; Text[ chinese_simplified ] = "切æ¢"; - Text[ russian ] = "Ïåðåêëþ÷èòü"; + Text[ russian ] = "Ïðåäñòàâëåíèå"; Text[ polish ] = "Prze³¹cz"; Text[ japanese ] = "切り替ãˆ"; Text[ chinese_traditional ] = "切æ›"; @@ -784,7 +784,7 @@ Window RID_SCDLG_NAVIGATOR Text[ dutch ] = "Opmerkingen"; Text[ chinese_simplified ] = "注解"; Text[ greek ] = "Ó÷üëéï"; - Text[ korean ] = "주ì„"; + Text[ korean ] = "설명"; Text[ turkish ] = "Açýklama"; Text[ language_user1 ] = " "; Text[ catalan ] = "Comentari"; @@ -875,7 +875,7 @@ String SCSTR_CONTENT_ROOT TEXT [ English ] = "Contents" ; Text [ english_us ] = "Contents" ; Text [ italian ] = "Contenuti" ; - Text [ spanish ] = "Contenidos" ; + Text [ spanish ] = "Contenido" ; Text [ french ] = "Contenu" ; Text [ dutch ] = "Inhoud" ; Text [ swedish ] = "Innehåll" ; @@ -949,7 +949,7 @@ String SCSTR_CONTENT_RANGENAME Text[ dutch ] = "Bereiknamen"; Text[ chinese_simplified ] = "区域å称"; Text[ greek ] = "Ïíüìáôá ðåñéï÷þí"; - Text[ korean ] = "ì˜ì— ì´ë¦„"; + Text[ korean ] = "범위 ì´ë¦„"; Text[ turkish ] = "Alan adlarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Noms d'àrea"; @@ -978,7 +978,7 @@ String SCSTR_CONTENT_DBAREA Text[ dutch ] = "Databasebereiken"; Text[ chinese_simplified ] = "æ•°æ®åº“区域"; Text[ greek ] = "Ðåäßá âÜóçò äåäïìÝíùí"; - Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ 범위"; Text[ turkish ] = "Veritabaný alanlarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrees de la base de dades"; @@ -1007,7 +1007,7 @@ String SCSTR_CONTENT_GRAPHIC Text[ dutch ] = "Afbeeldingen"; Text[ chinese_simplified ] = "图形"; Text[ greek ] = "ÃñáöéêÜ"; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafikler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Gràfics"; @@ -1094,7 +1094,7 @@ String SCSTR_CONTENT_AREALINK Text[ dutch ] = "Gekoppelde bereiken"; Text[ chinese_simplified ] = "链接的区域"; Text[ greek ] = "ÓõíäåäåìÝíåò ðåñéï÷Ýò"; - Text[ korean ] = "ë§í¬ëœ ì˜ì—"; + Text[ korean ] = "ì—°ê²°ëœ ì˜ì—"; Text[ turkish ] = "Baðlantýlý alanlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrees enllaçades"; @@ -1156,7 +1156,7 @@ Menu RID_POPUP_DROPMODE Text[ dutch ] = "Als Hyperlink invoegen"; Text[ chinese_simplified ] = "当作超链接æ’å…¥"; Text[ greek ] = "ÅéóáãùãÞ ùò õðåñ-óýíäåóç"; - Text[ korean ] = "하ì´í¼ë§í¬ 삽입"; + Text[ korean ] = "하ì´í¼ë§í¬ë¡œ 삽입"; Text[ turkish ] = "Hyperlink olarak ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix com a hiperenllaç"; @@ -1187,7 +1187,7 @@ Menu RID_POPUP_DROPMODE Text[ dutch ] = "Als koppeling invoegen"; Text[ chinese_simplified ] = "当作链接æ’å…¥"; Text[ greek ] = "ÅéóáãùãÞ ùò óýíäåóç"; - Text[ korean ] = "ì—°ê²°ë¡œ 삽입"; + Text[ korean ] = "ë§í¬ë¡œ 삽입"; Text[ turkish ] = "Baðlantý olarak ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix com a enllaç"; @@ -1243,7 +1243,7 @@ Menu RID_POPUP_NAVIPI_SCENARIO Text [ swedish ] = "Radera" ; Text [ danish ] = "Slet" ; Text [ italian ] = "Elimina" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ french ] = "Supprimer" ; Text [ dutch ] = "Wissen" ; Text[ chinese_simplified ] = "åˆ é™¤"; @@ -1286,7 +1286,7 @@ Menu RID_POPUP_NAVIPI_SCENARIO Text[ dutch ] = "Eigenschappen..."; Text[ chinese_simplified ] = "属性..."; Text[ greek ] = "Éäéüôçôåò..."; - Text[ korean ] = "특성..."; + Text[ korean ] = "ë“±ë¡ ì •ë³´..."; Text[ turkish ] = "Özellikler..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Propietats..."; @@ -1311,3 +1311,8 @@ Menu RID_POPUP_NAVIPI_SCENARIO + + + + + diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 0201248c272c..5cd5d9696e6c 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: opredlin.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 3cd8555fb216..6e636b499fbd 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpcalc.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: er $ $Date: 2001-07-11 16:02:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,8 +72,8 @@ #include "scitems.hxx" #include <vcl/msgbox.hxx> -#ifndef _TOOLS_SOLMATH_HXX //autogen wg. SolarMath -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX #include <unotools/localedatawrapper.hxx> @@ -182,12 +182,11 @@ SfxTabPage* __EXPORT ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& rCoreAttrs ) { USHORT d,m,y; - String aStrBuf; *pLocalOptions = *pOldOptions; - SolarMath::DoubleToString( aStrBuf, pLocalOptions->GetIterEps(), - 'G', 6, aDecSep.GetChar(0), TRUE ); + String aStrBuf( ::rtl::math::doubleToUString( pLocalOptions->GetIterEps(), + rtl_math_StringFormat_G, 6, aDecSep.GetChar(0), TRUE)); aBtnCase .Check( !pLocalOptions->IsIgnoreCase() ); aBtnCalc .Check( pLocalOptions->IsCalcAsShown() ); @@ -267,13 +266,14 @@ BOOL ScTpCalcOptions::GetEps( double& rEps ) { String aStr( aEdEps.GetText() ); aStr.EraseTrailingChars( ' ' ); - int nErrno; - const sal_Unicode* pEnd; - rEps = SolarMath::StringToDouble( aStr.GetBuffer(), - ScGlobal::pLocaleData->getNumThousandSep().GetChar(0), + rtl_math_ConversionStatus eStatus; + sal_Unicode const * pBegin = aStr.GetBuffer(); + sal_Unicode const * pEnd; + rEps = rtl_math_uStringToDouble( pBegin, pBegin + aStr.Len(), ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); - BOOL bOk = ( nErrno == 0 && *pEnd == '\0' && rEps > 0.0 ); + ScGlobal::pLocaleData->getNumThousandSep().GetChar(0), + &eStatus, &pEnd ); + BOOL bOk = ( eStatus == rtl_math_ConversionStatus_Ok && *pEnd == '\0' && rEps > 0.0 ); if ( bOk ) pLocalOptions->SetIterEps( rEps ); diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src index cec75becb266..ce08c84f5ba5 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.src +++ b/sc/source/ui/pagedlg/hfedtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: hfedtdlg.src,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:35:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ Text [ french ] = "En-tête/Pied de page" ; \ Text [ swedish ] = "Sidhuvud/sidfot" ; \ Text [ dutch ] = "Kop-/voettekst" ; \ - Text [ spanish ] = "Encabezam./Pie de página" ; \ + Text [ spanish ] = "Encabezamientos y pies de página" ; \ Text [ english_us ] = "Headers/Footers" ; \ Text[ chinese_simplified ] = "页眉/页脚"; \ Text[ russian ] = "Âåðõíèé/Íèæíèé êîëîíòèòóëû"; \ @@ -160,7 +160,7 @@ Text [ french ] = "En-tête (droit)" ; \ Text [ swedish ] = "Sidhuvud (höger)" ; \ Text [ dutch ] = "Koptekst (rechts)" ; \ - Text [ spanish ] = "Encabezam. (der.)" ; \ + Text [ spanish ] = "Encabezamiento (der.)" ; \ Text [ english_us ] = "Header (right)" ; \ Text[ chinese_simplified ] = "页眉(å³)"; \ Text[ russian ] = "Âåðõíèé êîëîíòèòóë (ñïðàâà)"; \ @@ -189,7 +189,7 @@ Text [ french ] = "En-tête (à gauche)" ; \ Text [ swedish ] = "Sidhuvud (vänster)" ; \ Text [ dutch ] = "Koptekst (links)" ; \ - Text [ spanish ] = "Encabezam. (izq.)" ; \ + Text [ spanish ] = "Encabezamiento (izq.)" ; \ Text [ english_us ] = "Header (left)" ; \ Text[ chinese_simplified ] = "页眉(å·¦)"; \ Text[ russian ] = "Âåðõíèé êîëîíòèòóë (ñëåâà)"; \ @@ -337,7 +337,7 @@ TabDialog RID_SCDLG_HFED_FOOTER Text [ portuguese ] = "Rodapé" ; Text [ finnish ] = "Alatunnisteet" ; Text [ danish ] = "Sidefødder" ; - Text [ french ] = "Pieds de pages" ; + Text [ french ] = "Pieds de page" ; Text [ swedish ] = "Sidfötter" ; Text [ dutch ] = "Voetteksten" ; Text [ spanish ] = "Pies de página" ; @@ -1133,7 +1133,7 @@ TabPage RID_HFBASE QuickHelpText[ dutch ] = "Pagina's"; QuickHelpText[ chinese_simplified ] = "页数"; QuickHelpText[ greek ] = "Óåëßäåò"; - QuickHelpText[ korean ] = "페ì´ì§€ë“¤"; + QuickHelpText[ korean ] = "페ì´ì§€"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Seiten"; QuickHelpText[ catalan ] = "Pàgines"; @@ -1253,7 +1253,7 @@ TabPage RID_HFBASE Text [ french ] = "Utilisez les boutons pour modifier la police ou pour insérer des champs tels que la date, l'heure, etc." ; Text [ swedish ] = "Använd kommandoknapparna för att ändra teckensnitt eller infoga fältkommandon som datum, klockslag etc." ; Text [ dutch ] = "Gebruik de knoppen om de tekstattributen te wijzigen of om veldopdrachten zoals datum, tijd, enz. in te voegen." ; - Text [ spanish ] = "Utilice los botones para modificar la fuente o para insertar comandos como fecha, hora, etc." ; + Text [ spanish ] = "Utilice los botones para modificar la fuente o para insertar ordenes como fecha, hora, etc." ; Text [ english_us ] = "Use the buttons to change the font or insert field commands such as date, time, etc." ; Text[ chinese_simplified ] = "请点击按钮，更改å—体或æ’入日期，时间ç‰åŒºåŸŸæŒ‡ä»¤ã€‚"; Text[ russian ] = "Èñïîëüçóéòå êíîïêè äëÿ èçìåíåíèÿ øðèôòà èëè äëÿ âñòàâêè òàêèõ êîìàíä ïîëÿ, êàê äàòà, âðåìÿ è ò.ä."; @@ -1264,7 +1264,7 @@ TabPage RID_HFBASE Text[ dutch ] = "Gebruik de knoppen om de tekstattributen te wijzigen of om veldopdrachten zoals datum, tijd, enz. in te voegen."; Text[ chinese_simplified ] = "请点击按钮，更改å—体或æ’入日期，时间ç‰åŒºåŸŸæŒ‡ä»¤ã€‚"; Text[ greek ] = "×ñçóéìïðïéÞóôå ôá ðåäßá åíôïëÞò ãéá íá áëëÜîåôå ôçí ãñáììáôïóåéñÜ Þ ãéá íá åéóÜãåôå ðåäßá åíôïëþí, üðùò ð.÷. çìåñïìçíßá, þñá, êôë."; - Text[ korean ] = "ê¸€ê¼´ì„ ë³€ê²½í•˜ê±°ë‚˜ ë‚ ì§œ, ì‹œê°„ë“±ì˜ í•„ë“œ ëª…ë ¹ì–´ë¥¼ 삽입하기 위해서는 ë²„íŠ¼ì„ ì‚¬ìš©í•˜ì‹ì‹œì˜¤."; + Text[ korean ] = "ê¸€ê¼´ì„ ë³€ê²½í•˜ê±°ë‚˜ ë‚ ì§œ, ì‹œê°„ë“±ì˜ í•„ë“œë¥¼ 삽입하기 위해서 ë²„íŠ¼ì„ ì‚¬ìš©í•˜ì‹ì‹œì˜¤."; Text[ turkish ] = "Yazýtipini deðiþtirmek ya da tarih, saat gibi alan komutlarý eklemek için düðmeleri kullanýnýz."; Text[ language_user1 ] = " "; Text[ catalan ] = "Utilitzeu els botons per canviar el tipus de lletra o bé inserir ordres de camp com ara la data, l'hora, etc."; @@ -1296,7 +1296,7 @@ TabPage RID_HFBASE Text[ dutch ] = "Tip"; Text[ chinese_simplified ] = "æ示"; Text[ greek ] = "ÓõìâïõëÞ"; - Text[ korean ] = "주"; + Text[ korean ] = "ì°¸ê³ "; Text[ turkish ] = "Not"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nota"; @@ -1433,3 +1433,8 @@ TabPage RID_SCPAGE_HFED_FR < RID_HFBASE + + + + + diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index 3c9928bb20fa..f894d8fb70af 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -2,9 +2,9 @@ * * $RCSfile: pagedlg.src,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: kz $ $Date: 2002-12-09 09:54:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ ModelessDialog RID_SCDLG_AREAS Text[ chinese_traditional ] = "列å°ç¯„åœ"; Text[ arabic ] = "äØÇÞ ÇáØÈÇÚÉ"; Text[ greek ] = "Ðåñéï÷Þ åêôýðùóçò"; - Text[ korean ] = "ì¸ì‡„ ì˜ì—"; + Text[ korean ] = "ì¸ì‡„ 범위"; Text[ turkish ] = "Yazdýrma aralýðý"; Text[ catalan ] = "Àrea d'impressió"; Text[ thai ] = "ช่วงà¸à¸²à¸£à¸žà¸´à¸¡à¸žà¹Œ"; @@ -518,7 +518,7 @@ ModelessDialog RID_SCDLG_AREAS Text [ NORWEGIAN ] = "Columns to repeat at left" ; Text [ DANISH ] = "Gentagelses~kolonne" ; Text [ ENGLISH_US ] = "Columns to repeat" ; - Text [ SPANISH ] = "~Columna a repetir" ; + Text [ SPANISH ] = "~Columna que repetir" ; Text [ FINNISH ] = "Toista sarake" ; Text [ FRENCH ] = "~Colonne à répéter" ; Text [ ITALIAN ] = "Colonna da ripetere" ; @@ -716,7 +716,7 @@ ModelessDialog RID_SCDLG_AREAS Text[ chinese_traditional ] = "編輯列å°ç¯„åœ"; Text[ arabic ] = "ÊÍÑíÑ äØÇÞÇÊ ÇáØÈÇÚÉ"; Text[ greek ] = "Åðåîåñãáóßá ðåñéï÷þí åêôýðùóçò"; - Text[ korean ] = "ì¸ì‡„ ì˜ì— 편집"; + Text[ korean ] = "ì¸ì‡„ 범위 편집"; Text[ turkish ] = "Yazdýrma aralýklarýný düzenle"; Text[ catalan ] = "Edita les àrees d'impressió"; Text[ finnish ] = "Muuta tulostusalueita"; @@ -754,7 +754,7 @@ TabPage RID_SCPAGE_TABLE Text[ chinese_traditional ] = "欄和列標題(~C)"; Text[ arabic ] = "ÑÄæÓ ÇáÃÓØÑ æÇáÃÚãÏÉ"; Text[ greek ] = "Êåöáëßäåò ãñáììþí/óôçëþí"; - Text[ korean ] = "행과 ì—´ 머리글(~C)"; + Text[ korean ] = "ì—´ 머리글/í–‰ 머리글(~C)"; Text[ turkish ] = "Satýr ve sütun ~baþlýklarý"; Text[ catalan ] = "Capçaleres de ~columnes i files"; Text[ thai ] = "ส่วนหัว~คà¸à¸¥à¸±à¸¡à¸™à¹Œà¹à¸¥à¸°à¹à¸–ว"; @@ -784,7 +784,7 @@ TabPage RID_SCPAGE_TABLE Text[ chinese_traditional ] = "å·¥ä½œè¡¨ç¶²æ ¼(~G)"; Text[ arabic ] = "ÔÈßÉ ÇáÌÏæá"; Text[ greek ] = "ÐëÝ~ãìá ðßíáêá"; - Text[ korean ] = "ëˆˆê¸ˆì„ (~G)"; + Text[ korean ] = "í‘œì˜ ëˆˆê¸ˆì„ (~G)"; Text[ turkish ] = "~Kýlavuz çizgiler"; Text[ catalan ] = "~Graella"; Text[ thai ] = "เ~ส้นตาราง"; @@ -838,13 +838,13 @@ TabPage RID_SCPAGE_TABLE Text [ ENGLISH_US ] = "~Objects/graphics" ; TabStop = TRUE ; Text[ chinese_simplified ] = "对象/图形(~O)"; - Text[ russian ] = "Âíåäðåííûå/ãðàôè÷åñêèå îáúåêòû"; + Text[ russian ] = "Âíåäðåííûå/ãðà~ôè÷åñêèå îáúåêòû"; Text[ polish ] = "Obiekty/~Grafiki"; Text[ japanese ] = "オブジェクトã¨å›³(~O)"; Text[ chinese_traditional ] = "物件/圖形(~O)"; Text[ arabic ] = "ßÇÆäÇÊ/ÕæÑ"; Text[ greek ] = "Áíôéêåßìåíá/ÃñáöéêÜ"; - Text[ korean ] = "개체/그래픽(~O)"; + Text[ korean ] = "개체/그림(~O)"; Text[ turkish ] = "~Nesne/grafikler"; Text[ catalan ] = "~Objectes/gràfics"; Text[ thai ] = "~วัตถุ/à¸à¸£à¸²à¸Ÿà¸´à¸„"; @@ -898,7 +898,7 @@ TabPage RID_SCPAGE_TABLE Text [ ENGLISH_US ] = "~Drawing objects" ; TabStop = TRUE ; Text[ chinese_simplified ] = "绘图对象(~D)"; - Text[ russian ] = "Ðèñóíêè"; + Text[ russian ] = "Ðèñ~óíêè"; Text[ polish ] = "Obiekty g~raficzne"; Text[ japanese ] = "図形æ画オブジェクト(~D)"; Text[ chinese_traditional ] = "繪圖物件(~D)"; @@ -1032,7 +1032,7 @@ TabPage RID_SCPAGE_TABLE { Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; - Text = "Von Lin~ks-nach-rechts, dann nach unten" ; + Text = "Von lin~ks nach rechts, dann nach unten" ; Text [ ENGLISH ] = "Left to rig~ht, then to bottom" ; Text [ norwegian ] = "Left to rig~ht" ; Text [ italian ] = "Da sinistra a d~estra, poi in basso" ; @@ -1040,7 +1040,7 @@ TabPage RID_SCPAGE_TABLE Text [ portuguese ] = "Da esquerda para a di~reita, depois para baixo" ; Text [ finnish ] = "~Vasemmalta oikealle, sitten alas" ; Text [ danish ] = "Fra ~venstre mod højre, derefter nedad" ; - Text [ french ] = "De gauche à dro~ite, puis vers le bas" ; + Text [ french ] = "De gauche à droite, puis vers le bas" ; Text [ swedish ] = "Från vänster till hög~er, sedan nedåt" ; Text [ dutch ] = "Van ~links naar rechts, dan naar beneden" ; Text [ spanish ] = "De ~izquierda a derecha, después hacia abajo" ; @@ -1054,7 +1054,7 @@ TabPage RID_SCPAGE_TABLE Text[ arabic ] = "ãä ÇáíÓÇÑ Åáì Çáíãíä"; Text[ language_user1 ] = "ÌÞêïò; - - - -"; Text[ greek ] = "Áðü áñéóôåñÜ ðñïò ôá äåîéÜ, óôç óõíÝ÷åéá ðñïò ôá ~êÜôù"; - Text[ korean ] = "왼쪽ì—ì„œ 오른쪽으로, ê·¸ í›„ì— ì•„ëž˜ë¡œ"; + Text[ korean ] = "왼쪽ì—ì„œ 오른쪽으로, ê·¸ ë‹¤ìŒ ì•„ëž˜ë¡œ"; Text[ turkish ] = "S~oldan saða"; Text[ catalan ] = "D'~esquerra a dreta"; Text[ thai ] = "ซ้า~ยไปขวา"; @@ -1103,7 +1103,7 @@ TabPage RID_SCPAGE_TABLE Text [ english_us ] = "First ~page number" ; TabStop = TRUE ; Text[ chinese_simplified ] = "第一个页ç (~P)"; - Text[ russian ] = "Íîìåð ïåðâîé ñòðàíèöû"; + Text[ russian ] = "¹ ïåðâîé ñòðàíèöû"; Text[ polish ] = "Pierwszy nu~mer strony"; Text[ japanese ] = "最åˆã®ãƒšãƒ¼ã‚¸ç•ªå·(~P)"; Text[ chinese_traditional ] = "第一個é 碼(~P)"; @@ -1262,7 +1262,7 @@ TabPage RID_SCPAGE_TABLE Text[ chinese_traditional ] = "顯示比例"; Text[ arabic ] = "ÇáãÞíÇÓ"; Text[ greek ] = "Êëßìáêá"; - Text[ korean ] = "배율"; + Text[ korean ] = "배율 ì¡°ì •"; Text[ turkish ] = "Ölçek"; Text[ catalan ] = "Escala"; Text[ finnish ] = "Skaalaa"; @@ -1275,12 +1275,3 @@ TabPage RID_SCPAGE_TABLE - - - - - - - - - diff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.src index 4bebd342277b..2ca4783faf95 100644 --- a/sc/source/ui/pagedlg/tphf.src +++ b/sc/source/ui/pagedlg/tphf.src @@ -2,9 +2,9 @@ * * $RCSfile: tphf.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2001-11-16 22:53:19 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,7 +72,7 @@ PushButton RID_SCBTN_HFEDIT Text [ italian ] = "Modifica..." ; Text [ portuguese_brazilian ] = "Edi~tar..." ; Text [ portuguese ] = "Edi~tar..." ; - Text [ finnish ] = "~Muokkaa" ; + Text [ finnish ] = "~Muuta..." ; Text [ danish ] = "Rediger..." ; Text [ french ] = "É~diter..." ; Text [ swedish ] = "Redige~ra..." ; @@ -86,10 +86,11 @@ PushButton RID_SCBTN_HFEDIT Text[ chinese_traditional ] = "編輯(~E)..."; Text[ arabic ] = "ÊÍÑíÑ..."; Text[ greek ] = "Åðåîåñãáóßá..."; - Text[ korean ] = "편집.(~E)..."; + Text[ korean ] = "편집(~E)..."; Text[ turkish ] = "~Düzenle..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editar..."; + Text[ catalan ] = "~Edita..."; + Text[ thai ] = "à¹~à¸à¹‰à¹„ข..."; }; @@ -101,3 +102,6 @@ PushButton RID_SCBTN_HFEDIT + + + diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src index 8b1cbff1b70d..9a503ae77200 100644 --- a/sc/source/ui/src/attrdlg.src +++ b/sc/source/ui/src/attrdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: attrdlg.src,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:42:49 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,15 +73,15 @@ TabDialog RID_SCDLG_ATTR Text = "Zellen formatieren" ; Text [ ENGLISH ] = "Cell Attributes" ; Text [ norwegian ] = "Cell Attributes" ; - Text [ italian ] = "Attributi cella" ; + Text [ italian ] = "Formatta celle" ; Text [ portuguese_brazilian ] = "Atributos da C?lula" ; Text [ portuguese ] = "Atributos de célula" ; Text [ finnish ] = "Solun määritteet" ; Text [ danish ] = "Celleattributter" ; - Text [ french ] = "Attributs de cellule" ; - Text [ swedish ] = "Cellattribut" ; + Text [ french ] = "Formatage des cellules" ; + Text [ swedish ] = "Formatera celler" ; Text [ dutch ] = "Celattributen" ; - Text [ spanish ] = "Atributos de celda" ; + Text [ spanish ] = "Formateado de celdas" ; Text [ english_us ] = "Format Cells" ; Moveable = TRUE ; Closeable = FALSE ; @@ -253,7 +253,7 @@ TabDialog RID_SCDLG_ATTR Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; Text[ chinese_simplified ] = "边框"; Text[ russian ] = "Îáðàìëåíèå"; @@ -262,7 +262,7 @@ TabDialog RID_SCDLG_ATTR Text[ chinese_traditional ] = "邊框"; Text[ arabic ] = "ÇáÍÏæÏ"; Text[ greek ] = "Ðåñßãñáììá"; - Text[ korean ] = "ì™¸ê³½ì„ "; + Text[ korean ] = "í…Œë‘리"; Text[ turkish ] = "Kenarlýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vores"; @@ -333,11 +333,11 @@ TabDialog RID_SCDLG_ATTR Text[ chinese_simplified ] = "å•å…ƒæ ¼å±žæ€§"; Text[ russian ] = "Àòðèáóòû ÿ÷åéêè"; Text[ polish ] = "Atrybuty komórek"; - Text[ japanese ] = "セルã®å±žæ€§"; - Text[ chinese_traditional ] = "儲å˜æ ¼å±¬æ€§"; + Text[ japanese ] = "セルã®æ›¸å¼è¨å®š"; + Text[ chinese_traditional ] = "æ ¼å¼åŒ–儲å˜æ ¼"; Text[ arabic ] = "ÓãÇÊ ÇáÎáíÉ"; Text[ greek ] = "Éäéüôçôåò êåëéïý"; - Text[ korean ] = "ì…€ ì†ì„±"; + Text[ korean ] = "ì…€ ì„œì‹ ì„¤ì •"; Text[ turkish ] = "Hücre öznitelikleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Atributs de la cel.la"; @@ -379,7 +379,7 @@ TabPage RID_SCPAGE_PROTECTION Text[ chinese_traditional ] = "鎖定(~P)"; Text[ arabic ] = "ãÍãí"; Text[ greek ] = "ÊëåéäùìÝíï"; - Text[ korean ] = "장í‰(~P)"; + Text[ korean ] = "보호함(~P)"; Text[ turkish ] = "~Koruma altýnda"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Protegit"; @@ -435,13 +435,13 @@ TabPage RID_SCPAGE_PROTECTION Text [ english_us ] = "Hide ~all" ; TabStop = TRUE ; Text[ chinese_simplified ] = "全部éšå…¥(~A)"; - Text[ russian ] = "Ñêðûòü âñå"; + Text[ russian ] = "Ñ~êðûòü âñå"; Text[ polish ] = "Ukryj wszystko"; Text[ japanese ] = "ã™ã¹ã¦è¡¨ç¤ºã—ãªã„(~A)"; Text[ chinese_traditional ] = "全部隱入(~A)"; Text[ arabic ] = "ÅÎÝÇÁ Çáßá"; Text[ greek ] = "~Áðüêñõøç üëùí"; - Text[ korean ] = "ì „ë¶€ 숨기기(~A)"; + Text[ korean ] = "ëª¨ë‘ ìˆ¨ê¸°ê¸°(~A)"; Text[ turkish ] = "~Tümünü gizle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Oculta-ho ~tot"; @@ -466,16 +466,16 @@ TabPage RID_SCPAGE_PROTECTION Text [ french ] = "Pour activer la protection d'une cellule, vous devez protéger la feuille active.\n\nChoisissez 'Protection' dans le menu 'Outils' puis la commande 'Feuille'." ; Text [ swedish ] = "Cellskyddet är bara verksamt om den aktiva tabellen är skyddad.\n\nVälj 'Skydda dokument' på menyn 'Verktyg' och därefter 'Tabell' för att skydda tabellen." ; Text [ dutch ] = "De celbeveiliging functioneert alleen als het actieve werkblad beveiligd is.\n\nKies eerst in menu 'Extra' de optie 'Document beveiligen' en vervolgens de optie 'Werkblad'." ; - Text [ spanish ] = "La protección de celdas será efectiva solamente si la hoja activa está protegida.\n\nEn 'Herramientas' seleccione el comando 'Proteger documento' y a continuación 'Hoja de cálculo'." ; + Text [ spanish ] = "La protección de celdas será efectiva solamente si la hoja activa está protegida.\n\nEn 'Herramientas' seleccione la orden 'Proteger documento' y a continuación 'Hoja de cálculo'." ; Text [ english_us ] = "Cell protection is only effective after the current sheet has been protected. \n\nSelect 'Protect Document' from the 'Tools' menu, and specify 'Sheet'." ; Text[ chinese_simplified ] = "åªæœ‰åœ¨ä½¿ç”¨ä¿æŠ¤å·¥ä½œè¡¨åŽï¼Œå•å…ƒæ ¼æ‰ä¼šå—到ä¿æŠ¤ã€‚\n\n请点击èœå•å‘½ä»¤\"工具\"，\"ä¿æŠ¤æ–‡æ¡£\"，\"工作表\"。"; - Text[ russian ] = "Çàùèòà ÿ÷åéêè äåéñòâóåò òîëüêî ïîñëå óñòàíîâëåíèÿ çàùèòû òåêóùåãî ëèñòà.\n\nÄëÿ çàùèòû ëèñòà âûáåðèòå â ìåíþ 'Ñåðâèñ' êîìàíäó 'Çàùèòà äîêóìåíòà', à çàòåì êîìàíäó 'Ëèñò'."; + Text[ russian ] = "Çàùèòà ÿ÷åéêè äåéñòâóåò òîëüêî ïîñëå óñòàíîâêè çàùèòû òåêóùåãî ëèñòà.\n\nÄëÿ çàùèòû ëèñòà âûáåðèòå â ìåíþ 'Ñåðâèñ' êîìàíäó 'Óñòàíîâèòü çàùèòó äîêóìåíòà', à çàòåì êîìàíäó 'Ëèñò'."; Text[ polish ] = "Ochrona komórek aktywna bêdzie dopiero po zabezpieczeniu aktualnego arkusza.\n\nNale¿y wybraæ w tym celu z menu 'Narzêdzia' polecenie 'Chroñ dokument', a nastêpnie polecenie 'Arkusz'."; Text[ japanese ] = "セルã®ä¿è·ã¯ç¾åœ¨ã®è¡¨ãŒä¿è·ã•ã‚Œã¦ã„る時ã®ã¿æœ‰åŠ¹ã§ã™ã€‚\n\n表をä¿è·ã™ã‚‹ã«ã¯ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã§ãƒ„ール→ドã‚ュメントã®ä¿è·â†’表をé¸æŠžã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "åªæœ‰åœ¨å•Ÿå‹•ä¿è·å·¥ä½œè¡¨å¾Œï¼Œå„²å˜æ ¼æ‰æœƒå—到ä¿è·ã€‚\n\n請按一下這個功能表指令：<ä¿è·æ–‡ä»¶>，<工作表>。"; Text[ arabic ] = "áÇ ÊÕÈÍ ÍãÇíÉ ÇáÎáÇíÇ ÝÚøÇáÉ¡ ÅáÇ ÚäÏãÇ íßæä ÇáÌÏæá ÇáÍÇáí ãÍãí.\n\náÊäÝíÐ Ðáß ÇáÑÌÇÁ ÇÎÊíÇÑ ÇáÃãÑ 'ÍãÇíÉ ÇáãÓÊäÏ' ãä ÇáÞÇÆãÉ 'ÃÏæÇÊ'¡ Ëã ÇáÃã?"; Text[ greek ] = "Ç ðñïóôáóßá êåëéþí éó÷ýåé ìüíï óôçí ðåñßðôùóç ðïõ õðÜñ÷åé ðñïóôáóßá ãéá ôïí ôñÝ÷ùí ðßíáêá.\n\nÃéá íá ãßíåé áõôü åðéëÝîôå óôï ìåíïý 'Åñãáëåßá' ôçí åíôïëÞ 'Ðñïóôáóßá åããñÜöïõ' êáé óôç óõíÝ÷åéá ôçí åíôïëÞ 'Ðßíáêáò'."; - Text[ korean ] = "ì…€ 보호는 í˜„ìž¬ì˜ ì‹œíŠ¸ê°€ 보호ë˜ì—ˆì„ 때만 ìœ íš¨í•©ë‹ˆë‹¤. \n\n'ë„구' 메뉴ì—ì„œ '문서 보호'를 ì„ íƒí•œ 다ìŒ, '시트'를 ì§€ì •í•˜ì‹ì‹œì˜¤."; + Text[ korean ] = "ì…€ 보호는 현재 활성 ì¤‘ì¸ ì‹œíŠ¸ê°€ 보호ë˜ì—ˆì„ 때만 ìœ íš¨í•©ë‹ˆë‹¤. \n\n[ë„구] 메뉴ì—ì„œ [문서 보호]를 ì„ íƒí•œ 후 [시트]를 ì§€ì •í•˜ì‹ì‹œì˜¤."; Text[ turkish ] = "Hücre korumasý, yalnýzca aktif tablo da korunmuþsa etkindir.\n\nBunun için 'Araçlar' mönüsünden önce 'belgeyi koru' sonra 'Tablo' komutunu seçin."; Text[ language_user1 ] = " "; Text[ catalan ] = "La protecció de cel.les només és efectiva després d'haver protegit el full actual. \n\nSeleccioneu 'Protegeix el document' del menú 'Eines' i especifiqueu 'Full'."; @@ -567,7 +567,7 @@ TabPage RID_SCPAGE_PROTECTION Text[ chinese_traditional ] = "ç›®å‰é¸å–的儲å˜æ ¼ä¸æœƒè¢«åˆ—å°å‡ºä¾†ã€‚"; Text[ arabic ] = "ÓíÊã ÊÌÇåá ÎáÇíÇ ÇáÊÍÏíÏ ÇáÍÇáí ÚäÏ ÇáØÈÇÚÉ."; Text[ greek ] = "Ôá êåëéÜ ôçò ôñÝ÷ïõóáò åðéëïãÞò èá ðáñáëçöèïýí êáôÜ ôçí åêôýðùóç."; - Text[ korean ] = "ì„ íƒëœ ì…€ì€ ì¸ì‡„ì—ì„œ ì œì™¸ë 것입니다."; + Text[ korean ] = "ì„ íƒëœ ì…€ì€ ì¸ì‡„ë˜ì§€ 않습니다."; Text[ turkish ] = "Yürürlükteki seçimin hücreleri yazdýrmaya dahil olmayacak."; Text[ language_user1 ] = " "; Text[ catalan ] = "En imprimir, les cel.les seleccionades s'ometran."; @@ -620,3 +620,8 @@ TabPage RID_SCPAGE_PROTECTION + + + + + diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src index bb44d841a029..3efea6d4fe4d 100644 --- a/sc/source/ui/src/autofmt.src +++ b/sc/source/ui/src/autofmt.src @@ -2,9 +2,9 @@ * * $RCSfile: autofmt.src,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: kz $ $Date: 2001-11-16 22:54:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ french ] = "AutoFormat" ; Text [ swedish ] = "Autoformat" ; Text [ dutch ] = "AutoOpmaak" ; - Text [ spanish ] = "AutoFormato" ; + Text [ spanish ] = "Formateado automático" ; Text [ english_us ] = "AutoFormat" ; Moveable = TRUE ; Closeable = FALSE ; @@ -101,10 +101,10 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ italian ] = "Formato" ; Text [ portuguese_brazilian ] = "~Formato" ; Text [ portuguese ] = "Fo~rmato" ; - Text [ finnish ] = "~Muotoile" ; - Text [ danish ] = "Forma~ter" ; + Text [ finnish ] = "Muotoil~e" ; + Text [ danish ] = "Form~ater" ; Text [ french ] = "Forma~t" ; - Text [ swedish ] = "~Format" ; + Text [ swedish ] = "Form~at" ; Text [ dutch ] = "~Opmaak" ; Text [ spanish ] = "~Formato" ; Text [ english_us ] = "F~ormat" ; @@ -118,7 +118,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "ì„œì‹(~O)"; Text[ turkish ] = "Format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Formato"; + Text[ catalan ] = "~Format"; + Text[ thai ] = "~รูปà¹à¸šà¸š"; }; Window WND_PREVIEW { @@ -147,16 +148,17 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ english_us ] = "A~utoFit width and height" ; TabStop = TRUE ; Text[ chinese_simplified ] = "调整宽度/高度(~U)"; - Text[ russian ] = "Ïîäáîð øèðèíû/âûñîòû"; + Text[ russian ] = "Ïîäáîð øèðèíû è âûñîòû"; Text[ polish ] = "Dostosuj szerokoœæ/wysokoœæ"; Text[ japanese ] = "å¹…ã¨é«˜ã•ã®èª¿æ•´(~U)"; Text[ chinese_traditional ] = "調整寬度/高度(~U)"; Text[ arabic ] = "ãáÇÁãÉ ÇáÚÑÖ æÇáÇÑÊÝÇÚ"; Text[ greek ] = "Ñýèìéóç ðëÜôïõò/ýøïõò"; - Text[ korean ] = "너비와 ë†’ì´ ì¡°ì ˆ(~U)"; + Text[ korean ] = "너비 ë° ë†’ì´ ìžë™ 맞춤(~U)"; Text[ turkish ] = "Geniþlik/yüksekliði ayarla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajustar anc~ho/alto"; + Text[ catalan ] = "Aj~usta automàticament l'amplada i l'alçada"; + Text[ thai ] = "ความà¸à¸§à¹‰à¸²à¸‡à¹à¸¥à¸°à¸„วามสูงพà¸à¸”ีà¸à¸±~ตโนมัติ"; }; CheckBox BTN_BORDER { @@ -174,7 +176,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ french ] = "~Bordure" ; Text [ swedish ] = "~Inramning" ; Text [ dutch ] = "~Omranding" ; - Text [ spanish ] = "~Borde" ; + Text [ spanish ] = "~Bordes" ; Text [ english_us ] = "~Borders" ; TabStop = TRUE ; Text[ chinese_simplified ] = "边框(~B)"; @@ -184,10 +186,11 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ chinese_traditional ] = "邊框(~B)"; Text[ arabic ] = "ÇáÍÏæÏ"; Text[ greek ] = "Ðåñßãñáììá"; - Text[ korean ] = "ì™¸ê³½ì„ (~B)"; + Text[ korean ] = "í…Œë‘리(~B)"; Text[ turkish ] = "~Kenarlýk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Borde"; + Text[ catalan ] = "~Vores"; + Text[ thai ] = "~เส้นขà¸à¸š"; }; CheckBox BTN_FONT { @@ -202,7 +205,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ portuguese ] = "~Tipo de letra" ; Text [ finnish ] = "~Fontti" ; Text [ danish ] = "Skrifttype" ; - Text [ french ] = "~Police" ; + Text [ french ] = "Police" ; Text [ swedish ] = "Tecken~snitt" ; Text [ dutch ] = "~Lettertype" ; Text [ spanish ] = "Fuen~te" ; @@ -211,14 +214,15 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ chinese_simplified ] = "å—体(~O)"; Text[ russian ] = "Øðèôò"; Text[ polish ] = "Czcionka"; - Text[ japanese ] = "ﾌｫï¾ï¾„ã®ç¨®é¡ž(~O)"; + Text[ japanese ] = "フォントã®ç¨®é¡ž(~O)"; Text[ chinese_traditional ] = "å—åž‹(~O)"; Text[ arabic ] = "äæÚ ÇáÎØ"; Text[ greek ] = "ÃñáììáôïóåéñÜ"; Text[ korean ] = "글꼴(~O)"; Text[ turkish ] = "~Yazýtipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuen~te"; + Text[ catalan ] = "T~ipus de lletra"; + Text[ thai ] = "ตัว~à¸à¸±à¸à¸©à¸£"; }; CheckBox BTN_PATTERN { @@ -240,7 +244,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ english_us ] = "~Pattern" ; TabStop = TRUE ; Text[ chinese_simplified ] = "图案(~P)"; - Text[ russian ] = "~Óçîð"; + Text[ russian ] = "~Îðíàìåíò"; Text[ polish ] = "Deseñ"; Text[ japanese ] = "背景(~P)"; Text[ chinese_traditional ] = "圖案(~P)"; @@ -249,7 +253,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "패턴(~P)"; Text[ turkish ] = "~Örnek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Modelo"; + Text[ catalan ] = "~Patró"; + Text[ thai ] = "~ลวดลาย"; }; CheckBox BTN_ALIGNMENT { @@ -259,12 +264,12 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text = "~Ausrichtung" ; Text [ ENGLISH ] = "Orien~tation" ; Text [ norwegian ] = "Orien~tation" ; - Text [ italian ] = "Orien~tamento" ; + Text [ italian ] = "~Orientamento" ; Text [ portuguese_brazilian ] = "Orien~ta??o" ; Text [ portuguese ] = "~Alinhamento" ; Text [ finnish ] = "~Tasaus" ; Text [ danish ] = "Justering" ; - Text [ french ] = "~Alignement" ; + Text [ french ] = "Alignement" ; Text [ swedish ] = "~Justering" ; Text [ dutch ] = "~Positie" ; Text [ spanish ] = "A~lineación" ; @@ -280,7 +285,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "맞춤(~T)"; Text[ turkish ] = "~Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~lineación"; + Text[ catalan ] = "A~lineació"; + Text[ thai ] = "จัดตำà¹~หน่ง"; }; CheckBox BTN_NUMFORMAT { @@ -293,12 +299,12 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ italian ] = "Formato ~numero" ; Text [ portuguese_brazilian ] = "~Formatodon?ero" ; Text [ portuguese ] = "~Formato numérico" ; - Text [ finnish ] = "~Numeromuoto" ; + Text [ finnish ] = "~Lukumuoto" ; Text [ danish ] = "Talformat" ; Text [ french ] = "~Format numérique" ; Text [ swedish ] = "Talf~ormat" ; Text [ dutch ] = "~Getalnotatie" ; - Text [ spanish ] = "~Formato de números" ; + Text [ spanish ] = "Formato nu~mérico" ; Text [ english_us ] = "~Number format" ; TabStop = TRUE ; Text[ chinese_simplified ] = "æ•°å—æ ¼å¼(~N)"; @@ -308,10 +314,11 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ chinese_traditional ] = "數å—æ ¼å¼(~N)"; Text[ arabic ] = "ÊäÓíÞ ÇáÃÑÞÇã"; Text[ greek ] = "ÌïñöÞ áñéèìþí"; - Text[ korean ] = "ìˆ«ìž í¬ë§·(~N)"; + Text[ korean ] = "ìˆ«ìž í‘œê¸° 형ì‹(~N)"; Text[ turkish ] = "Sayý f~ormatý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Formato de números"; + Text[ catalan ] = "Format dels ~nombres"; + Text[ thai ] = "รูปà¹à¸šà¸š~ตัวเลข"; }; FixedLine FL_FORMATTING { @@ -328,7 +335,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ danish ] = "Formatering" ; Text [ french ] = "Formatage" ; Text [ swedish ] = "Formatering" ; - Text [ dutch ] = "Opmaken" ; + Text [ dutch ] = "Opmaak" ; Text [ spanish ] = "Formato" ; Text [ english_us ] = "Formatting" ; Text[ chinese_simplified ] = "æ ¼å¼åŒ–"; @@ -338,10 +345,11 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ chinese_traditional ] = "æ ¼å¼åŒ–"; Text[ arabic ] = "ÊäÓíÞ"; Text[ greek ] = "Ìïñöïðïßçóç"; - Text[ korean ] = "í¬ë§·íŒ…"; + Text[ korean ] = "ì„œì‹ ì„¤ì •"; Text[ turkish ] = "Formatlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato"; + Text[ catalan ] = "Format"; + Text[ thai ] = "จัดรูปà¹à¸šà¸š"; }; OKButton BTN_OK { @@ -375,7 +383,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ italian ] = "~Inserisci..." ; Text [ portuguese_brazilian ] = "~Add..." ; Text [ portuguese ] = "~Adicionar..." ; - Text [ finnish ] = "~Lis??..." ; + Text [ finnish ] = "~Lisää..." ; Text [ danish ] = "Tilføj..." ; Text [ french ] = "A~jouter..." ; Text [ swedish ] = "Lägg ti~ll..." ; @@ -397,7 +405,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "추가(~A)..."; Text[ turkish ] = "~Ekle..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Añadir..."; + Text[ catalan ] = "~Afegeix..."; + Text[ thai ] = "เ~พิ่ม..."; }; PushButton BTN_REMOVE { @@ -412,10 +421,10 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ portuguese ] = "E~liminar" ; Text [ finnish ] = "~Poista" ; Text [ danish ] = "Slet" ; - Text [ french ] = "~Supprimer" ; + Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; @@ -428,7 +437,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "ì‚ì œ(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~ลบ"; }; PushButton BTN_RENAME @@ -458,8 +468,9 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "ì´ë¦„ 바꾸기(~R)"; Text[ turkish ] = "~Yeniden adlandýr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar ~nombre"; - Text[ finnish ] = "~Nime? uudelleen"; + Text[ catalan ] = "~Reanomena"; + Text[ finnish ] = "~Nimeä uudelleen"; + Text[ thai ] = "เ~ปลี่ยนชื่à¸"; }; HelpButton BTN_HELP @@ -479,24 +490,25 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ italian ] = "Aggiungi formattazione automatica" ; Text [ portuguese_brazilian ] = "Acrescentar Formato autom?tico" ; Text [ portuguese ] = "Adicionar AutoFormato" ; - Text [ finnish ] = "Lis?? automaattinen muotoilu" ; + Text [ finnish ] = "Lisää automaattinen muotoilu" ; Text [ danish ] = "Tilføj AutoFormat" ; Text [ french ] = "Ajouter un AutoFormat" ; Text [ swedish ] = "Lägg till autoformat" ; Text [ dutch ] = "AutoOpmaak toevoegen" ; - Text [ spanish ] = "Añadir AutoFormato" ; + Text [ spanish ] = "Añadir Formateado automático" ; Text [ english_us ] = "Add AutoFormat" ; Text[ chinese_simplified ] = "æ–°å¢žè‡ªåŠ¨æ ¼å¼"; Text[ russian ] = "Äîáàâèòü àâòîôîðìàò"; Text[ polish ] = "Dodaj Autoformat"; - Text[ japanese ] = "ｵｰﾄﾌｫｰï¾ï½¯ï¾„ã®è¿½åŠ "; + Text[ japanese ] = "オートフォーマットã®è¿½åŠ "; Text[ chinese_traditional ] = "æ–°å¢žè‡ªå‹•æ ¼å¼"; Text[ arabic ] = "ÅÖÇÝÉ ÊäÓíÞ ÊáÞÇÆí"; Text[ greek ] = "ÐñïóèÞêç ÁõôïÌïñöÞò"; - Text[ korean ] = "ìžë™ì„œì‹ 추가"; + Text[ korean ] = "ìžë™ ì„œì‹ ì¶”ê°€"; Text[ turkish ] = "Otomatik formatlama ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Añadir AutoFormato"; + Text[ catalan ] = "Afegeix el formatatge automàtic"; + Text[ thai ] = "เพิ่มรูปà¹à¸šà¸šà¸à¸±à¸•à¹‚นมัติ"; }; String STR_RENAME_TITLE @@ -509,21 +521,22 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ swedish ] = "Byt namn på autoformat" ; Text [ danish ] = "Omdøb AutoFormat" ; Text [ italian ] = "Rinomina formattazione automatica" ; - Text [ spanish ] = "Cambiar nombre del AutoFormato" ; + Text [ spanish ] = "Cambiar nombre del Formateado automático" ; Text [ french ] = "Renommer l'AutoFormat" ; Text [ dutch ] = "AutoOpmaak nieuwe naam geven" ; Text[ chinese_simplified ] = "é‡å‘½åè‡ªåŠ¨æ ¼å¼"; Text[ russian ] = "Ïåðåèìåíîâàòü àâòîôîðìàò"; Text[ polish ] = "Zmieñ nazwê Autoformatu"; - Text[ japanese ] = "ｵｰﾄﾌｫｰï¾ï½¯ï¾„ã®åå‰ã®å¤‰æ›´"; + Text[ japanese ] = "オートフォーマットã®åå‰ã®å¤‰æ›´"; Text[ chinese_traditional ] = "é‡æ–°å‘½åè‡ªå‹•æ ¼å¼"; Text[ arabic ] = "ÅÚÇÏÉ ÊÓãíÉ ÇáÊäÓíÞ ÇáÊáÞÇÆí"; Text[ greek ] = "Ìåôïíïìáóßá ÁõôïÌïñöÞò"; - Text[ korean ] = "ìžë™ì„œì‹ ì´ë¦„ 바꾸기"; + Text[ korean ] = "ìžë™ ì„œì‹ ì´ë¦„ 바꾸기"; Text[ turkish ] = "Otom. formatlamayý yen. adlandýr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre del AutoFormato"; - Text[ finnish ] = "Nime? automaattinen muotoilu uudelleen"; + Text[ catalan ] = "Reanomena el formatatge automàtic"; + Text[ finnish ] = "Nimeä automaattinen muotoilu uudelleen"; + Text[ thai ] = "เปลี่ยนชื่à¸à¸£à¸¹à¸›à¹à¸šà¸šà¸à¸±à¸•à¹‚นมัติ"; }; String STR_ADD_LABEL @@ -551,7 +564,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "ì´ë¦„"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "Nom"; + Text[ thai ] = "ชื่à¸"; }; String STR_DEL_TITLE { @@ -567,19 +581,20 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ french ] = "Supprimer l'AutoFormat" ; Text [ swedish ] = "Radera autoformat" ; Text [ dutch ] = "AutoOpmaak wissen" ; - Text [ spanish ] = "Eliminar AutoFormato" ; + Text [ spanish ] = "Borrar Formateado automático" ; Text [ english_us ] = "Delete AutoFormat" ; Text[ chinese_simplified ] = "åˆ é™¤è‡ªåŠ¨æ ¼å¼"; Text[ russian ] = "Óäàëèòü àâòîôîðìàò"; Text[ polish ] = "Usuñ Autoformat"; - Text[ japanese ] = "ｵｰﾄﾌｫｰï¾ï½¯ï¾„ã®å‰Šé™¤"; + Text[ japanese ] = "オートフォーマットã®å‰Šé™¤"; Text[ chinese_traditional ] = "åˆªé™¤è‡ªå‹•æ ¼å¼"; Text[ arabic ] = "ÍÐÝ ÊäÓíÞ ÊáÞÇÆí"; Text[ greek ] = "ÄéáãñáöÞ ÁõôïÌïñöÞò"; - Text[ korean ] = "ìžë™ì„œì‹ ì‚ì œ"; + Text[ korean ] = "ìžë™ ì„œì‹ ì‚ì œ"; Text[ turkish ] = "Otomatik formatlamayý sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar AutoFormato"; + Text[ catalan ] = "Suprimeix el formatatge automàtic"; + Text[ thai ] = "ลบรูปà¹à¸šà¸šà¸à¸±à¸•à¹‚นมัติ"; }; String STR_DEL_MSG { @@ -595,19 +610,20 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ french ] = "Confirmez-vous la suppression de l'AutoFormat # ?" ; Text [ swedish ] = "Skall autoformatet # verkligen raderas?" ; Text [ dutch ] = "Wilt u AutoOpmaak # werkelijk verwijderen?" ; - Text [ spanish ] = "¿Desea realmente eliminar el AutoFormato #?" ; + Text [ spanish ] = "¿Desea realmente borrar el Formateado automático #?" ; Text [ english_us ] = "Do you really want to delete the # AutoFomat?" ; Text[ chinese_simplified ] = "您真è¦åˆ é™¤è‡ªåŠ¨æ ¼å¼ # ?"; Text[ russian ] = "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü àâòîôîðìàò #?"; Text[ polish ] = "Czy na pewno usun¹æ Autoformat #?"; - Text[ japanese ] = "ｵｰﾄﾌｫｰï¾ï½¯ï¾„ # を本当ã«å‰Šé™¤ã—ã¾ã™ã‹ã€‚"; + Text[ japanese ] = "オートフォーマット # を本当ã«å‰Šé™¤ã—ã¾ã™ã‹ã€‚"; Text[ chinese_traditional ] = "真è¦åˆªé™¤è‡ªå‹•æ ¼å¼ # ?"; Text[ arabic ] = "åá ÊÑíÏ ÈÇáÝÚá ÍÐÝ ÇáÊäÓíÞ ÇáÊáÞÇÆí #¿"; Text[ greek ] = "ÈÝëåôå ðñáãìáôéêÜ íá äéáãñáöåß ç ÁõôïÌïñöÞ #;"; - Text[ korean ] = "# ìžë™ì„œì‹ì„ ì •ë§ë¡œ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"; + Text[ korean ] = "# ìžë™ ì„œì‹ì„ ì •ë§ë¡œ ì‚ì œí•˜ê² ìŠµë‹ˆê¹Œ?"; Text[ turkish ] = "Otomatik formatlama # gerçekten silinsin mi?"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¿Desea realmente eliminar el AutoFormato #?"; + Text[ catalan ] = "Segur que voleu suprimir el formatatge automàtic #?"; + Text[ thai ] = "คุณต้à¸à¸‡à¸à¸²à¸£à¸¥à¸š # รูปà¹à¸šà¸šà¸à¸±à¸•à¹‚นมัติหรืà¸à¹„ม่?"; }; String STR_BTN_CLOSE { @@ -620,7 +636,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ portuguese ] = "~Fechar" ; Text [ finnish ] = "~Sulje" ; Text [ danish ] = "Luk" ; - Text [ french ] = "~Fermer" ; + Text [ french ] = "Fermer" ; Text [ swedish ] = "Stä~ng" ; Text [ dutch ] = "~Sluiten" ; Text [ spanish ] = "~Cerrar" ; @@ -635,7 +651,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "닫기(~C)"; Text[ turkish ] = "K~apat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cerrar"; + Text[ catalan ] = "~Tanca"; + Text[ thai ] = "~ปิด"; }; String STR_JAN { @@ -662,7 +679,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "1ì›”"; Text[ turkish ] = "Oca"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ene"; + Text[ catalan ] = "Gen."; + Text[ thai ] = "มà¸à¸£à¸²à¸„ม"; }; String STR_FEB { @@ -689,7 +707,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "2ì›”"; Text[ turkish ] = "Þub"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Feb"; + Text[ catalan ] = "Feb."; + Text[ thai ] = "à¸à¸¸à¸¡à¸ าพันธ์"; }; String STR_MAR { @@ -717,7 +736,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "3ì›”"; Text[ turkish ] = "Mar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mar"; + Text[ catalan ] = "Març"; + Text[ thai ] = "มีนาคม"; }; String STR_NORTH { @@ -744,7 +764,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "ë¶ìª½"; Text[ turkish ] = "Kuzey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Norte"; + Text[ catalan ] = "Nord"; + Text[ thai ] = "เหนืà¸"; }; String STR_MID { @@ -756,7 +777,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ portuguese ] = "Centro" ; Text [ finnish ] = "Keski" ; Text [ danish ] = "Midte" ; - Text [ french ] = "Milieu" ; + Text [ french ] = "Centre" ; Text [ swedish ] = "Mitten" ; Text [ dutch ] = "Midden" ; Text [ spanish ] = "Centrado" ; @@ -768,10 +789,11 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ chinese_traditional ] = "ä¸"; Text[ arabic ] = "ÇáæÓØ"; Text[ greek ] = "ÊÝíôñï"; - Text[ korean ] = "중간"; + Text[ korean ] = "가운ë°"; Text[ turkish ] = "Orta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centro"; + Text[ catalan ] = "Mig"; + Text[ thai ] = "à¸à¸¥à¸²à¸‡"; }; String STR_SOUTH { @@ -782,7 +804,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ italian ] = "Sud" ; Text [ portuguese_brazilian ] = "Sul" ; Text [ portuguese ] = "Sul" ; - Text [ finnish ] = "Etel?" ; + Text [ finnish ] = "Etelä" ; Text [ danish ] = "Syd" ; Text [ french ] = "Sud" ; Text [ swedish ] = "Söder" ; @@ -799,7 +821,8 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "남쪽"; Text[ turkish ] = "Güney"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sur"; + Text[ catalan ] = "Sud"; + Text[ thai ] = "ใต้"; }; String STR_SUM { @@ -809,7 +832,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ italian ] = "Somma" ; Text [ portuguese_brazilian ] = "Soma" ; Text [ portuguese ] = "Soma" ; - Text [ finnish ] = "Yhteens?" ; + Text [ finnish ] = "Yhteensä" ; Text [ danish ] = "Total" ; Text [ french ] = "Somme" ; Text [ swedish ] = "Summa" ; @@ -826,19 +849,21 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text[ korean ] = "합계"; Text[ turkish ] = "Toplam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Suma"; + Text[ catalan ] = "Total"; + Text[ thai ] = "รวม"; }; Text[ chinese_simplified ] = "è‡ªåŠ¨æ ¼å¼"; Text[ russian ] = "Àâòîôîðìàò"; Text[ polish ] = "Autoformat"; - Text[ japanese ] = "ｵｰﾄﾌｫｰï¾ï½¯ï¾„"; + Text[ japanese ] = "オートフォーマット"; Text[ chinese_traditional ] = "è‡ªå‹•æ ¼å¼"; Text[ arabic ] = "ÇáÊäÓíÞ ÇáÊáÞÇÆí"; Text[ greek ] = "ÁõôïÌïñöÞ"; - Text[ korean ] = "ìžë™ì„œì‹"; + Text[ korean ] = "ìžë™ ì„œì‹"; Text[ turkish ] = "Otomatik formatlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoFormato"; + Text[ catalan ] = "Formatatge automàtic"; + Text[ thai ] = "รูปà¹à¸šà¸šà¸à¸±à¸•à¹‚นมัติ"; }; @@ -855,3 +880,10 @@ ModalDialog RID_SCDLG_AUTOFORMAT + + + + + + + diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src index 6ef0d217a907..c7cf89c7058f 100644 --- a/sc/source/ui/src/condfrmt.src +++ b/sc/source/ui/src/condfrmt.src @@ -2,9 +2,9 @@ * * $RCSfile: condfrmt.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:53:19 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text[ chinese_traditional ] = "æ¢ä»¶ ~1"; Text[ arabic ] = "ÇáÔÑØ 1"; Text[ greek ] = "ÓõíèÞêç ~1"; - Text[ korean ] = "ì „ì œ ì¡°ê±´ 1"; + Text[ korean ] = "ì¡°ê±´ 1"; Text[ turkish ] = "Koþul 1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Condició 1"; @@ -431,10 +431,10 @@ ModelessDialog RID_SCDLG_CONDFORMAT < "미만" ; Default ; > ; < "초과" ; Default ; > ; < "ì´í•˜" ; Default ; > ; - < "ì´ìƒ" ; Default ; > ; + < "ë‹¤ìŒ ê°’ ì´ìƒ" ; Default ; > ; < "ì§€ì •í•œ ì¡°ê±´ê³¼ 다름" ; Default ; > ; < "ë‹¤ìŒ ì‚¬ì´ìž„" ; Default ; > ; - < "ë‹¤ìŒ ì‚¬ì´ê°€ 아님" ; Default ; > ; + < "ë‹¤ìŒ ê°’ 사ì´ì— ì—†ìŒ" ; Default ; > ; }; StringList [ turkish ] = { @@ -553,7 +553,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text[ chinese_traditional ] = "å’Œ"; Text[ arabic ] = "æ"; Text[ greek ] = "êáé"; - Text[ korean ] = "와"; + Text[ korean ] = "ë°"; Text[ turkish ] = "ve"; Text[ language_user1 ] = " "; Text[ catalan ] = "i"; @@ -665,7 +665,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text[ chinese_traditional ] = "æ¢ä»¶ ~2"; Text[ arabic ] = "ÇáÔÑØ 2"; Text[ greek ] = "ÓõíèÞêç ~2"; - Text[ korean ] = "ì „ì œ ì¡°ê±´ 2"; + Text[ korean ] = "ì¡°ê±´ 2"; Text[ turkish ] = "Koþul 2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Condició 2"; @@ -1002,10 +1002,10 @@ ModelessDialog RID_SCDLG_CONDFORMAT < "미만" ; Default ; > ; < "초과" ; Default ; > ; < "ì´í•˜" ; Default ; > ; - < "í¬ê±°ë‚˜ ì§€ì •í•œ ì¡°ê±´ê³¼ ê°™ìŒ" ; Default ; > ; + < "ë‹¤ìŒ ê°’ ì´ìƒ" ; Default ; > ; < "ì§€ì •í•œ ì¡°ê±´ê³¼ 다름" ; Default ; > ; < "ë‹¤ìŒ ë‚ ì§œ 사ì´" ; Default ; > ; - < "ì§€ì •í•œ ê°’ ì´ì™¸" ; Default ; > ; + < "ë‹¤ìŒ ê°’ 사ì´ì— ì—†ìŒ" ; Default ; > ; }; StringList [ turkish ] = { @@ -1124,7 +1124,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text[ chinese_traditional ] = "å’Œ"; Text[ arabic ] = "æ"; Text[ greek ] = "êáé"; - Text[ korean ] = "와"; + Text[ korean ] = "ë°"; Text[ turkish ] = "ve"; Text[ language_user1 ] = " "; Text[ catalan ] = "i"; @@ -1236,7 +1236,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text[ chinese_traditional ] = "æ¢ä»¶ ~3"; Text[ arabic ] = "ÇáÔÑØ 3"; Text[ greek ] = "ÓõíèÞêç ~3"; - Text[ korean ] = "ì „ì œ ì¡°ê±´ 3"; + Text[ korean ] = "ì¡°ê±´ 3"; Text[ turkish ] = "Koþul 3"; Text[ language_user1 ] = " "; Text[ catalan ] = "Condició 3"; @@ -1573,10 +1573,10 @@ ModelessDialog RID_SCDLG_CONDFORMAT < "미만" ; Default ; > ; < "초과" ; Default ; > ; < "ì´í•˜" ; Default ; > ; - < "í¬ê±°ë‚˜ ì§€ì •í•œ ì¡°ê±´ê³¼ ê°™ìŒ" ; Default ; > ; + < "ë‹¤ìŒ ê°’ ì´ìƒ" ; Default ; > ; < "ì§€ì •í•œ ì¡°ê±´ê³¼ 다름" ; Default ; > ; < "ë‹¤ìŒ ë‚ ì§œ 사ì´" ; Default ; > ; - < "ì§€ì •í•œ 범위 ì´ì™¸" ; Default ; > ; + < "ë‹¤ìŒ ê°’ 사ì´ì— ì—†ìŒ" ; Default ; > ; }; StringList [ turkish ] = { @@ -1695,7 +1695,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text[ chinese_traditional ] = "å’Œ"; Text[ arabic ] = "æ"; Text[ greek ] = "êáé"; - Text[ korean ] = "와"; + Text[ korean ] = "ë°"; Text[ turkish ] = "ve"; Text[ language_user1 ] = " "; Text[ catalan ] = "i"; @@ -1800,7 +1800,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Text [ english_us ] = "Conditional Formatting" ; Text [ italian ] = "Formattazione condizionata" ; - Text [ spanish ] = "Formateado condicionado" ; + Text [ spanish ] = "Formateado condicional" ; Text [ french ] = "Formatage conditionnel" ; Text [ dutch ] = "Conditionele opmaak" ; Text [ swedish ] = "Villkorlig formatering" ; @@ -1814,7 +1814,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text[ chinese_traditional ] = "有æ¢ä»¶çš„æ ¼å¼"; Text[ arabic ] = "ÊäÓíÞ ãÔÑæØ"; Text[ greek ] = "Ìïñöïðïßçóç õðü üñïõò"; - Text[ korean ] = "ì¡°ê±´ì ì„œì‹ ì§€ì •"; + Text[ korean ] = "조건부 ì„œì‹"; Text[ turkish ] = "Koþullu formatlama"; Text[ language_user1 ] = " "; Text[ catalan ] = "Formatatge condicional"; @@ -1834,3 +1834,8 @@ ModelessDialog RID_SCDLG_CONDFORMAT + + + + + diff --git a/sc/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src index a9c5e8312c75..74b1c31f5300 100644 --- a/sc/source/ui/src/crnrdlg.src +++ b/sc/source/ui/src/crnrdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: crnrdlg.src,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:52:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text[ chinese_traditional ] = "å€åŸŸ"; Text[ arabic ] = "ÇáäØÇÞ"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "ì˜ì—"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea"; @@ -159,8 +159,8 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text [ portuguese ] = "Contém ~cabeçalhos das colunas" ; Text [ finnish ] = "Sisältää sarakeotsikot" ; Text [ danish ] = "indeholder kolonneoverskrifter" ; - Text [ french ] = "En-têtes de ~colonnes inclus" ; - Text [ swedish ] = "innehåller ~kolumnhuvuden" ; + Text [ french ] = "Contient des étiquettes de colonne" ; + Text [ swedish ] = "Innehåller ~kolumnetiketter" ; Text [ dutch ] = "~bevat kolomkoppen" ; Text [ spanish ] = "Contiene títulos de ~columnas" ; Text [ english_us ] = "Contains ~column labels" ; @@ -168,10 +168,10 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text[ russian ] = "Ñîäåðæèò çàãîëîâêè ñòîëáöîâ"; Text[ polish ] = "zawiera nag³ówki kolumn"; Text[ japanese ] = "列ã®é …目欄をå«ã‚€(~C)"; - Text[ chinese_traditional ] = "包å«æ¬„標題(~C)"; + Text[ chinese_traditional ] = "包å«æ¬„標籤(~C)"; Text[ arabic ] = "íÊÖãä ÑÄæÓ ÃÚãÏÉ"; Text[ greek ] = "ðåñéÝ÷åé êåöáëßäåò óôçëþí"; - Text[ korean ] = "ì—´ 머리글 í¬í•¨(~C)"; + Text[ korean ] = "ì—´ ë ˆì´ë¸” í¬í•¨(~C)"; Text[ turkish ] = "Sütun baþlýklarý ~içeriyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Conté capçaleres de ~columna"; @@ -186,21 +186,21 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text [ ENGLISH ] = "contains row headers" ; Text [ english_us ] = "Contains ~row labels" ; Text [ dutch ] = "~bevat rijkoppen" ; - Text [ swedish ] = "innehåller r~adhuvuden" ; + Text [ swedish ] = "Innehåller r~adetiketter" ; Text [ danish ] = "indeholder rækkeoverskrifter" ; Text [ italian ] = "Include intestazioni righe" ; Text [ spanish ] = "Contiene títulos de ~filas" ; - Text [ french ] = "En-têtes de ~lignes inclus" ; + Text [ french ] = "Contient des étiquettes de ligne" ; Text [ portuguese ] = "Contém ~cabeçalhos das linhas" ; Text [ portuguese_brazilian ] = "enth?lt ~Zeilenk?fe" ; Text[ chinese_simplified ] = "包å«è¡Œæ ‡é¢˜(~R)"; Text[ russian ] = "Ñîäåðæèò çàãîëîâêè ñòðîê"; Text[ polish ] = "zawiera nag³ówki wierszy"; Text[ japanese ] = "è¡Œã®é …目欄をå«ã‚€(~R)"; - Text[ chinese_traditional ] = "包å«åˆ—標題(~R)"; + Text[ chinese_traditional ] = "包å«åˆ—標籤(~R)"; Text[ arabic ] = "íÊÖãä ÑÄæÓ ÕÝæÝ"; Text[ greek ] = "ðåñéÝ÷åé êåöáëßäåò ãñáììþí"; - Text[ korean ] = "í–‰ 머리글 í¬í•¨(~R)"; + Text[ korean ] = "í–‰ ë ˆì´ë¸” í¬í•¨(~R)"; Text[ turkish ] = "Satýr baþlýklarý i~çeriyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Conté capçaleres de ~fila"; @@ -229,7 +229,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text[ chinese_traditional ] = "用於資料å€åŸŸ(~D)"; Text[ arabic ] = "áäØÇÞ ÇáÈíÇäÇÊ"; Text[ greek ] = "ãéá ðåñéï÷Þ ~äåäïìÝíùí"; - Text[ korean ] = "ì •ì˜ë ì˜ì— ì„¤ì •(~D)"; + Text[ korean ] = "ë°ì´í„° 범위(~D)"; Text[ turkish ] = "Veri aralýðý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Per a l'àrea de dades"; @@ -332,7 +332,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; @@ -370,7 +370,7 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text[ chinese_traditional ] = "定義標題å€åŸŸ"; Text[ arabic ] = "ÊÚÑíÝ äØÇÞ ÇáÚäæäÉ"; Text[ greek ] = "Ïñéóìüò ðåñéï÷Þò åðéãñáöÞò"; - Text[ korean ] = "ë¼ë²¨ ì˜ì— ì •ì˜"; + Text[ korean ] = "ë ˆì´ë¸” 범위 ì§€ì •"; Text[ turkish ] = "Baþlýk aralýðýný belirle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'àrea de l'etiqueta"; @@ -378,3 +378,5 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงป้ายชื่à¸"; }; + + diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src index 40970dd21ae8..b8a731583ede 100644 --- a/sc/source/ui/src/dbnamdlg.src +++ b/sc/source/ui/src/dbnamdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: dbnamdlg.src,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: kz $ $Date: 2002-11-27 17:05:20 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -229,8 +229,8 @@ ModelessDialog RID_SCDLG_DBNAMES Text [ portuguese ] = "Incluir ~cabeçalhos de colunas" ; Text [ finnish ] = "~Sisältää sarakeotsikot" ; Text [ danish ] = "Indeholder kolonneoverskrifter" ; - Text [ french ] = "En-têtes de colonnes inclus" ; - Text [ swedish ] = "Innehåller ~kolumnhuvuden" ; + Text [ french ] = "Contient des étiquettes de colonne" ; + Text [ swedish ] = "Innehåller ~kolumnetiketter" ; Text [ dutch ] = "bevat ~kolomkoppen" ; Text [ spanish ] = "Contiene títulos de ~columnas" ; Text [ english_us ] = "Co~ntains column labels" ; @@ -239,10 +239,10 @@ ModelessDialog RID_SCDLG_DBNAMES Text[ russian ] = "Ñîäåðæèò çàãîëîâêè ñòîëáöîâ"; Text[ polish ] = "zawiera nag³ówki kolumn"; Text[ japanese ] = "列ã®é …目欄をå«ã‚€(~N)"; - Text[ chinese_traditional ] = "包å«æ¬„標題(~N)"; + Text[ chinese_traditional ] = "包å«æ¬„標籤(~N)"; Text[ arabic ] = "íÊÖãä ÑÄæÓ ÃÚãÏÉ"; Text[ greek ] = "ðåñéÝ÷åé êåöáëßäåò óôçëþí"; - Text[ korean ] = "ì—´ 머리글 í¬í•¨(~N)"; + Text[ korean ] = "ì—´ ë ˆì´ë¸” í¬í•¨(~N)"; Text[ turkish ] = "Sütun baþlýklarý ~içeriyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Co~nté capçaleres de columna"; @@ -262,7 +262,7 @@ ModelessDialog RID_SCDLG_DBNAMES Text [ swedish ] = "Infoga/radera ~celler" ; Text [ danish ] = "Indsæt/slet celler" ; Text [ italian ] = "Inserisci/elimina celle" ; - Text [ spanish ] = "~Insertar o eliminar celdas" ; + Text [ spanish ] = "~Insertar / borrar celdas" ; Text [ french ] = "~Insérer/supprimer des cellules" ; Text [ dutch ] = "~Cellen invoegen/wissen" ; Text[ chinese_simplified ] = "æ’å…¥/åˆ é™¤å•å…ƒæ ¼(~C)"; @@ -303,7 +303,7 @@ ModelessDialog RID_SCDLG_DBNAMES Text[ chinese_traditional ] = "ä¿ç•™æ ¼å¼(~F)"; Text[ arabic ] = "ÇáÅÈÞÇÁ Úáì ÇáÊäÓíÞ"; Text[ greek ] = "ÄéáôÞñçóç ìïñ~öïðïßçóçò"; - Text[ korean ] = "ì„œì‹ ì§€ì • 실행(~F)"; + Text[ korean ] = "ì„œì‹ ì„¤ì • 그대로 ìœ ì§€(~F)"; Text[ turkish ] = "Formatlamayý ~koru"; Text[ language_user1 ] = " "; Text[ catalan ] = "Conserva el ~formatatge"; @@ -364,7 +364,7 @@ ModelessDialog RID_SCDLG_DBNAMES Text[ chinese_traditional ] = "資料æºï¼š"; Text[ arabic ] = "ÇáãÕÏÑ:"; Text[ greek ] = "ÐñïÝëåõóç:"; - Text[ korean ] = "소스:"; + Text[ korean ] = "ì›ë³¸:"; Text[ turkish ] = "Kaynak:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font:"; @@ -439,7 +439,7 @@ ModelessDialog RID_SCDLG_DBNAMES Text[ chinese_traditional ] = "新增(~A)"; Text[ arabic ] = "ÅÖÇÝÉ"; Text[ greek ] = "Ðñïó~èÞêç"; - Text[ korean ] = "삽입(~A)"; + Text[ korean ] = "추가(~A)"; Text[ turkish ] = "~Ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Afegeix"; @@ -460,7 +460,7 @@ ModelessDialog RID_SCDLG_DBNAMES Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; @@ -540,7 +540,7 @@ ModelessDialog RID_SCDLG_DBNAMES Text[ chinese_traditional ] = "變更(~O)"; Text[ arabic ] = "ÊÚÏíá"; Text[ greek ] = "Ôñïðïðïßçóç"; - Text[ korean ] = "ìˆ˜ì •(~O)"; + Text[ korean ] = "변경(~O)"; Text[ turkish ] = "~Deðiþtir"; Text[ language_user1 ] = " "; Text[ catalan ] = "M~odifica"; @@ -566,7 +566,7 @@ ModelessDialog RID_SCDLG_DBNAMES Text[ chinese_traditional ] = "無效的å€åŸŸ"; Text[ arabic ] = "äØÇÞ ÛíÑ ÕÇáÍ"; Text[ greek ] = "Ìç Ýãêõñç ðåñéï÷Þ"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ë²”ìœ„"; + Text[ korean ] = "ìž˜ëª»ëœ ë²”ìœ„"; Text[ turkish ] = "Geçersiz aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea no és vàlida"; @@ -580,10 +580,15 @@ ModelessDialog RID_SCDLG_DBNAMES Text[ chinese_traditional ] = "定義資料庫å€åŸŸ"; Text[ arabic ] = "ÊÚÑíÝ äØÇÞ ÞÇÚÏÉ ÇáÈíÇäÇÊ"; Text[ greek ] = "Êáèïñéóìüò ðåñéï÷Þò âÜóçò äåäïìÝíùí"; - Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ ì˜ì— ì •ì˜"; + Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ 범위 ì§€ì •"; Text[ turkish ] = "Veritabaný aralýðýný belirle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'àrea de la base de dades"; Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงà¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; + + + + + diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src index d8a3b020feb1..3aa01a3a90c0 100644 --- a/sc/source/ui/src/filter.src +++ b/sc/source/ui/src/filter.src @@ -2,9 +2,9 @@ * * $RCSfile: filter.src,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2002-12-09 11:42:37 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -311,7 +311,7 @@ ModelessDialog RID_SCDLG_FILTER }; StringList [ korean ] = { - < "와" ; Default ; > ; + < "와(ê³¼)" ; Default ; > ; < "ë˜ëŠ”" ; Default ; > ; }; StringList [ turkish ] = @@ -444,7 +444,7 @@ ModelessDialog RID_SCDLG_FILTER }; StringList [ korean ] = { - < "와" ; Default ; > ; + < "와(ê³¼)" ; Default ; > ; < "ë˜ëŠ”" ; Default ; > ; }; StringList [ turkish ] = @@ -1549,7 +1549,7 @@ ModelessDialog RID_SCDLG_FILTER Text [ french ] = "Caractère ~générique" ; Text [ swedish ] = "~Reguljärt uttryck" ; Text [ dutch ] = "~Gangbare uitdrukking" ; - Text [ spanish ] = "~Expresión corriente" ; + Text [ spanish ] = "~Expresión regular" ; Text [ english_us ] = "Regular ~expression" ; TabStop = TRUE ; Text[ chinese_simplified ] = "常规表达(~E)"; @@ -1578,20 +1578,20 @@ ModelessDialog RID_SCDLG_FILTER Text [ portuguese ] = "A área ~contém cabeçalhos de colunas" ; Text [ finnish ] = "~Alue sisältää sarakeotsikot" ; Text [ danish ] = "Område indholder kolonneoverskrifter" ; - Text [ french ] = "La plage contient des en-têtes de colonne" ; - Text [ swedish ] = "Område ~innehåller kolumnhuvuden" ; + Text [ french ] = "La plage contient des étiquettes de colonne." ; + Text [ swedish ] = "Område ~innehåller kolumnetiketter" ; Text [ dutch ] = "Bereik bevat ~kolomkoppen" ; - Text [ spanish ] = "Área contiene títulos de ~columnas" ; + Text [ spanish ] = "El área contiene los títulos de ~columnas" ; Text [ english_us ] = "Range contains ~column labels" ; TabStop = TRUE ; Text[ chinese_simplified ] = "区域包å«åˆ—æ ‡é¢˜(~C)"; Text[ russian ] = "Îáëàñòü ñîäåðæèò çàãîëîâêè ñòîëáöîâ"; Text[ polish ] = "Obszar zawiera nag³ówki kolumn"; Text[ japanese ] = "範囲ã«åˆ—ã®é …目欄をå«ã‚€(~C)"; - Text[ chinese_traditional ] = "å€åŸŸåŒ…å«æ¬„標題(~C)"; + Text[ chinese_traditional ] = "範åœåŒ…å«æ¬„標籤(~C)"; Text[ arabic ] = "ÇáãäØÞÉ ÊÊÖãä ÑÄæÓ ÃÚãÏÉ"; Text[ greek ] = "Ðåñéï÷Þ ðåñéÝ÷åé êåöáëßäåò óôçëþí"; - Text[ korean ] = "ì—´ 머리글 í¬í•¨(~C)"; + Text[ korean ] = "ë²”ìœ„ì— ì—´ ë ˆì´ë¸”ì„ í¬í•¨(~C)"; Text[ turkish ] = "Aralýk, ~sütun baþlýklarý içeriyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea conté capçaleres de ~columna"; @@ -1623,7 +1623,7 @@ ModelessDialog RID_SCDLG_FILTER Text[ chinese_traditional ] = "ä¸ç”¢ç”Ÿå‚™ä»½(~N)"; Text[ arabic ] = "ÈÏæä äõÓÎ ØÈÞ ÇáÃÕá"; Text[ greek ] = "¼÷é äéðëÜ óôïé÷åßá"; - Text[ korean ] = "중복 허용 안ë¨(~N)"; + Text[ korean ] = "ë³µì œ ì—†ìŒ(~N)"; Text[ turkish ] = "Ayný sonuçlarý ~ayýkla"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sense ~duplicats"; @@ -1674,7 +1674,7 @@ ModelessDialog RID_SCDLG_FILTER Text [ swedish ] = "~Behåll filterkriterier" ; Text [ danish ] = "Persistent" ; Text [ italian ] = "Mantieni criteri" ; - Text [ spanish ] = "~Persistente" ; + Text [ spanish ] = "~Conservar los criterios de filtrado" ; Text [ french ] = "Conserver les critères de filtre" ; Text [ dutch ] = "~Persistent" ; Text [ portuguese ] = "~Manter critérios" ; @@ -1787,7 +1787,7 @@ ModelessDialog RID_SCDLG_FILTER Text [ french ] = "factice" ; Text [ swedish ] = "dummy" ; Text [ dutch ] = "dummy" ; - Text [ spanish ] = "Comodín" ; + Text [ spanish ] = "Texto ejemplo" ; Text [ english_us ] = "dummy" ; Left = TRUE ; Text[ chinese_simplified ] = "æ ·æœ¬"; @@ -1828,7 +1828,7 @@ ModelessDialog RID_SCDLG_FILTER Text[ chinese_traditional ] = "資料å€åŸŸï¼š"; Text[ arabic ] = "äØÇÞ ÇáÈíÇäÇÊ:"; Text[ greek ] = "Ðåñéï÷Þ äåäïìÝíùí:"; - Text[ korean ] = "ë°ì´í„° ì˜ì—:"; + Text[ korean ] = "ë°ì´í„° 범위:"; Text[ turkish ] = "Veri aralýðý:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea de dades:"; @@ -1915,7 +1915,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER Text [ spanish ] = "Leer los criterios del ~filtro en" ; Text [ english_us ] = "Read ~filter criteria from" ; Text[ chinese_simplified ] = "ç›é€‰æ¡ä»¶æ¥è‡ª(~F)"; - Text[ russian ] = "Óñëîâèÿ ôèëüòðà èç"; + Text[ russian ] = "Êðèòåðèè ôèëüòðà"; Text[ polish ] = "Kryteria filtrowania znajduj¹ siê w"; Text[ japanese ] = "フィルタæ¡ä»¶ã«ã™ã‚‹ç¯„囲(~F)"; Text[ chinese_traditional ] = "篩é¸æ¢ä»¶ä¾†è‡ª(~F)"; @@ -2021,7 +2021,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER Text [ french ] = "Caractère ~générique" ; Text [ swedish ] = "~Reguljärt uttryck" ; Text [ dutch ] = "~Gangbare uitdrukking" ; - Text [ spanish ] = "~Expresión corriente" ; + Text [ spanish ] = "~Expresión regular" ; Text [ english_us ] = "Regular ~expressions" ; TabStop = TRUE ; Text[ chinese_simplified ] = "常规表达(~E)"; @@ -2050,20 +2050,20 @@ ModelessDialog RID_SCDLG_SPEC_FILTER Text [ portuguese ] = "Contém ~cabeçalhos para colunas" ; Text [ finnish ] = "~Sisältää sarakeotsikot" ; Text [ danish ] = "Indeholder kolonneoverskrifter" ; - Text [ french ] = "La plage contient des en-têtes de colonne" ; - Text [ swedish ] = "Område ~innehåller kolumnhuvuden" ; + Text [ french ] = "La plage contient des étiquettes de colonne." ; + Text [ swedish ] = "Område ~innehåller kolumnetiketter" ; Text [ dutch ] = "Bereik bevat ~kolomkoppen" ; - Text [ spanish ] = "El área contiene títulos de ~columnas" ; + Text [ spanish ] = "El área contiene los títulos de ~columnas" ; Text [ english_us ] = "Range c~ontains column labels" ; TabStop = TRUE ; Text[ chinese_simplified ] = "区域包å«åˆ—æ ‡é¢˜(~O)"; Text[ russian ] = "Ñîäåðæèò çàãîëîâêè ñòîëáöîâ"; Text[ polish ] = "Obszar zawiera nag³ówki kolumn"; Text[ japanese ] = "範囲ã«åˆ—ã®é …目欄をå«ã‚€(~O)"; - Text[ chinese_traditional ] = "å€åŸŸåŒ…å«æ¬„標題(~O)"; + Text[ chinese_traditional ] = "範åœåŒ…å«æ¬„標籤(~O)"; Text[ arabic ] = "ÇáãäØÞÉ ÊÊÖãä ÑÄæÓ ÃÚãÏÉ"; Text[ greek ] = "Ðåñéï÷Þ ðåñéÝ÷åé êåöáëßäåò óôçëþí"; - Text[ korean ] = "ì—´ 머리글 í¬í•¨(~O)"; + Text[ korean ] = "ë²”ìœ„ì— ì—´ ë ˆì´ë¸”ì„ í¬í•¨(~O)"; Text[ turkish ] = "Aralýk, ~sütun baþlýklarý içeriyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Co~nté capçaleres de columna"; @@ -2095,7 +2095,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER Text[ chinese_traditional ] = "ä¸ç”¢ç”Ÿå‚™ä»½(~N)"; Text[ arabic ] = "ÈÏæä äõÓÎ ØÈÞ ÇáÃÕá"; Text[ greek ] = "¼÷é äéðëÜ óôïé÷åßá"; - Text[ korean ] = "중복 허용 안ë¨(~N)"; + Text[ korean ] = "ë³µì œ ì—†ìŒ(~N)"; Text[ turkish ] = "Ayný sonuçlarý ~ayýkla"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sense ~duplicats"; @@ -2146,7 +2146,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER Text [ swedish ] = "~Behåll filterkriterier" ; Text [ danish ] = "Persistent" ; Text [ italian ] = "Mantieni criteri" ; - Text [ spanish ] = "~Persistente" ; + Text [ spanish ] = "~Conservar los criterios de filtrado" ; Text [ french ] = "Conserver les critères de filtre" ; Text [ dutch ] = "~Persistent" ; Text [ portuguese ] = "~Manter critérios" ; @@ -2259,7 +2259,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER Text [ french ] = "factice" ; Text [ swedish ] = "dummy" ; Text [ dutch ] = "dummy" ; - Text [ spanish ] = "Comodín" ; + Text [ spanish ] = "Texto ejemplo" ; Text [ english_us ] = "dummy" ; Left = TRUE ; Text[ chinese_simplified ] = "æ ·æœ¬"; @@ -2300,7 +2300,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER Text[ chinese_traditional ] = "資料å€åŸŸï¼š"; Text[ arabic ] = "äØÇÞ ÇáÈíÇäÇÊ:"; Text[ greek ] = "Ðåñéï÷Þ äåäïìÝíùí:"; - Text[ korean ] = "ë°ì´í„° ì˜ì—:"; + Text[ korean ] = "ë°ì´í„° 범위:"; Text[ turkish ] = "Veri aralýðý:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea de dades:"; @@ -2598,7 +2598,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; StringList [ korean ] = { - < "와" ; Default ; > ; + < "와(ê³¼)" ; Default ; > ; < "ë˜ëŠ”" ; Default ; > ; }; StringList [ turkish ] = @@ -2731,7 +2731,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; StringList [ korean ] = { - < "와" ; Default ; > ; + < "와(ê³¼)" ; Default ; > ; < "ë˜ëŠ”" ; Default ; > ; }; StringList [ turkish ] = @@ -3575,7 +3575,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER Text [ french ] = "Caractère ~générique" ; Text [ swedish ] = "~Reguljärt uttryck" ; Text [ dutch ] = "~Gangbare uitdrukking" ; - Text [ spanish ] = "~Expresión corriente" ; + Text [ spanish ] = "~Expresión regular" ; Text [ english_us ] = "~Regular expression" ; TabStop = TRUE ; Text[ chinese_simplified ] = "常规表达(~R)"; @@ -3585,7 +3585,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER Text[ chinese_traditional ] = "常è¦è¡¨é”(~R)"; Text[ arabic ] = "ÊÚÈíÑ ÇÚÊíÇÏí"; Text[ greek ] = "ÊáíïíéêÞ ðá~ñÜóôáóç"; - Text[ korean ] = "ì¼ë°˜ì 표현(~R)"; + Text[ korean ] = "ì •ê·œì‹(~R)"; Text[ turkish ] = "~Genel arama karakteri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Expressió ~habitual"; @@ -3617,7 +3617,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER Text[ chinese_traditional ] = "ä¸ç”¢ç”Ÿå‚™ä»½(~N)"; Text[ arabic ] = "ÈÏæä äõÓÎ ØÈÞ ÇáÃÕá"; Text[ greek ] = "¼÷é äéðëÜ óôïé÷åßá"; - Text[ korean ] = "중복 허용 안ë¨(~N)"; + Text[ korean ] = "ë³µì œ ì—†ìŒ(~N)"; Text[ turkish ] = "Ayný sonuçlarý ~ayýkla"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sense ~duplicats"; @@ -3670,7 +3670,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER Text [ french ] = "factice" ; Text [ swedish ] = "dummy" ; Text [ dutch ] = "dummy" ; - Text [ spanish ] = "Comodín" ; + Text [ spanish ] = "Texto ejemplo" ; Text [ english_us ] = "dummy" ; Left = TRUE ; Text[ chinese_simplified ] = "æ ·æœ¬"; @@ -3711,7 +3711,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER Text[ chinese_traditional ] = "資料å€åŸŸï¼š"; Text[ arabic ] = "äØÇÞ ÇáÈíÇäÇÊ:"; Text[ greek ] = "Ðåñéï÷Þ äåäïìÝíùí:"; - Text[ korean ] = "ë°ì´í„° ì˜ì—:"; + Text[ korean ] = "ë°ì´í„° 범위:"; Text[ turkish ] = "Veri aralýðý:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea de dades:"; @@ -3758,3 +3758,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER Text[ thai ] = "ตัวà¸à¸£à¸à¸‡"; }; + + + + + diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 8f775927f1d8..7875ccb44edd 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -2,9 +2,9 @@ * * $RCSfile: globstr.src,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: kz $ $Date: 2002-12-09 09:54:39 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,7 +108,7 @@ Resource RID_GLOBSTR Text [ french ] = "Données supprimées" ; Text [ swedish ] = "Radera" ; Text [ dutch ] = "Wissen" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ english_us ] = "Delete" ; Text[ chinese_simplified ] = "åˆ é™¤"; Text[ russian ] = "Óäàëèòü"; @@ -202,7 +202,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "拖曳"; Text[ arabic ] = "ÓÍÈ æ ÅÓÞÇØ"; Text[ greek ] = "Ìåôáêßíçóç êáé Aðüèåóç"; - Text[ korean ] = "ëŒì–´ì„œ 놓기"; + Text[ korean ] = "ëŒì–´ 놓기"; Text[ turkish ] = "Sürükle ve býrak"; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrossega i deixa anar"; @@ -278,7 +278,7 @@ Resource RID_GLOBSTR Text [ french ] = "Données supprimées" ; Text [ swedish ] = "Radera" ; Text [ dutch ] = "Wissen" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ english_us ] = "Delete" ; Text[ chinese_simplified ] = "åˆ é™¤"; Text[ russian ] = "Óäàëèòü"; @@ -510,7 +510,7 @@ Resource RID_GLOBSTR Text[ chinese_simplified ] = "åˆå¹¶"; Text[ russian ] = "Îáúåäèíèòü"; Text[ polish ] = "Scal"; - Text[ japanese ] = "çµ±åˆ"; + Text[ japanese ] = "çµåˆ"; Text[ chinese_traditional ] = "åˆä½µ"; Text[ arabic ] = "ÏãÌ"; Text[ greek ] = "ÓõãêÝíôñùóç"; @@ -542,7 +542,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å–消åˆä½µ"; Text[ arabic ] = "ÅÒÇáÉ ÇáÖã"; Text[ greek ] = "ÊáôÜñãçóç óõã÷þíåõóçò"; - Text[ korean ] = "요약 í•´ì œ"; + Text[ korean ] = "ë¶„í• "; Text[ turkish ] = "Böl"; Text[ language_user1 ] = " "; Text[ catalan ] = "Divideix"; @@ -562,7 +562,7 @@ Resource RID_GLOBSTR Text [ french ] = "AutoFormat" ; Text [ swedish ] = "Autoformat" ; Text [ dutch ] = "AutoOpmaak" ; - Text [ spanish ] = "AutoFormato" ; + Text [ spanish ] = "Formateado automático" ; Text [ english_us ] = "AutoFormat" ; Text[ chinese_simplified ] = "è‡ªåŠ¨æ ¼å¼"; Text[ russian ] = "Àâòîôîðìàò"; @@ -684,7 +684,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "æ’å…¥æ›æ¬„"; Text[ arabic ] = "ÅÏÑÇÌ ÝÇÕá ÃÚãÏÉ"; Text[ greek ] = "ÅéóáãùãÞ áëëáãÞò óôÞëçò"; - Text[ korean ] = "ì—´ 삽입"; + Text[ korean ] = "ì—´ 나누기 삽입"; Text[ turkish ] = "Sütun sonu ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un salt de columna"; @@ -704,7 +704,7 @@ Resource RID_GLOBSTR Text [ french ] = "Supprimer le saut de colonne" ; Text [ swedish ] = "Radera kolumnbrytning" ; Text [ dutch ] = "Kolomeinde verwijderen" ; - Text [ spanish ] = "Eliminar salto de columna" ; + Text [ spanish ] = "Borrar salto de columna" ; Text [ english_us ] = "Delete column break" ; Text[ chinese_simplified ] = "åˆ é™¤åˆ†åˆ—ç¬¦"; Text[ russian ] = "Óäàëèòü ðàçðûâ ñòîëáöà"; @@ -713,7 +713,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "刪除æ›æ¬„"; Text[ arabic ] = "ÍÐÝ ÝæÇÕá ÇáÃÚãÏÉ"; Text[ greek ] = "ÄéáãñáöÞ áëëáãÞò óôÞëçò"; - Text[ korean ] = "ì—´ ì‚ì œ"; + Text[ korean ] = "ì—´ 나누기 ì‚ì œ"; Text[ turkish ] = "Sütun sonunu sil"; Text[ language_user1 ] = " "; Text[ catalan ] = "Suprimeix el salt de columna"; @@ -742,7 +742,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "æ’å…¥æ›æ¬„"; Text[ arabic ] = "ÅÏÑÇÌ ÝÇÕá ÕÝæÝ"; Text[ greek ] = "ÅéóáãùãÞ áëëáãÞò ãñáììÞò"; - Text[ korean ] = "ë‹¨ë½ ì‚½ìž…"; + Text[ korean ] = "í–‰ 나누기 삽입"; Text[ turkish ] = "Satýr sonu ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un salt de fila"; @@ -762,7 +762,7 @@ Resource RID_GLOBSTR Text [ french ] = "Supprimer le renvoi à la ligne" ; Text [ swedish ] = "Radera radbrytning" ; Text [ dutch ] = "Rij-einde verwijderen" ; - Text [ spanish ] = "Eliminar salto de fila" ; + Text [ spanish ] = "Borrar salto de fila" ; Text [ english_us ] = "Delete row break" ; Text[ chinese_simplified ] = "åˆ é™¤æ¢è¡Œç¬¦"; Text[ russian ] = "Óäàëèòü ðàçðûâ ñòðîêè"; @@ -771,7 +771,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å–消æ›åˆ—"; Text[ arabic ] = "ÍÐÝ ÝÇÕá ÇáÃÓØÑ"; Text[ greek ] = "ÄéáãñáöÞ áëëáãÞò ãñáììÞò"; - Text[ korean ] = "ë‹¨ë½ ì‚ì œ"; + Text[ korean ] = "í–‰ 나누기 ì‚ì œ"; Text[ turkish ] = "Satýr sonunu sil"; Text[ language_user1 ] = " "; Text[ catalan ] = "Suprimeix el salt de fila"; @@ -912,7 +912,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "é¸æ“‡å¤§ç¶±ç´š"; Text[ arabic ] = "ÊÍÏíÏ ãÓÊæì ÇáÊÞÓíã"; Text[ greek ] = "ÅðéëïãÞ åðéðÝäïõ äéÜñèñùóçò"; - Text[ korean ] = "아웃트ë¼ì¸ ì„ íƒ"; + Text[ korean ] = "개요 수준 ì„ íƒ"; Text[ turkish ] = "Anahat düzeyini seç"; Text[ language_user1 ] = " "; Text[ catalan ] = "Seleccioneu el nivell de contorn"; @@ -984,10 +984,10 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Remover esquema" ; Text [ finnish ] = "Tyhjennä ääriviiva" ; Text [ danish ] = "Fjern disposition" ; - Text [ french ] = "Supprimer le plan" ; + Text [ french ] = "Effacer le plan" ; Text [ swedish ] = "Ta bort disposition" ; Text [ dutch ] = "Overzicht verwijderen" ; - Text [ spanish ] = "Eliminar el esquema" ; + Text [ spanish ] = "Borrar esquema" ; Text [ english_us ] = "Clear Outline" ; Text[ chinese_simplified ] = "åˆ é™¤å¤§çº²"; Text[ russian ] = "Î÷èñòèòü ðàçìåòêó"; @@ -1025,7 +1025,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "自動顯示大綱"; Text[ arabic ] = "ÊÞÓíã ÊáÞÇÆí"; Text[ greek ] = "ÁõôïÄéÜñèñùóç"; - Text[ korean ] = "ìžë™ ì™¸ê³½ì„ "; + Text[ korean ] = "ìžë™ 윤곽"; Text[ turkish ] = "Otomatik anahat"; Text[ language_user1 ] = " "; Text[ catalan ] = "Contorn automàtic"; @@ -1109,7 +1109,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "篩é¸"; Text[ arabic ] = "ÊÕÝíÉ"; Text[ greek ] = "ÖéëôñÜñéóìá"; - Text[ korean ] = "í•„í„°"; + Text[ korean ] = "í•„í„°ë§"; Text[ turkish ] = "Filtrele"; Text[ language_user1 ] = " "; Text[ catalan ] = "Filtre"; @@ -1126,7 +1126,7 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Modificar área da base de dados" ; Text [ finnish ] = "Muuta tietokanta-aluetta" ; Text [ danish ] = "Modificer databaseområde" ; - Text [ french ] = "Modifier plages de base de données" ; + Text [ french ] = "Modifier les plages de base de données" ; Text [ swedish ] = "Ändra databasområden" ; Text [ dutch ] = "Databasebereik wijzigen" ; Text [ spanish ] = "Modificar el área de la base de datos" ; @@ -1138,7 +1138,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "變更資料庫å€åŸŸ"; Text[ arabic ] = "ÊÚÏíá äØÇÞÇÊ ÞÇÚÏÉ ÈíÇäÇÊ"; Text[ greek ] = "ÁëëáãÞ ðåñéï÷þí âÜóçò äåäïìÝíùí"; - Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ ì˜ì— ìˆ˜ì •"; + Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ 범위 ìˆ˜ì •"; Text[ turkish ] = "Veritabaný aralýklarýný deðiþtir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Canvia l'àrea de la base de dades"; @@ -1160,7 +1160,7 @@ Resource RID_GLOBSTR Text [ spanish ] = "Importar" ; Text [ english_us ] = "Importing" ; Text[ chinese_simplified ] = "输入"; - Text[ russian ] = "Èìïîðòèðîâàíèå"; + Text[ russian ] = "Èìïîðò"; Text[ polish ] = "Importuj"; Text[ japanese ] = "インãƒãƒ¼ãƒˆ"; Text[ chinese_traditional ] = "匯入"; @@ -1192,7 +1192,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "æ›´æ–°å€åŸŸ"; Text[ arabic ] = "ÊÍÏíË ÇáäØÇÞ"; Text[ greek ] = "ÁíáíÝùóç ðåñéï÷Þò"; - Text[ korean ] = "ì˜ì— ì—…ë°ì´íŠ¸"; + Text[ korean ] = "범위 새로 ê³ ì¹¨"; Text[ turkish ] = "Aralýðý güncelle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Refresca l'àrea"; @@ -1207,7 +1207,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Edit graphics" ; Text [ italian ] = "Modifica immagine" ; Text [ spanish ] = "Editar imagen" ; - Text [ french ] = "Modifier image" ; + Text [ french ] = "Éditer l'image" ; Text [ swedish ] = "Redigera grafik" ; Text [ danish ] = "Rediger grafik" ; Text [ portuguese ] = "Editar imagem" ; @@ -1219,7 +1219,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "編輯圖形"; Text[ arabic ] = "ÊÍÑíÑ ÑÓæãÇÊ"; Text[ greek ] = "Åðåîåñãáóßá ãñáöéêïý"; - Text[ korean ] = "그래픽 편집"; + Text[ korean ] = "그림 편집"; Text[ turkish ] = "Grafik düzenle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Edita els gràfics"; @@ -1232,7 +1232,7 @@ Resource RID_GLOBSTR Text [ ENGLISH ] = "List names" ; Text [ english_us ] = "List names" ; Text [ italian ] = "Elenca nomi" ; - Text [ spanish ] = "Alistar nombres" ; + Text [ spanish ] = "Lista de nombres" ; Text [ french ] = "Liste des noms" ; Text [ dutch ] = "Lijst namen weergeven" ; Text [ swedish ] = "Lista upp namn" ; @@ -1246,7 +1246,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "列出å稱"; Text[ arabic ] = "Úãá ÞÇÆãÉ ÈÇáÃÓãÇÁ"; Text[ greek ] = "Ëßóôá ïíïìÜôùí"; - Text[ korean ] = "ì´ë¦„ ëª©ë¡ ìž‘ì„±"; + Text[ korean ] = "ì´ë¦„ 목ë¡"; Text[ turkish ] = "Adlarý sýrala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Noms de llista"; @@ -1315,7 +1315,7 @@ Resource RID_GLOBSTR Text [ dutch ] = "DataPiloot-tabel wissen" ; Text [ english_us ] = "Delete DataPilot Table" ; Text [ italian ] = "Elimina tabella di DataPilot" ; - Text [ spanish ] = "Eliminar tabla del Piloto de Datos" ; + Text [ spanish ] = "Borrar tabla del Piloto de Datos" ; Text [ french ] = "Supprimer la table du pilote de données" ; Text [ swedish ] = "Radera Datapilottabell" ; Text [ danish ] = "Slet DataPilot-tabel" ; @@ -1463,7 +1463,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "使用儲å˜æ ¼æ¨£å¼"; Text[ arabic ] = "ÇÓÊÎÏÇã äãØ ÎáíÉ"; Text[ greek ] = "ÅöáñìïãÞ óôõë êåëéþí"; - Text[ korean ] = "ì…€ 템플릿 ì ìš©"; + Text[ korean ] = "ì…€ ìŠ¤íƒ€ì¼ ì ìš©"; Text[ turkish ] = "Hücre biçimini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Aplica l'estil de la cel.la"; @@ -1487,7 +1487,7 @@ Resource RID_GLOBSTR Text[ polish ] = "Edytuj styl komórki"; Text[ portuguese_brazilian ] = "Edit cell style"; Text[ japanese ] = "セルスタイルã®ç·¨é›†"; - Text[ korean ] = "ì…€ 템플릿 편집"; + Text[ korean ] = "ì…€ ìŠ¤íƒ€ì¼ íŽ¸ì§‘"; Text[ chinese_simplified ] = "编辑å•å…ƒæ ¼æ ·å¼"; Text[ chinese_traditional ] = "編輯儲å˜æ ¼æ¨£å¼"; Text[ turkish ] = "Edit cell style"; @@ -1583,7 +1583,7 @@ Resource RID_GLOBSTR Text [ ENGLISH ] = "Remove Predescessor" ; Text [ english_us ] = "Remove Precedent" ; Text [ italian ] = "Rimuovi traccia sul precedente" ; - Text [ spanish ] = "Rastro al precedente" ; + Text [ spanish ] = "Borrar el rastro al precedente" ; Text [ french ] = "Supprimer le repérage des antécédents" ; Text [ dutch ] = "Spoor naar voorganger verwijderen" ; Text [ swedish ] = "Ta bort spår till överordnade" ; @@ -1637,7 +1637,7 @@ Resource RID_GLOBSTR Text [ ENGLISH ] = "Remove Successor" ; Text [ english_us ] = "Remove Dependent" ; Text [ italian ] = "Rimuovi ~freccia sul dipendente" ; - Text [ spanish ] = "Eliminar rastro al sucesor" ; + Text [ spanish ] = "Borrar rastro al sucesor" ; Text [ french ] = "Supprimer le repérage des dépendants" ; Text [ dutch ] = "Spoor naar opvolger verwijderen" ; Text [ swedish ] = "Ta bort spår till underordnade" ; @@ -1672,7 +1672,7 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Analisar erro" ; Text [ portuguese_brazilian ] = "Spur zum Fehler" ; Text[ chinese_simplified ] = "指å‘错误的追踪ç®å¤´"; - Text[ russian ] = "Ñëåä îøèáêè"; + Text[ russian ] = "Ïîêàçàòü îøèáêè"; Text[ polish ] = "ŒledŸ b³êdy"; Text[ japanese ] = "エラーã®ãƒˆãƒ¬ãƒ¼ã‚¹"; Text[ chinese_traditional ] = "追蹤錯誤"; @@ -1691,7 +1691,7 @@ Resource RID_GLOBSTR Text [ ENGLISH ] = "Remove all Traces" ; Text [ english_us ] = "Remove all Traces" ; Text [ italian ] = "Rimuovi tutte le tracce" ; - Text [ spanish ] = "Eliminar todos los rastros" ; + Text [ spanish ] = "Borrar todos los rastros" ; Text [ french ] = "Supprimer tous les repères" ; Text [ dutch ] = "Alle sporen verwijderen" ; Text [ swedish ] = "Ta bort alla spår" ; @@ -1733,7 +1733,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "標記無效的資料"; Text[ arabic ] = "æÖÚ ÚáÇãÉ Úáì ÇáÈíÇäÇÊ ÇáÛíÑ ÕÇáÍÉ"; Text[ greek ] = "ÓÞìáíóç (ìå êýêëï) ìç Ýãêõñùí äåäïìÝíùí"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ë°ì´í„° 표시"; + Text[ korean ] = "ìž˜ëª»ëœ ë°ì´í„° 표시"; Text[ turkish ] = "Geçersiz verileri iþaretle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marca les dades no vàlides"; @@ -1760,7 +1760,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "更新追蹤ç®è™Ÿ"; Text[ arabic ] = "ÊÍÏíË ÇáÂËÇÑ"; Text[ greek ] = "ÁíáíÝùóç é÷íþí"; - Text[ korean ] = "추ì ì—…ë°ì´íŠ¸"; + Text[ korean ] = "추ì 새로 ê³ ì¹¨"; Text[ turkish ] = "Ýzleri güncelle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Refresca els rastres"; @@ -1776,7 +1776,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Modify chart data range" ; Text [ italian ] = "Modifica area dati del diagramma" ; Text [ spanish ] = "Modificar el área de datos del diagrama" ; - Text [ french ] = "Modifier plage de données du diagramme" ; + Text [ french ] = "Modifier la plage de données du diagramme" ; Text [ swedish ] = "Ändra diagramets dataområde" ; Text [ danish ] = "Modificer diagrammets dataområde" ; Text [ portuguese ] = "Alterar área de dados do gráfico" ; @@ -1788,7 +1788,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "變更圖表資料å€åŸŸ"; Text[ arabic ] = "ÊÚÏíá äØÇÞ ÇáÈíÇäÇÊ ÇáÎÇÕ ÈÑÓã ÈíÇäí"; Text[ greek ] = "ÁëëáãÞ ðåñéï÷Þò äåäïìÝíùí ôïõ äéáãñÜììáôïò"; - Text[ korean ] = "차트 ë°ì´í„° ì˜ì— ìˆ˜ì •"; + Text[ korean ] = "차트 ë°ì´í„° 범위 ìˆ˜ì •"; Text[ turkish ] = "Þemanýn veri aralýðýný deðiþtir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Modifica l'àrea de dades del diagrama"; @@ -1807,7 +1807,7 @@ Resource RID_GLOBSTR Text [ finnish ] = "Alkuperäinen koko" ; Text [ danish ] = "Oprindelig størrelse" ; Text [ french ] = "Taille d'origine" ; - Text [ swedish ] = "Orginalstorlek" ; + Text [ swedish ] = "Originalstorlek" ; Text [ dutch ] = "Originele grootte" ; Text [ spanish ] = "Tamaño original" ; Text [ english_us ] = "Original Size" ; @@ -1818,7 +1818,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "原件大å°"; Text[ arabic ] = "ÇáÍÌã ÇáÃÕáí"; Text[ greek ] = "Áñ÷éêü ìÝãåèïò"; - Text[ korean ] = "ì›ëž˜ëŒ€ë¡œ"; + Text[ korean ] = "ì›ëž˜ í¬ê¸°"; Text[ turkish ] = "Gerçek boyut"; Text[ language_user1 ] = " "; Text[ catalan ] = "Mida original"; @@ -1845,7 +1845,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "æ›´æ–°æ·å¾‘"; Text[ arabic ] = "ÊÍÏíË ÇáÇÑÊÈÇØ"; Text[ greek ] = "ÅíçìÝñùóç óýíäåóçò"; - Text[ korean ] = "ë§í¬ 새로 ê³ ì¹¨"; + Text[ korean ] = "ë§í¬ ì—…ë°ì´íŠ¸"; Text[ turkish ] = "Baðlantýyý güncelle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Actualitza l'enllaç"; @@ -1860,7 +1860,7 @@ Resource RID_GLOBSTR Text [ dutch ] = "Koppeling opheffen" ; Text [ english_us ] = "Unlink" ; Text [ italian ] = "Rimuovi i collegamenti" ; - Text [ spanish ] = "Eliminar vínculo" ; + Text [ spanish ] = "Borrar vínculo" ; Text [ french ] = "Supprimer le lien" ; Text [ swedish ] = "Upphäv länk" ; Text [ danish ] = "Ophæv kæde" ; @@ -1873,7 +1873,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å–消æ·å¾‘"; Text[ arabic ] = "ÅÒÇáÉ ÇáÇÑÊÈÇØ"; Text[ greek ] = "ÊáôÜñãçóç óýíäåóçò"; - Text[ korean ] = "ì—°ê²° ì‚ì œ"; + Text[ korean ] = "ì—°ê²° í•´ì œ"; Text[ turkish ] = "Baðlantýyý kaldýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desenllaça"; @@ -1901,7 +1901,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "æ’å…¥æ·å¾‘"; Text[ arabic ] = "ÅÏÑÇÌ ÇÑÊÈÇØ"; Text[ greek ] = "ÅéóáãùãÞ óýíäåóçò"; - Text[ korean ] = "ì—°ê²° 삽입"; + Text[ korean ] = "ë§í¬ 삽입"; Text[ turkish ] = "Baðlantý ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un enllaç"; @@ -1918,7 +1918,7 @@ Resource RID_GLOBSTR Text [ italian ] = "Inserisci formula di matrice" ; Text [ spanish ] = "Insertar fórmula matriz" ; Text [ french ] = "Insérer une formule de matrice" ; - Text [ swedish ] = "Infoga matrixformel" ; + Text [ swedish ] = "Infoga matrisformel" ; Text [ danish ] = "Indsæt matrixformel" ; Text [ portuguese ] = "Inserir fórmula matriz" ; Text [ portuguese_brazilian ] = "Matrixformel einf?en" ; @@ -2026,7 +2026,7 @@ Resource RID_GLOBSTR Text [ swedish ] = "Förminska indrag" ; Text [ danish ] = "Formindsk indrykning" ; Text [ italian ] = "Riduci rientro" ; - Text [ spanish ] = "Reducir sangría" ; + Text [ spanish ] = "Reducir la sangría" ; Text [ french ] = "Réduire le retrait" ; Text [ portuguese ] = "Diminuir avanço" ; Text [ portuguese_brazilian ] = "Einzug vermindern" ; @@ -2037,7 +2037,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "減少縮排"; Text[ arabic ] = "ÊÞáíá ÇáÅÒÇÍÉ"; Text[ greek ] = "Ìåßùóç åóï÷Þò"; - Text[ korean ] = "들여쓰기，ê°ì†Œ"; + Text[ korean ] = "내어쓰기"; Text[ turkish ] = "Girintiyi küçült"; Text[ language_user1 ] = " "; Text[ catalan ] = "Redueix el sagnat"; @@ -2175,7 +2175,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å–消ä¿è·æ–‡ä»¶"; Text[ arabic ] = "ÅÒÇáÉ ÍãÇíÉ ÇáãÓÊäÏ"; Text[ greek ] = "ÊáôÜñãçóç ðñïóôáóßáò åããñÜöïõ"; - Text[ korean ] = "문서보호 í•´ì œ"; + Text[ korean ] = "문서 보호 í•´ì œ"; Text[ turkish ] = "Belge korumasýný kaldýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desprotegeix el document"; @@ -2202,7 +2202,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "列å°ç¯„åœ"; Text[ arabic ] = "äØÇÞÇÊ ÇáØÈÇÚÉ"; Text[ greek ] = "Ðåñéï÷Ýò åêôýðùóçò"; - Text[ korean ] = "ì¸ì‡„범위"; + Text[ korean ] = "ì¸ì‡„ 범위"; Text[ turkish ] = "Yazdýrma aralýðý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea d'impressió"; @@ -2220,7 +2220,7 @@ Resource RID_GLOBSTR Text [ swedish ] = "Radera sidbrytningar" ; Text [ danish ] = "Slet sideskift" ; Text [ italian ] = "Elimina interruzioni pagina" ; - Text [ spanish ] = "Eliminar saltos de página" ; + Text [ spanish ] = "Borrar saltos de página" ; Text [ french ] = "Supprimer les sauts de page" ; Text [ dutch ] = "Pagina-einde wissen" ; Text[ chinese_simplified ] = "åˆ é™¤æ¢é¡µç¬¦"; @@ -2312,7 +2312,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "編輯å€åŸŸå稱"; Text[ arabic ] = "ÊÍÑíÑ ÃÓãÇÁ äØÇÞÇÊ"; Text[ greek ] = "Åðåîåñãáóßá ïíïìÜôùí ðåñéï÷þí"; - Text[ korean ] = "ì˜ì— ì´ë¦„ 편집"; + Text[ korean ] = "범위 ì´ë¦„ 편집"; Text[ turkish ] = "Aralýk adlarýný düzenle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Edita els noms d'àrea"; @@ -2336,7 +2336,7 @@ Resource RID_GLOBSTR Text[ polish ] = "Wielkie i ma³e litery"; Text[ portuguese_brazilian ] = "Change case"; Text[ japanese ] = "æ–‡å—種ã®å¤‰æ›"; - Text[ korean ] = "ë¬¸ìž ëª¨ì–‘ 바꾸기"; + Text[ korean ] = "ë¬¸ìž ë°”ê¾¸ê¸°"; Text[ chinese_simplified ] = "å˜åŒ–å—æ¯å’Œå—ä½“æ ¼å¼"; Text[ chinese_traditional ] = "變化å—æ¯å’Œå—åž‹æ ¼å¼"; Text[ turkish ] = "Change case"; @@ -2443,7 +2443,7 @@ Resource RID_GLOBSTR Text [ french ] = "Supprimer les données ?" ; Text [ swedish ] = "Radera data?" ; Text [ dutch ] = "Gegevens wissen?" ; - Text [ spanish ] = "¿Desea eliminar los datos?" ; + Text [ spanish ] = "¿Desea borrar los datos?" ; Text [ english_us ] = "Delete data?" ; Text[ chinese_simplified ] = "åˆ é™¤æ•°æ®ï¼Ÿ"; Text[ russian ] = "Óäàëèòü äàííûå?"; @@ -2510,7 +2510,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "ä¸åŸ·è¡Œå‹•ä½œ"; Text[ arabic ] = "áÇ ÊæÌÏ ÚãáíÇÊ ááÊäÝíÐ"; Text[ greek ] = "Äåí õðÜñ÷ïõí åíôïëÝò ãéá åêôÝëåóç"; - Text[ korean ] = "ìž‘ì—… 실행 취소."; + Text[ korean ] = "ì‹¤í–‰í• ìž‘ì—…ì´ ì—†ìŠµë‹ˆë‹¤."; Text[ turkish ] = "Yürütülecek iþlem yok"; Text[ language_user1 ] = " "; Text[ catalan ] = "No hi ha cap operació per executar"; @@ -2539,7 +2539,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å€åŸŸæ²’有列標題。\nè¦ç”¨ç¬¬ä¸€åˆ—的內容當作列標題？"; Text[ arabic ] = "åÐÇ ÇáäØÇÞ áÇ íÍÊæí Úáì ÑÄæÓ ÃÚãÏÉ.\nåá ÊÑíÏ ÇÓÊÎÏÇã ÇáÓØÑ ÇáÃæá ßÑÄæÓ ÃÚãÏÉ."; Text[ greek ] = "Ç ðåñéï÷Þ äåí ðåñéÝ÷åé êåöáëßäá óôçëþí.\nÈÝëåôå íá ÷ñçóéìïðïéçèåß ç ðñþôç óôÞëç ùò êåöáëßäá óôçëþí;"; - Text[ korean ] = "ì´ ì˜ì—ì—는 ì—´ ë¨¸ë¦¬ê¸€ì´ í¬í•¨ë˜ì–´ 있지 않습니다.\n첫번째 í–‰ì„ ì—´ 머리글로서 ì‚¬ìš©í•˜ê² ìŠµë‹ˆê¹Œ?"; + Text[ korean ] = "ì´ ì˜ì—ì—는 ì—´ ë¨¸ë¦¬ê¸€ì´ í¬í•¨ë˜ì–´ 있지 않습니다.\n첫번째 ì¤„ì„ ì—´ 머리글로 ì‚¬ìš©í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"; Text[ turkish ] = "Bu aralýk, sütun baþlýklarý içermiyor.\nÝlk satýr sütun baþlýðý olarak kullanýlsýn mý?"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea no conté les capçaleres de les columnes.\nVoleu utilitzar la primera línia com a capçalera de la columna?"; @@ -2620,7 +2620,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無法開啟這個查詢<#>。"; Text[ arabic ] = "ÊÚÐÑ ÝÊÍ ÇáÇÓÊÝÓÇÑ '#'."; Text[ greek ] = "Äåí Þôáí äõíáôüí íá áíïé÷èåß ôï åñþôçìá '#'."; - Text[ korean ] = "ì§ˆì˜ '#'ì„(를) ì—´ 수 없었습니다."; + Text[ korean ] = "쿼리 '#'ì„(를) ì—´ 수 없습니다."; Text[ turkish ] = "'#' sorgusu açýlamadý."; Text[ language_user1 ] = " "; Text[ catalan ] = "No s'ha pogut obrir la consulta '#'."; @@ -2675,7 +2675,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "# 匯入資料..."; Text[ arabic ] = "# ÓÌá(ÓÌáÇÊ) ãÓÊæÑÏ(É)..."; Text[ greek ] = "# åããñáöÝò åéóÜ÷èçêáí..."; - Text[ korean ] = "# ë ˆì½”ë“œë¥¼ ê°€ì ¸ì™”ìŠµë‹ˆë‹¤ ..."; + Text[ korean ] = "# ë ˆì½”ë“œë¥¼ ê°€ì ¸ì™”ìŠµë‹ˆë‹¤..."; Text[ turkish ] = "# veri kümesi içe aktarýldý..."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'han importat # registres..."; @@ -2705,7 +2705,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無法建立群組"; Text[ arabic ] = "ÇáÊÌãíÚ ÛíÑ ããßä"; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ãßíåé ïìáäïðïßçóç"; - Text[ korean ] = "그룹 만들기 불가능"; + Text[ korean ] = "그룹화 불가능"; Text[ turkish ] = "Gruplama yapýlamaz"; Text[ language_user1 ] = " "; Text[ catalan ] = "No és possible l'agrupament"; @@ -2734,7 +2734,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無法å–消"; Text[ arabic ] = "ÇáÅÒÇáÉ ÛíÑ ããßäÉ"; Text[ greek ] = "Äåí åßíáé äõíáôÞ ç êáôÜñãçóç ôçò ïìáäïðïßçóçò"; - Text[ korean ] = "실행 취소 불가능"; + Text[ korean ] = "그룹 í•´ì œ 불가능"; Text[ turkish ] = "Grup çözülemiyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "El desagrupament no és possible"; @@ -2791,7 +2791,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "ä¸å…許複åˆåˆä½µï¼"; Text[ arabic ] = "ããäæÚ ÊÑÇßÈ ÇáÎáÇíÇ ÇáãÏãÌÉ!"; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ãßíåé óõã÷þíåõóç êåëéþí ôá ïðïßá åßíáé Þäç óõã÷ùíåõìÝíá!"; - Text[ korean ] = "ë³‘í•©ì‹œì— ê²¹ì¹˜ì§€ 않게!"; + Text[ korean ] = "ì…€ ë³‘í•©ì„ ì¤‘ë³µí• ìˆ˜ 없습니다."; Text[ turkish ] = "Özetlenmiþ hücreler özetlenemez!"; Text[ language_user1 ] = " "; Text[ catalan ] = "No és possible fusionar les cel.les si ja estan fusionades."; @@ -2819,7 +2819,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "ä¸å…許複åˆåˆä½µï¼"; Text[ arabic ] = "ããäæÚ ÊÑÇßÈ ÇáÎáÇíÇ ÇáãÏãÌÉ!"; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ãßíåé óõã÷þíåõóç êåëéþí ôá ïðïßá åßíáé Þäç óõã÷ùíåõìÝíá!"; - Text[ korean ] = "ë³‘í•©ì‹œì— ê²¹ì¹˜ì§€ 않게!"; + Text[ korean ] = "ì…€ ë³‘í•©ì„ ì¤‘ë³µí• ìˆ˜ 없습니다."; Text[ turkish ] = "Özetlenmiþ hücreler özetlenemez!"; Text[ language_user1 ] = " "; Text[ catalan ] = "No és possible fusionar les cel.les si ja estan fusionades."; @@ -2838,7 +2838,7 @@ Resource RID_GLOBSTR Text [ french ] = "Bordure incompatible avec la sélection multiple" ; Text [ swedish ] = "Ej multimarkering för kantlinje" ; Text [ dutch ] = "Geen kader bij meervoudige selectie" ; - Text [ spanish ] = "Marco incompatible con selección múltiple" ; + Text [ spanish ] = "No se pueden aplicar bordes a una selección múltiple" ; Text [ english_us ] = "Cannot apply borders to multiple selection" ; Text[ chinese_simplified ] = "æ¡†æ— æ³•é€‚ç”¨äºŽå¤šé‡é€‰æ‹©"; Text[ russian ] = "Íåâîçìîæíî ïðèìåíèòü îáðàìëåíèå ïðè ìíîãîêðàòíîì âûáîðå"; @@ -2847,7 +2847,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "框無法用於多é‡é¸å–"; Text[ arabic ] = "áÇ íãßä ÇÓÊÎÏÇã ÇáßÇÏÑ áÚãá ÊÍÏíÏ ãÊÚÏÏ"; Text[ greek ] = "Äåí åßíáé äõíáôÞ ç åöáñìïãÞ ðåñéãñáììÜôùí óå ðïëëáðëÞ åðéëïãÞ"; - Text[ korean ] = "ê²½ê³„ì„ ì— ë‹¤ì¤‘ ì„ íƒì´ ì ìš© ë 수 없습니다."; + Text[ korean ] = "í…Œë‘리는 다중 ì„ íƒìœ¼ë¡œ ì‚¬ìš©í• ìˆ˜ 없습니다."; Text[ turkish ] = "Çoklu hücre seçimi için kenarlýk oluþturulamýyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es poden aplicar vores en una selecció múltiple"; @@ -2870,13 +2870,13 @@ Resource RID_GLOBSTR Text [ spanish ] = "No es posible insertar en áreas fusionadas" ; Text [ english_us ] = "Inserting into merged ranges not possible" ; Text[ chinese_simplified ] = "æ— æ³•æ’入到åˆå¹¶çš„区域内"; - Text[ russian ] = "Íåâîçìîæíà âñòàâêà â îáúåäèíåííûå îáëàñòè"; + Text[ russian ] = "Íåâîçìîæíî âñòàâèòü â îáúåäèíåííûå îáëàñòè"; Text[ polish ] = "Nie mo¿na wstawiæ do po³¹czonych obszarów"; Text[ japanese ] = "çµåˆã—ãŸç¯„囲ã«æŒ¿å…¥ã§ãã¾ã›ã‚“。"; Text[ chinese_traditional ] = "無法在åˆä½µçš„å€åŸŸå…§æ’å…¥"; Text[ arabic ] = "áÇ íÓÊØíÚ ÇáÅÏÑÇÌ Ýí äØÇÞÇÊ ãÏãÌÉ"; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ãßíåé ðñïóèÞêç óå óõã÷ùíåõìÝíåò ðåñéï÷Ýò"; - Text[ korean ] = "ë³‘í•©ëœ ì˜ì—ì— ì‚½ìž…í• ìˆ˜ 없습니다."; + Text[ korean ] = "ë³‘í•©ëœ ë²”ìœ„ì— ì‚½ìž…í• ìˆ˜ 없습니다."; Text[ turkish ] = "Birleþtirilmiþ aralýklara ekleme yapýlamaz"; Text[ language_user1 ] = " "; Text[ catalan ] = "No és possible inserir en àrees fusionades"; @@ -2896,16 +2896,16 @@ Resource RID_GLOBSTR Text [ french ] = "Suppression impossible dans des plages contant des cellules fusionnées" ; Text [ swedish ] = "Kan inte radera från sammanfattade områden" ; Text [ dutch ] = "Verwijderen binnen samengevoegde bereiken onmogelijk!" ; - Text [ spanish ] = "No se puede eliminar en áreas fusionadas" ; + Text [ spanish ] = "No se puede borrar en áreas fusionadas" ; Text [ english_us ] = "Deleting in merged ranges not possible" ; Text[ chinese_simplified ] = "æ— æ³•ä»Žåˆå¹¶çš„区域ä¸åˆ 除"; - Text[ russian ] = "Íåâîçìîæíî óäàëåíèå èç îáúåäèíåííûõ îáëàñòåé"; + Text[ russian ] = "Íåâîçìîæíî óäàëèòü èç îáúåäèíåííûõ îáëàñòåé"; Text[ polish ] = "Nie mo¿e usun¹æ ze po³¹czonych obszarów"; Text[ japanese ] = "çµåˆã—ãŸç¯„囲ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。"; Text[ chinese_traditional ] = "無法刪除åˆä½µçš„å€åŸŸ"; Text[ arabic ] = "áÇ íãßä ÇáÍÐÝ ãä äØÇÞÇÊ ãÏãÌÉ"; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ãßíåé äéáãñáöÞ óôéò óõã÷ùíåõìÝíåò ðåñéï÷Ýò"; - Text[ korean ] = "ë³‘í•©ëœ ì˜ì—ì—ì„œ ì‚ì œí• ìˆ˜ 없습니다."; + Text[ korean ] = "ë³‘í•©ëœ ë²”ìœ„ì—ì„œ ì‚ì œí• ìˆ˜ 없습니다."; Text[ turkish ] = "Birleþtirilmiþ aralýklarda silme yapýlamaz"; Text[ language_user1 ] = " "; Text[ catalan ] = "No és possible suprimir en àrees fusionades"; @@ -2933,7 +2933,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "ä¸å…許複åˆåˆä½µï¼"; Text[ arabic ] = "ããäæÚ ÊÑÇßÈ ÇáÎáÇíÇ ÇáãÏãÌÉ !"; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ãßíåé óõã÷þíåõóç êåëéþí ôá ïðïßá åßíáé Þäç óõã÷ùíåõìÝíá!"; - Text[ korean ] = "ë³‘í•©ì‹œì— ê²¹ì¹˜ì§€ 않게!"; + Text[ korean ] = "ì…€ ë³‘í•©ì„ ì¤‘ë³µí• ìˆ˜ 없습니다."; Text[ turkish ] = "Özetlenmiþ hücreler özetlenemez!"; Text[ language_user1 ] = " "; Text[ catalan ] = "No és possible fusionar les cel.les si ja estan fusionades"; @@ -2960,7 +2960,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "åªæœ‰åœ¨ä¸å¸¶æ ¼å¼çš„æ¢ä»¶ä¸‹æ‰èƒ½æŽ’åºå«æœ‰åˆä½µçš„儲å˜æ ¼å€åŸŸã€‚"; Text[ arabic ] = "áÇ íãßä ÝÑÒ ÇáäØÇÞÇÊ ÐÇÊ ÇáÎáÇíÇ ÇáãÏãÌÉ ÅáÇ ÈÏæä ÊäÓíÞÇÊ."; Text[ greek ] = "Ç ôáîéíüìçóç ðåñéï÷þí, ïé ïðïßåò ðåñéÝ÷ïõí óõã÷ùíåõìÝíá êåëéÜ, åßíáé äõíáôüí íá ãßíåé ìüíï ÷ùñßò ôç ìïñöïðïßçóç."; - Text[ korean ] = "ë³‘í•©ëœ ì…€ì„ í¬í•¨í•˜ê³ 있는 ì˜ì—ì€ ì„œì‹ì´ ì—†ì„ ë•Œë§Œ ì •ë ¬ë 수 있습니다."; + Text[ korean ] = "ë³‘í•©ëœ ì…€ì„ í¬í•¨í•˜ê³ 있는 범위는 ì„œì‹ì´ ì—†ì„ ë•Œë§Œ ì •ë ¬ë 수 있습니다."; Text[ turkish ] = "Birleþtirilmiþ hücre içeren aralýklar yalnýzca formatsýz olarak sýralanabilir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Les àrees que contenen cel.les fusionades només es poden ordenar sense formats."; @@ -2987,7 +2987,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "沒有找到æœå°‹é …目。"; Text[ arabic ] = "ÊÚÐÑ ÇáÚËæÑ Úáì ÇáÈíÇäÇÊ ÇáÊí ÊÈÍË ÚäåÇ."; Text[ greek ] = "Äåí âñÝèçêå ï üñïò áíáæÞôçóçò."; - Text[ korean ] = "검색 용어를 찾지 못했습니다."; + Text[ korean ] = "검색 키를 찾지 못했습니다."; Text[ turkish ] = "Aranan terim bulunamadý."; Text[ language_user1 ] = " "; Text[ catalan ] = "No s'ha trobat la clau de cerca."; @@ -3215,7 +3215,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "總çµæžœ"; Text[ arabic ] = "ÇáãÌãæÚ"; Text[ greek ] = "Óõíïëéêü Üèñïéóìá"; - Text[ korean ] = "ì „ì²´ 합계"; + Text[ korean ] = "ì´í•©ê³„"; Text[ turkish ] = "Genel toplam"; Text[ language_user1 ] = " "; Text[ catalan ] = "Suma total"; @@ -3298,7 +3298,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å’Œ"; Text[ arabic ] = "AND"; Text[ greek ] = "KAI"; - Text[ korean ] = "ê·¸ë¦¬ê³ "; + Text[ korean ] = "AND"; Text[ turkish ] = "VE"; Text[ language_user1 ] = " "; Text[ catalan ] = "AND"; @@ -3365,7 +3365,7 @@ Resource RID_GLOBSTR Text = "- ans Ende stellen -" ; Text [ ENGLISH ] = "- move to last position -" ; Text [ norwegian ] = "- move to last position -" ; - Text [ italian ] = "- spostare all'ultima posizione -" ; + Text [ italian ] = "- sposta all'ultima posizione -" ; Text [ portuguese_brazilian ] = "- mova para ?tima posi??o -" ; Text [ portuguese ] = "- mover para última posição -" ; Text [ finnish ] = "- siirrä loppusijaintiin -" ; @@ -3467,7 +3467,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "資料å€åŸŸå¿…é ˆè‡³å°‘å«æœ‰ä¸€æ¬„數據。"; Text[ arabic ] = "íÌÈ Ãä íÍÊæí äØÇÞ ÇáÈíÇäÇÊ Úáì ÕÝ ÈíÇäÇÊ æÇÍÏ Úáì ÇáÃÞá."; Text[ greek ] = "Ç ðåñéï÷Þ äåäïìÝíùí ðñÝðåé íá ðåñéÝ÷åé ôïõëÜ÷éóôïí ìéá ãñáììÞ äåäïìÝíùí."; - Text[ korean ] = "ë°ì´í„° ì˜ì—ì—는 최소한 í•˜ë‚˜ì˜ ë°ì´í„°ï¼í–‰ì´ 있어야 합니다."; + Text[ korean ] = "ë°ì´í„° 범위ì—는 최소한 í•œ ì¤„ì˜ í–‰ì´ ìžˆì–´ì•¼ 합니다."; Text[ turkish ] = "Veri aralýðýnda en az bir satýr bulunmalýdýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea de dades ha de contenir almenys una fila."; @@ -3516,7 +3516,7 @@ Resource RID_GLOBSTR Text [ french ] = "Impossible de supprimer cette plage de données." ; Text [ swedish ] = "Dataområdet kan inte raderas." ; Text [ dutch ] = "Gegevensbereik wissen onmogelijk." ; - Text [ spanish ] = "No se puede eliminar el área de datos." ; + Text [ spanish ] = "No se puede borrar el área de datos." ; Text [ english_us ] = "The data range can not be deleted." ; Text[ chinese_simplified ] = "æ— æ³•åˆ é™¤æ•°æ®åº“区域。"; Text[ russian ] = "Íåâîçìîæíî óäàëèòü îáëàñòü äàííûõ."; @@ -3525,7 +3525,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無法刪除資料å€åŸŸã€‚"; Text[ arabic ] = "áÇ íãßä ÍÐÝ äØÇÞ ÇáÈíÇäÇÊ."; Text[ greek ] = "Ç ðåñéï÷Þ äåäïìÝíùí äåí åßíáé äõíáôüí íá äéáãñáöåß."; - Text[ korean ] = "ë°ì´í„° ì˜ì—ì€ ì‚ì œí• ìˆ˜ 없습니다."; + Text[ korean ] = "ë°ì´í„° 범위는 ì‚ì œí• ìˆ˜ 없습니다."; Text[ turkish ] = "Veri aralýðý silinemiyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot suprimir l'àrea de dades."; @@ -3539,7 +3539,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Error creating the Data Pilot Table." ; Text [ italian ] = "Erore nella creazione della tabella DataPilot" ; Text [ spanish ] = "Error al crear la tabla del Piloto de Datos." ; - Text [ french ] = "Erreur en créant la table du pilote de données" ; + Text [ french ] = "Erreur lors de la création de la table du pilote de données" ; Text [ swedish ] = "Fel när Datapilot-tabell skapades." ; Text [ danish ] = "Fejl ved oprettelse af DataPilot-tabellen." ; Text [ portuguese ] = "Erro ao criar a tabela do Piloto de Dados." ; @@ -3551,7 +3551,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "在建立資料助ç†å·¥ä½œè¡¨æ™‚發生錯誤。"; Text[ arabic ] = "ÍÏË ÎØà ÃËäÇÁ ÅäÔÇÁ ÌÏæá ãÑÔÏ ÇáÈíÇäÇÊ."; Text[ greek ] = "ÓöÜëìá êáôÜ ôçí äçìéïõñãßá ôïõ ðßíáêá ôïõ ðéëüôïõ äåäïìÝíùí."; - Text[ korean ] = "ë°ì´í„° 파ì¼ëŸ¿ í‘œ 작성시 오류."; + Text[ korean ] = "ë°ì´í„° 파ì¼ëŸ¿ í‘œ 만드는 중 오류"; Text[ turkish ] = "Veri pilotu tablosu oluþturma hatasý"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha produït un error en crear la taula del DataPilot."; @@ -3601,13 +3601,13 @@ Resource RID_GLOBSTR Text [ french ] = "La plage cible n'est pas vide. Voulez-vous remplacer son contenu ?" ; Text [ dutch ] = "Het doelbereik is niet leeg. Overschrijven?" ; Text[ chinese_simplified ] = "è¿™ä¸ªç›®æ ‡åŒºåŸŸä¸æ˜¯ç©ºç™½çš„。还是è¦åˆ 除它？"; - Text[ russian ] = "Öåëåâàÿ îáëàñòü íå ïóñòàÿ. Ïåðåçàïèñàòü ñîäåðæèìîå?"; + Text[ russian ] = "Îáëàñòü íàçíà÷åíèÿ íå ïóñòà. Ïåðåçàïèñàòü ñîäåðæèìîå?"; Text[ polish ] = "Obszar docelowy nie jest pusty. Czy on ma zostaæ skasowany przez zapisanie?"; Text[ japanese ] = "貼り付ã‘å…ˆãŒç©ºç™½ã§ã¯ã‚ã‚Šã¾ã›ã‚“。上書ãã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ã€‚"; Text[ chinese_traditional ] = "這個目標å€åŸŸä¸æ˜¯ç©ºç™½çš„。還是è¦åˆªé™¤ï¼Ÿ"; Text[ arabic ] = "ÇáäØÇÞ ÇáåÏÝ ÛíÑ ÝÇÑÛ. åá ÊÑíÏ ÇáßÊÇÈÉ ÝæÞ ãÍÊæíÇÊå¿"; Text[ greek ] = "Ç ðåñéï÷Þ ðñïïñéóìïý äåí åßíáé êåíÞ. ÈÝëåôå íá áíôéêáôáóôáèåß;"; - Text[ korean ] = "ëŒ€ìƒ ì˜ì—ì´ ë¹„ì–´ìžˆì§€ 않습니다. ê¸°ì¡´ì˜ ë‚´ìš©ì— ë®ì–´ì“°ê² 습니까?"; + Text[ korean ] = "ëŒ€ìƒ ë²”ìœ„ê°€ 비어있지 않습니다. ê¸°ì¡´ì˜ ë‚´ìš©ì— ë®ì–´ì“°ì‹œê² 습니까?"; Text[ turkish ] = "Hedef aralýðý boþ deðil. Mevcut içeriðin üzerine yazýlsýn mý?"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea de destinació no és buida. Voleu sobreescriure el contingut existent?"; @@ -3631,7 +3631,7 @@ Resource RID_GLOBSTR Text[ polish ] = "Obszar Ÿród³owy zawiera sumy poœrednie, które mog¹ sfa³szowaæ wynik. Czy u¿yæ go pomimo tego?"; Text[ portuguese_brazilian ] = "The source range contains subtotals which may distort the results. Use it anyway?"; Text[ japanese ] = "ã“ã®ã‚½ãƒ¼ã‚¹ç¯„囲ã«ã¯å°è¨ˆãŒå«ã¾ã‚Œã¦ãŠã‚Šã€æ£ã—ããªã„çµæžœãŒå‡ºã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚使用ã—ã¾ã™ã‹ã€‚"; - Text[ korean ] = "소스 ì˜ì—ì— ìž˜ëª»ëœ ê²°ê³¼ë¥¼ ì´ˆëž˜í• ìˆ˜ 있는 ë¶€ë¶„í•©ì´ í¬í•¨ë˜ì–´ 있습니다. ê·¸ëž˜ë„ ì‚¬ìš©í•˜ê² ìŠµë‹ˆê¹Œ?"; + Text[ korean ] = "ì›ë³¸ ë²”ìœ„ì— ìž˜ëª»ëœ ê²°ê³¼ë¥¼ ì´ˆëž˜í• ìˆ˜ 있는 ë¶€ë¶„í•©ì´ í¬í•¨ë˜ì–´ 있습니다. ê·¸ëž˜ë„ ì‚¬ìš©í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"; Text[ chinese_simplified ] = "这个æºåŒºåŸŸå«æœ‰ä¸€äº›å¯èƒ½ä¼šå½±å“到计算结果的自动求和公å¼ã€‚还是è¦ä½¿ç”¨å®ƒï¼Ÿ"; Text[ chinese_traditional ] = "這個æºå€åŸŸå«æœ‰ä¸€äº›å¯èƒ½æœƒå½±éŸ¿åˆ°è¨ˆç®—çµæžœçš„å°è¨ˆå…¬å¼ã€‚還是è¦ä½¿ç”¨å®ƒï¼Ÿ"; Text[ turkish ] = "The source range contains subtotals which may distort the results. Use it anyway?"; @@ -3689,7 +3689,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "總計"; Text[ arabic ] = "ÅÌãÇáí"; Text[ greek ] = "Óýíïëï"; - Text[ korean ] = "ì „ì²´"; + Text[ korean ] = "ì´"; Text[ turkish ] = "Toplam"; Text[ language_user1 ] = " "; Text[ catalan ] = "Total"; @@ -3801,7 +3801,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å¹³å‡å€¼"; Text[ arabic ] = "AVERAGE"; Text[ greek ] = "AVERAGE"; - Text[ korean ] = "í‰ê· "; + Text[ korean ] = "AVERAGE"; Text[ turkish ] = "AVERAGE"; Text[ language_user1 ] = " "; Text[ catalan ] = "AVERAGE"; @@ -3885,7 +3885,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "乘ç©"; Text[ arabic ] = "ÇáãõäúÊóÌ"; Text[ greek ] = "ÃÉÍÏÌÅÍÏ"; - Text[ korean ] = "ì œí’ˆ"; + Text[ korean ] = "PRODUCT"; Text[ turkish ] = "PRODUCT"; Text[ language_user1 ] = " "; Text[ catalan ] = "PRODUCT"; @@ -4221,7 +4221,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "<ä¸æ˜Žçš„工作表引用>"; Text[ arabic ] = "<ãÑÌÚ ÌÏæá ÛíÑ ãÚÑæÝ>"; Text[ greek ] = "<Üãíùóôç áíáöïñÜ ðßíáêá>"; - Text[ korean ] = "<ì•Œë ¤ì§€ì§€ ì•Šì€ ì‹œíŠ¸ 참조>"; + Text[ korean ] = "<ì•Œ 수 없는 í‘œ 참조>"; Text[ turkish ] = "<bilinmeyen tablo referansý>"; Text[ language_user1 ] = " "; Text[ catalan ] = "<referència desconeguda de la taula>"; @@ -4250,7 +4250,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å·²ç¶“åŠ å…¥äº†é€™å€‹å€åŸŸã€‚"; Text[ arabic ] = "Êã ÅÏÑÇÌ åÐÇ ÇáäØÇÞ ãÓÈÞÇð."; Text[ greek ] = "Ç ðåñéï÷Þ ðñïóôÝèçêå Þäç."; - Text[ korean ] = "ì´ ë²”ìœ„ëŠ” ì´ë¯¸ 삽입ë˜ì—ˆìŠµë‹ˆë‹¤."; + Text[ korean ] = "ì´ ë²”ìœ„ëŠ” ì´ë¯¸ 삽입ë˜ì–´ 있습니다."; Text[ turkish ] = "Bu aralýk daha önce eklendi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Aquesta àrea ja s'ha inserit."; @@ -4273,13 +4273,13 @@ Resource RID_GLOBSTR Text [ spanish ] = "Referencia a hoja no válida." ; Text [ english_us ] = "Invalid sheet reference." ; Text[ chinese_simplified ] = "å·¥ä½œè¡¨å¼•ç”¨æ— æ•ˆã€‚"; - Text[ russian ] = "Íåäîïóñòèìàÿ ññûëêà ëèñòà."; + Text[ russian ] = "Íåäîïóñòèìàÿ ññûëêà íà ëèñò."; Text[ polish ] = "Nieprawid³owy odnoœnik arkusza."; Text[ japanese ] = "貼り付ã‘å…ˆãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"; Text[ chinese_traditional ] = "工作表引用無效。"; Text[ arabic ] = "ãÑÌÚ ÇáÌÏæá ÛíÑ ÕÇáÍ."; Text[ greek ] = "Ìç Ýãêõñç áíáöïñÜ ðßíáêá"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ì‹œíŠ¸ 참조."; + Text[ korean ] = "ìž˜ëª»ëœ ì‹œíŠ¸ 참조."; Text[ turkish ] = "Geçersiz tablo referansý."; Text[ language_user1 ] = " "; Text[ catalan ] = "La referència del full no és vàlida."; @@ -4302,13 +4302,13 @@ Resource RID_GLOBSTR Text [ spanish ] = "Este área no contiene ninguna consulta válida." ; Text [ english_us ] = "This range does not contain a valid query." ; Text[ chinese_simplified ] = "这个区域没有有效的查询。"; - Text[ russian ] = "Îáëàñòü íå ñîäåðæèò äîïóñòèìûé çàïðîñ."; + Text[ russian ] = "Îáëàñòü ñîäåðæèò íå äîïóñòèìûé çàïðîñ."; Text[ polish ] = "Ten obszar nie zawiera prawid³owej kwerendy."; Text[ japanese ] = "ã“ã®ç¯„囲ã¯æœ‰åŠ¹ãªã‚¯ã‚¨ãƒªãƒ¼ã‚’å«ã‚“ã§ã„ã¾ã›ã‚“。　　　　　　　　"; Text[ chinese_traditional ] = "這個å€åŸŸæ²’有有效的查詢。"; Text[ arabic ] = "áÇ íÍÊæí åÐÇ ÇáäØÇÞ Úáì ÇÓÊÝÓÇÑ ÕÇáÍ."; Text[ greek ] = "Ç ðåñéï÷Þ äåí ðåñéÝ÷åé Ýãêõñï åñþôçìá."; - Text[ korean ] = "ì´ ë²”ìœ„ì—는 ìœ íš¨í•œ 질ì˜ê°€ í¬í•¨ë˜ì–´ 있지 않습니다 ."; + Text[ korean ] = "ì´ ë²”ìœ„ì—는 ìœ íš¨í•œ 쿼리가 í¬í•¨ë˜ì–´ 있지 않습니다."; Text[ turkish ] = "Bu aralýk geçerli bir sorgu içermiyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "Aquesta àrea no conté cap consulta vàlida."; @@ -4360,7 +4360,7 @@ Resource RID_GLOBSTR Text [ spanish ] = "Esta función no se puede aplicar con selecciones múltiples." ; Text [ english_us ] = "This function cannot be used with multiple selections." ; Text[ chinese_simplified ] = "è¿™ä¸ªåŠŸèƒ½æ— æ³•è¿ç”¨äºŽå¤šé‡é€‰æ‹©ã€‚"; - Text[ russian ] = "Íåâîçìîæíî ïðèìåíèòü ýòó ôóíêöèþ ñ ìíîãîêðàòíûì âûáîðîì."; + Text[ russian ] = "Íåâîçìîæíî ïðèìåíèòü ýòó ôóíêöèþ ê ìíîæåñòâåííîìó âûáîðó."; Text[ polish ] = "Tej funkcji nie mo¿na zastosowaæ do wielokrotnej selekcji."; Text[ japanese ] = "ã“ã®æ©Ÿèƒ½ã¯è¤‡æ•°é¸æŠžã§ã¯ä½¿ãˆã¾ã›ã‚“。"; Text[ chinese_traditional ] = "這個功能無法應用於多é‡é¸å–。"; @@ -4386,7 +4386,7 @@ Resource RID_GLOBSTR Text [ french ] = "Remplissage de série..." ; Text [ swedish ] = "Fyll serie..." ; Text [ dutch ] = "Reeksen invullen..." ; - Text [ spanish ] = "Rellenar serie..." ; + Text [ spanish ] = "Rellenar fila..." ; Text [ english_us ] = "Fill Row..." ; Text[ chinese_simplified ] = "充填系列..."; Text[ russian ] = "Çàëèâêà ñòðîê..."; @@ -4423,7 +4423,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "ä¸æ˜Žçš„篩é¸ï¼š "; Text[ arabic ] = "ÝáÊÑ ÛíÑ ãÚÑæÝ: "; Text[ greek ] = "¢ãíùóôï ößëôñï: "; - Text[ korean ] = "ì•Œë ¤ì ¸ 있지 ì•Šì€ í•„í„°: "; + Text[ korean ] = "ì•Œ 수 없는 í•„í„°: "; Text[ turkish ] = "Bilinmeyen filtre: "; Text[ language_user1 ] = " "; Text[ catalan ] = "Filtre desconegut: "; @@ -4551,7 +4551,7 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Preencher folhas" ; Text [ finnish ] = "Täytä taulukot" ; Text [ danish ] = "Fyld ark" ; - Text [ french ] = "Remplissage feuilles" ; + Text [ french ] = "Remplissage des feuilles" ; Text [ swedish ] = "Fyll tabeller" ; Text [ dutch ] = "Werkbladen vullen" ; Text [ spanish ] = "Rellenar hojas" ; @@ -4607,7 +4607,7 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Adicionar áreas seleccionadas ao cenário activo?" ; Text [ finnish ] = "Lisätäänkö valinnat nykyiseen skenaarioon?" ; Text [ danish ] = "Tilføje markerede områder til scenariet?" ; - Text [ french ] = "Ajouter les plages sélectionnées au scénario en cours ?" ; + Text [ french ] = "Ajouter les plages sélectionnées au scénario ?" ; Text [ swedish ] = "Utöka scenario med de markerade områdena?" ; Text [ dutch ] = "Geselecteerde bereiken aan huidig scenario toevoegen?" ; Text [ spanish ] = "¿Desea añadir las áreas seleccionadas al escenario actual?" ; @@ -4670,7 +4670,7 @@ Resource RID_GLOBSTR Text [ spanish ] = "Ninguna área seleccionada." ; Text [ english_us ] = "A range has not been selected." ; Text[ chinese_simplified ] = "æ²¡æœ‰æ ‡è®°ä»»ä½•åŒºåŸŸã€‚"; - Text[ russian ] = "Íå âûäåëåí äèàïàçí."; + Text[ russian ] = "Íå âûäåëåí äèàïàçîí."; Text[ polish ] = "Nie zaznaczono obszaru."; Text[ japanese ] = "何もé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"; Text[ chinese_traditional ] = "沒有標記任何å€åŸŸã€‚"; @@ -4733,7 +4733,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "工作表å稱無效。請用數å—或å—æ¯ä»£æ›¿ã€‚"; Text[ arabic ] = "ÇÓã ÌÏæá ÛíÑ ÕÇáÍ."; Text[ greek ] = "¢êõñï üíïìá ðßíáêá."; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ì‹œíŠ¸ ì´ë¦„"; + Text[ korean ] = "ìž˜ëª»ëœ ì‹œíŠ¸ ì´ë¦„"; Text[ turkish ] = "Geçersiz tablo adý."; Text[ language_user1 ] = " "; Text[ catalan ] = "El nom del full no és vàlid."; @@ -4901,7 +4901,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å¹³å‡å€¼"; Text[ arabic ] = "ÇáãÚÏá"; Text[ greek ] = "ÌÝóç ôéìÞ"; - Text[ korean ] = "í‰ê· "; + Text[ korean ] = "í‰ê· ê°’"; Text[ turkish ] = "Average"; Text[ language_user1 ] = " "; Text[ catalan ] = "Mitjana"; @@ -4985,7 +4985,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "乘ç©"; Text[ arabic ] = "ÍÇÕá ÇáÖÑÈ"; Text[ greek ] = "Ãéíüìåíï"; - Text[ korean ] = "ì œí’ˆ"; + Text[ korean ] = "ê³±"; Text[ turkish ] = "Çarpým"; Text[ language_user1 ] = " "; Text[ catalan ] = "Producte"; @@ -5228,7 +5228,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "(空缺)"; Text[ arabic ] = "(ÝÇÑÛ)"; Text[ greek ] = "(êåíü)"; - Text[ korean ] = "(공백)"; + Text[ korean ] = "(빈)"; Text[ turkish ] = "(boþ)"; Text[ language_user1 ] = " "; Text[ catalan ] = "(buit)"; @@ -5257,7 +5257,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無效的列å°å€åŸŸ"; Text[ arabic ] = "äØÇÞ ØÈÇÚÉ ÛíÑ ÕÇáÍ"; Text[ greek ] = "¢êõñç ðåñéï÷Þ åêôýðùóçò"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ì¸ì‡„ ì˜ì—"; + Text[ korean ] = "ìž˜ëª»ëœ ì¸ì‡„ 범위"; Text[ turkish ] = "Geçersiz yazdýrma aralýðý"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea d'impressió no és vàlida"; @@ -5276,7 +5276,7 @@ Resource RID_GLOBSTR Text [ french ] = "Style de page" ; Text [ swedish ] = "Sidformatmall" ; Text [ dutch ] = "Pagina-opmaakprofiel" ; - Text [ spanish ] = "Estilo de hoja" ; + Text [ spanish ] = "Estilo de página" ; Text [ english_us ] = "Page Style" ; Text[ chinese_simplified ] = "页é¢æ ·å¼"; Text[ russian ] = "Ñòèëü ñòðàíèöû"; @@ -5454,7 +5454,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "é "; Text[ arabic ] = "ÕÝÍÇÊ"; Text[ greek ] = "PAGES"; - Text[ korean ] = "페ì´ì§€ë“¤"; + Text[ korean ] = "페ì´ì§€"; Text[ turkish ] = "SAYFA"; Text[ language_user1 ] = " "; Text[ catalan ] = "PAGES"; @@ -5482,7 +5482,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "日期"; Text[ arabic ] = "ÇáÊÇÑíÎ"; Text[ greek ] = "ÇÌÅÑÏÌÇÍÉÁ"; - Text[ korean ] = "ì¼ìž"; + Text[ korean ] = "DATE"; Text[ turkish ] = "DATE"; Text[ language_user1 ] = " "; Text[ catalan ] = "DATE"; @@ -5645,21 +5645,21 @@ Resource RID_GLOBSTR // Text[spanish] = "Las celdas protegidas no pueden modificarse."; Text [ english_us ] = "You cannot change only part of an array." ; Text [ dutch ] = "Een deel van een matrix kan niet worden gewijzigd." ; - Text [ italian ] = "Non è possibile modificare una parte della matrice" ; - Text [ spanish ] = "No se puede modificar parte de la matriz." ; - Text [ french ] = "Impossible de modifier la partie d'une matrice." ; - Text [ swedish ] = "En del av en matris kan inte ändras." ; + Text [ italian ] = "Non è possibile modificare solo una parte della matrice." ; + Text [ spanish ] = "No se puede modificar sólo una parte de la matriz." ; + Text [ french ] = "Il n'est pas possible de ne modifier qu'une partie d'une matrice." ; + Text [ swedish ] = "Du kan inte ändra bara en del av en matris." ; Text [ danish ] = "Det er ikke muligt at ændre en del af en matrix." ; Text [ portuguese ] = "Impossível alterar uma parte da matriz." ; Text [ portuguese_brazilian ] = "Teil einer Matrix kann nicht ge?ndert werden." ; - Text[ chinese_simplified ] = "çŸ©é˜µçš„ä¸€éƒ¨åˆ†æ— æ³•è¢«æ›´æ”¹ã€‚"; + Text[ chinese_simplified ] = "æ‚¨æ— æ³•åªæ›´æ”¹çŸ©é˜µçš„一部分。"; Text[ russian ] = "Íåâîçìîæíî èçìåíèòü ÷àñòü ìàññèâà."; Text[ polish ] = "Czêœæ macierzy nie mo¿e byæ zmodyfikowana."; Text[ japanese ] = "行列ã¯éƒ¨åˆ†å¤‰æ›´ã§ãã¾ã›ã‚“。"; - Text[ chinese_traditional ] = "無法變更矩陣的一部份。"; + Text[ chinese_traditional ] = "無法僅變更陣列的一部份。"; Text[ arabic ] = "áÇ íãßä ÊÚÏíá ÌÒÁ ãä ÕÝíÝ."; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ôñïðïðïéçèåß ôìÞìá ìéáò ìÞôñáò."; - Text[ korean ] = "í–‰ë ¬ì˜ ì¼ë¶€ë¥¼ ë³€ê²½í• ìˆ˜ 없습니다."; + Text[ korean ] = "í–‰ë ¬ì˜ ì¼ë¶€ ë§Œì„ ë³€ê²½í• ìˆ˜ 없습니다."; Text[ turkish ] = "Matrislerin bir kýsmý deðiþtirilemiyor."; Text[ language_user1 ] = "EM Dec 2002: In other words, you can only change the whole thing."; Text[ catalan ] = "No es pot modificar una part d'una matriu."; @@ -5746,7 +5746,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "錯誤：無效的自變é‡"; Text[ arabic ] = "ÎØÃ: æÓíØÉ ÛíÑ ÕÇáÍÉ"; Text[ greek ] = "ÓöÜëìá: Ìç Ýãêõñï üñéóìá"; - Text[ korean ] = "오류: ìœ íš¨í•˜ì§€ ì•Šì€ ë…립 변수"; + Text[ korean ] = "오류: ìž˜ëª»ëœ ë…립 변수"; Text[ turkish ] = "Hata: Geçersiz deðiþken"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error: argument no vàlid"; @@ -5774,7 +5774,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "åƒæ•¸æ¸…單有錯誤"; Text[ arabic ] = "ÍÏË ÎØà Ýí ÞÇÆãÉ ÇáãÚáãÇÊ"; Text[ greek ] = "ÓöÜëìá óôç ëßóôá ðáñáìÝôñùí"; - Text[ korean ] = "파ë¼ë¯¸í„° 목ë¡ìƒì˜ 오류"; + Text[ korean ] = "매개 변수 목ë¡ì˜ 오류"; Text[ turkish ] = "Parametre listesinde hata"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha produït un error a la llista de paràmetres"; @@ -5799,11 +5799,11 @@ Resource RID_GLOBSTR Text[ chinese_simplified ] = "é”™è¯¯ï¼šæ— æ•ˆçš„æµ®ç‚¹è¿ç®—"; Text[ russian ] = "Îøèáêà: íåäîïóñòèìàÿ îïåðàöèÿ ñ ïëàâàþùåé çàïÿòîé"; Text[ polish ] = "B³¹d: Niepoprawna operacja liczby zmiennoprzecinkowej"; - Text[ japanese ] = "エラー: 無効ãªæµ®å‹•å°‘数点演算ã§ã™"; + Text[ japanese ] = "エラー: 無効ãªæµ®å‹•å°æ•°ç‚¹æ¼”ç®—ã§ã™"; Text[ chinese_traditional ] = "錯誤：無效的浮點é‹ç®—"; Text[ arabic ] = "ÎØÃ: ÚãáíÉ ÝÇÕáÉ ÚÇÆãÉ ÛíÑ ÕÇáÍÉ"; Text[ greek ] = "ÓöÜëìá: Ìç Ýãêõñç ëåéôïõñãßá êéíçôÞò õðïäéáóôïëÞò"; - Text[ korean ] = "오류: ìœ íš¨í•˜ì§€ ì•Šì€ ë¶€ë™ ì†Œìˆ˜ì ìž‘ë™"; + Text[ korean ] = "오류: ìž˜ëª»ëœ ë¶€ë™ ì†Œìˆ˜ì ìž‘ë™"; Text[ turkish ] = "Hata: Geçersiz kayan nokta iþlemi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error: l'operació de coma flotant no és vàlida"; @@ -5832,7 +5832,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "錯誤：無效的å—å…ƒ"; Text[ arabic ] = "ÎØÃ: ÍÑÝ ÛíÑ ÕÇáÍ"; Text[ greek ] = "ÓöÜëìá: Ìç Ýãêõñïò ÷áñáêôÞñáò"; - Text[ korean ] = "오류: ìœ íš¨í•˜ì§€ ì•Šì€ ë¬¸ìž"; + Text[ korean ] = "오류: ìž˜ëª»ëœ ë¬¸ìž"; Text[ turkish ] = "Hata: Geçersiz karakter"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error: caràcter no vàlid"; @@ -5861,7 +5861,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "錯誤：無效的分號"; Text[ arabic ] = "ÎØÃ: ÝÇÕáÉ ãäÞæØÉ ÛíÑ ÕÇáÍÉ"; Text[ greek ] = "ÓöÜëìá: Ìç Ýãêõñï semicolon ( ; )"; - Text[ korean ] = "오류:ìœ íš¨í•˜ì§€ ì•Šì€ ì„¸ë¯¸ì½œë¡ "; + Text[ korean ] = "오류: ìž˜ëª»ëœ ì„¸ë¯¸ì½œë¡ "; Text[ turkish ] = "Hata: Geçersiz noktalý virgül"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error: punt i coma no vàlid"; @@ -6116,7 +6116,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "錯誤：無效的å稱"; Text[ arabic ] = "ÎØÃ: ÇÓã ÛíÑ ÕÇáÍ"; Text[ greek ] = "ÓöÜëìá: Ìç áðïäåêôü üíïìá"; - Text[ korean ] = "오류: ìœ íš¨í•˜ì§€ ì•Šì€ ì´ë¦„"; + Text[ korean ] = "오류: ìž˜ëª»ëœ ì´ë¦„"; Text[ turkish ] = "Hata: Geçersiz ad"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error: nom no vàlid"; @@ -6144,7 +6144,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "錯誤：沒有找到 Add-In"; Text[ arabic ] = "Error: AddIn not found"; Text[ greek ] = "ÓöÜëìá: Äåí âñÝèçêå ôï AddIn"; - Text[ korean ] = "오류: 플러그ì¸ì„ 찾지 못했습니다"; + Text[ korean ] = "오류: Add-inì„ ì°¾ì§€ 못했습니다"; Text[ turkish ] = "Error: AddIn not found"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error: no s'ha trobat AddIn"; @@ -6431,13 +6431,13 @@ Resource RID_GLOBSTR Text [ spanish ] = "El área de la base de datos destino no existe." ; Text [ english_us ] = "The target database range does not exist." ; Text[ chinese_simplified ] = "è¿™ä¸ªç›®æ ‡æ•°æ®åŒºåŸŸå·²ç»å˜åœ¨ã€‚"; - Text[ russian ] = "Íå ñóùåñòâóåò äèàïàçîí öåëåâîé áàçû äàííûõ."; + Text[ russian ] = "Íå ñóùåñòâóåò äèàïàçîí áàçû äàííûõ íàçíà÷åíèÿ."; Text[ polish ] = "Obszar docelowej bazy danych nie istnieje."; Text[ japanese ] = "ターゲットデータベースãŒã‚ã‚Šã¾ã›ã‚“。"; Text[ chinese_traditional ] = "這個目標資料庫å€åŸŸå·²ç¶“å˜åœ¨ã€‚"; Text[ arabic ] = "äØÇÞ ÞÇÚÏÉ ÇáÈíÇäÇÊ ÇáåÏÝ ÛíÑ ãæÌæÏ."; Text[ greek ] = "Äåí õðÜñ÷åé ðåñéï÷Þ âÜóçò äåäïìÝíùí ðñïïñéóìïý."; - Text[ korean ] = "목표 ë°ì´í„°ë² ì´ìŠ¤ ì˜ì—ì€ ì¡´ìž¬í•˜ì§€ 않습니다."; + Text[ korean ] = "ëŒ€ìƒ ë°ì´í„°ë² ì´ìŠ¤ 범위가 없습니다."; Text[ turkish ] = "Hedef veritabaný aralýðý mevcut deðil."; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea de la base de dades de destinació no existeix."; @@ -6466,7 +6466,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無效的éžå¢ž"; Text[ arabic ] = "ÒíÇÏÉ ÛíÑ ÕÇáÍÉ"; Text[ greek ] = "Ìç Ýãêõñï âÞìá"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ì¦ê°€"; + Text[ korean ] = "ìž˜ëª»ëœ ì¦ê°€"; Text[ turkish ] = "Geçersiz aþama"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'increment no és vàlid"; @@ -6544,7 +6544,7 @@ Resource RID_GLOBSTR Text [ french ] = "Vous avez indiqué un nom incorrect.\nImpossible de créer l'AutoFormat.\nChoisissez un autre nom." ; Text [ swedish ] = "Du har angett ett ogiltigt namn.\nDet gick inte att skapa autoformatet.\nVälj ett annat namn." ; Text [ dutch ] = "U gebruikte een ongeldige naam.\nDe gewenste AutoOpmaak kan niet worden uitgevoerd.\nKies een andere naam." ; - Text [ spanish ] = "Ha escrito un nombre no válido,\npor lo que no se pudo crear el AutoFormato.\nSeleccione otro nombre por favor." ; + Text [ spanish ] = "Ha indicado un nombre no válido.\nEl Formateado automático no se ha podido efectuar.\nSeleccione otro nombre." ; Text [ ENGLISH_US ] = "You have entered an invalid name.\nAutoFormat could not be created. \nTry again using a different name." ; Text[ chinese_simplified ] = "æ‚¨è¾“å…¥äº†ä¸€ä¸ªæ— æ•ˆçš„å称。\næ— æ³•å»ºç«‹è‡ªåŠ¨æ ¼å¼ã€‚\n请您输入一个有效的å称。"; Text[ russian ] = "Âû ââåëè íåäîïóñòèìîå èìÿ.\nÍåâîçìîæíî ñîçäàòü Àâòîôîðìàò.\nÂûáåðèòå äðóãîå èìÿ."; @@ -6553,7 +6553,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "您輸入了一個無效的å稱。\nç„¡æ³•å»ºç«‹è‡ªå‹•æ ¼å¼ã€‚\n請您輸入一個有效的å稱。"; Text[ arabic ] = "áÞÏ ÞãÊ ÈÅÏÎÇá ÇÓã ÛíÑ ÕÇáÍ.\nÊÚÐÑ ÅäÔÇÁ ÇáÊäÓíÞ ÇáÊáÞÇÆí.\nÇáÑÌÇÁ ÇÎÊíÇÑ ÇÓã ÂÎÑ."; Text[ greek ] = "¸÷åôå åéóÜãåé Ýíá ìç Ýãêõñï üíïìá. Ç \nÁõôïÌïñöÞ äåí Þôáí äõíáôüí íá äçìéïõñãçèåß.\nÅðéëÝîôå Üëëï üíïìá."; - Text[ korean ] = "사용ìžëŠ” ìœ íš¨í•˜ì§€ ì•Šì€ ì´ë¦„ì„ ìž…ë ¥í•˜ì…¨ìŠµë‹ˆë‹¤ .\në”°ë¼ì„œ ìžë™ ì„œì‹ì€ 만들어지지 않습니다. \n다른 ì´ë¦„ì„ ì„ íƒí•˜ì‹ì‹œì˜¤."; + Text[ korean ] = "ìž˜ëª»ëœ ì´ë¦„ì„ ìž…ë ¥í•˜ì…¨ìŠµë‹ˆë‹¤ .\\요구ë˜ëŠ” ìžë™ ì„œì‹ì„ 만들 수 없습니다. \n다른 ì´ë¦„ì„ ì„ íƒí•˜ì‹ì‹œì˜¤."; Text[ turkish ] = "Girilen ad geçersiz.\nOtomatik formatlama yapýlamadý.\nBaþka bir ad ile yeniden deneyin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Heu introduït un nom no vàlid.\nNo s'ha pogut crear el formatatge automàtic. \nTorneu-ho a intentar amb un altre nom."; @@ -6768,7 +6768,7 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Para aplicar o AutoFormato, deverá seleccionar uma\nárea da tabela de pelo menos 3 x 3 células." ; Text [ french ] = "Une plage de feuille nécessite\nau moins 3x3 cellules sélectionnées\npour appliquer l'AutoFormat." ; Text [ dutch ] = "Om AutoOpmaak te kunnen uitvoeren,\nmoet er een tabelbereik van tenminste\n3x3 cellen gemarkeerd zijn." ; - Text [ spanish ] = "Para poder aplicar el AutoFormato\nes necesario marcar un área en la tabla\nde por lo menos 3x3 celdas." ; + Text [ spanish ] = "Para poder aplicar el Formateado automático\nes necesario seleccionar un área\nde por lo menos 3x3 celdas." ; Text [ danish ] = "For at kunne anvende AutoFormat,\nskal et tabelområde på mindst\n3x3 celler være markeret." ; Text [ swedish ] = "För att du ska kunna använda autoformatet\nmåste ett tabellområde på minst\n3x3 celler vara markerat." ; Text [ finnish ] = "Jotta automaattista muotoilua voi käyttää,\non valittava vähintään 3x3 solun\nkokoinen taulukkoalue." ; @@ -6780,7 +6780,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "ç‚ºäº†ä½¿ç”¨è‡ªå‹•æ ¼å¼ï¼Œ\næ‚¨å¿…é ˆè‡³å°‘é¸å–了\n3x3 工作表å€åŸŸã€‚"; Text[ arabic ] = "áßí ÊÓÊÎÏã ÇáÊäÓíÞ ÇáÊáÞÇÆí¡\níÌÈ Ãä ÊÍÏÏ äØÇÞ Ýí ÇáÌÏæá áÇ íÞá Úä\n3x3 ÎáÇíÇ."; Text[ greek ] = "Ãéá íá åöáñìïóôåß ç ÁõôïÌïñöÞ,\nðñÝðåé íá Ý÷åé åðéëåãåß ìéá ðåñéï÷Þ åíüò ðßíáêá ìå êåëéÜ\näéáóôÜóåùí ôïõëÜ÷éóôïí 3÷3."; - Text[ korean ] = "ìžë™ ì„œì‹ì„ ì 용하기 위해서는,\n최소한\n3x3ì…€ì˜ í‘œ ì˜ì—ì´ ì„ íƒë˜ì–´ 있어야 합니다."; + Text[ korean ] = "ìžë™ ì„œì‹ì„ ì 용하기 위해서는 최소한\n3x3ì…€ì˜ í‘œ 범위가 ì„ íƒë˜ì–´ 있어야 합니다."; Text[ turkish ] = "otomatik formatlamayý kullanabilmek için\n en az 3x3 hücre büyüklüðünde bir tablo aralýðý seçilmiþ olmalýdýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Per aplicar un formatatge automàtic,\n cal seleccionar una àrea de taula de com a mínim \n3x3 cel.les."; @@ -6830,7 +6830,7 @@ Resource RID_GLOBSTR Text [ spanish ] = "(opcional)" ; Text [ english_us ] = "(optional)" ; Text[ chinese_simplified ] = "(å¯é€‰æ‹©çš„)"; - Text[ russian ] = "(âûáîðî÷íûé)"; + Text[ russian ] = "(íåîáÿçàòåëüíûé)"; Text[ polish ] = "(opcjonalny)"; Text[ japanese ] = "(オプション)"; Text[ chinese_traditional ] = "(å¯é¸æ“‡çš„)"; @@ -6858,7 +6858,7 @@ Resource RID_GLOBSTR Text [ spanish ] = "(necesario)" ; Text [ english_us ] = "(required)" ; Text[ chinese_simplified ] = "(需è¦è¾“å…¥)"; - Text[ russian ] = "(íåîáõîäèìûé)"; + Text[ russian ] = "(îáÿçàòåëüíûé)"; Text[ polish ] = "(wymagany,-a, -e)"; Text[ japanese ] = "(å¿…é ˆ)"; Text[ chinese_traditional ] = "(需è¦è¼¸å…¥)"; @@ -6893,7 +6893,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無效"; Text[ arabic ] = "ÛíÑ ÕÇáÍ"; Text[ greek ] = "ìç Ýãêõñï"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•ŠìŒ"; + Text[ korean ] = "잘못ë¨"; Text[ turkish ] = "geçersiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "no vàlid"; @@ -6962,7 +6962,7 @@ Resource RID_GLOBSTR Text [ ENGLISH ] = "Are you sure you want to delete the selected sheets?" ; Text [ english_us ] = "Are you sure you want to permanently delete the current sheet(s)?" ; Text [ italian ] = "Si vuole eliminare definitivamente la tabella?" ; - Text [ spanish ] = "¿Desea eliminar las hojas seleccionadas?" ; + Text [ spanish ] = "¿Desea borrar las hojas seleccionadas?" ; Text [ french ] = "Voulez-vous supprimer les feuilles sélectionnées ?" ; Text [ dutch ] = "Wilt u het huidige werkblad werkelijk wissen?" ; Text [ swedish ] = "Vill du radera de markerade tabellerna?" ; @@ -6993,7 +6993,7 @@ Resource RID_GLOBSTR Text [ swedish ] = "Vill du radera det markerade scenariot?" ; Text [ danish ] = "Vil du slette det markerede scenario?" ; Text [ italian ] = "Cancellare lo scenario scelto?" ; - Text [ spanish ] = "¿Está seguro de querer eliminar el escenario seleccionado?" ; + Text [ spanish ] = "¿Está seguro de querer borrar el escenario seleccionado?" ; Text [ french ] = "Voulez-vous supprimer le scénario sélectionné ?" ; Text [ dutch ] = "Wilt u het geselecteerde scenario verwijderen?" ; Text[ chinese_simplified ] = "您真的è¦åˆ 除这个选ä¸çš„方案å—？"; @@ -7191,7 +7191,7 @@ Resource RID_GLOBSTR Text[ polish ] = "Eksport DBase"; Text[ portuguese_brazilian ] = "DBase export"; Text[ japanese ] = "DBase ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ"; - Text[ korean ] = "DBase 보내기"; + Text[ korean ] = "DBase 내보내기"; Text[ chinese_simplified ] = "DBase 输出"; Text[ chinese_traditional ] = "DBase 匯出"; Text[ arabic ] = "ÊÕÏíÑDBase "; @@ -7220,7 +7220,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "儲å˜æˆ DIF æ ¼å¼"; Text[ arabic ] = "ÊÕÏíÑ Dif"; Text[ greek ] = "ÅîáãùãÞ Dif"; - Text[ korean ] = "Dif 내보내기"; + Text[ korean ] = "Dif 내보내기"; Text[ turkish ] = "Dýþa aktar (Dif)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Exportació DIF"; @@ -7274,7 +7274,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "標準"; Text[ arabic ] = "ÇÝÊÑÇÖí"; Text[ greek ] = "ÐñïåðéëïãÞ"; - Text[ korean ] = "표준"; + Text[ korean ] = "기본값"; Text[ turkish ] = "Standart"; Text[ language_user1 ] = " "; Text[ catalan ] = "Per defecte"; @@ -7358,7 +7358,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "標題"; Text[ arabic ] = "ÇáÚäæÇä"; Text[ greek ] = "Åðéêåöáëßäá"; - Text[ korean ] = "글머리"; + Text[ korean ] = "ì œëª©"; Text[ turkish ] = "Baþlýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Encapçalament"; @@ -7386,7 +7386,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "標題 1"; Text[ arabic ] = "ÇáÚäæÇä 1"; Text[ greek ] = "Åðéêåöáëßäá1"; - Text[ korean ] = "글머리1"; + Text[ korean ] = "ì œëª©1"; Text[ turkish ] = "Baþlýk1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Encapçalament1"; @@ -7607,7 +7607,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "沒有è¨å®šä»»ä½•èªžè¨€"; Text[ arabic ] = "áã íÊã ÊÚííä ÇááÛÉ"; Text[ greek ] = "Äåí ïñßóôçêå ãëþóóá"; - Text[ korean ] = "언어 ì§‘í•©ì´ ì—†ìŠµë‹ˆë‹¤."; + Text[ korean ] = "언어를 ì„¤ì •í•˜ì§€ 않았습니다."; Text[ turkish ] = "Dil seçilmedi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sense conjunt d'idiomes"; @@ -7650,7 +7650,7 @@ Resource RID_GLOBSTR Text [ dutch ] = "Werkblad wissen" ; Text [ english_us ] = "Delete Sheets" ; Text [ italian ] = "Elimina tabelle" ; - Text [ spanish ] = "Eliminar hoja" ; + Text [ spanish ] = "Borrar hojas" ; Text [ french ] = "Supprimer des feuilles" ; Text [ swedish ] = "Radera tabeller" ; Text [ danish ] = "Slet ark" ; @@ -7677,7 +7677,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Rename Sheet" ; Text [ italian ] = "Rinomina tabella" ; Text [ spanish ] = "Cambiar nombre a la hoja" ; - Text [ french ] = "Renommer feuille" ; + Text [ french ] = "Renommer la feuille" ; Text [ dutch ] = "Werkbladnaam wijzigen" ; Text [ swedish ] = "Byt namn på tabell" ; Text [ danish ] = "Omdøb ark" ; @@ -7705,7 +7705,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Move Sheets" ; Text [ italian ] = "Sposta tabella" ; Text [ spanish ] = "Desplazar hojas" ; - Text [ french ] = "Déplacer feuilles" ; + Text [ french ] = "Déplacer les feuilles" ; Text [ swedish ] = "Flytta tabeller" ; Text [ danish ] = "Flyt ark" ; Text [ portuguese ] = "Mover folhas" ; @@ -7759,7 +7759,7 @@ Resource RID_GLOBSTR Text [ dutch ] = "Werkblad toevoegen" ; Text [ english_us ] = "Append sheet" ; Text [ italian ] = "Allega tabella" ; - Text [ spanish ] = "Añadir hoja" ; + Text [ spanish ] = "Adjuntar hoja" ; Text [ french ] = "Annexer la feuille" ; Text [ swedish ] = "Tillfoga tabell" ; Text [ danish ] = "Vedhæft ark" ; @@ -7786,7 +7786,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Show Sheet" ; Text [ italian ] = "Mostra tabella" ; Text [ spanish ] = "Mostrar hoja" ; - Text [ french ] = "Afficher feuille" ; + Text [ french ] = "Afficher la feuille" ; Text [ dutch ] = "Werkblad weergeven" ; Text [ swedish ] = "Visa tabell" ; Text [ danish ] = "Vis ark" ; @@ -7989,7 +7989,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "新的工作表å«æœ‰çµ•å°çš„指å‘其它工作表的åƒç…§ï¼Œé€™äº›å…¶å®ƒçš„工作表å¯èƒ½æœ‰éŒ¯èª¤ï¼"; Text[ arabic ] = "íÍÊæí ÇáÌÏæá ÇáÌÏíÏ Úáì ÅÔÇÑÇÊ ãØáÞÉ Åáì ÌÏÇæá ÃÎÑì ÞÏ Êßæä ÛíÑ ÕÍíÍÉ!"; Text[ greek ] = "Ï íÝïò ðßíáêáò ðåñéÝ÷åé áðüëõôåò áíáöïñÝò ãéá Üëëïõò ðßíáêåò , ïé ïðïßåò äåí åßíáé ïðùóäÞðïôå Ýãêõñåò!"; - Text[ korean ] = "새로운 시트는 다른 ì‹œíŠ¸ì— ëŒ€í•´ ë” ì´ìƒ ì¼ì¹˜í•˜ì§€ ì•Šì•„ë„ ë˜ëŠ” ì ˆëŒ€ 참조를 í¬í•¨í•˜ê³ 있습니다!"; + Text[ korean ] = "새 표는 옳지 ì•Šì„ ìˆ˜ 있는 다른 í‘œì— ëŒ€í•´ ì ˆëŒ€ì 참조를 수ë¡í•˜ê³ 있습니다."; Text[ turkish ] = "Yeni tabloda bulunan diðer tablolar ile ilgili mutlak referanslar doðru olmayabilir!"; Text[ language_user1 ] = " "; Text[ catalan ] = "La taula nova conté referències absolutes a altres taules que poden ser incorrectes."; @@ -8011,13 +8011,13 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Devido a nomes idênticos foi modificado o nome de uma área no documento de destino!" ; Text [ portuguese_brazilian ] = "Wegen einer Namensgleichheit wurde im Zieldokument ein bestehender Bereichsname ver?ndert!" ; Text[ chinese_simplified ] = "å› ä¸ºå称相åŒï¼Œç›®æ ‡æ–‡æ¡£å†…的区域å称已ç»è¢«æ›´æ”¹ï¼"; - Text[ russian ] = "Èç-çà èäåíòè÷íîñòè èìåí èçìåíåíî ñóùåñòâóþùåå èìÿ îáëàñòè öåëåâîãî äîêóìåíòà!"; + Text[ russian ] = "Èç-çà èäåíòè÷íîñòè èìåí èçìåíåíî íàçâàíèå äèàïàçîíà â äîêóìåíòå íàçíà÷åíèÿ!"; Text[ polish ] = "Ze wzglêdu na identyczne nazwy zosta³a zmieniona nazwa obszaru w dokumencie docelowym!"; Text[ japanese ] = "åå‰ãŒåŒä¸€ã§ã‚ã£ãŸãŸã‚ã€ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æ—¢å˜ã™ã‚‹ç¯„囲åãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸã€‚"; Text[ chinese_traditional ] = "å› ç‚ºå稱相åŒï¼Œç›®æ¨™æ–‡ä»¶å…§çš„å€åŸŸå稱已經被變更ï¼"; Text[ arabic ] = "äÙÑÇð áÊÔÇÈå ÇáÃÓãÇÁ¡ Êã ÊÛííÑ ÇÓã äØÇÞ ãæÌæÏ ãÓÈÞÇð Ýí ÇáãÓÊäÏ ÇáåÏÝ!"; Text[ greek ] = "Ëüãù ôçò ôáýôéóçò ïíüìáôïò Ýãéíå ôñïðïðïßçóç õðÜñ÷ïíôïò ïíüìáôïò ðåñéï÷Þò óôï Ýããñáöï ðñïïñéóìïý!"; - Text[ korean ] = "ê°™ì€ ì´ë¦„으로 ì¸í•´ ëŒ€ìƒ ë¬¸ì„œì˜ ê¸°ì¡´ ì˜ì— ì´ë¦„ì´ ë³€ê²½ë˜ì—ˆìŠµë‹ˆë‹¤!"; + Text[ korean ] = "ì´ë¦„ì´ ê°™ì€ ì´ìœ ë¡œ ëŒ€ìƒ ë¬¸ì„œì˜ ê¸°ì¡´ 범위 ì´ë¦„ì´ ë°”ë€Œì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Ad eþleþmesi nedeniyle hedef belgede mevcut bir aralýk adý deðiþtirildi!"; Text[ language_user1 ] = " "; Text[ catalan ] = "Com que hi havia noms idèntics, s'ha modificat un nom d'àrea existent al document de destinació."; @@ -8032,7 +8032,7 @@ Resource RID_GLOBSTR Text [ dutch ] = "AutoFilter niet mogelijk" ; Text [ english_us ] = "AutoFilter not possible" ; Text [ italian ] = "Filtro automatico non possibile" ; - Text [ spanish ] = "El AutoFiltro no es posible" ; + Text [ spanish ] = "Filtro automático imposible" ; Text [ french ] = "AutoFiltre impossible" ; Text [ swedish ] = "AutoFilter omöjligt" ; Text [ danish ] = "AutoFilter ikke mulig" ; @@ -8128,7 +8128,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "æœå°‹å’Œä»£æ›¿"; Text[ arabic ] = "ÇáÈÍË æÇáÇÓÊÈÏÇá"; Text[ greek ] = "ÁíáæÞôçóç êáé ÁíôéêáôÜóôáóç"; - Text[ korean ] = "찾기 & 바꾸기"; + Text[ korean ] = "찾기 ë° ë°”ê¾¸ê¸°"; Text[ turkish ] = "Ara ve deðiþtir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cerca i reemplaça"; @@ -8155,7 +8155,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "%PRODUCTNAME Calc 已經æœå°‹åˆ°æ–‡ä»¶çš„起始ä½ç½®ã€‚è¦ç¹¼çºŒåœ¨æ–‡ä»¶çš„çµæŸä½ç½®æœå°‹ï¼Ÿ"; Text[ arabic ] = "ÈÍË %PRODUCTNAME Calc ÍÊì ÈÏÇíÉ ÇáãÓÊäÏ. åá ÊÑíÏ ãÊÇÈÚÉ ÇáÈÍË ÚäÏ äåÇíÉ ÇáãÓÊäÏ¿"; Text[ greek ] = "Ôï %PRODUCTNAME Calc ïëïêëÞñùóå ôçí áíáæÞôçóç ùò ôçí áñ÷Þ ôïõ åããñÜöïõ. ÈÝëåôå íá óõíå÷éóôåß ç áíáæÞôçóç áðü ôï ôÝëïò ôïõ åããñÜöïõ;"; - Text[ korean ] = "%PRODUCTNAME Calc는 ë¬¸ì„œì˜ ì‹œìž‘ë¶€ë¶„ì„ ê²€ìƒ‰í–ˆìŠµë‹ˆë‹¤. 마지막까지 ê³„ì† í•˜ê² ìŠµë‹ˆê¹Œ?"; + Text[ korean ] = "%PRODUCTNAME Calc는 ë¬¸ì„œì˜ ì‹œìž‘ì„ ê²€ìƒ‰í–ˆìŠµë‹ˆë‹¤. ë¬¸ì„œì˜ ëì—ì„œ ê²€ìƒ‰ì„ ê³„ì†í•˜ì‹œê² 습니까?"; Text[ turkish ] = "%PRODUCTNAME Calc belgenin baþýna kadar aradý. Aramaya belge sonunda devam etmek istiyor musunuz?"; Text[ language_user1 ] = " "; Text[ catalan ] = "%PRODUCTNAME Calc ha buscat fins al principi del document. Voleu continuar la cerca fins al final del document?"; @@ -8209,7 +8209,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "代替ç¾å˜çš„定義 # ？"; Text[ arabic ] = "åá ÊÑíÏ ÇÓÊÈÏÇá ÊÚÑíÝ # ÇáãæÌæÏ¿"; Text[ greek ] = "ÁíôéêáôÜóôáóç õðÜñ÷ïí ïñéóìïý ãéá #;"; - Text[ korean ] = "#ì˜ ê¸°ì¡´ ì •ì˜ë¥¼ ë°”ê¾¸ê² ìŠµë‹ˆê¹Œ?"; + Text[ korean ] = "#ì˜ ê¸°ì¡´ ì •ì˜ë¥¼ ë°”ê¾¸ì‹œê² ìŠµë‹ˆê¹Œ?"; Text[ turkish ] = "Mevcut # tanýmý deðiþtirilsin mi?"; Text[ language_user1 ] = " "; Text[ catalan ] = "Voleu reemplaçar la definició existent de #?"; @@ -8237,7 +8237,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å€åŸŸå稱的錯誤é¸æ“‡"; Text[ arabic ] = "ÊÍÏíÏ ÛíÑ ÕÇáÍ áÃÓãÇÁ äØÇÞ."; Text[ greek ] = "ËÜèïò åðéëïãÞ ãéá ïíüìáôá ðåñéï÷þí"; - Text[ korean ] = "범위 ì´ë¦„ì— ëŒ€í•œ ìž˜ëª»ëœ ì„ íƒ í‘œì‹œ"; + Text[ korean ] = "범위 ì´ë¦„ì˜ ìž˜ëª»ëœ ì„ íƒ"; Text[ turkish ] = "Aralýk adlarý için geçersiz seçim"; Text[ language_user1 ] = " "; Text[ catalan ] = "La selecció per a noms d'àrea no és vàlida"; @@ -8265,7 +8265,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無法在æºè³‡æ–™ä¹‹ä¸ŠåŠ å…¥æ·å¾‘。"; Text[ arabic ] = "áÇ íãßä ÅÏÑÇÌ ÇáÇÊÕÇáÇÊ ÝæÞ ÈíÇäÇÊ ÇáãÕÏÑ."; Text[ greek ] = "Äåí åßíáé äõíáôüí íá åéóá÷èïýí óõíäÝóåéò ðÜíù áðü ôá äåäïìÝíá ðñïÝëåõóçò."; - Text[ korean ] = "ë§í¬ë¥¼ 소스 ë°ì´í„° 위로 ì‚½ìž…í• ìˆ˜ 없습니다."; + Text[ korean ] = "참조를 ì›ë³¸ ë°ì´í„° 위로 ì‚½ìž…í• ìˆ˜ 없습니다."; Text[ turkish ] = "Referanslar, kaynak verilerinin üstünde eklenemez."; Text[ language_user1 ] = " "; Text[ catalan ] = "No es poden inserir referències sobre les dades font."; @@ -8307,7 +8307,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Do you really want to delete the entry #?" ; Text [ dutch ] = "Wilt u het item # werkelijk wissen?" ; Text [ italian ] = "Si vuole veramente eliminare la voce #?" ; - Text [ spanish ] = "¿Desea realmente eliminar la entrada #?" ; + Text [ spanish ] = "¿Desea realmente borrar la entrada #?" ; Text [ french ] = "Voulez-vous vraiment supprimer l'entrée # ?" ; Text [ swedish ] = "Vill du verkligen radera #?" ; Text [ danish ] = "Er du sikker på at du vil slette element #?" ; @@ -8347,7 +8347,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "物件/圖形"; Text[ arabic ] = "ßÇÆäÇÊ/ÕæÑ"; Text[ greek ] = "Áíôéêåßìåíá/ÃñáöéêÜ"; - Text[ korean ] = "개체/그래픽"; + Text[ korean ] = "개체/그림"; Text[ turkish ] = "Nesne/Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Objectes/gràfics"; @@ -8497,7 +8497,7 @@ Resource RID_GLOBSTR Text [ dutch ] = "Van boven naar beneden" ; Text [ italian ] = "Da sopra a sotto" ; Text [ spanish ] = "De arriba hacia abajo" ; - Text [ french ] = "Du haut en bas" ; + Text [ french ] = "De haut en bas" ; Text [ swedish ] = "Uppifrån ned" ; Text [ danish ] = "Fra øverst til nederst" ; Text [ portuguese ] = "De cima para baixo" ; @@ -8590,7 +8590,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "å·¥ä½œè¡¨ç¶²æ ¼"; Text[ arabic ] = "ÔÈßÉ ÌÏæá"; Text[ greek ] = "ÐëÝãìá ðßíáêá"; - Text[ korean ] = "ëˆˆê¸ˆì„ "; + Text[ korean ] = "í‘œì˜ ëˆˆê¸ˆì„ "; Text[ turkish ] = "Kýlavuz çizgiler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Graella"; @@ -8618,7 +8618,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "欄標題和列標題"; Text[ arabic ] = "ÑÄæÓ ÇáÃÓØÑ æÇáÃÚãÏÉ"; Text[ greek ] = "Åðéêåöáëßäåò ãñáììþí êáé óôçëþí"; - Text[ korean ] = "í–‰ & ì—´ 머리글"; + Text[ korean ] = "ì—´ 머리글/í–‰ 머리글"; Text[ turkish ] = "Satýr ve sütun baþlýklarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Capçaleres de la fila i de la columna"; @@ -8751,7 +8751,7 @@ Resource RID_GLOBSTR Text[ polish ] = "Wszystko na [%] "; Text[ japanese ] = "ã™ã¹ã¦ [%]"; Text[ greek ] = "¼ëá óå [%]"; - Text[ korean ] = "ì „ì²´ë¥¼ [%]ë¡œ"; + Text[ korean ] = "모ë‘를 [%]ë¡œ"; Text[ chinese_traditional ] = "全部採用[%]"; Text[ arabic ] = "Çáßá Åáì [%]"; Text[ turkish ] = "Tümünü [%]"; @@ -8796,7 +8796,7 @@ Resource RID_GLOBSTR TEXT [ portuguese ] = "Estatística" ; TEXT [ finnish ] = "Tilastotiedot" ; TEXT [ danish ] = "Statistik" ; - TEXT [ french ] = "Statistique" ; + TEXT [ french ] = "Statistiques" ; TEXT [ swedish ] = "Statistik" ; TEXT [ dutch ] = "Statistiek" ; TEXT [ spanish ] = "Estadística" ; @@ -8917,7 +8917,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "摘è¦"; Text[ arabic ] = "ÇáÊáÎíÕ"; Text[ greek ] = "Óýíïøç"; - Text[ korean ] = "미리보기"; + Text[ korean ] = "개요"; Text[ turkish ] = "Genel bakýþ"; Text[ language_user1 ] = " "; Text[ catalan ] = "Visió general"; @@ -8931,7 +8931,7 @@ Resource RID_GLOBSTR Text [ ENGLISH_US ] = "Doc.Information" ; Text [ dutch ] = "Documentinfo" ; Text [ italian ] = "Info documento" ; - Text [ spanish ] = "Info documento" ; + Text [ spanish ] = "Información documento" ; Text [ french ] = "Info document" ; Text [ swedish ] = "Dokumentinformation" ; Text [ danish ] = "Dokumentinfo" ; @@ -8999,7 +8999,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "已經修改"; Text[ arabic ] = "ãÚÏá"; Text[ greek ] = "Ôñïðïðïßçóç"; - Text[ korean ] = "ìˆ˜ì •ë¨"; + Text[ korean ] = "변경ë¨"; Text[ turkish ] = "Deðiþtirilen"; Text[ language_user1 ] = " "; Text[ catalan ] = "Modificat"; @@ -9039,7 +9039,7 @@ Resource RID_GLOBSTR Text [ ENGLISH ] = "Theme" ; Text [ ENGLISH_US ] = "Subject" ; Text [ italian ] = "Argomento" ; - Text [ spanish ] = "Tema" ; + Text [ spanish ] = "Asunto" ; Text [ french ] = "Sujet" ; Text [ dutch ] = "Onderwerp" ; Text [ swedish ] = "Tema" ; @@ -9081,7 +9081,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "é—œéµå—"; Text[ arabic ] = "ÇáßáãÇÊ ÇáÃÓÇÓíÉ"; Text[ greek ] = "ËÝîåéò êëåéäéÜ"; - Text[ korean ] = "키 워드"; + Text[ korean ] = "키워드"; Text[ turkish ] = "Anahtar sözcükler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Paraules clau"; @@ -9108,7 +9108,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "評語"; Text[ arabic ] = "ãáÇÍÙÇÊ"; Text[ greek ] = "ÐáñáôçñÞóåéò"; - Text[ korean ] = "주"; + Text[ korean ] = "설명"; Text[ turkish ] = "Açýklamalar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Comentaris"; @@ -9135,7 +9135,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "ç”±"; Text[ arabic ] = "ÈæÇÓØÉ"; Text[ greek ] = "áðü"; - Text[ korean ] = "ë¡œ"; + Text[ korean ] = "작성ìž"; Text[ turkish ] = "Yazdýran"; Text[ language_user1 ] = " "; Text[ catalan ] = "per"; @@ -9191,7 +9191,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "這個檔案å«æœ‰æŒ‡å‘其他檔案的æ·å¾‘。\nè¦æ›´æ–°é€™å€‹æª”案？"; Text[ arabic ] = "íÍÊæí åÐÇ ÇáãáÝ Úáì ÇÑÊÈÇØÇÊ ãÚ ãáÝÇÊ ÃÎÑì.\nåá ÊÑíÏ ÊÍÏíËåÇ¿"; Text[ greek ] = "Ôï áñ÷åßï áõôü ðåñéÝ÷åé óõíäÝóåéò ðñïò Üëëá áñ÷åßá.\nÈÝëåôå íá ãßíåé åíçìÝñùóç áõôþí;"; - Text[ korean ] = "ì´ íŒŒì¼ì€ 다른 파ì¼ê³¼ ì—°ê²°ë˜ì–´ 있습니다.\nì´ íŒŒì¼ì„ ì—…ë°ì´íŠ¸í•˜ê² 습니까?"; + Text[ korean ] = "ì´ íŒŒì¼ì€ 다른 파ì¼ê³¼ ì—°ê²°ë˜ì–´ 있습니다.\nì´ íŒŒì¼ì„ ì—…ë°ì´íŠ¸í•˜ì‹œê² 습니까?"; Text[ turkish ] = "Bu dosyada baþka dosyalara baðlantýlar mevcut.\nBaðlantýlar güncellensin mi?"; Text[ language_user1 ] = " "; Text[ catalan ] = "Aquest fitxer conté enllaços a altres fitxers.\nVoleu actualitzar-los?"; @@ -9219,7 +9219,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "這個檔案å«æœ‰ä¸€äº›æŸ¥è©¢ï¼Œå®ƒå€‘çš„çµæžœç„¡æ³•è¢«å„²å˜ã€‚\nè¦é‡è¤‡åŸ·è¡Œé€™å€‹æŸ¥è©¢ï¼Ÿ"; Text[ arabic ] = "íÍÊæí åÐÇ ÇáãáÝ Úáì ÇÓÊÝÓÇÑÇÊ áã íÊã ÍÝÙ äÊÇÆÌåÇ.\nåá ÊÑíÏ ÊßÑÇÑ åÐå ÇáÇÓÊÝÓÇÑÇÊ¿"; Text[ greek ] = "Ôï áñ÷åßï áõôü ðåñéÝ÷åé åñùôÞìáôá, ôá áðïôåëÝóìáôá ôùí ïðïßùí äåí áðïèçêåýôçêáí.\nÈÝëåôå íá åðáíáëçöèïýí ôá åñùôÞìáôá áõôÜ;"; - Text[ korean ] = "ì´ íŒŒì¼ì—는 질ì˜ê°€ í¬í•¨ë˜ì–´ 있습니다. ì´ ì§ˆì˜ ì´ ê²°ê³¼ë“¤ì€ ì €ìž¥ë˜ì§€ 않았습니다 .\nì´ ì§ˆì˜ë¥¼ 반복 í•˜ê² ìŠµë‹ˆê¹Œ?"; + Text[ korean ] = "ì´ íŒŒì¼ì—는 쿼리가 í¬í•¨ë˜ì–´ 있습니다. ì´ ì¿¼ë¦¬ì˜ ê²°ê³¼ê°€ ì €ìž¥ë˜ì§€ 않았습니다.\nì´ ì¿¼ë¦¬ë¥¼ ë°˜ë³µí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"; Text[ turkish ] = "Bu dosya, sonuçlarý kaydedilmeyen sorgular içeriyor.\nBU sorgular yinelensin mi?"; Text[ language_user1 ] = " "; Text[ catalan ] = "Aquest fitxer conté consultes. Els resultats d'aquestes consultes no s'han desat.\nVoleu repetir-les?"; @@ -9302,7 +9302,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無法輸入這個工作表。"; Text[ arabic ] = "ÊÚÐÑ ÅÏÑÇÌ ÇáÌÏæá."; Text[ greek ] = "Äåí Þôáí äõíáôüí íá ãßíåé åéóáãùãÞ ôïõ ðßíáêá."; - Text[ korean ] = "시트를 삽입하지 못했습니다."; + Text[ korean ] = "표를 삽입하지 못했습니다."; Text[ turkish ] = "Tablo eklenemedi."; Text[ language_user1 ] = " "; Text[ catalan ] = "No s'ha pogut inserir la taula."; @@ -9319,7 +9319,7 @@ Resource RID_GLOBSTR Text [ swedish ] = "Tabellerna kunde inte raderas." ; Text [ danish ] = "Det var ikke muligt at slette arkene." ; Text [ italian ] = "Impossibile cancellare le tabelle." ; - Text [ spanish ] = "No se pudieron eliminar las hojas de cálculo" ; + Text [ spanish ] = "No se pudieron borrar las hojas de cálculo." ; Text [ french ] = "Impossible de supprimer les feuilles de calcul" ; Text [ dutch ] = "De werkbladen kunnen niet worden gewist." ; Text[ chinese_simplified ] = "æ— æ³•åˆ é™¤è¿™ä¸ªå·¥ä½œè¡¨ã€‚"; @@ -9385,7 +9385,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "空間ä¸å¤ ，無法æ’入。"; Text[ arabic ] = "áÇ ÊßÝí ÇáæÑÞÉ áÚãáíÉ ÇáÅÏÑÇÌ."; Text[ greek ] = "Äåí õðÜñ÷åé áñêåôüò ÷þñïò óôï öýëëï ãéá íá ãßíåé åéóáãùãÞ."; - Text[ korean ] = "ì‹œíŠ¸ì— ì‚½ìž…ë ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤. ."; + Text[ korean ] = "ì‹œíŠ¸ì— ì‚½ìž…í• ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤."; Text[ turkish ] = "Sayfada ekleme için yeterli alan yok."; Text[ language_user1 ] = " "; Text[ catalan ] = "No hi ha prou espai al full per inserir aquí."; @@ -9412,7 +9412,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "剪貼簿的內容大於é¸å–çš„å€åŸŸã€‚\n您還是è¦æ’入？"; Text[ arabic ] = "ãÍÊæíÇÊ ÇáÍÇÝÙÉ ÊÝæÞ ÇáäØÇÞ¡ ÇáÐí ÞãÊ ÈÇÎÊíÇÑå¡ ÍÌãÇð.\nåá ÊÑíÏ ÇáÅÏÑÇÌ ÈÇáÑÛã ãä Ðáß¿"; Text[ greek ] = "Ôï ðåñéå÷üìåíï ôïõ ðñü÷åéñïõ åßíáé ìåãáëýôåñï áðü ôçí åðéëåãìÝíç ðåñéï÷Þ.\nÈÝëåôå ðáñ' üëá áõôÜ íá ãßíåé ç åéóáãùãÞ;"; - Text[ korean ] = "í´ë¦½ë³´ë“œì˜ ë‚´ìš©ì´ ì„ íƒëœ ì˜ì—ì˜ ë‚´ìš©ë³´ë‹¤ í¬ê¸°ê°€ ë” í½ë‹ˆë‹¤.\nê·¸ëž˜ë„ ì‚½ìž…í•˜ê² ìŠµë‹ˆê¹Œ?"; + Text[ korean ] = "í´ë¦½ë³´ë“œì˜ ë‚´ìš©ì´ ì„ íƒëœ ë²”ìœ„ì˜ ë‚´ìš©ë³´ë‹¤ ë” í½ë‹ˆë‹¤.\nê·¸ëž˜ë„ ì‚½ìž…í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"; Text[ turkish ] = "Pano içeriði, seçilen alandan daha büyük.\nYine de eklemek istiyor musunuz?"; Text[ language_user1 ] = " "; Text[ catalan ] = "El contingut del porta-retalls és més gran que l'àrea seleccionada.\nEl voleu inserir igualment?"; @@ -9461,13 +9461,13 @@ Resource RID_GLOBSTR Text [ portuguese ] = "Fonte e destino não se devem sobrepor." ; Text [ portuguese_brazilian ] = "Quell- und Zielbereich d?fen sich nicht ?erlappen." ; Text[ chinese_simplified ] = "æºåŒºåŸŸå’Œç›®æ ‡åŒºåŸŸä¸å¯ä»¥ç›¸äº’é‡å 。"; - Text[ russian ] = "Èñõîäíàÿ è öåëåâàÿ îáëàñòè íå äîëæíû ïåðåñåêàòüñÿ."; + Text[ russian ] = "Èñõîäíàÿ îáëàñòü è îáëàñòü íàçíà÷åíèÿ íå äîëæíû ïåðåñåêàòüñÿ."; Text[ polish ] = "Obszar Ÿród³owy i docelowy nie mog¹ zachodziæ na siebie."; Text[ japanese ] = "ソース範囲ã¨ã‚¿ãƒ¼ã‚²ãƒƒãƒˆç¯„囲をé‡ãã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"; Text[ chinese_traditional ] = "æºå€åŸŸå’Œç›®æ¨™å€åŸŸä¸å¯ä»¥ç›¸äº’é‡ç–Šã€‚"; Text[ arabic ] = "íÌÈ ÃáÇ íÊÏÇÎá ÇáäØÇÞ ÇáãÕÏÑ æÇáäØÇÞ ÇáåÏÝ."; Text[ greek ] = "Ïé ðåñéï÷Ýò ðñïÝëåõóçò êáé ðñïïñéóìïý äåí åðéôñÝðåôáé íá åðéêáëýðôïðíôáé."; - Text[ korean ] = "소스 ì˜ì—ê³¼ ëŒ€ìƒ ì˜ì—ì´ ê²¹ì³ì ¸ì„œëŠ” 안ë©ë‹ˆë‹¤."; + Text[ korean ] = "ì›ë³¸ê³¼ 대ìƒì´ ê²¹ì³ì ¸ì„œëŠ” 안ë©ë‹ˆë‹¤."; Text[ turkish ] = "Kaynak ve hedef aralýðý örtüþmemelidir."; Text[ language_user1 ] = " "; Text[ catalan ] = "No es poden superposar la font i la destinació."; @@ -9494,7 +9494,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = "ÕæÑÉ"; Text[ greek ] = "Ãñáöéêü"; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Gràfics"; @@ -9522,7 +9522,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無效的å稱。"; Text[ arabic ] = "ÇÓã ÛíÑ ÕÇáÍ."; Text[ greek ] = "¢êõñï üíïìá."; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ì´ë¦„."; + Text[ korean ] = "ìž˜ëª»ëœ ì´ë¦„."; Text[ turkish ] = "Geçersiz ad."; Text[ language_user1 ] = " "; Text[ catalan ] = "El nom no és vàlid."; @@ -9565,7 +9565,7 @@ Resource RID_GLOBSTR Text [ english_us ] = "Invalid value." ; Text [ italian ] = "Il valore digitato non è valido." ; Text [ spanish ] = "Valor no válido." ; - Text [ french ] = "Donnée entrée incorrecte." ; + Text [ french ] = "Valeur incorrecte" ; Text [ swedish ] = "Det inmatade värdet är ogilitigt." ; Text [ danish ] = "Den indtastede værdi er ugyldig." ; Text [ portuguese ] = "O valor é incorrecto." ; @@ -9577,7 +9577,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "這個輸入的數值無效。"; Text[ arabic ] = "ÇáÞíãÉ ÇáãÏÎáÉ ÛíÑ ÕÇáÍÉ."; Text[ greek ] = "Ìç Ýãêõñç ôéìÞ."; - Text[ korean ] = "ìž…ë ¥ëœ ê°’ì€ ìœ íš¨í•˜ì§€ ì•ŠìŒ."; + Text[ korean ] = "ìž…ë ¥ëœ ê°’ì€ ìž˜ëª»ë¨."; Text[ turkish ] = "Girilen deðer geçerli deðil."; Text[ language_user1 ] = " "; Text[ catalan ] = "El valor no és vàlid."; @@ -9650,7 +9650,7 @@ Resource RID_GLOBSTR Text [ danish ] = "Tilpas rækkehøjde" ; Text [ italian ] = "Adatta altezza riga" ; Text [ spanish ] = "Ajustar altura de filas" ; - Text [ french ] = "Adapter haut.de lignes" ; + Text [ french ] = "Adapter la hauteur des lignes" ; Text [ dutch ] = "Rijhoogte aanpassen" ; Text[ chinese_simplified ] = "调整行高"; Text[ russian ] = "Ïîäáîð âûñîòû ñòðîêè"; @@ -9732,7 +9732,7 @@ Resource RID_GLOBSTR Text [ swedish ] = "Radera innehåll" ; Text [ danish ] = "Slet indhold" ; Text [ italian ] = "Elimina contenuti" ; - Text [ spanish ] = "Eliminar contenidos" ; + Text [ spanish ] = "Borrar contenido" ; Text [ french ] = "Supprimer du contenu" ; Text [ dutch ] = "Inhoud wissen" ; Text[ chinese_simplified ] = "åˆ é™¤å†…å®¹"; @@ -9742,7 +9742,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "刪除內容"; Text[ arabic ] = "ÍÐÝ ãÍÊæíÇÊ"; Text[ greek ] = "ÄéáãñáöÞ ðåñéå÷ïìÝíùí"; - Text[ korean ] = "ë‚´ìš© 지우기"; + Text[ korean ] = "ë‚´ìš© ì‚ì œ"; Text[ turkish ] = "Ýçerikleri sil"; Text[ language_user1 ] = " "; Text[ catalan ] = "Suprimeix el contingut"; @@ -9796,7 +9796,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "其他..."; Text[ arabic ] = "ÇáãÒíÏ..."; Text[ greek ] = "¢ëëá..."; - Text[ korean ] = "ìžì„¸ížˆ..."; + Text[ korean ] = "기타..."; Text[ turkish ] = "Diðer..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Més..."; @@ -9824,7 +9824,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "無效的å€åŸŸ"; Text[ arabic ] = "äØÇÞ ÛíÑ ÕÇáÍ"; Text[ greek ] = "Ìç Ýãêõñç ðåñéï÷Þ"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ì˜ì—"; + Text[ korean ] = "ìž˜ëª»ëœ ë²”ìœ„"; Text[ turkish ] = "Geçersiz aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea no és vàlida"; @@ -10041,7 +10041,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "排åº"; Text[ arabic ] = "ÇáÝÑÒ"; Text[ greek ] = "Ôáîéíüìçóç"; - Text[ korean ] = "ì •ì—´"; + Text[ korean ] = "ì •ë ¬"; Text[ turkish ] = "Sýralama"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ordena"; @@ -10258,7 +10258,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "<空缺>"; Text[ arabic ] = "<ÝÇÑÛ>"; Text[ greek ] = "<êåíü>"; - Text[ korean ] = "<비어 있ìŒ>"; + Text[ korean ] = "<빈>"; Text[ turkish ] = "<boþ>"; Text[ language_user1 ] = " "; Text[ catalan ] = "<buit>"; @@ -10306,7 +10306,7 @@ Resource RID_GLOBSTR Text [ french ] = "#1 inséré" ; Text [ dutch ] = "#1 ingevoegd" ; Text[ chinese_simplified ] = "å·²ç»åŠ å…¥ #1"; - Text[ russian ] = "#1 âñòàâëåí"; + Text[ russian ] = "#1 âñòàâëåíà"; Text[ polish ] = "#1 wstawiony"; Text[ japanese ] = "#1 ã¯æŒ¿å…¥ã•ã‚Œã¾ã—ãŸã€‚"; Text[ chinese_traditional ] = "å·²ç¶“åŠ å…¥ #1"; @@ -10329,11 +10329,11 @@ Resource RID_GLOBSTR Text [ swedish ] = "#1 raderad" ; Text [ danish ] = "#1 slettet" ; Text [ italian ] = "#1 cancellato" ; - Text [ spanish ] = "#1 eliminada" ; + Text [ spanish ] = "#1 borrado" ; Text [ french ] = "#1 supprimé" ; Text [ dutch ] = "#1 gewist" ; Text[ chinese_simplified ] = "å·²ç»åˆ 除 #1"; - Text[ russian ] = "#1 óäàëåí"; + Text[ russian ] = "#1 óäàëåíà"; Text[ polish ] = "#1 usuniêty"; Text[ japanese ] = "#1 ã¯å‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚"; Text[ chinese_traditional ] = "已經刪除 #1"; @@ -10414,13 +10414,13 @@ Resource RID_GLOBSTR Text [ french ] = "Cette opération met fin à l'enregistrement des modifications.\nToute information concernant les modifications sera perdue.\n\nQuitter l'enregistrement ?\n\n" ; Text [ dutch ] = "Door deze activiteit wordt het registreren van wijzigingen beëindigd.\\ nDe informatie over wijzigingen gaat hierdoor verloren.\n\nRegistratie beëindigen?\n\n" ; Text[ chinese_simplified ] = "这个æ“作会ä¸æ–更改记录。\n更改内容就会é—失。\n\n您还是è¦ä¸æ–记录å—？\n\n"; - Text[ russian ] = "Ýòî äåéñòâèå îòìåíèòü ðåæèì çàïèñè èçìåíåíèé.\nËþáàÿ èíôîðìàöèÿ îá èñïðàâëåíèÿõ áóäåò óòåðÿíà.\n\nÂûéòè èç ðåæèìà çàïèñè èçìåíåíèé?\n\n"; + Text[ russian ] = "Ðåæèì çàïèñè èçìåíåíèé áóäåò îòêëþ÷åí.\nÂñÿ íàêîïëåííàÿ èíôîðìàöèÿ îá èçìåíåíèÿõ áóäåò óäàëåíà.\n\nÎòêëþ÷èòü ðåæèì çàïèñè èçìåíåíèé?\n\n"; Text[ polish ] = "Akcja ta koñczy zapisywanie zmian.\nProwadzi to do utraty informacji o zmianach.\n\nZakoñczyæ zapisywanie?\n\n"; Text[ japanese ] = "変更ã®è¨˜éŒ²ã‚’ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã§çµ‚了ã—ã¾ã™ã€‚\nåŒæ™‚ã«å¤‰æ›´ã—ãŸæƒ…å ±ã‚‚å®Œå…¨ã«å¤±ã‚ã‚Œã¾ã™ã€‚\n\n記録を終了ã—ã¾ã™ã‹ã€‚\n\n"; Text[ chinese_traditional ] = "這個動作會çµæŸä¿®æ”¹ã€‚\n修改內容就會æµå¤±ã€‚\n\n您還是è¦ç¹¼çºŒï¼Ÿ\n\n"; Text[ arabic ] = "åÐÇ ÇáÅÌÑÇÁ ÓæÝ íÄÏí Åáì ÅäåÇÁ ÚãáíÉ ÊÓÌíá ÇáÊÛííÑÇÊ.\nÓæÝ íÄÏí åÐÇ ÈÏæÑå Åáì ÖíÇÚ ÇáãÚáæãÇÊ ÇáÎÇÕÉ ÈÇáÊÛííÑÇÊ.\n\nåá ÊÑíÏ ÅäåÇÁ ÇáÊÓÌíá¿\n\n"; Text[ greek ] = "Ìå áõôÞ ôçí åíÝñãåéá ôåñìáôßæåôáé ç êáôáãñáöÞ ôùí áëëáãþí.\nÏé ðëçñïöïñßåò ó÷åôéêÜ ìå ôéò áëëáãÝò ðñüêåéôáé íá ÷áèïýí.\n\nÍá ôåñìáôéóôåß ç åããñáöÞ;\n\n"; - Text[ korean ] = "ì´ ì‹¤í–‰ìœ¼ë¡œ 변경 기ë¡ì´ 종료ë©ë‹ˆë‹¤.\në”°ë¼ì„œ ë³€ê²½ì— ëŒ€í•œ ì •ë³´ê°€ ì†ì‹¤ë 것입니다 .\n\n기ë¡ì„ ì¢…ë£Œí•˜ê² ìŠµë‹ˆê¹Œ?\n\n"; + Text[ korean ] = "ì´ ìž‘ë™ì„ 실행하면 변경 기ë¡ì´ 종료ë©ë‹ˆë‹¤.\n그러면 변경 ë‚´ìš© ì •ë³´ê°€ ì†ì‹¤ë©ë‹ˆë‹¤.\n\n변경 기ë¡ì„ ì¢…ë£Œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?\n\n"; Text[ turkish ] = "Bu iþlem ile deðiþikliklerin izlenmesi sona erdirilecek.\nDaha önceki deðiþiklikler ile ilgili tüm bilgiler kaybolacak.\n\nKayýt durdurulsun mu?\n\n"; Text[ language_user1 ] = " "; Text[ catalan ] = "Aquesta acció sortirà dels canvis del registre.\nEs perdrà tota la informació sobre els canvis.\n\nVoleu sortir dels canvis del registre?\n\n"; @@ -10447,7 +10447,7 @@ Resource RID_GLOBSTR Text[ chinese_traditional ] = "在更新一個æ·å¾‘時無法關閉這個文件。"; Text[ arabic ] = "áÇ íãßä ÅÛáÇÞ ÇáãÓÊäÏ Ýí ÇáæÞÊ ÇáÐí íÊã Ýíå ÊÍÏíË ÇÑÊÈÇØ."; Text[ greek ] = "Äåí åßíáé äõíáôüí íá êëåßóåôå ôï Ýããñáöï êáèþò ãßíåôáé åíçìÝñùóç ìéáò óýíäåóçò."; - Text[ korean ] = "ë§í¬ê°€ ì—…ë°ì´íŠ¸ë˜ëŠ” ë™ì•ˆì—는 문서를 ë‹«ì„ ìˆ˜ 없습니다 ."; + Text[ korean ] = "ë§í¬ê°€ ì—…ë°ì´íŠ¸ë˜ëŠ” ë™ì•ˆì—는 문서를 ë‹«ì„ ìˆ˜ 없습니다."; Text[ turkish ] = "Belge, baðlantý güncellemesi yapýlýrken kapatýlamaz."; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot tancar el document mentre s'actualitza un enllaç."; @@ -10565,3 +10565,8 @@ Resource RID_GLOBSTR + + + + + diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index 5fc5ad09df28..2b5c0888d93f 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -2,9 +2,9 @@ * * $RCSfile: hdrcont.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:05:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,7 +69,7 @@ HelpId = FID_CELL_FORMAT ; \ Text = "~Zellen formatieren..." ; \ Text [ ENGLISH ] = "Format Cells..." ; \ - Text [ finnish ] = "~Muotoile solut" ; \ + Text [ finnish ] = "~Muotoile solut..." ; \ Text [ danish ] = "Formater celler..." ; \ Text [ french ] = "Formater les ~cellules..." ; \ Text [ swedish ] = "Formatera ~celler..." ; \ @@ -82,14 +82,15 @@ Text[ chinese_simplified ] = "å•å…ƒæ ¼æ ¼å¼åŒ–(~F)...";\ Text[ russian ] = "Ôîðìàò ÿ÷ååê...";\ Text[ polish ] = "Formatuj komórki...";\ - Text[ japanese ] = "ｾﾙã®æ›¸å¼è¨å®š(~F)...";\ + Text[ japanese ] = "セルã®æ›¸å¼è¨å®š(~F)...";\ Text[ chinese_traditional ] = "儲å˜æ ¼æ ¼å¼åŒ–(~F)...";\ Text[ arabic ] = "...ÊäÓíÞ ÇáÎáÇíÇ";\ Text[ greek ] = "Ìïñöï~ðïßçóç êåëéþí...";\ - Text[ korean ] = "ì…€ í¬ë§·íŒ…(~F)...";\ + Text[ korean ] = "ì…€ ì„œì‹ ì„¤ì •(~F)...";\ Text[ turkish ] = "Hücreleri formatla...";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Formatear celdas...";\ + Text[ catalan ] = "~Formata les cel.les...";\ + Text[ thai ] = "~รูปà¹à¸šà¸šà¹€à¸‹à¸¥à¸¥à¹Œ...";\ }; @@ -100,7 +101,7 @@ HelpId = SID_CUT ; \ Text = "Auss~chneiden" ; \ Text [ ENGLISH ] = "Cut" ; \ - Text [ finnish ] = "L~eikkaa" ; \ + Text [ finnish ] = "~Leikkaa" ; \ Text [ danish ] = "Klip" ; \ Text [ french ] = "Couper" ; \ Text [ swedish ] = "Klipp ~ut" ; \ @@ -121,7 +122,8 @@ Text[ korean ] = "잘ë¼ë‚´ê¸°(~T)";\ Text[ turkish ] = "~Kes";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Co~rtar";\ + Text[ catalan ] = "Retal~la";\ + Text[ thai ] = "ตั~ด";\ };\ MenuItem\ {\ @@ -129,7 +131,7 @@ HelpId = SID_COPY ; \ Text = "Kopie~ren" ; \ Text [ ENGLISH ] = "Copy" ; \ - Text [ finnish ] = "~Kopioi" ; \ + Text [ finnish ] = "K~opioi" ; \ Text [ danish ] = "Kopier" ; \ Text [ french ] = "Copier" ; \ Text [ swedish ] = "Kopie~ra" ; \ @@ -142,14 +144,15 @@ Text[ chinese_simplified ] = "å¤åˆ¶(~C)";\ Text[ russian ] = "Êîïèðîâàòü";\ Text[ polish ] = "Kopiuj";\ - Text[ japanese ] = "ｺﾋﾟｰ(~C)";\ + Text[ japanese ] = "コピー(~C)";\ Text[ chinese_traditional ] = "複製(~C)";\ Text[ arabic ] = "äÓÎ";\ Text[ greek ] = "Áíôé~ãñáöÞ";\ Text[ korean ] = "복사(~C)";\ Text[ turkish ] = "Kopyala";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Co~piar";\ + Text[ catalan ] = "~Copia";\ + Text[ thai ] = "~คัดลà¸à¸";\ };\ MenuItem\ {\ @@ -158,7 +161,7 @@ /* ### ACHTUNG: Neuer Text in Resource? Einfügen : Einf³gen */\ Text = "E~infügen" ; \ Text [ ENGLISH ] = "Paste" ; \ - Text [ finnish ] = "L~iit?" ; \ + Text [ finnish ] = "Lii~tä" ; \ Text [ danish ] = "Sæt i~nd" ; \ Text [ french ] = "~Insérer" ; \ Text [ swedish ] = "Klistra ~in" ; \ @@ -169,17 +172,18 @@ Text [ italian ] = "~Incolla" ; \ Text [ portuguese ] = "Colar" ; \ Text [ portuguese_brazilian ] = "Einf?en" ; \ - Text[ chinese_simplified ] = "æ’å…¥(~P)";\ + Text[ chinese_simplified ] = "粘贴(~P)";\ Text[ russian ] = "Âñò~àâèòü";\ Text[ polish ] = "~Wklej";\ Text[ japanese ] = "貼り付ã‘(~P)";\ - Text[ chinese_traditional ] = "æ’å…¥(~P)";\ + Text[ chinese_traditional ] = "貼上(~P)";\ Text[ arabic ] = "áÕÞ~";\ Text[ greek ] = "Åð~éêüëëçóç";\ Text[ korean ] = "붙여넣기(~P)";\ Text[ turkish ] = "~Yapýþtýr";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "P~egar";\ + Text[ catalan ] = "~Enganxa";\ + Text[ thai ] = "~วาง";\ }; //------------------------------------------------------------------------------- @@ -210,17 +214,18 @@ Menu RID_POPUP_ROWHEADER Text [ italian ] = "Altezza riga..." ; Text [ portuguese ] = "Altu~ra da linha..." ; Text [ portuguese_brazilian ] = "Zeilenh?e..." ; - Text[ chinese_simplified ] = "行高(~H)..."; + Text[ chinese_simplified ] = "行高(~G)..."; Text[ russian ] = "Âûñîòà ñòðîêè..."; Text[ polish ] = "Wysokoœæ linii..."; - Text[ japanese ] = "è¡Œã®é«˜ã•(~H)..."; - Text[ chinese_traditional ] = "列高(~H)..."; + Text[ japanese ] = "è¡Œã®é«˜ã•(~G)..."; + Text[ chinese_traditional ] = "列高(~G)..."; Text[ arabic ] = "ÇÑÊÝÇÚ ÇáÕÝ..."; Text[ greek ] = "¾øïò ãñá~ììÞò..."; - Text[ korean ] = "행높ì´(~H)..."; + Text[ korean ] = "행높ì´(~G)..."; Text[ turkish ] = "Satýr yüksekliði..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Altura de fila..."; + Text[ catalan ] = "~Alçada..."; + Text[ thai ] = "~ความสูง..."; }; MenuItem { @@ -247,10 +252,11 @@ Menu RID_POPUP_ROWHEADER Text[ chinese_traditional ] = "最é©åˆ—高(~R)..."; Text[ arabic ] = "...ÇáÇÑÊÝÇÚ ÇáÃãËá ááÕÝ"; Text[ greek ] = "ÂÝëôéóô~ï ýøïò ãñáììÞò..."; - Text[ korean ] = "최ì í–‰ 높ì´(~R)..."; + Text[ korean ] = "최ì í–‰ 높ì´(~R)..."; Text[ turkish ] = "~En uygun yükseklik..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Optimar altura de fila..."; + Text[ catalan ] = "Alçada òptima de la ~fila..."; + Text[ thai ] = "ความยาวà¹~ถวที่เหมาะที่สุด..."; }; //------------------------------ MenuItem { Separator = TRUE ; }; @@ -262,7 +268,7 @@ Menu RID_POPUP_ROWHEADER /* ### ACHTUNG: Neuer Text in Resource? Zeilen einfügen : Zeilen einf³gen */ Text = "Zeilen ~einfügen" ; Text [ ENGLISH ] = "Insert rows" ; - Text [ finnish ] = "~Lis?? rivit" ; + Text [ finnish ] = "~Lisää rivit" ; Text [ danish ] = "Indsæt rækker" ; Text [ french ] = "I~nsérer des lignes" ; Text [ swedish ] = "Infoga rad~er" ; @@ -283,7 +289,8 @@ Menu RID_POPUP_ROWHEADER Text[ korean ] = "í–‰ 삽입(~I)"; Text[ turkish ] = "Satýr ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Insertar filas"; + Text[ catalan ] = "~Insereix files"; + Text[ thai ] = "à¹~ทรà¸à¹à¸–ว"; }; MenuItem { @@ -296,7 +303,7 @@ Menu RID_POPUP_ROWHEADER /* ### ACHTUNG: Neuer Text in Resource? Ganze Zeilen löschen : Ganze Zeilen l÷schen */ Text [ dutch ] = "Rijen ~wissen" ; Text [ italian ] = "Elimina righe" ; - Text [ spanish ] = "~Eliminar filas" ; + Text [ spanish ] = "~Borrar filas" ; Text [ french ] = "~Supprimer des lignes" ; Text [ swedish ] = "Radera ra~der" ; Text [ danish ] = "Slet rækker" ; @@ -312,8 +319,9 @@ Menu RID_POPUP_ROWHEADER Text[ korean ] = "í–‰ ì‚ì œ(~D)"; Text[ turkish ] = "Satýr sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar filas"; + Text[ catalan ] = "~Suprimeix les files"; Text[ finnish ] = "~Poista rivit"; + Text[ thai ] = "~ลบà¹à¸–ว"; }; MenuItem { @@ -326,12 +334,12 @@ Menu RID_POPUP_ROWHEADER Text [ italian ] = "Canc~ella contenuti..." ; Text [ portuguese_brazilian ] = "Apa~gar Dados..." ; Text [ portuguese ] = "Eli~minar conteúdos..." ; - Text [ finnish ] = "~Poista sis?ll?..." ; + Text [ finnish ] = "~Poista sisältö..." ; Text [ danish ] = "Slet indhold..." ; Text [ french ] = "S~upprimer du contenu..." ; Text [ swedish ] = "Radera innehå~ll..." ; Text [ dutch ] = "~Inhoud wissen..." ; - Text [ spanish ] = "Eliminar contenidos..." ; + Text [ spanish ] = "~Borrar contenido..." ; Text [ english_us ] = "De~lete Contents..." ; /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Inhalte löschen (Formeln, Formate etc.) : Ausgewõhlte Inhalte l÷schen (Formeln, Formate etc.) */ Text[ chinese_simplified ] = "åˆ é™¤å†…å®¹(~L)..."; @@ -344,7 +352,8 @@ Menu RID_POPUP_ROWHEADER Text[ korean ] = "ë‚´ìš© ì‚ì œ(~L)..."; Text[ turkish ] = "Ýçerikleri sil..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar contenidos..."; + Text[ catalan ] = "Su~primeix el contingut..."; + Text[ thai ] = "ล~บเนื้à¸à¸«à¸²..."; }; //------------------------------ MenuItem { Separator = TRUE ; }; @@ -360,7 +369,7 @@ Menu RID_POPUP_ROWHEADER Text [ french ] = "M~asquer" ; Text [ swedish ] = "~Dölj" ; Text [ dutch ] = "~Verbergen" ; - Text [ spanish ] = "~Ocultar" ; + Text [ spanish ] = "Ocultar" ; Text [ english_us ] = "~Hide" ; Text [ italian ] = "Nascondi" ; Text [ portuguese ] = "O~cultar" ; @@ -375,7 +384,8 @@ Menu RID_POPUP_ROWHEADER Text[ korean ] = "숨기기(~H)"; Text[ turkish ] = "~Gizle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ocultar"; + Text[ catalan ] = "~Oculta"; + Text[ thai ] = "~ซ่à¸à¸™"; }; MenuItem { @@ -383,7 +393,7 @@ Menu RID_POPUP_ROWHEADER HelpId = FID_ROW_SHOW ; Text = "Ein~blenden" ; Text [ ENGLISH ] = "Show" ; - Text [ finnish ] = "~N?yt?" ; + Text [ finnish ] = "~Näytä" ; Text [ danish ] = "Vis" ; Text [ french ] = "~Afficher" ; Text [ swedish ] = "~Visa" ; @@ -400,10 +410,11 @@ Menu RID_POPUP_ROWHEADER Text[ chinese_traditional ] = "顯示(~S)"; Text[ arabic ] = "ÅÙåÇÑ"; Text[ greek ] = "Åì~öÜíéóç"; - Text[ korean ] = "나타내기(~S)"; + Text[ korean ] = "표시(~S)"; Text[ turkish ] = "G~öster"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mostrar"; + Text[ catalan ] = "~Mostra"; + Text[ thai ] = "à¹~สดง"; }; //------------------------------ MenuItem { Separator = TRUE ; }; @@ -414,29 +425,30 @@ Menu RID_POPUP_ROWHEADER Identifier = FID_PASTE_CONTENTS ; HelpId = FID_PASTE_CONTENTS ; Text = "In~halte einfügen..." ; - Text[ chinese_simplified ] = "æ’入内容(~S)..."; + Text[ chinese_simplified ] = "粘贴内容(~A)..."; Text [ ENGLISH ] = "Paste ~Special..." ; Text [ norwegian ] = "Paste ~Special..." ; Text [ italian ] = "Incolla ~speciale..." ; Text [ portuguese_brazilian ] = "Colar ~Especial..." ; Text [ portuguese ] = "Colar e~special..." ; - Text [ finnish ] = "Liit? ~m??r?ten" ; + Text [ finnish ] = "Liitä ~määräten..." ; Text [ danish ] = "Indsæt ind~hold..." ; Text [ french ] = "Colla~ge spécial..." ; Text [ swedish ] = "Klistra in inne~håll..." ; Text [ dutch ] = "Plakken ~speciaal..." ; Text [ spanish ] = "Peg~ado especial..." ; Text [ english_us ] = "P~aste Special..." ; - Text[ russian ] = "~Ñïåöèàëüíàÿ âñòàâêà..."; + Text[ russian ] = "Âñòàâèòü êàê..."; Text[ polish ] = "~Wstaw zawartoœæ..."; - Text[ japanese ] = "å½¢å¼ã‚’é¸æŠžã—ã¦è²¼ã‚Šä»˜ã‘(~S)..."; - Text[ chinese_traditional ] = "æ’入內容(~S)..."; + Text[ japanese ] = "å½¢å¼ã‚’é¸æŠžã—ã¦è²¼ã‚Šä»˜ã‘(~A)..."; + Text[ chinese_traditional ] = "貼上內容(~A)..."; Text[ arabic ] = "áÕÞ ÎÇÕ..."; Text[ greek ] = "ÅéäéêÞ åðéêüëë~çóç..."; - Text[ korean ] = "ì„ íƒí•˜ì—¬ 붙여넣기( ~S)..."; + Text[ korean ] = "ì„ íƒí•˜ì—¬ 붙여넣기(~A)..."; Text[ turkish ] = "Ö~zel yapýþtýr..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Peg~ado especial..."; + Text[ catalan ] = "Enganxament ~especial..."; + Text[ thai ] = "วาง~พิเศษ..."; }; }; }; @@ -478,7 +490,8 @@ Menu RID_POPUP_COLHEADER Text[ korean ] = "ì—´ 너비(~U)..."; Text[ turkish ] = "Sütun geniþliði..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ancho de columna..."; + Text[ catalan ] = "Amplada de la col~umna..."; + Text[ thai ] = "ความà¸à¸§à¹‰à¸²à¸‡à¸„à¸à¸¥à¸±à¸¡~น์..."; }; MenuItem { @@ -497,7 +510,7 @@ Menu RID_POPUP_COLHEADER Text [ portuguese ] = "~Optimizar largura da coluna..." ; Text [ portuguese_brazilian ] = "Optimale Spaltenbreite..." ; Text[ chinese_simplified ] = "最佳列宽(~P)..."; - Text[ russian ] = "Îïòèìàëüíàÿ øèðèíà êîëîíêè..."; + Text[ russian ] = "Îïòèìàëüíàÿ øèðèíà ñòîëáöà..."; Text[ polish ] = "Optymalna szerokoœæ kolumny..."; Text[ japanese ] = "最é©ãªåˆ—å¹…(~P)..."; Text[ chinese_traditional ] = "最é©æ¬„寬(~P)..."; @@ -506,7 +519,8 @@ Menu RID_POPUP_COLHEADER Text[ korean ] = "최ì ì—´ 너비(~P)..."; Text[ turkish ] = "En uygun geniþlik..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Optimar ancho de columna..."; + Text[ catalan ] = "Amplada ò~ptima de la columna..."; + Text[ thai ] = "ความà¸à¸§à¹‰à¸²à¸‡à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œ~ที่เหมาะที่สุด..."; }; //------------------------------ MenuItem { Separator = TRUE ; }; @@ -518,7 +532,7 @@ Menu RID_POPUP_COLHEADER /* ### ACHTUNG: Neuer Text in Resource? Spalten einfügen : Spalten einf³gen */ Text = "Spalten ~einfügen" ; Text [ ENGLISH ] = "Insert columns" ; - Text [ finnish ] = "~Lis?? sarakkeet" ; + Text [ finnish ] = "~Lisää sarakkeet" ; Text [ danish ] = "Indsæt kolonner" ; Text [ french ] = "I~nsérer des colonnes" ; Text [ swedish ] = "Infoga ~kolumner" ; @@ -539,7 +553,8 @@ Menu RID_POPUP_COLHEADER Text[ korean ] = "ì—´ 삽입(~I)"; Text[ turkish ] = "Sütun ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Insertar columnas"; + Text[ catalan ] = "~Insereix columnes"; + Text[ thai ] = "à¹~ทรà¸à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; MenuItem { @@ -551,7 +566,7 @@ Menu RID_POPUP_COLHEADER Text [ english_us ] = "~Delete Columns" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Spalten löschen : Ganze Spalten l÷schen */ Text [ italian ] = "Elimina colonne" ; - Text [ spanish ] = "~Eliminar columnas" ; + Text [ spanish ] = "~Borrar columnas" ; Text [ french ] = "S~upprimer des colonnes" ; Text [ dutch ] = "K~olommen wissen" ; Text [ swedish ] = "Radera ko~lumner" ; @@ -568,8 +583,9 @@ Menu RID_POPUP_COLHEADER Text[ korean ] = "ì—´ ì‚ì œ(~D)"; Text[ turkish ] = "Sütun sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar columnas"; + Text[ catalan ] = "~Suprimeix les columnes"; Text[ finnish ] = "~Poista sarakkeet"; + Text[ thai ] = "~ลบคà¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; MenuItem { @@ -582,12 +598,12 @@ Menu RID_POPUP_COLHEADER Text [ italian ] = "Can~cella contenuti..." ; Text [ portuguese_brazilian ] = "Apa~gar Dados..." ; Text [ portuguese ] = "Eliminar co~nteúdos..." ; - Text [ finnish ] = "Pois~ta sis?lt?" ; + Text [ finnish ] = "Pois~ta sisältö..." ; Text [ danish ] = "Slet indhold..." ; Text [ french ] = "~Supprimer du contenu..." ; Text [ swedish ] = "Radera ~innehåll..." ; - Text [ dutch ] = "I~nhoud wissen..." ; - Text [ spanish ] = "~Eliminar contenidos..." ; + Text [ dutch ] = "In~houd wissen..." ; + Text [ spanish ] = "~Borrar contenido..." ; Text [ english_us ] = "D~elete Contents..." ; /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Inhalte löschen (Formeln, Formate etc.) : Ausgewõhlte Inhalte l÷schen (Formeln, Formate etc.) */ Text[ chinese_simplified ] = "åˆ é™¤å†…å®¹(~E)..."; @@ -600,7 +616,8 @@ Menu RID_POPUP_COLHEADER Text[ korean ] = "ë‚´ìš© ì‚ì œ(~E)..."; Text[ turkish ] = "Ýçerikleri sil..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar contenidos..."; + Text[ catalan ] = "S~uprimeix el contingut..."; + Text[ thai ] = "ล~บเนื้à¸à¸«à¸²..."; }; //------------------------------ MenuItem { Separator = TRUE ; }; @@ -616,7 +633,7 @@ Menu RID_POPUP_COLHEADER Text [ french ] = "~Masquer" ; Text [ swedish ] = "~Dölj" ; Text [ dutch ] = "~Verbergen" ; - Text [ spanish ] = "~Ocultar" ; + Text [ spanish ] = "Ocultar" ; Text [ english_us ] = "~Hide" ; Text [ italian ] = "Nascondi" ; Text [ portuguese ] = "O~cultar" ; @@ -631,7 +648,8 @@ Menu RID_POPUP_COLHEADER Text[ korean ] = "숨기기(~H)"; Text[ turkish ] = "~Gizle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ocultar"; + Text[ catalan ] = "~Oculta"; + Text[ thai ] = "~ซ่à¸à¸™"; }; MenuItem { @@ -639,7 +657,7 @@ Menu RID_POPUP_COLHEADER HelpId = FID_COL_SHOW ; Text = "Ein~blenden" ; Text [ ENGLISH ] = "Show" ; - Text [ finnish ] = "~N?yt?" ; + Text [ finnish ] = "~Näytä" ; Text [ danish ] = "Vis" ; Text [ french ] = "A~fficher" ; Text [ swedish ] = "~Visa" ; @@ -656,10 +674,11 @@ Menu RID_POPUP_COLHEADER Text[ chinese_traditional ] = "顯示(~S)"; Text[ arabic ] = "ÅÙåÇÑ"; Text[ greek ] = "Åì~öÜíéóç"; - Text[ korean ] = "나타내기(~S)"; + Text[ korean ] = "표시(~S)"; Text[ turkish ] = "G~öster"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mostrar"; + Text[ catalan ] = "~Mostra"; + Text[ thai ] = "à¹~สดง"; }; //------------------------------ MenuItem { Separator = TRUE ; }; @@ -670,29 +689,30 @@ Menu RID_POPUP_COLHEADER Identifier = FID_PASTE_CONTENTS ; HelpId = FID_PASTE_CONTENTS ; Text = "In~halte einfügen..." ; - Text[ chinese_simplified ] = "æ’入内容(~S)..."; + Text[ chinese_simplified ] = "粘贴内容(~S)..."; Text [ ENGLISH ] = "Paste ~Special..." ; Text [ norwegian ] = "Paste ~Special..." ; Text [ italian ] = "Incolla ~speciale..." ; Text [ portuguese_brazilian ] = "Colar ~Especial..." ; Text [ portuguese ] = "Colar e~special..." ; - Text [ finnish ] = "Liit? ~m??r?ten" ; + Text [ finnish ] = "Liitä ~määräten..." ; Text [ danish ] = "Indsæt ind~hold..." ; Text [ french ] = "Colla~ge spécial..." ; Text [ swedish ] = "Klistra in inne~håll..." ; Text [ dutch ] = "Plakken ~speciaal..." ; Text [ spanish ] = "Peg~ado especial..." ; Text [ english_us ] = "Paste ~Special..." ; - Text[ russian ] = "~Ñïåöèàëüíàÿ âñòàâêà..."; + Text[ russian ] = "Âñòàâèòü êàê..."; Text[ polish ] = "~Wstaw zawartoœæ..."; Text[ japanese ] = "å½¢å¼ã‚’é¸æŠžã—ã¦è²¼ã‚Šä»˜ã‘(~S)..."; - Text[ chinese_traditional ] = "æ’入內容(~S)..."; + Text[ chinese_traditional ] = "貼上內容(~S)..."; Text[ arabic ] = "áÕÞ ÎÇÕ..."; Text[ greek ] = "ÅéäéêÞ åðéêüëë~çóç..."; - Text[ korean ] = "ì„ íƒí•˜ì—¬ 붙여넣기( ~S)..."; + Text[ korean ] = "ì„ íƒí•˜ì—¬ 붙여넣기(~S)..."; Text[ turkish ] = "Ö~zel yapýþtýr..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Peg~ado especial..."; + Text[ catalan ] = "Enganxament ~especial..."; + Text[ thai ] = "วาง~พิเศษ..."; }; }; }; @@ -710,3 +730,8 @@ Menu RID_POPUP_COLHEADER + + + + + diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src index 732442db020b..2577d50c18d0 100644 --- a/sc/source/ui/src/miscdlgs.src +++ b/sc/source/ui/src/miscdlgs.src @@ -2,9 +2,9 @@ * * $RCSfile: miscdlgs.src,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: kz $ $Date: 2002-11-27 17:04:22 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ ModalDialog RID_SCDLG_DELCELL Text [ french ] = "Supprimer des cellules" ; Text [ swedish ] = "Radera celler" ; Text [ dutch ] = "Cellen wissen" ; - Text [ spanish ] = "Eliminar celdas" ; + Text [ spanish ] = "Borrar celdas" ; Text [ english_us ] = "Delete Cells" ; Moveable = TRUE ; Closeable = FALSE ; @@ -117,7 +117,7 @@ ModalDialog RID_SCDLG_DELCELL Text [ french ] = "Supprimer des ~colonnes entières" ; Text [ swedish ] = "Radera hela ~kolumner" ; Text [ dutch ] = "Hele ~kolommen verwijderen" ; - Text [ spanish ] = "Eli~minar columnas completas" ; + Text [ spanish ] = "~Borrar columnas completas" ; Text [ english_us ] = "Delete entire ~column(s)" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤æ•´åˆ—(~C)"; @@ -148,7 +148,7 @@ ModalDialog RID_SCDLG_DELCELL Text [ french ] = "Supprimer des ~lignes entières" ; Text [ swedish ] = "Radera hela ~rader" ; Text [ dutch ] = "Hele ~rijen verwijderen" ; - Text [ spanish ] = "~Eliminar filas completas" ; + Text [ spanish ] = "~Borrar filas completas" ; Text [ english_us ] = "Delete entire ~row(s)" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤æ•´è¡Œ(~R)"; @@ -499,7 +499,7 @@ ModalDialog RID_SCDLG_DELCONT Text [ french ] = "Supprimer du contenu" ; Text [ swedish ] = "Radera innehåll" ; Text [ dutch ] = "Inhoud wissen" ; - Text [ spanish ] = "Eliminar contenidos" ; + Text [ spanish ] = "Borrar contenido" ; Text [ english_us ] = "Delete Contents" ; Moveable = TRUE ; Closeable = FALSE ; @@ -537,7 +537,7 @@ ModalDialog RID_SCDLG_DELCONT Text [ french ] = "Supprimer ~tout" ; Text [ swedish ] = "Radera ~allt" ; Text [ dutch ] = "Alles ~wissen" ; - Text [ spanish ] = "Eliminar ~todo" ; + Text [ spanish ] = "Borrar ~todo" ; Text [ english_us ] = "Delete ~all" ; TabStop = TRUE ; Text[ chinese_simplified ] = "å…¨éƒ¨åˆ é™¤(~A)"; @@ -640,7 +640,7 @@ ModalDialog RID_SCDLG_DELCONT Text[ chinese_traditional ] = "日期和時間(~D)"; Text[ arabic ] = "ÇáÊÇÑíÎ æÇáæÞÊ"; Text[ greek ] = "Çìåñïìçíßá êáé ¿ñá"; - Text[ korean ] = "ë‚ ì§œ & 시간(~D)"; + Text[ korean ] = "ë‚ ì§œ ë° ì‹œê°„(~D)"; Text[ turkish ] = "~Tarih & Saat"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Dia i hora"; @@ -972,7 +972,7 @@ ModalDialog RID_SCDLG_INSCONT Text[ chinese_traditional ] = "日期和時間(~D)"; Text[ arabic ] = "ÇáÊÇÑíÎ æÇáæÞÊ"; Text[ greek ] = "Çìåñïìçíßá êáé ¿ñá"; - Text[ korean ] = "ì¼ìž & 시간(~D)"; + Text[ korean ] = "ë‚ ì§œ ë° ì‹œê°„(~D)"; Text[ turkish ] = "~Tarih & Saat"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Dia i hora"; @@ -1052,7 +1052,7 @@ ModalDialog RID_SCDLG_INSCONT Text[ russian ] = "O~bjects"; Text[ greek ] = "O~bjects"; Text[ dutch ] = "O~bjects"; - Text[ french ] = "Objects"; + Text[ french ] = "Objets"; Text[ spanish ] = "O~bjetos"; Text[ finnish ] = "O~bjects"; Text[ italian ] = "Oggetti"; @@ -1194,7 +1194,7 @@ ModalDialog RID_SCDLG_INSCONT Text [ dutch ] = "~Aftrekken" ; Text [ english_us ] = "S~ubtract" ; Text [ italian ] = "Sottrai" ; - Text [ spanish ] = "Sustraer" ; + Text [ spanish ] = "~Substraer" ; Text [ french ] = "~Soustraction" ; Text [ swedish ] = "Su~btrahera" ; Text [ danish ] = "Subtraher" ; @@ -1323,7 +1323,7 @@ ModalDialog RID_SCDLG_INSCONT Text[ chinese_traditional ] = "è·³éŽç©ºå„²å˜æ ¼(~K)"; Text[ arabic ] = "ÊÎØí ÇáÎáÇíÇ ÇáÎÇáíÉ"; Text[ greek ] = "ÐáñÜëåéøç êåíþí êåëéþí"; - Text[ korean ] = "빈 ì…€ 넘어가기(~K)"; + Text[ korean ] = "빈 ì…€ 건너뛰기(~K)"; Text[ turkish ] = "~Boþ hücreleri atla"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ome~t les cel.les buides"; @@ -1352,7 +1352,7 @@ ModalDialog RID_SCDLG_INSCONT Text[ chinese_traditional ] = "行欄替æ›(~T)"; Text[ arabic ] = "ÊÛííÑ ÇáãßÇä"; Text[ greek ] = "ÁíôéìåôÜèåóç"; - Text[ korean ] = "ë’¤ 바꾸기(~T)"; + Text[ korean ] = "바꾸기(~T)"; Text[ turkish ] = "Dönüþtür"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Transposa"; @@ -1439,7 +1439,7 @@ ModalDialog RID_SCDLG_INSCONT Text[ chinese_traditional ] = "ä¸ç§»å‹•(~I)"; Text[ arabic ] = "ÈÏæä ÅÒÇÍÉ"; Text[ greek ] = "Íá ìçí ãßíåé ìåôáêßíçóç"; - Text[ korean ] = "밀어내기 금지(~I)"; + Text[ korean ] = "ì´ë™í•˜ì§€ ì•ŠìŒ(~I)"; Text[ turkish ] = "~Taþýma"; Text[ language_user1 ] = " "; Text[ catalan ] = "No desplacis"; @@ -1620,7 +1620,7 @@ ModalDialog RID_SCDLG_MOVETAB Text[ chinese_traditional ] = "åŠ å…¥æ–‡ä»¶(~D)"; Text[ arabic ] = "Åáì ÇáãáÝ"; Text[ greek ] = "Óôï Ýããñáöï"; - Text[ korean ] = "문서ì—(~D)"; + Text[ korean ] = "문서로(~D)"; Text[ turkish ] = "~Belgeye"; Text[ language_user1 ] = " "; Text[ catalan ] = "Al ~document"; @@ -1658,7 +1658,7 @@ ModalDialog RID_SCDLG_MOVETAB Text[ chinese_traditional ] = "å‰ç½®æ–¼(~I)"; Text[ arabic ] = "ÅÏÑÇÌ ÞÈá"; Text[ greek ] = "ÐñïóèÞêç ðñéí áðü"; - Text[ korean ] = "ì•žì— ì‚½ìž…(~I)"; + Text[ korean ] = "ë‹¤ìŒ í‘œ ì•žì— ì‚½ìž…(~I)"; Text[ turkish ] = "~Öne ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Insereix abans de"; @@ -1715,7 +1715,7 @@ ModalDialog RID_SCDLG_MOVETAB Text [ french ] = "- Nouveau document -" ; Text [ swedish ] = "- nytt dokument -" ; Text [ dutch ] = "- nieuw document -" ; - Text [ spanish ] = "- nuevo documento -" ; + Text [ spanish ] = "- documento nuevo -" ; Text [ english_us ] = "- new document -" ; Text[ chinese_simplified ] = "- 新文档 -"; Text[ russian ] = "- íîâûé äîêóìåíò -"; @@ -1948,13 +1948,13 @@ ModalDialog RID_SCDLG_COL_MAN Text [ swedish ] = "~Standardvärde" ; Text [ danish ] = "Standardværdi" ; Text[ chinese_simplified ] = "默认值(~D)"; - Text[ russian ] = "Ñòàíäàðòíîå çíà÷åíèå"; + Text[ russian ] = "Ïî óìîë÷àíèþ"; Text[ polish ] = "Wartoœæ domyœlna"; Text[ japanese ] = "標準値(~D)"; Text[ chinese_traditional ] = "默èªå€¼(~D)"; Text[ arabic ] = "ÞíãÉ ÇÝÊÑÇÖíÉ"; Text[ greek ] = "ÐñïåðéëåãìÝíç ôéìÞ"; - Text[ korean ] = "기본 ê°’(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "~Standart deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor per ~defecte"; @@ -2075,13 +2075,13 @@ ModalDialog RID_SCDLG_COL_OPT Text [ swedish ] = "~Standardvärde" ; Text [ danish ] = "~Standardværdi" ; Text[ chinese_simplified ] = "默认值(~D)"; - Text[ russian ] = "Ñòàíäàðòíîå çíà÷åíèå"; + Text[ russian ] = "Ïî óìîë÷àíèþ"; Text[ polish ] = "Wartoœæ domyœlna"; Text[ japanese ] = "標準値(~D)"; Text[ chinese_traditional ] = "默èªå€¼(~D)"; Text[ arabic ] = "ÞíãÉ ÇÝÊÑÇÖíÉ"; Text[ greek ] = "ÐñïåðéëåãìÝíç ôéìÞ"; - Text[ korean ] = "기본 ê°’(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "~Standart deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor per ~defecte"; @@ -2203,13 +2203,13 @@ ModalDialog RID_SCDLG_ROW_MAN Text [ danish ] = "~Standardværdi" ; Text[ chinese_simplified ] = "默认值(~D)"; Text[ language_user1 ] = " "; - Text[ russian ] = "Ñòàíäàðòíîå çíà÷åíèå"; + Text[ russian ] = "Ïî óìîë÷àíèþ"; Text[ polish ] = "Wartoœæ domyœlna"; Text[ japanese ] = "標準値(~D)"; Text[ chinese_traditional ] = "默èªå€¼(~D)"; Text[ arabic ] = "ÞíãÉ ÇÝÊÑÇÖíÉ"; Text[ greek ] = "ÐñïåðéëåãìÝíç ôéìÞ"; - Text[ korean ] = "기본 ê°’(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "~Standart deðer"; Text[ catalan ] = "Valor per ~defecte"; Text[ finnish ] = "Oletusarvo"; @@ -2328,13 +2328,13 @@ ModalDialog RID_SCDLG_ROW_OPT Text [ swedish ] = "~Standardvärde" ; Text [ danish ] = "~Standardværdi" ; Text[ chinese_simplified ] = "默认值(~D)"; - Text[ russian ] = "Ñòàíäàðòíîå çíà÷åíèå"; + Text[ russian ] = "Ïî óìîë÷àíèþ"; Text[ polish ] = "Wartoœæ domyœlna"; Text[ japanese ] = "標準値(~D)"; Text[ chinese_traditional ] = "默èªå€¼(~D)"; Text[ arabic ] = "ÞíãÉ ÇÝÊÑÇÖíÉ"; Text[ greek ] = "ÐñïåðéëåãìÝíç ôéìÞ"; - Text[ korean ] = "기본 ê°’(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "~Standart deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor per ~defecte"; @@ -2955,7 +2955,7 @@ ModalDialog RID_SCDLG_FILLSERIES Text [ portuguese ] = "AutoPreenchimento" ; Text [ finnish ] = "Automaattinen täyttö" ; Text [ danish ] = "AutoFyld" ; - Text [ french ] = "~Rempl. automatique" ; + Text [ french ] = "Remplissage automatique" ; Text [ swedish ] = "Auto~Fyll" ; Text [ dutch ] = "~Automatisch invullen" ; Text [ spanish ] = "~Relleno automático" ; @@ -2998,7 +2998,7 @@ ModalDialog RID_SCDLG_FILLSERIES Text[ chinese_traditional ] = "排列類型"; Text[ arabic ] = "äæÚ ÇáÕÝæÝ"; Text[ greek ] = "Ôýðïò óåéñÜò"; - Text[ korean ] = "형ì‹"; + Text[ korean ] = "ì—°ì† ë°ì´í„° ìœ í˜•"; Text[ turkish ] = "Sýra türü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; @@ -3146,7 +3146,7 @@ ModalDialog RID_SCDLG_FILLSERIES Text[ chinese_traditional ] = "無效值"; Text[ arabic ] = "ÞíãÉ ÛíÑ ÕÇáÍÉ"; Text[ greek ] = "Ìç Ýãêõñç ôéìÞ"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ ê°’"; + Text[ korean ] = "ìž˜ëª»ëœ ê°’"; Text[ turkish ] = "Geçersiz deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "El valor no és vàlid"; @@ -3313,7 +3313,7 @@ ModalDialog RID_SCDLG_GROUP Text[ chinese_traditional ] = "啟動用於"; Text[ arabic ] = "ÊäÔíØ ãä ÃÌá"; Text[ greek ] = "Åíåñãïðïßçóç ãéá"; - Text[ korean ] = "그룹화하는 대ìƒ"; + Text[ korean ] = "활성화 대ìƒ"; Text[ turkish ] = "Þunun için etkinleþtir:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Inclou"; @@ -3341,7 +3341,7 @@ ModalDialog RID_SCDLG_GROUP Text[ chinese_traditional ] = "å–消群組"; Text[ arabic ] = "ÅáÛÇÁ ÇáÊäÔíØ ãä ÃÌá"; Text[ greek ] = "Áðåíåñãïðïßçóç ãéá"; - Text[ korean ] = "ì˜ ì‹¤í–‰ 취소"; + Text[ korean ] = "그룹 í•´ì œ 대ìƒ"; Text[ turkish ] = "Þunun için etkinliðini kaldýr:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desactiva durant"; @@ -3367,7 +3367,7 @@ ModalDialog RID_SCDLG_GROUP Text[ chinese_traditional ] = "群組"; Text[ arabic ] = "ÊÌãíÚ"; Text[ greek ] = "Ïìáäïðïßçóç"; - Text[ korean ] = "그룹 만들기"; + Text[ korean ] = "그룹"; Text[ turkish ] = "Grup"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grup"; @@ -3443,21 +3443,21 @@ ModalDialog RID_SCDLG_NAMES_CREATE Text [ ENGLISH ] = "First row" ; Text [ dutch ] = "~Koptekst" ; Text [ english_us ] = "~Top row" ; - Text [ italian ] = "Riga d'intestazione" ; - Text [ spanish ] = "~Encabezamiento" ; - Text [ french ] = "~En-tête" ; - Text [ swedish ] = "Si~dhuvud" ; + Text [ italian ] = "Riga superiore" ; + Text [ spanish ] = "~Fila superior" ; + Text [ french ] = "Ligne supérieure" ; + Text [ swedish ] = "Ö~versta raden" ; Text [ danish ] = "Øverste række" ; Text [ portuguese_brazilian ] = "~Kopfzeile" ; Text [ portuguese ] = "~Cabeçalho" ; - Text[ chinese_simplified ] = "页眉(~E)"; + Text[ chinese_simplified ] = "上行(~T)"; Text[ russian ] = "Âåðõíèé êîëîíòèòóë"; Text[ polish ] = "~nag³ówka"; - Text[ japanese ] = "上端行(~E)"; - Text[ chinese_traditional ] = "é 首(~E)"; + Text[ japanese ] = "上端行(~T)"; + Text[ chinese_traditional ] = "首列(~T)"; Text[ arabic ] = "ÑÃÓ ÇáÕÝÍÉ"; Text[ greek ] = "Êåöáëßäá"; - Text[ korean ] = "머리글(~E)"; + Text[ korean ] = "맨위 í–‰(~E)"; Text[ turkish ] = "~Üstbilgi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Capça~lera"; @@ -3503,21 +3503,21 @@ ModalDialog RID_SCDLG_NAMES_CREATE Text [ ENGLISH ] = "Last row" ; Text [ dutch ] = "~Voettekst" ; Text [ english_us ] = "~Bottom row" ; - Text [ italian ] = "Piè di pagina" ; - Text [ spanish ] = "~Pie de página" ; - Text [ french ] = "~Pied de page" ; - Text [ swedish ] = "Sid~fot" ; + Text [ italian ] = "Riga inferiore" ; + Text [ spanish ] = "~Fila inferior" ; + Text [ french ] = "Ligne inférieure" ; + Text [ swedish ] = "N~edersta raden" ; Text [ danish ] = "Nederste række" ; Text [ portuguese ] = "~Rodapé" ; Text [ portuguese_brazilian ] = "~Fu?zeile" ; - Text[ chinese_simplified ] = "页脚(~F)"; + Text[ chinese_simplified ] = "下行(~B)"; Text[ russian ] = "Íèæíèé êîëîíòèòóë"; Text[ polish ] = "~stopki"; - Text[ japanese ] = "最下行(~F)"; - Text[ chinese_traditional ] = "é å°¾(~F)"; + Text[ japanese ] = "最下行(~B)"; + Text[ chinese_traditional ] = "末列(~B)"; Text[ arabic ] = "ÊÐííá ÇáÕÝÍÉ"; Text[ greek ] = "ÕðïóÝëéäï"; - Text[ korean ] = "바닥글(~F)"; + Text[ korean ] = "맨아래 í–‰(~F)"; Text[ turkish ] = "~Altbilgi"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Peu de pàgina"; @@ -3595,7 +3595,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE Text[ chinese_traditional ] = "新建å稱從"; Text[ arabic ] = "ÅäÔÇÁ ÃÓãÇÁ ãä"; Text[ greek ] = "Äçìéïõñãßá ïíüìáôïò áðü"; - Text[ korean ] = "ì´ë¦„으로 쓰는 위치"; + Text[ korean ] = "ì ìš©í• ì´ë¦„ì˜ ìœ„ì¹˜"; Text[ turkish ] = "Ad için kaynak"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nom a partir de "; @@ -3811,7 +3811,7 @@ ModalDialog RID_SCDLG_CHARTCOLROW Text[ chinese_traditional ] = "將第一欄當作標題(~C)"; Text[ arabic ] = "ÇáÚãæÏ ÇáÃæá ßÚäæÇä"; Text[ greek ] = "Ðñþôç óôÞëç ùò åðéãñáöÞ"; - Text[ korean ] = "ì²˜ìŒ ì—´ì„ ë¼ë²¨ë¡œ(~C)"; + Text[ korean ] = "첫 ì—´ì„ ë ˆì´ë¸”ë¡œ(~C)"; Text[ turkish ] = "Etiket olarak ilk~sütun"; Text[ language_user1 ] = " "; Text[ catalan ] = "La primera ~columna com a etiqueta"; @@ -3840,7 +3840,7 @@ ModalDialog RID_SCDLG_CHARTCOLROW Text[ chinese_traditional ] = "第一列當作標題(~R)"; Text[ arabic ] = "ÇáÕÝ ÇáÃæá ßÚäæÇä"; Text[ greek ] = "Ðñþôç ãñáììÞ ùò åðéãñáöÞ"; - Text[ korean ] = "ì²˜ìŒ í–‰ì„ ë¼ë²¨ë¡œ(~R)"; + Text[ korean ] = "첫 í–‰ì„ ë ˆì´ë¸”ë¡œ(~R)"; Text[ turkish ] = "Etiket olarak ilk~satýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "La primera ~fila com a etiqueta"; @@ -3910,7 +3910,7 @@ ModalDialog RID_SCDLG_CHARTCOLROW Text[ chinese_traditional ] = "變更æºè³‡æ–™å€åŸŸ"; Text[ arabic ] = "ÊÛííÑ äØÇÞ ÈíÇäÇÊ ÇáãÕÏÑ"; Text[ greek ] = "ÁëëáãÞ ðåñéï÷Þò ðñïÝëåõóçò äåäïìÝíùí"; - Text[ korean ] = "소스 ë°ì´í„° ì˜ì— 변경"; + Text[ korean ] = "ì›ë³¸ ë°ì´í„° 범위 변경"; Text[ turkish ] = "Kaynak verileri aralýðýný deðiþtir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Modifica les dades font"; @@ -3918,3 +3918,8 @@ ModalDialog RID_SCDLG_CHARTCOLROW Text[ thai ] = "เปลี่ยนช่วงà¹à¸«à¸¥à¹ˆà¸‡à¸‚้à¸à¸¡à¸¹à¸¥"; }; + + + + + diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src index 74503995cd2b..1b80570cb3ec 100644 --- a/sc/source/ui/src/namedlg.src +++ b/sc/source/ui/src/namedlg.src @@ -2,9 +2,9 @@ * * $RCSfile: namedlg.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:12:37 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,9 @@ // (C) 1994-96 StarDivision GmbH, Hamburg, Germany // // $Workfile: namedlg.src $ - // $Author: kz $ - // $Date: 2001-11-16 23:12:37 $ - // $Revision: 1.23 $ + // $Author: hr $ + // $Date: 2003-03-26 18:06:28 $ + // $Revision: 1.24 $ // $Logfile: T:/sc/source/ui/src/namedlg.srv $ //--------------------------------------------------------------------------- @@ -84,7 +84,7 @@ ModelessDialog RID_SCDLG_NAMES Text [ italian ] = "Definisci nomi" ; Text [ portuguese_brazilian ] = "Definir Nomes" ; Text [ portuguese ] = "Definir nomes" ; - Text [ finnish ] = "M??rit? nimet" ; + Text [ finnish ] = "Määritä nimet" ; Text [ danish ] = "Definer navne" ; Text [ french ] = "Définir des noms" ; Text [ swedish ] = "Definiera namn" ; @@ -122,9 +122,9 @@ ModelessDialog RID_SCDLG_NAMES Text [ italian ] = "Aggiungi" ; Text [ portuguese_brazilian ] = "~Acrescentar" ; Text [ portuguese ] = "~Adicionar" ; - Text [ finnish ] = "~Lis??" ; + Text [ finnish ] = "~Lisää" ; Text [ danish ] = "Tilføj" ; - Text [ french ] = "~Ajouter" ; + Text [ french ] = "Ajouter" ; Text [ swedish ] = "~Lägg till" ; Text [ dutch ] = "Toe~voegen" ; Text [ spanish ] = "~Añadir" ; @@ -141,7 +141,8 @@ ModelessDialog RID_SCDLG_NAMES Text[ korean ] = "추가(~A)"; Text[ turkish ] = "~Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Añadir"; + Text[ catalan ] = "~Afegeix"; + Text[ thai ] = "เ~พิ่ม"; }; PushButton BTN_REMOVE { @@ -156,10 +157,10 @@ ModelessDialog RID_SCDLG_NAMES Text [ portuguese ] = "E~liminar" ; Text [ finnish ] = "~Poista" ; Text [ danish ] = "Slet" ; - Text [ french ] = "~Supprimer" ; + Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; @@ -172,7 +173,8 @@ ModelessDialog RID_SCDLG_NAMES Text[ korean ] = "ì‚ì œ(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~ลบ"; }; FixedLine FL_NAME { @@ -201,7 +203,8 @@ ModelessDialog RID_SCDLG_NAMES Text[ korean ] = "ì´ë¦„"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "Nom"; + Text[ thai ] = "ชื่à¸"; }; ComboBox ED_NAME { @@ -221,24 +224,25 @@ ModelessDialog RID_SCDLG_NAMES Text [ italian ] = "Riferito a" ; Text [ portuguese_brazilian ] = "Remente a" ; Text [ portuguese ] = "Refere-se a" ; - Text [ finnish ] = "Viittauskohde" ; - Text [ danish ] = "Henviser til" ; + Text [ finnish ] = "Liitoskohde" ; + Text [ danish ] = "Tildelt til" ; Text [ french ] = "Assigné à" ; Text [ swedish ] = "Refererar till" ; Text [ dutch ] = "Toegevoegd aan" ; Text [ spanish ] = "Asignado a" ; Text [ english_us ] = "Assigned to" ; Text[ chinese_simplified ] = "指定给"; - Text[ russian ] = "Ññûëêà íà"; + Text[ russian ] = "Íàçíà÷åí íà"; Text[ polish ] = "Odnosi siê do"; Text[ japanese ] = "ä½ç½®"; Text[ chinese_traditional ] = "指定到"; Text[ arabic ] = "íäÓÈ Åáì"; Text[ greek ] = "Áíôéóôïé÷åß óå"; - Text[ korean ] = "ì— í• ë‹¹"; + Text[ korean ] = "위치"; Text[ turkish ] = "Ait olduðu aralýk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Asignado a"; + Text[ catalan ] = "Fa referència a"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸–ึง"; }; Edit ED_ASSIGN { @@ -273,8 +277,9 @@ ModelessDialog RID_SCDLG_NAMES QuickHelpText[ korean ] = "축소"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern"; - QuickHelpText[ catalan ] = "Reducir"; - QuickHelpText[ finnish ] = "Kutista!"; + QuickHelpText[ catalan ] = "Redueix"; + QuickHelpText[ finnish ] = "Kutista"; + QuickHelpText[ thai ] = "Shrink"; }; MoreButton BTN_MORE { @@ -308,10 +313,11 @@ ModelessDialog RID_SCDLG_NAMES Text[ chinese_traditional ] = "å€åŸŸé¡žåž‹"; Text[ arabic ] = "äæÚ ÇáäØÇÞ"; Text[ greek ] = "Ôýðïò ðåñéï÷Þò"; - Text[ korean ] = "êµ¬ì— ì¢…ë¥˜"; + Text[ korean ] = "ì˜ì— 종류"; Text[ turkish ] = "Aralýk türü"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo de área"; + Text[ catalan ] = "Tipus d'àrea"; + Text[ thai ] = "ชนิดพื้นที่"; }; CheckBox BTN_PRINTAREA { @@ -341,7 +347,8 @@ ModelessDialog RID_SCDLG_NAMES Text[ korean ] = "ì¸ì‡„ 범위(~P)"; Text[ turkish ] = "Yazdýrma a~ralýðý"; Text[ language_user1 ] = "RB: zu finden in: Format - Druckbereich - Bearbeiten... - -"; - Text[ catalan ] = "Área de ~impresión"; + Text[ catalan ] = "Àrea d'im~pressió"; + Text[ thai ] = "ช่วงà¸à¸²à¸£~พิมพ์"; }; CheckBox BTN_CRITERIA { @@ -353,7 +360,7 @@ ModelessDialog RID_SCDLG_NAMES Text [ italian ] = "~Filtro" ; Text [ portuguese_brazilian ] = "~Filtro" ; Text [ portuguese ] = "~Filtro" ; - Text [ finnish ] = "~Suodatin" ; + Text [ finnish ] = "~Suodatus" ; Text [ danish ] = "Filter" ; Text [ french ] = "~Filtre" ; Text [ swedish ] = "Fil~ter" ; @@ -364,14 +371,15 @@ ModelessDialog RID_SCDLG_NAMES Text[ chinese_simplified ] = "ç›é€‰(~F)"; Text[ russian ] = "Ôèëüòð"; Text[ polish ] = "Filtr"; - Text[ japanese ] = "ﾌｨﾙﾀ(~F)"; + Text[ japanese ] = "フィルタ(~F)"; Text[ chinese_traditional ] = "篩é¸(~F)"; Text[ arabic ] = "ÇáÝáÊÑ"; Text[ greek ] = "Ößëôñï"; Text[ korean ] = "í•„í„°(~F)"; Text[ turkish ] = "Fil~tre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fi~ltro"; + Text[ catalan ] = "~Filtre"; + Text[ thai ] = "~ตัวà¸à¸£à¸à¸‡"; }; CheckBox BTN_ROWHEADER { @@ -388,20 +396,21 @@ ModelessDialog RID_SCDLG_NAMES Text [ french ] = "~Ligne à répéter" ; Text [ swedish ] = "Upprepn~ingsrad" ; Text [ dutch ] = "~Rij herhalen" ; - Text [ spanish ] = "Fil~a a repetir" ; + Text [ spanish ] = "Fil~a que repetir" ; Text [ english_us ] = "Repeat ~row" ; TabStop = TRUE ; Text[ chinese_simplified ] = "é‡å¤çš„è¡Œ(~R)"; - Text[ russian ] = "Ïîâòîð ñòðîêè"; + Text[ russian ] = "Ïîâòîðèòü ñòðîêó"; Text[ polish ] = "Wiersz powtórzony"; Text[ japanese ] = "ç¹°ã‚Šè¿”ã™è¡Œ(~R)"; Text[ chinese_traditional ] = "é‡è¤‡çš„列(~R)"; Text[ arabic ] = "ÇáÕÝ ÇáãßÑÑ"; Text[ greek ] = "Åðáíáëáìâáíüìåí~ç ãñáììÞ"; - Text[ korean ] = "반복행(~R)"; + Text[ korean ] = "반복 í–‰(~R)"; Text[ turkish ] = "Y~inelenen satýr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fil~a a repetir"; + Text[ catalan ] = "Repeteix la ~fila"; + Text[ thai ] = "ทำà¹~ถวซ้ำ"; }; CheckBox BTN_COLHEADER { @@ -418,20 +427,21 @@ ModelessDialog RID_SCDLG_NAMES Text [ french ] = "~Colonne à répéter" ; Text [ swedish ] = "~Upprepningskolumn" ; Text [ dutch ] = "~Kolom herhalen" ; - Text [ spanish ] = "Columna a r~epetir" ; + Text [ spanish ] = "Columna que r~epetir" ; Text [ english_us ] = "Repeat ~column" ; TabStop = TRUE ; Text[ chinese_simplified ] = "é‡å¤çš„列(~C)"; - Text[ russian ] = "Ïîâòîð ñòîëáöà"; + Text[ russian ] = "Ïîâòîðèòü ñòîëáåö"; Text[ polish ] = "Kolumna powtórzona"; Text[ japanese ] = "ç¹°ã‚Šè¿”ã™åˆ—(~C)"; Text[ chinese_traditional ] = "é‡è¤‡çš„欄(~C)"; Text[ arabic ] = "ÇáÚãæÏ ÇáãßÑÑ"; Text[ greek ] = "Åðáíáëáì~âáíüìåíç óôÞëç"; - Text[ korean ] = "반복열(~C)"; + Text[ korean ] = "반복 ì—´(~C)"; Text[ turkish ] = "~Yinelenen sütun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columna a r~epetir"; + Text[ catalan ] = "Repeteix la ~columna"; + Text[ thai ] = "ทำ~คà¸à¸¥à¸±à¸¡à¸™à¹Œà¸‹à¹‰à¸³"; }; String STR_ADD { @@ -442,9 +452,9 @@ ModelessDialog RID_SCDLG_NAMES Text [ italian ] = "Aggiungi" ; Text [ portuguese_brazilian ] = "~Acrescentar" ; Text [ portuguese ] = "~Adicionar" ; - Text [ finnish ] = "~Lis??" ; + Text [ finnish ] = "~Lisää" ; Text [ danish ] = "Tilføj" ; - Text [ french ] = "~Ajouter" ; + Text [ french ] = "Ajouter" ; Text [ swedish ] = "~Lägg till" ; Text [ dutch ] = "Toe~voegen" ; Text [ spanish ] = "~Añadir" ; @@ -459,7 +469,8 @@ ModelessDialog RID_SCDLG_NAMES Text[ korean ] = "추가(~A)"; Text[ turkish ] = "~Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Añadir"; + Text[ catalan ] = "~Afegeix"; + Text[ thai ] = "เ~พิ่ม"; }; String STR_MODIFY { @@ -470,9 +481,9 @@ ModelessDialog RID_SCDLG_NAMES Text [ italian ] = "Modifica" ; Text [ portuguese_brazilian ] = "Modif~icar" ; Text [ portuguese ] = "~Modificar" ; - Text [ finnish ] = "~Muokkaa" ; + Text [ finnish ] = "~Muuta" ; Text [ danish ] = "Modificer" ; - Text [ french ] = "~Modifier" ; + Text [ french ] = "Modifier" ; Text [ swedish ] = "Än~dra" ; Text [ dutch ] = "Wij~zigen" ; Text [ spanish ] = "~Modificar" ; @@ -484,10 +495,11 @@ ModelessDialog RID_SCDLG_NAMES Text[ chinese_traditional ] = "變更(~I)"; Text[ arabic ] = "ÊÚÏíá"; Text[ greek ] = "Ôñïðïðïßçóç"; - Text[ korean ] = "ìˆ˜ì •(~I)"; + Text[ korean ] = "변경(~I)"; Text[ turkish ] = "~Deðiþtir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Modificar"; + Text[ catalan ] = "Mod~ifica"; + Text[ thai ] = "ดัดà¹~ปลง"; }; String STR_INVALIDSYMBOL { @@ -512,22 +524,24 @@ ModelessDialog RID_SCDLG_NAMES Text[ chinese_traditional ] = "無效的表述å¼"; Text[ arabic ] = "ÊÚÈíÑ ÛíÑ ÕÇáÍ"; Text[ greek ] = "Ìç Ýãêõñç Ýêöñáóç"; - Text[ korean ] = "ìœ íš¨í•˜ì§€ ì•Šì€ í‘œí˜„"; + Text[ korean ] = "ìž˜ëª»ëœ ì‹"; Text[ turkish ] = "Geçersiz terim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Expresión no válida"; + Text[ catalan ] = "L'expressió no és vàlida"; + Text[ thai ] = "นิพจน์ไม่ถูà¸à¸•à¹‰à¸à¸‡"; }; Text[ chinese_simplified ] = "定义å称"; - Text[ russian ] = "Ïðèñâîèòü èìÿ"; + Text[ russian ] = "Îïðåäåëèòü èìåíà"; Text[ polish ] = "Definiowanie nazw"; Text[ japanese ] = "åå‰ã®æŒ‡å®š"; Text[ chinese_traditional ] = "定義å稱"; Text[ arabic ] = "ÊÍÏíÏ ÇáÃÓãÇÁ"; Text[ greek ] = "Ïñéóìüò ïíïìÜôùí"; - Text[ korean ] = "ì´ë¦„ ì •ì˜"; + Text[ korean ] = "ì´ë¦„ ì§€ì •"; Text[ turkish ] = "Ad tanýmla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Definir nombres"; + Text[ catalan ] = "Defineix els noms"; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ชื่à¸"; }; @@ -539,3 +553,10 @@ ModelessDialog RID_SCDLG_NAMES + + + + + + + diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src index fa336f3de23d..36226948c84d 100644 --- a/sc/source/ui/src/opredlin.src +++ b/sc/source/ui/src/opredlin.src @@ -2,9 +2,9 @@ * * $RCSfile: opredlin.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:14:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,14 +77,14 @@ TabPage RID_SCPAGE_OPREDLINE Text [ english_us ] = "Chan~ges" ; Text [ portuguese_brazilian ] = "~?nderungen" ; Text [ swedish ] = "~Ändringar" ; - Text [ danish ] = "Ændringer" ; + Text [ danish ] = "~Ændringer" ; Text [ italian ] = "~Modifica" ; Text [ spanish ] = "~Modificaciones" ; Text [ french ] = "~Modifications" ; Text [ dutch ] = "~Wijzigingen" ; Text [ portuguese ] = "~Modificações" ; Text[ chinese_simplified ] = "更改(~G)"; - Text[ russian ] = "Èñïðàâëåíèÿ"; + Text[ russian ] = "Èçìåíåíèÿ"; Text[ polish ] = "Zmiany"; Text[ japanese ] = "変更(~G)"; Text[ chinese_traditional ] = "變更(~G)"; @@ -93,8 +93,9 @@ TabPage RID_SCPAGE_OPREDLINE Text[ korean ] = "변경(~G)"; Text[ turkish ] = "~Deðiþiklikler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Modificaciones"; + Text[ catalan ] = "Can~vis"; Text[ finnish ] = "Muu~tokset"; + Text[ thai ] = "เป~ลี่ยน"; }; FixedText FT_REMOVE { @@ -108,9 +109,9 @@ TabPage RID_SCPAGE_OPREDLINE Text [ swedish ] = "~Raderingar" ; Text [ danish ] = "Sletninger" ; Text [ italian ] = "~Elimina" ; - Text [ spanish ] = "~Eliminaciones" ; + Text [ spanish ] = "~Borrar" ; Text [ french ] = "~Suppressions" ; - Text [ dutch ] = "~Verwijderingen" ; + Text [ dutch ] = "V~erwijderingen" ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; Text[ russian ] = "Óäàëåíèÿ"; Text[ polish ] = "Usuniêcia"; @@ -121,8 +122,9 @@ TabPage RID_SCPAGE_OPREDLINE Text[ korean ] = "ì‚ì œ(~D)"; Text[ turkish ] = "~Silinenler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminaciones"; + Text[ catalan ] = "~Supressions"; Text[ finnish ] = "~Poistot"; + Text[ thai ] = "~ลบ"; }; FixedText FT_INSERT { @@ -135,7 +137,7 @@ TabPage RID_SCPAGE_OPREDLINE Text [ portuguese_brazilian ] = "~Einf?ungen" ; Text [ swedish ] = "~Infogningar" ; Text [ danish ] = "Indsættelser" ; - Text [ italian ] = "~Inserisci" ; + Text [ italian ] = "Inserisci" ; Text [ spanish ] = "~Inserciones" ; Text [ french ] = "~Insertions" ; Text [ dutch ] = "~Invoegingen" ; @@ -149,8 +151,9 @@ TabPage RID_SCPAGE_OPREDLINE Text[ korean ] = "삽입(~I)"; Text[ turkish ] = "~Eklemeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Inserciones"; - Text[ finnish ] = "~Lis?ykset"; + Text[ catalan ] = "~Insercions"; + Text[ finnish ] = "~Lisäykset"; + Text[ thai ] = "à¹~ทรà¸"; }; FixedText FT_MOVE { @@ -165,10 +168,10 @@ TabPage RID_SCPAGE_OPREDLINE Text [ danish ] = "Flytninger" ; Text [ italian ] = "~Sposta" ; Text [ spanish ] = "~Desplazamientos" ; - Text [ french ] = "~Déplacements" ; - Text [ dutch ] = "~Verplaatsingen" ; + Text [ french ] = "Déplacements" ; + Text [ dutch ] = "Ver~plaatsingen" ; Text[ chinese_simplified ] = "移动(~M)"; - Text[ russian ] = "Cìåùåíèÿ"; + Text[ russian ] = "Ïåðåìåùåííûå ýëåìåíòû"; Text[ polish ] = "Przesuniêcia"; Text[ japanese ] = "移動(~M)"; Text[ chinese_traditional ] = "移動(~M)"; @@ -177,8 +180,9 @@ TabPage RID_SCPAGE_OPREDLINE Text[ korean ] = "ì´ë™(~M)"; Text[ turkish ] = "~Taþýnan giriþler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Desplazamientos"; - Text[ finnish ] = "~Siirretyt merkinn?t"; + Text[ catalan ] = "Entrades ~mogudes"; + Text[ finnish ] = "~Siirretyt merkinnät"; + Text[ thai ] = "~ย้ายรายà¸à¸²à¸£"; }; FixedLine GB_COLORCHGS { @@ -190,7 +194,7 @@ TabPage RID_SCPAGE_OPREDLINE Text [ english_us ] = "Colors for changes" ; Text [ portuguese_brazilian ] = "Farbgebung f? ?nderungen" ; Text [ swedish ] = "Färggivning för ändringar" ; - Text [ danish ] = "Farver for ændringer" ; + Text [ danish ] = "Farve til markering af ændringer" ; Text [ italian ] = "Colori per i comandi" ; Text [ spanish ] = "Colores para las modificaciones" ; Text [ french ] = "Couleurs pour les modifications" ; @@ -205,8 +209,9 @@ TabPage RID_SCPAGE_OPREDLINE Text[ korean ] = "변경 색ìƒ"; Text[ turkish ] = "Deðiþiklikleri gösteren renkler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Colores para las modificaciones"; + Text[ catalan ] = "Colors per als canvis"; Text[ finnish ] = "Muutosten värit"; + Text[ thai ] = "สีสำหรับเปลี่ยน"; }; ListBox CLB_CONTENT { @@ -246,21 +251,22 @@ TabPage RID_SCPAGE_OPREDLINE Text [ swedish ] = "Efter författare" ; Text [ danish ] = "Efter forfatter" ; Text [ italian ] = "per autore" ; - Text [ spanish ] = "Según autor" ; + Text [ spanish ] = "Por autor" ; Text [ french ] = "Par auteur" ; Text [ dutch ] = "Naar auteur" ; Text[ chinese_simplified ] = "ä¾ä½œè€…设定"; Text[ russian ] = "Ïî àâòîðó"; Text[ polish ] = "Wed³ug autora"; - Text[ japanese ] = "作æˆè€…ã¹ã¤"; + Text[ japanese ] = "作æˆè€…別"; Text[ chinese_traditional ] = "ä¾ä½œè€…è¨å®š"; Text[ arabic ] = "ÍÓÈ ÇáãÄáÝ"; Text[ greek ] = "ÊáôÜ óõíôÜêôç"; - Text[ korean ] = "작성ìž"; + Text[ korean ] = "ìž‘ì„±ìž ì„¤ì •"; Text[ turkish ] = "Yazana göre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Según autor"; - Text[ finnish ] = "Laatija"; + Text[ catalan ] = "Per l'autor"; + Text[ finnish ] = "Tekijä"; + Text[ thai ] = "โดยผู้à¹à¸•à¹ˆà¸‡"; }; }; @@ -274,3 +280,11 @@ TabPage RID_SCPAGE_OPREDLINE + + + + + + + + diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src index 2e5934574f82..5ff9a654b06c 100644 --- a/sc/source/ui/src/optdlg.src +++ b/sc/source/ui/src/optdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: optdlg.src,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: kz $ $Date: 2002-12-09 10:02:40 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -404,7 +404,7 @@ TabPage RID_SCPAGE_CALC QuickHelpText[ arabic ] = "0 corresponds to 12/30/1899"; QuickHelpText[ italian ] = "Il valore 0 corrisponde a 30/12/1899"; Text[ greek ] = "30/12/1899 (~ÐñïåðéëïãÞ)"; - Text[ korean ] = "1899/12/30 (표준)(~U)"; + Text[ korean ] = "1899/12/30 (기본값)(~U)"; QuickHelpText[ greek ] = "ÔéìÞ 0 áíôéóôïé÷åß óôçí ôéìÞ 30/12/1899"; QuickHelpText[ korean ] = "ê°’0ì€ 1899,12,30ì— ì¼ì¹˜"; Text[ turkish ] = "30.12.1899 ( ~Standart )"; @@ -585,7 +585,7 @@ TabPage RID_SCPAGE_CALC Text[ chinese_traditional ] = "å°æ•¸é»žä½æ•¸(~D)"; Text[ arabic ] = "ÇáãäÇÒá ÇáÚÔÑíÉ"; Text[ greek ] = "ÄåêáäéêÜ øçößá"; - Text[ korean ] = "소수ì ì´í•˜ ìžë¦¬(~D)"; + Text[ korean ] = "소수ì ì´í•˜ ìžë¦¿ìˆ˜(~D)"; Text[ turkish ] = "~Ondalýk hane"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de ~decimals"; @@ -667,7 +667,7 @@ TabPage RID_SCPAGE_CALC Text [ ENGLISH ] = "Search cri~terias = and <> must match entire cells" ; Text [ english_us ] = "Search criteria = and <> must apply to ~whole cells" ; Text [ italian ] = "I criteri di ricerca = ed <> devono riferirsi a celle intere" ; - Text [ spanish ] = "Criterios de ~búsqueda = y <> deben coincidir con celdas completas" ; + Text [ spanish ] = "Los criterios de ~búsqueda = y <> deben referirse a celdas completas" ; Text [ french ] = "Critères de recherche = et <> doivent correspondre à des lignes entières" ; Text [ dutch ] = "~Zoekcriteria = en <> moeten op hele cellen toepasbaar zijn" ; Text [ swedish ] = "Sö~kkriterier = och <> måste matcha hela celler" ; @@ -704,13 +704,13 @@ TabPage RID_SCPAGE_CALC Text [ portuguese_brazilian ] = "Enable regular expressions in formulas" ; Text [ portuguese ] = "Permitir expressões regulares em ~fórmulas" ; Text[ chinese_simplified ] = "å…许公å¼å«æœ‰å¸¸è§„表达å¼(~E)"; - Text[ russian ] = "Ïîçâîëèòü ðåãóëÿðíûå âûðàæåíèÿ â ôîðìóëàõ"; + Text[ russian ] = "Ïîçâîëèòü ðåãóëÿðíûå ~âûðàæåíèÿ â ôîðìóëàõ"; Text[ polish ] = "Dopuœæ w formu³ach wyra¿enia regularne"; Text[ japanese ] = "æ•°å¼ã§æ£è¦è¡¨ç¾ã‚’使ã†(~E)"; Text[ chinese_traditional ] = "å…許公å¼å«æœ‰å¸¸è¦è¡¨é”å¼(~E)"; Text[ arabic ] = "Enable regular expressions in formulas"; Text[ greek ] = "Enable regular expressions in formulas"; - Text[ korean ] = "ì–‘ì‹ì—ì„œ ì •ê·œì‹ í™œì„±í™”(~E)"; + Text[ korean ] = "수ì‹ì—ì„œ ì •ê·œì‹ í™œì„±í™”(~E)"; Text[ turkish ] = "Enable regular expressions in formulas"; Text[ language_user1 ] = " "; Text[ finnish ] = "Ot~a säännölliset lausekkeet käyttöön kaavoissa"; @@ -739,7 +739,7 @@ TabPage RID_SCPAGE_CALC Text[ chinese_traditional ] = "自動æœå°‹åˆ—/欄標題(~A)"; Text[ arabic ] = "ÇáÈÍË Úä ÚäÇæíä ÇáÃÚãÏÉ æÇáÕÝæÝ ÊáÞÇÆíÇð"; Text[ greek ] = "Áõôüìáôç áíáæÞôçóç åðéãñáöþí óôçëþí/ãñáììþí"; - Text[ korean ] = "ì—´ê³¼ í–‰ì˜ ë¼ë²¨ ìžë™ 찾기(~A)"; + Text[ korean ] = "ì—´ ë° í–‰ì˜ ë ˆì´ë¸”ì„ ìžë™ìœ¼ë¡œ 찾기(~A)"; Text[ turkish ] = "Sütun/satýr baþlýklarýný otomatik olarak ara"; Text[ language_user1 ] = " "; Text[ finnish ] = "~Hae sarakkeiden ja rivien selitteet automaattisesti "; @@ -951,7 +951,7 @@ TabPage RID_SCPAGE_USERLISTS Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; Text[ russian ] = "Óäàëèòü"; @@ -1037,7 +1037,7 @@ TabPage RID_SCPAGE_USERLISTS Text [ french ] = "Êtes-vous sûr de vouloir supprimer l'entrée\n#\n ?" ; Text [ swedish ] = "Skall posten\n#\nraderas?" ; Text [ dutch ] = "Wilt u \n#\nverwijderen?" ; - Text [ spanish ] = "¿Desea eliminar la entrada\n\n#\\?" ; + Text [ spanish ] = "¿Desea borrar la entrada\n\n#\\?" ; Text [ english_us ] = "Should the entry\n#\nbe deleted?" ; Text[ chinese_simplified ] = "您è¦åˆ 除这个æ¡ç›®\n#？"; Text[ russian ] = "Óäàëèòü ýëåìåíò\n#\n?"; @@ -1099,7 +1099,7 @@ TabPage RID_SCPAGE_USERLISTS Text[ chinese_traditional ] = "清單從"; Text[ arabic ] = "ÞÇÆãÉ ãä"; Text[ greek ] = "Ëßóôá áðü"; - Text[ korean ] = "ë¡œë¶€í„°ì˜ ëª©ë¡"; + Text[ korean ] = "ëª©ë¡ ì¶œì²˜"; Text[ turkish ] = "Liste kaynaðý"; Text[ language_user1 ] = " "; Text[ finnish ] = "Luettelo"; @@ -1120,13 +1120,13 @@ TabPage RID_SCPAGE_USERLISTS Text [ portuguese_brazilian ] = "Zellen ohne einfachen Text wurden ignoriert." ; Text [ portuguese ] = "As células sem texto foram ignoradas." ; Text[ chinese_simplified ] = "忽略ä¸å«æ–‡å—çš„å•å…ƒæ ¼ã€‚"; - Text[ russian ] = "ß÷åéêè áåç îáû÷íîãî òåêñòà ïðîïóùåíû."; + Text[ russian ] = "ß÷åéêè áåç òåêñòà ïðîïóùåíû."; Text[ polish ] = "Komórki bez tekstu zosta³y zignorowane."; Text[ japanese ] = "テã‚ストã®ãªã„セルã¯ç„¡è¦–ã•ã‚Œã¾ã—ãŸã€‚"; Text[ chinese_traditional ] = "忽略ä¸å«æ–‡å—的儲å˜æ ¼ã€‚"; Text[ arabic ] = "Êã ÊÌÇåá ÇáÎáÇíÇ ÇáÊí áÇ ÊÍÊæí Úáì äÕ ÈÓíØ."; Text[ greek ] = "Ôá êåëéÜ ÷ùñßò áðëü êåßìåíï Ý÷ïõí ðáñáâëåèåß."; - Text[ korean ] = "í…스트 없는 ì…€ 무시"; + Text[ korean ] = "í…스트 없는 ì…€ì€ ë¬´ì‹œë©ë‹ˆë‹¤."; Text[ turkish ] = "Metinsiz hücreler yok sayýldý."; Text[ language_user1 ] = " "; Text[ finnish ] = "Tekstittömät solut ohitettiin."; @@ -1260,7 +1260,7 @@ TabPage RID_SCPAGE_CONTENT Text [ dutch ] = "~Pagina-einde" ; Text [ portuguese ] = "~Quebras de página" ; Text[ chinese_simplified ] = "æ¢é¡µ(~P)"; - Text[ russian ] = "Ðàçðûâû ñòðàíèöû"; + Text[ russian ] = "Ðàçð~ûâû ñòðàíèöû"; Text[ polish ] = "Podzia³y ~strony"; Text[ japanese ] = "改ページ(~P)"; Text[ chinese_traditional ] = "æ›é (~P)"; @@ -1281,7 +1281,7 @@ TabPage RID_SCPAGE_CONTENT Text [ ENGLISH ] = "Guides ~while moving" ; Text[ english_us ] = "Guides ~while moving"; Text[ portuguese ] = "Guias durante o movimento"; - Text[ russian ] = "Íàïðàâëÿþùèå ïðè ïåðåìåùåíèè"; + Text[ russian ] = "Íàïðàâëÿþùèå ~ïðè ïåðåìåùåíèè"; Text[ greek ] = "Âïçèçô~éêÝò ãñáììÝò êáôÜ ôç ìåôáêßíçóç"; Text[ dutch ] = "H~ulplijnen tijdens de beweging"; Text[ french ] = "Repères lors du déplacement"; @@ -1292,7 +1292,7 @@ TabPage RID_SCPAGE_CONTENT Text[ polish ] = "Linie pomocnicze podczas przesuwania"; Text[ portuguese_brazilian ] = "Guides while moving"; Text[ japanese ] = "移動時ã®è£œåŠ©ç·š(~W)"; - Text[ korean ] = "ì´ë™ì‹œì— ì•ˆë‚´ì„ (~W)"; + Text[ korean ] = "ì´ë™ì‹œ ì•ˆë‚´ì„ (~W)"; Text[ chinese_simplified ] = "移动时显示辅助线(~W)"; Text[ chinese_traditional ] = "移動時顯示輔助線(~W)"; Text[ turkish ] = "Guides while moving"; @@ -1466,7 +1466,7 @@ TabPage RID_SCPAGE_CONTENT Text [ portuguese ] = "~Indicador de anotações" ; Text [ finnish ] = "Huomautusilmaisin" ; Text [ danish ] = "Note~indikator" ; - Text [ french ] = "Indicateur de ~notes" ; + Text [ french ] = "Indicateur de ~note" ; Text [ swedish ] = "Ante~ckningsmarkör" ; Text [ dutch ] = "Aantekeningenwij~zer" ; Text [ spanish ] = "I~ndicador de notas" ; @@ -1655,7 +1655,7 @@ TabPage RID_SCPAGE_CONTENT Text[ chinese_traditional ] = "物件åŠåœ–å½¢(~J)"; Text[ arabic ] = "ßÇÆäÇÊ/ÕæÑ"; Text[ greek ] = "Áíôéêåßìåíá/~ÃñáöéêÜ"; - Text[ korean ] = "대ìƒ/그래픽(~J)"; + Text[ korean ] = "개체/그림(~J)"; Text[ turkish ] = "~Nesne/grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ob~jectes/Gràfics"; @@ -1795,7 +1795,7 @@ TabPage RID_SCPAGE_CONTENT Text[ chinese_traditional ] = "欄標題和列標題(~M)"; Text[ arabic ] = "ÑÄæÓ ÇáÃÓØÑ æÇáÃÚãÏÉ"; Text[ greek ] = "~Êåöáëßäåò ãñáììþí/óôçëþí"; - Text[ korean ] = "행과 ì—´ 머리글(~M)"; + Text[ korean ] = "í–‰ 머리글/ì—´ 머리글(~M)"; Text[ turkish ] = "Sa~týr ve sütun baþlýklarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Capçaleres de colu~mnes/files"; @@ -1825,7 +1825,7 @@ TabPage RID_SCPAGE_CONTENT Text[ chinese_traditional ] = "æ°´å¹³å¼æ²è»¸(~Z)"; Text[ arabic ] = "ÔÑíØ ÊÍÑíß ÇáÕÝÍÉ ÃÝÞíÇð"; Text[ greek ] = "Ïñéæüíôéá ãñáììÞ êýëéó~çò"; - Text[ korean ] = "ìˆ˜í‰ ìŠ¤í¬ë¡¤(~Z)"; + Text[ korean ] = "ìˆ˜í‰ ìŠ¤í¬ë¡¤ 막대(~Z)"; Text[ turkish ] = "~Yatay kaydýrma çubuðu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra de desplaçament horit~zontal"; @@ -1855,7 +1855,7 @@ TabPage RID_SCPAGE_CONTENT Text[ chinese_traditional ] = "åž‚ç›´å¼æ²è»¸(~V)"; Text[ arabic ] = "ÔÑíØ ÊÍÑíß ÇáÕÝÍÉ ÑÃÓíÇð"; Text[ greek ] = "Êáôáêüñõöç ãñáììÞ êý~ëéóçò"; - Text[ korean ] = "ìˆ˜ì§ ìŠ¤í¬ë¡¤(~V)"; + Text[ korean ] = "ìˆ˜ì§ ìŠ¤í¬ë¡¤ 막대(~V)"; Text[ turkish ] = "~Dikey kaydýrma çubuðu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra de desplaçament ~vertical"; @@ -1915,7 +1915,7 @@ TabPage RID_SCPAGE_CONTENT Text[ chinese_traditional ] = "大綱圖示(~O)"; Text[ arabic ] = "ÑãæÒ ÇáÊÞÓíã"; Text[ greek ] = "Óýìâïëá äéÜñèñùóçò"; - Text[ korean ] = "아웃트ë¼ì¸ 기호(~O)"; + Text[ korean ] = "개요 기호(~O)"; Text[ turkish ] = "A~nahat simgesi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Símbols del c~ontorn"; @@ -2322,7 +2322,7 @@ TabPage RID_SCPAGE_LAYOUT Text[ polish ] = "Tabulator"; Text[ portuguese_brazilian ] = "Tab stops"; Text[ japanese ] = "タブ間隔(~T)"; - Text[ korean ] = "íƒ(~T)"; + Text[ korean ] = "íƒ ê°„ê²©(~T)"; Text[ chinese_simplified ] = "制表符(~T)"; Text[ chinese_traditional ] = "定ä½éµ(~T)"; Text[ turkish ] = "Tab stops"; @@ -2487,7 +2487,7 @@ TabPage RID_SCPAGE_LAYOUT Text[ spanish ] = "~Nunca"; Text[ english_us ] = "~Never"; Text[ chinese_simplified ] = "永远ä¸(~N)"; - Text[ russian ] = "Íèêîãäà"; + Text[ russian ] = "Íè~êîãäà"; Text[ polish ] = "Nigdy"; Text[ japanese ] = "ã—ãªã„(~N)"; Text[ chinese_traditional ] = "æ°¸ä¸(~N)"; @@ -2692,7 +2692,7 @@ TabPage RID_SCPAGE_LAYOUT }; StringList [ korean ] = { - < "아래" ; Default ; > ; + < "아래로" ; Default ; > ; < "오른쪽" ; Default ; > ; < "위" ; Default ; > ; < "왼쪽" ; Default ; > ; @@ -2772,20 +2772,20 @@ TabPage RID_SCPAGE_LAYOUT Text [ swedish ] = "Utöka ~formatering" ; Text [ danish ] = "~Udvid formatering" ; Text [ italian ] = "~Espandi formattazione" ; - Text [ spanish ] = "Extender ~formato" ; + Text [ spanish ] = "Expandir ~formato" ; Text [ french ] = "Expansion du ~formatage" ; Text [ dutch ] = "~Opmaakbereik uitbreiden" ; Text [ portuguese_brazilian ] = "Formatierung ausdehnen" ; Text [ portuguese ] = "Expandir ~formatação" ; Text[ chinese_simplified ] = "套用å‰ä¸€ä¸ªå•å…ƒæ ¼æ ¼å¼(~F)"; - Text[ russian ] = "Ðàñòÿíóòü ôîðìàòèðîâàíèå"; + Text[ russian ] = "Ðàñòÿíóòü ~ôîðìàòèðîâàíèå"; Text[ polish ] = "Rozszerz formatowanie"; Text[ japanese ] = "書å¼ã®æ‹¡å¼µ(~F)"; Text[ chinese_traditional ] = "採用å‰ä¸€å€‹å„²å˜æ ¼çš„æ ¼å¼(~F)"; Text[ arabic ] = "ÊæÓíÚ ÇáÊäÓíÞ"; Text[ language_user1 ] = " "; Text[ greek ] = "ÅðÝêô~áóç ôçò ìïñöïðïßçóçò"; - Text[ korean ] = "ì„œì‹ ì—°ìž¥(~F)"; + Text[ korean ] = "ì„œì‹ í™•ìž¥(~F)"; Text[ turkish ] = "~Formatlamayý geniþlet"; Text[ finnish ] = "Laajenna m~uotoilua"; Text[ catalan ] = "Expandeix el ~formatatge"; @@ -2813,7 +2813,7 @@ TabPage RID_SCPAGE_LAYOUT Text[ chinese_traditional ] = "擴展顯示æ’入的列欄åƒç…§(~R)"; Text[ arabic ] = "ÊæÓíÚ ÇáãÑÇÌÚ ÚäÏ ÅÏÑÇÌ ÃÚãÏÉ Ãæ ÕÝæÝ"; Text[ greek ] = "ÅðÝêôáóç ôùí áíáöï~ñþí êáôÜ ôçí åéóáãùãÞ ôùí óôçëþí/ãñáììþí"; - Text[ korean ] = "행과 ì—´ 삽입시 í…Œë‘리로 참조 확장(~R)"; + Text[ korean ] = "행과 ì—´ì„ ì‚½ìž…í• ë•Œ í…Œë‘리로 참조를 확장(~R)"; Text[ turkish ] = "Yeni sütun/satýr eklendiðinde refera~nslarý kenarlardan geniþlet"; Text[ language_user1 ] = " "; Text[ finnish ] = "Laajenna ~viitteitä, jos uusia rivejä tai sarakkeita lisätään"; @@ -2869,7 +2869,7 @@ TabPage RID_SCPAGE_LAYOUT Text[ polish ] = "Do sformatowania tekstu u¿yj parametrów drukarki"; Text[ portuguese_brazilian ] = "Use printer metrics for text formatting"; Text[ japanese ] = "文書書å¼è¨å®šã®å°åˆ·ç¯„囲を使用"; - Text[ korean ] = "í…스트 ì„œì‹ ì§€ì •ì—ì„œ 프린터 ë©”íŠ¸ë¦ ì‚¬ìš©"; + Text[ korean ] = "문서 ì„œì‹ ì„¤ì •ì—ì„œ 프린터 ë©”íŠ¸ë¦ ì‚¬ìš©"; Text[ chinese_simplified ] = "æ–‡å—æ ¼å¼åŒ–采用打å°ç‰ˆå¼"; Text[ chinese_traditional ] = "æ–‡å—æ ¼å¼åŒ–採用列å°ç‰ˆå¼"; Text[ turkish ] = "Use printer metrics for text formatting"; @@ -2896,7 +2896,7 @@ TabPage RID_SCPAGE_LAYOUT Text[ swedish ] = "Visa ~varning för att skriva över när data klistras in"; Text[ polish ] = "Show overwrite ~warning when pasting data"; Text[ japanese ] = "データを挿入ã™ã‚‹éš›ã€ãƒ‡ãƒ¼ã‚¿ä¸Šæ›¸ãã®ç¢ºèªã‚’ã™ã‚‹"; - Text[ korean ] = "ë°ì´í„°ë¥¼ ë¶™ì—¬ë„£ì„ ë•Œ ê²¹ì³ì“°ê¸° ê²½ê³ í‘œì‹œ"; + Text[ korean ] = "ë°ì´í„°ë¥¼ ë¶™ì—¬ë„£ê¸°í• ë•Œ ê²¹ì³ì“°ê¸° ê²½ê³ í‘œì‹œ"; Text[ chinese_simplified ] = "粘贴数æ®æ—¶æ˜¾ç¤ºæ”¹å†™è¦å‘Š"; Text[ chinese_traditional ] = "貼上資料時顯示覆寫è¦å‘Š"; Text[ turkish ] = "Show overwrite ~warning when pasting data"; @@ -2953,7 +2953,7 @@ TabPage RID_SCPAGE_PRINT Text [ ENGLISH ] = "~Suppress output of empty pages" ; Text[ english_us ] = "~Suppress output of empty pages"; Text[ portuguese ] = "~Não imprimir páginas vazias"; - Text[ russian ] = "~Ïîäàâëÿòü âûâîä ïóñòûõ ñòðàíèö"; + Text[ russian ] = "Ïî~äàâëÿòü âûâîä ïóñòûõ ñòðàíèö"; Text[ greek ] = "~Suppress output of empty pages"; Text[ dutch ] = "~Weergave van lege pagina's onderdrukken"; Text[ french ] = "Ignorer les pages vides pour l'impression"; @@ -2965,7 +2965,7 @@ TabPage RID_SCPAGE_PRINT Text[ polish ] = "~Nie drukuj pustych stron"; Text[ portuguese_brazilian ] = "~Suppress output of empty pages"; Text[ japanese ] = "空白ã®ãƒšãƒ¼ã‚¸ã‚’出力ã—ãªã„(~S)"; - Text[ korean ] = "빈 페ì´ì§€ ì¶œë ¥ 안함(~S)"; + Text[ korean ] = "빈 페ì´ì§€ëŠ” ì¶œë ¥í•˜ì§€ ì•ŠìŒ(~S)"; Text[ chinese_simplified ] = "ä¸æ‰“å°ç©ºç™½é¡µé¢(~S)"; Text[ chinese_traditional ] = "ä¸åˆ—å°ç©ºç™½é é¢(~S)"; Text[ turkish ] = "~Suppress output of empty pages"; @@ -3052,3 +3052,8 @@ TabPage RID_SCPAGE_PRINT + + + + + diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index 0cb15f9a811b..204bc6f27f65 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -2,9 +2,9 @@ * * $RCSfile: popup.src,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:27:23 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,7 +122,7 @@ Menu RID_POPUP_CELLS Text[ chinese_traditional ] = "標準(~D)"; Text[ arabic ] = "ÇÝÊÑÇÖí~"; Text[ greek ] = "~ÐñïåðéëïãÞ"; - Text[ korean ] = "기본 ê°’(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "~Standart"; Text[ catalan ] = "Per ~defecte"; Text[ finnish ] = "~Palauta oletustyyli"; @@ -155,7 +155,7 @@ Menu RID_POPUP_CELLS Text[ chinese_traditional ] = "儲å˜æ ¼æ ¼å¼åŒ–(~F)..."; Text[ arabic ] = "...ÊäÓíÞ ÇáÎáÇíÇ"; Text[ greek ] = "Ìïñöï~ðïßçóç êåëéþí..."; - Text[ korean ] = "ì…€ ì„œì‹ ì§€ì •(~F)..."; + Text[ korean ] = "ì…€ ì„œì‹ ì„¤ì •(~F)..."; Text[ turkish ] = "Hücreleri formatla..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Formata les cel.les..."; @@ -209,7 +209,7 @@ Menu RID_POPUP_CELLS Text [ french ] = "Suppr~imer des cellules..." ; Text [ swedish ] = "Radera ce~ller..." ; Text [ dutch ] = "Cellen ~wissen..." ; - Text [ spanish ] = "~Eliminar celdas..." ; + Text [ spanish ] = "~Borrar celdas..." ; Text [ english_us ] = "De~lete Cells..." ; Text[ chinese_simplified ] = "åˆ é™¤å•å…ƒæ ¼(~L)..."; Text[ russian ] = "Óäàëèòü ÿ÷åéêè..."; @@ -239,7 +239,7 @@ Menu RID_POPUP_CELLS Text [ french ] = "Supprimer du ~contenu..." ; Text [ swedish ] = "Ra~dera innehåll..." ; Text [ dutch ] = "In~houd wissen..." ; - Text [ spanish ] = "Eliminar contenidos..." ; + Text [ spanish ] = "~Borrar contenido..." ; Text [ english_us ] = "Delete C~ontents..." ; Text[ chinese_simplified ] = "åˆ é™¤å†…å®¹(~O)..."; Text[ russian ] = "Óäàëèòü ñîäåðæèìîå..."; @@ -469,7 +469,7 @@ String RID_POPUP_TAB Text[ chinese_traditional ] = "工作表工具列的快顯功能表"; Text[ arabic ] = "ÞÇÆãÉ ãäÈËÞÉ áÔÑíØ ÌÏæá"; Text[ greek ] = "Áíáäõüìåíï ìåíïý ãéá ãñáììÞ ðßíáêá"; - Text[ korean ] = "시트 표시줄 íŒì—…메뉴"; + Text[ korean ] = "시트 표시줄 íŒì—… 메뉴"; Text[ turkish ] = "Tablo çubuðu için popup mönü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Menú emergent de la barra del full"; @@ -525,7 +525,7 @@ Menu RID_POPUP_TAB Text [ french ] = "~Supprimer la feuille..." ; Text [ swedish ] = "~Radera tabell..." ; Text [ dutch ] = "~Wissen..." ; - Text [ spanish ] = "Eli~minar hoja..." ; + Text [ spanish ] = "~Borrar hoja..." ; Text [ english_us ] = "~Delete Sheet..." ; Text[ chinese_simplified ] = "åˆ é™¤å·¥ä½œè¡¨(~D)..."; Text[ russian ] = "Óäàëèòü..."; @@ -582,7 +582,7 @@ Menu RID_POPUP_TAB Text [ portuguese ] = "~Mover/Copiar..." ; Text [ finnish ] = "~Siirrä/kopioi..." ; Text [ danish ] = "Flyt/kopier..." ; - Text [ french ] = "~Déplacer/Copier la feuille..." ; + Text [ french ] = "~Déplacer/copier la feuille..." ; Text [ swedish ] = "~Flytta/kopiera tabell..." ; Text [ dutch ] = "~Verplaatsen/kopiëren..." ; Text [ spanish ] = "~Desplazar/copiar hoja..." ; @@ -720,7 +720,7 @@ Menu RID_POPUP_PIVOT Text[ chinese_traditional ] = "æ›´æ–°(~R)"; Text[ arabic ] = "ÊÍÏíË"; Text[ greek ] = "Å~íçìÝñùóç"; - Text[ korean ] = "ì—…ë°ì´íŠ¸(~R)"; + Text[ korean ] = "새로 ê³ ì¹¨(~R)"; Text[ turkish ] = "Güncelle"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Refresca"; @@ -757,7 +757,7 @@ Menu RID_POPUP_PIVOT Text [ french ] = "~Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; Text[ russian ] = "Óäàëèòü"; @@ -788,7 +788,7 @@ String RID_POPUP_PREVIEW Text [ french ] = "Menu Pop-up pour l'aperçu de page" ; Text [ swedish ] = "Popupmeny för sidförhandsvisning" ; Text [ dutch ] = "PopUp-menu voor paginavoorbeeld" ; - Text [ spanish ] = "Menú para la previsualización" ; + Text [ spanish ] = "Menú de la vista preliminar" ; Text [ english_us ] = "Page Preview pop-up menu" ; Text[ chinese_simplified ] = "页é¢é¢„览弹出å¼èœå•"; Text[ russian ] = "Âñïëûâàþùåå ìåíþ ïðåäâàðèòåëüíîãî ïðîñìîòðà ñòðàíèöû"; @@ -797,7 +797,7 @@ String RID_POPUP_PREVIEW Text[ chinese_traditional ] = "é é¢æª¢è¦–快顯功能表"; Text[ arabic ] = "ÞÇÆãÉ ãäÈËÞÉ áãÚÇíäÉ ÇáÕÝÍÉ"; Text[ greek ] = "Áíáäõüìåíï ìåíïý ðñïåðéóêüðçóçò óåëßäáò"; - Text[ korean ] = "페ì´ì§€ 미리보기 íŒì—… 메뉴"; + Text[ korean ] = "페ì´ì§€ 미리 보기 íŒì—… 메뉴"; Text[ turkish ] = "Sayfa önizlemesi için popup mönü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Menú emergent de la vista preliminar"; @@ -892,7 +892,7 @@ Menu RID_POPUP_PREVIEW Text[ chinese_traditional ] = "é é¢ç‰ˆå¼(~G)..."; Text[ arabic ] = "ÊÎØíØ ÇáÕÝÍÉ..."; Text[ greek ] = "ÄéÜô~áîç óåëßäáò..."; - Text[ korean ] = "페ì´ì§€ ë ˆì´ì•„웃(~G)..."; + Text[ korean ] = "페ì´ì§€ 모양(~G)..."; Text[ turkish ] = "Sayfa düzeni..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Disseny de pà~gina..."; @@ -940,18 +940,18 @@ Menu RID_POPUP_PREVIEW Text[ russian ] = "Close Pre~view"; Text[ greek ] = "Close Pre~view"; Text[ dutch ] = "Close Pre~view"; - Text[ french ] = "Close Pre~view"; - Text[ spanish ] = "Close Pre~view"; + Text[ french ] = "Fermer l'~aperçu"; + Text[ spanish ] = "Cerrar ~previsualización"; Text[ finnish ] = "Close Pre~view"; - Text[ italian ] = "Close Pre~view"; + Text[ italian ] = "Chiudi anteprima"; Text[ danish ] = "Close Pre~view"; - Text[ swedish ] = "Close Pre~view"; + Text[ swedish ] = "Stäng förh~andsvisning"; Text[ polish ] = "Close Pre~view"; Text[ portuguese_brazilian ] = "Close Pre~view"; - Text[ japanese ] = "Close Pre~view"; - Text[ korean ] = "Close Pre~view"; - Text[ chinese_simplified ] = "Close Pre~view"; - Text[ chinese_traditional ] = "Close Pre~view"; + Text[ japanese ] = "プレビューを閉ã˜ã‚‹(~V)"; + Text[ korean ] = "미리 보기 닫기"; + Text[ chinese_simplified ] = "å…³é—预览(~V)"; + Text[ chinese_traditional ] = "關閉é 覽(~V)"; Text[ turkish ] = "Close Pre~view"; Text[ arabic ] = "Close Pre~view"; Text[ catalan ] = "Close Pre~view"; @@ -1015,7 +1015,7 @@ Menu RID_POPUP_EDIT Text[ chinese_traditional ] = "標準(~D)"; Text[ arabic ] = "~ÞíÇÓí"; Text[ greek ] = "~ÐñïåðéëïãÞ"; - Text[ korean ] = "기본 ê°’(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "~Standart"; Text[ language_user1 ] = " "; Text[ catalan ] = "Per ~defecte"; @@ -1142,7 +1142,7 @@ Menu RID_POPUP_EDIT Text[ chinese_traditional ] = "上標(~U)"; Text[ arabic ] = "ãÑÊÝÚ"; Text[ greek ] = "ÅêèÝô~çò"; - Text[ korean ] = "윗 첨ìž(~U)"; + Text[ korean ] = "위 첨ìž(~U)"; Text[ turkish ] = "Üst simge"; Text[ language_user1 ] = " "; Text[ catalan ] = "Superíndex"; @@ -1297,7 +1297,7 @@ Menu RID_POPUP_AUDIT Text [ french ] = "~Supprimer le repérage des antécédents" ; Text [ swedish ] = "Ta bort spår till öv~erordnade" ; Text [ dutch ] = "Spoor naar voorganger v~erwijderen" ; - Text [ spanish ] = "~Eliminar rastro a precedente" ; + Text [ spanish ] = "~Borrar rastro de precedentes" ; Text [ english_us ] = "~Remove Precedent" ; Text[ chinese_simplified ] = "åˆ é™¤å‘å‰çš„追踪ç®å¤´(~R)"; Text[ russian ] = "Óäàëèòü ñòðåëêè ê âëèÿþùèì ÿ÷åéêàì"; @@ -1357,7 +1357,7 @@ Menu RID_POPUP_AUDIT Text [ french ] = "S~upprimer le repérage des dépendants" ; Text [ swedish ] = "Ta bort spår till un~derordnade" ; Text [ dutch ] = "Spoor naar opvolger ve~rwijderen" ; - Text [ spanish ] = "~Eliminar rastro a dependiente" ; + Text [ spanish ] = "~Borrar rastro a dependiente" ; Text [ english_us ] = "Remove Dependent" ; Text[ chinese_simplified ] = "åˆ é™¤å‘åŽçš„追踪ç®å¤´"; Text[ russian ] = "Óäàëèòü ñòðåëêè ê çàâèñèìûì ÿ÷åéêàì"; @@ -1387,7 +1387,7 @@ Menu RID_POPUP_AUDIT Text [ french ] = "Su~pprimer tous les repères" ; Text [ swedish ] = "Ta bort ~alla spår" ; Text [ dutch ] = "~Alle sporen verwijderen" ; - Text [ spanish ] = "Eliminar ~todos los rastros" ; + Text [ spanish ] = "Borrar rastro de los d~ependientes" ; Text [ english_us ] = "Remove ~All Traces" ; Text[ chinese_simplified ] = "åˆ é™¤å…¨éƒ¨çš„è¿½è¸ªç®å¤´(~A)"; Text[ russian ] = "Óäàëèòü âñå ñòðåëêè"; @@ -1488,7 +1488,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "標準(~D)"; Text[ arabic ] = "~ÞíÇÓí"; Text[ greek ] = "~ÐñïåðéëïãÞ"; - Text[ korean ] = "기본 ê°’(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "~Standart"; Text[ language_user1 ] = " "; Text[ catalan ] = "Per ~defecte"; @@ -1522,7 +1522,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "儲å˜æ ¼æ ¼å¼åŒ–(~F)..."; Text[ arabic ] = "ÊäÓíÞ ÇáÎáÇíÇ..."; Text[ greek ] = "Ìïñöï~ðïßçóç êåëéþí..."; - Text[ korean ] = "ì…€ ì„œì‹ ì§€ì •(~F)..."; + Text[ korean ] = "ì…€ ì„œì‹ ì„¤ì •(~F)..."; Text[ turkish ] = "Hücreleri formatla..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Formata les cel.les..."; @@ -1553,7 +1553,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "æ’å…¥æ›åˆ—(~R)"; Text[ arabic ] = "ÅÏÑÇÌ ÝÇÕá ÃÓØÑ"; Text[ greek ] = "~ÅéóáãùãÞ áëëáãÞò ãñáììÞò"; - Text[ korean ] = "ë‹¨ë½ ì‚½ìž…(~R)"; + Text[ korean ] = "í–‰ 나누기 삽입(~R)"; Text[ turkish ] = "Satýr sonu ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un salt de fi~la"; @@ -1582,7 +1582,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "æ’å…¥æ›æ¬„(~C)"; Text[ arabic ] = "ÅÏÑÇÌ ÝÇÕá ÃÚãÏÉ"; Text[ greek ] = "ÅéóáãùãÞ áëëáãÞò ó~ôÞëçò"; - Text[ korean ] = "ì—´ 삽입(~C)"; + Text[ korean ] = "ì—´ 나누기 삽입(~C)"; Text[ turkish ] = "Sütun sonu ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un salt de ~columna"; @@ -1600,7 +1600,7 @@ Menu RID_POPUP_PAGEBREAK Text [ swedish ] = "Radera alla ~manuella brytningar" ; Text [ danish ] = "Slet alle manuelle skift" ; Text [ italian ] = "Elimina interruzioni manuali" ; - Text [ spanish ] = "Eliminar todos los saltos ~manuales" ; + Text [ spanish ] = "Borrar todos los saltos ~manuales" ; Text [ french ] = "Supprimer tous les sauts ~manuels" ; Text [ dutch ] = "Alle handmatige ~einden wissen" ; Text [ portuguese ] = "Remover todas as quebras ~manuais" ; @@ -1640,7 +1640,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "é‡è¨é¡¯ç¤ºæ¯”例"; Text[ arabic ] = "ÅÒÇáÉ ÇáãÞíÇÓ"; Text[ greek ] = "ÊáôÜñãçóç ~êëßìáêáò"; - Text[ korean ] = "배율 í•´ì œ"; + Text[ korean ] = "축소/확대 ì›ëž˜ëŒ€ë¡œ"; Text[ turkish ] = "Ölçeklendirmeyi kaldýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "Reinicia l'escala"; @@ -1672,7 +1672,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "è¨å®šåˆ—å°ç¯„åœ"; Text[ arabic ] = "ÊÚííä äØÇÞ ÇáØÈÇÚÉ"; Text[ greek ] = "~Ïñéóìüò ðåñéï÷Þò åêôýðùóçò"; - Text[ korean ] = "ì¸ì‡„ ì˜ì— ì •ì˜"; + Text[ korean ] = "ì¸ì‡„ 범위 ì§€ì •"; Text[ turkish ] = "Yazdýrma aralýðýný tanýmla"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'àrea d'impressió"; @@ -1701,7 +1701,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "新增列å°ç¯„åœ"; Text[ arabic ] = "ÅÖÇÝÉ äØÇÞ ØÈÇÚÉ"; Text[ greek ] = "ÐñïóèÞêç ðåñéï~÷Þò åêôýðùóçò"; - Text[ korean ] = "ì¸ì‡„ ì˜ì— 추가"; + Text[ korean ] = "ì¸ì‡„ 범위 추가"; Text[ turkish ] = "Yazdýrma aralýðýný ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Afegeix una àrea d'impressió"; @@ -1730,7 +1730,7 @@ Menu RID_POPUP_PAGEBREAK Text[ chinese_traditional ] = "é‡è¨åˆ—å°ç¯„åœ"; Text[ arabic ] = "ÅáÛÇÁ äØÇÞ ÇáØÈÇÚÉ"; Text[ greek ] = "Ê~áôÜñãçóç ðåñéï÷Þò åêôýðùóçò"; - Text[ korean ] = "ì¸ì‡„ ì˜ì— 실행취소"; + Text[ korean ] = "ì¸ì‡„ 범위 실행 취소"; Text[ turkish ] = "Yazdýrma aralýðýný kaldýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desfés l'àrea d'impressió"; @@ -1805,3 +1805,8 @@ Menu RID_POPUP_PAGEBREAK }; + + + + + diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src index 670c6fc1aa37..84dfed5d3f95 100644 --- a/sc/source/ui/src/sc.src +++ b/sc/source/ui/src/sc.src @@ -2,9 +2,9 @@ * * $RCSfile: sc.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:41:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ // StarCalc Applikations Resource // // (C) 1994 StarDivision GmbH, Hamburg, Germany - // $Author: kz $ $Date: 2002-11-27 16:41:42 $ $Revision: 1.14 $ + // $Author: hr $ $Date: 2003-03-26 18:06:29 $ $Revision: 1.15 $ // $Logfile: T:/sc/source/ui/src/sc.srv $ $Workfile: sc.src $ //================================================================== @@ -154,3 +154,5 @@ String 30001 { Text = "Dummy1" ; }; String 30002 { Text = "Dummy2" ; }; String 30006 { Text = "Dummy3" ; }; + + diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src index 3486c2ed0553..22635fcbd76b 100644 --- a/sc/source/ui/src/scerrors.src +++ b/sc/source/ui/src/scerrors.src @@ -2,9 +2,9 @@ * * $RCSfile: scerrors.src,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: kz $ $Date: 2002-12-09 10:01:40 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,7 +91,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "無法連çµé€™å€‹æª”案。"; Text[ arabic ] = "ÊÚÐÑ ÇáÇÊÕÇá ÈÇáãáÝ."; Text[ greek ] = "Äåí Þôáí äõíáôüí íá ãßíåé óýíäåóç ìå ôï áñ÷åßï."; - Text[ korean ] = "파ì¼ì— ì—°ê²°ì´ ë¶ˆê°€ëŠ¥í•©ë‹ˆë‹¤."; + Text[ korean ] = "파ì¼ë¡œ ì—°ê²°í• ìˆ˜ 없습니다."; Text[ turkish ] = "Dosya ile baðlantý oluþturulamadý."; Text[ language_user1 ] = " "; Text[ catalan ] = "És impossible connectar-se al fitxer."; @@ -146,7 +146,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "發生一個ä¸æ˜Žçš„錯誤。"; Text[ arabic ] = "ÍÏË ÎØà ÛíÑ ãÚÑæÝ."; Text[ greek ] = "ÐáñïõóéÜóôçêå Üãíùóôï óöÜëìá."; - Text[ korean ] = "알수없는 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤."; + Text[ korean ] = "ì•Œ 수 없는 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Bilnmeyen hata oluþtu."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha produït un error desconegut."; @@ -167,13 +167,13 @@ Resource RID_ERRHDLSC Text [ portuguese ] = "Memória insuficiente ao importar." ; Text [ portuguese_brazilian ] = "Nicht genug Speicher beim Importieren." ; Text[ chinese_simplified ] = "在输入时内å˜ä¸è¶³ã€‚"; - Text[ russian ] = "Íåäîñòàòî÷íî ïàìÿòè ïðè èìïîðòèðîâàíèè."; + Text[ russian ] = "Íåäîñòàòî÷íî ïàìÿòè äëÿ îñóùåñòâëåíèÿ èìïîðòà."; Text[ polish ] = "Za ma³o pamiêci dla importu."; Text[ japanese ] = "インãƒãƒ¼ãƒˆã«å¿…è¦ãªãƒ‡ã‚£ã‚¹ã‚¯ç©ºã容é‡ãŒè¶³ã‚Šã¾ã›ã‚“。"; Text[ chinese_traditional ] = "匯入時記憶體ä¸è¶³ã€‚"; Text[ arabic ] = "ÇáÐÇßÑÉ áíÓÊ ßÇÝíÉ ÃËäÇÁ ÇáÇÓÊíÑÇÏ."; Text[ greek ] = "ÊáôÜ ôçí åéóáãùãÞ ðñïÝêõøå ðñüâëçìá ìíÞìçò."; - Text[ korean ] = "ê°€ì ¸ì˜¤ê¸°ë¥¼ 하기 위한 메모리가 부족합니다."; + Text[ korean ] = "ê°€ì ¸ì˜¤ê¸° 실행 중 메모리가 부족합니다."; Text[ turkish ] = "Ýçe aktarma iþleminde bellek yetersiz."; Text[ language_user1 ] = " "; Text[ catalan ] = "Memòria insuficient durant la importació."; @@ -200,7 +200,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "ä¸æ˜Žçš„ Lotus1-2-3 æª”æ¡ˆæ ¼å¼ã€‚"; Text[ arabic ] = "ÊäÓíÞ ãáÝ Lotus-123 ÛíÑ ãÚÑæÝ."; Text[ greek ] = "¢ãíùóôç ìïñöÞ áñ÷åßïõ Lotus1-2-3."; - Text[ korean ] = "알수없는 로터스1-2-3 íŒŒì¼ ì„œì‹"; + Text[ korean ] = "ì•Œ 수 없는 Lotus1-2-3 íŒŒì¼ ì„œì‹"; Text[ turkish ] = "Bilinmeyen Lotus-123 dosya formatý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Format de fitxer Lotus1-2-3 desconegut."; @@ -221,13 +221,13 @@ Resource RID_ERRHDLSC Text [ portuguese ] = "Erro na estrutura do ficheiro ao importar." ; Text [ portuguese_brazilian ] = "Fehler in Dateistruktur beim Importieren." ; Text[ chinese_simplified ] = "在输入时å‘生文件结构错误。"; - Text[ russian ] = "Îøèáêà ñòðóêòóðû ôàéëà ïðè èìïîðòèðîâàíèè."; + Text[ russian ] = "Îøèáêà ñòðóêòóðû ôàéëà ïðè îñóùåñòâëåíèè èìïîðòà."; Text[ polish ] = "B³¹d struktury pliku podczas importowania."; Text[ japanese ] = "インãƒãƒ¼ãƒˆæ™‚ã®ãƒ•ã‚¡ã‚¤ãƒ«æ§‹é€ ã§ã®ã‚¨ãƒ©ãƒ¼ã€‚"; Text[ chinese_traditional ] = "匯入時發生檔案çµæ§‹éŒ¯èª¤ã€‚"; Text[ arabic ] = "ÍÏË ÎØà Ýí ÈäíÉ ÇáãáÝ ÃËäÇÁ ÇáÇÓÊíÑÇÏ."; Text[ greek ] = "ÓöÜëìá óôç äïìÞ ôïõ áñ÷åßïõ êáôÜ ôçí åéóáãùãÞ."; - Text[ korean ] = "ê°€ì ¸ì˜¤ê¸°ë¥¼ 하는ë™ì•ˆ íŒŒì¼ êµ¬ì¡°ì—ì„œ 오류"; + Text[ korean ] = "ê°€ì ¸ì˜¤ê¸° 실행 중 íŒŒì¼ êµ¬ì¡°ì—ì„œ 오류"; Text[ turkish ] = "Ýçe aktarma iþleminde dosya yapýsýnda hata."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha produït un error en l'estructura del fitxer durant la importació."; @@ -256,7 +256,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "ç›®å‰é‚„ä¸èƒ½ç‚ºé€™å€‹æª”案類型æ供篩é¸åŠŸèƒ½ã€‚"; Text[ arabic ] = "áã íÊã ÊäÝíÐ ÝáÊÑ áåÐÇ ÇáäæÚ ãä ÇáãáÝÇÊ."; Text[ greek ] = "Äåí õðÜñ÷åé ößëôñï äéáèÝóéìï ãéá áõôüí ôïí ôýðï áñ÷åßùí."; - Text[ korean ] = "ì´ íŒŒì¼ ìœ í˜•ì— ë§žëŠ” í•„í„°ê°€ 없습니다."; + Text[ korean ] = "ì´ íŒŒì¼ í˜•ì‹ì— ì‚¬ìš©í• í•„í„°ê°€ 없습니다."; Text[ turkish ] = "Bu dosya tipi için filtre mevcut deðil."; Text[ catalan ] = "No hi ha cap filtre disponible per a aquest tipus de fitxer."; Text[ finnish ] = "Tälle tiedostotyypille ei ole suodatusta."; @@ -269,7 +269,7 @@ Resource RID_ERRHDLSC Text [ ENGLISH ] = "Unknown or not supported Excel file format" ; Text [ english_us ] = "Unknown or unsupported Excel file format." ; Text [ italian ] = "Formato file Excel sconosciuto o non supportato" ; - Text [ spanish ] = "Formato del archivo Excel no soportado o desconocido." ; + Text [ spanish ] = "Formato de archivo Excel no admitido o desconocido." ; Text [ french ] = "Format de fichier Excel inconnu ou incompatible." ; Text [ dutch ] = "Niet ondersteund of onbekende Excel-bestandsindeling." ; Text [ swedish ] = "Ej understött eller obekant Excel-filformat." ; @@ -283,7 +283,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "ä¸å—支æ´çš„或ä¸æ˜Žçš„ Excel æª”æ¡ˆæ ¼å¼ã€‚"; Text[ arabic ] = "ÊäÓíÞ ãáÝ Excel ÛíÑ ãÏÚæã¡ Ãæ ÛíÑ ãÚÑæÝ."; Text[ greek ] = "¢ãíùóôç Þ ìç õðïóôçñéæüìåíç ìïñöÞ áñ÷åßïõ Excel."; - Text[ korean ] = "ì•Œ 수 없는 ë˜ëŠ” 지ì›ë˜ì§€ 않는 Excel íŒŒì¼ ì„œì‹."; + Text[ korean ] = "ì•Œ 수 없거나 지ì›í•˜ì§€ 않는 Excel íŒŒì¼ ì„œì‹."; Text[ turkish ] = "Desteklenmeyen ya da bilinmeyen Excel dosya formatý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Format de fitxer Excel no permès o desconegut."; @@ -310,7 +310,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "é‚„ä¸å—支æ´çš„ Excel æª”æ¡ˆæ ¼å¼ã€‚"; Text[ arabic ] = "ÊäÓíÞ ãáÝ Excel áã íÊã ÊäÝíÐå ÈÚÏ."; Text[ greek ] = "ÌïñöÞ áñ÷åßïõ Excel ðïõ äåí Ý÷åé õëïðïéçèåß áêüìç."; - Text[ korean ] = "Excel íŒŒì¼ í˜•ì‹ì´ ì•„ì§ êµ¬í˜„ë˜ì§€ 않았습니다."; + Text[ korean ] = "ì•„ì§ êµ¬í˜„ë˜ì§€ ì•Šì€ Excel íŒŒì¼ ì„œì‹."; Text[ turkish ] = "Henüz kullanýlmayan Excel dosya formatý."; Text[ language_user1 ] = " "; Text[ catalan ] = "El format de fitxer Excel encara no s'ha implementat."; @@ -338,7 +338,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "這個檔案å—到密碼ä¿è·ã€‚"; Text[ arabic ] = "åÐÇ ÇáãáÝ ãÍãí ÈßáãÉ ÓÑ."; Text[ greek ] = "Ôï áñ÷åßï ðñïóôáôåýåôáé ìå êùäéêü ðñüóâáóçò."; - Text[ korean ] = "파ì¼ì€ 패스워드로 보호ë˜ì–´ 있습니다."; + Text[ korean ] = "파ì¼ì€ 암호로 보호ë˜ì–´ 있습니다."; Text[ turkish ] = "Dosya þifre ile korunuyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "Aquest fitxer està protegit amb una contrasenya."; @@ -359,13 +359,13 @@ Resource RID_ERRHDLSC Text [ portuguese ] = "Erro de importação interno." ; Text [ portuguese_brazilian ] = "Interner Importfehler" ; Text[ chinese_simplified ] = "内部输入错误。"; - Text[ russian ] = "Îøèáêà âíóòðåííåãî èìïîðòà."; + Text[ russian ] = "Âíóòðåííÿÿ îøèáêà èìïîðòà."; Text[ polish ] = "Wewnêtrzny b³¹d importu"; Text[ japanese ] = "内部ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã‚¨ãƒ©ãƒ¼ã€‚"; Text[ chinese_traditional ] = "內部輸入錯誤。"; Text[ arabic ] = "ÎØà ÇÓÊíÑÇÏ ÏÇÎáí"; Text[ greek ] = "Åóùôåñéêü óöÜëìá åéóáãùãÞò."; - Text[ korean ] = "내부 ê°€ì ¸ì˜¤ê¸° 오류."; + Text[ korean ] = "ë‚´ë¶€ì˜ ê°€ì ¸ì˜¤ê¸° 오류"; Text[ turkish ] = "Ýç içe aktarma hatasý"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha produït un error d'importació intern."; @@ -387,13 +387,13 @@ Resource RID_ERRHDLSC Text [ french ] = "Le fichier ne peut pas être lu car il contient des données au delà de la ligne 8192." ; Text [ dutch ] = "In het bestand komen beneden regel 8192 gegevens voor en het kan daarom niet worden gelezen." ; Text[ chinese_simplified ] = "这个文件å«æœ‰è¡Œæ•°8192之下的数æ®ï¼Œå› æ¤æ— 法读出。"; - Text[ russian ] = "Íåâîçìîæíî ïðî÷åñòü ôàéë, òàê êàê â íåì ôàéëå ñîäåðæàòñÿ äàííûå, íàõîäÿùèåñÿ íèæå ñòðîêè 8192."; + Text[ russian ] = "Íåâîçìîæíî ïðî÷åñòü ôàéë, òàê êàê â íåì ñîäåðæàòñÿ äàííûå, íàõîäÿùèåñÿ íèæå ñòðîêè 8192."; Text[ polish ] = "Plik zawiera znaki poni¿ej wiersza 8192 i z tego powodu nie mo¿e zostaæ odczytany."; Text[ japanese ] = "ファイル㯠8192行目ã®ä¸‹ã«ãƒ‡ãƒ¼ã‚¿ã‚’å«ã‚“ã§ã„ã‚‹ãŸã‚ã€èªã¿å–ã‚Šã§ãã¾ã›ã‚“。"; Text[ chinese_traditional ] = "這個檔案å«æœ‰åˆ—數8192ä¹‹ä¸‹çš„æ•¸æ“šï¼Œå› æ¤ç„¡æ³•è®€å‡ºã€‚"; Text[ arabic ] = "íÍÊæí ÇáãáÝ Úáì ÈíÇäÇÊ ÃÓÝá ÇáÕÝ 8192¡ áåÐÇ áÇ íãßä ÞÑÇÁÊå."; Text[ greek ] = "Äåí åßíáé äõíáôüí íá ãßíåé áíÜãíùóç ôïõ áñ÷åßïõ åðåéäÞ ðåñéÝ÷åé äåäïìÝíá ðëÝïí ôùí 8192 ãñáììþí."; - Text[ korean ] = "파ì¼ì´ 8192 í–‰ ë¯¸ë§Œì˜ ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있어서 ì½ì„ 수 없습니다."; + Text[ korean ] = "파ì¼ì€ 8192 í–‰ ì´í›„ì˜ ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있어 ì½ì„ 수 없습니다."; Text[ turkish ] = "Dosya, 8192 satýrý altýnda veri bulunduðu okununamýyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "El fitxer conté dades més enllà de la fila 8192 i, per tant, no es pot llegir."; @@ -406,7 +406,7 @@ Resource RID_ERRHDLSC TEXT [ English ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)" ; TEXT[ english_us ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ portuguese ] = "Erro de formato no sub-documento $(ARG1) do ficheiro, na posição $(ARG2)(linha,coluna)"; - TEXT[ russian ] = "Îøèáêà ôîðìàòà ôàéëà ÷àñòè äîêóìåíòà $(ARG1) â ïîçèöèè $(ARG2)(ñòðîêà,ñòîëáåö)."; + TEXT[ russian ] = "Îøèáêà ôîðìàòà ôàéëà â ïîääîêóìåíòå $(ARG1) â ïîçèöèè $(ARG2)(ñòðîêà,ñòîëáåö)."; TEXT[ greek ] = "Åíôïðßóôçêå Ýíá óöÜëìá ìïñöïðïßçóçò ôïõ áñ÷åßïõ óôï ôìÞìá êåéìÝíïõ $(ARG1) óôç èÝóç $(ARG2)(ãñáììÞ, óôÞëç)"; TEXT[ dutch ] = "Indelingsfout in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; TEXT[ french ] = "Erreur de format dans le sous-document $(ARG1) du fichier, position $(ARG2)(ligne,colonne)."; @@ -417,7 +417,7 @@ Resource RID_ERRHDLSC TEXT[ polish ] = "Wykryto w pliku b³¹d w formacie dokumentu podrzêdnego $(ARG1) na pozycji $(ARG2)(wiersz, kolumna)"; TEXT[ portuguese_brazilian ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ japanese ] = "ファイルã®éƒ¨åˆ†ãƒ‰ã‚ュメント $(ARG1)ã®$(ARG2)(è¡Œã€åˆ—)ã«æ›¸å¼ã‚¨ãƒ©ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚"; - TEXT[ korean ] = "파ì¼ì˜ $(ARG2)(í–‰, ì—´)ìœ„ì¹˜ì— ìžˆëŠ” 부분 문서 $(ARG1)ì—ì„œ í˜•ì‹ ì˜¤ë¥˜ 발견"; + TEXT[ korean ] = "파ì¼ì˜ $(ARG2)(í–‰, ì—´)ìœ„ì¹˜ì— ìžˆëŠ” 부분 문서 $(ARG1)ì—ì„œ ì„œì‹ ì˜¤ë¥˜ë¥¼ 발견했습니다."; TEXT[ chinese_simplified ] = "在文件的å文档$(ARG1)内的 $(ARG2)(è¡Œ,列)处å‘çŽ°æ ¼å¼é”™è¯¯"; TEXT[ chinese_traditional ] = "發ç¾æª”案的å文件$(ARG1)å…§å«æ ¼å¼éŒ¯èª¤ï¼Œä½ç½®åœ¨ $(ARG2)(è¡Œ,欄)"; TEXT[ turkish ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; @@ -447,7 +447,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "檔案å«æœ‰æ ¼å¼éŒ¯èª¤ï¼Œä½ç½®åœ¨ $(ARG1)(行，欄)"; Text[ arabic ] = "Êã ÇßÊÔÇÝ ÎØà Ýí ÇáãæÖÚ $(ARG1)(ÓØÑ¡ÚãæÏ) Ýí ÇáãáÝ"; Text[ greek ] = "ÂñÝèçêå óöÜëìá ìïñöïðïßçóçò óôç èÝóç $(ARG1)(ãñáììÞ,óôÞëç) ôïõ áñ÷åßï"; - Text[ korean ] = "파ì¼ì˜ $(ARG1)(í–‰,ì—´)ì—ì„œ í˜•ì‹ ì˜¤ë¥˜ 발견"; + Text[ korean ] = "파ì¼ì˜ $(ARG1)(í–‰,ì—´)ì—ì„œ ì„œì‹ ì˜¤ë¥˜ë¥¼ 발견했습니다."; Text[ turkish ] = "Dosya format hatasý $(ARG1)(satýr, sütun) bulundu"; Text[ catalan ] = "Error en el format del fitxer a la posició $(ARG1)(fila,columna)"; Text[ finnish ] = "Tiedostomuotovirhe ilmeni kohteessa $(ARG1)(rivi,sarake)."; @@ -476,7 +476,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "無法連çµæª”案。"; Text[ arabic ] = "ÊÚÐÑ ÇáÇÊÕÇá ÈÇáãáÝ."; Text[ greek ] = "Äåí Þôáí äõíáôüí íá ãßíåé óýíäåóç ìå ôï áñ÷åßï."; - Text[ korean ] = "파ì¼ì— 대한 ì—°ê²°ì„ êµ¬ì¶•í•˜ì§€ 못했습니다."; + Text[ korean ] = "파ì¼ë¡œ 연결하지 못했습니다."; Text[ turkish ] = "Dosya ile baðlantý oluþturulamadý."; Text[ language_user1 ] = " "; Text[ catalan ] = "No s'ha pogut establir la connexió al fitxer."; @@ -561,7 +561,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "超éŽåˆ—數最高é™åº¦ã€‚超éŽçš„列ä¸æœƒè¢«åŒ¯å…¥ï¼"; Text[ arabic ] = "Êã ÊÎØí ÇáÚÏÏ ÇáÃÞÕì ááÕÝæÝ. áåÐÇ áã íÊã ÇÓÊíÑÇÏ ÇáÕÝæÝ ÇáÒÇÆÏÉ!"; Text[ greek ] = "¸ãéíå õðÝñâáóç ôïõ ìÝãéóôïõ áñéèìïý ãñáììþí. Äåí èá ãßíåé åéóáãùãÞ ôùí ãñáììþí ðïõ îåðåñíïýí ôï üñéï!"; - Text[ korean ] = "í–‰ì˜ ìµœëŒ€ìˆ˜ë¥¼ 초과했습니다. ì´ˆê³¼ëœ í–‰ì€ í•¨ê»˜ 들여와지지 않았습니다."; + Text[ korean ] = "í–‰ì˜ ìµœëŒ€ìˆ˜ë¥¼ 초과했습니다. ì´ˆê³¼ëœ í–‰ì€ ê°€ì ¸ì˜¤ì§€ 않았습니다."; Text[ turkish ] = "Azami satýr sayýsý aþýldý. Fazla satýrlar içe aktarýlmadý!"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha excedit el nombre màxim de files. Les files sobrants no s'han importat!"; @@ -575,22 +575,22 @@ Resource RID_ERRHDLSC Text [ english_us ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded." ; Text[ portuguese ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; Text[ russian ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ spanish ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ italian ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ swedish ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; + Text[ spanish ] = "Los datos no se pudieron cargar por completo por haberse excedido el número máximo de filas por hoja. "; + Text[ italian ] = "Impossibile caricare completamente i dati in quanto il numero di colonne supera il massimo consentito."; + Text[ swedish ] = "Det gick inte att ladda data fullständigt eftersom det maximala antalet rader per tabell har överskridits."; Text[ polish ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; Text[ portuguese_brazilian ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ japanese ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ korean ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; + Text[ japanese ] = "シート内ã®è¡Œæ•°ãŒæœ€å¤§æ•°ã‚’超ãˆãŸãŸã‚ã€ãƒ‡ãƒ¼ã‚¿ã®ä¸€éƒ¨ã‚’èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"; + Text[ korean ] = "í•œ 시트 당 í–‰ì˜ ìµœëŒ€ì¹˜ê°€ 초과ë˜ì—ˆê¸° ë•Œë¬¸ì— ë°ì´í„°ë¥¼ ì™„ì „í•˜ê²Œ ë¡œë”©í• ìˆ˜ 없습니다."; Text[ turkish ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; Text[ thai ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; Text[ greek ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; Text[ dutch ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ french ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; + Text[ french ] = "Impossible de charger la totalité des données : dépassement du nombre maximal de lignes par feuille."; Text[ finnish ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; Text[ danish ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ chinese_simplified ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; - Text[ chinese_traditional ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; + Text[ chinese_simplified ] = "æ— æ³•å®Œå…¨è£…è½½æ•°æ®ï¼Œå› 为已ç»è¶…è¿‡è¡¨æ ¼è¡Œçš„æœ€å¤§æ•°ç›®ã€‚"; + Text[ chinese_traditional ] = "由於超éŽæ¯å¼µå·¥ä½œè¡¨çš„最大列數，無法完全載入資料。"; Text[ arabic ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; Text[ catalan ] = "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."; }; @@ -601,22 +601,22 @@ Resource RID_ERRHDLSC Text [ english_us ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded." ; Text[ portuguese ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; Text[ russian ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ spanish ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ italian ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ swedish ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; + Text[ spanish ] = "Los datos no se han podido cargar por completo por haberse excedido el número máximo de columnas por hoja. "; + Text[ italian ] = "Impossibile caricare completamente i dati in quanto il numero delle colonne per pagina supera il massimo consentito."; + Text[ swedish ] = "Det gick inte att ladda data fullständigt eftersom det maximala antalet kolumner per tabell har överskridits."; Text[ polish ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; Text[ portuguese_brazilian ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ japanese ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ korean ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; + Text[ japanese ] = "シート内ã®åˆ—æ•°ãŒæœ€å¤§æ•°ã‚’超ãˆãŸãŸã‚ã€ãƒ‡ãƒ¼ã‚¿ã®ä¸€éƒ¨ã‚’èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"; + Text[ korean ] = "í•œ 시트 당 ì—´ì˜ ìµœëŒ€ì¹˜ê°€ 초과ë˜ì—ˆê¸° ë•Œë¬¸ì— ë°ì´í„°ë¥¼ ì™„ì „í•˜ê²Œ ë¡œë”©í• ìˆ˜ 없습니다."; Text[ turkish ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; Text[ thai ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; Text[ greek ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; Text[ dutch ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ french ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; + Text[ french ] = "Impossible de charger la totalité des données : dépassement du nombre maximal de colonnes par feuille."; Text[ finnish ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; Text[ danish ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ chinese_simplified ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; - Text[ chinese_traditional ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; + Text[ chinese_simplified ] = "æ— æ³•å®Œå…¨è£…è½½æ•°æ®ï¼Œå› 为已ç»è¶…è¿‡è¡¨æ ¼åˆ—çš„æœ€å¤§æ•°ç›®ã€‚"; + Text[ chinese_traditional ] = "由於超éŽæ¯å¼µå·¥ä½œè¡¨çš„最大欄數，無法完全載入資料。"; Text[ arabic ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; Text[ catalan ] = "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."; }; @@ -627,22 +627,22 @@ Resource RID_ERRHDLSC Text [ english_us ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded." ; Text[ portuguese ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; Text[ russian ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ spanish ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ italian ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ swedish ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; + Text[ spanish ] = "Algunas hojas no se han podido cargar por completo por haberse excedido el número máximo de hojas."; + Text[ italian ] = "Impossibile caricare tutte le tabelle in quanto superano il numero massimo consentito."; + Text[ swedish ] = "Det gick inte att ladda en del tabeller eftersom det maximala antalet tabeller har överskridits."; Text[ polish ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; Text[ portuguese_brazilian ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ japanese ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ korean ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; + Text[ japanese ] = "シートã®æ•°ãŒæœ€å¤§æ•°ã‚’超ãˆãŸãŸã‚ã€ã„ãã¤ã‹ã®ã‚·ãƒ¼ãƒˆã‚’èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"; + Text[ korean ] = "ì‹œíŠ¸ì˜ ìµœëŒ€ì¹˜ê°€ 초과ë˜ì—ˆê¸° ë•Œë¬¸ì— ì‹œíŠ¸ 중 ëª‡ê°€ì§€ëŠ”ë¡œë”©í• ìˆ˜ 없습니다."; Text[ turkish ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; Text[ thai ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; Text[ greek ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; Text[ dutch ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ french ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; + Text[ french ] = "Impossible de charger la totalité des feuilles : dépassement du nombre maximal de feuilles."; Text[ finnish ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; Text[ danish ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ chinese_simplified ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; - Text[ chinese_traditional ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; + Text[ chinese_simplified ] = "æ— æ³•å®Œå…¨è£…è½½æ•°æ®ï¼Œå› 为已ç»è¶…è¿‡è¡¨æ ¼çš„æœ€å¤§æ•°ç›®ã€‚"; + Text[ chinese_traditional ] = "由於超éŽå·¥ä½œè¡¨çš„最大數，有些工作表無法載入。"; Text[ arabic ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; Text[ catalan ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded."; }; @@ -741,7 +741,7 @@ Resource RID_ERRHDLSC Text [ swedish ] = "Dokumentet innehåller mer rader än vad som understöds av utmatningsformatet.\nÖvertaliga rader sparades inte." ; Text [ danish ] = "Dokumentet indeholder flere rækker end output-formatet understøtter.\nDe overtallige rækker blev ikke gemt." ; Text [ italian ] = "Il documento contiene più righe di quelle supportate dal formato di uscita.\nLe righe in eccesso non sono state salvate." ; - Text [ spanish ] = "El documento contiene más filas de las que soporta el formato seleccionado.\nLas filas adicionales no se guardaron." ; + Text [ spanish ] = "El documento contiene más filas de las que el formato seleccionado admite.\nLas filas adicionales no se guardaron." ; Text [ french ] = "Le document comporte plus de lignes que le format n'en supporte.\nLes lignes en surplus n'ont pas été enregistrées." ; Text [ dutch ] = "Het document bevat teveel regels voor dit formaat.\nDeze zijn niet opgeslagen." ; Text[ chinese_simplified ] = "整个文档å«æœ‰çš„行数超过打å°æ ¼å¼æ”¯æŒçš„范围。\n超过的行ä¸ä¼šè¢«å˜ç›˜ã€‚"; @@ -751,7 +751,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "這個文件å«æœ‰çš„列數超éŽåˆ—å°æ ¼å¼æ”¯æŒçš„範åœã€‚\n超éŽçš„列ä¸æœƒè¢«å„²å˜ã€‚"; Text[ arabic ] = "íÍÊæí ÇáãÓÊäÏ Úáì ÚÏÏ ãä ÇáÕÝæÝ íÝæÞ ÇáÚÏÏ ÇáÐí íãßä ááÊäÓíÞ ÇáãÍÏÏ ÏÚãå.\náã íÊã ÍÝÙ ÇáÕÝæÝ ÇáÒÇÆÏÉ."; Text[ greek ] = "Ôï Ýããñáöï ðåñéÝ÷åé ðåñéóóüôåñåò ãñáììÝò áðü üôé õðïóôçñßæåé ç ìïñöÞ \nåîáãùãÞò. Ïé ðëåïíÜæïõóåò ãñáììÝò äåí áðïèçêåýôçêáí."; - Text[ korean ] = "ì¶œë ¥ 형ì‹ì´ 지ì›í• 수 있는것보다 ë” ë§Žì€ í–‰ì´ ë¬¸ì„œì— í¬í•¨ë˜ì–´ 있습니다.\n초과ë˜ëŠ” í–‰ì€ ì €ìž¥ë˜ì§€ 않았습니다."; + Text[ korean ] = "ì„ íƒëœ ì„œì‹ì—ì„œ 지ì›í• 수 있는 것보다 ë” ë§Žì€ í–‰ì´ ë¬¸ì„œì— í¬í•¨ë˜ì–´ 있습니다.\n초과 í–‰ì€ ì €ìž¥í•˜ì§€ 않습니다."; Text[ turkish ] = "Belge, çýktý formatýnýn desteklediðinden çok satýr içeriyor.\nFazla gelen satýrlar kaydedilmedi."; Text[ language_user1 ] = " "; Text[ catalan ] = "El document conté més files de les que permet el format seleccionat.\nLes files addicionals no s'han desat."; @@ -766,7 +766,7 @@ Resource RID_ERRHDLSC Text [ portuguese ] = "O documento contém informações desconhecidas para esta versão do programa.\nAo guardar novamente perderá estas informações!" ; Text [ english_us ] = "The document contains information not recognized by this program version.\nResaving the document will delete this information!" ; Text [ portuguese_brazilian ] = "Das Dokument enth?lt Informationen, die dieser Programmversion unbekannt sind.\nBei erneutem Speichern gehen diese Informationen verloren!" ; - Text [ swedish ] = "Dokumentet innehåller information som denna programversion inte känner igen.\nOm Du sparar igen går den här informationen förlorad!" ; + Text [ swedish ] = "Dokumentet innehåller information som denna programversion inte känner igen.\nOm du sparar igen går den här informationen förlorad!" ; Text [ danish ] = "Dokumentet indeholder informationer, som denne programversion ikke kan genkende.\nHvis du gemmer dokumentet igen, vil disse informationer gå tabt." ; Text [ italian ] = "Il documento contiene informazioni sconosciute alla versione corrente del programma.\nCon un nuovo salvataggio le informazioni andranno perse!" ; Text [ spanish ] = "El documento contiene información desconocida para la versión de este programa.\n¡Al volver a guardar se perderá esta información!" ; @@ -779,7 +779,7 @@ Resource RID_ERRHDLSC Text[ chinese_traditional ] = "這個程åºç„¡æ³•è™•ç†é€™å€‹æ–‡ä»¶ä¸ä¸æ˜Žçš„資訊。\n在é‡æ–°å„²å˜æ™‚這些資訊會æµå¤±ï¼"; Text[ arabic ] = "íÍÊæí ÇáãÓÊäÏ Úáì ãÚáæãÇÊ ÛÑíÈÉ Úáì ÅÕÏÇÑ ÇáÈÑäÇãÌ åÐÇ.\nåÐå ÇáÈíÇäÇÊ ÓæÝ ÊÖíÚ ÚäÏ ÅÚÇÏÉ ÍÝÙ ÇáãÓÊäÏ!"; Text[ greek ] = "Ôï Ýããñáöï ðåñéÝ÷åé ðëçñïöïñßåò ïé ïðïßåò åßíáé Üãíùóôåò ãéá áõôÞ ôç Ýêäïóç ôïõ \nðñïãñÜììáôïò. Ïé ðëçñïöïñßåò áõôÝò èá ÷áèïýí áí åðáíáëáìâ "; - Text[ korean ] = "문서ì—는 ì´ í”„ë¡œê·¸ëž¨ì˜ ë²„ì „ì— ì˜í•´ì„œëŠ” ì¸ì‹ë 수 없는 ì •ë³´ê°€ í¬í•¨ë˜ì–´ 있습니다.\n다시 ì €ìž¥ì‹œì— ì´ ì •ë³´ëŠ” ìƒì‹¤ë©ë‹ˆë‹¤!"; + Text[ korean ] = "문서ì—는 ì´ í”„ë¡œê·¸ëž¨ì˜ ë²„ì „ìœ¼ë¡œ ì¸ì‹ë˜ì§€ 않는 ì •ë³´ê°€ í¬í•¨ë˜ì–´ 있습니다.\n다시 ì €ìž¥ ì‹œì— ì´ ì •ë³´ëŠ” ìƒì‹¤ë©ë‹ˆë‹¤."; Text[ turkish ] = "Belgede, bu program sürümünde bilinmeyen bilgiler mevcut.\nBu bilgiler, yeniden kayýtta kaybolacak!"; Text[ language_user1 ] = " "; Text[ catalan ] = "El document conté informació que aquesta versió del programa no reconeix.\nSi es torna a desar el document, aquesta informació es perdrà."; @@ -796,7 +796,7 @@ Resource RID_ERRHDLSC Text [ swedish ] = "Allt innehåll i cellerna kunde inte sparas i det angivna formatet." ; Text [ danish ] = "Det var ikke muligt at gemme alle celleindhold i det angivne format." ; Text [ italian ] = "Non è stato possibile salvare tutti i contenuti delle celle nel formato specificato ." ; - Text [ spanish ] = "No se pudieron guardar todos los contenidos de las celdas en el formato especificado." ; + Text [ spanish ] = "No se pudo guardar el contenido de las celdas en el formato especificado." ; Text [ french ] = "Il n'a pas été possible d'enregistrer le contenu de toutes les cellules dans le format spécifié." ; Text [ dutch ] = "Niet van elke cel kan de inhoud in het opgegeven formaat worden opgeslagen." ; Text[ chinese_simplified ] = "æ— æ³•ç”¨æŒ‡å®šçš„æ ¼å¼å˜ç›˜å…¨éƒ¨çš„å•å…ƒæ ¼å†…容。"; @@ -845,7 +845,7 @@ Resource RID_ERRHDLSC TEXT [ English ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)" ; TEXT[ english_us ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ portuguese ] = "Erro de formato no sub-documento $(ARG1) do ficheiro, na posição(ARG2)(linha,coluna)"; - TEXT[ russian ] = "Îøèáêà ôîðìàòà ôàéëà â ÷àñòè äîêóìåíòà $(ARG1) â ïîçèöèè $(ARG2)(ñòðîêà,ñòîëáåö)."; + TEXT[ russian ] = "Îøèáêà ôîðìàòà ôàéëà â ïîääîêóìåíòå $(ARG1) â ïîçèöèè $(ARG2)(ñòðîêà,ñòîëáåö)."; TEXT[ greek ] = "Åíôïðßóôçêå óöÜëìá ìïñöïðïßçóçò óôï áñ÷åßï óôï ôìÞìá êåéìÝíïõ $(ARG1) óôç èÝóç $(ARG2)(ãñáììÞ,óôÞëç)"; TEXT[ dutch ] = "Indelingsfout in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; TEXT[ french ] = "Erreur de format dans le sous-document $(ARG1) du fichier, position $(ARG2)(ligne,colonne)."; @@ -856,7 +856,7 @@ Resource RID_ERRHDLSC TEXT[ polish ] = "Wykryto w pliku b³¹d w formacie dokumentu podrzêdnego $(ARG1) na pozycji $(ARG2)(wiersz, kolumna)"; TEXT[ portuguese_brazilian ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ japanese ] = "ファイルã®éƒ¨åˆ†ãƒ‰ã‚ュメント $(ARG1)ã® $(ARG2)(è¡Œã€åˆ—)ã«æ›¸å¼ã‚¨ãƒ©ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚"; - TEXT[ korean ] = "파ì¼ì˜ $(ARG2)(í–‰,ì—´) ìœ„ì¹˜ì— ìžˆëŠ” 부분 문서 $(ARG1)ì—ì„œ í˜•ì‹ ì˜¤ë¥˜ 발견"; + TEXT[ korean ] = "파ì¼ì˜ $(ARG2)(í–‰,ì—´) ìœ„ì¹˜ì— ìžˆëŠ” 부분 문서 $(ARG1)ì—ì„œ ì„œì‹ ì˜¤ë¥˜ë¥¼ 발견했습니다."; TEXT[ chinese_simplified ] = "在文件的å文档$(ARG1)内的 $(ARG2)(è¡Œ,列)处å‘çŽ°æ ¼å¼é”™è¯¯"; TEXT[ chinese_traditional ] = "發ç¾æª”案的å文件$(ARG1)å…§å«æ ¼å¼éŒ¯èª¤ï¼Œä½ç½®åœ¨ $(ARG2)(è¡Œ,欄)"; TEXT[ turkish ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; @@ -879,3 +879,8 @@ Resource RID_ERRHDLSC + + + + + diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 1e18770e416b..5c55f9d05632 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -2,9 +2,9 @@ * * $RCSfile: scfuncs.src,v $ * - * $Revision: 1.70 $ + * $Revision: 1.71 $ * - * last change: $Author: rt $ $Date: 2002-09-05 18:53:49 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,7 +118,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Cuenta, dentro de la base de datos, todas las celdas cuyos contenidos coinciden con los valores buscados." ; Text [ english_us ] = "Counts the cells of a data range whose contents match the search criteria." ; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„å•å…ƒæ ¼æ•°ç›®ã€‚"; - Text[ russian ] = "Ïîäñ÷èòûâàåò âñå ÿ÷åéêè îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; + Text[ russian ] = "Ïîäñ÷èòûâàåò âñå ÿ÷åéêè îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Liczy wszystkie komórki z obszaru danych, których zawartoœci odpowiadaj¹ podanym kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®æ•°ã‚’æ•°ãˆã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„儲å˜æ ¼æ•¸ç›®ã€‚"; @@ -126,10 +126,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Telt alle cellen van een gegevensbereik, waarvan de inhoud aan de criteria voldoet."; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„å•å…ƒæ ¼æ•°ç›®ã€‚"; Text[ greek ] = "Áñéèìåß üëá ôá êåëéÜ ìéáò ðåñéï÷Þò äåäïìÝíùí ôá ïðïßá äåí åßíáé êåíÜ êáé åêðëçñþíïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ë§žëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì„ ê³„ìˆ˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë‚´ìš©ì„ í¬í•¨í•˜ëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì„ ì…‰ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücreleri sayar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Compta les cel·les d'una àrea de dades el contingut de les quals coincideix amb els criteris de cerca."; + Text[ catalan ] = "Compta les cel.les d'una àrea de dades el contingut de les quals coincideix amb els criteris de cerca."; + Text[ thai ] = "นับเซลล์ขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่เนื้à¸à¸«à¸²à¹€à¸‚้าà¸à¸±à¸šà¹€à¸à¸“ฑ์ในà¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -165,6 +166,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -182,7 +184,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè"; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -190,10 +192,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -207,7 +210,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -216,13 +219,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -237,7 +241,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "indica el campo (columna) que se utiliza para los valores buscados." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "指定è¦å½“作æœå¯»æ¡ä»¶çš„æ•°æ®åˆ—。"; @@ -246,13 +250,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "指定è¦å½“作æœå¯»æ¡ä»¶çš„æ•°æ®åˆ—。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าไม่ใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์ในà¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -282,6 +287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์ในà¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -299,7 +305,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los valores buscados." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -307,10 +313,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ ì˜ì—ì„ ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ 범위를 ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¹€à¸à¸“ฑ์ในà¸à¸²à¸£à¸„้นหา"; }; }; Resource SC_OPCODE_DB_COUNT_2 @@ -332,7 +339,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Cuenta las celdas en un área de datos que no están en blanco cuyos contenidos coinciden con los criterios de búsqueda." ; Text [ english_us ] = "Counts all non-blank cells of a data range where the content corresponds to the search criteria." ; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„且ä¸æ˜¯ç©ºç™½çš„å•å…ƒæ ¼æ•°ç›®ã€‚"; - Text[ russian ] = "Ïîäñ÷èòûâàåò âñå çàïîëíåííûå ÿ÷åéêè îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; + Text[ russian ] = "Ïîäñ÷èòûâàåò âñå çàïîëíåííûå ÿ÷åéêè îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Liczy wszystkie niepuste komórki obszaru danych, których zawartoœci odpowiadaj¹ kryteriom wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’満ãŸã™å†…容ã®ãƒ‡ãƒ¼ã‚¿ç¯„囲を対象ã«ã€ç©ºç™½ã§ãªã„ã™ã¹ã¦ã®ã‚»ãƒ«ã®æ•°ã‚’æ•°ãˆã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„ä¸æ˜¯ç©ºç™½çš„儲å˜æ ¼æ•¸ç›®ã€‚"; @@ -340,10 +347,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Telt alle niet-lege cellen van een gegevensbereik waarvan de inhoud aan de zoekcriteria voldoet."; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„且ä¸æ˜¯ç©ºç™½çš„å•å…ƒæ ¼æ•°ç›®ã€‚"; Text[ greek ] = "Áñéèìåß üëá ôá êåëéÜ ìéáò ðåñéï÷Þò äåäïìÝíùí ôá ïðïßá äåí åßíáé êåíÜ êáé åêðëçñþíïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "ë‚´ìš©ì´ ê²€ìƒ‰ ê¸°ì¤€ì— ìƒì‘하는, ë°ì´í„°ì˜ì—ì˜ ë¹„ì–´ìžˆì§€ ì•Šì€ ì…€ì„ ëª¨ë‘ ì…‰ë‹ˆë‹¤."; + Text[ korean ] = "ë‚´ìš©ì´ ê²€ìƒ‰ ê¸°ì¤€ì— ìƒì‘하며 ë°ì´í„° ë²”ìœ„ì˜ ë¹„ì–´ìžˆì§€ ì•Šì€ ì…€ì„ ëª¨ë‘ ì…‰ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda bulunup içerikleri arama ölçütlerine uyan ve boþ olmayan hücrelerini sayar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Compta totes les cel·les que no estiguin en blanc d'una àrea de dades el contingut de les quals correspongui als criteris de cerca."; + Text[ catalan ] = "Compta totes les cel.les que no estiguin en blanc d'una àrea de dades el contingut de les quals correspongui als criteris de cerca."; + Text[ thai ] = "นับเซลล์ที่ไม่เป็นช่à¸à¸‡à¸§à¹ˆà¸²à¸‡à¸—ั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่เนื้à¸à¸«à¸²à¸•à¸£à¸‡à¸à¸±à¸šà¹€à¸à¸“ฑ์ในà¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -379,6 +387,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -396,7 +405,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -404,10 +413,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -421,7 +431,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -430,13 +440,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -451,7 +462,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "指定è¦å½“作æœå¯»æ¡ä»¶çš„æ•°æ®åˆ—。"; @@ -460,13 +471,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "指定è¦å½“作æœå¯»æ¡ä»¶çš„æ•°æ®åˆ—。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ì‚¬ìš©ë˜ëŠ” ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าไม่ใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -496,6 +508,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -513,7 +526,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los criterios de búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -521,10 +534,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ ì˜ì—ì„ ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ 범위를 ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBMITTELWERT #*=- @@ -546,7 +560,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el promedio de todas las celdas de un área de una base de datos cuyos contenidos coinciden con los criterios." ; Text [ english_us ] = "Returns the average value of all the cells of a data range whose contents match the search criteria." ; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸä¸ç¬¦åˆæœå¯»æ¡ä»¶çš„æ•°æ®çš„å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Îáðàçóåò ñðåäíåå çíà÷åíèå âñåõ ÿ÷ååê îäíîãî äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Âîçâðàùàåò ñðåäíåå çíà÷åíèå âñåõ ÿ÷ååê îäíîé îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Wyznacza œredni¹ wszystkich komórek zakresu danych, zawartoœci których odpowiada kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã™ã¹ã¦ã®ã‚»ãƒ«ã®å¹³å‡å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個資料å€åŸŸä¸ç¬¦åˆæœå°‹æ¢ä»¶çš„數據平å‡å€¼ã€‚"; @@ -554,10 +568,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Berekent de gemiddelde waarde van alle cellen van een gegevensbereik waarvan de inhoud overeenkomt met de zoekcriteria."; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸä¸ç¬¦åˆæœå¯»æ¡ä»¶çš„æ•°æ®çš„å¹³å‡å€¼ã€‚"; Text[ greek ] = "Äßíåé ôçí ìÝóç ôéìÞ üëùí ôùí êåëéþí ìéáò ðåñéï÷Þò äåäïìÝíùí, ôçò ïðïßáò ôá ðåñéå÷üìåíá åêðëçñþíïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ë§žëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì˜ í‰ê· ê°’ 만들기"; + Text[ korean ] = "검색 ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì˜ í‰ê· ê°’ì„ ë§Œë“니다."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan hücrelerin ortalamasýný verir."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna el valor mitjà de totes les cel·les d'un àrea de dades els continguts de les quals coincideixen amb els criteris de cerca."; + Text[ catalan ] = "Torna el valor mitjà de totes les cel.les d'una àrea de dades els continguts de les quals coincideixen amb els criteris de cerca."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเฉลี่ยขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸‚à¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ั้งหมดขà¸à¸‡à¹€à¸™à¸·à¹‰à¸à¸«à¸²à¸—ี่เข้าà¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -593,6 +608,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -610,7 +626,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲"; Text[ chinese_traditional ] = "å«æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -618,10 +634,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -635,7 +652,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ de BD" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -644,13 +661,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -665,7 +683,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "indica el campo de la base de datos (columna) para los valores buscados." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“å称或列å·ã€‚"; @@ -674,13 +692,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å稱或欄號。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“å称或列å·ã€‚"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ì‚¬ìš©ë˜ëŠ” ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าไม่ใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -710,6 +729,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -727,7 +747,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los valores buscados." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -735,10 +755,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ 범위를 ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBAUSZUG #*=- @@ -760,7 +781,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el contenido de la celda de un área de datos cuyo contenido coincide con los criterios de búsqueda." ; Text [ english_us ] = "Defines the contents of the cell of a data range which matches the search criteria." ; Text[ chinese_simplified ] = "确定一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„第一个å•å…ƒæ ¼çš„内容。"; - Text[ russian ] = "Âîçâðàùàåò ñîäåðæèìîå ÿ÷åéêè äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Îïðåäåëÿåò ñîäåðæèìîå ÿ÷åéêè îáëàñòè äàííûõ, êîòîðîå ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Okreœla zawartoœæ pierwszej komórki obszaru danych, która odpowiada kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®å†…容を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個符åˆæœå°‹æ¢ä»¶çš„資料å€åŸŸçš„第一個儲å˜æ ¼çš„內容。"; @@ -768,10 +789,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft de inhoud van de cel in een gegevensbereik waarvan de inhoud voldoet aan de zoekcriteria."; Text[ chinese_simplified ] = "确定一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„第一个å•å…ƒæ ¼çš„内容。"; Text[ greek ] = "Äßíåé ôï ðåñéå÷üìåíï åíüò êåëéïý ìéáò ðåñéï÷Þò äåäïìÝíùí, ôïõ ïðïßï ôï ðåñéå÷üìåíï åêðëçñþíåé ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ë§žëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì—ì˜ ì…€ ë‚´ìš© ì œê³µ"; + Text[ korean ] = "검색 ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ë²”ìœ„ì˜ ì…€ì„ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içeriði arama ölçütlerine uyan hücrenin içeriðini verir."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix el contingut de la cel·la d'una àrea de dades que coincideix amb els criteris de cerca."; + Text[ catalan ] = "Defineix el contingut de la cel.la d'una àrea de dades que coincideix amb els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”เนื้à¸à¸«à¸²à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸‚à¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่ตรงà¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -807,6 +829,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -824,7 +847,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -832,10 +855,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -849,7 +873,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -858,13 +882,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -879,7 +904,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "indica el campo (columna) que debe utilizarse en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -888,13 +913,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -924,6 +950,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -941,7 +968,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los criterios de búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -949,10 +976,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ì˜ ë²”ìœ„ë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBMAX #*=- @@ -974,7 +1002,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el valor máximo de todas las celdas de un área cuyos contenidos coinciden con los valores buscados." ; Text [ english_us ] = "Returns the maximum value from all of the cells of a data range which correspond to the search criteria." ; Text[ chinese_simplified ] = "找出数æ®åŒºåŸŸä¸ç¬¦åˆæœå¯»æ¡ä»¶çš„å•å…ƒæ ¼çš„最大数值。"; - Text[ russian ] = "Îïðåäåëÿåò ìàêñèìàëüíîå çíà÷åíèå âñåõ ÿ÷ååê äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Îïðåäåëÿåò ìàêñèìàëüíîå çíà÷åíèå èç âñåõ ÿ÷ååê îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Okreœla maksimum wszystkich komórek obszaru danych, których zawartoœci odpowiadaj¹ kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®æœ€é«˜å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "找出資料å€åŸŸä¸ç¬¦åˆæœå°‹æ¢ä»¶çš„儲å˜æ ¼çš„最大數值。"; @@ -982,10 +1010,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bepaalt de maximumwaarde van alle cellen van een gegevensbereik waarvan de inhoud voldoet aan de zoekcriteria."; Text[ chinese_simplified ] = "找出数æ®åŒºåŸŸä¸ç¬¦åˆæœå¯»æ¡ä»¶çš„å•å…ƒæ ¼çš„最大数值。"; Text[ greek ] = "Êáèïñßæåé .ôçí ìÝãéóôç ôéìÞ üëùí ôùí êåëéþí ìéáò ðåñéï÷Þò äåäïìÝíùí, ôçò ïðïßáò ôá ðåñéå÷üìåíá åðáëçèåýïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ìƒì‘하는 ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì— ëŒ€í•œ ìµœëŒ€ê°’ì„ ê²°ì •."; + Text[ korean ] = "검색 ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì— ëŒ€í•œ ìµœëŒ€ê°’ì„ ê²°ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücrelerin azami deðerini verir."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna el valor màxim de totes les cel·les d'una àrea de dades que corresponguin als criteris de cerca."; + Text[ catalan ] = "Torna el valor màxim de totes les cel.les d'una àrea de dades que corresponguin als criteris de cerca."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าที่มาà¸à¸—ี่สุดจาà¸à¹€à¸‹à¸¥à¸¥à¹Œà¸—ั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่ตรงà¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -1021,6 +1050,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -1038,7 +1068,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -1046,10 +1076,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -1063,7 +1094,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -1072,13 +1103,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -1093,7 +1125,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -1102,13 +1134,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -1138,6 +1171,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -1155,7 +1189,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los valores buscados." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -1163,10 +1197,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ì˜ ë²”ìœ„ë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBMIN #*=- @@ -1188,7 +1223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el valor mínimo de la columna nombre_de_campo de los registros de la base de datos que coinciden con el argumento criterios." ; Text [ english_us ] = "Returns the minimum of all cells of a data range where the contents correspond to the search criteria." ; Text[ chinese_simplified ] = "找出数æ®åŒºåŸŸä¸ç¬¦åˆæœå¯»æ¡ä»¶çš„å•å…ƒæ ¼ä¸çš„最å°æ•°å€¼ã€‚"; - Text[ russian ] = "Îïðåäåëÿåò ìèíèìàëüíîå çíà÷åíèå âñåõ ÿ÷ååê äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Îïðåäåëÿåò ìèíèìàëüíûå çíà÷åíèÿ èç âñåõ ÿ÷ååê îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Okreœla minimum wszystkich komórek obszaru danych, których zawartoœci odpowiadaj¹ kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®æœ€ä½Žå€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "找出資料å€åŸŸä¸ç¬¦åˆæœå°‹æ¢ä»¶çš„儲å˜æ ¼ä¸çš„最å°æ•¸å€¼ã€‚"; @@ -1196,10 +1231,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bepaalt de minimumwaarde van alle cellen van een gegevensbereik, waarvan de inhoud aan de criteria voldoet."; Text[ chinese_simplified ] = "找出数æ®åŒºåŸŸä¸ç¬¦åˆæœå¯»æ¡ä»¶çš„å•å…ƒæ ¼ä¸çš„最å°æ•°å€¼ã€‚"; Text[ greek ] = "Êáèïñßæåé .ôçí åëÜ÷éóôç ôéìÞ üëùí ôùí êåëéþí ìéáò ðåñéï÷Þò äåäïìÝíùí, ôçò ïðïßáò ôá ðåñéå÷üìåíá åðáëçèåýïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ìƒì‘하는 ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì— ëŒ€í•œ ìµœì†Œê°’ì„ ê²°ì •."; + Text[ korean ] = "검색 ê¸°ì¤€ì— ìƒì‘하는 ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì— ëŒ€í•œ ìµœì†Œê°’ì„ ê²°ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücrelerin asgari deðerini verir."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna el mínim de totes les cel·les d'una àrea de dades el contingut de les quals corresponguin als criteris de cerca."; + Text[ catalan ] = "Torna el mínim de totes les cel.les d'una àrea de dades el contingut de les quals corresponguin als criteris de cerca."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¹€à¸‹à¸¥à¸¥à¹Œà¸—ั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่น้à¸à¸¢à¸—ี่สุดที่เนื้à¸à¸«à¸²à¸•à¸£à¸‡à¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -1235,6 +1271,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -1252,7 +1289,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -1260,10 +1297,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -1277,7 +1315,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -1286,13 +1324,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -1307,7 +1346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de criteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de criteria." ; Text [ spanish ] = "indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -1316,13 +1355,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de criteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de criteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -1352,6 +1392,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -1369,7 +1410,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los criterios de búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -1377,10 +1418,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ 범위를 ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBPRODUKT #*=- @@ -1398,22 +1440,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Ganger værdierne i alle celler indenfor et dataområde, hvis indhold opfylder søgekriterierne." ; Text [ french ] = "Multiplie toutes les cellules d'une plage de données dont les contenus correspondent aux critères de recherche." ; Text [ swedish ] = "Multiplicerar alla celler i ett dataområde vars innehåll motsvarar sökkriterierna." ; - Text [ dutch ] = "Vermengvuldigt alle cellen in een gegevensbereik waarvan de inhoud voldoet aan de zoekcriteria." ; + Text [ dutch ] = "Vermenigvuldigt alle cellen in een gegevensbereik waarvan de inhoud voldoet aan de zoekcriteria." ; Text [ spanish ] = "Multiplica los valores de un campo de registros determinado que coinciden con los criterios de una base de datos." ; Text [ english_us ] = "Multiplies all cells of a data range where the contents match the search criteria." ; Text[ chinese_simplified ] = "一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼çš„乘积。"; - Text[ russian ] = "Ïåðåìíîæàåò âñå ÿ÷åéêè äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Ïåðåìíîæàåò âñå ÿ÷åéêè îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Mno¿y wszystkie komórki zakresu danych, których zawartoœci odpowiadaj¹ kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®ç©ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "一個資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„所有儲å˜æ ¼çš„乘ç©ã€‚"; Text[ arabic ] = "ÊÖÑÈ Þíã ßá ÎáÇíÇ äØÇÞ ÈíÇäÇÊ ãÇ ÊÝí ÈãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Vermengvuldigt alle cellen in een gegevensbereik waarvan de inhoud voldoet aan de zoekcriteria."; + Text[ dutch ] = "Vermenigvuldigt alle cellen in een gegevensbereik waarvan de inhoud voldoet aan de zoekcriteria."; Text[ chinese_simplified ] = "一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼çš„乘积。"; Text[ greek ] = "ÐïëëáðëáóéÜæåé üëá ôá êåëéÜ ôçò ðåñéï÷Þò äåäïìÝíùí, ôùí ïðïßùí ôá ðåñéå÷üìåíá åêðëçñþíïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ìƒì‘하는 ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì„ ê³±í•¨"; + Text[ korean ] = "검색 ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì„ ê³±í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri alanýnda olup içerikleri arama ölçütlerine uyan tüm hücreleri çarpar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Multiplica totes les cel·les d'una àrea de dades el contingut de les quals coincideixi amb els criteris de cerca."; + Text[ catalan ] = "Multiplica totes les cel.les d'una àrea de dades el contingut de les quals coincideixi amb els criteris de cerca."; + Text[ thai ] = "ตัวคูณเซลล์ทั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่เนื้à¸à¸«à¸²à¸•à¸£à¸‡à¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา "; }; ExtraData = { @@ -1449,6 +1492,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -1466,7 +1510,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos." ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -1474,10 +1518,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ëœ ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -1491,7 +1536,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -1500,13 +1545,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -1521,7 +1567,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfält (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -1530,13 +1576,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -1566,6 +1613,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -1583,7 +1631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los criterios de búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Podaje zakres komórek z kryteriami wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶å„²å˜æ ¼å€åŸŸã€‚"; @@ -1591,10 +1639,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ì˜ ë²”ìœ„ ì§€ì •"; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBSTDABW #*=- @@ -1612,22 +1661,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Beregner standardafvigelsen af alle celler indenfor et dataområde, hvis indhold opfylder søgekriterierne." ; Text [ french ] = "Évalue l'écart type de toutes cellules d'une plage dont les contenus correspondent aux critères de recherche." ; Text [ swedish ] = "Bestämmer standardavvikelsen för alla celler i ett dataområde vars innehåll motsvarar sökkriterierna." ; - Text [ dutch ] = "Bepaalt de standaarddeviatievan alle cellen in een gegevensbereik, waarvan de inhoud voldoet aan de criteria." ; + Text [ dutch ] = "Bepaalt de standaarddeviatie van alle cellen in een gegevensbereik, waarvan de inhoud voldoet aan de criteria." ; Text [ spanish ] = "Calcula la desviación predeterminada basándose en una muestra de las entradas seleccionadas de una base de datos." ; Text [ english_us ] = "Calculates the standard deviation of all cells in a data range whose contents match the search criteria." ; Text[ chinese_simplified ] = "估算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸\næ•°æ®çš„æ ‡å‡†å差。"; - Text[ russian ] = "Îïðåäåëÿåò ñòàíäàðòíîå îòêëîíåíèå âñåõ ÿ÷ååê äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Îïðåäåëÿåò ñòàíäàðòíîå îòêëîíåíèå âñåõ ÿ÷ååê îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Okreœla odchylenie standardowe wszystkich komórek obszaru danych, których zawartoœci odpowiadaj¹ kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®æ¨™æº–å差を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "估算一個資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„所有儲å˜æ ¼ä¸æ•¸æ“šçš„標準å差。"; Text[ arabic ] = "ÊÍÏÏ ÇáÇäÍÑÇÝ ÇáãÚíÇÑí áßá ÎáÇíÇ äØÇÞ ÈíÇäÇÊ ãÇ¡ æÇáÊí ÊÝí ÈãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt de standaarddeviatievan alle cellen in een gegevensbereik, waarvan de inhoud voldoet aan de criteria."; + Text[ dutch ] = "Bepaalt de standaarddeviatie van alle cellen in een gegevensbereik, waarvan de inhoud voldoet aan de criteria."; Text[ chinese_simplified ] = "估算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸\næ•°æ®çš„æ ‡å‡†å差。"; Text[ greek ] = "Ïñßæåé ôçí ôõðéêÞ áðüêëéóç üëùí ôùí êåëéþí ìéáò ðåñéï÷Þò äåäïìÝíùí, ôá ðåñéå÷üìåíá ôùí ïðïßùí åêðëçñþíïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ë§žëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì— ì•ˆì˜ ëª¨ë“ ì…€ì˜ í‘œì¤€ 편차를 ê²°ì •"; + Text[ korean ] = "검색 ê¸°ì¤€ì— ë§žëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° 범위 ì•ˆì˜ ëª¨ë“ ì…€ì˜ í‘œì¤€ 편차를 ê²°ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücrelerin standart sapmasýný hesaplar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Calcula la desviació estàndard de totes les cel·les d'una àrea de dades el contingut de les quals coincideix amb els criteris de cerca."; + Text[ catalan ] = "Calcula la desviació estàndard de totes les cel.les d'una àrea de dades el contingut de les quals coincideix amb els criteris de cerca."; + Text[ thai ] = "คำนวณส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸—ั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¹€à¸™à¸·à¹‰à¸à¸«à¸²à¸—ี่ตรงà¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -1663,6 +1713,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -1680,7 +1731,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -1688,10 +1739,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -1705,7 +1757,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -1714,13 +1766,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -1735,7 +1788,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -1744,13 +1797,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -1780,6 +1834,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -1797,7 +1852,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los criterios de búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek odpowiadaj¹cych kryteriom wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -1805,10 +1860,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ì˜ ë²”ìœ„ë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBSTDABWN #*=- @@ -1826,22 +1882,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Beregner standardafvigelsen baseret på hele populationen af alle celler indenfor et dataområde, hvis indhold opfylder søgekriterierne." ; Text [ french ] = "Évalue l'écart type d'une population représentée par toutes les cellules d'une plage de données dont les contenus correspondent aux critères de recherche." ; Text [ swedish ] = "Bestämmer standardavvikelsen baserad på populationen av alla celler i ett dataområde vars innehåll motsvarar sökkriterierna." ; - Text [ dutch ] = "Berekent de standaarddeviatie m.b.t. de hele populatie van de cellen van een gegevensvbereik, waarvan de inhoud aan de criteria voldoet." ; + Text [ dutch ] = "Berekent de standaarddeviatie m.b.t. de hele populatie van de cellen van een gegevensbereik, waarvan de inhoud aan de criteria voldoet." ; Text [ spanish ] = "Calcula la desviación predeterminada basándose en la población total de las entradas seleccionadas de una base de datos." ; Text [ english_us ] = "Returns the standard deviation with regards to the population of all cells of a data range matching the search criteria." ; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸æ•°æ®çš„æ€»ä½“æ ‡å‡†å差。"; - Text[ russian ] = "Îïðåäåëÿåò ñòàíäàðòíîå îòêëîíåíèå ãåíåðàëüíîé ñîâîêóïíîñòè âñåõ ÿ÷ååê äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Îïðåäåëÿåò ñòàíäàðòíîå îòêëîíåíèå ñîâîêóïíîñòè âñåõ ÿ÷ååê îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Wyznacza odchylenie standardowe ewent.populacjê komórek obszaru danych, których zawartoœci odpowiadaj¹ kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®æ¯é›†å›£ã‚’基準ã¨ã—ãŸæ¨™æº–å差を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„所有儲å˜æ ¼ä¸æ•¸æ“šçš„總體標準å差。"; Text[ arabic ] = "ÊÍÏÏ ÇáÇäÍÑÇÝ ÇáãÚíÇÑí ÇáãÊÚáÞ ÈÇáãÌÊãÚ ÈÃßáãå ÇÓÊäÇÏÇð áßá ÎáÇíÇ äØÇÞ ÈíÇäÇÊ ÊÝí ãÍÊæíÇÊåÇ ÈãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Berekent de standaarddeviatie m.b.t. de hele populatie van de cellen van een gegevensvbereik, waarvan de inhoud aan de criteria voldoet."; + Text[ dutch ] = "Berekent de standaarddeviatie m.b.t. de hele populatie van de cellen van een gegevensbereik, waarvan de inhoud aan de criteria voldoet."; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸æ•°æ®çš„æ€»ä½“æ ‡å‡†å差。"; Text[ greek ] = "Ïñßæåé ôçí ôõðéêÞ áðüêëéóç ó÷åôéêÜ ìå ôïí óõíïëéêü ðëçèõóìü üëùí ôùí êåëéþí ìéáò ðåñéï÷Þò äåäïìÝíùí, ôá ðåñéå÷üìåíá ôùí ïðïßùí åêðëçñþíïõ? "; - Text[ korean ] = "검색 ê¸°ì¤€ì— ë§žëŠ” ë‚´ìš©ì˜ ë°ì´í„° ì˜ì—ì´ ìžˆëŠ” ëª¨ë“ ì…€ì˜ ëª¨ì§‘ë‹¨ì— ê´€ë ¨ëœ í‘œì¤€ 편차 ê²°ì •."; + Text[ korean ] = "검색 ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë‚´ìš©ì˜ ë°ì´í„° 범위가 있는 ëª¨ë“ ì…€ì˜ ëª¨ì§‘ë‹¨ì— ê´€ë ¨ëœ í‘œì¤€ 편차를 ê²°ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücrelerin popülasyonu ile ilgili standart sapmayý belirler."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna la desviació estàndard, quant a la població, de totes les cel·les d'una àrea de dades que coincideixin amb els criteris de cerca."; + Text[ catalan ] = "Torna la desviació estàndard, quant a la població, de totes les cel.les d'una àrea de dades que coincideixin amb els criteris de cerca."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ªà¹ˆà¸§à¸™à¹€à¸šà¸µà¹ˆà¸¢à¸‡à¹€à¸šà¸™à¸¡à¸²à¸•à¸£à¸à¸²à¸™à¹ƒà¸™à¹€à¸£à¸·à¹ˆà¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸—ั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸•à¸£à¸‡à¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -1877,6 +1934,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -1894,7 +1952,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "带数æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "帶數據的儲å˜æ ¼å€åŸŸ"; @@ -1902,10 +1960,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "带数æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ë¥¼ í¬í•¨í•˜ê³ 있는 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -1919,7 +1978,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -1928,13 +1987,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -1949,7 +2009,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "Indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -1958,13 +2018,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -1994,6 +2055,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -2011,7 +2073,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los criterios de búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -2019,10 +2081,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ì˜ ë²”ìœ„ë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงเซลล์มีเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBSUMME #*=- @@ -2044,7 +2107,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Suma todas las celdas de un área de datos cuyos contenidos que coinciden con los criterios." ; Text [ english_us ] = "Adds all the cells of a data range where the contents match the search criteria." ; Text[ chinese_simplified ] = "æ•°æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸çš„æ•°å—之和。"; - Text[ russian ] = "Ñóììèðóåò âñå ÿ÷åéêè äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Ñóììèðóåò âñå ÿ÷åéêè îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Dodaje zawartoœci wszystkich komórek, których treœæ odpowiada kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®åˆè¨ˆã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„所有儲å˜æ ¼ä¸çš„數å—之和。"; @@ -2052,10 +2115,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Berekent de som van alle veld waarden van een gegevensbereik die aan de zoekcriteria voldoen."; Text[ chinese_simplified ] = "æ•°æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸çš„æ•°å—之和。"; Text[ greek ] = "ÐñïóèÝôåé üëá ôá êåëéÜ ìéáò ðåñéï÷Þò äåäïìÝíùí, ôùí ïðïßùí ôá ðåñéå÷üìåíá åðáëçèåýïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì— ìƒì‘하는 ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì„ í•©ì‚°"; + Text[ korean ] = "검색 ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë‚´ìš©ì´ ìžˆëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì„ í•©ì‚°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücreleri toplar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Afegeix totes les cel·les d'una àrea de dades el contingut de les quals coincideixi amb els criteris de cerca."; + Text[ catalan ] = "Afegeix totes les cel.les d'una àrea de dades el contingut de les quals coincideixi amb els criteris de cerca."; + Text[ thai ] = "เพิ่มเซลล์ทั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่เนื้à¸à¸«à¸²à¸•à¸£à¸‡à¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -2091,6 +2155,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -2108,7 +2173,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos" ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè"; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -2116,10 +2181,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ 있는 ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -2133,7 +2199,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -2142,13 +2208,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -2163,7 +2230,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcritera." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "Determina el campo (columna) para los criterios de búsqueda." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -2172,13 +2239,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcritera."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -2208,6 +2276,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -2225,7 +2294,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los criterios de búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -2233,10 +2302,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ì˜ ë²”ìœ„ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBVARIANZ #*=- @@ -2255,10 +2325,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Calcule la variance de toutes les cellules d'une plage de données dont les contenus correspondent aux critères de recherche." ; Text [ swedish ] = "Bestämmer variansen av alla celler i ett dataområde vars innehåll motsvarar sökkriterierna." ; Text [ dutch ] = "Bepaalt de variantie van alle cellen van een gegevensbereik, waarvan de inhoud aan de zoekcriteria voldoet." ; - Text [ spanish ] = "Calcula la varianza de todas las celdas de un área de datos cuyos contenidos coinciden con los criterios especificados." ; + Text [ spanish ] = "Calcula la variancia de todas las celdas de un área de datos cuyos contenidos coincidan con los criterios especificados." ; Text [ english_us ] = "Determines the variance of all the cells in a data range where the contents match the search criteria." ; Text[ chinese_simplified ] = "估算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸æ•°æ®çš„方差。"; - Text[ russian ] = "Îïðåäåëÿåò äèñïåðñèþ âñåõ ÿ÷ååê äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Îïðåäåëÿåò äèñïåðñèþ ñîâîêóïíîñòè âñåõ ÿ÷ååê îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Okreœla wariancjê wszystkich komórek obszaru danych, których zawartoœci odpowiadaj¹ podanym kryteriom wyszukiwania."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®åˆ†æ•£ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "估算一個資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„所有儲å˜æ ¼ä¸æ•¸æ“šçš„方差。"; @@ -2266,10 +2336,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bepaalt de variantie van alle cellen van een gegevensbereik, waarvan de inhoud aan de zoekcriteria voldoet."; Text[ chinese_simplified ] = "估算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸æ•°æ®çš„方差。"; Text[ greek ] = "Õðïëïãßæåé ôç äéáêýìáíóç üëùí ôùí êåëéþí ôçò ðåñéï÷Þò äåäïìÝíùí, ôùí ïðïßùí ôá ðåñéå÷üìåíá åðáëçèåýïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "ë‚´ìš©ì´ ê²€ìƒ‰ ê¸°ì¤€ì— ìƒì‘하는 ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì˜ ë¶„ì‚°ì„ ê²°ì •."; + Text[ korean ] = "ë‚´ìš©ì´ ê²€ìƒ‰ ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì˜ ë¶„ì‚°ì„ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücrelerin varyansýný belirler."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Determina la variància de totes les cel·les d'una àrea de dades el contingut de les quals coincideixi amb els criteris de cerca."; + Text[ catalan ] = "Determina la variància de totes les cel.les d'una àrea de dades el contingut de les quals coincideixi amb els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ว่าà¸à¸²à¸£à¹à¸›à¸£à¸œà¸±à¸™à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸—ั้งหมดขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่เนื้à¸à¸«à¸²à¸•à¸£à¸‡à¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -2305,6 +2376,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -2322,7 +2394,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos." ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸ"; @@ -2330,10 +2402,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸ"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -2347,7 +2420,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -2356,13 +2429,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -2377,7 +2451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "Indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -2386,13 +2460,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -2422,6 +2497,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -2439,7 +2515,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas que contiene los criterios búsqueda." ; Text [ english_us ] = "Defines the cell range containing the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîäåðæèò óñëîâèÿ ïîèñêà."; + Text[ russian ] = "Çàäàåò äèàïàçîí ÿ÷ååê, êîòîðûé ñîîòâåòñòâóåò óñëîâèÿì ïîèñêà."; Text[ polish ] = "Wyznacza zakres komórek zawieraj¹cych kryteria wyszukiwania."; Text[ japanese ] = "検索æ¡ä»¶ã‚’å«ã‚€ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -2447,10 +2523,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì„ í¬í•¨í•˜ê³ 있는 ì…€ì˜ ë²”ìœ„ë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DBVARIANZEN #*=- @@ -2469,10 +2546,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Calcule la variance sur l'ensemble d'une population de toutes les cellules d'une plage de données dont les contenus correspondent aux critères de recherche." ; Text [ swedish ] = "Bestämmer variansen baserat på populationen av alla celler i ett dataområde vars innehåll motsvarar sökkriterierna." ; Text [ dutch ] = "Bepaalt de variantie m.b.t. de hele populatie van alle cellen van een gegevensbereik, waarvan de inhoud aan de zoekcriteria voldoet." ; - Text [ spanish ] = "Calcula la varianza basándose en la población total de todas las celdas de un área de datos cuyos contenidos coinciden con los criterios." ; + Text [ spanish ] = "Calcula la variancia basándose en la población total de todas las celdas de un área de datos cuyos contenidos coincidan con los criterios." ; Text [ english_us ] = "Determines variance of a population based on all cells in a data range where contents match the search criteria." ; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸æ•°æ®çš„总体方差。"; - Text[ russian ] = "Îïðåäåëÿåò äèñïåðñèþ ãåíåðàëüíîé ñîâîêóïíîñòè âñåõ ÿ÷ååê äèàïàçîíà äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; + Text[ russian ] = "Îïðåäåëÿåò ñîâîêóïíîñòè âñåõ ÿ÷ååê îáëàñòè äàííûõ, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò êðèòåðèÿì ïîèñêà."; Text[ polish ] = "Okreœla wariancjê lub populacjê wszystkich komórek obszaru danych, których zawartoœci odpowiadaj¹ podanym kryteriom."; Text[ japanese ] = "データ範囲内ã§ã€æ¤œç´¢æ¡ä»¶ã«åˆã£ãŸã‚»ãƒ«ã®æ¯é›†å›£ã‚’基準ã¨ã—ãŸåˆ†æ•£ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個資料å€åŸŸå…§ç¬¦åˆæœå°‹æ¢ä»¶çš„所有儲å˜æ ¼ä¸æ•¸æ“šçš„總體方差。"; @@ -2480,10 +2557,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bepaalt de variantie m.b.t. de hele populatie van alle cellen van een gegevensbereik, waarvan de inhoud aan de zoekcriteria voldoet."; Text[ chinese_simplified ] = "计算一个数æ®åŒºåŸŸå†…符åˆæœå¯»æ¡ä»¶çš„所有å•å…ƒæ ¼ä¸æ•°æ®çš„总体方差。"; Text[ greek ] = "Õðïëïãßæåé ôç äéáêýìáíóç ôïõ ðëçèõóìïý ìå âÜóç üëá ôá êåëéÜ ôçò ðåñéï÷Þò äåäïìÝíùí, ôùí ïðïßùí ôá ðåñéå÷üìåíá åðáëçèåýïõí ôá êñéôÞñéá áíáæ "; - Text[ korean ] = "ë‚´ìš©ì´ ê²€ìƒ‰ ê¸°ì¤€ì— ìƒì‘하는 ë°ì´í„° ì˜ì—ì˜ ëª¨ë“ ì…€ì˜ ëª¨ì§‘ë‹¨ì— ê´€ë ¨ëœ ë¶„ì‚°ì„ ê²°ì •."; + Text[ korean ] = "ë‚´ìš©ì´ ê²€ìƒ‰ ê¸°ì¤€ì— í•´ë‹¹í•˜ëŠ” ë°ì´í„° ë²”ìœ„ì˜ ëª¨ë“ ì…€ì˜ ëª¨ì§‘ë‹¨ì— ê´€ë ¨ëœ ë¶„ì‚°ì„ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Veri aralýðýnda olup içerikleri arama ölçütlerine uyan tüm hücrelerin popülasyonu ile ilgili varyansý belirler."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Determina la variància d'una població basada en totes les cel·les d'una àrea de dades el contingut de la qual coincideixi amb els criteris de cerca."; + Text[ catalan ] = "Determina la variància d'una població basada en totes les cel.les d'una àrea de dades el contingut de la qual coincideixi amb els criteris de cerca."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”à¸à¸²à¸£à¹à¸›à¸£à¸œà¸±à¸™à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£à¸à¸¢à¸¹à¹ˆà¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¹€à¸‹à¸¥à¸¥à¹Œà¸—ั้งหมดในช่วงข้à¸à¸¡à¸¹à¸¥à¸«à¸™à¸¶à¹ˆà¸‡à¸—ี่เนื้à¸à¸«à¸²à¸•à¸£à¸‡à¸à¸±à¸šà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; ExtraData = { @@ -2519,6 +2597,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veritabaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base de dades"; + Text[ thai ] = "à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -2536,7 +2615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "área de celdas con los datos." ; Text [ english_us ] = "The range of cells containing data." ; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê ñ äàííûìè."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, ñîäåðæàùèõ äàííûå."; Text[ polish ] = "Zakres komórek s³u¿¹cych do tworzenia bazy danych."; Text[ japanese ] = "データã®ã‚るセル範囲。"; Text[ chinese_traditional ] = "å«æœ‰æ•¸æ“šçš„儲å˜æ ¼å€åŸŸã€‚"; @@ -2544,10 +2623,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik met de gegevens"; Text[ chinese_simplified ] = "å«æœ‰æ•°æ®çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ç ðåñéï÷Þ êåëéþí ìå ôá äåäïìÝíá."; - Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "ë°ì´í„°ê°€ í¬í•¨ë˜ì–´ 있는 ì…€ 범위"; Text[ turkish ] = "Verileri içeren hücre aralýðý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les que contenen les dades."; + Text[ catalan ] = "Àrea de cel.les que contenen les dades."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -2561,7 +2641,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ" ; Text [ swedish ] = "databasfält" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text [ spanish ] = "Campo de base de datos" ; Text [ english_us ] = "Database field" ; Text[ chinese_simplified ] = "field"; @@ -2570,13 +2650,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "データベースフィールド"; Text[ chinese_traditional ] = "field"; Text[ arabic ] = "Field"; - Text[ dutch ] = "Database-veld"; + Text[ dutch ] = "Databaseveld"; Text[ chinese_simplified ] = "field"; Text[ greek ] = "Ðåäßï âÜóçò äåäïìÝíùí"; Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ"; Text[ turkish ] = "Veritabaný alaný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -2591,7 +2672,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Definerer databasefeltet (kolonne) for søgekriterierne." ; Text [ french ] = "Indique le champ de base de données (colonne) utilisé pour les critères de recherche." ; Text [ swedish ] = "Definierar databasfältet (kolumn) för sökkriterierna." ; - Text [ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria." ; + Text [ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria." ; Text [ spanish ] = "Indica el campo (columna) que se utiliza en la función." ; Text [ english_us ] = "Indicates which database field (column) is to be used for the search criteria." ; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; @@ -2600,13 +2681,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "検索æ¡ä»¶ã‚’ã‚ã¦ã¯ã‚るデータベースフィールド(列)。"; Text[ chinese_traditional ] = "確定å«æœ‰æœå°‹æ¢ä»¶çš„資料庫å€åŸŸ(欄)。"; Text[ arabic ] = "íÍÏÏ ÍÞá ÞÇÚÏÉ ÇáÈíÇäÇÊ áãÚÇííÑ ÇáÈÍË."; - Text[ dutch ] = "Bepaalt het database-veld (kolom) voor de zoekcriteria."; + Text[ dutch ] = "Bepaalt het databaseveld (kolom) voor de zoekcriteria."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„æ•°æ®åº“区域(列)。"; Text[ greek ] = "Êáèïñßæåé ôï ðåäßï âÜóçò äåäïìÝíùí (óôÞëç) ãéá ôá êñéôÞñéá áíáæÞôçóçò."; Text[ korean ] = "검색 ê¸°ì¤€ì— ëŒ€í•œ ë°ì´í„°ë² ì´ìŠ¤ í•„ë“œ(ì—´) ì •ì˜"; Text[ turkish ] = "Arama ölçütleri için veritabaný alanýný (sütun) belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin camp de la base de dades (columna) s'ha d'utilitzar per als criteris de cerca."; + Text[ thai ] = "ระบุว่าใช้เขตข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ (คà¸à¸¥à¸±à¸¡à¸™à¹Œ) สำหรับเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -2636,6 +2718,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arama ölçütleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteris de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 7 // Description of Parameter 3 { @@ -2661,10 +2744,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft het cellenbereik met de zoekcriteria aan."; Text[ chinese_simplified ] = "确定å«æœ‰æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ïñßæåé ôçí ðåñéï÷Þ êåëéþí ìå ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ ì˜ì— ì •ì˜"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ìžˆëŠ” ì…€ì˜ ë²”ìœ„ë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Arama ölçütlerini içeren hücre aralýðýný tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Defineix l'àrea de cel·les que contenen els criteris de cerca."; + Text[ catalan ] = "Defineix l'àrea de cel.les que contenen els criteris de cerca."; + Text[ thai ] = "ระบุช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸¡à¸µà¹€à¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; }; // -=*# Resource for function DATUM #*=- @@ -2687,7 +2771,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el número de serie de una fecha especificada." ; Text [ english_us ] = "Provides an internal number for the date given." ; Text[ chinese_simplified ] = "为给定的日期æ供一个内部åºåˆ—数。"; - Text[ russian ] = "Âîçâðàùàåò äàòó â ÷èñëîâîì ôîðìàòå äëÿ çàäàííîé äàòû."; + Text[ russian ] = "Ïðåîáðàçóåò äàòó è îòîáðàæàåò åå â ÿ÷åéêå."; Text[ polish ] = "Zwraca numer kolejny odpowiadaj¹cy podanej dacie."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "為指定的日期æ供一個內部數值。"; @@ -2695,10 +2779,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Converteert een bepaalde datum naar een serieel getal."; Text[ chinese_simplified ] = "为给定的日期æ供一个内部åºåˆ—数。"; Text[ greek ] = "Äßíåé ôïí åóùôåñéêü áñéèìü ãéá ôç äåäïìÝíç çìåñïìçíßá."; - Text[ korean ] = "주어진 ë‚ ì§œì˜ ë‚´ë¶€ 숫ìžë¥¼ ì œê³µ"; + Text[ korean ] = "주어진 ë‚ ì§œì˜ ë‚´ë¶€ê°’ì„ ì œê³µí•©ë‹ˆë‹¤."; Text[ turkish ] = "Belirtilen tarih için bir iç sayý üretir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Proporciona un nombre intern per a les dades indicades."; + Text[ thai ] = "จัดหาตัวเลขภายในสำหรับวันที่ที่ให้มา"; }; ExtraData = { @@ -2734,6 +2819,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yýl"; Text[ language_user1 ] = " "; Text[ catalan ] = "any"; + Text[ thai ] = "ปี"; }; String 3 // Description of Parameter 1 { @@ -2763,6 +2849,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ language_user1 ] = " "; Text[ catalan ] = "Enter entre 1583 i 9956 o entre 0 i 99 (19xx o 20xx segons l'opció definida)."; Text[ finnish ] = "Kokonaisluku 1583 - 9956 tai 0 - 99 (19xx tai 20xx valinnan mukaan)."; + Text[ thai ] = "จำนวนเต็มระหว่าง 1583 à¹à¸¥à¸° 9956 หรืภ0 à¹à¸¥à¸° 99 (19xx หรืภ20xx ขึ้นà¸à¸¢à¸¹à¹ˆà¸à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸—ี่ระบุ)"; }; String 4 // Name of Parameter 2 { @@ -2791,7 +2878,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "ì›”"; Text[ turkish ] = "Ay"; Text[ language_user1 ] = " "; - Text[ catalan ] = "MONTH"; + Text[ catalan ] = "mes"; + Text[ thai ] = "เดืà¸à¸™"; }; String 5 // Description of Parameter 2 { @@ -2822,6 +2910,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ay için 1 ile 12 arasýnda bir tamsayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter entre 1 i 12 que representa el mes."; + Text[ thai ] = "จำนวนเต็มระหว่าง 1 à¹à¸¥à¸° 12 ใช้à¹à¸—นเดืà¸à¸™"; }; String 6 // Name of Parameter 3 { @@ -2851,6 +2940,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gün"; Text[ language_user1 ] = " "; Text[ catalan ] = "dia"; + Text[ thai ] = "วัน"; }; String 7 // Description of Parameter 3 { @@ -2881,6 +2971,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gün için 1 ile 31 arasýnda bir tamsayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter entre 1 i 31 que representa el dia del mes."; + Text[ thai ] = "จำนวนเต็มระหว่าง 1 à¹à¸¥à¸° 31 ใช้à¹à¸—นวันขà¸à¸‡à¹€à¸”ืà¸à¸™"; }; }; // -=*# Resource for function DATWERT #*=- @@ -2911,10 +3002,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Converteert datum in de vorm van tekst naar een serieel getal."; Text[ chinese_simplified ] = "å°†å…·å¤‡æ—¥æœŸè¾“å…¥æ ¼å¼çš„æ–‡å—转æ¢æˆæ—¥æœŸçš„系统内部åºåˆ—数。"; Text[ greek ] = "Áðïäßäåé Ýíáí åóùôåñéêü áñéèìü ãéá Ýíá êåßìåíï ìå ìéá ðéèáíÞ ìïñöÞ çìåñïìçíßáò"; - Text[ korean ] = "가능한 ì¼ìž ì„œì‹ì— 대한 내부 수를 반환"; + Text[ korean ] = "ë‚ ì§œ ì„œì‹ì„ í¬í•¨í•˜ê³ ìžˆì„ ìˆ˜ 있는 문ìžì—´ì˜ ë‚´ë¶€ê°’ì„ êµ¬í•©ë‹ˆë‹¤."; Text[ turkish ] = "Muhtemel bir tarih formatýndaki bir metinden iç sayý üretir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna un nombre intern per a un text que tingui un format de data possible."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ภายในสำหรับà¸à¸²à¸£à¸¡à¸µà¸£à¸¹à¸›à¹à¸šà¸šà¸‚้à¸à¸„วามวันที่ที่เป็นไปได้"; }; ExtraData = { @@ -2950,6 +3042,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -2960,11 +3053,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Il testo tra virgolette che riproduce una data in formato %PRODUCTNAME." ; Text [ portuguese_brazilian ] = "Ein in Anf?rungszeichen eingeschlossener Text, der ein Datum in einem %PRODUCTNAME Calc Datumsformat wiedergibt." ; Text [ portuguese ] = "Um texto entre aspas que devolve uma data com um formato do %PRODUCTNAME." ; - Text [ finnish ] = "Lainausmerkeillä rajattu teksti, joka palauttaa päivämäärän ohjelman %PRODUCTNAME päivämäärämuodossa." ; + Text [ finnish ] = "Lainausmerkeillä rajattu teksti, joka palauttaa päivämäärän %PRODUCTNAMEn päivämäärämuodossa." ; Text [ danish ] = "Tekst i anførselstegn som repræsenterer en dato i et %PRODUCTNAME datoformat." ; Text [ french ] = "Un texte entre guillemets qui renvoie une date dans un format de date de %PRODUCTNAME." ; Text [ swedish ] = "En inom citationstecken skriven text, som returnerar ett datum i något av %PRODUCTNAME Calcs datumformat." ; - Text [ dutch ] = "Een tekst tussen aanhalingstekens met een datum in een %PRODUCTNAME Calc-datumsformaat." ; + Text [ dutch ] = "Een tekst tussen aanhalingstekens met een datum in een %PRODUCTNAME Calc Datumnotatie." ; Text [ spanish ] = "Un texto entre comillas que será devuelto en un formato de fecha de %PRODUCTNAME." ; Text [ english_us ] = "A text enclosed in quotation marks which returns a date in a %PRODUCTNAME date format." ; Text[ chinese_simplified ] = "引å·å†…çš„å—串转æ¢æˆ %PRODUCTNAME æ—¥æœŸæ ¼å¼ã€‚"; @@ -2973,13 +3066,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "クォテーションマークã§å›²ã‚“ã 日付を表ã™æ–‡å—列を %PRODUCTNAME ã®æ—¥ä»˜è¡¨ç¤ºå½¢å¼ã§æŒ‡å®šã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將引號內的文å—轉變æˆ%PRODUCTNAME æ—¥æœŸæ ¼å¼ã€‚"; Text[ arabic ] = "äÕ ãÍÇØ ÈÚáÇãÇÊ ÊäÕíÕ íãËá ÊÇÑíÎÇð ÈÃÍÏ ÊäÓíÞÇÊ ÇáÊÇÑíÎ Ýí %PRODUCTNAME Calc."; - Text[ dutch ] = "Een tekst tussen aanhalingstekens met een datum in een %PRODUCTNAME Calc-datumsformaat."; + Text[ dutch ] = "Een tekst tussen aanhalingstekens met een datum in een %PRODUCTNAME Calc Datumnotatie."; Text[ chinese_simplified ] = "引å·å†…çš„å—串转æ¢æˆ %PRODUCTNAME æ—¥æœŸæ ¼å¼ã€‚"; Text[ greek ] = "¸íá êåßìåíï óå åéóáãùãéêÜ, ôï ïðïßï åðéóôñÝöåé ìéá çìåñïìçíßá óå ìïñöÞ çìåñïìçíßáò ôïõ %PRODUCTNAME Calc."; Text[ korean ] = "ì¸ìš©ë¶€í˜¸ ì•ˆì— ë“¤ì–´ 있는 í…스트로서 %PRODUCTNAME ë‚ ì§œ ì„œì‹ì— 있는 ë‚ ì§œë¥¼ 나타냅니다."; Text[ turkish ] = "%PRODUCTNAME tarih formatýnda tarih bilgisi veren týrnak iþaretleri içindeki metin."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Un text entre cometes que serà retornat en un format de data de %PRODUCTNAME."; + Text[ catalan ] = "Un text entre cometes que serà retornat en un format de data d'%PRODUCTNAME."; + Text[ thai ] = "ข้à¸à¸„วามที่à¹à¸™à¸šà¸¡à¸²à¹ƒà¸™à¹ƒà¸šà¹€à¸ªà¸™à¸à¸£à¸²à¸„ามีเครื่à¸à¸‡à¸«à¸¡à¸²à¸¢à¸—ี่ส่งà¸à¸¥à¸±à¸šà¸§à¸±à¸™à¸—ี่ในรูปà¹à¸šà¸šà¸§à¸±à¸™à¸—ี่ขà¸à¸‡ %PRODUCTNAME "; }; }; // -=*# Resource for function TAG #*=- @@ -2997,22 +3091,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Omregner serienummeret til en dag i måneden som et mellem 1 og 31." ; Text [ french ] = "Renvoie le jour du mois (compris entre 1 et 31) correspondant à l'argument numéro_série." ; Text [ swedish ] = "Bestämmer dagen i månaden som tal (1-31) för datumvärdet." ; - Text [ dutch ] = "Converteert de actuele dag van de maand naar een serieel getal tussen 1 en 31." ; + Text [ dutch ] = "Converteert de huidige dag van de maand naar een serieel getal tussen 1 en 31." ; Text [ spanish ] = "Devuelve el día del mes (1 - 31) correspondiente al núm_de_serie." ; Text [ english_us ] = "Returns the sequential date of the month as an integer (1-31) in relation to the date value." ; Text[ chinese_simplified ] = "确定与日期值相对应的，且用整数 1 到 31 表示的，一月内的æŸå¤©ã€‚"; - Text[ russian ] = "Ïðåîáðàçóåò äàòó â äåíü ìåñÿöà (÷èñëî îò 1 äî 31)."; + Text[ russian ] = "Âû÷èñëÿåò äåíü äëÿ äàííîé äàòû. Äåíü ÿâëÿåòñÿ öåëûì ÷èñëîì è ïðèíàäëåæèò ïðîìåæóòêó îò 1 äî 31."; Text[ polish ] = "Konwertuje kolejny numer na dzieñ miesi¹ca w postaci liczby (1 - 31)."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒãã®æœˆã®ä½•æ—¥ç›®ã«ã‚ãŸã‚‹ã‹ã‚’数値(1～31)ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "轉æ›æ—¥æœŸåºåˆ—數æˆå°æ‡‰çš„一月內的æŸå¤©ï¹ç”¨æ•´æ•¸ 1 到 31 表示。"; Text[ arabic ] = "ÊÍæá ÑÞãÇð ãÓáÓáÇð Åáì íæã Ýí ÔåÑ."; - Text[ dutch ] = "Converteert de actuele dag van de maand naar een serieel getal tussen 1 en 31."; + Text[ dutch ] = "Converteert de huidige dag van de maand naar een serieel getal tussen 1 en 31."; Text[ chinese_simplified ] = "确定与日期值相对应的，且用整数 1 到 31 表示的，一月内的æŸå¤©ã€‚"; Text[ greek ] = "Ïñßæåé ãéá ôçí ôéìÞ çìåñïìçíßáò ôçí äéáäï÷éêÞ çìÝñá ôïõ ìçíüò ùò áñéèìü (1 - 31)."; Text[ korean ] = "ì›”ì˜ ì—°ì†ì ì¸ ë‚ ì§œë¥¼ 나타내는 숫ìž(1 - 31)를 ë‚ ì§œê°’ìœ¼ë¡œ ê²°ì •"; Text[ turkish ] = "Tarih deðerine göre, ayýn sürekli tarihini tam sayý (1 - 31) olarak belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la data seqüencial del mes com un enter (1-31) en relació al valor de la data."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸§à¸±à¸™à¸—ี่ขà¸à¸‡à¹€à¸”ืà¸à¸™à¸•à¸²à¸¡à¸¥à¸³à¸”ับเป็นจำนวนเต็ม (1-31) สัมพันธ์à¸à¸±à¸šà¸„่าขà¸à¸‡à¸§à¸±à¸™à¸—ี่"; }; ExtraData = { @@ -3048,6 +3143,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -3057,7 +3153,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Data espressa come numero seriale." ; Text [ portuguese_brazilian ] = "Interne Zahl des Datums." ; Text [ portuguese ] = "é o código data-hora usado para calcular a data e a hora." ; - Text [ finnish ] = "Päivämäärän sisäinen numeroarvo." ; + Text [ finnish ] = "Päivämäärän sisäinen numeroarvo" ; Text [ danish ] = "Intern datoværdi." ; Text [ french ] = "Le numéro de série de la date." ; Text [ swedish ] = "Internt tal för datum." ; @@ -3065,7 +3161,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Número interno de la fecha" ; Text [ english_us ] = "The internal number for the date." ; Text[ chinese_simplified ] = "日期的系统内部åºæ•°ã€‚"; - Text[ russian ] = "Êîä äàòà-âðåìÿ, èñïîëüçóåìûé äëÿ âû÷èñëåíèé äàòû è âðåìåíè."; + Text[ russian ] = "Âíóòðåííåå ÷èñëî äàòû."; Text[ polish ] = "Kod daty-godziny u¿ywany do obliczenia daty i godziny."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "日期的系統內部數å—。"; @@ -3073,10 +3169,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Serieel getal van de datum."; Text[ chinese_simplified ] = "日期的系统内部åºæ•°ã€‚"; Text[ greek ] = "is the date-time code used for date and time calculations."; - Text[ korean ] = "ë‚ ì§œì˜ ë‚´ë¶€ ê°’"; + Text[ korean ] = "ë‚ ì§œ 내부값"; Text[ turkish ] = "Tarihin iç sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre intern per a la data."; + Text[ thai ] = "ตัวเลขภายในสำหรับวันที่"; }; }; // -=*# Resource for function TAGE360 #*=- @@ -3090,7 +3187,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il numero di giorni compresi tra due date sulla base di un anno di 360 giorni." ; Text [ portuguese_brazilian ] = "Bestimmt die Tagesdifferenz zweier Daten bei 360-Tage/Jahr-Berechnung." ; Text [ portuguese ] = "Calcula o número de dias entre duas datas, baseando-se num ano de 360 dias." ; - Text [ finnish ] = "Laskee kahden päivämäärän välisten päivien määrän (360-päivän pituisen vuoden mukaan)." ; + Text [ finnish ] = "Laskee kahden päivämäärän välisten päivien määrän 360 päivän pituisen vuoden mukaan." ; Text [ danish ] = "Bestemmer antallet af dage mellem to datoer baserende på et år med 360 dage." ; Text [ french ] = "Renvoie le nombre de jours compris entre deux dates sur la base d'une année de 360 jours." ; Text [ swedish ] = "Bestämmer antalet dagar mellan två datum baserat på 360 dagar per år." ; @@ -3106,10 +3203,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bepaalt het aantal dagen tussen twee data op basis van 360 dagen per jaar."; Text[ chinese_simplified ] = "按照一年360天的规则，计算两个日期之间的相差天数。"; Text[ greek ] = "Êáèïñßæåé ôçí äéáöïñÜ çìåñþí äýï çìåñïìçíéþí ëáìâÜíïíôáò õðüøç 360 çìÝñåò/Ýôïò."; - Text[ korean ] = "360ì¼/ë…„ì˜ ê³„ì‚°ì—ì„œ ë‘ ë‚ ì§œê°„ ë‚ ì§œë¥¼ ì •í•©ë‹ˆë‹¤"; + Text[ korean ] = "360ì¼/ë…„ì˜ ê³„ì‚°ì„ ê¸°ì¤€ìœ¼ë¡œ ë‘ ë‚ ì§œê°„ì˜ ì°¨ì´ë¥¼ 계산합니다."; Text[ turkish ] = "360 günlü yýl hesaplamasýnda iki tarih arasýndaki gün farkýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el nombre de dies entre dues dates considerant un any de 360 dies."; + Text[ thai ] = "คำนวณจำนวนวันระหว่างวันที่สà¸à¸‡à¸§à¸±à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸›à¸µà¸«à¸™à¸¶à¹ˆà¸‡à¸¡à¸µ 360 วัน"; }; ExtraData = { @@ -3133,7 +3231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Fecha_1" ; Text [ english_us ] = "Date_1" ; Text[ chinese_simplified ] = "date_1"; - Text[ russian ] = "Äàòà_1"; + Text[ russian ] = "Äàòà 1"; Text[ polish ] = "Data_1"; Text[ japanese ] = "日付 1"; Text[ chinese_traditional ] = "date_1"; @@ -3145,6 +3243,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tarih_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_1"; + Text[ thai ] = "วันที่_1"; }; String 3 // Description of Parameter 1 { @@ -3170,10 +3269,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Oudere datum ter bepaling van het aantal dagen."; Text[ chinese_simplified ] = "计算两个日期相差天数时较早的那个日期。"; Text[ greek ] = "Áñ÷éêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò çìåñþí."; - Text[ korean ] = "ë‚ ì§œ ì°¨ì´ì—ì„œì˜ ì‹œìž‘ ì¼ìž"; + Text[ korean ] = "ìš”ì¼ ìˆ˜ ì°¨ì´ ê³„ì‚°ì˜ ì‹œìž‘ ë‚ ì§œ"; Text[ turkish ] = "Gün farký hesabý için erken olan tarih."; Text[ language_user1 ] = " "; Text[ catalan ] = "Data d'inici per calcular la diferència en dies."; + Text[ thai ] = "วันที่เริ่มต้นสำหรับà¸à¸²à¸£à¸„ำนวณความต่างà¸à¸±à¸™à¹ƒà¸™à¸§à¸±à¸™à¸—ี่ต่าง ๆ"; }; String 4 // Name of Parameter 2 { @@ -3191,7 +3291,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Fecha_2" ; Text [ english_us ] = "Date_2" ; Text[ chinese_simplified ] = "date_2"; - Text[ russian ] = "Äàòà_2"; + Text[ russian ] = "Äàòà 2"; Text[ polish ] = "Data_2"; Text[ japanese ] = "日付 2"; Text[ chinese_traditional ] = "date_2"; @@ -3203,6 +3303,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tarih_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_2"; + Text[ thai ] = "วันที่_2"; }; String 5 // Description of Parameter 2 { @@ -3228,10 +3329,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Jongere datum ter bepaling van het aantal dagen."; Text[ chinese_simplified ] = "计算两个日期相差天数时较晚的那个日期。"; Text[ greek ] = "Ç ôåëéêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò çìåñþí."; - Text[ korean ] = "ë‚ ì§œ ì°¨ì´ì—ì„œì˜ ë§ˆì§€ë§‰ ì¼ìž"; + Text[ korean ] = "ìš”ì¼ ìˆ˜ ì°¨ì´ ê³„ì‚°ì˜ ìµœì¢… ë‚ ì§œ"; Text[ turkish ] = "Gün farký hesabý için geç olan tarih."; Text[ language_user1 ] = " "; Text[ catalan ] = "Data final per calcular la diferència en dies."; + Text[ thai ] = "วันที่สุดท้ายสำหรับà¸à¸²à¸£à¸„ำนวณความต่างà¸à¸±à¸™à¹ƒà¸™à¸§à¸±à¸™à¸—ี่ต่าง ๆ"; }; String 6 // Name of Parameter 3 { @@ -3249,7 +3351,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Tipo" ; Text [ english_us ] = "Type" ; Text[ chinese_simplified ] = "type"; - Text[ russian ] = "Ìåòîä"; + Text[ russian ] = "Òèï"; Text[ polish ] = "Typ"; Text[ japanese ] = "タイプ"; Text[ chinese_traditional ] = "type"; @@ -3261,6 +3363,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 7 // Description of Parameter 3 { @@ -3278,7 +3381,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Método de cálculo de diferencia. Modo = 0 para el americano (NASD) y = 1 para el europeo." ; Text [ english_us ] = "Method used to form differences: Type = 0 denotes US method (NASD), Type = 1 denotes the European method." ; Text[ chinese_simplified ] = "æž„æˆå·®æ•°çš„æ–¹å¼ã€‚type = 0 表示美国方å¼(NASD)， \ntype = 1 表示欧洲方å¼ã€‚"; - Text[ russian ] = "Îïðåäåëÿåò, êàêîé ìåòîä äîëæåí èñïîëüçîâàòüñÿ ïðè âû÷èñëåíèè ðàçíîñòè: ìåòîä ÑØÀ (NASD) (1) èëè åâðîïåéñêèé ìåòîä (0)."; + Text[ russian ] = "Îïðåäåëÿåò, êàêîé ìåòîä äîëæåí èñïîëüçîâàòüñÿ äëÿ ðàçëè÷èé: ìåòîä ÑØÀ (NASD) (1) èëè åâðîïåéñêèé ìåòîä (0)."; Text[ polish ] = "Rodzaj obliczania ró¿nicy: 0 oznacza metodê amerykañsk¹ (NASD), 1 - europejsk¹."; Text[ japanese ] = "算出方å¼ã€‚æ–¹å¼ = 0 米国(NASD)æ–¹å¼ï½¤ æ–¹å¼ = 1 ヨーãƒãƒƒãƒ‘æ–¹å¼ã€‚"; Text[ chinese_traditional ] = "構æˆå·®æ•¸çš„æ–¹å¼ã€‚type = 0 表示美國方å¼(NASD)ï¹ type = 1 表示æ洲方å¼ã€‚"; @@ -3290,6 +3393,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Fark hesaplama yöntemi: Tür = 1, ABD'de kullanýlan yöntem (NASD), tür = 0 ise Avrupa'da kullanýlan yöntemidir."; Text[ language_user1 ] = " "; Text[ catalan ] = "El mètode utilitzat per formar diferències: tipus = 0 indica el mètode americà (NASD), tipus = 1 indica el mètode europeu."; + Text[ thai ] = "วิธีà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸à¸±à¸šà¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¸—ี่ต่างà¸à¸±à¸™: ชนิด = 0 à¹à¸—นวีธีà¸à¸²à¸£à¸‚à¸à¸‡à¸à¹€à¸¡à¸£à¸´à¸à¸±à¸™ (NASD), ชนิด = 1 à¹à¸—นวิธีà¸à¸²à¸£à¸‚à¸à¸‡à¸¢à¸¸à¹‚รป"; }; }; // -=*# Resource for function STUNDE #*=- @@ -3311,7 +3415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la hora correspondiente al argumento núm_de_serie en forma de número (0 - 23)." ; Text [ english_us ] = "Determines the sequential number of the hour of the day (0-23) for the time value." ; Text[ chinese_simplified ] = "确定与时间值对应的å°æ—¶æ•°(0 - 23)。"; - Text[ russian ] = "Ïðåîáðàçóåò äàòó â ÷èñëîâîì ôîðìàòå (0 - 23) â ÷àñû."; + Text[ russian ] = "Âû÷èñëÿåò ÷àñ äëÿ óêàçàííîãî âðåìåíè. Çíà÷åíèÿ ÷àñîâ ïðèíàäëåæàò ïðîìåæóòêó îò 0 äî 23."; Text[ polish ] = "Podaje godzinê odpowiednio do numeru kolejnego (liczba ca³kowita od 0 do 23)."; Text[ japanese ] = "時間ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒãã®æ—¥ã®ä½•æ™‚ã«ã‚ãŸã‚‹ã‹ã‚’数値(0～23)ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "轉æ›æ•¸å—æˆå°æ™‚數(0 - 23)。"; @@ -3323,6 +3427,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saat deðerine göre, günün sürekli saatini tam sayý (0 - 23) olarak belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina el nombre seqüencial de l'hora del dia (0-23) per al valor de l'hora."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”จำนวนชั่วโมงขà¸à¸‡à¸§à¸±à¸™à¸•à¸²à¸¡à¸¥à¸³à¸”ับ (0-23) สำหรับค่าขà¸à¸‡à¹€à¸§à¸¥à¸²"; }; ExtraData = { @@ -3358,6 +3463,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -3375,7 +3481,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor interno de hora" ; Text [ english_us ] = "Internal time value" ; Text[ chinese_simplified ] = "系统内部时间值。"; - Text[ russian ] = "Êîä äàòà-âðåìÿ, èñïîëüçóåìûé äëÿ âû÷èñëåíèé ñ äàòàìè è ïðåèîäàìè âðåìåíè."; + Text[ russian ] = "Âíóòðåííåå çíà÷åíèå âðåìåíè."; Text[ polish ] = "Kod daty-godziny u¿ywany do obliczenia daty i godziny."; Text[ japanese ] = "時間ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "系統內部時間åºæ•¸ã€‚"; @@ -3387,6 +3493,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýç saat deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor intern de l'hora"; + Text[ thai ] = "ค่าขà¸à¸‡à¹€à¸§à¸¥à¸²à¸ ายใน"; }; }; // -=*# Resource for function MINUTE #*=- @@ -3408,7 +3515,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el minuto que corresponde a núm_de_serie en forma de número (0 - 59)." ; Text [ english_us ] = "Determines the sequential number for the minute of the hour (0-59) for the time value." ; Text[ chinese_simplified ] = "确定与时间值对应的分钟数(0 - 59)。"; - Text[ russian ] = "Ïðåîáðàçóåò äàòó â ÷èñëîâîì ôîðìàòå (0 - 59) â ìèíóòû."; + Text[ russian ] = "Âû÷èñëÿåò ìèíóòû çà îïðåäåëåííûé ïåðèîä âðåìåíè. Çíà÷åíèÿ ìèíóò ïðèíàäëåæàò ïðîìåæóòêó îò 0 äî 59."; Text[ polish ] = "Podaje minutê odpowiadaj¹c¹ numerowi kolejnemu jako liczbê (0 - 59)."; Text[ japanese ] = "時間ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒãã®æ™‚é–“ã®ä½•åˆ†ã«ã‚ãŸã‚‹ã‹ã‚’数値ã§è¿”ã—ã¾ã™ã€‚(0-59)"; Text[ chinese_traditional ] = "轉æ›æ•¸å—æˆä»½é˜æ•¸(0 - 59)。"; @@ -3420,6 +3527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saat deðerine göre, saatin sürekli dakika deðerini tam sayý (0 - 59) olarak belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina el nombre seqüencial per al minut de l'hora (0-59) per al valor de l'hora."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”จำนวนนาทีขà¸à¸‡à¸Šà¸±à¹ˆà¸§à¹‚มงตามลำดับ (0-59) สำหรับค่าขà¸à¸‡à¹€à¸§à¸¥à¸²"; }; ExtraData = { @@ -3455,6 +3563,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saat"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -3472,7 +3581,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor interno de hora" ; Text [ english_us ] = "Internal time value." ; Text[ chinese_simplified ] = "系统内部时间值。"; - Text[ russian ] = "Êîä äàòà-âðåìÿ, èñïîëüçóåìûé äëÿ âû÷èñëåíèé ñ äàòàìè è ïðåèîäàìè âðåìåíè."; + Text[ russian ] = "Âíóòðåííåå çíà÷åíèå âðåìåíè."; Text[ polish ] = "Kod daty-godziny u¿ywany do obliczenia daty i godziny."; Text[ japanese ] = "時間ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "系統內部時間åºæ•¸ã€‚"; @@ -3484,6 +3593,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýç saat deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor intern de l'hora."; + Text[ thai ] = "ค่าขà¸à¸‡à¹€à¸§à¸¥à¸²à¸ ายใน"; }; }; // -=*# Resource for function MONAT #*=- @@ -3505,7 +3615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el mes que corresponde a núm_de_serie en forma de número (1 - 12)." ; Text [ english_us ] = "Determines the sequential number of a month of the year (1-12) for the date value." ; Text[ chinese_simplified ] = "确定与时间值对应的月份数(1 - 12)。"; - Text[ russian ] = "Ïðåîáðàçóåò äàòó â ÷èñëîâîì ôîðìàòå â ìåñÿö (÷èñëî îò 1 äî 12)."; + Text[ russian ] = "Âû÷èñëÿåò ìåñÿöû äëÿ òåêóùåé äàòû. Çíà÷åíèÿ ìåñÿöåâ ïðèíàäëåæàò ïðîìåæóòêó îò 1 äî 12."; Text[ polish ] = "Podaje miesi¹c odpowiadaj¹cy numerowi kolejnemu jako liczbê (1 - 12)."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒãã®å¹´ã®ä½•æœˆã«ã‚ãŸã‚‹ã‹ã‚’数値(1～12)ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "轉æ›æ•¸å—æˆæœˆä»½æ•¸(1 - 12)。"; @@ -3513,10 +3623,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Converteert een tijdswaarde naar een maand als getal (1 - 12)."; Text[ chinese_simplified ] = "确定与时间值对应的月份数(1 - 12)。"; Text[ greek ] = "Ïñßæåé ãéá ôçí ôéìÞ çìåñïìçíßáò ôïí äéáäï÷éêü ìÞíá ôïõ Ýôïõò ùò áñéèìü (1-12)."; - Text[ korean ] = "1ë…„ì˜ ì—°ì†ì ì¸ ì›”ì„ ë‚˜íƒ€ë‚´ëŠ” 숫ìž(1-12)를 ë‚ ì§œê°’ìœ¼ë¡œ ê²°ì •."; + Text[ korean ] = "í•œ í•´ì˜ ì—°ì†ë˜ëŠ” 개월 수(1-12)를 ë‚ ì§œê°’ìœ¼ë¡œ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Tarih deðerine göre yýlýn sürekli ay deðerini (1 - 12) tam sayý olarak belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina el nombre seqüencial del mes de l'any (1-12) per al valor de la data."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”จำนวนเดืà¸à¸™à¸‚à¸à¸‡à¸›à¸µà¸•à¸²à¸¡à¸¥à¸³à¸”ับ (1-12) สำหรับค่าขà¸à¸‡à¸§à¸±à¸™à¸—ี่"; }; ExtraData = { @@ -3552,6 +3663,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -3569,7 +3681,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Número interno de la fecha." ; Text [ english_us ] = "The internal number of the date." ; Text[ chinese_simplified ] = "日期的系统内部åºæ•°ã€‚"; - Text[ russian ] = "Êîä äàòà-âðåìÿ, èñïîëüçóåìûé äëÿ âû÷èñëåíèé ñ äàòàìè è ïðåèîäàìè âðåìåíè."; + Text[ russian ] = "Âíóòðåííåå ïðåäñòàâëåíèå äàòû."; Text[ polish ] = "Kod daty-godziny u¿ywany do obliczenia daty i godziny."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "日期的系統內部數å—。"; @@ -3577,10 +3689,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Datum als serieel getal."; Text[ chinese_simplified ] = "日期的系统内部åºæ•°ã€‚"; Text[ greek ] = "is the date-time code used for date and time calculations."; - Text[ korean ] = "ë‚ ì§œì˜ã€€ë‚´ë¶€ ê°’"; + Text[ korean ] = "ë‚ ì§œ 내부값"; Text[ turkish ] = "Ýç tarih sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre intern de la data."; + Text[ thai ] = "จำนวนวันที่ภายใน"; }; }; // -=*# Resource for function JETZT #*=- @@ -3598,22 +3711,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Beregner serienummeret for computerens aktuelle klokkeslæt." ; Text [ french ] = "Détermine le numéro de série et de l'heure courante." ; Text [ swedish ] = "Bestämmer den aktuella tiden för datorn." ; - Text [ dutch ] = "Bepaalt de actuele tijd van de computer." ; + Text [ dutch ] = "Bepaalt de huidige tijd van de computer." ; Text [ spanish ] = "Determina la hora actual del ordenador." ; Text [ english_us ] = "Determines the current time of the computer." ; Text[ chinese_simplified ] = "确定计算机内部时钟的当å‰æ—¶é—´ã€‚"; - Text[ russian ] = "Îïðåäåëÿåò òåêóùåå âðåìÿ êîìïüþòåðà."; + Text[ russian ] = "Îïðåäåëÿåò òåêóùèå âðåìÿ è äàòó êîìïüþòåðà."; Text[ polish ] = "Podaje wartoœæ kolejnego numeru bie¿¹cej daty i czasu."; Text[ japanese ] = "コンピュータã®ç¾åœ¨ã®æ™‚é–“ã®ã‚·ãƒªã‚¢ãƒ«å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定電腦內部時é˜çš„ç›®å‰æ™‚間。"; Text[ arabic ] = "ÊÍÏÏ ÇáæÞÊ ÇáÍÇáí ááßãÈíæÊÑ."; - Text[ dutch ] = "Bepaalt de actuele tijd van de computer."; + Text[ dutch ] = "Bepaalt de huidige tijd van de computer."; Text[ chinese_simplified ] = "确定计算机内部时钟的当å‰æ—¶é—´ã€‚"; Text[ greek ] = "Êáèïñßæåé ôçí ôñÝ÷ïõóá çìåñïìçíßá ôïõ õðïëïãéóôÞ."; Text[ korean ] = "ì»´í“¨í„°ì˜ í˜„ìž¬ ì¼ìžë¥¼ ê²°ì •"; Text[ turkish ] = "Bilgisayarýn güncel saatini belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina l'hora actual de l'ordinador."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”เวลาปัจจุบันขà¸à¸‡à¹€à¸„รื่à¸à¸‡à¸„à¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œ"; }; ExtraData = { @@ -3641,7 +3755,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve los segundos que corresponden al núm_de_serie en forma de número (0 - 59)." ; Text [ english_us ] = "Determines the sequential number of the second of a minute (0-59) for the time value." ; Text[ chinese_simplified ] = "确定与时间值对应的秒钟数(0 - 59)。"; - Text[ russian ] = "Ïðåîáðàçóåò äàòó â ÷èñëîâîì ôîðìàòå â ñåêóíäû (÷èñëî îò 0 äî 59)."; + Text[ russian ] = "Âû÷èñëÿåò ñåêóíäû äëÿ óêàçàííîãî âðåìåíè. Çíà÷åíèÿ ñåêóíä ïðèíàäëåæàò ïðîìåæóòêó îò 0 äî 59."; Text[ polish ] = "Podaje w wyniku sekundê, której przyporz¹dkowany jest numer_kolejny (liczba ca³kowita w zakresie od 0 do 59)."; Text[ japanese ] = "時間ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒãã®åˆ†ã®ä½•ç§’ã«ã‚ãŸã‚‹ã‹ã‚’数値(0～59)ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "轉æ›æ•¸å—æˆç§’é˜æ•¸(0 - 59)。"; @@ -3653,6 +3767,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saat deðerine göre, dakikanýn sürekli saniye deðerini tam sayý (0 - 59) olarak belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina el nombre seqüencial del segon d'un minut (0-59) per al valor de l'hora."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”จำนวนวินาทีขà¸à¸‡à¸™à¸²à¸—ีตามลำดับ (0-59) สำหรับค่าขà¸à¸‡à¹€à¸§à¸¥à¸²"; }; ExtraData = { @@ -3688,6 +3803,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -3705,7 +3821,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor interno de hora" ; Text [ english_us ] = "The internal time value." ; Text[ chinese_simplified ] = "系统内部时间值。"; - Text[ russian ] = "Êîä äàòà-âðåìÿ, èñïîëüçóåìûé äëÿ âû÷èñëåíèé ñ äàòàìè è ïðåèîäàìè âðåìåíè."; + Text[ russian ] = "Âíóòðåííåå çíà÷åíèå äàòû."; Text[ polish ] = "Kod daty-godziny u¿ywany do obliczenia daty i godziny."; Text[ japanese ] = "時間ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "系統內部時間åºæ•¸ã€‚"; @@ -3717,6 +3833,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýç saat sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor intern de l'hora."; + Text[ thai ] = "ค่าขà¸à¸‡à¹€à¸§à¸¥à¸²à¸ ายใน"; }; }; // -=*# Resource for function ZEIT #*=- @@ -3739,7 +3856,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el número de serie para una hora determinada en hora, minutos y segundos" ; Text [ english_us ] = "Determines a time value from the details for hour, minute and second." ; Text[ chinese_simplified ] = "生æˆä¸€ä¸ªç”±å°æ—¶ï¼Œåˆ†é’Ÿå’Œç§’组æˆçš„时间值。"; - Text[ russian ] = "Âîçâðàùàåò äàòó â ÷èñëîâîì ôîðìàòå äëÿ çàäàííîãî âðåìåíè."; + Text[ russian ] = "Óñòàíàâëèâàåò çíà÷åíèå âðåìåíè â ÷àñàõ, ìèíóòàõ è ñåêóíäàõ."; Text[ polish ] = "Zwraca numer kolejny odpowiadaj¹cy podanej dacie oznaczaj¹cy godzinê, minutê i sekundê."; Text[ japanese ] = "時ã€åˆ†ã€ç§’を指定ã—ã¦æ™‚é–“ã®ã‚·ãƒªã‚¢ãƒ«å€¤ã‚’求ã‚ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個由å°æ™‚ï¹åˆ†é˜å’Œç§’組æˆçš„時間數值。"; @@ -3751,6 +3868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saat, dakika ve saniye sayý deðerleri için bir saat deðeri oluþturur"; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina un valor d'hora a partir dels detalls d'hora, minut i segon."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ค่าขà¸à¸‡à¹€à¸§à¸¥à¸²à¸ˆà¸²à¸à¸£à¸²à¸¢à¸¥à¸°à¹€à¸à¸µà¸¢à¸”สำหรับชั่วโมง, นาทีà¹à¸¥à¸°à¸§à¸´à¸™à¸²à¸—ี"; }; ExtraData = { @@ -3785,7 +3903,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "시간"; Text[ turkish ] = "Saat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "HOUR"; + Text[ catalan ] = "hora"; + Text[ thai ] = "ชัวโมง"; }; String 3 // Description of Parameter 1 { @@ -3796,7 +3915,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero intero che rappresenta l'ora." ; Text [ portuguese_brazilian ] = "Ganze Zahl f? die Stunde." ; Text [ portuguese ] = "é um número inteiro entre 0 e 23 que representa a hora." ; - Text [ finnish ] = "Tunteja kuvaava muuttuja." ; + Text [ finnish ] = "Tunteja kuvaava kokonaisluku." ; Text [ danish ] = "Heltal som svarer til timen." ; Text [ french ] = "Nombre entier pour l'heure." ; Text [ swedish ] = "Heltal för timmen." ; @@ -3816,6 +3935,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saat için tamsayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter per a l'hora."; + Text[ thai ] = "จำนวนเต็มสำหรับชั่วโมง"; }; String 4 // Name of Parameter 2 { @@ -3833,7 +3953,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Minuto" ; Text [ english_us ] = "minute" ; Text[ chinese_simplified ] = "minute"; - Text[ russian ] = "Ìèíóòû"; + Text[ russian ] = "Ìèíóòà"; Text[ polish ] = "Minuta"; Text[ japanese ] = "分"; Text[ chinese_traditional ] = "minute"; @@ -3845,6 +3965,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dakika"; Text[ language_user1 ] = " "; Text[ catalan ] = "minut"; + Text[ thai ] = "นาที"; }; String 5 // Description of Parameter 2 { @@ -3855,7 +3976,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero intero che rappresenta il minuto." ; Text [ portuguese_brazilian ] = "Ganze Zahl f? die Minute." ; Text [ portuguese ] = "é um número inteiro entre 0 e 59 que representa o minuto." ; - Text [ finnish ] = "Minuutteja kuvaava muuttuja." ; + Text [ finnish ] = "Minuutteja kuvaava kokonaisluku." ; Text [ danish ] = "Heltal som svarer til minuttet." ; Text [ french ] = "Nombre entier pour les minutes." ; Text [ swedish ] = "Heltal för minuten." ; @@ -3875,6 +3996,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dakika için tamsayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter per al minut."; + Text[ thai ] = "จำนวนเต็มสำหรับนาที"; }; String 6 // Name of Parameter 3 { @@ -3892,7 +4014,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Segundo" ; Text [ english_us ] = "second" ; Text[ chinese_simplified ] = "second"; - Text[ russian ] = "Ñåêóíäû"; + Text[ russian ] = "Ñåêóíäà"; Text[ polish ] = "Sekunda"; Text[ japanese ] = "秒"; Text[ chinese_traditional ] = "second"; @@ -3904,6 +4026,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saniye"; Text[ language_user1 ] = " "; Text[ catalan ] = "segon"; + Text[ thai ] = "วินาที"; }; String 7 // Description of Parameter 3 { @@ -3914,7 +4037,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Un numero intero che rappresenta i secondi." ; Text [ portuguese_brazilian ] = "Ganze Zahl f? die Sekunde." ; Text [ portuguese ] = "é um número inteiro entre 0 e 59 que representa o segundo." ; - Text [ finnish ] = "Sekunteja kuvaava muuttuja." ; + Text [ finnish ] = "Sekunteja kuvaava kokonaisluku." ; Text [ danish ] = "Heltal som svarer til sekundet." ; Text [ french ] = "Nombre entier pour les secondes." ; Text [ swedish ] = "Heltal för sekunden." ; @@ -3934,6 +4057,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Saniye için tamsayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter per al segon."; + Text[ thai ] = "จำนวนเต็มสำหรับวินาที"; }; }; // -=*# Resource for function ZEITWERT #*=- @@ -3956,7 +4080,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el número de serie de la hora representada por texto_de_hora." ; Text [ english_us ] = "Returns a sequential number for a text shown in a possible time entry format." ; Text[ chinese_simplified ] = "转æ¢æ–‡å—类型的时间值æˆä¸ºåºåˆ—时间值。"; - Text[ russian ] = "Ïðåîáðàçóåò âðåìÿ èç òåêñòîâîãî ôîðìàòà â äàòó â ÷èñëîâîì ôîðìàòå."; + Text[ russian ] = "Ïðåîáðàçóåò âðåìÿ èç òåêñòîâîãî ôîðìàòà âî âðåìÿ â ÷èñëîâîì ôîðìàòå."; Text[ polish ] = "Zamienia tekst w formacie wprowadzania czasu na kolejn¹ liczbê."; Text[ japanese ] = "時間を表ã™æ–‡å—列をシリアル値ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å—å…ƒæ™‚é–“æ ¼å¼è½‰æ›æˆåºåˆ—æ•¸æ™‚é–“æ ¼å¼ã€‚"; @@ -3964,10 +4088,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Converteert een datum in de vorm van tekst te naar een serieel getal."; Text[ chinese_simplified ] = "转æ¢æ–‡å—类型的时间值æˆä¸ºåºåˆ—时间值。"; Text[ greek ] = "Ïñßæåé Ýíáí óõíå÷üìåíï áñéèìü ãéá Ýíá êåßìåíï ìå ìéá ðéèáíÞ ìïñöÞ ÷ñüíïõ."; - Text[ korean ] = "가능한 시간 ìž…ë ¥ 형ì‹ì˜ í…스트ì—ì„œ ì—°ì†ì ì¸ ìˆ˜ ì„ íƒï¼Ž"; + Text[ korean ] = "가능한 시간 ìž…ë ¥ ì„œì‹ì˜ í…스트ì—ì„œ ì—°ì†ì ì¸ ìˆ˜ ì„ íƒ"; Text[ turkish ] = "Muhtemel bir saat formatýndaki bir metinden iç sayý üretir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna un nombre seqüencial per a un text mostrat en un format d'entrada d'hora possible."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸¥à¸³à¸”ับตัวเลขสำหรับà¸à¸²à¸£à¹à¸ªà¸”งข้à¸à¸„วามในรูปà¹à¸šà¸šà¸£à¸²à¸¢à¸à¸²à¸£à¹€à¸§à¸¥à¸²à¸—ี่เป็นไปได้"; }; ExtraData = { @@ -4003,6 +4128,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -4013,11 +4139,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Testo tra virgolette che riproduce un'indicazione oraria in formato %PRODUCTNAME." ; Text [ portuguese_brazilian ] = "Ein in Anf?rungszeichen eingeschlossener Text, der eine Zeitangabe in einem %PRODUCTNAME Calc Zeitformat wiedergibt." ; Text [ portuguese ] = "Um texto que fornece uma hora num dos vários formatos de horas do %PRODUCTNAME." ; - Text [ finnish ] = "Lainausmerkeillä rajattu teksti, joka palauttaa kellonajan ohjelman %PRODUCTNAME aikamuodossa." ; + Text [ finnish ] = "Lainausmerkeillä rajattu teksti, joka palauttaa kellonajan %PRODUCTNAMEn aikamuodossa." ; Text [ danish ] = "Tekst i anførselstegn som repræsenterer et klokkeslæt i et %PRODUCTNAME datoformat." ; Text [ french ] = "Un texte entre guillemets qui renvoie une heure dans un format d'heure de %PRODUCTNAME." ; Text [ swedish ] = "En inom citationstecken skriven text, som returnerar en tid i något av %PRODUCTNAME Calcs tidsformat." ; - Text [ dutch ] = "Een tekst tussen aanhalingstekens met een tijdsaanduiding in een %PRODUCTNAME Calc tijdformaat." ; + Text [ dutch ] = "Een tekst tussen aanhalingstekens met een tijdsaanduiding in een %PRODUCTNAME Calc Tijdnotatie." ; Text [ spanish ] = "Un texto entre comillas que devuelve una hora en uno de los formatos horarios de %PRODUCTNAME." ; Text [ english_us ] = "A text enclosed in quotation marks which returns a time in a %PRODUCTNAME time format." ; Text[ chinese_simplified ] = "引å·å†…çš„å—串转æ¢æˆ %PRODUCTNAME æ—¶é—´æ ¼å¼ã€‚"; @@ -4026,13 +4152,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "クォテーションマークã§å›²ã‚“ã 時間を表ã™æ–‡å—列を %PRODUCTNAME ã®æ™‚間表示形å¼ã§æŒ‡å®šã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "一個引號內的å—串轉æ›æˆä¸€å€‹ %PRODUCTNAME æ™‚é–“æ ¼å¼ã€‚"; Text[ arabic ] = "äÕ ãÍÇØ ÈÚáÇãÇÊ ÊäÕíÕ íãËá ÇáæÞÊ ÈÃÍÏ ÊäÓíÞÇÊ ÇáæÞÊ Ýí %PRODUCTNAME."; - Text[ dutch ] = "Een tekst tussen aanhalingstekens met een tijdsaanduiding in een %PRODUCTNAME Calc tijdformaat."; + Text[ dutch ] = "Een tekst tussen aanhalingstekens met een tijdsaanduiding in een %PRODUCTNAME Calc Tijdnotatie."; Text[ chinese_simplified ] = "引å·å†…çš„å—串转æ¢æˆ %PRODUCTNAME æ—¶é—´æ ¼å¼ã€‚"; Text[ greek ] = "¸íá êåßìåíï óå åéóáãùãéêÜ, ôï ïðïßï åðéóôñÝöåé ìéá þñá óå ìïñöÞ þñáò ôïõ %PRODUCTNAME Calc."; - Text[ korean ] = "ì¸ìš©ë¶€í˜¸ ì•ˆì— ë“¤ì–´ 있는 í…스트로서 %PRODUCTNAME 시간서ì‹ì— 있는 ì‹œê°„ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤."; + Text[ korean ] = "ì¸ìš© 부호 ì•ˆì— ë“¤ì–´ 있는 í…스트로서 %PRODUCTNAME 시간 표기 형ì‹ì— 있는 ì‹œê°„ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤."; Text[ turkish ] = "%PRODUCTNAME zaman formatýnda zaman bilgisi veren týrnak iþaretleri içindeki metin."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Un text entre cometes que retorna una hora en un dels formats horaris de %PRODUCTNAME."; + Text[ catalan ] = "Un text entre cometes que retorna una hora en un dels formats horaris d'%PRODUCTNAME."; + Text[ thai ] = "ข้à¸à¸„วามที่à¹à¸™à¸šà¸¡à¸²à¹ƒà¸™à¹ƒà¸šà¹€à¸ªà¸™à¸à¸£à¸²à¸„ามีเครื่à¸à¸‡à¸«à¸¡à¸²à¸¢à¸—ี่ส่งà¸à¸¥à¸±à¸šà¹€à¸§à¸¥à¸²à¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¹€à¸§à¸¥à¸²à¸‚à¸à¸‡ %PRODUCTNAME "; }; }; // -=*# Resource for function HEUTE #*=- @@ -4054,7 +4181,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Determina la fecha actual del ordenador." ; Text [ english_us ] = "Determines the current date of the computer." ; Text[ chinese_simplified ] = "确定计算机内部时钟当å‰çš„日期。"; - Text[ russian ] = "Îïðåäåëÿåò òåêóùóþ äàòó êîìüþòåðà."; + Text[ russian ] = "Ââîäèò òåêóùóþ äàòó êîìïüþòåðà."; Text[ polish ] = "Podaje wartoœæ kolejnego numeru bie¿¹cej daty."; Text[ japanese ] = "コンピュータã®ç¾åœ¨ã®æ—¥ä»˜ã®ã‚·ãƒªã‚¢ãƒ«å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定電腦內部時é˜ç›®å‰çš„日期。"; @@ -4062,10 +4189,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bepaalt de huidige datum van de computer."; Text[ chinese_simplified ] = "确定计算机内部时钟当å‰çš„日期。"; Text[ greek ] = "Êáèïñßæåé ôçí ôñÝ÷ïõóá çìåñïìçíßá ôïõ õðïëïãéóôÞ."; - Text[ korean ] = "ì»´í“¨í„°ì˜ í˜„ìž¬ ë‚ ì§œë¥¼ ê²°ì •"; + Text[ korean ] = "ì»´í“¨í„°ì˜ í˜„ìž¬ ë‚ ì§œë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Bilgisayarýn güncel tarihini belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina la data actual de l'ordinador."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”วันที่ปัจจุบันขà¸à¸‡à¹€à¸„รื่à¸à¸‡à¸„à¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œ"; }; ExtraData = { @@ -4093,7 +4221,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el día de la semana (1 - 7) correspondiente al argumento núm_de_serie." ; Text [ english_us ] = "Returns the day of the week for the date value as an integer (1-7)." ; Text[ chinese_simplified ] = "确定与日期值相对应的一周内的æŸå¤©ï¼Œç»“果用介于1å’Œ7之间的整数表示。"; - Text[ russian ] = "Ïðåîáðàçóåò äàòó â ÷èñëîâîì ôîðìàòå â íîìåð äíÿ íåäåëè (÷èñëî îò 1 äî 7)."; + Text[ russian ] = "Âû÷èñëÿåò äåíü íåäåëè äëÿ äàííîãî çíà÷åíèÿ. Çíà÷åíèå äíÿ ïðèíàäëåæèò ïðîìåæóòêó îò 1(Ïîíåäåëüíèê) äî 7(Âòîðíèê)."; Text[ polish ] = "Podaje dzieñ tygodnia odpowiadaj¹cy numerowi kolejnemu (liczba ca³kowita od 1 do 7)."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒä½•æ›œæ—¥ã«ã‚ãŸã‚‹ã‹ã‚’数値(1～7)ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "轉æ›æ—¥æœŸæˆå°æ‡‰çš„一週內的æŸå¤©(1-7)。"; @@ -4101,10 +4229,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Converteert een bepaalde dag van de week naar een serieel getal (1 - 7)."; Text[ chinese_simplified ] = "确定与日期值相对应的一周内的æŸå¤©ï¼Œç»“果用介于1å’Œ7之间的整数表示。"; Text[ greek ] = "Ïñßæåé ãéá ôçí ôéìÞ çìåñïìçíßáò ôçí çìÝñá ôçò åâäïìÜäáò ùò áñéèü (1 - 7)."; - Text[ korean ] = "ìš”ì¼ì„ 나타내는 ìˆ«ìž (1-7)ì„ ë‚ ì§œê°’ìœ¼ë¡œ ê²°ì •."; + Text[ korean ] = "ìš”ì¼ì„ 나타내는 숫ìž(1-7)를 ë‚ ì§œê°’ìœ¼ë¡œ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Tarih deðerine göre, hafta gününü tam sayý (1 - 7) olarak belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el dia de la setmana per al valor de la data com a enter (1-7)."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸§à¸±à¸™à¸‚à¸à¸‡à¸ªà¸±à¸›à¸”าห์สำหรับค่าขà¸à¸‡à¸§à¸±à¸™à¸—ี่เป็นจำนวนเต็ม (1-7)"; }; ExtraData = { @@ -4140,6 +4269,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -4149,7 +4279,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Data espressa come numero seriale." ; Text [ portuguese_brazilian ] = "Interne Zahl des Datums." ; Text [ portuguese ] = "é o código de data-hora para calcular a data e a hora." ; - Text [ finnish ] = "Päivämäärän sisäinen numeroarvo." ; + Text [ finnish ] = "Päivämäärän sisäinen numeroarvo" ; Text [ danish ] = "Intern datoværdi." ; Text [ french ] = "Le numéro de série de la date." ; Text [ swedish ] = "Internt tal för datum." ; @@ -4157,7 +4287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Número interno de la fecha." ; Text [ english_us ] = "The internal number for the date." ; Text[ chinese_simplified ] = "日期的系统内部数å—。"; - Text[ russian ] = "Êîä äàòà-âðåìÿ, èñïîëüçóåìûé äëÿ âû÷èñëåíèé ñ äàòàìè è ïðåèîäàìè âðåìåíè."; + Text[ russian ] = "Âíóòðåííåå ÷èñëî äàòû."; Text[ polish ] = "Kod daty-godziny u¿ywany do obliczenia daty i godziny."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "日期的內部數å—。"; @@ -4165,10 +4295,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Serieel getal van de datum."; Text[ chinese_simplified ] = "日期的系统内部数å—。"; Text[ greek ] = "is the date-time code used for date and time calculations."; - Text[ korean ] = "ë‚ ì§œì˜ ë‚´ë¶€ ê°’"; + Text[ korean ] = "ë‚ ì§œ 내부값"; Text[ turkish ] = "Tarihin iç sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre intern per a la data."; + Text[ thai ] = "ตัวเลขภายในสำหรับวันที่"; }; String 4 // Name of Parameter 2 { @@ -4198,6 +4329,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 5 // Description of Parameter 2 { @@ -4227,6 +4359,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Haftabaþýný ve hesaplama türünü belirler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Fixa el començament de la setmana i el tipus de càlcul que s'utilitzarà."; + Text[ thai ] = "ให้à¸à¸²à¸£à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸ªà¸±à¸›à¸”าห์คงที่à¹à¸¥à¸°à¹ƒà¸Šà¹‰à¸Šà¸™à¸´à¸”ขà¸à¸‡à¸à¸²à¸£à¸„ำนวณ"; }; }; // -=*# Resource for function JAHR #*=- @@ -4240,26 +4373,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce l'anno espresso come numero seriale." ; Text [ portuguese_brazilian ] = "Bestimmt zu dem Datumswert das Jahr als Zahl." ; Text [ portuguese ] = "Devolve o ano correspondente a núm_série." ; - Text [ finnish ] = "Palauttaa päivämäärän vuosiarvon muuttujana." ; + Text [ finnish ] = "Palauttaa päivämäärän vuosiarvon kokonaislukuna." ; Text [ danish ] = "Omregner serienummeret til et år." ; Text [ french ] = "Renvoie l'année correspondant à l'argument numéro_série." ; Text [ swedish ] = "Bestämmer året som tal för datumvärdet." ; - Text [ dutch ] = "Converteert de datumswaarde naar een jaar dat wordt weergegeven als getal." ; + Text [ dutch ] = "Converteert de datumwaarde naar een jaar dat wordt weergegeven als getal." ; Text [ spanish ] = "Devuelve el año correspondiente al núm_de_serie." ; Text [ english_us ] = "Returns the year of a date value as an integer." ; Text[ chinese_simplified ] = "转æ¢æ—¥æœŸæ•°å€¼æˆç›¸å¯¹åº”的年份数。"; - Text[ russian ] = "Ïðåîáðàçóåò äàòó â ÷èñëîâîì ôîðìàòå â ãîä."; + Text[ russian ] = "Âîçâðàùàåò ãîä â âèäå öåëî÷èñëåííîé äàòû."; Text[ polish ] = "Przekszta³ca numer kolejny w rok."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒè¥¿æš¦ä½•å¹´ã«ã‚ãŸã‚‹ã‹ã‚’数値ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "日期轉æ›æˆç›¸å°æ‡‰çš„年份數。"; Text[ arabic ] = "ÊÍæá ÑÞã ÊÓáÓáí Åáì ÚÇã."; - Text[ dutch ] = "Converteert de datumswaarde naar een jaar dat wordt weergegeven als getal."; + Text[ dutch ] = "Converteert de datumwaarde naar een jaar dat wordt weergegeven als getal."; Text[ chinese_simplified ] = "转æ¢æ—¥æœŸæ•°å€¼æˆç›¸å¯¹åº”的年份数。"; Text[ greek ] = "Ïñßæåé ãéá ôçí ôéìÞ çìåñïìçíßáò ôï Ýôïò ùò áñéèìü."; - Text[ korean ] = "ë…„ë„를 나타내는 ë‚ ì§œê°’ìœ¼ë¡œ ì‚¬ìš©í• ìˆ«ìž ì„ íƒ"; + Text[ korean ] = "ì—°ë„를 나타내는 ë‚ ì§œê°’ìœ¼ë¡œ ì‚¬ìš©í• ìˆ«ìžë¥¼ 구합니다."; Text[ turkish ] = "Tarih deðerine göre yýlý tamsayý olarak bulur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna l'any d'un valor de data com a enter."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸›à¸µà¸‚à¸à¸‡à¸„่าขà¸à¸‡à¸§à¸±à¸™à¸—ี่เป็นจำนวนเต็ม"; }; ExtraData = { @@ -4295,6 +4429,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -4312,7 +4447,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Número interno de la fecha" ; Text [ english_us ] = "Internal number of the date." ; Text[ chinese_simplified ] = "日期的系统内部数å—。"; - Text[ russian ] = "Êîä äàòà-âðåìÿ, èñïîëüçóåìûé äëÿ âû÷èñëåíèé ñ äàòàìè è ïðåèîäàìè âðåìåíè."; + Text[ russian ] = "Âíóòðåííåå ÷èñëî äàòû."; Text[ polish ] = "Kod daty-godziny u¿ywany do obliczenia daty i godziny."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "日期的內部數å—。"; @@ -4320,10 +4455,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "De datum als serieel getal."; Text[ chinese_simplified ] = "日期的系统内部数å—。"; Text[ greek ] = "is the date-time code used for date and time calculations."; - Text[ korean ] = "ë‚ ì§œì˜ ë‚´ë¶€ ê°’"; + Text[ korean ] = "ë‚ ì§œ 내부값"; Text[ turkish ] = "Tarihin iç sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre intern de la data."; + Text[ thai ] = "ตัวเลขภายในขà¸à¸‡à¸§à¸±à¸™à¸—ี่"; }; }; // -=*# Resource for function TAGE #*=- @@ -4357,6 +4493,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýki tarih arasýndaki gün farkýný bulur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el nombre de dies entre dues dates."; + Text[ thai ] = "คำนวณจำนวนวันระหว่างวันที่สà¸à¸‡à¸§à¸±à¸™"; }; ExtraData = { @@ -4380,7 +4517,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Fecha_2" ; Text [ english_us ] = "Date_2" ; Text[ chinese_simplified ] = "date_2"; - Text[ russian ] = "Äàòà_2"; + Text[ russian ] = "Äàòà 2"; Text[ polish ] = "Data_2"; Text[ japanese ] = "日付 2"; Text[ chinese_traditional ] = "date_2"; @@ -4392,6 +4529,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tarih_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_2"; + Text[ thai ] = "วันที่_2"; }; String 3 // Description of Parameter 1 { @@ -4417,10 +4555,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Jongere datum ter bepaling van het aantal dagen."; Text[ chinese_simplified ] = "计算两个日期相差天数时较晚的那个日期。"; Text[ greek ] = "ÔåëéêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò çìåñþí."; - Text[ korean ] = "ë‚ ì§œ 계산ì—ì„œì˜ ë§ˆì§€ë§‰ ì¼ìž."; + Text[ korean ] = "ìš”ì¼ìˆ˜ ì°¨ì´ ê³„ì‚°ì˜ ìµœì¢… ë‚ ì§œ"; Text[ turkish ] = "Gün farký hesabý için geç olan tarih."; Text[ language_user1 ] = " "; Text[ catalan ] = "Data final per calcular la diferència en dies."; + Text[ thai ] = "วันสุดท้ายสำหรับà¸à¸²à¸£à¸„ำนวณความà¹à¸•à¸à¸•à¹ˆà¸²à¸‡à¹ƒà¸™à¸§à¸±à¸™à¸•à¹ˆà¸²à¸‡ ๆ"; }; String 4 // Name of Parameter 2 { @@ -4438,7 +4577,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Fecha_1" ; Text [ english_us ] = "Date_1" ; Text[ chinese_simplified ] = "date_1"; - Text[ russian ] = "Äàòà_1"; + Text[ russian ] = "Äàòà 1"; Text[ polish ] = "Data_1"; Text[ japanese ] = "日付 1"; Text[ chinese_traditional ] = "date_1"; @@ -4450,6 +4589,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tarih_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_1"; + Text[ thai ] = "วันที่_1"; }; String 5 // Description of Parameter 2 { @@ -4475,10 +4615,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Oudere datum ter bepaling van het aantal dagen."; Text[ chinese_simplified ] = "计算两个日期相差天数时较早的那个日期。"; Text[ greek ] = "Áñ÷éêÞ çìåñïìçíßá ãéá ôïí õðïëïãéóìü ôçò äéáöïñÜò çìåñþí."; - Text[ korean ] = "ë‚ ì§œ 계산ì—ì„œì˜ ì‹œìž‘ ì¼ìž"; + Text[ korean ] = "ìš”ì¼ ìˆ˜ ì°¨ì´ ê³„ì‚°ì˜ ì‹œìž‘ ë‚ ì§œ"; Text[ turkish ] = "Gün farký hesabý için erken olan tarih."; Text[ language_user1 ] = " "; Text[ catalan ] = "Data d'inici per calcular la diferència en dies."; + Text[ thai ] = "วันเริ่มต้นสำหรับà¸à¸²à¸£à¸„ำนวณความà¹à¸•à¸à¸•à¹ˆà¸²à¸‡à¸à¸±à¸™à¹ƒà¸™à¸§à¸±à¸™à¸•à¹ˆà¸²à¸‡ ๆ"; }; }; // -=*# Resource for function KALENDERWOCHE #*=- @@ -4500,7 +4641,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Calcula la semana del año correspondiente a la fecha especificada." ; Text [ english_us ] = "Calculates the calendar week corresponding to the given date." ; Text[ chinese_simplified ] = "计算æŸä¸€æ—¥æœŸåœ¨ä¸€å¹´ä¸æ‰€å¯¹åº”的星期åºåˆ—数。"; - Text[ russian ] = "Âû÷èñëÿåò êàëåíäàðíóþ íåäåëþ ñîîòâåòñòâåííî äàííîé äàòå."; + Text[ russian ] = "Âû÷èñëÿåò íîìåð êàëåíäàðíîé íåäåëè â ñîîòâåòñòâèè ñ óêàçàííîé äàòîé."; Text[ polish ] = "Oblicza dla podanej daty tydzieñ kalendarzowy w roku."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤ãŒãã®å¹´ã®ä½•é€±ç›®ã«ã‚ãŸã‚‹ã‹ã‚’ã€æ•°å€¤ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算æŸä¸€æ—¥æœŸåœ¨ä¸€å¹´ä¸çš„星期åºåˆ—數。"; @@ -4508,10 +4649,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bepaalt de kalenderweek aan de hand van de gegeven datumwaarde."; Text[ chinese_simplified ] = "计算æŸä¸€æ—¥æœŸåœ¨ä¸€å¹´ä¸æ‰€å¯¹åº”的星期åºåˆ—数。"; Text[ greek ] = "Ïñßæåé ãéá ôçí ôéìÞ çìåñïìçíßáò ôçí çìåñïëïãéáêÞ åâäïìÜäá ôïõ Ýôïõò."; - Text[ korean ] = "ë‚ ì§œê°’ì— ëŒ€í•´ 주ï¼ë…„ì„ ê²°ì •"; + Text[ korean ] = "ì§€ì •ëœ ì—°ë„ì— í•´ë‹¹í•˜ëŠ” ì£¼ì¼ ìˆ˜ë¥¼ 계산합니다."; Text[ turkish ] = "Tarih deðerine göre takvim haftasýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la setmana corresponent a la data indicada."; + Text[ thai ] = "คำนวณสัปดาห์ขà¸à¸‡à¸›à¸à¸´à¸—ินสà¸à¸”คล้à¸à¸‡à¸à¸±à¸šà¸§à¸±à¸™à¸—ี่ให้มา"; }; ExtraData = { @@ -4547,6 +4689,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -4556,7 +4699,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Data espressa come numero seriale." ; Text [ portuguese_brazilian ] = "Interne Zahl des Datums." ; Text [ portuguese ] = "é o número interno da data." ; - Text [ finnish ] = "Päivämäärän sisäinen arvo." ; + Text [ finnish ] = "Päivämäärän sisäinen arvo" ; Text [ danish ] = "Intern datoværdi." ; Text [ french ] = "Le numéro de série de la date." ; Text [ swedish ] = "Internt tal för datum." ; @@ -4564,7 +4707,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el código de fecha que representa la fecha." ; Text [ english_us ] = "The internal number of the date." ; Text[ chinese_simplified ] = "日期的内部åºåˆ—数。"; - Text[ russian ] = "Ïîðÿäêîâîå ÷èñëî äàííîé äàòû."; + Text[ russian ] = "Ïîðÿäêîâîå ÷èñëî äàòû."; Text[ polish ] = "Numer kolejny odpowiadaj¹cy dacie."; Text[ japanese ] = "日付ã®ã‚·ãƒªã‚¢ãƒ«å€¤"; Text[ chinese_traditional ] = "日期的內部數å—。"; @@ -4572,10 +4715,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "De datum als serieel getal."; Text[ chinese_simplified ] = "日期的内部åºåˆ—数。"; Text[ greek ] = "Åóùôåñéêüò áñéèìüò ôçò çìåñïìçíßáò."; - Text[ korean ] = "ë‚ ì§œì˜ ë‚´ë¶€ ê°’"; + Text[ korean ] = "ë‚ ì§œ 내부값"; Text[ turkish ] = "Dahili tarih sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre intern de la data."; + Text[ thai ] = "ตัวเลขภายในขà¸à¸‡à¸§à¸±à¸™à¸—ี่"; }; String 4 // Name of Parameter 2 { @@ -4605,6 +4749,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kip"; Text[ language_user1 ] = " "; Text[ catalan ] = "mode"; + Text[ thai ] = "โหมด"; }; String 5 // Description of Parameter 2 { @@ -4614,7 +4759,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Stabilisce il primo giorno della settimana (1 = domenica, altro valore = lunedì)." ; Text [ portuguese_brazilian ] = "Legt den ersten Tag in der Woche fest." ; Text [ portuguese ] = "Determina o primeiro dia da semana." ; - Text [ finnish ] = "Viikon ensimmäinen päivä." ; + Text [ finnish ] = "Viikon ensimmäinen päivä (1 = sunnuntai, muut arvot = maanantai)" ; Text [ danish ] = "Definerer den første dag i ugen (1 = søndag, andre værdier = mandag)." ; Text [ french ] = "Détermine le premier jour de la semaine (1 = Dimanche, autres valeurs = Lundi)." ; Text [ swedish ] = "Definierar den första dagen i veckan (1 = söndag, andra värden = måndag)." ; @@ -4634,6 +4779,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Haftanýn birinci gününü belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica el primer dia de la setmana."; + Text[ thai ] = "ระบุวันà¹à¸£à¸à¸‚à¸à¸‡à¸ªà¸±à¸›à¸”าห์"; }; }; // -=*# Resource for function OSTERSONNTAG #*=- @@ -4645,8 +4791,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "Calculates the date of easter sunday in a given year." ; Text[ english_us ] = "Calculates the date of Easter Sunday in a given year."; Text[ portuguese ] = "Calcula a data do domingo de Páscoa para um ano determinado."; - Text[ russian ] = "Îïðåäåëÿåò äàòó ïàñõàëüíîãî âîñêðåñåíüÿ â ãîäó."; - Text[ dutch ] = "Berekent de datum van de eerste Paasdag in een bepaald jaar."; + Text[ russian ] = "Îïðåäåëÿåò äàòó ïàñõàëüíîãî âîñêðåñåíüÿ â çàäàííîì ãîäó."; + Text[ dutch ] = "Berekent de datum van eerste Paasdag in een bepaald jaar."; Text[ french ] = "Calcule la date du dimanche de Pâques pour une année donnée"; Text[ spanish ] = "Calcula la fecha del Domingo de Pascua de un año."; Text[ italian ] = "Restituisce la data della domenica di Pasqua per l'anno indicato."; @@ -4658,14 +4804,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ chinese_simplified ] = "计算æŸä¸€å¹´å¤æ´»èŠ‚星期天的日期。"; Text[ chinese_traditional ] = "計算æŸä¸€å¹´å¾©æ´»ç¯€æ˜ŸæœŸå¤©çš„日期。"; Text[ arabic ] = "ÊÍÏÏ ÊÇÑíÎ íæã ÇáÃÍÏ ÇáãæÇÝÞ ÚíÏ ÇáÝÕÍ Ýí ÇáÚÇã ÇáãÚØì."; - Text[ dutch ] = "Berekent de datum van de eerste Paasdag in een bepaald jaar."; + Text[ dutch ] = "Berekent de datum van eerste Paasdag in een bepaald jaar."; Text[ chinese_simplified ] = "计算æŸä¸€å¹´å¤æ´»èŠ‚星期天的日期。"; Text[ greek ] = "Õðïëïãéóìüò çìåñïìçíßáò ôçò ÊõñéáêÞò ôïõ ÐÜó÷á åíüò Ýôïõò."; - Text[ korean ] = "주어진 ë…„ë„ì˜ë¶€í™œì ˆ ì¼ìš”ì¼ì˜ ë‚ ì§œë¥¼ 계산"; + Text[ korean ] = "ì§€ì •ëœ ì—°ë„ ë¶€í™œì ˆ ì¼ìš”ì¼ì˜ ë‚ ì§œë¥¼ 계산합니다."; Text[ turkish ] = "Paskalya Pazar gününün hangi tarihe denk geldiðini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la data de la Pasqua de Resurrecció d'un any determinat."; Text[ finnish ] = "Laskee pääsiäissunnuntain päivämäärän annettuna vuonna."; + Text[ thai ] = "คำนวณวันที่ขà¸à¸‡à¸§à¸±à¸™à¸à¸²à¸—ิตย์ที่เป็นวันà¸à¸µà¸ªà¹€à¸•à¸à¸£à¹Œà¹ƒà¸™à¸›à¸µà¸—ี่ให้มา"; }; ExtraData = { @@ -4700,6 +4847,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ language_user1 ] = " "; Text[ catalan ] = "any"; Text[ finnish ] = "vuosi"; + Text[ thai ] = "ปี"; }; String 3 // Description of Parameter 1 { @@ -4728,6 +4876,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ language_user1 ] = " "; Text[ catalan ] = "Enter entre 1583 i 9956, o entre 0 i 99 (19xx o 20xx segons l'opció establerta)."; Text[ finnish ] = "Kokonaisluku 1583 - 9956, tai 0 - 99 (19xx tai 20xx käytetyn asetuksen mukaan)."; + Text[ thai ] = "จำนวนเต็มระหว่าง 1583 à¹à¸¥à¸° 9956, หรืภ0 à¹à¸¥à¸° 99 (19xx หรืภ20xx ขึ้นà¸à¸¢à¸¹à¹ˆà¸à¸±à¸šà¸Šà¸¸à¸”ตัวเลืà¸à¸)"; }; }; // -=*# Resource for function BW #*=- @@ -4761,6 +4910,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Bir yatýrýmýn bugünkü deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Calcula el valor actual d'una inversió."; + Text[ thai ] = "ค่าปัจจุบัน คำนวณค่าปัจุบันขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; ExtraData = { @@ -4784,7 +4934,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "tasa" ; Text [ english_us ] = "Rate" ; Text[ chinese_simplified ] = "rate"; - Text[ russian ] = "Ïðîöåíò ñ êàïèòàëà"; + Text[ russian ] = "Ïðîöåíò"; Text[ polish ] = "Odsetek"; Text[ japanese ] = "利率"; Text[ chinese_traditional ] = "rate"; @@ -4792,10 +4942,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "Rate"; - Text[ korean ] = "비율"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -4825,6 +4976,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faiz oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per al període donat."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸‡à¸§à¸”ที่ให้มา"; }; String 4 // Name of Parameter 2 { @@ -4834,11 +4986,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "NPER" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; - Text [ dutch ] = "BT" ; + Text [ dutch ] = "NPER" ; Text [ spanish ] = "nper" ; Text [ english_us ] = "NPER" ; Text[ chinese_simplified ] = "nper"; @@ -4847,13 +4999,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "全支払ã„期間"; Text[ chinese_traditional ] = "NPER"; Text[ arabic ] = "NPER"; - Text[ dutch ] = "BT"; + Text[ dutch ] = "NPER"; Text[ chinese_simplified ] = "nper"; Text[ greek ] = "NPER"; Text[ korean ] = "NPER"; Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 5 // Description of Parameter 2 { @@ -4884,6 +5037,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ จำนวนงวดทั้งหมดที่จ่ายเงินรายปี"; }; String 6 // Name of Parameter 3 { @@ -4893,7 +5047,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Rata" ; Text [ portuguese_brazilian ] = "RMZ" ; Text [ portuguese ] = "Pgto" ; - Text [ finnish ] = "PMT" ; + Text [ finnish ] = "MAKSU" ; Text [ danish ] = "YDELSE" ; Text [ french ] = "VPM" ; Text [ swedish ] = "Betalning" ; @@ -4913,6 +5067,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "PMT"; Text[ language_user1 ] = " "; Text[ catalan ] = "PMT"; + Text[ thai ] = "PMT"; }; String 7 // Description of Parameter 3 { @@ -4943,6 +5098,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödemeler. Her dönem ödenen sabit annüiteler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Pagaments regulars. Quantitat constant de l'anualitat que es paga en cada període."; + Text[ thai ] = "à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´ จำนวนเงินคงที่ขà¸à¸‡à¹€à¸‡à¸´à¸™à¸£à¸²à¸¢à¸›à¸µà¸—ี่จ่ายในà¹à¸•à¹ˆà¸¥à¸°à¸‡à¸§à¸”"; }; String 8 // Name of Parameter 4 { @@ -4952,7 +5108,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "Vf" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -4960,7 +5116,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "fv"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "fv"; @@ -4972,6 +5128,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "FV"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 9 // Description of Parameter 4 { @@ -4990,7 +5147,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor futuro o el saldo en efectivo que desea lograr después de efectuar el último pago." ; Text [ english_us ] = "Future value. The value (final value) to be attained after the last payment." ; Text[ chinese_simplified ] = "未æ¥å€¼ã€‚完æˆæœ€åŽä¸€æ¬¡æ”¯ä»˜åŽè¾¾åˆ°çš„最终值。"; - Text[ russian ] = "Áóäóùåå çíà÷åíèå. Çíà÷åíèå (êîíå÷íîå çíà÷åíèå), êîòîðîå äîëæíî ïîëó÷èòüñÿ ïîñëå ïîñëåäíåãî ïëàòåæà."; + Text[ russian ] = "Áóäóùåå çíà÷åíèå. Çíà÷åíèå (êîíå÷íîå çíà÷åíèå), êîòîðîå äîëæíî ïîëó÷èòüñÿ ïîñëå ïîñëåäíåãî ïëàòåæà."; Text[ polish ] = "Przysz³a wartoœæ. Wartoœæ koñcowa, która ma zostaæ osi¹gniêta po dokonaniu ostatniej p³atnoœci."; Text[ japanese ] = "å°†æ¥ä¾¡å€¤ã€‚投資ã®å°†æ¥ä¾¡å€¤ã€ã¾ãŸã¯æœ€å¾Œã®æ”¯æ‰•ã„ã‚’è¡Œã£ãŸã‚ã¨ã«æ®‹ã‚‹ç¾é‡‘ã®åŽæ”¯ã€‚"; Text[ chinese_traditional ] = "未來值。完æˆæœ€å¾Œä¸€æ¬¡æ”¯ä»˜å¾Œé”到的最終值。"; @@ -5002,6 +5159,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer. Son ödeme yapýldýktan sonra elde edilmek istenen deðer (son deðer)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur. Valor (valor final) que s'ha d'aconseguir després de l'últim pagament."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸™à¸²à¸„ต ค่า (ค่าสุดท้าย) ที่ได้รับหลังจาà¸à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„รั้งสุดท้าย"; }; String 10 // Name of Parameter 5 { @@ -5031,6 +5189,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 11 // Description of Parameter 5 { @@ -5041,7 +5200,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Scadenza pagamenti. Tipo=1 significa scadenza all'inizio e Tipo=0 significa alla fine di un periodo." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o número 0 ou 1 e indica as datas de vencimento dos pagamentos. 1 = início do período; 0 = fim do período." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -5049,7 +5208,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el vencimiento de los pagos. El 1 es al comienzo del período, el 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。 type = 1 表示在周期开始时到期，type= 0 表示在周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 okreœlaj¹ca sposób dokonywania p³atnoœci (z do³u lub z góry)."; Text[ japanese ] = "支払期日。支払期 = 1 ã¯å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 ã¯å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在週期開始時到期ï¹F = 0 表示在週期çµæŸæ™‚到期。"; @@ -5061,6 +5220,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นครบà¸à¸³à¸«à¸™à¸”งวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function ZW #*=- @@ -5075,7 +5235,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro. Restituisce il valore futuro di un investimento sulla base di pagamenti periodici e di un tasso di interesse costante." ; Text [ portuguese_brazilian ] = "Zuk?ftiger Wert. Berechnet den Endwert einer Investition bei regelm??igen Zahlungen und konstantem Zinssatz." ; Text [ portuguese ] = "Devolve o valor futuro de um investimento de acordo com os pagamentos periódicos e constantes e com uma taxa de juros constante." ; - Text [ finnish ] = "Tuleva arvo. Palauttaa sijoituksen tulevan arvon, joka lasketaan säännöllisen maksuohjelman ja kiinteän korkoprosentin mukaan." ; + Text [ finnish ] = "Tuleva arvo Palauttaa sijoituksen tulevan arvon, joka lasketaan säännöllisen maksuohjelman ja kiinteän korkoprosentin mukaan." ; Text [ danish ] = "Fremtidsværdi. Beregner slutværdien af en investering ved konstant ydelse og konstant rentesats." ; Text [ french ] = "Calcule la valeur future d'un investissement sur la base de paiements réguliers et d'un taux d'intérêt constant." ; Text [ swedish ] = "Framtida värde. Beräknar slutvärdet för en investering vid regelbundna betalningar och konstant räntesats." ; @@ -5083,7 +5243,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el valor futuro de una inversión basándose en pagos periódicos constantes y en una tasa de interés constante." ; Text [ english_us ] = "Future value. Returns the future value of an investment based on regular payments and a constant interest rate." ; Text[ chinese_simplified ] = "未æ¥å€¼ã€‚在定期支付和利率æ’定的情况下，\n计算一项投资的未æ¥å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò áóäóùåå çíà÷åíèå âêëàäà ñ ïîñòîÿííûìè âûïëàòàìè è ïîñòîÿííûì ïðîöåíòîì."; + Text[ russian ] = "Âû÷èñëÿåò áóäóùåå çíà÷åíèå âêëàäà ñ ïîñòîÿííûìè âûïëàòàìè è ïîñòîÿííûì ïðîöåíòîì."; Text[ polish ] = "Oblicza wartoœæ przysz³¹ inwestycji opart¹ na regularnych wp³atach i sta³ej stopie oprocentowania."; Text[ japanese ] = "å°†æ¥ä¾¡å€¤ã€‚投資ã®å°†æ¥ä¾¡å€¤ã€ã¾ãŸã¯æœ€å¾Œã®æ”¯æ‰•ã„ã‚’è¡Œã£ãŸã‚ã¨ã«æ®‹ã‚‹ç¾é‡‘ã®åŽæ”¯ã‚’指定ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "未來值。在定期支付和利率æ†å®šçš„情æ³ä¸‹ï¹è¨ˆç®—ä¸€é …æŠ•è³‡çš„æœªä¾†å€¼ã€‚"; @@ -5095,6 +5255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer. Düzenli ödemeli ve sabit faiz oranlý yatýrýmýn son deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur. Torna el valor de futur d'una inversió basada en pagaments regulars i una taxa d'interès constant."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸™à¸²à¸„ต ส่งà¸à¸¥à¸±à¸šà¸„่าขà¸à¸‡à¸à¸™à¸²à¸„ตขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุนบนพื้นà¸à¸²à¸™à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´à¹à¸¥à¸°à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่"; }; ExtraData = { @@ -5118,7 +5279,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "tasa" ; Text [ english_us ] = "Rate" ; Text[ chinese_simplified ] = "rate"; - Text[ russian ] = "Ñòàâêà"; + Text[ russian ] = "Ïðîöåíò"; Text[ polish ] = "Odsetki"; Text[ japanese ] = "利率"; Text[ chinese_traditional ] = "rate"; @@ -5126,10 +5287,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "rate"; - Text[ korean ] = "비율"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -5139,7 +5301,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di interesse per periodo." ; Text [ portuguese_brazilian ] = "Der Zinssatz pro Periode." ; Text [ portuguese ] = "é a taxa de juros periódica." ; - Text [ finnish ] = "Kausikohtainen korkoprosentti." ; + Text [ finnish ] = "Kausikohtainen korkoprosentti" ; Text [ danish ] = "Rentesatsen per periode." ; Text [ french ] = "Le taux d'intérêt par période." ; Text [ swedish ] = "Räntesatsen per period." ; @@ -5147,7 +5309,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es la tasa de interés por período." ; Text [ english_us ] = "The rate of interest per period." ; Text[ chinese_simplified ] = "å„期的利率。"; - Text[ russian ] = "Íîðìà ïðèáûëè çà ïåðèîä."; + Text[ russian ] = "Ïðîöåíò ïðèáûëè çà ïåðèîä."; Text[ polish ] = "Stopa procentowa dla pojedynczego okresu."; Text[ japanese ] = "å„期ã®åˆ©æ¯"; Text[ chinese_traditional ] = "å„期的利率。"; @@ -5159,6 +5321,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faiz oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; String 4 // Name of Parameter 2 { @@ -5168,7 +5331,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "Nper" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; @@ -5176,7 +5339,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "nper" ; Text [ english_us ] = "NPER" ; Text[ chinese_simplified ] = "nper"; - Text[ russian ] = "Êïåð"; + Text[ russian ] = "ÊÏÅÐ"; Text[ polish ] = "LICZBA.RAT"; Text[ japanese ] = "全支払ã„期間"; Text[ chinese_traditional ] = "nper"; @@ -5188,6 +5351,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 5 // Description of Parameter 2 { @@ -5198,7 +5362,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero totale dei periodi di pagamento in un'annualità." ; Text [ portuguese_brazilian ] = "Zahlungszeitraum. Die Gesamtanzahl der Perioden, in denen die Annuit?t (Rente) gezahlt wird." ; Text [ portuguese ] = "é o número total de períodos de pagamento numa anuidade." ; - Text [ finnish ] = "Maksukausi. Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; + Text [ finnish ] = "Maksukausi Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; Text [ danish ] = "Ydelsesperioder. Det samlede antal ydelsesperioder i en annuitet." ; Text [ french ] = "Le nombre total de périodes de paiement de l'annuité." ; Text [ swedish ] = "Betalningsperiod. Det totala antalet perioder då annuiteten (pension) betalas." ; @@ -5218,6 +5382,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat (pensió)."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ จำนวนงวดทั้งหมดที่จ่ายเงินรายปี (เงินบำเหน็จ) "; }; String 6 // Name of Parameter 3 { @@ -5227,7 +5392,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Rata" ; Text [ portuguese_brazilian ] = "RMZ" ; Text [ portuguese ] = "Pgto" ; - Text [ finnish ] = "PMT" ; + Text [ finnish ] = "MAKSU" ; Text [ danish ] = "YDELSE" ; Text [ french ] = "VPM" ; Text [ swedish ] = "Betalning" ; @@ -5247,6 +5412,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödeme"; Text[ language_user1 ] = " "; Text[ catalan ] = "PMT"; + Text[ thai ] = "PMT"; }; String 7 // Description of Parameter 3 { @@ -5257,7 +5423,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Pagamento effettuato in ciascun periodo e non può variare nel corso dell'annualità." ; Text [ portuguese_brazilian ] = "Regelm??ige Zahlung. Die konstante Annuit?t, die in jeder Periode gezahlt wird." ; Text [ portuguese ] = "é o pagamento feito em cada período, mantendo-se constante durante a vigência da anuidade." ; - Text [ finnish ] = "Säännölliset maksut. Kunakin kautena maksettava vakioannuiteetti." ; + Text [ finnish ] = "Säännölliset maksut Kunakin kautena maksettava vakioannuiteetti." ; Text [ danish ] = "Ydelse. Den konstante ydelse som betales hver periode og ikke kan ændres i annuitetens løbetid" ; Text [ french ] = "Paiement régulier. L'annuité constante payée pour chaque période." ; Text [ swedish ] = "Regelbunden betalning. Den konstanta annuiteten som betalas i varje period." ; @@ -5277,6 +5443,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödemeler. Her dönem ödenen sabit annüite."; Text[ language_user1 ] = " "; Text[ catalan ] = "Pagaments regulars. Anualitat constant que s'ha de pagar en cada període."; + Text[ thai ] = "à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´ เงินรายปีคงที่ที่จ่ายในà¹à¸•à¹ˆà¸¥à¸°à¸›à¸µ"; }; String 8 // Name of Parameter 4 { @@ -5286,7 +5453,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "PV" ; + Text [ finnish ] = "NA" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -5294,7 +5461,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "va" ; Text [ english_us ] = "PV" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Íç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -5306,6 +5473,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "PV"; + Text[ thai ] = "PV"; }; String 9 // Description of Parameter 4 { @@ -5315,7 +5483,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale di una serie di pagamenti." ; Text [ portuguese_brazilian ] = "Barwert. Der derzeitige Wert der Reihe von Zahlungen." ; Text [ portuguese ] = "é o valor presente ou a quantia total actual correspondente a uma série de pagamentos futuros." ; - Text [ finnish ] = "Nykyinen arvo. Maksusarjan nykyinen arvo" ; + Text [ finnish ] = "Nykyinen arvo Maksusarjan nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Den værdi en række ydelser er værd nu." ; Text [ french ] = "Valeur actuelle = la valeur, à la date d'aujourd'hui, d'une série de remboursements futurs." ; Text [ swedish ] = "Nuvarande värde. Det nuvarande värdet för raden av betalningar." ; @@ -5323,7 +5491,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor actual de la cantidad total de una serie de pagos futuros." ; Text [ english_us ] = "Present value. The current value of a series of payments" ; Text[ chinese_simplified ] = "现金值。一系列未æ¥æ”¯ä»˜çš„ç›®å‰ä»·å€¼ã€‚"; - Text[ russian ] = "Òåêóùàÿ ñòîèìîñòü èëè îáùàÿ ñóììà âñåõ áóäóùèõ ïëàòåæåé ñ íàñòîÿùåãî ìîìåíòà."; + Text[ russian ] = "Òåêóùàÿ çíà÷åíèå èëè îáùàÿ ñóììà âñåõ áóäóùèõ ïëàòåæåé ñ íàñòîÿùåãî ìîìåíòà."; Text[ polish ] = "Wartoœæ bie¿¹ca dla serii przysz³ych p³atnoœci."; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤ã€‚å°†æ¥è¡Œã‚れる一連ã®æ”¯æ‰•ã„ã‚’ã€ç¾æ™‚点ã§ä¸€æ‹¬æ‰•ã„ã—ãŸå ´åˆã®åˆè¨ˆé‡‘é¡ã€‚"; Text[ chinese_traditional ] = "凈ç¾å€¼ã€‚一系列未來付款目å‰å€¼çš„ç´¯ç©æ•¸ã€‚"; @@ -5335,6 +5503,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual d'una sèrie de pagaments."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันขà¸à¸‡à¸¥à¸³à¸”ับà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™"; }; String 10 // Name of Parameter 5 { @@ -5360,10 +5529,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "V"; Text[ chinese_simplified ] = "type"; Text[ greek ] = "Ôýðïò"; - Text[ korean ] = "Ｆ"; + Text[ korean ] = "type"; Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 11 // Description of Parameter 5 { @@ -5374,7 +5544,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenze dei pagamenti. 1 = all'inizio di un periodo, 0 = alla fine." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period och F = 0 i slutet." ; @@ -5382,7 +5552,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el vencimiento de los pagos, 1 es al comienzo del período, 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。 type = 1 表示在周期开始时到期，type= 0 表示在周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 okreœlaj¹ca sposób dokonywania p³atnoœci ( z do³u lub z góry)."; Text[ japanese ] = "支払期日ã€æ”¯æ‰•æœŸæ—¥ = 1 å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在期åˆæ™‚到期ï¹F = 0 表示在期末時到期。"; @@ -5394,6 +5564,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นงวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function ZZR #*=- @@ -5408,7 +5579,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero di rate. Restituisce il numero di periodi di pagamento relativi ad un investimento che prevede pagamenti periodici a tasso di interesse costante." ; Text [ portuguese_brazilian ] = "Zahlungszeitraum. Berechnet die Anzahl der Zahlungsperioden einer Investition bei regelm??igen Zahlungen und konstantem Zinssatz." ; Text [ portuguese ] = "Calcula o número de períodos para um investimento de acordo com pagamentos regulares e uma taxa de juros constante." ; - Text [ finnish ] = "Maksukausi. Laskee sijoituksen maksukausien määrän säännöllisten maksujen ja kiinteän koron mukaan." ; + Text [ finnish ] = "Maksukausi Laskee sijoituksen maksukausien määrän säännöllisten maksujen ja kiinteän koron mukaan." ; Text [ danish ] = "Ydelsesperioder. Beregner antallet af ydelsesperioder for en investering ved konstant ydelse og konstant rentesats." ; Text [ french ] = "Calcule le nombre de périodes de paiement pour un investissement sur la base de paiements réguliers et d'un taux d'intérêt constant." ; Text [ swedish ] = "Betalningsperiod. Beräknar antalet betalningsperioder för en investering vid regelbundna betalningar och konstant räntesats." ; @@ -5416,7 +5587,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el número de pagos de una inversión basándose en los pagos periódicos constantes y en la tasa de interés constante." ; Text [ english_us ] = "Payment period. Calculates the number of payment periods for an investment based on regular payments and a constant interest rate." ; Text[ chinese_simplified ] = "支付周期数。在定期支付和利率æ’定的情况下，\n计算一项投资的支付周期数。"; - Text[ russian ] = "Âû÷èñëÿåò îáùåå êîëè÷åñòâî ïåðèîäîâ âûïëàòû äëÿ äàííîãî âêëàäà ñ ïîñòîÿííûìè âûïëàòàìè è ïîñòîÿííûì ïðîöåíòîì."; + Text[ russian ] = "Âû÷èñëÿåò îáùåå êîëè÷åñòâî ïåðèîäîâ âûïëàò äëÿ äàííîãî âêëàäà ñ ïîñòîÿííûìè âûïëàòàìè è ïîñòîÿííûì ïðîöåíòîì."; Text[ polish ] = "Okres p³atnoœci. Oblicza iloœæ okresów p³atnoœci dla inwestycji przy regularnych p³atnoœciach i sta³ej stopie oprocentowania."; Text[ japanese ] = "支払ã„期間。定é¡ã®æ”¯æ‰•ã„を定期的ã«è¡Œã„ã€åˆ©çŽ‡ãŒä¸€å®šã§ã‚ã‚‹ã¨ä»®å®šã—ã¦ã€æŠ•è³‡ã«å¿…è¦ãªæœŸé–“ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "支付週期數。在定期支付和利率æ†å®šçš„情æ³ä¸‹ï¹è¨ˆç®—ä¸€é …æŠ•è³‡çš„æ”¯ä»˜é€±æœŸæ•¸ã€‚"; @@ -5428,6 +5599,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Düzenli ödeme ve sabit faiz oranlý bir yatýrýmýn ödeme dönemi sayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Calcula el nombre de períodes de pagament d'una inversió basada en pagaments regulars i una taxa d'interès constant."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ คำนวนจำนวนงวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸¥à¸‡à¸—ุนบนพื้นà¸à¸²à¸™à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´à¹à¸¥à¸°à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸›à¸à¸•à¸´"; }; ExtraData = { @@ -5451,7 +5623,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "tasa" ; Text [ english_us ] = "Rate" ; Text[ chinese_simplified ] = "rate"; - Text[ russian ] = "Ñòàâêà"; + Text[ russian ] = "Ïðîöåíò"; Text[ polish ] = "Odsetki"; Text[ japanese ] = "利率"; Text[ chinese_traditional ] = "rate"; @@ -5459,10 +5631,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "rate"; - Text[ korean ] = "ì´ìž"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -5472,7 +5645,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di interesse per periodo." ; Text [ portuguese_brazilian ] = "Der Zinssatz pro Periode." ; Text [ portuguese ] = "é a taxa de juros periódica." ; - Text [ finnish ] = "Kausikohtainen korkoprosentti." ; + Text [ finnish ] = "Kausikohtainen korkoprosentti" ; Text [ danish ] = "Rentesatsen per periode." ; Text [ french ] = "Le taux d'intérêt par période." ; Text [ swedish ] = "Räntesatsen per period." ; @@ -5480,7 +5653,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es la tasa de interés por período." ; Text [ english_us ] = "The rate of interest per period." ; Text[ chinese_simplified ] = "æ¯ä¸ªå‘¨æœŸçš„利率。"; - Text[ russian ] = "Íîðìà ïðèáûëè çà ïåðèîä."; + Text[ russian ] = "Ïðîöåíò ïðèáûëè çà ïåðèîä."; Text[ polish ] = "Stopa procentowa w pojedynczym okresie."; Text[ japanese ] = "投資期間を通ã˜ã¦ã®ä¸€å®šã®åˆ©çŽ‡ã€‚"; Text[ chinese_traditional ] = "æ¯å€‹é€±æœŸçš„利率。"; @@ -5492,6 +5665,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faizi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; String 4 // Name of Parameter 2 { @@ -5501,7 +5675,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Rata" ; Text [ portuguese_brazilian ] = "RMZ" ; Text [ portuguese ] = "Pgto" ; - Text [ finnish ] = "PMT" ; + Text [ finnish ] = "MAKSU" ; Text [ danish ] = "YDELSE" ; Text [ french ] = "VPM" ; Text [ swedish ] = "Betalning" ; @@ -5521,6 +5695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödemeler"; Text[ language_user1 ] = " "; Text[ catalan ] = "PMT"; + Text[ thai ] = "PMT"; }; String 5 // Description of Parameter 2 { @@ -5531,7 +5706,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Pagamenti regolari. Le annualità costanti pagate in ogni periodo." ; Text [ portuguese_brazilian ] = "Regelm??ige Zahlung. Die konstante Annuit?t, die in jeder Periode gezahlt wird." ; Text [ portuguese ] = "é o pagamento feito em cada período, mantendo-se constante durante a vigência da anuidade." ; - Text [ finnish ] = "Säännölliset maksut. Kunakin kautena maksettava vakioannuiteetti." ; + Text [ finnish ] = "Säännölliset maksut Kunakin kautena maksettava vakioannuiteetti" ; Text [ danish ] = "Ydelse. Den konstante ydelse som betales hver periode og ikke kan ændres i annuitetens løbetid" ; Text [ french ] = "Paiement régulier. L'annuité constante payée pour chaque période." ; Text [ swedish ] = "Regelbunden betalning. Den konstanta annuiteten som betalas i varje period." ; @@ -5539,7 +5714,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el pago efectuado en cada período; debe permanecer constante durante la vida de la anualidad." ; Text [ english_us ] = "Regular payments. The constant annuity to be paid in each period." ; Text[ chinese_simplified ] = "å„个周期应支付的年金。"; - Text[ russian ] = "Ïîñòîÿííàÿ âûïëàòà. ïðîèçâîäèìàÿ â êàæäûé ïåðèîä."; + Text[ russian ] = "Ïîñòîÿííàÿ âûïëàòà, ïðîèçâîäèìàÿ â êàæäûé ïåðèîä."; Text[ polish ] = "Sta³a suma sp³aty d³ugu (obejmuj¹ca czêœæ d³ugu i odsetki), która jest p³acona regularnie w ka¿dym okresie."; Text[ japanese ] = "定期的ãªæ”¯æ‰•ã„é¡ã€‚å°†æ¥ä¸€é€£ã«æ”¯æ‰•ã‚れる一定ã®å¹´é‡‘。"; Text[ chinese_traditional ] = "å„個週期應支付的年金。"; @@ -5551,6 +5726,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödemeler. Her dönem ödenen sabit annüiteler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Pagaments regulars. Anualitat constant que s'ha de pagar en cada període."; + Text[ thai ] = "à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´ เงินรายปีคงที่ที่จ่ายในà¹à¸•à¹ˆà¸¥à¸°à¸‡à¸§à¸”"; }; String 6 // Name of Parameter 3 { @@ -5560,7 +5736,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "PV" ; + Text [ finnish ] = "NA" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -5568,7 +5744,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "va" ; Text [ english_us ] = "PV" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Íç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -5580,6 +5756,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "PV"; + Text[ thai ] = "PV"; }; String 7 // Description of Parameter 3 { @@ -5589,7 +5766,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale di una serie di pagamenti." ; Text [ portuguese_brazilian ] = "Barwert. Der derzeitige Wert der Reihe von Zahlungen." ; Text [ portuguese ] = "é o valor presente ou a quantia total actual correspondente a uma série de pagamentos futuros." ; - Text [ finnish ] = "Nykyinen arvo. Maksusarjan nykyinen arvo" ; + Text [ finnish ] = "Nykyinen arvo Maksusarjan nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Den værdi en række ydelser er værd nu." ; Text [ french ] = "Valeur actuelle = la valeur, à la date d'aujourd'hui, d'une série de remboursements futurs." ; Text [ swedish ] = "Nuvarande värde. Det nuvarande värdet för en rad betalningar." ; @@ -5597,7 +5774,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor actual o la suma total de una serie de futuros pagos." ; Text [ english_us ] = "Present value. The current value of a series of payments" ; Text[ chinese_simplified ] = "现金值。或一系列未æ¥æ”¯ä»˜çš„ç›®å‰ä»·å€¼ã€‚"; - Text[ russian ] = "Òåêóùàÿ ñòîèìîñòü èëè îáùàÿ ñóììà âñåõ áóäóùèõ ïëàòåæåé ñ íàñòîÿùåãî ìîìåíòà."; + Text[ russian ] = "Òåêóùåå çíà÷åíèå ðÿäà ïëàòåæåé."; Text[ polish ] = "Wartoœæ bie¿¹ca dla serii przysz³ych p³atnoœci."; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤ã€‚å°†æ¥è¡Œã‚れる一連ã®æ”¯æ‰•ã„ã‚’ã€ç¾æ™‚点ã§ä¸€æ‹¬æ‰•ã„ã—ãŸå ´åˆã®åˆè¨ˆé‡‘é¡ã€‚"; Text[ chinese_traditional ] = "凈ç¾å€¼ã€‚或一系列未來支付的目å‰åƒ¹å€¼ã€‚"; @@ -5609,6 +5786,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual d'una sèrie de pagaments."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันขà¸à¸‡à¸¥à¸³à¸”ับà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™"; }; String 8 // Name of Parameter 4 { @@ -5618,7 +5796,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "VF" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -5626,7 +5804,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "FV"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "fv"; @@ -5638,6 +5816,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 9 // Description of Parameter 4 { @@ -5648,7 +5827,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Il valore finale che si desidera raggiungere dopo aver effettuato l'ultimo pagamento." ; Text [ portuguese_brazilian ] = "Zuk?ftiger Wert. Der Wert (Endwert), der nach der letzten Zahlung erreicht werden soll." ; Text [ portuguese ] = "é o valor futuro ou um saldo de caixa obtido depois de efectuado o último pagamento." ; - Text [ finnish ] = "Tuleva arvo. Viimeisen maksun jälkeinen arvo (loppuarvo)." ; + Text [ finnish ] = "Tuleva arvo Viimeisen maksun jälkeinen arvo (loppuarvo)" ; Text [ danish ] = "Fremtidsværdi. Den værdi eller den kassebalance der ønskes opnået, når den sidste ydelse er betalt." ; Text [ french ] = "Valeur future (valeur capitalisée) : le montant que vous souhaitez obtenir après le dernier paiement." ; Text [ swedish ] = "Framtida värde. Värdet (slutvärde) som skall uppnås efter den sista betalningen." ; @@ -5656,7 +5835,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor futuro o saldo en efectivo que se desea lograr después del último pago." ; Text [ english_us ] = "Future value. The value (end value) to be attained after the final payment." ; Text[ chinese_simplified ] = "未æ¥å€¼ã€‚完æˆæœ€åŽä¸€æ¬¡æ”¯ä»˜åŽè¾¾åˆ°çš„最终值。"; - Text[ russian ] = "Áóäóùàÿ ñòîèìîñòü èëè áàëàíñ íàëè÷íîñòè. êîòîðûé íåîáõîäèìî äîñòè÷ü ïîñëå ïîñëåäíåé âûïëàòû."; + Text[ russian ] = "Áóäóùåå çíà÷åíèå, êîòîðîå íåîáõîäèìî äîñòè÷ü ïîñëå ïîñëåäíåé âûïëàòû."; Text[ polish ] = "Przysz³a wartoœæ. Wartoœæ koñcowa, która ma zostaæ osi¹gniêta po dokonaniu ostatniej p³atnoœci."; Text[ japanese ] = "å°†æ¥ä¾¡å€¤ã€‚投資ã®å°†æ¥ä¾¡å€¤ã€ã¾ãŸã¯æœ€å¾Œã®æ”¯æ‰•ã„ã‚’è¡Œã£ãŸã‚ã¨ã«æ®‹ã‚‹ç¾é‡‘ã®åŽæ”¯ã€‚"; Text[ chinese_traditional ] = "未來值。完æˆæœ€å¾Œä¸€æ¬¡æ”¯ä»˜å¾Œé”到的最終值。"; @@ -5668,6 +5847,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer. Son ödeme yapýldýktan sonra elde edilmek istenen deðer (son deðer)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur. Valor (valor final) que s'ha d'aconseguir després de l'últim pagament."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸™à¸²à¸„ต ค่า (ค่าสุดท้าย) ที่ได้รับหลังจาà¸à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„รั้งสุดท้าย"; }; String 10 // Name of Parameter 5 { @@ -5697,6 +5877,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 11 // Description of Parameter 5 { @@ -5707,7 +5888,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenza. 1 = all'inizio, 0 = alla fine del periodo." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -5715,7 +5896,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el vencimiento de los pagos, 1 es al comienzo del período, 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。 type = 1 表示在周期开始时到期，type = 0 \n表示在周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 oznaczaj¹ca sposób dokonywania p³atnoœci (z do³u lub z góry)."; Text[ japanese ] = "支払期日。支払期日 = 1 ã¯å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 ã¯å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在週期開始時到期ï¹F = 0 表示在週期çµæŸæ™‚到期。"; @@ -5727,6 +5908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นครบà¸à¸³à¸«à¸™à¸”งวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function RMZ #*=- @@ -5741,7 +5923,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il pagamento periodico (annualità) per un investimento a tasso di interesse costante." ; Text [ portuguese_brazilian ] = "Regelm??ige Zahlungen. Berechnet die regelm??igen Zahlungen (Annuit?t) f? eine Investition bei konstantem Zinssatz." ; Text [ portuguese ] = "Calcula o pagamento periódico de uma anuidade, baseado em pagamentos regulares e numa taxa de juro constante." ; - Text [ finnish ] = "Säännölliset maksut. Palauttaa annuiteetin säännöllisen maksun, joka lasketaan säännöllisen maksuohjelman ja kiinteän korkoprosentin avulla." ; + Text [ finnish ] = "Säännölliset maksut Palauttaa annuiteetin säännöllisen maksun, joka lasketaan säännöllisen maksuohjelman ja kiinteän korkoprosentin avulla." ; Text [ danish ] = "Ydelse. Beregner den regelmæssige ydelse for en investering ved konstant rentsats." ; Text [ french ] = "Calcule le montant total de chaque remboursement périodique d'un investissement à remboursements et taux d'intérêt constants." ; Text [ swedish ] = "Regelbundna betalningar. Beräknar de regelbundna betalningarna (annuitet) för en investering vid konstant räntesats." ; @@ -5761,6 +5943,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödemeler. Sabit faiz oranlý bir yatýrým için yapýlan düzenli ödemeleri (annüiteleri) hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Pagaments regulars. Torna el pagament periòdic d'una anualitat, basat en pagaments regulars i una taxa d'interès periòdic fixa."; + Text[ thai ] = "à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´ ส่งà¸à¸¥à¸±à¸šà¸‡à¸§à¸”à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸£à¸²à¸¢à¸›à¸µ, บนพื้นà¸à¸²à¸™à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´à¹à¸¥à¸°à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่เป็นรายงวด"; }; ExtraData = { @@ -5784,7 +5967,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "tasa" ; Text [ english_us ] = "Rate" ; Text[ chinese_simplified ] = "rate"; - Text[ russian ] = "Ïðîöåíò ñ êàïèòàëà"; + Text[ russian ] = "Ïðîöåíò"; Text[ polish ] = "Odsetki"; Text[ japanese ] = "利率"; Text[ chinese_traditional ] = "Rate"; @@ -5792,10 +5975,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "Rate"; - Text[ korean ] = "ì´ìž"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -5805,7 +5989,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di interesse per periodo." ; Text [ portuguese_brazilian ] = "Der Zinssatz pro Periode." ; Text [ portuguese ] = "é a taxa de juro periódica." ; - Text [ finnish ] = "Kausikohtainen korkoprosentti." ; + Text [ finnish ] = "Kausikohtainen korkoprosentti" ; Text [ danish ] = "Rentesatsen per periode." ; Text [ french ] = "Le taux d'intérêt par période." ; Text [ swedish ] = "Räntesatsen per period." ; @@ -5825,6 +6009,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faiz oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; String 4 // Name of Parameter 2 { @@ -5834,7 +6019,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "Nper" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; @@ -5842,7 +6027,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "nper" ; Text [ english_us ] = "NPER" ; Text[ chinese_simplified ] = "nper"; - Text[ russian ] = "Êïåð"; + Text[ russian ] = "ÊÏÅÐ"; Text[ polish ] = "LICZBA.RAT"; Text[ japanese ] = "全支払ã„期間"; Text[ chinese_traditional ] = "nper"; @@ -5854,6 +6039,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 5 // Description of Parameter 2 { @@ -5864,7 +6050,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero totale dei periodi di pagamento in un'annualità." ; Text [ portuguese_brazilian ] = "Zahlungszeitraum. Die Gesamtanzahl der Perioden, in denen die Annuit?t (Rente) gezahlt wird." ; Text [ portuguese ] = "é o número total de períodos de pagamento numa anuidade." ; - Text [ finnish ] = "Maksukausi. Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; + Text [ finnish ] = "Maksukausi Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; Text [ danish ] = "Ydelsesperioder. Det samlede antal ydelsesperioder i en annuitet." ; Text [ french ] = "Le nombre total de périodes de paiement de l'annuité." ; Text [ swedish ] = "Betalningsperiod. Det totala antalet perioder då annuiteten (pension) betalas." ; @@ -5884,6 +6070,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat (pensió)."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ จำนวนงวดทั้งหมดในเงินรายปี (เงินบำเหน็จ) ที่จ่าย"; }; String 6 // Name of Parameter 3 { @@ -5893,7 +6080,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "PV" ; + Text [ finnish ] = "NA" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -5901,7 +6088,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "va" ; Text [ english_us ] = "PV" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Òç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -5913,6 +6100,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "PV"; + Text[ thai ] = "PV"; }; String 7 // Description of Parameter 3 { @@ -5930,7 +6118,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor actual o la cantidad total de una serie de pagos futuros." ; Text [ english_us ] = "Present value. The current value of a series of payments" ; Text[ chinese_simplified ] = "现金值。或一系列未æ¥æ”¯ä»˜çš„ç›®å‰ä»·å€¼ã€‚"; - Text[ russian ] = "Òåêóùàÿ ñòîèìîñòü èëè îáùàÿ ñóììà âñåõ áóäóùèõ ïëàòåæåé ñ íàñòîÿùåãî ìîìåíòà."; + Text[ russian ] = "Òåêóùåå çíà÷åíèå ðÿäà ïëàòåæåé."; Text[ polish ] = "Wartoœæ bie¿¹ca dla serii przysz³ych p³atnoœci."; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤ã€‚å°†æ¥è¡Œã‚れる一連ã®æ”¯æ‰•ã„ã‚’ã€ç¾æ™‚点ã§ä¸€æ‹¬æ‰•ã„ã—ãŸå ´åˆã®åˆè¨ˆé‡‘é¡ã€‚"; Text[ chinese_traditional ] = "凈ç¾å€¼ã€‚或一系列未來支付的目å‰åƒ¹å€¼ã€‚"; @@ -5942,6 +6130,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual d'una sèrie de pagaments."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันขà¸à¸‡à¸¥à¸³à¸”ับà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™"; }; String 8 // Name of Parameter 4 { @@ -5951,7 +6140,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "VF" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -5959,7 +6148,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "FV"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "fv"; @@ -5971,6 +6160,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 9 // Description of Parameter 4 { @@ -5989,7 +6179,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor futuro o saldo en efectivo que desea lograr después de efectuar el último pago." ; Text [ english_us ] = "Future value. The value (end value) to be attained after the final payment." ; Text[ chinese_simplified ] = "未æ¥å€¼ã€‚完æˆæœ€åŽä¸€æ¬¡æ”¯ä»˜åŽè¾¾åˆ°çš„最终值。"; - Text[ russian ] = "Áóäóùåå çíà÷åíèå. Çíà÷åíèå (êîíå÷íîå çíà÷åíèå), êîòîðîå äîëæíî ïîëó÷èòüñÿ ïîñëå ïîñëåäíåãî ïëàòåæà."; + Text[ russian ] = "Áóäóùåå çíà÷åíèå. Çíà÷åíèå (êîíå÷íîå çíà÷åíèå), êîòîðîå äîëæíî ïîëó÷èòüñÿ ïîñëå ïîñëåäíåãî ïëàòåæà."; Text[ polish ] = "Przysz³a wartoœæ. Wartoœæ koñcowa, która ma zostaæ osi¹gniêta po dokonaniu ostatniej p³atnoœci."; Text[ japanese ] = "å°†æ¥ä¾¡å€¤ã€‚投資ã®å°†æ¥ä¾¡å€¤ã€ã¾ãŸã¯æœ€å¾Œã®æ”¯æ‰•ã„ã‚’è¡Œã£ãŸã‚ã¨ã«æ®‹ã‚‹ç¾é‡‘ã®åŽæ”¯ã€‚"; Text[ chinese_traditional ] = "未來值。完æˆæœ€å¾Œä¸€æ¬¡æ”¯ä»˜å¾Œé”到的最終值。"; @@ -6001,6 +6191,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer. Son ödeme yapýldýktan sonra elde edilmek istenen deðer (son deðer)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur. Valor (valor final) que s'ha d'aconseguir després de l'últim pagament."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸™à¸²à¸„ต ค่า (ค่าสุดท้าย) ที่ได้รับหลังจาà¸à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„รั้งสุดท้าย"; }; String 10 // Name of Parameter 5 { @@ -6030,6 +6221,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 11 // Description of Parameter 5 { @@ -6040,7 +6232,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenza. 1 = all'inizio, 0 = alla fine del periodo." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -6048,7 +6240,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el vencimiento de los pagos, 1 es al comienzo de un período, 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。 type = 1 表示在周期开始时到期，type= 0 表示在周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 oznaczaj¹ca sposób dokonywania p³atnoœci (z do³u lub z góry)."; Text[ japanese ] = "支払期日。支払期日 = 1 ã¯å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 ã¯å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在週期開始時到期ï¹F = 0 表示在週期çµæŸæ™‚到期。"; @@ -6060,6 +6252,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นครบà¸à¸³à¸«à¸™à¸”งวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function ZINS #*=- @@ -6082,7 +6275,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la tasa de interés por período de una anualidad." ; Text [ english_us ] = "Calculates the constant interest rate of an investment with regular payments." ; Text[ chinese_simplified ] = "计算一项贷款在定期å¿è¿˜æƒ…况下的å„期(æ’定)利率。"; - Text[ russian ] = "Âîçâðàùàåò íîðìó ïðèáûëè çà îäèí ïåðèîä ïðè âûïëàòå ðåíòû."; + Text[ russian ] = "Âû÷èñëÿåò ïîñòîÿííûé äîõîä ñ ïîìîùüþ ðåãóëÿðíûõ âûïëàò."; Text[ polish ] = "Oblicza sta³¹ stopê procentow¹ inwestycji przy regularnej p³atnoœci."; Text[ japanese ] = "定期支払ã„ã«ãŠã‘る投資ã®ä¸€å®šã®åˆ©çŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "è¨ˆç®—ä¸€é …å®šæœŸå„Ÿé‚„çš„è²¸æ¬¾çš„æ†å®šåˆ©çŽ‡ã€‚"; @@ -6094,6 +6287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödemeleri olan bir yatýrýmýn sabit faiz oranýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la taxa d'interès constant d'una inversió amb pagaments regulars."; + Text[ thai ] = "คำนวณà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่ขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุนด้วยà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¹à¸šà¸šà¸›à¸à¸•à¸´"; }; ExtraData = { @@ -6109,7 +6303,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "Nper" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; @@ -6117,7 +6311,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "nper" ; Text [ english_us ] = "NPER" ; Text[ chinese_simplified ] = "nper"; - Text[ russian ] = "Êïåð"; + Text[ russian ] = "ÊÏÅÐ"; Text[ polish ] = "LICZBA.RAT"; Text[ japanese ] = "全支払ã„期間"; Text[ chinese_traditional ] = "nper"; @@ -6129,6 +6323,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 3 // Description of Parameter 1 { @@ -6139,7 +6334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero totale dei periodi di pagamento in un'annualità." ; Text [ portuguese_brazilian ] = "Zahlungszeitraum. Die Gesamtanzahl der Perioden, in denen die Annuit?t (Rente) gezahlt wird." ; Text [ portuguese ] = "é o número total de períodos de pagamento numa anuidade." ; - Text [ finnish ] = "Maksukausi. Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; + Text [ finnish ] = "Maksukausi Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; Text [ danish ] = "Ydelsesperioder. Det samlede antal ydelsesperioder i en annuitet." ; Text [ french ] = "Le nombre total de périodes de paiement de l'annuité." ; Text [ swedish ] = "Betalningsperiod. Det totala antalet perioder då annuiteten (pension) betalas." ; @@ -6159,6 +6354,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat (pensió)."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ จำนวนงวดทั้งหมดในเงินรายปี (เงินบำเหน็จ) ที่จ่าย"; }; String 4 // Name of Parameter 2 { @@ -6168,7 +6364,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Rata" ; Text [ portuguese_brazilian ] = "RMZ" ; Text [ portuguese ] = "Pgto" ; - Text [ finnish ] = "PMT" ; + Text [ finnish ] = "MAKSU" ; Text [ danish ] = "YDELSE" ; Text [ french ] = "VPM" ; Text [ swedish ] = "Betalning" ; @@ -6188,6 +6384,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödeme"; Text[ language_user1 ] = " "; Text[ catalan ] = "PMT"; + Text[ thai ] = "PMT"; }; String 5 // Description of Parameter 2 { @@ -6198,7 +6395,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Pagamento effettuato in ciascun periodo che non può variare nel corso dell'annualità." ; Text [ portuguese_brazilian ] = "Regelm??ige Zahlung. Die konstante Annuit?t, die in jeder Periode gezahlt wird." ; Text [ portuguese ] = "é o pagamento feito em cada período, mantendo-se constante durante a vigência da anuidade." ; - Text [ finnish ] = "Säännölliset maksut. Kunakin kautena maksettava vakioannuiteetti." ; + Text [ finnish ] = "Säännölliset maksut Kunakin kautena maksettava vakioannuiteetti." ; Text [ danish ] = "Ydelse. Den konstante ydelse som betales hver periode og ikke kan ændres i annuitetens løbetid" ; Text [ french ] = "Paiement régulier. L'annuité constante payée pour chaque période." ; Text [ swedish ] = "Regelbunden betalning. Den konstanta annuiteten som betalas i varje period." ; @@ -6206,7 +6403,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el pago que se efectúa en cada período y que no puede cambiar durante la vida de la anualidad." ; Text [ english_us ] = "Regular payments. The constant annuity to be paid in each period." ; Text[ chinese_simplified ] = "分期支付é¢ã€‚在æ¯ä¸ªå‘¨æœŸåº”支付的固定金é¢ã€‚"; - Text[ russian ] = "Âûïëàòà, ïðîèçâîäèìàÿ â êàæäûé ïåðèîä è íå ìåíÿþùàÿñÿ çà âñå âðåìÿ âûïëàòû ðåíòû."; + Text[ russian ] = "Ïîñòîÿííûå ðåãóëÿðíûå âûïëàòû çà êàæäûé ïåðèîä."; Text[ polish ] = "Sta³a suma sp³aty d³ugu (obejmuj¹ca czêœæ d³ugu i odsetki), która jest p³acona regularnie w ka¿dym okresie."; Text[ japanese ] = "定期支払é¡ï½¡ 毎回ã®æ”¯æ‰•é¡ã‚’指定ã—ã¾ã™ã€‚投資期間内ã«æ”¯æ‰•é¡ã‚’変更ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“｡"; Text[ chinese_traditional ] = "分期支付。å„期支付的æ†å®šå¹´é‡‘。"; @@ -6218,6 +6415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Düzenli ödemeler. Her dönem ödenen sabit annüiteler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Pagaments regulars. Anualitat constant que s'ha de pagar en cada període."; + Text[ thai ] = "à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸›à¸à¸•à¸´ เงินรายปีคงที่ที่จ่ายในà¹à¸•à¹ˆà¸¥à¸°à¸‡à¸§à¸”"; }; String 6 // Name of Parameter 3 { @@ -6227,7 +6425,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "PV" ; + Text [ finnish ] = "NA" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -6235,7 +6433,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "va" ; Text [ english_us ] = "PV" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Íç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -6247,6 +6445,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "PV"; + Text[ thai ] = "PV"; }; String 7 // Description of Parameter 3 { @@ -6256,7 +6455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale di una serie di pagamenti." ; Text [ portuguese_brazilian ] = "Barwert. Der derzeitige Wert der Reihe von Zahlungen." ; Text [ portuguese ] = "é o valor presente ou a quantia total actual correspondente a uma série de pagamentos futuros." ; - Text [ finnish ] = "Nykyinen arvo. Maksusarjan nykyinen arvo" ; + Text [ finnish ] = "Nykyinen arvo Maksusarjan nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Den værdi en række ydelser er værd nu." ; Text [ french ] = "Valeur actuelle = la valeur, à la date d'aujourd'hui, d'une série de remboursements futurs." ; Text [ swedish ] = "Nuvarande värde. Det nuvarande värdet för raden av betalningar." ; @@ -6264,7 +6463,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor actual de la cantidad total de una serie de pagos futuros." ; Text [ english_us ] = "Present value. The current value of a series of payments" ; Text[ chinese_simplified ] = "现金值。或一系列未æ¥æ”¯ä»˜çš„ç›®å‰ä»·å€¼ã€‚"; - Text[ russian ] = "Òåêóùàÿ ñòîèìîñòü: îáùàÿ ñóììà âñåõ áóäóùèõ ïëàòåæåé ñ íàñòîÿùåãî ìîìåíòà."; + Text[ russian ] = "Òåêóùåå çíà÷åíèå ðÿäà ïëàòåæåé."; Text[ polish ] = "Wartoœæ bie¿¹ca dla serii przysz³ych p³atnoœci."; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤ã€‚ å°†æ¥è¡Œã‚れる一連ã®æ”¯æ‰•ã„ã‚’ã€ç¾æ™‚点ã§ä¸€æ‹¬æ‰•ã„ã—ãŸå ´åˆã®åˆè¨ˆé‡‘é¡ã€‚"; Text[ chinese_traditional ] = "凈ç¾å€¼ã€‚或一系列未來支付的目å‰åƒ¹å€¼ã€‚"; @@ -6276,6 +6475,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual d'una sèrie de pagaments"; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันขà¸à¸‡à¸¥à¸³à¸”ับà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™"; }; String 8 // Name of Parameter 4 { @@ -6285,7 +6485,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "VF" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -6293,7 +6493,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "fv"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "fv"; @@ -6305,6 +6505,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 9 // Description of Parameter 4 { @@ -6315,7 +6516,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore finale che si desidera raggiungere dopo aver effettuato l'ultimo pagamento." ; Text [ portuguese_brazilian ] = "Zuk?ftiger Wert. Der Wert (Endwert), der nach der letzten Zahlung erreicht werden soll." ; Text [ portuguese ] = "é o valor futuro ou um saldo de caixa obtido depois de efectuado o último pagamento." ; - Text [ finnish ] = "Tuleva arvo. Viimeisen maksun jälkeinen arvo (loppuarvo)." ; + Text [ finnish ] = "Tuleva arvo Viimeisen maksun jälkeinen arvo (loppuarvo)" ; Text [ danish ] = "Fremtidsværdi. Den værdi eller den kassebalance, der ønskes opnået, når den sidste ydelse er betalt." ; Text [ french ] = "Valeur future (valeur capitalisée) : le montant que vous souhaitez obtenir après le dernier paiement." ; Text [ swedish ] = "Framtida värde. Värdet (slutvärde) som skall uppnås efter den sista betalningen." ; @@ -6323,7 +6524,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor futuro o un saldo en efectivo que desea lograr después de efectuar el último pago." ; Text [ english_us ] = "Future value. The value (end value) to be attained after the final payment." ; Text[ chinese_simplified ] = "未æ¥å€¼ã€‚完æˆæœ€åŽä¸€æ¬¡æ”¯ä»˜åŽè¾¾åˆ°çš„最终值。"; - Text[ russian ] = "Áóäóùàÿ ñòîèìîñòü èëè áàëàíñ íàëè÷íîñòè, êîòîðûé íóæíî äîñòè÷ü ïîñëå ïîñëåäíåé âûïëàòû."; + Text[ russian ] = "Áóäóùåå çíà÷åíèå, êîòîðîå íåîáõîäèìî äîñòè÷ü ïîñëå ïîñëåäíåé âûïëàòû."; Text[ polish ] = "Przysz³a wartoœæ. Wartoœæ koñcowa, która ma zostaæ osi¹gniêta po dokonaniu ostatniej p³atnoœci."; Text[ japanese ] = "投資ã®å°†æ¥ä¾¡å€¤ã€‚最後ã®æ”¯æ‰•ã„ã‚’è¡Œã£ãŸã‚ã¨ã«æ®‹ã‚‹ç¾é‡‘ã®åŽæ”¯ã‚’指定ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "未來值。完æˆæœ€å¾Œä¸€æ¬¡æ”¯ä»˜å¾Œé”到的最終值。"; @@ -6335,6 +6536,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer. Son ödeme yapýldýktan sonra elde edilmek istenen deðer (son deðer)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur. Valor (valor final) que s'ha d'aconseguir després de l'últim pagament."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸™à¸²à¸„ต ค่า(ค่าสุดท้าย) ที่ได้รับหลังจาà¸à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„รั้งสุดท้าย"; }; String 10 // Name of Parameter 5 { @@ -6364,6 +6566,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 11 // Description of Parameter 5 { @@ -6374,7 +6577,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenza dei pagamenti. 1 = all'inizio di un periodo, 0 = alla fine." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -6382,7 +6585,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el vencimiento de los pagos, 1 es al comienzo del período, 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。 type = 1 表示在周期开始时到期，\ntype = 0 表示在周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 okreœlaj¹ca sposób dokonywania p³atnoœci ( z do³u lub z góry)."; Text[ japanese ] = "支払ã„期日。支払期日 = 1 å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在週期開始時到期ï¹F = 0 表示在週期çµæŸæ™‚到期。"; @@ -6394,6 +6597,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นครบà¸à¸³à¸«à¸™à¸”งวดเริ่มต้น, = 0 งวดสุดท้าย"; }; String 12 // Name of Parameter 6 { @@ -6423,6 +6627,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tahmini deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estima"; + Text[ thai ] = "คะเน"; }; String 13 // Description of Parameter 6 { @@ -6433,7 +6638,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Previsione del tasso di interesse futuro." ; Text [ portuguese_brazilian ] = "Sch?tzwert. Sch?tzwert des Zinses f? das iterative Berechnungsverfahren." ; Text [ portuguese ] = "é um número que se estima estar próximo do resultado da taxa de retorno interna." ; - Text [ finnish ] = "Arvio:! Iteratiivisen laskentamenetelmän arvioitu korkoprosenttia." ; + Text [ finnish ] = "Arvio Iteratiivisen laskentamenetelmän arvioitu korkoprosenttia." ; Text [ danish ] = "Gæt. Skøn over renten for den iterative beregning." ; Text [ french ] = "La valeur estimée quant au taux pour la méthode de calculation itérative." ; Text [ swedish ] = "Gissning. Räntans uppskattade värde för den iterativa beräkningsmetoden." ; @@ -6441,7 +6646,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es su estimación de la tasa de interés." ; Text [ english_us ] = "Guess. The estimate of the interest rate for the iterative calculating method." ; Text[ chinese_simplified ] = "估计值。采用近似计算法时的利率估计值。"; - Text[ russian ] = "Ïðåäïîëàãàåìàÿ âåëè÷èíà íîðìû."; + Text[ russian ] = "Ïðåäïîëàãàåìàÿ âåëè÷èíà äîõîäà äëÿ èòåðàöèîííîãî ìåòîäà âû÷èñëåíèÿ."; Text[ polish ] = "Wartoœæ szacowana odsetek dla iteracyjnej metody kalkulacji."; Text[ japanese ] = "推定値｡ 利率ãŒãŠã‚ˆãã©ã‚Œãらã„ã«ãªã‚‹ã‹ã‚’推定ã—ãŸå€¤ã€‚"; Text[ chinese_traditional ] = "估計值。用來近似計算法的利æ¯ä¼°è¨ˆå€¼ã€‚"; @@ -6453,6 +6658,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tahmini deðer. Özyineleme hesabý için faiz oranýnýn baþlangýç deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Estima. Estimació de la taxa d'interès per al mètode de càlcul iteratiu."; + Text[ thai ] = "คะเน à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¹‚ดยประมาณสำหรับวิธีà¸à¸²à¸£à¸„ำนวณà¹à¸šà¸šà¸—วนซ้ำ"; }; }; // -=*# Resource for function ZINSZ #*=- @@ -6467,7 +6673,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Interesse composto. Restituisce il pagamento di un periodo per un investimento sulla base di pagamenti periodici e interessi costanti." ; Text [ portuguese_brazilian ] = "Zinseszins. Berechnet den Zinsbetrag einer Periode f? eine Investition bei regelm??igen Zahlungen und konstantem Zinssatz." ; Text [ portuguese ] = "Devolve a quantia total de juros periódicos de um investimento a uma taxa de juros constante." ; - Text [ finnish ] = "Yhteiskorko. Laskee pääoman korkomaksun suuruuden kauden alalta säännöllisten maksujen ja kiinteän korkoprosentin mukaan." ; + Text [ finnish ] = "Yhteiskorko Laskee pääoman korkomaksun suuruuden kauden alalta säännöllisten maksujen ja kiinteän korkoprosentin mukaan." ; Text [ danish ] = "Rentes rente. Beregner renteydelsen i en periode for en investering ved konstante ydelser og konstant rentesats." ; Text [ french ] = "Calcule le montant des intérêts d'un investissement pour une période donnée sur la base de paiements réguliers et d'un taux d'intérêt constant." ; Text [ swedish ] = "Ränta på ränta. Beräknar räntebeloppet i en period för en investering vid regelbundna betalningar och konstant räntesats." ; @@ -6487,6 +6693,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bileþik faiz. Düzenli ödemeli ve sabit faiz oranlý yatýrýmýn dönem faizini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Interès compost. Calcula el pagament d'interessos del principal per a una inversió amb pagaments regulars i una taxa d'interès constant per a un període donat."; + Text[ thai ] = "ดà¸à¸à¹€à¸šà¸µà¹‰à¸¢à¹€à¸Šà¸´à¸‡à¸‹à¹‰à¸à¸™ คำนวณà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸šà¸™à¸«à¸¥à¸±à¸à¸à¸²à¸£à¸¥à¸‡à¸—ุนด้วยà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¹à¸šà¸šà¸›à¸à¸•à¸´à¹à¸¥à¸°à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่สำหรับงวดที่ให้มา"; }; ExtraData = { @@ -6510,7 +6717,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "tasa" ; Text [ english_us ] = "Rate" ; Text[ chinese_simplified ] = "rate"; - Text[ russian ] = "Ñòàâêà"; + Text[ russian ] = "Ïðîöåíò"; Text[ polish ] = "Odsetki"; Text[ japanese ] = "利率"; Text[ chinese_traditional ] = "rate"; @@ -6518,10 +6725,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "rate"; - Text[ korean ] = "ì´ìž"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -6531,7 +6739,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di interesse per periodo" ; Text [ portuguese_brazilian ] = "Der Zinssatz pro Periode." ; Text [ portuguese ] = "é a taxa de juros periódica." ; - Text [ finnish ] = "Kausikohtainen korkoprosentti." ; + Text [ finnish ] = "Kausikohtainen korkoprosentti" ; Text [ danish ] = "Rentesatsen per periode." ; Text [ french ] = "Le taux d'intérêt par période." ; Text [ swedish ] = "Räntesatsen per period." ; @@ -6539,7 +6747,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es la tasa de interés por período." ; Text [ english_us ] = "The rate of interest per period." ; Text[ chinese_simplified ] = "æ¯ä¸ªå‘¨æœŸçš„利率。"; - Text[ russian ] = "Íîðìà ïðèáûëè çà ïåðèîä."; + Text[ russian ] = "Ïðîöåíò ïðèáûëè çà ïåðèîä."; Text[ polish ] = "Stopa procentowa dla pojedynczego okresu."; Text[ japanese ] = "å„期ã®åˆ©æ¯ã€‚"; Text[ chinese_traditional ] = "æ¯å€‹é€±æœŸçš„利率。"; @@ -6551,6 +6759,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faiz oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; String 4 // Name of Parameter 2 { @@ -6580,6 +6789,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "D"; Text[ language_user1 ] = " "; Text[ catalan ] = "Període"; + Text[ thai ] = "งวด"; }; String 5 // Description of Parameter 2 { @@ -6590,7 +6800,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "La durata per la quale si desidera calcolare gli interessi. 1 = per il primo periodo, Periodi = Numero rate significa per l'ultimo." ; Text [ portuguese_brazilian ] = "Periode. Die Periode, f? die die Zinseszinsen berechnet werden. P = 1 hei?t f? die erste Periode, P = ZZR f? die letzte." ; Text [ portuguese ] = "é o período para o qual se calcula a amortização. 1 indica o primeiro período, nper o último." ; - Text [ finnish ] = "Kaudet! Kaudet, joiden yhteiskorko lasketaan.! P = 1 tarkoittaa ensimmäistä ja P = NPER viimeistä kautta" ; + Text [ finnish ] = "Kaudet Kaudet, joiden yhteiskorko lasketaan. P = 1 tarkoittaa ensimmäistä ja P = NJAKSO viimeistä kautta." ; Text [ danish ] = "Periode. Perioden som rentes renten beregnes for. P = 1 betyder for den første periode, P = NPER for den sidste." ; Text [ french ] = "La période pour laquelle vous souhaitez calculer les intérêts. P = 1 pour la première période, P = NPM pour la dernière." ; Text [ swedish ] = "Period. Perioden som räntorna på räntor skall betalas för. P = 1 betyder för den första perioden och P = Perioder för den sista." ; @@ -6598,7 +6808,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el período para el que se desea calcular el interés, y deberá estar entre 1 y el argumento nper." ; Text [ english_us ] = "Periods. The periods for which the compounded interest is to be calculated. P = 1 denotes for the first period, P = NPER for the last one." ; Text[ chinese_simplified ] = "周期数。è¦è®¡ç®—其利æ¯é‡‘é¢çš„周期数。 per = 1 \n是第一个周期， per = nper 是最åŽä¸€ä¸ªå‘¨æœŸã€‚"; - Text[ russian ] = "Ïåðèîä, äëÿ êîòîðîãî òðåáóåòñÿ íàéòè ïðèáûëü, äîëæåí áûòü â èíòåðâàëå îò 1 äî Êïåð."; + Text[ russian ] = "Ïåðèîä, äëÿ êîòîðîãî òðåáóåòñÿ íàéòè ïðèáûëü, äîëæåí áûòü â èíòåðâàëå îò 1 äî ÊÏÅÐ."; Text[ polish ] = "Okres, dla którego maj¹ zostaæ obliczone odsetki sk³adowe. 1 oznacza pierwszy okres, nper - ostatni."; Text[ japanese ] = "期。金利支払é¡ã‚’求ã‚る期。期 = 1 ã¯æœ€åˆã®æœŸã€æœŸ = 全支払ã„期間ã¯æœ€å¾Œã®æœŸã€‚"; Text[ chinese_traditional ] = "週期。用於計算復利的週期數。 per = 1 æ˜¯ç¬¬ä¸€å€‹é€±æœŸï¹ \nper = nper 是最後一個週期。"; @@ -6610,6 +6820,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem. Geri ödemenin hesaplandýðý dönem. P = 1 ilk dönem, P = NPER ise son dönemdir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Períodes. Períodes l'interès compost dels quals s'ha de calcular. P = 1 indica per al primer període; P = NPER, per a l'últim."; + Text[ thai ] = "งวด งวดในà¸à¸²à¸£à¸„ำนวณดà¸à¸à¹€à¸šà¸µà¹‰à¸¢à¹€à¸Šà¸´à¸‡à¸‹à¹‰à¸à¸™ P = 1 à¹à¸—นงวดà¹à¸£à¸, P = NPER สำหรับงวดสุดท้าย"; }; String 6 // Name of Parameter 3 { @@ -6619,7 +6830,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "Nper" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; @@ -6627,7 +6838,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "nper" ; Text [ english_us ] = "NPER" ; Text[ chinese_simplified ] = "nper"; - Text[ russian ] = "Êïåð"; + Text[ russian ] = "ÊÏÅÐ"; Text[ polish ] = "LICZBA.RAT"; Text[ japanese ] = "全支払ã„期間"; Text[ chinese_traditional ] = "nper"; @@ -6639,6 +6850,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 7 // Description of Parameter 3 { @@ -6649,7 +6861,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero totale dei periodi di pagamento in un'annualità" ; Text [ portuguese_brazilian ] = "Zahlungszeitraum. Die Gesamtanzahl der Perioden, in denen die Annuit?t (Rente) gezahlt wird." ; Text [ portuguese ] = "é o número total de períodos de pagamento numa anuidade." ; - Text [ finnish ] = "Maksukausi. Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; + Text [ finnish ] = "Maksukausi Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; Text [ danish ] = "Ydelsesperioder. Det samlede antal ydelsesperioder i en annuitet." ; Text [ french ] = "Le nombre total de périodes de paiement de l'annuité." ; Text [ swedish ] = "Betalningsperiod. Det totala antalet perioder då annuiteten (pension) betalas." ; @@ -6669,6 +6881,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat (pensió)."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ จำนวนงวดทั้งหมดในเงินรายปี (เงินบำเหน็จ) ที่จ่าย "; }; String 8 // Name of Parameter 4 { @@ -6678,7 +6891,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "pv" ; + Text [ finnish ] = "na" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -6686,7 +6899,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "va" ; Text [ english_us ] = "pv" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Òç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -6697,7 +6910,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "pv"; Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; - Text[ catalan ] = "PV"; + Text[ catalan ] = "va"; + Text[ thai ] = "pv"; }; String 9 // Description of Parameter 4 { @@ -6707,7 +6921,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale di una serie di pagamenti" ; Text [ portuguese_brazilian ] = "Barwert. Der derzeitige Wert der Reihe von Zahlungen." ; Text [ portuguese ] = "é o valor presente ou a quantia total actual correspondente a uma série de pagamentos futuros." ; - Text [ finnish ] = "Nykyinen arvo. Maksusarjan nykyinen arvo" ; + Text [ finnish ] = "Nykyinen arvo Maksusarjan nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Den værdi en række ydelser er værd nu." ; Text [ french ] = "Valeur actuelle = la valeur, à la date d'aujourd'hui, d'une série de remboursements futurs." ; Text [ swedish ] = "Nuvarande värde. Det nuvarande värdet för en rad betalningar." ; @@ -6715,7 +6929,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor actual de la suma total de una serie de pagos futuros." ; Text [ english_us ] = "Present value. The current value of a series of payments" ; Text[ chinese_simplified ] = "现金值。或一系列未æ¥æ”¯ä»˜çš„ç›®å‰ä»·å€¼ã€‚"; - Text[ russian ] = "Òåêóùàÿ ñòîèìîñòü èëè îáùàÿ ñóììà âñåõ áóäóùèõ ïëàòåæåé ñ íàñòîÿùåãî ìîìåíòà."; + Text[ russian ] = "Òåêóùàÿ çíà÷åíèå ðÿäà ïëàòåæåé."; Text[ polish ] = "Wartoœæ bie¿¹ca dla serii przysz³ych p³atnoœci."; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤ã€‚å°†æ¥è¡Œã‚れる一連ã®æ”¯æ‰•ã„ã‚’ã€ç¾æ™‚点ã§ä¸€æ‹¬æ‰•ã„ã—ãŸå ´åˆã®åˆè¨ˆé‡‘é¡ã€‚"; Text[ chinese_traditional ] = "凈ç¾å€¼ã€‚或一系列未來支付的目å‰åƒ¹å€¼ã€‚"; @@ -6727,6 +6941,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual d'una sèrie de pagaments."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันขà¸à¸‡à¸¥à¸³à¸”ับà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™"; }; String 10 // Name of Parameter 5 { @@ -6736,7 +6951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "VF" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -6744,7 +6959,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "fv"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "fv"; @@ -6756,6 +6971,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 11 // Description of Parameter 5 { @@ -6766,7 +6982,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore finale che si desidera raggiungere dopo aver effettuato l'ultimo pagamento." ; Text [ portuguese_brazilian ] = "Zuk?ftiger Wert. Der Wert (Endwert), der nach der letzten Zahlung erreicht werden soll." ; Text [ portuguese ] = "é o valor futuro ou um saldo de caixa obtido depois de efectuado o último pagamento." ; - Text [ finnish ] = "Tuleva arvo. Viimeisen maksun jälkeinen arvo (loppuarvo)." ; + Text [ finnish ] = "Tuleva arvo Viimeisen maksun jälkeinen arvo (loppuarvo)" ; Text [ danish ] = "Fremtidsværdi. Den værdi eller den kassebalance, der ønskes opnået, når den sidste ydelse er betalt." ; Text [ french ] = "Valeur future (valeur capitalisée) : le montant que vous souhaitez obtenir après le dernier paiement." ; Text [ swedish ] = "Framtida värde. Värdet (slutvärde) som skall uppnås efter den sista betalningen." ; @@ -6774,7 +6990,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor futuro o saldo en efectivo que desea obtener después de efectuar el último pago." ; Text [ english_us ] = "Future value. The value (end value) to be attained after the final payment." ; Text[ chinese_simplified ] = "未æ¥å€¼ã€‚完æˆæœ€åŽä¸€æ¬¡æ”¯ä»˜åŽè¾¾åˆ°çš„最终值。"; - Text[ russian ] = "Áóäóùàÿ ñòîèìîñòü èëè áàëàíñ íàëè÷íîñòè, êîòîðûé íóæíî äîñòè÷ü ïîñëå ïîñëåäíåé âûïëàòû."; + Text[ russian ] = "Áóäóùàÿ çíà÷åíèå, êîòîðûé íóæíî äîñòè÷ü ïîñëå ïîñëåäíåé âûïëàòû."; Text[ polish ] = "Przysz³a wartoœæ. Wartoœæ koñcowa, która ma zostaæ osi¹gniêta po dokonaniu ostatniej p³atnoœci."; Text[ japanese ] = "å°†æ¥ä¾¡å€¤ã€‚投資ã®å°†æ¥ä¾¡å€¤ã€ã¾ãŸã¯æœ€å¾Œã®æ”¯æ‰•ã„ã‚’è¡Œã£ãŸã‚ã¨ã«æ®‹ã‚‹ç¾é‡‘ã®åŽæ”¯ã€‚"; Text[ chinese_traditional ] = "未來值。完æˆæœ€å¾Œä¸€æ¬¡æ”¯ä»˜å¾Œé”到的最終值。"; @@ -6786,6 +7002,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer. Son ödeme yapýldýktan sonra elde edilmek istenen deðer (son deðer)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur. Valor (valor final) que s'ha d'aconseguir després de l'últim pagament."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸™à¸²à¸„ต ค่า (ค่าสุดท้าย) ที่ได้รับหลังจาà¸à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„รั้งสุดท้าย"; }; String 12 // Name of Parameter 6 { @@ -6815,6 +7032,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 13 // Description of Parameter 6 { @@ -6825,7 +7043,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenza dei pagamenti. 1 = all'inizio di un periodo, 0 = alla fine." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -6833,7 +7051,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el vencimiento de los pagos, 1 es al comienzo del período, 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。 type = 1 表示在周期开始时到期，\ntype = 0 表示在周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 okreœlaj¹ca sposób dokonywania p³atnoœci (z do³u lub z góry)."; Text[ japanese ] = "支払期日。支払期日 = 1 å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在週期開始時到期ï¹F = 0 表示是在週期çµæŸæ™‚到期。"; @@ -6845,6 +7063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นงวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function KAPZ #*=- @@ -6879,6 +7098,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Geri ödeme. Düzenli ödemeler ve sabit faizli bir yatýrým için dönemi geri ödeme meblaðýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Amortització. Calcula la quantitat d'amortització, per a un període determinat, d'una inversió els pagaments de la qual es fan a intervals regulars i amb una taxa d'interès constant."; + Text[ thai ] = "à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„ืน คำนวณจำนวนงวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„ืนสำหรับà¸à¸²à¸£à¸¥à¸‡à¸—ุนด้วยà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸Šà¹ˆà¸§à¸‡à¸›à¸à¸•à¸´à¹à¸¥à¸°à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่"; }; ExtraData = { @@ -6910,10 +7130,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "Rate"; - Text[ korean ] = "ì´ìž"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -6943,6 +7164,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faiz oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; String 4 // Name of Parameter 2 { @@ -6972,6 +7194,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem"; Text[ language_user1 ] = " "; Text[ catalan ] = "Període"; + Text[ thai ] = "งวด"; }; String 5 // Description of Parameter 2 { @@ -6982,7 +7205,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "La durata per la quale si desidera calcolare l'ammortamento . 1 = primo periodo, Numero rate = ultimo periodo." ; Text [ portuguese_brazilian ] = "Periode. Die Periode, f? die die Tilgung berechnet wird. P = 1 hei?t f? die erste Periode, P = ZZR f? die letzte." ; Text [ portuguese ] = "é o período para o qual se calcula a amortização. 1 indica o primeiro período, nper o último." ; - Text [ finnish ] = "Kausi! Kausi, jonka maksut lasketaan. P = 1 tarkoittaa ensimmäistä ja P = NPER viimeistä kautta" ; + Text [ finnish ] = "Kausi Kausi, jonka maksut lasketaan. P = 1 tarkoittaa ensimmäistä ja P = NPER viimeistä kautta" ; Text [ danish ] = "Periode. Perioden som amortsationen beregnes for. P = 1 betyder for den første periode, P = NPER for den sidste." ; Text [ french ] = "Période pour laquelle vous souhaitez calculer le remboursement. P = 1 pour la première période, P = NPM pour la dernière." ; Text [ swedish ] = "Period. Perioden som amorteringen beräknas för. P = 1 betyder för den första perioden, P = Perioder för den sista." ; @@ -6990,7 +7213,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Especifica el período para el cual se calcula la amortización. 1 indica el primer período, nper el último." ; Text [ english_us ] = "Period. The period for which the repayments are to be calculated. Per = 1 denotes for the first period, P = NPER for the last" ; Text[ chinese_simplified ] = "周期数。计算分期付款的周期数。P = 1 表示第一个\n周期， P = NPER 表示最åŽä¸€ä¸ªå‘¨æœŸã€‚"; - Text[ russian ] = "Ïåðèîä, äëÿ êîòîðîãî âû÷èñëÿåòñÿ óïëàòà. Çíà÷åíèå äîëæíî áûòü â èíòåðâàëå îò 1 (ïåðâûé ïåðèîä) äî êïåð (ïîñëåäíèé ïåðèîä)."; + Text[ russian ] = "Ïåðèîä, äëÿ êîòîðîãî âû÷èñëÿåòñÿ âûïëàòà. Çíà÷åíèå äîëæíî áûòü â èíòåðâàëå îò 1 (ïåðâûé ïåðèîä) äî ÊÏÅÐ (ïîñëåäíèé ïåðèîä)."; Text[ polish ] = "Wyznacza okres, dla którego obliczona bêdzie sp³ata kredytu. 1 oznacza pierwszy okres, NPER - ostatni."; Text[ japanese ] = "期。元金支払é¡ã‚’求ã‚る期。期 = 1 ã¯æœ€åˆã®æœŸã€æœŸ = 全支払ã„期間ã¯æœ€å¾Œã®æœŸã€‚"; Text[ chinese_traditional ] = "週期數。計算分期付款的週期數。P = 1 è¡¨ç¤ºç¬¬ä¸€å€‹é€±æœŸï¹ \nP = ZZR 表示最後一個週期。"; @@ -7002,6 +7225,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem. Geri ödemenin hesaplandýðý dönem. P = 1 ilk dönem, P = NPER ise son dönemdir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període. Període per al qual s'han de calcular les amortitzacions. Per = 1 indica per al primer període; P = NPER, per a l'últim."; + Text[ thai ] = "งวด งวดในà¸à¸²à¸£à¸„ำนวณà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„ืน Per = 1 à¹à¸—นงวดà¹à¸£à¸, P = NPER สำหรับงวดสุดท้าย"; }; String 6 // Name of Parameter 3 { @@ -7011,7 +7235,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "Nper" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; @@ -7031,6 +7255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 7 // Description of Parameter 3 { @@ -7061,6 +7286,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat (pensió)."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢ จำนวนงวดทั้งหมดในเงินรายปี (เงินบำเหน็จ) ที่จ่าย "; }; String 8 // Name of Parameter 4 { @@ -7070,7 +7296,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "Va" ; - Text [ finnish ] = "PV" ; + Text [ finnish ] = "NA" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -7078,7 +7304,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Va" ; Text [ english_us ] = "PV" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Òç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -7090,6 +7316,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "PV"; + Text[ thai ] = "PV"; }; String 9 // Description of Parameter 4 { @@ -7107,7 +7334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el valor actual de la cantidad total de una serie de pagos futuros." ; Text [ english_us ] = "The present value. The present value or the amount the annuity is currently worth." ; Text[ chinese_simplified ] = "现金值。或一系列未æ¥æ”¯ä»˜çš„ç›®å‰ä»·å€¼ã€‚"; - Text[ russian ] = "Òåêóùåå çíà÷åíèå: òåêóùåå çíà÷åíèå ðÿäà ïëàòåæåé."; + Text[ russian ] = "Òåêóùåå çíà÷åíèå. Òåêóùåå çíà÷åíèå ðÿäà ïëàòåæåé."; Text[ polish ] = "Wartoœæ bie¿¹ca dla serii przysz³ych p³atnoœci."; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤ã€‚ å°†æ¥è¡Œã‚れる一連ã®æ”¯æ‰•ã„ã‚’ã€ç¾æ™‚点ã§ä¸€æ‹¬æ‰•ã„ã—ãŸå ´åˆã®åˆè¨ˆé‡‘é¡ã€‚"; Text[ chinese_traditional ] = "凈ç¾å€¼ã€‚或一系列未來支付的目å‰åƒ¹å€¼ã€‚"; @@ -7119,6 +7346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðerini verir.Barwert."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual o la quantitat en què l'anualitat està valorada actualment."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันหรืà¸à¸ˆà¸³à¸™à¸§à¸™à¹€à¸‡à¸´à¸™à¸£à¸²à¸¢à¸›à¸µà¸—ี่มีค่าในปัจจุบัน"; }; String 10 // Name of Parameter 5 { @@ -7128,7 +7356,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "Vf" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -7136,7 +7364,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "fv"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "fv"; @@ -7148,6 +7376,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 11 // Description of Parameter 5 { @@ -7178,6 +7407,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer. Son ödeme yapýldýktan sonra elde edilmek istenen deðer (son deðer)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur. Valor aconseguit (valor final) després que s'hagi fet l'últim pagament."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸™à¸²à¸„ต ค่า (ค่าสุดท้าย) ที่ได้รับหลังจาà¸à¸—ำà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸‡à¸§à¸”สุดท้าย"; }; String 12 // Name of Parameter 6 { @@ -7207,6 +7437,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 13 // Description of Parameter 6 { @@ -7217,7 +7448,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenza dei pagamenti. 1 = all'inizio di un periodo, 0 = alla fine." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o número 0 ou 1 e indica as datas de vencimento dos pagamentos. 1 = início do período; 0 = fim do período." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -7225,7 +7456,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el vencimiento de los pagos, 1 es al comienzo del período y 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。 type = 1 表示在一个周期的开始时到期，\ntype = 0 表示在一个周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 okreœlaj¹ca sposób dokonywania p³atnoœci; 1 oznacza p³atnoœæ na pocz¹tku okresu, 0 - na koñcu."; Text[ japanese ] = "支払期日。支払期日 = 1 ã¯å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 ã¯å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在一個週期開始時到期ï¹F = 0 表示在一個\n週期çµæŸæ™‚到期。"; @@ -7237,6 +7468,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นครบà¸à¸³à¸«à¸™à¸”งวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function KUMKAPITAL #*=- @@ -7251,7 +7483,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Capitale cumulativo. Calcola il valore totale dei pagamenti in un periodo per un investimento a interesse costante." ; Text [ portuguese_brazilian ] = "Kumuliertes Kapitel. Berechnet den Gesamtbetrag der Tilgungsanteile in einem Zeitraum f? eine Investition bei konstantem Zinssatz." ; Text [ portuguese ] = "Capital acumulado. Devolve o capital acumulado pago sobre um empréstimo entre início_período e final_período a uma taxa de juro constante." ; - Text [ finnish ] = "Karttuva pääoma. Laskee sijoituksen kauden takaisinmaksuosuuksien kokonaissumman, kun korkoprosentti on kiinteä." ; + Text [ finnish ] = "Karttuva pääoma Laskee sijoituksen kauden takaisinmaksuosuuksien kokonaissumman, kun korkoprosentti on kiinteä." ; Text [ danish ] = "Akkumuleret hovedstol. Beregner den akkumulerede nedbringelse indenfor en periode for en investering ved konstant rentesats." ; Text [ french ] = "Capital cumulé. Renvoie le montant total des remboursements d'une période pour un investissement avec un taux d'intérêt constant." ; Text [ swedish ] = "Kumulerat kapital. Beräknar totalbeloppet av amorteringarna för en investering under en tidsperiod med konstant räntesats." ; @@ -7271,6 +7503,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kümülatif sermaye. Sabit faiz oranlý yatýrýmlar için bir dönemdeki geri ödemelerin toplam meblaðýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Capital acumulatiu. Calcula la quantitat total de la compartició d'amortització en un període per a una inversió amb una taxa d'interès constant."; + Text[ thai ] = "ทุนสะสม คำนวนจำนวนเงินทั้งหมดขà¸à¸‡à¸ªà¹ˆà¸§à¸™à¹à¸šà¹ˆà¸‡à¹ƒà¸™à¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¸„ืนในงวดสำหรับà¸à¸²à¸£à¸¥à¸‡à¸—ุนด้วยà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่"; }; ExtraData = { @@ -7294,7 +7527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Tasa" ; Text [ english_us ] = "Rate" ; Text[ chinese_simplified ] = "rate"; - Text[ russian ] = "Ïðîöåíò ñ êàïèòàëà"; + Text[ russian ] = "Ïðîöåíò"; Text[ polish ] = "Odsetki"; Text[ japanese ] = "利率"; Text[ chinese_traditional ] = "rate"; @@ -7302,10 +7535,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "Åðéôüêéï"; - Text[ korean ] = "ì •ìˆ˜"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -7315,7 +7549,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di interesse per periodo." ; Text [ portuguese_brazilian ] = "Der Zinssatz pro Periode." ; Text [ portuguese ] = "é a taxa de juros por período." ; - Text [ finnish ] = "Kausikohtainen korkoprosentti." ; + Text [ finnish ] = "Kausikohtainen korkoprosentti" ; Text [ danish ] = "Rentesatsen per periode." ; Text [ french ] = "Le taux d'intérêt par période." ; Text [ swedish ] = "Räntesatsen per period." ; @@ -7335,6 +7569,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faiz oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; String 4 // Name of Parameter 2 { @@ -7344,7 +7579,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "Nper" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; @@ -7352,7 +7587,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Nper" ; Text [ english_us ] = "NPER" ; Text[ chinese_simplified ] = "nper"; - Text[ russian ] = "Êïåð"; + Text[ russian ] = "ÊÏÅÐ"; Text[ polish ] = "LICZBA.RAT"; Text[ japanese ] = "全支払ã„期間"; Text[ chinese_traditional ] = "NPER"; @@ -7364,6 +7599,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 5 // Description of Parameter 2 { @@ -7374,7 +7610,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero complessivo dei periodi per i quali vengono effettuati pagamenti." ; Text [ portuguese_brazilian ] = "Zahlungszeitraum. Die Gesamtanzahl der Perioden, in denen die Annuit?t (Rente) gezahlt wird." ; Text [ portuguese ] = "é o número total de períodos de pagamento numa anuidade." ; - Text [ finnish ] = "Maksukausi. Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; + Text [ finnish ] = "Maksukausi Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; Text [ danish ] = "Ydelsesperioder. Det samlede antal ydelsesperioder i en annuitet." ; Text [ french ] = "Le nombre total de périodes de paiement de l'annuité." ; Text [ swedish ] = "Betalningsperiod. Det totala antalet perioder då annuiteten (pension) betalas." ; @@ -7394,6 +7630,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat (pensió)."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ จำนวนงวดทั้งหมดในเงินรายปี (เงินบำเหน็จ) ที่จ่าย"; }; String 6 // Name of Parameter 3 { @@ -7403,7 +7640,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "PV" ; + Text [ finnish ] = "NA" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -7411,7 +7648,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Va" ; Text [ english_us ] = "PV" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Òç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -7423,6 +7660,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "PV"; + Text[ thai ] = "PV"; }; String 7 // Description of Parameter 3 { @@ -7432,7 +7670,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale della serie di pagamenti." ; Text [ portuguese_brazilian ] = "Barwert. Der derzeitige Wert der Reihe von Zahlungen." ; Text [ portuguese ] = "é o valor presente ou a quantia total actual correspondente a uma série de pagamentos futuros." ; - Text [ finnish ] = "Nykyinen arvo. Annuiteetin nykyinen arvo." ; + Text [ finnish ] = "Nykyinen arvo Annuiteetin nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Den værdi en række ydelser er værd nu." ; Text [ french ] = "Valeur actuelle = la valeur, à la date d'aujourd'hui, d'une série de remboursements futurs." ; Text [ swedish ] = "Nuvarande värde. Det nuvarande värdet för raden av betalningar." ; @@ -7452,6 +7690,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual o la quantitat en què l'anualitat està valorada actualment."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันหรืà¸à¸ˆà¸³à¸™à¸§à¸™à¹€à¸‡à¸´à¸™à¸£à¸²à¸¢à¸›à¸µà¸—ี่มีค่าในปัจจุบัน"; }; String 8 // Name of Parameter 4 { @@ -7469,7 +7708,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Per_inicial" ; Text [ english_us ] = "S" ; Text[ chinese_simplified ] = "start_period"; - Text[ russian ] = "Íà÷_ïåðèîä"; + Text[ russian ] = "Í"; Text[ polish ] = "okres_pocz"; Text[ japanese ] = "開始期"; Text[ chinese_traditional ] = "Start_period"; @@ -7481,6 +7720,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "B"; Text[ language_user1 ] = " "; Text[ catalan ] = "S"; + Text[ thai ] = "S"; }; String 9 // Description of Parameter 4 { @@ -7491,7 +7731,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Periodo iniziale per il quale calcolare il deprezzamento. 1 = primo periodo." ; Text [ portuguese_brazilian ] = "Anfangsperiode. Die erste Periode, die ber?ksichtigt wird. A = 1 hei?t die allerserte Periode." ; Text [ portuguese ] = "é o primeiro período no cálculo. 1 representa o primeiro período." ; - Text [ finnish ] = "Aloituskausi. Ensimmäinen huomioitava kausi.! A = 1 tarkoittaa ensimmäistä kautta." ; + Text [ finnish ] = "Aloituskausi Ensimmäinen huomioitava kausi A = 1 tarkoittaa ensimmäistä kautta." ; Text [ danish ] = "Startperiode. Den første periode i beregningen.Start = 1 betyder første periode." ; Text [ french ] = "La première période incluse dans le calcul. Ces périodes sont numérotées à partir de 1." ; Text [ swedish ] = "Startperiod. Den första perioden för beräkningen. S = 1 betyder den allra första perioden." ; @@ -7499,7 +7739,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el primer período en el cálculo. 1 representa el primer período." ; Text [ english_us ] = "The start period. The first period to be taken into account. A = 1 denotes the very first period." ; Text[ chinese_simplified ] = "起始周期。第一个计算周期。 Start_period = 1 表示第一个周期。"; - Text[ russian ] = "Íîìåð ïåðâîãî ïåðèîäà, ó÷èòûâàåìîãî â âû÷èñëåíèÿõ. Åñëè íà÷_ïåðèîä ðàâåí 1, òî ýòî îçíà÷àåò ñàìûé ïåðâûé ïåðèîä."; + Text[ russian ] = "Íîìåð ïåðâîãî ïåðèîäà, ó÷èòûâàåìîãî â âû÷èñëåíèÿõ. Åñëè Í = 1, òî ýòî ñàìûé ïåðâûé ïåðèîä."; Text[ polish ] = "Okres pocz¹tkowy dla obliczania amortyzacji. A = 1 oznacza pierwszy okres."; Text[ japanese ] = "開始期。計算ã®å¯¾è±¡ã¨ãªã‚‹æœ€åˆã®æœŸã§ã€é–‹å§‹æœŸ = 1 ã¯ä¸€ç•ªã¯ã˜ã‚ã®æœŸã€‚"; Text[ chinese_traditional ] = "起始週期。第一個計算週期。 A = 1 表示第一個週期。"; @@ -7511,6 +7751,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýlk dönem. Dikkate alýnan ilk dönem. A = 1 ilk dönem anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període inicial. Primer període que s'ha de considerar. A = 1 indica el primer de tots els períodes."; + Text[ thai ] = "งวดเริ่มต้น งวดà¹à¸£à¸à¸—ี่คำนึงถึง A = 1 à¹à¸—นงวดà¹à¸£à¸à¸ªà¸¸à¸”"; }; String 10 // Name of Parameter 5 { @@ -7528,7 +7769,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Per_final" ; Text [ english_us ] = "E" ; Text[ chinese_simplified ] = "end_period"; - Text[ russian ] = "Êîí_ïåðèîä"; + Text[ russian ] = "Ê"; Text[ polish ] = "okres_koñc"; Text[ japanese ] = "終了期"; Text[ chinese_traditional ] = "end_period"; @@ -7540,6 +7781,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "S"; Text[ language_user1 ] = " "; Text[ catalan ] = "E"; + Text[ thai ] = "สิ้นสุด"; }; String 11 // Description of Parameter 5 { @@ -7550,7 +7792,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Periodo finale. L'ultimo periodo del quale si tiene conto." ; Text [ portuguese_brazilian ] = "Endperiode. Die letzte Periode, die ber?ksichtigt wird." ; Text [ portuguese ] = "é o último período no cálculo da amortização." ; - Text [ finnish ] = "Viimeinen kausi. Viimeinen huomioitava kausi." ; + Text [ finnish ] = "Viimeinen kausi Viimeinen huomioitava kausi" ; Text [ danish ] = "Slutperiode. Den sidste periode i beregningen." ; Text [ french ] = "La dernière période incluse dans le calcul." ; Text [ swedish ] = "Slutperiod. Den sista perioden för beräkningen." ; @@ -7570,6 +7812,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Son dönem. Dikkate alýnan son dönem."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període final. últim període que s'ha de considerar."; + Text[ thai ] = "งวดสุดท้าย งวดสุดท้ายที่คำนึงถึง"; }; String 12 // Name of Parameter 6 { @@ -7595,10 +7838,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "T"; Text[ chinese_simplified ] = "type"; Text[ greek ] = "Ôýðïò"; - Text[ korean ] = "형태"; + Text[ korean ] = "ìœ í˜•"; Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 13 // Description of Parameter 6 { @@ -7609,7 +7853,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenza. 1 = scadenza all'inizio di un periodo, 0 = alla fine." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -7617,7 +7861,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el vencimiento de los pagos de intereses. 1 es al comienzo del período, 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。type = 1 表示在周期的开始时到期，type = 0 \n表示在周期的结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 okreœlaj¹ca sposób dokonywania p³atnoœci. (1 oznacza p³atnoœæ na pocz¹tku okresu, 0 - na koñcu)."; Text[ japanese ] = "支払期日。支払期日 = 1 ã¯å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。 F = 1 表示在週期的開始時到期ï¹F = 0 表示在週期的çµæŸæ™‚到期。"; @@ -7629,6 +7873,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นครบà¸à¸³à¸«à¸™à¸”งวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function KUMZINSZ #*=- @@ -7643,7 +7888,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Interesse composto cumulativo. Fornisce l'ammontare totale degli interessi per periodo per un investimento a interesse costante." ; Text [ portuguese_brazilian ] = "Kumulierte Zinseszinsen. Berechnet den Gesamtbetrag der Zinsanteile in einem Zeitraum f? eine Investition bei konstantem Zinssatz." ; Text [ portuguese ] = "Juros acumulados compostos. Devolve a quantia total de juros periódicos de um investimento a uma taxa de juros constante." ; - Text [ finnish ] = "Kumulatiivinen yhteiskorko. Laskee sijoituksen kauden korkomaksujen kokonaissumman, kun korkoprosentti on kiinteä." ; + Text [ finnish ] = "Kumulatiivinen yhteiskorko Laskee sijoituksen kauden korkomaksujen kokonaissumman, kun korkoprosentti on kiinteä." ; Text [ danish ] = "Akkumuleret rentes rente. Beregner den akkumulerede rente indenfor en periode for en investering ved konstant rentesats." ; Text [ french ] = "Intérêt cumulé. Calcule le cumulé des intérêts payés entre deux périodes données pour un investissement de taux d'intérêt constant." ; Text [ swedish ] = "Kumulerade räntor på räntor. Beräknar det totala beloppet för ränteandelarna i en tidsperiod för en investering vid konstant räntesats." ; @@ -7651,7 +7896,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el interés acumulado pagado sobre un préstamo entre los argumentos per_inicial y per_final" ; Text [ english_us ] = "Cumulative compounded interest. Calculates the total amount of the interest share in a period for an investment with a constant interest rate." ; Text[ chinese_simplified ] = "累积å¤åˆ©ã€‚计算一笔固定利率贷款在一定时期内\n应å¿è¿˜çš„利æ¯æ€»é¢ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò îáùóþ ñóììó ïðîöåíòíîãî äîõîäà çà ïåðèîä äëÿ èíâåñòèöèè ïðè ïîñòîÿííîé ïðîöåíòíîé ñòàâêå."; + Text[ russian ] = "Âû÷èñëÿåò ñóììàðíûå âûïëàòû ïî ïðîöåíòàì."; Text[ polish ] = "Skumulowane odsetki sk³adane. Oblicza ogóln¹ sumê odsetek w podanym okresie dla inwestycji przy sta³ej stopie oprocentowania."; Text[ japanese ] = "複利計算ã§ã®åˆ©æ¯ã®ç´¯è¨ˆã€‚指定ã•ã‚ŒãŸæœŸé–“ã«ã€è²¸ä»˜é‡‘ã«å¯¾ã—ã¦æ”¯æ‰•ã‚れる利æ¯ã®ç´¯è¨ˆã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "ç´¯ç©è¤‡åˆ©ã€‚計算一ç†å›ºå®šåˆ©çŽ‡è²¸æ¬¾åœ¨ä¸€å®šæ™‚期內應償還的利æ¯ç¸½é¡ã€‚"; @@ -7663,6 +7908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kümülatif bileþik faiz. Sabit faiz oranlý yatýrýmlar için bir dönemdeki faiz paylarýnýn toplam meblaðýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Interès compost acumulatiu. Calcula la quantitat total de la part d'interès d'un període per a una inversió amb una taxa d'interès constant."; + Text[ thai ] = "ดà¸à¸à¹€à¸šà¸µà¹‰à¸¢à¹€à¸Šà¸´à¸‡à¸‹à¹‰à¸à¸™à¸ªà¸°à¸ªà¸¡ คำนวณจำนวนส่วนà¹à¸šà¹ˆà¸‡à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸—ั้งหมดในงวดเวลาหนึ่งสำหรับà¸à¸²à¸£à¸¥à¸‡à¸—ุนด้วยà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่"; }; ExtraData = { @@ -7686,7 +7932,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Tasa" ; Text [ english_us ] = "Rate" ; Text[ chinese_simplified ] = "rate"; - Text[ russian ] = "Ïðîöåíò ñ êàïèòàëà"; + Text[ russian ] = "Ïðîöåíò"; Text[ polish ] = "Odsetki"; Text[ japanese ] = "利率"; Text[ chinese_traditional ] = "rate"; @@ -7694,10 +7940,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "Åðéôüêéï"; - Text[ korean ] = "ì´ìž"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -7707,7 +7954,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di interesse per periodo." ; Text [ portuguese_brazilian ] = "Der Zinssatz pro Periode." ; Text [ portuguese ] = "é a taxa de juros por período." ; - Text [ finnish ] = "Kausikohtainen korkoprosentti." ; + Text [ finnish ] = "Kausikohtainen korkoprosentti" ; Text [ danish ] = "Rentesatsen per periode." ; Text [ french ] = "Le taux d'intérêt par période." ; Text [ swedish ] = "Räntesats per period." ; @@ -7727,6 +7974,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem faiz oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès per període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; String 4 // Name of Parameter 2 { @@ -7736,7 +7984,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero rate" ; Text [ portuguese_brazilian ] = "ZZR" ; Text [ portuguese ] = "Nper" ; - Text [ finnish ] = "NPER" ; + Text [ finnish ] = "NJAKSO" ; Text [ danish ] = "NPER" ; Text [ french ] = "NPM" ; Text [ swedish ] = "Perioder" ; @@ -7744,7 +7992,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Nper" ; Text [ english_us ] = "NPER" ; Text[ chinese_simplified ] = "nper"; - Text[ russian ] = "Êïåð"; + Text[ russian ] = "ÊÏÅÐ"; Text[ polish ] = "LICZBA.RAT"; Text[ japanese ] = "全支払ã„期間"; Text[ chinese_traditional ] = "NPER"; @@ -7756,6 +8004,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NPER"; Text[ language_user1 ] = " "; Text[ catalan ] = "NPER"; + Text[ thai ] = "NPER"; }; String 5 // Description of Parameter 2 { @@ -7766,7 +8015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Il numero totale dei periodi di pagamento." ; Text [ portuguese_brazilian ] = "Zahlungszeitraum. Die Gesamtanzahl der Perioden, in denen die Annuit?t (Rente) gezahlt wird." ; Text [ portuguese ] = "é o número total de períodos de pagamento numa anuidade." ; - Text [ finnish ] = "Maksukausi. Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; + Text [ finnish ] = "Maksukausi Maksukaudet, joiden aikana annuiteetti (eläke) maksetaan." ; Text [ danish ] = "Ydelsesperioder. Det samlede antal ydelsesperioder i en annuitet." ; Text [ french ] = "Le nombre total de périodes de paiement de l'annuité." ; Text [ swedish ] = "Betalningsperiod. Det totala antalet perioder då annuiteten (pension) betalas." ; @@ -7786,6 +8035,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Taksit sayýsý. Annüite ödenen toplam dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període de pagament. Nombre total de períodes en què es paga l'anualitat (pensió)."; + Text[ thai ] = "งวดà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ จำนวนงวดทั้งหมดในเงินรายปี (เงินบำเหน็จ) ที่จ่าย"; }; String 6 // Name of Parameter 3 { @@ -7795,7 +8045,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "BW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "pv" ; + Text [ finnish ] = "na" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -7803,7 +8053,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Va" ; Text [ english_us ] = "pv" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Òç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "PV"; @@ -7815,6 +8065,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "pv"; + Text[ thai ] = "pv"; }; String 7 // Description of Parameter 3 { @@ -7824,7 +8075,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Il valore attuale della serie di pagamenti" ; Text [ portuguese_brazilian ] = "Barwert. Der derzeitige Wert der Reihe von Zahlungen." ; Text [ portuguese ] = "é o valor presente ou a quantia total actual correspondente a uma série de pagamentos futuros." ; - Text [ finnish ] = "Nykyinen arvo. Annuiteetin nykyinen arvo." ; + Text [ finnish ] = "Nykyinen arvo Annuiteetin nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Den værdi en række ydelser er værd nu." ; Text [ french ] = "Valeur actuelle = la valeur, à la date d'aujourd'hui, d'une série de remboursements futurs." ; Text [ swedish ] = "Nuvarande värde. Det nuvarande värdet för en rad betalningar." ; @@ -7844,6 +8095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Ödeme dizisinin bugünkü deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual o la quantitat en què l'anualitat està valorada actualment."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันหรืà¸à¸ˆà¸³à¸™à¸§à¸™à¹€à¸‡à¸´à¸™à¸£à¸²à¸¢à¸›à¸—ี่มีค่าในปัจจุบัน"; }; String 8 // Name of Parameter 4 { @@ -7861,7 +8113,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Per_inicial" ; Text [ english_us ] = "S" ; Text[ chinese_simplified ] = "start_period"; - Text[ russian ] = "Íà÷_ïåðèîä"; + Text[ russian ] = "Í"; Text[ polish ] = "okres_pocz"; Text[ japanese ] = "開始期"; Text[ chinese_traditional ] = "Start_period"; @@ -7873,6 +8125,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "B"; Text[ language_user1 ] = " "; Text[ catalan ] = "S"; + Text[ thai ] = "S"; }; String 9 // Description of Parameter 4 { @@ -7883,7 +8136,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Il periodo iniziale per il quale calcolare il deprezzamento. 1 = primo periodo." ; Text [ portuguese_brazilian ] = "Anfangsperiode. Die erste Periode, die ber?ksichtigt wird. A = 1 ist die allererste Periode." ; Text [ portuguese ] = "é o primeiro período no cálculo. 1 representa o primeiro período." ; - Text [ finnish ] = "Aloituskausi. Ensimmäinen huomioitava kausi.! A = 1 tarkoittaa ensimmäistä kautta." ; + Text [ finnish ] = "Aloituskausi Ensimmäinen huomioitava kausi A = 1 tarkoittaa ensimmäistä kautta." ; Text [ danish ] = "Startperiode. Den første periode i beregningen.Start = 1 betyder første periode." ; Text [ french ] = "La première période incluse dans le calcul. Ces périodes sont numérotées à partir de 1." ; Text [ swedish ] = "Startperiod. Den första perioden för beräkningen. A = 1 är den allra första perioden." ; @@ -7903,6 +8156,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýlk dönem. Dikkate alýnan ilk dönem. A = 1 ilk dönem anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període inicial. Primer període que s'ha de considerar. A = 1 indica el primer de tots els períodes."; + Text[ thai ] = "งวดเริ่มต้น งวดà¹à¸£à¸à¸—ี่คำนึงถึง A = 1 à¹à¸—นงวดà¹à¸£à¸à¸ªà¸¸à¸”"; }; String 10 // Name of Parameter 5 { @@ -7920,7 +8174,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Per_final" ; Text [ english_us ] = "E" ; Text[ chinese_simplified ] = "end_period"; - Text[ russian ] = "Êîí_ïåðèîä"; + Text[ russian ] = "Ê"; Text[ polish ] = "okres_koñc"; Text[ japanese ] = "終了期"; Text[ chinese_traditional ] = "End_period"; @@ -7932,6 +8186,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "S"; Text[ language_user1 ] = " "; Text[ catalan ] = "E"; + Text[ thai ] = "สิ้นสุด"; }; String 11 // Description of Parameter 5 { @@ -7942,11 +8197,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "L'ultimo periodo per il quale calcolare il deprezzamento." ; Text [ portuguese_brazilian ] = "Endperiode. Die letzte Periode, die ber?ksichtigt wird." ; Text [ portuguese ] = "é o último período do cálculo." ; - Text [ finnish ] = "Viimeinen kausi. Viimeinen huomioitava kausi." ; + Text [ finnish ] = "Viimeinen kausi Viimeinen huomioitava kausi" ; Text [ danish ] = "Slutperiode. Den sidste periode i beregningen." ; Text [ french ] = "La dernière période incluse dans le calcul." ; Text [ swedish ] = "Slutperiod. Den sista perioden för beräkningen." ; - Text [ dutch ] = "Einttermijn. De laatste termijn die in de berekening is opgenomen." ; + Text [ dutch ] = "Eindtermijn. De laatste termijn die in de berekening is opgenomen." ; Text [ spanish ] = "Es el período final del cálculo." ; Text [ english_us ] = "The end period. The last period to be taken into account." ; Text[ chinese_simplified ] = "截æ¢å‘¨æœŸã€‚最åŽä¸€ä¸ªè®¡ç®—周期。"; @@ -7955,13 +8210,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "終了期。計算ã®å¯¾è±¡ã¨ãªã‚‹æœ€å¾Œã®æœŸã€‚"; Text[ chinese_traditional ] = "截æ¢é€±æœŸã€‚最後一個計算週期。"; Text[ arabic ] = "ÃÎÑ ÝÊÑÉ ÊÑíÏ ÍÓÇÈ ÇáÇÓÊåáÇß ÝíåÇ."; - Text[ dutch ] = "Einttermijn. De laatste termijn die in de berekening is opgenomen."; + Text[ dutch ] = "Eindtermijn. De laatste termijn die in de berekening is opgenomen."; Text[ chinese_simplified ] = "截æ¢å‘¨æœŸã€‚最åŽä¸€ä¸ªè®¡ç®—周期。"; Text[ greek ] = "ÔåëéêÞ ðåñßïäïò. Ç ôåëåõôáßá ðåñßïäïò ðïõ èá ëçöèåß õðüøç."; Text[ korean ] = "최종 시기. ê³ ë ¤í•´ì•¼ í• ë§ˆì§€ë§‰ 시기입니다."; Text[ turkish ] = "Son dönem. Dikkate alýnan son dönem."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període final. L'últim període que s'ha de considerar."; + Text[ thai ] = "งวดสุดท้าย งวดสุดท้ายที่คำนึงถึง"; }; String 12 // Name of Parameter 6 { @@ -7991,6 +8247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 13 // Description of Parameter 6 { @@ -8001,7 +8258,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tipo di scadenze dei pagamaenti. 1 = all'inizio del periodo, 0 = alla fine." ; Text [ portuguese_brazilian ] = "F?lligkeit. F = 1 hei?t F?lligkeit am Anfang einer Periode, F = 0 am Ende." ; Text [ portuguese ] = "é o vencimento dos pagamentos de juros. 1 significa no ínicio do período, 0 no final." ; - Text [ finnish ] = "Tyyppi = 1 tarkoittaa kauden alkua ja = 0 kauden loppua." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; Text [ danish ] = "Forfaldstidspunkt. F = 1 betyder betaling ved periodens begyndelse, F = 0 betaling ved periodens slutning." ; Text [ french ] = "Échéance. Type=1 signifie échéance au début d'une période, type=0 à la fin d'une période." ; Text [ swedish ] = "Förfallotidpunkt. F = 1 betyder förfallotidpunkt i början av en period, F = 0 i slutet." ; @@ -8009,7 +8266,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el vencimiento de los pagos. 1 indica al principio del período, 0 al final." ; Text [ english_us ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; Text[ chinese_simplified ] = "到期类型。type = 1 表示在一个周期开始时到期。 \ntype = 0 则表示在一个周期结æŸæ—¶åˆ°æœŸã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå (0 èëè1), îáîçíà÷àþùåå, äîëæíà ëè ïðîèçâîäèòüñÿ âûïëàòà â êîíöå ïåðèîäà (0) èëè â íà÷àëå ïåðèîäà (1)."; + Text[ russian ] = "Òèï = 1 îçíà÷àåò, ÷òî ïëàòà ïðîèçâîäèòñÿ â íà÷àëå ïåðèîäà, = 0 - â êîíöå ïåðèîäà."; Text[ polish ] = "Wartoœæ 0 lub 1 okreœlaj¹ca sposób dokonywania p³atnoœci. (1 oznacza p³atnoœæ na pocz¹tku okresu, 0 - na koñcu)."; Text[ japanese ] = "支払期日。支払期日 = 1 ã¯å„期ã®æœŸé¦–ã€æ”¯æ‰•æœŸæ—¥ = 0 ã¯å„期ã®æœŸæœ«ã€‚"; Text[ chinese_traditional ] = "到期類型。F = 1 表示在一個週期開始時到期。 F = 0 則表示在一個週期çµæŸæ™‚到期。"; @@ -8021,6 +8278,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Vade. F = 1, vade dönem baþýnda, F = 0 ise dönem sonunda anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus = 1 indica venciment al començament del període; = 0, al final."; + Text[ thai ] = "ชนิด = 1 à¹à¸—นครบà¸à¸³à¸«à¸™à¸”งวดเริ่มต้น, = 0 งวดสุดท้าย"; }; }; // -=*# Resource for function DIA #*=- @@ -8051,10 +8309,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Berekent de meetkundig-degressieve afschrijving voor een bepaalde termijn."; Text[ chinese_simplified ] = "计算指定期é™å†…的算术递å‡åž‹èµ„产折旧é¢ã€‚"; Text[ greek ] = "Õðïëïãßæåé ôçí áñéèìçôéêÞ-öèßíïõóá ôéìÞ ôçò áðüóâåóçò ìéáò óõãêåêñéìÝíçò ðåñéüäïõ."; - Text[ korean ] = "íŠ¹ì •í•œ ê¸°ê°„ì— ëŒ€í•œ ì‚°ìˆ ì ï¼ì²´ê° ê°ê°€ ìƒê°ì•¡ì„ 계산합니다"; + Text[ korean ] = "íŠ¹ì •í•œ ê¸°ê°„ì— ëŒ€í•œ ì‚°ìˆ ì ì²´ê° ê°ê°€ ìƒê°ì•¡ì„ 계산합니다"; Text[ turkish ] = "Belirli bir dönem için aritmetik-azalan amortismanýný hesaplar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Calcula el valor de disminució aritmètica d'un bé (depreciació) per a un període determinat."; + Text[ catalan ] = "Calcula el valor de disminució aritmètica d'un bé (depreciació³) per a un període determinat."; + Text[ thai ] = "คำนวณค่าที่ลดลงà¹à¸šà¸šà¹€à¸¥à¸‚คณิตขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์ (ค่าเสื่à¸à¸¡à¸£à¸²à¸„า) สำหรับงวดที่ระบุ"; }; ExtraData = { @@ -8090,6 +8349,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cost"; + Text[ thai ] = "ต้นทุน"; }; String 3 // Description of Parameter 1 { @@ -8119,6 +8379,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti. Ýktisadi malýn satýnalma maliyeti."; Text[ language_user1 ] = " "; Text[ catalan ] = "Costs d'adquisició. Cost inicial del bé."; + Text[ thai ] = "ต้นทุนที่ได้รับมา ต้นทุนà¹à¸£à¸à¹€à¸£à¸´à¹ˆà¸¡à¸‚à¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 4 // Name of Parameter 2 { @@ -8136,7 +8397,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor_residual" ; Text [ english_us ] = "Salvage" ; Text[ chinese_simplified ] = "salvage"; - Text[ russian ] = "Îñòàòî÷íàÿ_ñòîèìîñòü"; + Text[ russian ] = "Ëèêâ_ñòîèì"; Text[ polish ] = "Wartoœæ_odzysku"; Text[ japanese ] = "残å˜ä¾¡é¡"; Text[ chinese_traditional ] = "salvage"; @@ -8148,6 +8409,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament"; + Text[ thai ] = "เงินชดเชย"; }; String 5 // Description of Parameter 2 { @@ -8165,7 +8427,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor residual. Es el valor al final de la amortización." ; Text [ english_us ] = "Salvage: The remaining value of the asset at the end of its life." ; Text[ chinese_simplified ] = "剩余值。使用年é™ç»ˆæ¢æ—¶çš„剩余价值。"; - Text[ russian ] = "Îñòàòî÷íàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; + Text[ russian ] = "Ëèêâèäàöèîííàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; Text[ polish ] = "Wartoœæ koñcowa po amortyzacji."; Text[ japanese ] = "残å˜ä¾¡é¡ã€‚è€ç”¨å¹´æ•°ãŒçµ‚了ã—ãŸæ™‚点ã§ã®è³‡ç”£ã®ä¾¡æ ¼ã€‚"; Text[ chinese_traditional ] = "剩餘值。使用年é™çµ‚æ¢æ™‚的剩餘價值。"; @@ -8177,6 +8439,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer. Varlýðýn ömrü tamamlandýðýnda kalan deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament: valor restant del bé al final de la seva vida."; + Text[ thai ] = "เงินชดเชย: ค่าขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์ที่เหลืà¸à¸à¸¢à¸¹à¹ˆ ณ จุดสิ้นสุดขà¸à¸‡à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚à¸à¸‡à¸¡à¸±à¸™"; }; String 6 // Name of Parameter 3 { @@ -8206,6 +8469,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida"; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -8224,7 +8488,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el número de períodos durante el cual se produce la amortización del bien (llamada también vida útil del bien)." ; Text [ english_us ] = "Useful life. The number of periods in the useful life of the asset." ; Text[ chinese_simplified ] = "使用寿命。资产折旧期é™ã€‚"; - Text[ russian ] = "×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî (èíîãäà íàçûâàåìîå âðåìåíåì ïîëíîé àìîðòèçàöèè)."; + Text[ russian ] = "Ñðîê èñïîëüçîâàíèÿ. ×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî."; Text[ polish ] = "Liczba okresów, po których œrodek trwa³y ulega amortyzacji."; Text[ japanese ] = "è€ç”¨å¹´æ•°ã€‚資産を使用ã§ãã‚‹å¹´æ•°ã€ã¤ã¾ã‚Šå„Ÿå´ã®å¯¾è±¡ã¨ãªã‚‹è³‡ç”£ã®å¯¿å‘½å¹´æ•°ã€‚"; Text[ chinese_traditional ] = "使用年é™ã€‚資產折舊期é™ã€‚"; @@ -8236,6 +8500,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür. Varlýk için amortisman ayrýlan dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida útil. Nombre de períodes de la vida útil del bé."; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ จำนวนงวดในà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 8 // Name of Parameter 4 { @@ -8265,6 +8530,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem"; Text[ language_user1 ] = " "; Text[ catalan ] = "Període"; + Text[ thai ] = "งวด"; }; String 9 // Description of Parameter 4 { @@ -8274,7 +8540,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Periodo dell'ammortamento espresso nelle stesse unità di misura di Vita utile." ; Text [ portuguese_brazilian ] = "Zeitraum. Die Periode der Abschreibung in derselben Zeiteinheit wie die Nutzungsdauer." ; Text [ portuguese ] = "é o período de amortização que deseja calcular e tem a mesma unidade de tempo da vida útil." ; - Text [ finnish ] = "Kausi! Poistokausi, jonka on oltava sama aikayksikkö kuin mitä käyttöiän määrityksessä on käytetty." ; + Text [ finnish ] = "Kausi Poistokausi, jonka on oltava sama aikayksikkö kuin mitä käyttöiän määrityksessä on käytetty." ; Text [ danish ] = "Tidsperiode. Afskrivningsperioden i samme tidsenhed som levetiden." ; Text [ french ] = "La période d'amortissement ; doit être exprimée dans la même unité que la durée." ; Text [ swedish ] = "Tidsperiod. Period för avskrivning i samma tidsenhet som livslängden." ; @@ -8282,7 +8548,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el período y se deben utilizar las mismas unidades que en el argumento vida." ; Text [ english_us ] = "Period. The depreciation period which must have the same time unit as average useful life." ; Text[ chinese_simplified ] = "折旧期数，其å•ä½å’Œä½¿ç”¨å¹´é™çš„å•ä½ç›¸åŒã€‚"; - Text[ russian ] = "Ïåðèîä. Ïåðèîäû àìîðòèçàöèè â òàêîé æå åäèíèöå âðåìåíè, ÷òî è ñðîê àìîðòçàöèè."; + Text[ russian ] = "Ïåðèîä. Ïåðèîäû àìîðòèçàöèè â òàêîé æå åäèíèöå âðåìåíè, ÷òî è ñðîê àìîðòèçàöèè."; Text[ polish ] = "Okres amortyzacji musi zostaæ wyra¿ony w tych samych jednostkach co argument czas_¿ycia."; Text[ japanese ] = "期間。減価償å´è²»ã‚’求ã‚る期。"; Text[ chinese_traditional ] = "折舊期數ï¹å…¶å–®ä½å’Œä½¿ç”¨å¹´é™çš„å–®ä½ç›¸åŒã€‚"; @@ -8294,6 +8560,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem. Ömür ile ayný zaman birimine sahip amortisman dönemi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període. Període de depreciació, que ha d'expressar-se en la mateixa unitat de temps que la vida útil mitjana."; + Text[ thai ] = "งวด งวดขà¸à¸‡à¸à¸²à¸£à¹€à¸ªà¸·à¹ˆà¸à¸¡à¸£à¸²à¸„าที่ต้à¸à¸‡à¸¡à¸µà¸«à¸™à¹ˆà¸§à¸¢à¹€à¸§à¸¥à¸²à¹€à¸«à¸¡à¸·à¸à¸™à¸à¸±à¸šà¸„่าเฉลี่ยà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์"; }; }; // -=*# Resource for function LIA #*=- @@ -8315,7 +8582,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la amortización lineal por período." ; Text [ english_us ] = "Calculates the linear depreciation per period." ; Text[ chinese_simplified ] = "计算å„期的线性折旧é¢ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò âåëè÷èíó íåïîñðåäñòâåííîé àìîðòèçàöèè èìóùåñòâà çà îäèí ïåðèîä."; + Text[ russian ] = "Âû÷èñëÿåò îáùåãîäîâóþ âåëè÷èíó àìîðòèçàöèè èìóùåñòâà äëÿ óêàçàííîãî ïåðèîäà."; Text[ polish ] = "Oblicza wartoœæ amortyzacji œrodka trwa³ego w podanym okresie metod¹ liniow¹."; Text[ japanese ] = "定é¡æ³•(Straight-line Method)を使用ã—ã¦ã€è³‡ç”£ã®1期当ãŸã‚Šã®æ¸›ä¾¡å„Ÿå´è²»ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算å„期的線性折舊é¡ã€‚"; @@ -8327,6 +8594,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Beher dönemdeki doðrusal amortismaný hesaplar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la depreciació lineal per període."; + Text[ thai ] = "คำนวณค่าเสื่à¸à¸¡à¸£à¸²à¸„าà¹à¸šà¸šà¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡à¸•à¹ˆà¸à¸‡à¸§à¸”"; }; ExtraData = { @@ -8362,6 +8630,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cost"; + Text[ thai ] = "ต้นทุน"; }; String 3 // Description of Parameter 1 { @@ -8371,7 +8640,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Costo di acquisto del bene economico." ; Text [ portuguese_brazilian ] = "Anschaffungswert. Die Anschaffungskosten des Wirtschaftgutes." ; Text [ portuguese ] = "é o custo de aquisição do activo." ; - Text [ finnish ] = "Hankintakustannus. Resurssin alkukustannukset." ; + Text [ finnish ] = "Hankintakustannus Resurssin alkukustannukset" ; Text [ danish ] = "Købspris. Aktivets anskaffelsespris." ; Text [ french ] = "La valeur d'acquisition du bien." ; Text [ swedish ] = "Anskaffningsvärde. Anskaffningskostnaderna för tillgången." ; @@ -8391,6 +8660,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti. Ýktisadi varlýðýn satýnalma maliyeti."; Text[ language_user1 ] = " "; Text[ catalan ] = "Cost d'adquisició. Cost inicial d'un bé."; + Text[ thai ] = "ต้นทุนที่ได้รับมา ต้นทุนà¹à¸£à¸à¹€à¸£à¸´à¹ˆà¸¡à¸‚à¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 4 // Name of Parameter 2 { @@ -8408,7 +8678,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor_residual" ; Text [ english_us ] = "Salvage" ; Text[ chinese_simplified ] = "salvage"; - Text[ russian ] = "Îñòàòî÷íàÿ_ñòîèìîñòü"; + Text[ russian ] = "Ëèêâ_ñòîèì"; Text[ polish ] = "Wartoœæ_odzysku"; Text[ japanese ] = "残å˜ä¾¡é¡"; Text[ chinese_traditional ] = "salvage"; @@ -8420,6 +8690,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament"; + Text[ thai ] = "เงินชดเชย"; }; String 5 // Description of Parameter 2 { @@ -8437,7 +8708,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor residual. Es el valor al final de la amortización." ; Text [ english_us ] = "Salvage: The remaining value of the asset at the end of its life." ; Text[ chinese_simplified ] = "剩余值。使用年é™ç»ˆæ¢æ—¶çš„剩余价值。"; - Text[ russian ] = "Îñòàòî÷íàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; + Text[ russian ] = "Ëèêâèäàöèîííàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; Text[ polish ] = "Wartoœæ koñcowa po amortyzacji."; Text[ japanese ] = "残å˜ä¾¡é¡ã€‚è€ç”¨å¹´æ•°ãŒçµ‚了ã—ãŸæ™‚点ã§ã®è³‡ç”£ã®ä¾¡æ ¼ã€‚"; Text[ chinese_traditional ] = "剩餘值。使用年é™çµ‚æ¢æ™‚的剩餘價值。"; @@ -8449,6 +8720,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer. Varlýðýn ömrü tamamlandýðýnda kalan deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament: valor restant del bé al final de la seva vida."; + Text[ thai ] = "เงินชดเชย: ค่าขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์ที่เหลืà¸à¸à¸¢à¸¹à¹ˆ ณ จุดสิ้นสุดขà¸à¸‡à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚à¸à¸‡à¸¡à¸±à¸™"; }; String 6 // Name of Parameter 3 { @@ -8478,6 +8750,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida"; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -8488,7 +8761,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Vita utile di un bene o il numero di periodi in cui il bene viene ammortizzato." ; Text [ portuguese_brazilian ] = "Nutzungsdauer. Die Anzahl der Perioden, ?er die das Wirtschaftsgut abgeschrieben wird." ; Text [ portuguese ] = "é o número de períodos de amortização do activo." ; - Text [ finnish ] = "Hyödyllinen käyttöikä. Resurssin käyttöiän hyödyllisten jaksojen määrä." ; + Text [ finnish ] = "Hyödyllinen käyttöikä Resurssin käyttöiän hyödyllisten jaksojen määrä." ; Text [ danish ] = "Levetid. Antallet af perioder over hvilke aktivet afskrives." ; Text [ french ] = "La durée de vie utile du bien ou le nombre de périodes pendant lesquelles le bien est amorti." ; Text [ swedish ] = "Livslängd. Antalet perioder då tillgången avskrivs." ; @@ -8496,7 +8769,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el número de períodos durante los cuales ocurre la amortización del bien." ; Text [ english_us ] = "Useful life. The number of periods in the useful life of the asset." ; Text[ chinese_simplified ] = "使用期é™ã€‚资产折旧期é™ã€‚"; - Text[ russian ] = "×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî (èíîãäà íàçûâàåìîå âðåìåíåì ïîëíîé àìîðòèçàöèè)."; + Text[ russian ] = "Ñðîê èñïîëüçîâàíèÿ. ×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî."; Text[ polish ] = "Liczba okresów, po których œrodek trwa³y ulega amortyzacji."; Text[ japanese ] = "è€ç”¨å¹´æ•°ã€‚資産を使用ã§ãã‚‹å¹´æ•°ã€ã¤ã¾ã‚Šå„Ÿå´ã®å¯¾è±¡ã¨ãªã‚‹è³‡ç”£ã®å¯¿å‘½å¹´æ•°ã€‚"; Text[ chinese_traditional ] = "使用年é™ã€‚資產折舊期é™ã€‚"; @@ -8508,6 +8781,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür. Varlýk için amortisman ayrýlan dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida útil. Nombre de períodes de la vida útil del bé."; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ จำนวนงวดในà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; }; // -=*# Resource for function GDA #*=- @@ -8538,10 +8812,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Berekent de afschrijving van activa over een bepaalde termijn."; Text[ chinese_simplified ] = "计算指定期é™å†…的算术递å‡åž‹èµ„产折旧é¢ã€‚"; Text[ greek ] = "Õðïëïãßæåé ôçí áñéèìçôéêÞ-öèßíïõóá ôéìÞ ôçò áðüóâåóçò ìéáò óõãêåêñéìÝíçò ðåñéüäïõ."; - Text[ korean ] = "íŠ¹ì •í•œ ê¸°ê°„ì— ëŒ€í•œ ì‚°ìˆ ì ï¼ì²´ê° ê°ê°€ ìƒê°ì•¡ì„ 계산합니다"; + Text[ korean ] = "íŠ¹ì •í•œ ê¸°ê°„ì— ëŒ€í•œ ì‚°ìˆ ì ì²´ê° ê°ê°€ ìƒê°ì•¡ì„ 계산합니다"; Text[ turkish ] = "Belirli bir dönem için aritmetik-azalan amortismaný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la depreciació d'un bé per a un període determinat utilitzant el mètode de balanç de doble disminució o el factor de balanç de disminució."; + Text[ thai ] = "คำนวณค่าเสื่à¸à¸¡à¸£à¸²à¸„าขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์สำหรับà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸§à¸”เฉพาะวิธีà¸à¸²à¸£à¸ªà¸¡à¸”ุลà¹à¸šà¸šà¸¥à¸”ลงคู่หรืà¸à¸›à¸±à¸ˆà¸ˆà¸±à¸¢à¸à¸²à¸£à¸¥à¸”ลงà¸à¸¢à¹ˆà¸²à¸‡à¸ªà¸¡à¸”ุล"; }; ExtraData = { @@ -8577,6 +8852,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cost"; + Text[ thai ] = "ต้นทุน"; }; String 3 // Description of Parameter 1 { @@ -8586,7 +8862,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Costo di acquisto del bene economico." ; Text [ portuguese_brazilian ] = "Anschaffungswert. Die Anschaffungskosten des Wirtschaftgutes." ; Text [ portuguese ] = "é o valor inicial de aquisição do bem económico." ; - Text [ finnish ] = "Hankintakustannukset. Resurssin alkukustannukset." ; + Text [ finnish ] = "Hankintakustannukset Resurssin alkukustannukset" ; Text [ danish ] = "Købspris. Aktivets anskaffelsespris." ; Text [ french ] = "La valeur d'acquisition du bien." ; Text [ swedish ] = "Anskaffningsvärde. Anskaffningskostnaderna för tillgången." ; @@ -8606,6 +8882,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti. Ýktisadi malýn satýnalma maliyeti."; Text[ language_user1 ] = " "; Text[ catalan ] = "Costs d'adquisició. Cost inicial del bé."; + Text[ thai ] = "ต้นทุนที่ได้รับมา ต้นทุนà¹à¸£à¸à¹€à¸£à¸´à¹ˆà¸¡à¸‚à¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 4 // Name of Parameter 2 { @@ -8623,7 +8900,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor_residual" ; Text [ english_us ] = "Salvage" ; Text[ chinese_simplified ] = "salvage"; - Text[ russian ] = "Îñòàòî÷íàÿ_ñòîèìîñòü"; + Text[ russian ] = "Ëèêâ_ñòîèì"; Text[ polish ] = "Wartoœæ_odzysku"; Text[ japanese ] = "残å˜ä¾¡é¡"; Text[ chinese_traditional ] = "salvage"; @@ -8635,6 +8912,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament"; + Text[ thai ] = "เงินชดเชย"; }; String 5 // Description of Parameter 2 { @@ -8652,7 +8930,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor residual. Es el valor al final de la amortización (a veces llamado valor residual del bien)." ; Text [ english_us ] = "Salvage: The remaining value of the asset at the end of its life." ; Text[ chinese_simplified ] = "剩余值。使用年é™ç»ˆæ¢æ—¶çš„剩余价值。"; - Text[ russian ] = "Îñòàòî÷íàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; + Text[ russian ] = "Ëèêâèäàöèîííàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; Text[ polish ] = "Wartoœæ odzysku na koniec okresu amortyzacji."; Text[ japanese ] = "残å˜ä¾¡é¡ã€‚è€ç”¨å¹´æ•°ãŒçµ‚了ã—ãŸæ™‚点ã§ã®è³‡ç”£ã®ä¾¡æ ¼ã€‚"; Text[ chinese_traditional ] = "剩餘值。使用年é™çµ‚æ¢æ™‚的剩餘價值。"; @@ -8664,6 +8942,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer. Varlýðýn ömrü tamamlandýðýnda kalan deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament: valor restant del bé al final de la seva vida."; + Text[ thai ] = "เงินชดเชย: ค่าขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์ที่ยังเหลืà¸à¸à¸¢à¸¹à¹ˆ ณ จุดสิ้นสุดขà¸à¸‡à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"; }; String 6 // Name of Parameter 3 { @@ -8693,6 +8972,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida"; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -8703,7 +8983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Vita utile di un bene o il numero di periodi in cui il bene viene ammortizzato." ; Text [ portuguese_brazilian ] = "Nutzungsdauer. Die Anzahl der Perioden, ?er die das Wirtschaftsgut abgeschrieben wird." ; Text [ portuguese ] = "é o número de períodos de amortização do bem económico." ; - Text [ finnish ] = "Hyödyllinen käyttöikä. Resurssin käyttöiän hyödyllisten jaksojen määrä." ; + Text [ finnish ] = "Hyödyllinen käyttöikä Resurssin käyttöiän hyödyllisten jaksojen määrä." ; Text [ danish ] = "Levetid. Antallet af perioder over hvilke aktivet afskrives." ; Text [ french ] = "La durée de vie utile du bien ou le nombre de périodes pendant lesquelles le bien est amorti." ; Text [ swedish ] = "Livslängd. Antalet perioder då tillgången avskrivs." ; @@ -8711,7 +8991,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el número de períodos durante los cuales se deprecia el bien (a veces llamado vida útil del bien)." ; Text [ english_us ] = "Useful life. The number of periods in the useful life of the asset." ; Text[ chinese_simplified ] = "使用期é™ã€‚资产折旧期é™ã€‚"; - Text[ russian ] = "×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî (èíîãäà íàçûâàåìîå âðåìåíåì ïîëíîé àìîðòèçàöèè)."; + Text[ russian ] = "Ñðîê èñïîëüçîâàíèÿ. ×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî."; Text[ polish ] = "Liczba okresów, po których œrodek trwa³y ulega amortyzacji."; Text[ japanese ] = "è€ç”¨å¹´æ•°ã€‚資産を使用ã§ãã‚‹å¹´æ•°ã€ã¤ã¾ã‚Šå„Ÿå´ã®å¯¾è±¡ã¨ãªã‚‹è³‡ç”£ã®å¯¿å‘½å¹´æ•°ã€‚"; Text[ chinese_traditional ] = "使用年é™ã€‚資產折舊年é™ã€‚"; @@ -8723,6 +9003,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür. Varlýk için amortisman ayrýlan dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida útil. Nombre de períodes de la vida útil del bé."; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ จำนวนช่วงในà¸à¸²à¸¢à¸¸à¸—ี่ใช้ประโยชน์ขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 8 // Name of Parameter 4 { @@ -8752,6 +9033,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem"; Text[ language_user1 ] = " "; Text[ catalan ] = "Període"; + Text[ thai ] = "งวด"; }; String 9 // Description of Parameter 4 { @@ -8761,7 +9043,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Durata dell'ammortamento espressa nelle stesse unità di misura di Vita utile." ; Text [ portuguese_brazilian ] = "Periode. Die Periode der Abschreibung in derselben Zeiteinheit wie die Nutzungsdauer." ; Text [ portuguese ] = "é o período de amortização que deseja calcular e tem a mesma unidade de tempo da vida útil." ; - Text [ finnish ] = "Kausi! Poistokausi määritettynä samoina aikayksikköinä kuin käyttöikä." ; + Text [ finnish ] = "Kausi Poistokausi määritettynä samoina aikayksikköinä kuin käyttöikä." ; Text [ danish ] = "Periode. Afskrivningensperioden i samme tidsenhed som levetiden." ; Text [ french ] = "La période pour laquelle vous voulez calculer l'amortissement, elle doit être exprimée dans la même unité que la durée de vie du bien." ; Text [ swedish ] = "Period. Perioden för avskrivning i samma tidsenhet som livslängden." ; @@ -8781,6 +9063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem. Ömür ile ayný zaman birimine sahip amortisman dönemi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Període. Període de depreciació, que ha d'expressar-se en la mateixa unitat de temps que l'entrada de vida útil mitjana."; + Text[ thai ] = "งวด งวดค่าเสื่à¸à¸¡à¸£à¸²à¸„าในเวลาเดียวà¸à¸±à¸šà¸«à¸™à¹ˆà¸§à¸¢à¹€à¸›à¹‡à¸™à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์โดยเฉลี่ย"; }; String 10 // Name of Parameter 5 { @@ -8810,6 +9093,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Faktör"; Text[ language_user1 ] = " "; Text[ catalan ] = "Factor"; + Text[ thai ] = "ปัจจัย"; }; String 11 // Description of Parameter 5 { @@ -8820,7 +9104,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso al quale il valore residuo diminuisce. Se il Fattore = 2 l'ammortamento è a quote doppie." ; Text [ portuguese_brazilian ] = "Faktor. Faktor f? die Abnahme der Abschreibung. F = 2 hei?t Doppelraten-Abschreibung." ; Text [ portuguese ] = "é a taxa de declínio do saldo." ; - Text [ finnish ] = "Kerroin: Saldon pienentymiskerroin. F = 2 tarkoittaa kaksinkertaista saldon pienentymistä" ; + Text [ finnish ] = "Kerroin Saldon pienentymiskerroin F = 2 tarkoittaa kaksinkertaista saldon pienentymistä" ; Text [ danish ] = "Faktor. Den sats, som saldoen aftager med. F= 2 betyder doppeltsaldometoden." ; Text [ french ] = "Le taux de l'amortissement dégressif. ; F = 2 est la méthode d'amortissement dégressif à taux double." ; Text [ swedish ] = "Faktor. Faktor för minskning av avskrivning. F = 2 betyder dubbel avskrivning." ; @@ -8828,7 +9112,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es la tasa de declinación del saldo." ; Text [ english_us ] = "Factor. The factor for balance decline. F = 2 means a double declining balance factor" ; Text[ chinese_simplified ] = "为用于折旧计算的余é¢é€’å‡å› å。F=2 说明采用的是åŒå€ä½™é¢é€’å‡æŠ˜æ—§æ³•ã€‚"; - Text[ russian ] = "Íîðìà ñíèæåíèÿ áàëàíñîâîé ñòîèìîñòè. Êîýôôèöèåíò ðàâåí äâóì îçíà÷àåò äâóêðàòíîå ñíèæåíèå áàëàíñîâîé ñòîèìîñòè."; + Text[ russian ] = "Íîðìà ñíèæåíèÿ áàëàíñîâîé ñòîèìîñòè. Êîýôôèöèåíò ðàâåí äâóì, êîãäà ñóùåñòâóåò äâóêðàòíîå ñíèæåíèå áàëàíñîâîé ñòîèìîñòè."; Text[ polish ] = "Wartoœæ steruj¹ca szybkoœci¹, z jak¹ ma maleæ saldo. 2 oznacza metodê podwójnego spadku."; Text[ japanese ] = "率。減価償å´çŽ‡ã‚’指定ã—ã¾ã™ã€‚率 = 2 ã«ã™ã‚‹ã¨å€çŽ‡é€“減法ã§è¨ˆç®—ãŒè¡Œã‚ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "為余é¡éžæ¸›æŠ˜èˆŠå› åï¹F=2 是雙å€ä½™é¡éžæ¸›æŠ˜èˆŠæ³•ã€‚"; @@ -8836,10 +9120,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Factor. Factor voor de snelheid waarmee wordt afgeschreven. FA = 2 betekent afschrijving in dubbele termijnen."; Text[ chinese_simplified ] = "为用于折旧计算的余é¢é€’å‡å› å。F=2 说明采用的是åŒå€ä½™é¢é€’å‡æŠ˜æ—§æ³•ã€‚"; Text[ greek ] = "ÐáñÜãïíôáò. ÐáñÜãïíôáò ãéá ôç ìåßùóç ôïõ õðïëïßðïõ. F = 2 óçìáßíåé ìÝèïäïò ôïõ äéðëÜ öèßíïíôïò õðïëïßðïõ."; - Text[ korean ] = "ì¸ìˆ˜. ê°ê°€ìƒê°ì•¡ ê³µì œ ì¸ìˆ˜. F = 2는 ì´ì¤‘ ê°ê°€ ìƒê°ì„ ì˜ë¯¸í•©ë‹ˆë‹¤."; + Text[ korean ] = "ì¸ìˆ˜. ê°ê°€ ìƒê°ì•¡ ê³µì œ ì¸ìˆ˜. F = 2는 ì´ì¤‘ ê°ê°€ ìƒê°ì„ ì˜ë¯¸í•©ë‹ˆë‹¤."; Text[ turkish ] = "Faktör. Amortisman bakiyesi faktörü. F = 2, çift azalan bakiye amortismaný anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Factor. Factor per a la disminució del balanç. F = 2 indica un factor de balanç de doble disminució"; + Text[ thai ] = "ปัจจัย ปัจจัยสำหรับà¸à¸²à¸£à¸¥à¸”ลงà¸à¸¢à¹ˆà¸²à¸‡à¸ªà¸¡à¸”ุล F = 2 หมายถึงปัจจัยà¸à¸²à¸£à¸¥à¸”ลงคู่à¹à¸šà¸šà¸ªà¸¡à¸”ุล"; }; }; // -=*# Resource for function GDA2 #*=- @@ -8862,7 +9147,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la amortización de un bien durante un período específico usando el método de amortización de saldo fijo" ; Text [ english_us ] = "Returns the real depreciation of an asset for a specified period using the fixed-declining balance method." ; Text[ chinese_simplified ] = "计算指定期é™å†…çš„å‡ ä½•é€’å‡åž‹(固定余é¢é€’å‡æ³•)资产折旧é¢ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò àìîðòèçàöèþ èìóùåñòâà íà çàäàííûé ïåðèîä, èñïîëüçóÿ ìåòîä ïîñòîÿííîãî ó÷åòà àìîðòèçàöèè."; + Text[ russian ] = "Âîçâðàùàåò ñíèæåíèå ñòîèìîñòè àêòèâà äëÿ îïðåäåëåííîãî ïåðèîäà, èñïîëüçóÿ ìåòîä äâîéíîãî óìåíüøåíèÿ áàëàíñà."; Text[ polish ] = "Oblicza amortyzacjê œrodka trwa³ego za podany okres metod¹ równomiernie malej¹cego salda."; Text[ japanese ] = "定率法(Fixed-declining Balance Method)を使用ã—ã¦ã€ç‰¹å®šã®æœŸã«ãŠã‘る資産ã®æ¸›ä¾¡å„Ÿå´è²»ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "用固定余é¡éžæ¸›æ³•è¨ˆç®—æŸä¸€é€±æœŸçš„資產折舊值。"; @@ -8874,6 +9159,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Belirli bir dönem için geometrik-azalan amortismaný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la depreciació real d'un bé per a un període indicat utilitzant el mètode de balanç de disminució fixa."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเสื่à¸à¸¡à¸£à¸²à¸„าจริงขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์สำหรับงวดที่ระบุใช้วิธีสมดุลà¹à¸šà¸šà¸¥à¸”ลงคงที่"; }; ExtraData = { @@ -8897,7 +9183,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Costo" ; Text [ english_us ] = "Cost" ; Text[ chinese_simplified ] = "cost"; - Text[ russian ] = "Íà÷_ñòîèìîñòü"; + Text[ russian ] = "Ñòîèìîñòü"; Text[ polish ] = "Cena_zakupu"; Text[ japanese ] = "å–得価é¡"; Text[ chinese_traditional ] = "cost"; @@ -8909,6 +9195,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cost"; + Text[ thai ] = "ต้นทุน"; }; String 3 // Description of Parameter 1 { @@ -8918,7 +9205,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Costo di acquisto del bene economico." ; Text [ portuguese_brazilian ] = "Anschaffungswert. Die Anschaffungskosten des Wirtschaftgutes." ; Text [ portuguese ] = "é o valor inicial de aquisição do bem económico." ; - Text [ finnish ] = "Hankintakustannukset: Resurssin alkukustannukset." ; + Text [ finnish ] = "Hankintakustannukset: Resurssin alkukustannukset" ; Text [ danish ] = "Købspris. Aktivets anskaffelsespris." ; Text [ french ] = "La valeur d'acquisition du bien." ; Text [ swedish ] = "Anskaffningsvärde. Anskaffningskostnader för tillgången." ; @@ -8938,6 +9225,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti. Ýktisadi varlýðýn satýnalma maliyeti."; Text[ language_user1 ] = " "; Text[ catalan ] = "Costs d'adquisició: cost inicial del bé."; + Text[ thai ] = "ต้นทุนที่ได้รับมา: ต้นทุนà¹à¸£à¸à¹€à¸£à¸´à¹ˆà¸¡à¸‚à¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 4 // Name of Parameter 2 { @@ -8955,7 +9243,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor_residual" ; Text [ english_us ] = "Salvage" ; Text[ chinese_simplified ] = "salvage"; - Text[ russian ] = "Îñòàòî÷íàÿ_ñòîèìîñòü"; + Text[ russian ] = "Ëèêâ_ñòîèì"; Text[ polish ] = "Wartoœæ_odzysku"; Text[ japanese ] = "残å˜ä¾¡é¡"; Text[ chinese_traditional ] = "salvage"; @@ -8967,6 +9255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament"; + Text[ thai ] = "เงินชดเชย"; }; String 5 // Description of Parameter 2 { @@ -8984,7 +9273,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor residual. Es el valor al final de la amortización." ; Text [ english_us ] = "Salvage: The remaining value of the asset at the end of its life." ; Text[ chinese_simplified ] = "剩余价值。资产在折旧(使用)期é™ç»ˆæ¢æ—¶çš„剩余价值。"; - Text[ russian ] = "Îñòàòî÷íàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; + Text[ russian ] = "Ëèêâèäàöèîííàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; Text[ polish ] = "Wartoœæ odzysku na koniec okresu amortyzacji."; Text[ japanese ] = "残å˜ä¾¡é¡ã€‚è€ç”¨å¹´æ•°ãŒçµ‚了ã—ãŸæ™‚点ã§ã®è³‡ç”£ã®ä¾¡æ ¼ã€‚"; Text[ chinese_traditional ] = "剩餘值。使用年é™çµ‚æ¢æ™‚的資產剩餘值。"; @@ -8996,6 +9285,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer. Varlýðýn ömrü tamamlandýðýnda kalan deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament: valor restant del bé al final de la seva vida."; + Text[ thai ] = "เงินชดเชย: ค่าที่เหลืà¸à¸à¸¢à¸¹à¹ˆà¸‚à¸à¸‡à¸ªà¸´à¸™à¸—รัพย์ที่จุดสิ้นสุดขà¸à¸‡à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"; }; String 6 // Name of Parameter 3 { @@ -9025,6 +9315,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida"; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -9035,7 +9326,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Vita utile di un bene o il numero di periodi in cui il bene viene ammortizzato." ; Text [ portuguese_brazilian ] = "Nutzungsdauer. Die Anzahl der Perioden, ?er die das Wirtschaftsgut abgeschrieben wird." ; Text [ portuguese ] = "é o número de períodos de amortização do bem económico." ; - Text [ finnish ] = "Hyödyllinen käyttöikä. Resurssin käyttöiän hyödyllisten jaksojen määrä." ; + Text [ finnish ] = "Hyödyllinen käyttöikä Resurssin käyttöiän hyödyllisten jaksojen määrä." ; Text [ danish ] = "Levetid. Antallet af perioder over hvilke aktivet afskrives." ; Text [ french ] = "La durée de vie utile du bien ou le nombre de périodes pendant lesquelles le bien est amorti." ; Text [ swedish ] = "Livslängd. Antalet perioder då tillgången avskrivs." ; @@ -9043,7 +9334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el número de períodos durante los cuales se deprecia el bien (también conocido como vida útil del bien)." ; Text [ english_us ] = "Useful life. The number of periods in the useful life of the asset." ; Text[ chinese_simplified ] = "使用期é™ã€‚资产折旧期é™ã€‚"; - Text[ russian ] = "×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî (èíîãäà íàçûâàåìîå âðåìåíåì ïîëíîé àìîðòèçàöèè)."; + Text[ russian ] = "Ñðîê èñïîëüçîâàíèÿ. ×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî."; Text[ polish ] = "Liczba okresów, o których œrodek trwa³y ulega amortyzacji."; Text[ japanese ] = "è€ç”¨å¹´æ•°ã€‚資産を使用ã§ãã‚‹å¹´æ•°ã€ã¤ã¾ã‚Šå„Ÿå´ã®å¯¾è±¡ã¨ãªã‚‹è³‡ç”£ã®å¯¿å‘½å¹´æ•°ã€‚"; Text[ chinese_traditional ] = "使用年é™ã€‚資產折舊年é™ã€‚"; @@ -9055,6 +9346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür. Varlýk için amortisman ayrýlan dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida útil. Nombre de períodes de la vida útil del bé."; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ จำนวนงวดในà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 8 // Name of Parameter 4 { @@ -9084,6 +9376,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem"; Text[ language_user1 ] = " "; Text[ catalan ] = "Període"; + Text[ thai ] = "งวด"; }; String 9 // Description of Parameter 4 { @@ -9113,6 +9406,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem. Ömür ile ayný zaman birimine sahip amortisman dönemi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Períodes: període per al qual es calcula la depreciació. La unitat de temps utilitzada per al període ha de ser la mateixa que la utilitzada per a la vida útil."; + Text[ thai ] = "งวด: งวดสำหรับคำนวณค่าเสื่à¸à¸¡à¸£à¸²à¸„า หน่วยเวลาที่ใช้สำหรับงวดต้à¸à¸‡à¹€à¸«à¸¡à¸·à¸à¸™à¸à¸±à¸šà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์"; }; String 10 // Name of Parameter 5 { @@ -9130,7 +9424,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Mes" ; Text [ english_us ] = "month" ; Text[ chinese_simplified ] = "month"; - Text[ russian ] = "Ìåñÿö"; + Text[ russian ] = "ìåñÿö"; Text[ polish ] = "Miesi¹c"; Text[ japanese ] = "月"; Text[ chinese_traditional ] = "month"; @@ -9141,7 +9435,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "ì›”"; Text[ turkish ] = "Ay"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mes"; + Text[ catalan ] = "mes"; + Text[ thai ] = "เดืà¸à¸™"; }; String 11 // Description of Parameter 5 { @@ -9167,10 +9462,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Maanden. Het aantal maanden in het eerste jaar van de afschrijving."; Text[ chinese_simplified ] = "月份数。进行折旧计算的首年月份数。"; Text[ greek ] = "ÌÞíåò. Ôï ðëÞèïò ôùí ìçíþí óôïí ðñþôï ÷ñüíï ôçò áðüóâåóçò."; - Text[ korean ] = "ì›”: ê°ê°€ìƒê°ì˜ 첫번째 ë…„ë„ì˜ ê°œì›”ìˆ˜"; + Text[ korean ] = "ì›”: ê°ê°€ ìƒê° 시작 ì—°ë„ì˜ ê°œì›”ìˆ˜"; Text[ turkish ] = "Ay. Ýlk amortisman yýlýndaki ay sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mesos: nombre de mesos en el primer any de depreciació."; + Text[ thai ] = "เดืà¸à¸™: จำนวนเดืà¸à¸™à¹ƒà¸™à¸›à¸µà¹à¸£à¸à¸‚à¸à¸‡à¸„่าเสื่à¸à¸¡à¸£à¸²à¸„า"; }; }; // -=*# Resource for function VDB #*=- @@ -9185,26 +9481,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce l'ammortamento decrescente per un determinato periodo (variable declining balance)." ; Text [ portuguese_brazilian ] = "Variable declining balance. Berechnet die arithmetisch-degressive Abschreibung f? eine bestimmte Periode" ; Text [ portuguese ] = "Devolve a amortização aritmética degressiva para um período determinado, usando o método do balanço decrescente duplo." ; - Text [ finnish ] = "Muuttujan laskeva saldo. Palauttaa laskevan arvon tietyn kauden poiston." ; + Text [ finnish ] = "Muuttujan laskeva saldo Palauttaa laskevan arvon tietyn kauden poiston." ; Text [ danish ] = "Variabel saldoafskrivning. Beregner afskrivningen på et aktiv i en angivet periode ved brug af dobbeltsaldometoden." ; Text [ french ] = "'Variable declining balance' - Calcule l'amortissement arithmétique dégressif pour une période spécifiée." ; Text [ swedish ] = "Beräknar den aritmetisk-degressiva avskrivningen för en bestämd period." ; - Text [ dutch ] = "Variable declining balance, Berekent de afschrijving van activa over een bepaalde periode met behulp van de \"variable declining balance\"-methode.." ; + Text [ dutch ] = "Variable declining balance. Berekent de afschrijving van activa over een bepaalde periode met behulp van de \"variable declining balance\"-methode.." ; Text [ spanish ] = "Devuelve la amortización de un bien, usando el método de amortización por doble disminución del saldo, durante un período especificado" ; Text [ english_us ] = "Variable declining balance. Returns the declining balance depreciation for a particular period." ; Text[ chinese_simplified ] = "å¯å˜ä½™é¢é€’å‡æ³•ã€‚计算指定期间内的算术递å‡åž‹èµ„产折旧é¢ã€‚"; - Text[ russian ] = "Âîçâðàùàåò âåëè÷èíó àìîðòèçàöèè èìóùåñòâà äëÿ ÿâíî óêàçàííîãî èëè ñîîòâåòñòâóþùåãî ïåðèîäà ïðè èñïîëüçîâàíèè ìåòîäà ðàçîâîãî ó÷åòà àìîðòèçàöèè."; + Text[ russian ] = "Âû÷èñëÿåò âåëè÷èíó àìîðòèçàöèè èìóùåñòâà äëÿ ñîîòâåòñòâóþùåãî ïåðèîäà ïðè èñïîëüçîâàíèè ìåòîäà ðàçîâîãî ó÷åòà àìîðòèçàöèè."; Text[ polish ] = "Oblicza amortyzacjê œrodka trwa³ego za podany okres lub jego czêœæ metod¹ malej¹cego salda."; Text[ japanese ] = "VDB ã¯ã€Variable Declining Balance を表ã—ã¾ã™ã€‚å€çŽ‡é€“減法ã¾ãŸã¯æŒ‡å®šã•ã‚ŒãŸæ–¹æ³•ã‚’使用ã—ã¦ã€æŒ‡å®šã•ã‚ŒãŸæœŸé–“ã«ãŠã‘る資産ã®æ¸›ä¾¡å„Ÿå´è²»ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å¯è®Šä½™é¡éžæ¸›æ³•ã€‚計算指定期間內的資產折舊é¡ã€‚"; Text[ arabic ] = "ÊÍÓÈ ÇÓÊåáÇß ÇáãæÌæÏÇÊ Ýí ÝÊÑÉ ãÍÏÏÉ¡ ÈÇÓÊÎÏÇã ØÑíÞÉ ÇáÇÓÊåáÇß ÇáãÊäÇÞÕ ÇáãÒÏæÌ."; - Text[ dutch ] = "Variable declining balance, Berekent de afschrijving van activa over een bepaalde periode met behulp van de \"variable declining balance\"-methode.."; + Text[ dutch ] = "Variable declining balance. Berekent de afschrijving van activa over een bepaalde periode met behulp van de \"variable declining balance\"-methode.."; Text[ chinese_simplified ] = "å¯å˜ä½™é¢é€’å‡æ³•ã€‚计算指定期间内的算术递å‡åž‹èµ„产折旧é¢ã€‚"; Text[ greek ] = "\"Variable declining balance\". Õðïëïãßæåé ôçí áñéèìçôéêÞ-öèßíïõóá áðüóâåóç ìéáò óõãêåêñéìÝíçò ðåñéüäïõ."; - Text[ korean ] = "ìˆ˜ì§€í•˜ë½ ë³€ìˆ˜. íŠ¹ì •í•œ ê¸°ê°„ì— ëŒ€í•œ ì‚°ìˆ ì ï¼ì²´ê° ê°ê°€ ìƒê°ì•¡ì„ 계산합니다."; + Text[ korean ] = "ìˆ˜ì§€í•˜ë½ ë³€ìˆ˜. íŠ¹ì •í•œ ê¸°ê°„ì— ëŒ€í•œ ì‚°ìˆ ì ì²´ê° ê°ê°€ ìƒê°ì•¡ì„ 계산합니다."; Text[ turkish ] = "Deðiþken azalan bakiye. Belirli bir dönem için aritmetik-azalan amortismaný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Balanç de disminució variable. Torna la depreciació de balanç de disminució per a un període determinat."; + Text[ thai ] = "ความสมดุลขà¸à¸‡à¸à¸²à¸£à¸¥à¸”ลงขà¸à¸‡à¸•à¸±à¸§à¹à¸›à¸£ ส่งà¸à¸¥à¸±à¸šà¸„่าเสื่à¸à¸¡à¸£à¸²à¸„าที่สมดุลที่ลดลงสำหรับงวดเฉพาะ"; }; ExtraData = { @@ -9228,7 +9525,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "costo" ; Text [ english_us ] = "Cost" ; Text[ chinese_simplified ] = "cost"; - Text[ russian ] = "Ëèêâ_ñòîèìîñòü"; + Text[ russian ] = "Ñòîèìîñòü"; Text[ polish ] = "Cena_zakupu"; Text[ japanese ] = "å–得価é¡"; Text[ chinese_traditional ] = "cost"; @@ -9236,10 +9533,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "AW"; Text[ chinese_simplified ] = "cost"; Text[ greek ] = "cost"; - Text[ korean ] = "비용"; + Text[ korean ] = "íšë“ 비용"; Text[ turkish ] = "Satýnalma maliyeti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cost"; + Text[ thai ] = "ต้นทุน"; }; String 3 // Description of Parameter 1 { @@ -9249,7 +9547,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Costo di acquisto del bene economico." ; Text [ portuguese_brazilian ] = "Anschaffungswert. Die Anschaffungskosten des Wirtschaftgutes." ; Text [ portuguese ] = "é o custo inicial do activo." ; - Text [ finnish ] = "Kustannus. Resurssin alkukustannukset." ; + Text [ finnish ] = "Kustannus Resurssin alkukustannukset" ; Text [ danish ] = "Købspris. Aktivets anskaffelsespris." ; Text [ french ] = "La valeur d'acquisition du bien." ; Text [ swedish ] = "Anskaffningsvärde. Anskaffningskostnaderna för tillgången." ; @@ -9269,6 +9567,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýnalma maliyeti. Ýktisadi varlýðýn satýnalma maliyeti."; Text[ language_user1 ] = " "; Text[ catalan ] = "Cost. Cost inicial del bé."; + Text[ thai ] = "ต้นทุน ต้นทุนà¹à¸£à¸à¹€à¸£à¸´à¹ˆà¸¡à¸‚à¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 4 // Name of Parameter 2 { @@ -9286,7 +9585,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "valor_residual" ; Text [ english_us ] = "Salvage" ; Text[ chinese_simplified ] = "salvage"; - Text[ russian ] = "Îñò_ñòîèì"; + Text[ russian ] = "Ëèêâ_ñòîèì"; Text[ polish ] = "Wartoœæ_odzysku"; Text[ japanese ] = "残å˜ä¾¡é¡"; Text[ chinese_traditional ] = "salvage"; @@ -9298,6 +9597,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament"; + Text[ thai ] = "เงินชดเชย"; }; String 5 // Description of Parameter 2 { @@ -9307,7 +9607,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore residuo del bene al termine della vita utile." ; Text [ portuguese_brazilian ] = "Restwert. Der verbleibende Wert am Ende der Nutzungsdauer." ; Text [ portuguese ] = "é o valor do activo no fim da amortização." ; - Text [ finnish ] = "Loppuarvo. Resurssin lopullinen arvo, kun resurssi on kulutettu loppuun." ; + Text [ finnish ] = "Loppuarvo Resurssin lopullinen arvo, kun resurssi on kulutettu loppuun." ; Text [ danish ] = "Restværdi. Aktivets værdi ved afskrivningens afslutning." ; Text [ french ] = "La valeur résiduelle du bien au terme de l'amortissement." ; Text [ swedish ] = "Restvärde. Det resterande värdet i slutet av livslängden." ; @@ -9315,7 +9615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor residual. Es el valor al final de la amortización." ; Text [ english_us ] = "Salvage. The salvage value of an asset at the end of its useful life." ; Text[ chinese_simplified ] = "剩余价值。资产在折旧(使用)期é™ç»ˆæ¢æ—¶çš„剩余价值。"; - Text[ russian ] = "Îñòàòî÷íàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; + Text[ russian ] = "Ëèêâèäàöèîííàÿ ñòîèìîñòü â êîíöå ïåðèîäà àìîðòèçàöèè."; Text[ polish ] = "Odzysk: Wartoœæ koñcowa po amortyzacji."; Text[ japanese ] = "残å˜ä¾¡é¡ï½¡ è€ç”¨å¹´æ•°ãŒçµ‚了ã—ãŸæ™‚点ã§ã®è³‡ç”£ã®ä¾¡æ ¼ã€‚"; Text[ chinese_traditional ] = "剩餘值。使用年é™çµ‚æ¢æ™‚的資產剩餘值。"; @@ -9327,6 +9627,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kalan deðer. Varlýðýn ömrü tamamlandýðýnda kalan deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Salvament. Valor de salvament d'un bé al final de la seva vida útil."; + Text[ thai ] = "เงินชดเชย ค่าเงินชดเชยขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์ที่จุดสิ้นสุดขà¸à¸‡à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์"; }; String 6 // Name of Parameter 3 { @@ -9344,7 +9645,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "vida" ; Text [ english_us ] = "Life" ; Text[ chinese_simplified ] = "life"; - Text[ russian ] = "Âðåìÿ_ïîëí_àìîðò"; + Text[ russian ] = "Âðåìÿ_ýêñïëóàòàöèè"; Text[ polish ] = "okres_u¿ytkowania"; Text[ japanese ] = "è€ç”¨å¹´æ•°"; Text[ chinese_traditional ] = "life"; @@ -9355,7 +9656,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "내구년한"; Text[ turkish ] = "Ömür"; Text[ language_user1 ] = " "; - Text[ catalan ] = "vida"; + Text[ catalan ] = "Vida"; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -9366,7 +9668,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Vita utile di un bene o il numero di periodi in cui il bene viene ammortizzato." ; Text [ portuguese_brazilian ] = "Nutzungsdauer. Die Anzahl der Perioden, ?er die das Wirtschaftsgut abgeschrieben wird." ; Text [ portuguese ] = "é o número de períodos de amortização do activo." ; - Text [ finnish ] = "Hyödyllinen käyttöikä. Resurssin käyttöiän hyödyllisten jaksojen määrä." ; + Text [ finnish ] = "Hyödyllinen käyttöikä Resurssin käyttöiän hyödyllisten jaksojen määrä." ; Text [ danish ] = "Levetid. Antallet af perioder over hvilke aktivet afskrives." ; Text [ french ] = "La durée de vie utile du bien ou le nombre de périodes pendant lesquelles le bien est amorti." ; Text [ swedish ] = "Livslängd. Antalet perioder då tillgången avskrivs." ; @@ -9374,7 +9676,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el número de períodos durante los que ocurre la amortización del bien (también conocido como vida útil del bien)." ; Text [ english_us ] = "Useful life. The number of periods in the useful life of the asset." ; Text[ chinese_simplified ] = "使用期é™ã€‚资产折旧期é™ã€‚"; - Text[ russian ] = "×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî (èíîãäà íàçûâàåìîå âðåìåíåì ïîëíîé àìîðòèçàöèè)"; + Text[ russian ] = "Ñðîê èñïîëüçîâàíèÿ. ×èñëî ïåðèîäîâ, çà êîòîðîå àìîðòèçèðóåòñÿ èìóùåñòâî."; Text[ polish ] = "Liczba okresów, po których œrodek trwa³y ulega amortyzacji."; Text[ japanese ] = "è€ç”¨å¹´æ•°ï½¡ 資産を使用ã§ãã‚‹å¹´æ•°ã€ã¤ã¾ã‚Šå„Ÿå´ã®å¯¾è±¡ã¨ãªã‚‹è³‡ç”£ã®å¯¿å‘½å¹´æ•°ã€‚"; Text[ chinese_traditional ] = "使用年é™ã€‚資產折舊年é™ã€‚"; @@ -9386,6 +9688,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ömür. Varlýk için amortisman ayrýlan dönem sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Vida útil. Nombre de períodes de la vida útil del bé."; + Text[ thai ] = "à¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ จำนวนงวดในà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์ขà¸à¸‡à¸ªà¸´à¸™à¸—รัพย์"; }; String 8 // Name of Parameter 4 { @@ -9415,6 +9718,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ language_user1 ] = " "; Text[ turkish ] = "B"; Text[ catalan ] = "S"; + Text[ thai ] = "S"; }; String 9 // Description of Parameter 4 { @@ -9424,7 +9728,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Primo periodo dell'ammortamento espresso nelle stesse unità di tempo di Vita utile." ; Text [ portuguese_brazilian ] = "Anfang. Die erste Periode der Abschreibung in derselben Zeiteinheit wie die Nutzungsdauer." ; Text [ portuguese ] = "é o período inicial para o cálculo da amortização" ; - Text [ finnish ] = "Aloitus. Ensimmäinen poistokausi, jonka on oltava määritettynä samoina aikayksikköinä kuin mitä käyttöiän määrityksessä on käytetty." ; + Text [ finnish ] = "Aloitus Ensimmäinen poistokausi, jonka on oltava määritettynä samoina aikayksikköinä kuin mitä käyttöiän määrityksessä on käytetty." ; Text [ danish ] = "Start. Den første afskrivningsperiode i samme tidsenhed som levetiden." ; Text [ french ] = "La première période de l'amortissement dans la même unité que la durée." ; Text [ swedish ] = "Start. Den första perioden för avskrivningen i samma tidsenhet som livslängden." ; @@ -9444,6 +9748,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýlk dönem. Ömür ile ayný zaman birimine sahip ilk amortisman dönemi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Inici. Primer període per a la depreciació, que ha d'expressar-se en la mateixa unitat de temps que la vida útil."; + Text[ thai ] = "เริ่มต้น งวดà¹à¸£à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸„่าเสื่à¸à¸¡à¸£à¸²à¸„าในหน่วยเวลาที่เหมืà¸à¸™à¸à¸±à¸šà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์"; }; String 10 // Name of Parameter 5 { @@ -9473,6 +9778,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "S"; Text[ language_user1 ] = " "; Text[ catalan ] = "final"; + Text[ thai ] = "สิ้นสุด"; }; String 11 // Description of Parameter 5 { @@ -9482,7 +9788,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Ultimo periodo dell'ammortamento espresso nelle stesse unità di misura di Vita utile." ; Text [ portuguese_brazilian ] = "Ende. Die letzte Periode der Abschreibung in derselben Zeiteinheit wie die Nutzungsdauer." ; Text [ portuguese ] = "é o período final para o qual se deseja calcular a amortização." ; - Text [ finnish ] = "Loppu! Viimeinen poistokausi, jonka aikamääritys on sama kuin käyttöiän." ; + Text [ finnish ] = "Loppu Viimeinen poistokausi, jonka aikamääritys on sama kuin käyttöiän." ; Text [ danish ] = "Slut. Den sidste afskrivningsperiode i samme tidsenhed som levetiden." ; Text [ french ] = "Représente la dernière période de l'amortissement. L'unité de temps est identique à la période d'utilisation." ; Text [ swedish ] = "Slut. Den sista perioden för avskrivningen i samma tidsenhet som livslängden." ; @@ -9502,6 +9808,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Son dönem. Ömür ile ayný zaman birimine sahip son amortisman dönemi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Final. últim període per a la depreciació, utilitzant la mateixa unitat de temps que per a la vida útil."; + Text[ thai ] = "สิ้นสุด งวดสุดท้ายขà¸à¸‡à¸„่าเสื่à¸à¸¡à¸£à¸²à¸„าใช้หน่วยเวลาเดียวà¸à¸±à¸šà¸à¸²à¸¢à¸¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ใช้ประโยชน์"; }; String 12 // Name of Parameter 6 { @@ -9530,7 +9837,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "ＦＡ"; Text[ turkish ] = "Faktör"; Text[ language_user1 ] = " "; - Text[ catalan ] = "factor"; + Text[ catalan ] = "Factor"; + Text[ thai ] = "ปัจจัย"; }; String 13 // Description of Parameter 6 { @@ -9541,7 +9849,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di diminuzione delle quote proporzionali ai valori residui." ; Text [ portuguese_brazilian ] = "Faktor. Faktor f? die Abnahme der Abschreibung. F = 2 hei?t Doppelraten-Abschreibung." ; Text [ portuguese ] = "é a taxa de amortização degressiva." ; - Text [ finnish ] = "Kerroin: Poiston vähennyskerroin. F = 2 tarkoittaa kaksinkertaista poistonopeutta." ; + Text [ finnish ] = "Kerroin Poiston vähennyskerroin F = 2 tarkoittaa kaksinkertaista poistonopeutta." ; Text [ danish ] = "Faktor. Den sats som saldoen aftager med. F= 2 betyder doppeltsaldometoden." ; Text [ french ] = "Le taux de l'amortissement dégressif. F = 2 signifie amortissement dégressif à taux double." ; Text [ swedish ] = "Faktor. Faktor för minskningen av avskrivningen. F = 2 betyder dubbel avskrivning." ; @@ -9549,7 +9857,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es la tasa a la que diminuye el saldo." ; Text [ english_us ] = "Factor. The factor for the reduction of the depreciation. F = 2 denotes double rate depreciation." ; Text[ chinese_simplified ] = "ä½™é¢é€’å‡æŠ˜æ—§å› å，factor=2 表示采用åŒå€ä½™é¢é€’å‡æŠ˜æ—§æ³•ã€‚"; - Text[ russian ] = "Íîðìà ñíèæåíèÿ áàëàíñîâîé ñòîèìîñòè. Êîýôôèöèåíò ðàâåí äâóì îçíà÷àåò äâóêðàòíîå ñíèæåíèå áàëàíñîâîé ñòîèìîñòè."; + Text[ russian ] = "Êîýôôèöèåíò. Íîðìà ñíèæåíèÿ áàëàíñîâîé ñòîèìîñòè. Êîýôôèöèåíò ðàâåí äâóì, êîãäà ñóùåñòâóåò äâóêðàòíîå ñíèæåíèå áàëàíñîâîé ñòîèìîñòè."; Text[ polish ] = "Wartoœæ steruj¹ca szybkoœci¹, z jak¹ ma maleæ saldo. Wartoœæ 2 oznacza metodê podwójnego spadku."; Text[ japanese ] = "率。減価償å´çŽ‡ã€‚率 = 2 ã¯å€çŽ‡é€“減法を表ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "ä½™é¡éžæ¸›æŠ˜èˆŠå› åï¹F=2 是雙å€ä½™é¡éžæ¸›æŠ˜èˆŠæ³•ã€‚"; @@ -9561,6 +9869,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Faktör. Amortisman azalma faktörü. F = 2, çift azalan bakiyeli amortisman anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Factor. Factor per a la reducció de la depreciació. F = 2 indica la depreciació de doble taxa."; + Text[ thai ] = "ปัจจัย ปัจจัยสำหรับà¸à¸²à¸£à¸¥à¸”ลงขà¸à¸‡à¸„่าเสื่à¸à¸¡à¸£à¸²à¸„า F = 2 à¹à¸—นค่าเสื่à¸à¸¡à¸£à¸²à¸„าà¸à¸±à¸•à¸£à¸²à¸ªà¸à¸‡à¹€à¸—่า่"; }; String 14 // Name of Parameter 7 { @@ -9578,7 +9887,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "sin_cambios" ; Text [ english_us ] = "Type" ; Text[ chinese_simplified ] = "no_switch"; - Text[ russian ] = "Áåç_ïåðåêëþ÷åíèé"; + Text[ russian ] = "Òèï"; Text[ polish ] = "bez_prze³¹czenia"; Text[ japanese ] = "切り替ãˆãªã—"; Text[ chinese_traditional ] = "no_switch"; @@ -9590,6 +9899,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 15 // Description of Parameter 7 { @@ -9608,7 +9918,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es un valor lógico, 1 indica que se deberá cambiar al método directo de amortización, 0 significa sin cambios." ; Text [ english_us ] = "Do not alter. Type = 1 denotes switch to linear depreciation, type = 0 do not switch." ; Text[ chinese_simplified ] = "no_switch=1 表示转æ¢è‡³ç›´çº¿å¼æŠ˜æ—§æ³•ï¼Œ no_switch= 0 表示ä¸è½¬æ¢ã€‚"; - Text[ russian ] = "Òèï = 1 îçíà÷àåò ïåðåêëþ÷åíèå íà ïðÿìóþ àìîðòèçàöèþ. Òèï = 0 îçíà÷àåò áåç ïåðåêëþ÷åíèÿ."; + Text[ russian ] = "Íå èçìåíÿòü. Òèï = 1 îçíà÷àåò ïåðåêëþ÷åíèå íà ïðÿìóþ àìîðòèçàöèþ. Òèï = 0 îçíà÷àåò áåç ïåðåêëþ÷åíèÿ."; Text[ polish ] = "Nie zmieniaj. Typ 1 oznacza prze³¹czenie na odpis na amortyzacjê liniow¹, typ 0 oznacza brak prze³¹czania."; Text[ japanese ] = "切り替ãˆãªã—。切り替ãˆãªã— = 1 ã¯å®šé¡æ³•ã¸ã®åˆ‡ã‚Šæ›¿ãˆãŒè¡Œã‚ã‚Œã€åˆ‡ã‚Šæ›¿ãˆãªã— = 0 ã¯åˆ‡ã‚Šæ›¿ãˆãŒè¡Œã‚ã‚Œã¾ã›ã‚“。"; Text[ chinese_traditional ] = "是個é‚輯值。數值 = 1 表示切æ›è‡³ç›´ç·šå¼æŠ˜èˆŠæ³•ï¹ 數值 = 0 表示ä¸ç”¨åˆ‡æ›ã€‚"; @@ -9616,10 +9926,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Niet wisselen. Wissel = 1 betekent omschakelen op lineaire afschrijving, Wissel = 0 betekent niet omschakelen."; Text[ chinese_simplified ] = "no_switch=1 表示转æ¢è‡³ç›´çº¿å¼æŠ˜æ—§æ³•ï¼Œ no_switch= 0 表示ä¸è½¬æ¢ã€‚"; Text[ greek ] = "Íá ìçí ãßíåé áëëáãÞ. Ôýðïò = 1 óçìáßíåé áëëáãÞ óå ãñáììéêÞ áðüóâåóç, Ôýðïò = 0 óçìáßíåé ÷ùñßò áëëáãÞ."; - Text[ korean ] = "변경하지 ë§ê²ƒ. 형ì‹=1ì€ 1ì°¨ ê°ê°€ìƒê°ìœ¼ë¡œ ì „í™˜í•˜ëŠ” ê²ƒì„ ë‚˜íƒ€ë‚´ë©° 형ì‹=0ì€ ì „í™˜í•˜ì§€ ì•ŠìŒì„ 나타냅니다."; + Text[ korean ] = "바꾸지 ë§ê²ƒ. 형ì‹=1ì€ 1ì°¨ ê°ê°€ìƒê°ìœ¼ë¡œ ì „í™˜í•˜ëŠ” ê²ƒì„ ë‚˜íƒ€ë‚´ë©° 형ì‹=0ì€ ì „í™˜í•˜ì§€ ì•ŠìŒì„ 나타냅니다."; Text[ turkish ] = "Deðiþtirmeyin. Tür = 1, doðrusal amortismana geçiþ, tür = 0 ise geçiþ yok anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "No ho canviïs. Tipus = 1 indica commutació a depreciació lineal; tipus = 0, sense aquesta commutació."; + Text[ thai ] = "ห้ามเปลี่ยน ชนิด = 1 à¹à¸—นสลับไปยังค่าเสื่à¸à¸¡à¸£à¸²à¸„าà¹à¸šà¸šà¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡, ชนิด = 0 ห้ามสลับ"; }; }; // -=*# Resource for function EFFEKTIV #*=- @@ -9654,6 +9965,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Nominal faiz oraný için yýllýk efektif faiz oranýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la taxa d'interès neta anual per a una taxa d'interès nominal."; + Text[ thai ] = "คำนวณà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸ªà¸¸à¸—ธิประจำปีสำหรับà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸™à¹‰à¸à¸¢à¸™à¸´à¸”"; }; ExtraData = { @@ -9689,6 +10001,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "NOM"; Text[ language_user1 ] = " "; Text[ catalan ] = "NOM"; + Text[ thai ] = "NOM"; }; String 3 // Description of Parameter 1 { @@ -9718,6 +10031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Nominal faiz oraný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Interès nominal"; + Text[ thai ] = "ดà¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸™à¹‰à¸à¸¢à¸™à¸´à¸”"; }; String 4 // Name of Parameter 2 { @@ -9735,7 +10049,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Periodo" ; Text [ english_us ] = "P" ; Text[ chinese_simplified ] = "p"; - Text[ russian ] = "Ïåðèîä"; + Text[ russian ] = "Ï"; Text[ polish ] = "Okres"; Text[ japanese ] = "期間"; Text[ chinese_traditional ] = "P"; @@ -9747,6 +10061,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dönem"; Text[ language_user1 ] = " "; Text[ catalan ] = "P"; + Text[ thai ] = "งวด"; }; String 5 // Description of Parameter 2 { @@ -9756,7 +10071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero dei periodi dei pagamenti d'interessi in un'annualità." ; Text [ portuguese_brazilian ] = "Perioden. Die Anzahl der Zinszahlungen pro Jahr." ; Text [ portuguese ] = "é o número de pagamentos de juros por ano." ; - Text [ finnish ] = "Kaudet! Korkomaksujen määrä vuodessa." ; + Text [ finnish ] = "Kaudet Korkomaksujen määrä vuodessa." ; Text [ danish ] = "Perioder. Antallet af renteydelsesperioder per år." ; Text [ french ] = "Périodes. Le nombre de paiements d'intérêts par an." ; Text [ swedish ] = "Perioder. Antalet räntebetalningar per år." ; @@ -9764,7 +10079,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el número de pagos de interés compuesto por año." ; Text [ english_us ] = "Periods. The number of interest payments per year." ; Text[ chinese_simplified ] = "æ¯å¹´æ”¯ä»˜åˆ©æ¯çš„次数。"; - Text[ russian ] = "×èñëî óïëàò ïðîöåíòîâ â ãîä."; + Text[ russian ] = "Ïåðèîäû. Êîëè÷åñòâî âûïëàò äîõîäîâ ïî ïðîöåíòàì â ãîä."; Text[ polish ] = "Okresy. Liczba p³atnoœci odsetek w roku."; Text[ japanese ] = "期間。1年当ãŸã‚Šã®è¤‡åˆ©è¨ˆç®—回数。"; Text[ chinese_traditional ] = "æ¯å¹´æ”¯ä»˜åˆ©æ¯çš„次數。"; @@ -9772,10 +10087,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Termijnen. Het aantal rentebetalingen per jaar."; Text[ chinese_simplified ] = "æ¯å¹´æ”¯ä»˜åˆ©æ¯çš„次数。"; Text[ greek ] = "Ðåñßïäïé. Ôï ðëÞèïò ôùí ðëçñùìþí ôüêùí áíÜ Ýôïò."; - Text[ korean ] = "기간. ë…„ê°„ ì´ìž 지불 횟수"; + Text[ korean ] = "기간. ì—°ê°„ ì´ìž 지불 횟수"; Text[ turkish ] = "Dönem. Yýllýk faiz ödemeleri sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Períodes. Nombre de pagament d'interès per any."; + Text[ thai ] = "งวด จำนวนà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸›à¸µ"; }; }; // -=*# Resource for function NOMINAL #*=- @@ -9806,10 +10122,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Berekent de nominale jaarlijkse rente op basis van het effectieve rentepercentage."; Text[ chinese_simplified ] = "计算以实际利率为基础的年å义利率。"; Text[ greek ] = "Õðïëïãßæåé ôï åôÞóéï ïíïìáóôéêü åðéôüêéï ìéáò ôñÝ÷ïõóáò áðüäïóçò."; - Text[ korean ] = "실 ì´ìžìœ¨ì—　대한 ì—°ê°„ 명목 ì´ìžìœ¨ 산출"; + Text[ korean ] = "실 ì´ìžìœ¨ì— 대한 ì—°ê°„ 명목 ì´ìžìœ¨ì„ 계산합니다."; Text[ turkish ] = "Efektif faiz oraný için yýllýk nominal faiz oranýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la taxa d'interès nominal anual com a taxa d'interès efectiu."; + Text[ thai ] = "คำนวณà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸™à¹‰à¸à¸¢à¸™à¸´à¸”ต่à¸à¸›à¸µà¹€à¸›à¹‡à¸™à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸—ี่มีผล"; }; ExtraData = { @@ -9845,6 +10162,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Net faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "effect_rate"; + Text[ thai ] = "มีผล_à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -9854,7 +10172,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di interesse effettivo" ; Text [ portuguese_brazilian ] = "Effektiver Zinssatz" ; Text [ portuguese ] = "é a taxa de juros efectiva." ; - Text [ finnish ] = "Todellinen korkoprosentti" ; + Text [ finnish ] = "Käytettävä korko" ; Text [ danish ] = "Den effektive rente" ; Text [ french ] = "Taux d'intérêt effectif" ; Text [ swedish ] = "Effektiv räntesats." ; @@ -9874,6 +10192,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Efektif faiz oraný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa d'interès efectiu"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸—ี่มีผล"; }; String 4 // Name of Parameter 2 { @@ -9903,6 +10222,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "D"; Text[ language_user1 ] = " "; Text[ catalan ] = "npery"; + Text[ thai ] = "งวด"; }; String 5 // Description of Parameter 2 { @@ -9912,7 +10232,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero totale dei periodi di pagamento per anno" ; Text [ portuguese_brazilian ] = "Perioden. Die Anzahl der Zinszahlungen pro Jahr." ; Text [ portuguese ] = "é o número de pagamentos de juros por ano." ; - Text [ finnish ] = "Kaudet! Korkomaksujen määrä vuodessa." ; + Text [ finnish ] = "Kaudet Korkomaksujen määrä vuodessa" ; Text [ danish ] = "Perioder. Antallet af renteydelsesperioder per år." ; Text [ french ] = "Périodes. Le nombre de paiements d'intérêts par an." ; Text [ swedish ] = "Perioder. Antalet räntebetalningar per år." ; @@ -9920,7 +10240,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el número de pagos de interés por año." ; Text [ english_us ] = "Periods. The number of interest payment per year." ; Text[ chinese_simplified ] = "周期数。æ¯å¹´æ”¯ä»˜åˆ©æ¯çš„周期数。"; - Text[ russian ] = "×èñëî óïëàò ïðîöåíòîâ â ãîä."; + Text[ russian ] = "Ïåðèîäû. Êîëè÷åñòâî âûïëàò äîõîäîâ ïî ïðîöåíòàì â ãîä."; Text[ polish ] = "Okresy. Liczba p³atnoœci odsetek w roku."; Text[ japanese ] = "期間。1年当ãŸã‚Šã®åˆ©æ¯è¨ˆç®—回数。"; Text[ chinese_traditional ] = "週期數。æ¯å¹´æ”¯ä»˜åˆ©æ¯çš„週期數。"; @@ -9928,10 +10248,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Perioden. Het aantal rentebetalingen per jaar."; Text[ chinese_simplified ] = "周期数。æ¯å¹´æ”¯ä»˜åˆ©æ¯çš„周期数。"; Text[ greek ] = "Ðåñßïäïé. Ôï ðëÞèïò ôùí ðëçñùìþí ôüêùí áíÜ Ýôïò."; - Text[ korean ] = "기간. ë…„ê°„ ì´ìž 지불 횟수"; + Text[ korean ] = "기간. ì—°ê°„ ì´ìž 지불 횟수"; Text[ turkish ] = "Dönem. Yýllýk faiz ödemeleri sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Períodes. Nombre de pagament d'interès per any."; + Text[ thai ] = "งวด จำนวนà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸•à¹ˆà¸à¸›à¸µ"; }; }; // -=*# Resource for function NBW #*=- @@ -9945,7 +10266,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il valore attuale netto di un investimento basato su pagamenti periodici e su un tasso di sconto." ; Text [ portuguese_brazilian ] = "Nettobarwert. Berechnet den Kapitalwert einer Investition auf Basis eines Abzinsungsfaktors bei periodischen Zahlungen." ; Text [ portuguese ] = "Devolve o valor líquido actual de um investimento, baseado numa série de fluxos financeiros periódicos e numa taxa de desconto." ; - Text [ finnish ] = "Nykyinen nettoarvo. Laskee sijoituksen nykyisen nettoarvon säännöllisten maksujen ja alennusprosentin mukaan." ; + Text [ finnish ] = "Nykyinen nettoarvo Laskee sijoituksen nykyisen nettoarvon säännöllisten maksujen ja alennusprosentin mukaan." ; Text [ danish ] = "Nettonutidsværdi. Beregner den aktuelle nutidsværdi for en investering baseret på en diskontosats ved periodiske betalinger." ; Text [ french ] = "Calcule la valeur actuelle nette d'un investissement basée sur des flux financiers non constants." ; Text [ swedish ] = "Nettonuvärde. Beräknar kapitalvärdet av en investering baserat på en diskonteringsfaktor vid periodiska betalningar." ; @@ -9953,7 +10274,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el valor neto presente de una inversión a partir de flujos de caja que no tienen que ser constantes." ; Text [ english_us ] = "Net present value. Calculates the net present value of an investment based on a series of periodic payments and a discount rate." ; Text[ chinese_simplified ] = "净现金值。在贴现率固定且定期支付的情况下上，计算一项投资的净现金值。"; - Text[ russian ] = "Âû÷èñëÿåò ÷èñòûé òåêóùèé îáúåì âêëàäà íà îñíîâå ïåðèîäè÷åñêèõ ïîñòóïëåíèé è ó÷åòíîé ñòàâêè."; + Text[ russian ] = "Âû÷èñëÿåò ÷èñòóþ ïðèâåä¸ííóþ ñòîèìîñòü èíâåñòèöèé, îñíîâàííóþ íà ïåðèîäè÷åñêîì ïîñòóïëåíèè äåíåæíûõ ñðåäñòâ è ó÷¸òíîé ñòàâêè."; Text[ polish ] = "Oblicza wartoœæ bie¿¹c¹ netto inwestycji w oparciu o okresowe przep³ywy œrodków pieniê¿nych przy okreœlonej stopie dyskontowej."; Text[ japanese ] = "æ£å‘³ç¾åœ¨ä¾¡æ ¼ã€‚投資ã®æ£å‘³ç¾åœ¨ä¾¡å€¤ã‚’ã€æŠ•è³‡æœŸé–“ã®å‰²å¼•çŽ‡ã‚’ã‚‚ã¨ã«ç®—出ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "在貼ç¾çŽ‡å›ºå®šå’Œä¸€ç³»åˆ—定期的ç¾é‡‘æµçš„åŸºç¤Žä¸Šï¼Œè¨ˆç®—ä¸€é …æŠ•è³‡çš„æ·¨ç¾å€¼ã€‚"; @@ -9965,6 +10286,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü net deðer. Bir yatýrýmýn, periyodik ödemeler ve indirim oraný faktörü bazýnda bugünkü net deðerini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor net actual. Calcula el valor net actual d'una inversió basada en una sèrie de pagaments periòdics i una taxa de descompte."; + Text[ thai ] = "ค่าปัจจุบันสุทธิ คำนวณค่าปัจจุบันสุทธิขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุนบนพื้นà¸à¸²à¸™à¸¥à¸³à¸”ับà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¹à¸¥à¸°à¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¸¥à¸”เป็นงวด"; }; ExtraData = { @@ -9980,7 +10302,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso interesse" ; Text [ portuguese_brazilian ] = "ZINS" ; Text [ portuguese ] = "TAXA" ; - Text [ finnish ] = "RATE" ; + Text [ finnish ] = "KORKO" ; Text [ danish ] = "RENTE" ; Text [ french ] = "TAUX" ; Text [ swedish ] = "RÄNTA" ; @@ -9996,10 +10318,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "RENTE"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "RATE"; - Text[ korean ] = "비율"; + Text[ korean ] = "ì´ìžìœ¨"; Text[ turkish ] = "FAÝZ"; Text[ language_user1 ] = " "; Text[ catalan ] = "RATE"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -10010,7 +10333,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso di sconto per la durata di un periodo." ; Text [ portuguese_brazilian ] = "Der Abzinsungssatz f? eine Periode." ; Text [ portuguese ] = "é a taxa de desconto durante um período." ; - Text [ finnish ] = "Yhden kauden alennusprosentti." ; + Text [ finnish ] = "Yhden kauden alennusprosentti" ; Text [ danish ] = "Diskontosatsen for en periode." ; Text [ french ] = "Le taux d'actualisation pour une période." ; Text [ swedish ] = "Diskonteringssatsen för en period." ; @@ -10030,6 +10353,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir dönemlik indirim oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa de descompte per a un període."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¸¥à¸”สำหรับหนึ่งงวด"; }; String 4 // Name of Parameter 2 { @@ -10039,26 +10363,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore " ; Text [ portuguese_brazilian ] = "Wert " ; Text [ portuguese ] = "Valor " ; - Text [ finnish ] = "arvo" ; + Text [ finnish ] = "arvo " ; Text [ danish ] = "Værdi " ; Text [ french ] = "Valeur " ; Text [ swedish ] = "värde " ; - Text [ dutch ] = "Waarde " ; + Text [ dutch ] = "Waarde" ; Text [ spanish ] = "valor " ; Text [ english_us ] = "value " ; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "Waarde "; + Text[ dutch ] = "Waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; Text[ catalan ] = "valor "; + Text[ thai ] = "ค่า "; }; String 5 // Description of Parameter 2 { @@ -10089,6 +10414,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer 1;deðer 2;... Ödeme ve geliri temsil eden 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1, valor 2,... són entre 1 i 30 arguments que representen pagaments i ingressos."; + Text[ thai ] = "ค่า 1, ค่า 2,... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ู่ 1 ถึง 30 ใช้à¹à¸—นà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™à¹à¸¥à¸°à¸£à¸²à¸¢à¹„ด้"; }; }; // -=*# Resource for function IKV #*=- @@ -10103,7 +10429,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il tasso di rendimento interno di un investimento senza costi o utili." ; Text [ portuguese_brazilian ] = "Berechnet den internen Zinsfu? einer Investition ohne Kosten oder Gewinne." ; Text [ portuguese ] = "Calcula a taxa interna de retorno de um investimento sem considerar as despesas nem os lucros." ; - Text [ finnish ] = "Palauttaa sijoituksen (ilman kustannuksia tai voittoja) tilinpidollisen korkoprosentin." ; + Text [ finnish ] = "Palauttaa sijoituksen tilinpidollisen korkoprosentin ilman kustannuksia tai voittoja." ; Text [ danish ] = "Beregner det interne afkast for en investering uden udgifter eller indtægter." ; Text [ french ] = "Calcule le taux de rentabilité interne d'un investissement, sans tenir compte des coûts ou des plus-values." ; Text [ swedish ] = "Beräknar internräntan för en investering utan kostnader eller vinster." ; @@ -10111,7 +10437,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la tasa interna de retorno de una inversión, sin costos de financiación o las ganancias por reinversión." ; Text [ english_us ] = "Returns the actuarial rate of interest of an investment excluding costs or profits." ; Text[ chinese_simplified ] = "计算一个投资的内部收益率，ä¸è®¡æˆæœ¬å’Œç›ˆåˆ©ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò âíóòðåííþþ ñêîðîñòü îáîðîòà äëÿ ðÿäà ïîñëåäîâàòåëüíûõ îïåðàöèé ñ íàëè÷íûìè."; + Text[ russian ] = "Âû÷èñëÿåò âíóòðåííþþ ñêîðîñòü îáîðîòà äëÿ ðÿäà ïîñëåäîâàòåëüíûõ îïåðàöèé."; Text[ polish ] = "Oblicza wewnêtrzn¹ stopê zwrotu dla przep³ywów œrodków pieniê¿nych."; Text[ japanese ] = "一連ã®å®šæœŸçš„ãªã‚ャッシュフãƒãƒ¼ã«å¯¾ã™ã‚‹å†…部利益率を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個投資的內部收益率ï¹ä¸è¨ˆæˆæœ¬å’Œç›ˆåˆ©ã€‚"; @@ -10123,6 +10449,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir yatýrýmýn, masraf ve kar hariç, iç verim oraný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la taxa actuarial d'interès d'una inversió excloent-ne els costs i els beneficis."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸‚à¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุนเà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸ªà¸–ิติà¸à¸²à¸£à¸›à¸£à¸°à¸à¸±à¸™à¸ ัยที่ไม่รวมต้นทุนหรืà¸à¸à¸³à¹„ร"; }; ExtraData = { @@ -10158,6 +10485,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðerler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -10167,11 +10495,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Riferimento a una cella o a una matrice che contiene i valori degli importi di pagamento. " ; Text [ portuguese_brazilian ] = "Matrix oder Zellbezug auf Zellen, deren Inhalt den Zahlungen entsprechen. " ; Text [ portuguese ] = "é uma matriz ou uma referência a células, cujos conteúdos correspondem aos pagamentos. " ; - Text [ finnish ] = "Matriisi tai soluviite maksuja vastaaviin soluihin. " ; + Text [ finnish ] = "Taulukko tai soluviite maksuja vastaaviin soluihin. " ; Text [ danish ] = "Matrix eller reference til celler som indeholder de værdier, det interne afkast skal beregnes for. " ; Text [ french ] = "Une matrice ou une référence à des cellules dont le contenu correspond aux paiements. " ; Text [ swedish ] = "Matris eller cellreferens till celler vars innehåll motsvarar betalningarna. " ; - Text [ dutch ] = "Matrix of celverwijzing naar cellen waarvan de inhoud overeenkomt met de betalingen. " ; + Text [ dutch ] = "Matrix of celverwijzing naar cellen waarvan de inhoud overeenkomt met de betalingen." ; Text [ spanish ] = "Es una matriz o referencia a celdas cuyo contenido correponde a los pagos. " ; Text [ english_us ] = "An array or reference to cells whose contents correspond to the payments. " ; Text[ chinese_simplified ] = "å«æœ‰æ”¯ä»˜é‡‘é¢çš„å•å…ƒæ ¼ç»„或å•å…ƒæ ¼å¼•ç”¨ã€‚ "; @@ -10180,13 +10508,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "数値ãŒå…¥åŠ›ã•ã‚ŒãŸé…列ã€ã¾ãŸã¯ã‚»ãƒ«ç¯„囲を指定ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "其內容與支付å°æ‡‰çš„儲å˜æ ¼çµ„或儲å˜æ ¼åƒç…§ã€‚ "; Text[ arabic ] = "ÕÝíÝ Ãæ ãÑÌÚ Åáì ÎáÇíÇ ÊÊØÇÈÞ ãÍÊæíÇÊåÇ ãÚ ÇáÏÝÚÇÊ. "; - Text[ dutch ] = "Matrix of celverwijzing naar cellen waarvan de inhoud overeenkomt met de betalingen. "; + Text[ dutch ] = "Matrix of celverwijzing naar cellen waarvan de inhoud overeenkomt met de betalingen."; Text[ chinese_simplified ] = "å«æœ‰æ”¯ä»˜é‡‘é¢çš„å•å…ƒæ ¼ç»„或å•å…ƒæ ¼å¼•ç”¨ã€‚ "; Text[ greek ] = "ÌÞôñá Þ áíáöïñÜ êåëéïý óå êåëéÜ, ôùí ïðïßùí ôá ðåñéå÷üìåíá áíôéóôïé÷ïýí óôéò ðëçñùìÝò. "; Text[ korean ] = "ì§€ë¶ˆì— ìƒì‘하는 ë‚´ìš©ì„ ê°€ì§„ ì…€ì— ëŒ€í•œ 참조 ë˜ëŠ” í–‰ë ¬ìž…ë‹ˆë‹¤."; Text[ turkish ] = "Ýçerikleri, ödemelere uyan hücrelere referans ya da matris. "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Matriu o referència a cel·les el contingut de les quals correspon als pagaments. "; + Text[ catalan ] = "Matriu o referència a cel.les el contingut de les quals correspon als pagaments. "; + Text[ thai ] = "à¹à¸–วลำดับหรืà¸à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์ขà¸à¸‡à¹€à¸™à¸·à¹‰à¸à¸«à¸²à¸ªà¸à¸”คล้à¸à¸‡à¸à¸±à¸šà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™ "; }; String 4 // Name of Parameter 2 { @@ -10216,6 +10545,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tahmini deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estima"; + Text[ thai ] = "คะเน"; }; String 5 // Description of Parameter 2 { @@ -10226,26 +10556,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Indica un valore ipotizzato. Il valore iniziale del tasso di interesse." ; Text [ portuguese_brazilian ] = "Sch?tzwert. Startwert des Zinsfu?es f? das Iterationsverfahren." ; Text [ portuguese ] = "é um número que se estima estar próximo do resultado da taxa de retorno interna." ; - Text [ finnish ] = "Arvio:! Iteraatiolaskennassa käytettävä arvioitu palautusprosentti." ; + Text [ finnish ] = "Arvio Iteraatiolaskennassa käytettävä arvioitu palautusprosentti." ; Text [ danish ] = "Gæt. Skøn over rentefodens startværdi for iterationsberegningen." ; Text [ french ] = "Le taux que vous estimez être le plus proche du résultat de TRI." ; Text [ swedish ] = "Gissning. Räntesatsens startvärde för iterationsmetoden." ; - Text [ dutch ] = "Geschatte waarde. Startwaarde van de rentevoet voor het iteratieproces." ; + Text [ dutch ] = "Geschatte waarde. Beginwaarde van de rentevoet voor het iteratieproces." ; Text [ spanish ] = "Es un número que el usuario estima que se aproximará al resultado de TIR." ; Text [ english_us ] = "Guess. An estimated value of the rate of return to be used for the iteration calculation." ; Text[ chinese_simplified ] = "估计值。采用é€æ¥é€¼è¿‘法计算时的利率起始估计值。"; - Text[ russian ] = "Âåëè÷èíà, î êîòîðîé ïðåäïîëàãàåòñÿ, ÷òî îíà áëèçêà ê ðåçóëüòàòó ÂÍÄÎÕ."; + Text[ russian ] = "Ïðåäïîëîæåíèå. Âåëè÷èíà, î êîòîðîé ïðåäïîëàãàåòñÿ, ÷òî îíà áëèçêà ê ðåçóëüòàòó."; Text[ polish ] = "Wartoœæ szacowana. Wartoœæ pocz¹tkowa ustawowej stopy procentowej dla iteracyjnej metody kalkulacji."; Text[ japanese ] = "推定値。計算çµæžœã«è¿‘ã„ã¨æ€ã‚れる数値。"; Text[ chinese_traditional ] = "估計值。用於é€æ¥é€¼è¿‘法計算的利率開始估計值。"; Text[ arabic ] = "ÇáÑÞã ÇáÐí ÊÊæÞÚ Ãä íßæä ÞÑíÈÇð ãä äÊíÌÉ IRR."; - Text[ dutch ] = "Geschatte waarde. Startwaarde van de rentevoet voor het iteratieproces."; + Text[ dutch ] = "Geschatte waarde. Beginwaarde van de rentevoet voor het iteratieproces."; Text[ chinese_simplified ] = "估计值。采用é€æ¥é€¼è¿‘法计算时的利率起始估计值。"; Text[ greek ] = "Åêôéìþìåíç ôéìÞ. Áñ÷éêÞ ôéìÞ ôçò ñïÞò åðéôïêßïõ ãéá ôçí åðáíáëçðôéêÞ äéáäéêáóßá."; Text[ korean ] = "ì¶”ì •ê°’. 반복 횟수 ë°©ì‹ì„ 위한 ì´ìžìœ¨ì˜ 시작값"; Text[ turkish ] = "Tahmini deðer. Özyineleme hesabý için verim oranýnýn baþlangýç deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Estima. Valor estimatiu de la taxa de devolució que s'ha d'utilitzar per al càlcul iteratiu."; + Text[ thai ] = "คะเน ค่าโดยประมาณขà¸à¸‡à¸à¸±à¸•à¸£à¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸šà¸—ี่ใช้สำหรับà¸à¸²à¸£à¸„ำนวณซ้ำ"; }; }; // -=*# Resource for function QIKV/MIRR #*=- @@ -10259,7 +10590,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ portuguese ] = "Calcula a taxa de rentabilidade interna de uma série de investimentos."; Text[ russian ] = "Âû÷èñëÿåò ìîäèôèöèðîâàííóþ âíóòðåííþþ íîðìó ïðèáûëè ðÿäà èíâåñòèöèé."; Text[ greek ] = "Õðïëïãßæåé ôçí ôñïðïðïéçìÝíç åóùôåñéêÞ ñïÞ åðéôïêßïõ ìéáò óåéñÜò åðåíäýóåùí."; - Text[ dutch ] = "Geeft als resultaat de gemodificeerde interne rentevoet in een reeks van inversteringen."; + Text[ dutch ] = "Geeft als resultaat de gemodificeerde interne rentevoet in een reeks van investeringen."; Text[ french ] = "Calcule le taux de rentabilité interne modifié pour une série d'investissements."; Text[ spanish ] = "Calcula el tipo de interés de una serie de inversiones."; Text[ italian ] = "Restituisce il tasso di rendimento interno variato di una serie di investimenti."; @@ -10275,6 +10606,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "Returns the modified internal rate of return for a series of cash flows represented by the numbers in values."; Text[ catalan ] = "Torna la taxa interna modificada de devolució per a una sèrie d'inversions."; Text[ finnish ] = "Palauttaa sijoitusten sisäisen mukautetun tuottoprosentin."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸±à¸•à¸£à¸²à¸ ายในที่ดัดà¹à¸›à¸¥à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸šà¸¥à¸³à¸”ับà¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; ExtraData = { @@ -10306,6 +10638,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "ÇáÞíã"; Text[ catalan ] = "Valors"; Text[ finnish ] = "Arvot"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -10315,7 +10648,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ portuguese ] = "Uma matriz ou uma referência a células, cujos conteúdos correspondem aos pagamentos."; Text[ russian ] = "Ìàññèâ èëè ññûëêà íà ÿ÷åéêè, ñîäåðæèìîå êîòîðûõ ñîîòâåòñòâóåò ïëàòåæàì."; Text[ greek ] = "Ìéá ìÞôñá Þ ìéá áíáöïñÜ óå êåëéÜ, ôùí ïðïßùí ôá ðåñéå÷üìåíá áíôéóôïé÷ïýí óôéò ðëçñùìÝò."; - Text[ dutch ] = "Matrix of celverwijzing naar cellen waarvan de inhoud overeenkomt met de betalingen. "; + Text[ dutch ] = "Matrix of celverwijzing naar cellen waarvan de inhoud overeenkomt met de betalingen."; Text[ french ] = "Une matrice ou une référence à des cellules dont le contenu correspond aux paiements."; Text[ spanish ] = "Matriz o referencia de celda a celdas cuyo contenido corresponde a los pagos."; Text[ italian ] = "Riferimento a una cella o una matrice che contiene i valori degli importi di pagamento."; @@ -10329,8 +10662,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ chinese_traditional ] = "符åˆæ”¯ä»˜é‡‘é¡çš„儲å˜æ ¼çŸ©é™£æˆ–儲å˜æ ¼åƒç…§ã€‚ "; Text[ turkish ] = "is an array or a reference to cells that contain numbers for which you want to calculate the internal rate of return."; Text[ arabic ] = "ÕÝíÝ Ãæ ãÑÌÚ Åáì ÎáÇíÇ ÊÊØÇÈÞ ãÍÊæíÇÊåÇ ãÚ ÇáÏÝÚÇÊ. "; - Text[ catalan ] = "Matriu o referència a cel·les el contingut de les quals correspon als pagaments."; - Text[ finnish ] = "Matriisi tai soluviite maksuja vastaaviin soluihin."; + Text[ catalan ] = "Matriu o referència a cel.les el contingut de les quals correspon als pagaments."; + Text[ finnish ] = "Taulukko tai soluviite maksuja vastaaviin soluihin."; + Text[ thai ] = "à¹à¸–วลำดับหรืà¸à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์ขà¸à¸‡à¹€à¸™à¸·à¹‰à¸à¸«à¸²à¸ªà¸à¸”คล้à¸à¸‡à¸à¸±à¸šà¸à¸²à¸£à¸ˆà¹ˆà¸²à¸¢à¹€à¸‡à¸´à¸™"; }; String 4 // Name of Parameter 2 { @@ -10356,6 +10690,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "invest_rate"; Text[ catalan ] = "inversió"; Text[ finnish ] = "sijoitus"; + Text[ thai ] = "à¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; String 5 // Description of Parameter 2 { @@ -10380,7 +10715,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "interest rate of investments (the negative values in the array)."; Text[ arabic ] = "interest rate of investments (the negative values in the array)."; Text[ catalan ] = "Taxa d'interès per a les inversions (els valors negatius de la matriu)."; - Text[ finnish ] = "Sijoitusten korkoprosentti (matriisin negatiiviset arvot)."; + Text[ finnish ] = "Sijoitusten korkoprosentti (taulukon negatiiviset arvot)."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸¥à¸‡à¸—ุน (ค่าลบในà¹à¸–วลำดับ)"; }; String 6 // Name of Parameter 3 { @@ -10388,9 +10724,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "reinvest_rate" ; Text[ english_us ] = "reinvest_rate"; Text[ portuguese ] = "Reinvestimento"; - Text[ russian ] = "Ðåèíâåñòèöèÿ"; + Text[ russian ] = "Ïîâòîðíàÿ èíâåñòèöèÿ"; Text[ greek ] = "ÅðáíåðÝíäõóç"; - Text[ dutch ] = "reïnvestering"; + Text[ dutch ] = "Herinvestering"; Text[ french ] = "Réinvestissement"; Text[ spanish ] = "Reinversión"; Text[ italian ] = "Reinvestimenti"; @@ -10405,7 +10741,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "reinvest_rate"; Text[ arabic ] = "reinvest_rate"; Text[ catalan ] = "reinvest_rate"; - Text[ finnish ] = "reinvest_rate"; + Text[ finnish ] = "uudelleensijoitus_korko"; + Text[ thai ] = "ลงทุนซ้ำ_à¸à¸±à¸•à¸£à¸²"; }; String 7 // Description of Parameter 3 { @@ -10413,9 +10750,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "interest rate of reinvestments (the positive values in the array)." ; Text[ english_us ] = "interest rate for reinvestments (the positive values in the array)."; Text[ portuguese ] = "Taxa de juro dos reinvestimentos (valores positivos da matriz)."; - Text[ russian ] = "Íîðìà ïðèáûëè ðåèíâåñòèöèé(ïîëîæèòåëüíûå çíà÷åíèÿ ìàññèâà)."; + Text[ russian ] = "Íîðìà ïðèáûëè ïîâòîðíûõ èíâåñòèöèé (ïîëîæèòåëüíûå çíà÷åíèÿ ìàññèâà)."; Text[ greek ] = "ÑïÞ åðéôïêßïõ ôçò åðáíáåðÝíäõóçò (ïé èåôéêÝò ôéìÝò ôçò ìÞôñáò)."; - Text[ dutch ] = "Rentevoet bij reïnvesteringen (de positieve waarden in de matrix)."; + Text[ dutch ] = "Rentevoet bij herinvesteringen (de positieve waarden in de matrix)."; Text[ french ] = "Taux de rentabilité des réinvestissements (les valeurs positives de la matrice)."; Text[ spanish ] = "Tipo de interés de las reinversiones (los valores positivos de la matriz)"; Text[ italian ] = "Tasso di rendimento dei reinvenstimenti (valori positivi della matrice)."; @@ -10430,7 +10767,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "interest rate of reinvestments (the positive values in the array)."; Text[ arabic ] = "interest rate of reinvestments (the positive values in the array)."; Text[ catalan ] = "taxa d'interès per a les reinversions (els valors positius de la matriu)."; - Text[ finnish ] = "Uudelleensijoituksen korkoprosentti (matriisin positiiviset arvot)."; + Text[ finnish ] = "Uudelleensijoituksen korkoprosentti (taulukon positiiviset arvot)."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸¥à¸‡à¸—ุนซ้ำ (ค่าบวà¸à¹ƒà¸™à¹à¸–วลำดับ)"; }; }; // -=*# Resource for function ISPMT #*=- @@ -10442,7 +10780,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "Returns the amount of interest for constant redemption rates." ; Text[ english_us ] = "Returns the amount of interest for constant amortization rates."; Text[ portuguese ] = "Calcula o montante dos juros a taxas de amortização constantes."; - Text[ russian ] = "Âû÷èñëÿåò ðàçìåð ïðîöåíòíîé ñòàâêè ïðè êîíñòàíòíûõ íîðìàõ ïîãàøåíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò ðàçìåð ïðîöåíòíîé ñòàâêè ïðè ïîñòîÿííûõ íîðìàõ ïîãàøåíèÿ."; Text[ greek ] = "Returns the amount of interest for constant redemption rates."; Text[ dutch ] = "Berekent de hoogte van de rente bij gelijkblijvende aflossingstermijnen."; Text[ french ] = "Calcule le montant des intérêts pour un emprunt à remboursement constant."; @@ -10460,6 +10798,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "Returns the amount of interest for constant redemption rates."; Text[ catalan ] = "Torna la quantitat d'interès per a taxes d'amortització constant."; Text[ finnish ] = "Palauttaa jatkuvan kuoletuskustannuksen korkosumman."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸±à¸•à¸£à¸²à¸«à¸±à¸à¸¥à¸šà¸à¸¥à¸šà¸«à¸™à¸µà¹‰à¸„งที่"; }; ExtraData = { @@ -10484,13 +10823,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ polish ] = "Odsetek"; Text[ portuguese_brazilian ] = "rate"; Text[ japanese ] = "利率"; - Text[ korean ] = "ì´ìžìœ¨"; + Text[ korean ] = "ì´ìœ¨"; Text[ chinese_simplified ] = "rate"; Text[ chinese_traditional ] = "rate"; Text[ turkish ] = "rate"; Text[ arabic ] = "rate"; Text[ catalan ] = "taxa"; Text[ finnish ] = "korko"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -10516,6 +10856,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "Interest rate of a single redemption rate."; Text[ catalan ] = "Taxa d'interès per a una única taxa d'amortització."; Text[ finnish ] = "Yksittäisen kuoletuskustannuksen korkoprosentti."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸±à¸•à¸£à¸²à¸«à¸±à¸à¸¥à¸šà¸à¸¥à¸šà¸«à¸™à¸µà¹‰à¹€à¸Šà¸´à¸‡à¹€à¸”ี่ยว"; }; String 4 // Name of Parameter 2 { @@ -10541,6 +10882,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "period"; Text[ catalan ] = "Període"; Text[ finnish ] = "Kausi"; + Text[ thai ] = "งวด"; }; String 5 // Description of Parameter 2 { @@ -10566,6 +10908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "Count of amortization periods for the calculation of the interest."; Text[ catalan ] = "Nombre de períodes d'amortització per al càlcul de l'interès."; Text[ finnish ] = "Kuoletuskausien määrä, joina korko lasketaan."; + Text[ thai ] = "จำนวนงวดหัà¸à¸¥à¸šà¸à¸¥à¸šà¸«à¸™à¸µà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸„ำนวณดà¸à¸à¹€à¸šà¸µà¹‰à¸¢"; }; String 6 // Name of Parameter 3 { @@ -10573,7 +10916,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "total_periods" ; Text[ english_us ] = "total_periods"; Text[ portuguese ] = "Total_períodos"; - Text[ russian ] = "Âñåãî_ïåðèîäîâ"; + Text[ russian ] = "Âñåãî ïåðèîäîâ"; Text[ greek ] = "total_periods"; Text[ dutch ] = "gehele_termijn"; Text[ french ] = "Durée_totale"; @@ -10591,6 +10934,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "total_periods"; Text[ catalan ] = "total_periods"; Text[ finnish ] = "total_periods"; + Text[ thai ] = "ทั้งหมด_งวด"; }; String 7 // Description of Parameter 3 { @@ -10600,7 +10944,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ portuguese ] = "Soma total dos períodos de amortização."; Text[ russian ] = "Îáùåå êîëè÷åñòâî ïåðèîäîâ ïîãàøåíèÿ."; Text[ greek ] = "Sum total of amortization periods."; - Text[ dutch ] = "Ttotaal aantal aflossingstermijnen."; + Text[ dutch ] = "Totaal aantal aflossingstermijnen."; Text[ french ] = "Nombre total de périodes d'amortissement."; Text[ spanish ] = "Cantidad total de periodos de amortización."; Text[ italian ] = "Calcolo totale del periodo di ammortamento"; @@ -10616,6 +10960,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "Sum total of amortization periods."; Text[ catalan ] = "Suma total dels períodes d'amortització."; Text[ finnish ] = "Kuoletuskausien kokonaissumma."; + Text[ thai ] = "ผลรวมทั้งหมดขà¸à¸‡à¸‡à¸§à¸”ในà¸à¸²à¸£à¸«à¸±à¸à¸¥à¸šà¸à¸¥à¸šà¸«à¸™à¸µà¹‰"; }; String 8 // Name of Parameter 4 { @@ -10641,6 +10986,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "invest"; Text[ catalan ] = "invest"; Text[ finnish ] = "sijoitus"; + Text[ thai ] = "ลงทุน"; }; String 9 // Description of Parameter 4 { @@ -10650,7 +10996,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ portuguese ] = "Montante do investimento."; Text[ russian ] = "Ñóììà èíâåñòèöèè."; Text[ greek ] = "Amount of the investment."; - Text[ dutch ] = "Bedrag van de investering."; + Text[ dutch ] = "Investeringsbedrag"; Text[ french ] = "Montant de l'investissement."; Text[ spanish ] = "Cantidad de la inversión."; Text[ italian ] = "Cifra d'investimento"; @@ -10659,13 +11005,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ polish ] = "Kwota inwestycji."; Text[ portuguese_brazilian ] = "Amount of the investment."; Text[ japanese ] = "ç¾åœ¨ã®æŠ•è³‡é¡ã¾ãŸã¯å°†æ¥è¡Œã‚れる一連ã®æ”¯æ‰•ã„ã‚’ã€ç¾æ™‚点ã§ä¸€æ‹¬æ‰•ã„ã—ãŸå ´åˆã®åˆè¨ˆã‚’指定ã—ã¾ã™ã€‚"; - Text[ korean ] = "íˆ¬ìž ê¸ˆì•¡."; + Text[ korean ] = "íˆ¬ìž ê¸ˆì•¡"; Text[ chinese_simplified ] = "一项投资金é¢ã€‚"; Text[ chinese_traditional ] = "ä¸€é …æŠ•è³‡é‡‘é¡ã€‚"; Text[ turkish ] = "Amount of the investment."; Text[ arabic ] = "Amount of the investment."; Text[ catalan ] = "Quantitat de la inversió."; Text[ finnish ] = "Sijoitettu summa."; + Text[ thai ] = "จำนวนเงินลงทุน"; }; }; // -=*# Resource for function LAUFZEIT #*=- @@ -10679,7 +11026,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il numero di periodi necessari affinché un investimento raggiunga un valore voluto." ; Text [ portuguese_brazilian ] = "Laufzeit. Berechnet die Anzahl der Perioden, die eine Einlage ben?igt, um auf einen angestrebten Wert zu kommen." ; Text [ portuguese ] = "Duração. Devolve a quantidade de períodos necessários para que um investimento atinja o valor desejado." ; - Text [ finnish ] = "Kesto: Laskee kausien määrän, joka tarvitaan sijoituksen halutun arvon saavuttamiseen." ; + Text [ finnish ] = "Kesto Laskee kausien määrän, joka tarvitaan sijoituksen halutun arvon saavuttamiseen." ; Text [ danish ] = "Varighed. Beregner antallet af perioder, som en investering kræver for at opnå den ønskede værdi." ; Text [ french ] = "Durée. Renvoie le nombre de périodes nécessaires à un investissement pour atteindre une valeur nominale." ; Text [ swedish ] = "Löptid. Beräknar antalet perioder som en investering behöver för att uppnå ett eftersträvat värde." ; @@ -10687,7 +11034,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Plazo. Devuelve la cantidad de períodos que requiere una inversión para lograr un valor deseado." ; Text [ english_us ] = "Duration. Calculates the number of periods required by an investment to attain the desired value." ; Text[ chinese_simplified ] = "期é™ã€‚è®¡ç®—ä¸ºäº†è¾¾åˆ°ä¸€å®šç›®æ ‡å€¼ä¸€é¡¹æŠ•èµ„æ‰€éœ€è¦çš„周期数。"; - Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî ïåðèîäîâ, íåîáõîäèìîå äëÿ èíâåñòèöèè, ÷òîáû äîñòèãíóòü ïðåäïîëàãàåìîå çíà÷åíèå."; + Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî ïåðèîäîâ, íåîáõîäèìîå äëÿ èíâåñòèöèè, ÷òîáû äîñòèãíóòü ïðåäëàãàåìîãî çíà÷åíèÿ."; Text[ polish ] = "Oblicza iloœæ okresów, która jest wymagana, aby wk³ad osi¹gn¹³ oczekiwan¹ wartoœæ."; Text[ japanese ] = "満é¡æœŸã€‚投資ã—ã¦ç›®æ¨™é¡ã«é”æˆã™ã‚‹ã®ã«å¿…è¦ã¨ã™ã‚‹æœŸé–“ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "期é™ã€‚計算為了é”åˆ°ä¸€å®šç›®æ¨™å€¼ä¸€é …æŠ•è³‡æ‰€éœ€è¦çš„週期數。"; @@ -10699,6 +11046,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Süre. Bir yatýrýmýn istenen deðere ulaþabilmesi için gereken dönem sayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Durada. Calcula el nombre de períodes que una inversió necessita per aconseguir el valor desitjat."; + Text[ thai ] = "ระยะเวลา คำนวณจำนวนงวดที่ต้à¸à¸‡à¸à¸²à¸£à¹‚ดยà¸à¸²à¸£à¸¥à¸‡à¸—ุนเพื่à¸à¹„ด้รับค่าที่ปรารถนา"; }; ExtraData = { @@ -10714,7 +11062,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Tasso interesse" ; Text [ portuguese_brazilian ] = "ZINS" ; Text [ portuguese ] = "Taxa" ; - Text [ finnish ] = "RATE" ; + Text [ finnish ] = "KORKO" ; Text [ danish ] = "RENTE" ; Text [ french ] = "TAUX" ; Text [ swedish ] = "RÄNTA" ; @@ -10730,10 +11078,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "RENTE"; Text[ chinese_simplified ] = "rate"; Text[ greek ] = "rate"; - Text[ korean ] = "ì´ìž"; + Text[ korean ] = "ì´ìœ¨"; Text[ turkish ] = "Faiz"; Text[ language_user1 ] = " "; Text[ catalan ] = "RATE"; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²"; }; String 3 // Description of Parameter 1 { @@ -10743,7 +11092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "L'interesse costante" ; Text [ portuguese_brazilian ] = "konstanter Zinsatz" ; Text [ portuguese ] = "é a taxa de juros constante." ; - Text [ finnish ] = "Kiinteä korkoprosentti." ; + Text [ finnish ] = "Kiinteä korkoprosentti" ; Text [ danish ] = "En konstant rentesats." ; Text [ french ] = "Taux d'intérêt constant" ; Text [ swedish ] = "konstant räntesats." ; @@ -10751,7 +11100,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es la tasa de interés constante" ; Text [ english_us ] = "The constant rate of interest." ; Text[ chinese_simplified ] = "æ’定利率"; - Text[ russian ] = "ïîñòîÿííàÿ ïðîöåíòíàÿ ñòàâêà"; + Text[ russian ] = "Ïîñòîÿííàÿ ïðîöåíòíàÿ ñòàâêà"; Text[ polish ] = "Sta³a stopa oprocentowania"; Text[ japanese ] = "一定利率"; Text[ chinese_traditional ] = "æ†å®šåˆ©çŽ‡"; @@ -10763,6 +11112,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sabit faiz oraný"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa constant d'interès."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸„งที่"; }; String 4 // Name of Parameter 2 { @@ -10772,7 +11122,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "GW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "pv" ; + Text [ finnish ] = "na" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -10780,7 +11130,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "VA" ; Text [ english_us ] = "pv" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Òç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "pv"; @@ -10788,10 +11138,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "HW"; Text[ chinese_simplified ] = "pv"; Text[ greek ] = "PV"; - Text[ korean ] = "현금가치"; + Text[ korean ] = "pv"; Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "pv"; + Text[ thai ] = "pv"; }; String 5 // Description of Parameter 2 { @@ -10801,7 +11152,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale dell'investimento" ; Text [ portuguese_brazilian ] = "Gegenwartswert der Einlage." ; Text [ portuguese ] = "é o valor actual do investimento." ; - Text [ finnish ] = "Nykyinen arvo. Sijoituksen nykyinen arvo." ; + Text [ finnish ] = "Nykyinen arvo Sijoituksen nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Investeringens nuværende værdi." ; Text [ french ] = "Valeur actuelle de l'investissement" ; Text [ swedish ] = "Nuvarande värde. Det nuvarande värdet för investering." ; @@ -10821,6 +11172,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Yatýrýmýn bugünkü deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual de la inversió."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; String 6 // Name of Parameter 3 { @@ -10830,7 +11182,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "Vf" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -10838,7 +11190,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "FV"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "fv"; @@ -10850,6 +11202,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 7 // Description of Parameter 3 { @@ -10860,7 +11213,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro dell'investimento" ; Text [ portuguese_brazilian ] = "Zuk?ftiger Wert der Einlage." ; Text [ portuguese ] = "é o valor futuro do investimento." ; - Text [ finnish ] = "Sijoituksen tuleva arvo." ; + Text [ finnish ] = "Sijoituksen tuleva arvo" ; Text [ danish ] = "Investeringens fremtidværdi." ; Text [ french ] = "Valeur future de l'investissement." ; Text [ swedish ] = "Framtida värde av investering." ; @@ -10880,6 +11233,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yatýrýmýn gelecek deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur de la inversió."; + Text[ thai ] = "ค่าà¸à¸™à¸²à¸„ตขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; }; // -=*# Resource for function ZGZ #*=- @@ -10893,7 +11247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Calcola il tasso d'interessi che rappresenta la rendita di un investimento." ; Text [ portuguese_brazilian ] = "Zins. Berechnet den Zinssatz, der die Rendite aus einer Einlage darstellt." ; Text [ portuguese ] = "Juros. Calcula a taxa de juro de uma anuidade." ; - Text [ finnish ] = "Korko. Laskee sijoituksen voittoprosentin." ; + Text [ finnish ] = "Korko Laskee sijoituksen voittoprosentin." ; Text [ danish ] = "Rente. Beregner den rentesats, som repræsenterer det årlige renteudbytte fra en investering." ; Text [ french ] = "Calcule le taux d'intérêt qui représente la rentabilité d'un investissement." ; Text [ swedish ] = "Ränta. Beräknar räntesatsen som utgör avkastningen på en investering." ; @@ -10901,7 +11255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Interés. Devuelve la tasa de interés del rendimiento de una inversión." ; Text [ english_us ] = "Interest. Calculates the interest rate which represents the rate of return from an investment." ; Text[ chinese_simplified ] = "利率。计算表示投资赢利的利率。"; - Text[ russian ] = "Ïðîöåíòû. Âû÷èñëÿåò ïðîöåíòíóþ ñòàâêó, êîòîðàÿ ïðåäñòàâëÿåò äîõîä îò èíâåñòèöèè."; + Text[ russian ] = "Âû÷èñëÿåò ïðîöåíòíóþ ñòàâêó, êîòîðàÿ ïðåäñòàâëÿåò ñîáîé äîõîä îò èíâåñòèöèè."; Text[ polish ] = "Odsetki. Oblicza stopê procentow¹ dla wk³adu w okreœlonym czasie w stosunku do w³o¿onego kapita³u."; Text[ japanese ] = "利æ¯ã€‚投資ã‹ã‚‰å¾—られる利得ã®ä¸€å®šã®åˆ©çŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "利æ¯ã€‚計算顯示投資è´åˆ©çš„利率。"; @@ -10909,10 +11263,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rente. Berekent de rentevoet die het rendement uit een investering weergeeft."; Text[ chinese_simplified ] = "利率。计算表示投资赢利的利率。"; Text[ greek ] = "Åðéôüêéï. Õðïëïãßæåé ôïí ôüêï, ï ïðïßïò áíôéðñïóùðåýåé ôçí áðüäïóç ôçò åðÝíäõóçò."; - Text[ korean ] = "ì´ìž. 투ìžã€€ìˆ˜ìµì— ì˜í•´ 나타나는 ì´ìžìœ¨ì„ 산출"; + Text[ korean ] = "ì´ìž. íˆ¬ìž ìˆ˜ìµì— ì˜í•´ 나타나는 ì´ìžìœ¨ì„ 계산합니다."; Text[ turkish ] = "Faiz. Yatýrýmýn gelirini temsil eden faiz oranýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Interès. Calcula la taxa d'interès que representa la taxa de devolució d'una inversió."; + Text[ thai ] = "ดà¸à¸à¹€à¸šà¸µà¹‰à¸¢ คำนวณà¸à¸±à¸•à¸£à¸²à¸”à¸à¸à¹€à¸šà¸µà¹‰à¸¢à¸—ี่ใช้à¹à¸—นà¸à¸±à¸•à¸£à¸²à¸‚à¸à¸‡à¸œà¸¥à¸•à¸à¸šà¹à¸—นจาà¸à¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; ExtraData = { @@ -10936,7 +11291,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "períodos" ; Text [ english_us ] = "P" ; Text[ chinese_simplified ] = "p"; - Text[ russian ] = "Ïåðèîä"; + Text[ russian ] = "Ï"; Text[ polish ] = "Okres"; Text[ japanese ] = "期間"; Text[ chinese_traditional ] = "P"; @@ -10948,6 +11303,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "D"; Text[ language_user1 ] = " "; Text[ catalan ] = "P"; + Text[ thai ] = "งวด"; }; String 3 // Description of Parameter 1 { @@ -10958,7 +11314,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero dei periodi per il calcolo." ; Text [ portuguese_brazilian ] = "Anzahl der Perioden f? die Berechnung" ; Text [ portuguese ] = "é o número de períodos a calcular." ; - Text [ finnish ] = "Laskennassa käytettävä kausien määrä." ; + Text [ finnish ] = "Laskennassa käytettävä kausien määrä" ; Text [ danish ] = "Antallet af perioder for beregningen." ; Text [ french ] = "Le nombre de périodes pour le calcul." ; Text [ swedish ] = "Antal perioder för beräkningen." ; @@ -10978,6 +11334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hesaplamada kullanýlan dönem sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de períodes utilitzats en el càlcul."; + Text[ thai ] = "จำนวนงวดที่ใช้ในà¸à¸²à¸£à¸„ำนวณ"; }; String 4 // Name of Parameter 2 { @@ -10987,7 +11344,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale" ; Text [ portuguese_brazilian ] = "GW" ; Text [ portuguese ] = "VA" ; - Text [ finnish ] = "pv" ; + Text [ finnish ] = "na" ; Text [ danish ] = "NV" ; Text [ french ] = "VA" ; Text [ swedish ] = "Nuvärde" ; @@ -10995,7 +11352,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "va" ; Text [ english_us ] = "pv" ; Text[ chinese_simplified ] = "pv"; - Text[ russian ] = "Òç"; + Text[ russian ] = "ÒÇ"; Text[ polish ] = "PV"; Text[ japanese ] = "ç¾åœ¨ä¾¡å€¤"; Text[ chinese_traditional ] = "PV"; @@ -11007,6 +11364,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "pv"; + Text[ thai ] = "pv"; }; String 5 // Description of Parameter 2 { @@ -11016,7 +11374,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore attuale dell'investimento." ; Text [ portuguese_brazilian ] = "Gegenwartswert der Einlage." ; Text [ portuguese ] = "Valor actual. Representa o valor actual de um investimento." ; - Text [ finnish ] = "Nykyinen arvo. Sijoituksen nykyinen arvo." ; + Text [ finnish ] = "Nykyinen arvo Sijoituksen nykyinen arvo" ; Text [ danish ] = "Nutidsværdi. Investeringens nuværende værdi." ; Text [ french ] = "Valeur actuelle de l'investissement." ; Text [ swedish ] = "Nuvarande värde. Nuvarande värdet av investeringen." ; @@ -11036,6 +11394,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bugünkü deðer. Yatýrýmýn bugünkü deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor actual. Valor actual de la inversió."; + Text[ thai ] = "ค่าปัจจุบัน ค่าปัจจุบันขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; String 6 // Name of Parameter 3 { @@ -11045,7 +11404,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro" ; Text [ portuguese_brazilian ] = "ZW" ; Text [ portuguese ] = "VF" ; - Text [ finnish ] = "FV" ; + Text [ finnish ] = "TULEVA_ARVO" ; Text [ danish ] = "FV" ; Text [ french ] = "VC" ; Text [ swedish ] = "Slutvärde" ; @@ -11053,7 +11412,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "vf" ; Text [ english_us ] = "FV" ; Text[ chinese_simplified ] = "fv"; - Text[ russian ] = "Áç"; + Text[ russian ] = "ÁÇ"; Text[ polish ] = "FV"; Text[ japanese ] = "å°†æ¥ä¾¡å€¤"; Text[ chinese_traditional ] = "FV"; @@ -11065,6 +11424,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Gelecek deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "FV"; + Text[ thai ] = "FV"; }; String 7 // Description of Parameter 3 { @@ -11075,7 +11435,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore futuro dell'investimento." ; Text [ portuguese_brazilian ] = "Zuk?ftiger Wert der Einlage." ; Text [ portuguese ] = "Representa o valor futuro de um investimento." ; - Text [ finnish ] = "Sijoituksen tuleva arvo." ; + Text [ finnish ] = "Sijoituksen tuleva arvo" ; Text [ danish ] = "Investeringens fremtidværdi." ; Text [ french ] = "Représente la valeur future d'un investissement." ; Text [ swedish ] = "Framtida värdet av investeringen." ; @@ -11095,6 +11455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yatýrýmýn gelecek deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de futur de la inversió."; + Text[ thai ] = "ค่าà¸à¸™à¸²à¸„ตขà¸à¸‡à¸à¸²à¸£à¸¥à¸‡à¸—ุน"; }; }; // -=*# Resource for function ISTBEZUG #*=- @@ -11108,7 +11469,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un riferimento." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert ein Bezug ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor é uma referência." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on viite." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on viite." ; Text [ danish ] = "Returnerer SAND, hvis værdien er en reference." ; Text [ french ] = "Renvoie VRAI si la valeur est une référence." ; Text [ swedish ] = "Returnerar SANT om värdet är en referens." ; @@ -11128,6 +11489,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer bir referans ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és una referència."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเป็นà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; ExtraData = { @@ -11163,6 +11525,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11173,7 +11536,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11193,6 +11556,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTFEHL #*=- @@ -11206,7 +11570,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un valore di errore diverso da #N/D." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert ein Fehlerwert ungleich #NV ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor se refere a qualquer valor de erro diferente de #N/D." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on virhearvo, joka ei ole #N/A." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on virhearvo, joka ei ole #N/A." ; Text [ danish ] = "Returnerer SAND, hvis værdien er en hvilken som helst fejlværdi forskellig fra #I/T" ; Text [ french ] = "Renvoie VRAI si la valeur fait référence à une des valeurs d'erreur, à l'exception de #N/A." ; Text [ swedish ] = "Returnerar SANT när värdet är ett felvärde som ej är lika med #SAKNAS." ; @@ -11214,7 +11578,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve VERDADERO si el valor es cualquier valor de error distinto de #N/A." ; Text [ english_us ] = "Returns TRUE if the value is an error value not equal to #N/A." ; Text[ chinese_simplified ] = "如果一个错误数值ä¸ç‰äºŽ #NV ，那就å馈 TRUE 。"; - Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ ëþáûì îøèáî÷íûì çíà÷åíèåì, êðîìå Í/Ä."; + Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ ëþáûì îøèáî÷íûì çíà÷åíèåì, êðîìå #Í/Ä."; Text[ polish ] = "Zwraca wartoœæ PRAWDA, je¿eli wartoœæ b³êdu jest ró¿na od #N/D."; Text[ japanese ] = "セル㌠#N/A ã§ãªã„エラーã®å ´åˆã€TRUEã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果一個錯誤數值ä¸ç‰æ–¼ #NV ï¹é‚£å°±å‚³å›ž TRUE 。"; @@ -11226,6 +11590,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer, #NV/A deðerine eþit olmayan bir hata deðeri ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és un valor d'error diferent de #N/A."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเป็นค่าผิดพลาดที่ไม่เท่าà¸à¸±à¸š #N/A"; }; ExtraData = { @@ -11261,6 +11626,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11271,7 +11637,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11291,6 +11657,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTFEHLER #*=- @@ -11304,7 +11671,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un valore di errore." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert ein Fehlerwert ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor se refere a qualquer valor de erro (#N/A,#VALOR!,'REF! ou NOME?)." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on virhearvo." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on virhearvo." ; Text [ danish ] = "Returnerer SAND, hvis værdien er en hvilken som helst fejlværdi." ; Text [ french ] = "Renvoie VRAI si la valeur fait référence à une valeur d'erreur." ; Text [ swedish ] = "Returnerar SANT om värdet är ett felvärde." ; @@ -11324,6 +11691,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer, bir hata deðeri ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és un valor d'error."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเป็นค่าผิดพลาด"; }; ExtraData = { @@ -11359,6 +11727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11369,7 +11738,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11389,6 +11758,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTLEER #*=- @@ -11402,7 +11772,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un riferimento ad una cella vuota." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert ein Bezug auf eine leere Zelle ist." ; Text [ portuguese ] = "Devolve VERDADEIRO; se o valor se refere a uma célula vazia." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo viittaa tyhjään soluun." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo viittaa tyhjään soluun." ; Text [ danish ] = "Returnerer SAND, hvis værdien refererer til en tom celle." ; Text [ french ] = "Renvoie VRAI si la valeur fait référence à une cellule vide." ; Text [ swedish ] = "Returnerar SANT om värdet refererar till en tom cell." ; @@ -11421,7 +11791,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "ê°’ì´ ë¹ˆ ì…€ì— ëŒ€í•œ 참조ì´ë©´ TRUE를 ì œê³µ."; Text[ turkish ] = "Deðer, boþ bir hücreyi referans alýyorsa sonuç DOÐRU olur."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna TRUE si el valor es refereix a una cel·la buida."; + Text[ catalan ] = "Torna TRUE si el valor es refereix a una cel.la buida."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าà¸à¹‰à¸²à¸‡à¸–ึงเซลล์ว่าง"; }; ExtraData = { @@ -11457,6 +11828,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11467,7 +11839,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11487,6 +11859,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTLOG #*=- @@ -11501,7 +11874,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore ha un formato numerico logico." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert ein logisches Zahlformat tr?gt." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor se refere a um valor lógico." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvossa on looginen lukumuoto." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvossa on looginen lukumuoto." ; Text [ danish ] = "Returnerer SAND, hvis værdien er en logisk værdi." ; Text [ french ] = "Renvoie VRAI si la valeur fait référence à une valeur logique." ; Text [ swedish ] = "Returnerar SANT om värdet har ett logiskt talformat." ; @@ -11517,10 +11890,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft als resultaat WAAR als de waarde een logische waarde is."; Text[ chinese_simplified ] = "如果这个数值是一个逻辑值，那就å馈TRUE 。"; Text[ greek ] = "Äßíåé TRUE (ÁËÇÈÇÓ) áí ç ôéìÞ ðåñéÝ÷åé ìéá ëïãéêÞ ìïñöÞ áñéèìïý."; - Text[ korean ] = "ê°’ì´ ë…¼ë¦¬ì ìˆ«ìž í˜•ì‹ì¼ 경우 TRUE를 반환."; + Text[ korean ] = "ê°’ì´ ë…¼ë¦¬ì ìˆ«ìž ì„œì‹ì¼ 경우 TRUE를 반환"; Text[ turkish ] = "Deðer, mantýksal bir sayý formatý içeriyorsa sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor porta un format de nombres lògic."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่ามีรูปà¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ตามตรรà¸à¸°"; }; ExtraData = { @@ -11556,6 +11930,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11566,7 +11941,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11586,6 +11961,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTNV #*=- @@ -11599,7 +11975,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è uguale a #N/D (valore non disponibile)." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert gleich #NV ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor é igual ao valor de erro #N/A.." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on #N/A." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on #N/A." ; Text [ danish ] = "Returnerer SAND, hvis værdien er lig med #I/T." ; Text [ french ] = "Renvoie VRAI si la valeur fait référence à la valeur d'erreur #N/A." ; Text [ swedish ] = "Returnerar SANT om värdet är lika med #SAKNAS." ; @@ -11607,7 +11983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve VERDADERO si el valor es el valor de error #N/A." ; Text [ english_us ] = "Returns TRUE if value equals #N/A." ; Text[ chinese_simplified ] = "如果这个数值ç‰äºŽ #NV ，那就å馈TRUE 。"; - Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ îøèáî÷íûì çíà÷åíèåì #Í/Ä."; + Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ íåäîñòóïíûì."; Text[ polish ] = "Zwraca wartoœæ PRAWDA, jeœli wartoœci¹ b³êdu jest #NV."; Text[ japanese ] = "値㌠#N/A ã®å ´åˆã€TRUE ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果這個數值ç‰æ–¼ #NV ï¹é‚£å°±å‚³å›žTRUE 。"; @@ -11619,6 +11995,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer eþittir #NV ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és igual a #N/A."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเท่าà¸à¸±à¸š #N/A"; }; ExtraData = { @@ -11654,6 +12031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11664,7 +12042,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11684,6 +12062,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTKTEXT #*=- @@ -11697,7 +12076,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore non è un testo." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert kein Text ist." ; Text [ portuguese ] = "Devolve VERDADEIRO; se o valor não for texto." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo ei ole tekstiä." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo ei ole tekstiä." ; Text [ danish ] = "Returnerer SAND, hvis værdien ikke er tekst." ; Text [ french ] = "Renvoie VRAI si la valeur n'est pas du texte." ; Text [ swedish ] = "Returnerar SANT om värdet inte är en text." ; @@ -11717,6 +12096,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer bir metin deðil ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor no és text."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าไม่ใช่ข้à¸à¸„วาม"; }; ExtraData = { @@ -11752,6 +12132,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11762,7 +12143,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11782,6 +12163,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTTEXT #*=- @@ -11795,7 +12177,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un testo." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert ein Text ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor é um texto." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on teksti." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on teksti." ; Text [ danish ] = "Returnerer SAND, hvis værdien er en tekst." ; Text [ french ] = "Renvoie VRAI si la valeur est un texte." ; Text [ swedish ] = "Returnerar SANT om värdet är en text." ; @@ -11815,6 +12197,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer bir metin ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és text."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเป็นข้à¸à¸„วาม"; }; ExtraData = { @@ -11850,6 +12233,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11860,7 +12244,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11880,6 +12264,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTZAHL #*=- @@ -11893,7 +12278,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un numero." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert eine Zahl ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor é um número." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on luku." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on luku." ; Text [ danish ] = "Returnerer SAND, hvis værdien er et tal." ; Text [ french ] = "Renvoie VRAI si la valeur est un nombre." ; Text [ swedish ] = "Returnerar SANT om värdet är ett tal." ; @@ -11913,6 +12298,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer bir sayý ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเป็นตัวเลข"; }; ExtraData = { @@ -11948,6 +12334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -11958,7 +12345,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -11978,6 +12365,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าที่ถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTFORMEL #*=- @@ -11991,7 +12379,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se la cella è una cella di formula" ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn die Zelle eine Formelzelle ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o conteúdo da célula é uma fórmula." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos solu on kaavasolu." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos solu on kaavasolu." ; Text [ danish ] = "Returnerer SAND, hvis cellen er en formelcelle." ; Text [ french ] = "Renvoie VRAI si la cellule est une cellule de formule." ; Text [ swedish ] = "Returnerar SANT om cellen är en formelcell." ; @@ -12010,7 +12398,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "ì…€ì´ ìˆ˜ì‹ ì…€ì´ë¼ë©´ TRUE를 반환."; Text[ turkish ] = "Hücre bir formül hücresi ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna TRUE si la cel·la és una cel·la de fórmula."; + Text[ catalan ] = "Torna TRUE si la cel.la és una cel.la de fórmula."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าเซลล์เป็นสูตร"; }; ExtraData = { @@ -12046,6 +12435,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "referència"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -12064,7 +12454,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es la celda que se desea probar." ; Text [ english_us ] = "The cell to be checked." ; Text[ chinese_simplified ] = "è¦æ£€éªŒçš„å•å…ƒæ ¼ã€‚"; - Text[ russian ] = "Ññûëêà íà ÿ÷åéêó, êîòîðóþ íåîáõîäèìî ïðîâåðèòü."; + Text[ russian ] = "ß÷åéêà, êîòîðóþ íåîáõîäèìî ïðîâåðèòü."; Text[ polish ] = "Komórka do sprawdzenia."; Text[ japanese ] = "検査ã®å¯¾è±¡ã¨ãªã‚‹ã‚»ãƒ«ã€‚"; Text[ chinese_traditional ] = "è¦æª¢é©—的儲å˜æ ¼ã€‚"; @@ -12075,7 +12465,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ korean ] = "검사ë˜ì–´ì•¼ í• ì…€ìž…ë‹ˆë‹¤."; Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cel·la que s'ha de comprovar."; + Text[ catalan ] = "Cel.la que s'ha de comprovar."; + Text[ thai ] = "เซลล์ที่ถูà¸à¸•à¸£à¸§à¸ˆà¸ªà¸à¸š"; }; }; // -=*# Resource for function FORMEL #*=- @@ -12103,8 +12494,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ chinese_traditional ] = "å饋一個儲å˜æ ¼çš„å…¬å¼ã€‚"; Text[ arabic ] = "íÞÏã ÇáÕíÛÉ áÃÍÏ ÎáÇíÇ ÇáÕíÛÉ."; Text[ turkish ] = "Formül hücresinin formülünü verir."; - Text[ catalan ] = "Torna la fórmula d'una cel·la de fórmula."; + Text[ catalan ] = "Torna la fórmula d'una cel.la de fórmula."; Text[ finnish ] = "Palauttaa kaavasolun kaavan."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ªà¸¹à¸•à¸£à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œ"; }; ExtraData = { @@ -12136,6 +12528,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Referans"; Text[ catalan ] = "Referència"; Text[ finnish ] = "Viite"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -12159,8 +12552,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ chinese_traditional ] = "å…¬å¼å„²å˜æ ¼ã€‚"; Text[ arabic ] = "ÎáíÉ ÇáÕíÛÉ."; Text[ turkish ] = "Formül hücresi."; - Text[ catalan ] = "Cel·la de fórmula"; - Text[ finnish ] = "Kaavasolu."; + Text[ catalan ] = "Cel.la de fórmula"; + Text[ finnish ] = "Kaavasolu"; + Text[ thai ] = "เซลล์สูตร"; }; }; // -=*# Resource for function N #*=- @@ -12194,6 +12588,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir deðeri sayýya çevirir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un valor en un nombre."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸„่าเป็นตัวเลข"; }; ExtraData = { @@ -12229,6 +12624,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -12238,7 +12634,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore che si desidera convertire." ; Text [ portuguese_brazilian ] = "Der Wert, der als Zahl interpretiert wird." ; Text [ portuguese ] = "é o valor que se deseja converter." ; - Text [ finnish ] = "Luvuksi muunnettava arvo." ; + Text [ finnish ] = "Luvuksi muunnettava arvo" ; Text [ danish ] = "Den værdi som skal konverteres." ; Text [ french ] = "La valeur à convertir." ; Text [ swedish ] = "Värdet som tolkas som tal." ; @@ -12258,6 +12654,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý olarak yorumlanan deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha d'interpretar com a nombre."; + Text[ thai ] = "ค่าที่ถูà¸à¸•à¸µà¸„วามเป็นตัวเลข"; }; }; // -=*# Resource for function NV #*=- @@ -12272,7 +12669,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Non disponibile. Imposta nella cella il valore di errore #N/D." ; Text [ portuguese_brazilian ] = "Nicht verf?bar. Setzt eine Zelle auf den Fehlerwert #NV." ; Text [ portuguese ] = "Devolve o valor de erro #N/A." ; - Text [ finnish ] = "Ei käytettävissä. Palauttaa virhearvon #N/A." ; + Text [ finnish ] = "Ei käytettävissä Palauttaa virhearvon #N/A." ; Text [ danish ] = "Ikke tilgængelig. Sætter en celle på fejlværdien #NV." ; Text [ french ] = "Aucune valeur disponible. Renvoie la valeur d'erreur #N/A pour une cellule." ; Text [ swedish ] = "Inte tillgänglig. Returnerar felvärdet #Saknas för en cell." ; @@ -12280,7 +12677,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "No disponible. Devuelve el valor de error #N/A que significa que el valor no está disponible." ; Text [ english_us ] = "Not available. Returns the error value #N/A." ; Text[ chinese_simplified ] = "ä¸å˜åœ¨ã€‚å馈一个错误数值 #NV 。"; - Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå îøèáêè #Í/Ä (çíà÷åíèå íåäîñòóïíî)."; + Text[ russian ] = "Íåäîñòóïíî. Âîçâðàùàåò çíà÷åíèå îøèáêè #Í/Ä."; Text[ polish ] = "Niedostêpne. Zwraca wartoœæ b³êdu #N/D."; Text[ japanese ] = "エラー値 #N/A ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "ä¸å˜åœ¨ã€‚傳回一個錯誤數值 #NV 。"; @@ -12292,6 +12689,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Mevcut deðil. #N/A hata mesajýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "No disponible. Torna el valor d'error #N/A."; + Text[ thai ] = "ใช้ไม่ได้ ส่งà¸à¸¥à¸±à¸šà¸„่า #N/A ผิดพลาด"; }; ExtraData = { @@ -12331,6 +12729,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðerin veri tipini belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix el tipus de dades d'un valor."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ชนิดข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„่า"; }; ExtraData = { @@ -12366,6 +12765,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -12395,6 +12795,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Veri tipi belirlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor del qual s'ha de determinar el tipus de dades."; + Text[ thai ] = "ค่าสำหรับชนิดขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่ถูà¸à¸à¸³à¸«à¸™à¸”"; }; }; // -=*# Resource for function CELL/ZELLE #*=- @@ -12417,13 +12818,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ polish ] = "Ustala adres, format lub zawartoœæ komórki."; Text[ portuguese_brazilian ] = "Determines information about address, formatting or contents of a cell."; Text[ japanese ] = "セルã®æ›¸å¼è¨å®šã€ä½ç½®ã€å†…容ã«é–¢ã™ã‚‹æƒ…å ±ã‚’è¿”ã—ã¾ã™ã€‚"; - Text[ korean ] = "주소, ì„œì‹ ì§€ì • ë˜ëŠ” ì…€ ë‚´ìš©ì— ëŒ€í•œ ì •ë³´ë¥¼ 조사합니다."; + Text[ korean ] = "주소, ì„œì‹ ì„¤ì • ë˜ëŠ” ì…€ ë‚´ìš©ì— ëŒ€í•œ ì •ë³´ë¥¼ 확ì¸í•©ë‹ˆë‹¤."; Text[ chinese_simplified ] = "求得一个å•å…ƒæ ¼çš„地å€ï¼Œæ ¼å¼å’Œå†…容。"; Text[ chinese_traditional ] = "得出一個儲å˜æ ¼çš„地å€ï¼Œæ ¼å¼å’Œå…§å®¹ã€‚"; Text[ turkish ] = "Determines information about address, formatting or contents of a cell."; Text[ arabic ] = "Determines information about address, formatting or contents of a cell."; - Text[ catalan ] = "Determina la informació sobre l'adreça, el formatatge o el contingut d'una cel·la."; + Text[ catalan ] = "Determina la informació sobre l'adreça, el formatatge o el contingut d'una cel.la."; Text[ finnish ] = "Määrittää osoitetta, muotoilua tai solun sisältöä koskevat tiedot."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ข้à¸à¸¡à¸¹à¸¥à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸—ี่à¸à¸¢à¸¹à¹ˆ, à¸à¸²à¸£à¸ˆà¸±à¸”รูปà¹à¸šà¸šà¸«à¸£à¸·à¸à¹€à¸™à¸·à¹‰à¸à¸«à¸²à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œ"; }; ExtraData = { @@ -12437,7 +12839,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "info_type" ; Text[ english_us ] = "info_type"; Text[ portuguese ] = "Tipo_info"; - Text[ russian ] = "Òèï_èíôîðìàöèè"; + Text[ russian ] = "Òèï èíôîðìàöèè"; Text[ greek ] = "Ôýðïò_ðëçñïöïñßáò"; Text[ dutch ] = "infotype"; Text[ french ] = "Type_info"; @@ -12455,6 +12857,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "info_type"; Text[ catalan ] = "info_type"; Text[ finnish ] = "info_type"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_ชนิด"; }; String 3 // Description of Parameter 1 { @@ -12462,7 +12865,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "This text specifies the type of information." ; Text[ english_us ] = "String that specifies the type of information."; Text[ portuguese ] = "Cadeia de caracteres que determina o tipo de informação."; - Text[ russian ] = "Ñòðîêà çíàêîâ, îïðåäåëÿþùàÿ òèï èíôîðìàöèè."; + Text[ russian ] = "Ñòðîêà, óêàçûâàþùàÿ òèï èíôîðìàöèè."; Text[ greek ] = "Êåßìåíï, ôï ïðïßï êáèïñßæåé ôïí ôýðï ôçò ðëçñïöïñßáò"; Text[ dutch ] = "Tekenreeks die bepalend is voor het soort gegevens."; Text[ french ] = "Chaîne de caractères déterminant le type d'information."; @@ -12473,13 +12876,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ polish ] = "Ci¹g znaków definiuj¹cy rodzaj informacji."; Text[ portuguese_brazilian ] = "This text specifies the type of information."; Text[ japanese ] = "調ã¹ãŸã„ã‚»ãƒ«æƒ…å ±ã®ç¨®é¡žã‚’表ã™æ–‡å—列値を指定ã—ã¾ã™ã€‚"; - Text[ korean ] = "ì •ë³´ ìœ í˜•ì„ ê²°ì •í•˜ëŠ” 문ìžì—´."; + Text[ korean ] = "ì •ë³´ ìœ í˜•ì„ ê²°ì •í•˜ëŠ” 문ìžì—´"; Text[ chinese_simplified ] = "确定æŸä¸€é€‰é¡¹ç±»åž‹çš„å—串。"; Text[ chinese_traditional ] = "確定æŸä¸€é¸é …é¡žåž‹çš„å—串。"; Text[ turkish ] = "This text specifies the type of information."; Text[ arabic ] = "This text specifies the type of information."; Text[ catalan ] = "Cadena que indica el tipus d'informació."; Text[ finnish ] = "Merkkijono, joka määrittää tietotyypin."; + Text[ thai ] = "สายà¸à¸±à¸à¸‚ระที่ระบุชนิดขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -12505,6 +12909,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ arabic ] = "reference"; Text[ catalan ] = "Referència"; Text[ finnish ] = "Viite"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 5 // Description of Parameter 2 { @@ -12512,7 +12917,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ english ] = "The position of the cell you want to examine." ; Text[ english_us ] = "The position of the cell you want to examine."; Text[ portuguese ] = "Posição da célula a ser examinada."; - Text[ russian ] = "Ìåñòîíàõîæäåíèå ïðîâåðÿåìîé ÿ÷åéêè."; + Text[ russian ] = "Ïîçèöèÿ ïðîâåðÿåìîé ÿ÷åéêè."; Text[ greek ] = "Ç èÝóç ôïõ êåëéïý ðïõ ðñüêåéôáé íá åîåôáóôåß."; Text[ dutch ] = "De positie van de cel die u wilt onderzoeken."; Text[ french ] = "La position de la cellule à examiner."; @@ -12528,8 +12933,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ chinese_traditional ] = "è¦æª¢æŸ¥çš„儲å˜æ ¼çš„ä½ç½®ã€‚"; Text[ turkish ] = "The position of the cell you want to examine."; Text[ arabic ] = "The position of the cell you want to examine."; - Text[ catalan ] = "Posició de la cel·la que voleu examinar."; + Text[ catalan ] = "Posició de la cel.la que voleu examinar."; Text[ finnish ] = "Tarkasteltavan solun sijainti."; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸—ี่คุณต้à¸à¸‡à¸à¸²à¸£à¸žà¸´à¸ˆà¸²à¸£à¸“า"; }; }; // -=*# Resource for function AKTUELL #*=- @@ -12547,22 +12953,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Returnerer formlens aktuelle værdi på denne funktions position." ; Text [ french ] = "Détermine la valeur courante de la formule à la position de cette fonction." ; Text [ swedish ] = "Beräknar det aktuella värdet av en formel vid positionen där funktionen står." ; - Text [ dutch ] = "Berekent de actuele waarde van de formule op de plaats waar deze functie zich bevindt." ; + Text [ dutch ] = "Berekent de huidige waarde van de formule op de plaats waar deze functie zich bevindt." ; Text [ spanish ] = "Devuelve el valor actual de la fórmula en la posición en la esté esta función." ; Text [ english_us ] = "Calculates the current value of the formula at the present location. " ; Text[ chinese_simplified ] = "计算函数公å¼æ‰€åœ¨ä½ç½®çš„现值。"; - Text[ russian ] = "Ïåðåäàåò çíà÷åíèå ôîðìóëû â òåêóùåé ïîçèöèè ôóíêöèè."; + Text[ russian ] = "Ïåðåäàåò çíà÷åíèå ôîðìóëû â òåêóùåé ïîçèöèè."; Text[ polish ] = "Wyznacza aktualn¹ wartoœæ formu³y przy aktualnej pozycji funkcji."; Text[ japanese ] = "ã“ã®ä½ç½®ã®ã“ã®é–¢æ•°ã§ã®æ•°å¼ã®æ•°å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; - Text[ language_user1 ] = "Fehler im Deutschen: Posktion"; + Text[ language_user1 ] = "Fehl; Fehler im Deutschen: Posktion"; Text[ chinese_traditional ] = "計算函數公å¼æ‰€åœ¨ä½ç½®çš„ç¾å€¼ã€‚"; Text[ arabic ] = "ÊÍÓÈ ÇáÞíãÉ ÇáÍÇáíÉ ááÕíÛÉ Ýí ÇáãæÖÚ ÇáÍÇáí."; - Text[ dutch ] = "Berekent de actuele waarde van de formule op de plaats waar deze functie zich bevindt."; + Text[ dutch ] = "Berekent de huidige waarde van de formule op de plaats waar deze functie zich bevindt."; Text[ chinese_simplified ] = "计算函数公å¼æ‰€åœ¨ä½ç½®çš„现值。"; Text[ greek ] = "Õðïëïãßæåé ôçí ôñÝ÷ïõóá ôéìÞ ôïõ ôýðïõ óôç èÝóç óôçí ïðïßá âñßóêåôáé."; - Text[ korean ] = "í˜„ìž¬ì˜ ìœ„ì¹˜ì— ëŒ€í•œ 수ì‹ì˜ 현재 ê°’ì„ ê³„ì‚°"; + Text[ korean ] = "í˜„ìž¬ì˜ ìœ„ì¹˜ì— ëŒ€í•œ 수ì‹ì˜ í˜„ìž¬ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Formulün güncel deðerini, bu fonksiyonun bulunduðu konumda hesaplar."; Text[ catalan ] = "Calcula el valor actual de la fórmula a la ubicació actual. "; + Text[ thai ] = "คำนวณค่าปัจจุบันขà¸à¸‡à¸ªà¸¹à¸•à¸£ ณ ที่ตั้งปัจจุบัน "; }; ExtraData = { @@ -12582,7 +12989,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il valore logico FALSO." ; Text [ portuguese_brazilian ] = "Setzt den Wahrheitswert FALSCH." ; Text [ portuguese ] = "Devolve o valor lógico FALSO." ; - Text [ finnish ] = "Määrittää loogisen arvon arvoksi UNTRUE." ; + Text [ finnish ] = "Määrittää loogisen arvon arvoksi EPÄTOSI." ; Text [ danish ] = "Returnerer den logiske værdi FALSK." ; Text [ french ] = "Renvoie la valeur logique FAUX." ; Text [ swedish ] = "Returnerar det logiska värdet FALSKT." ; @@ -12590,7 +12997,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el valor lógico FALSO." ; Text [ english_us ] = "Defines the logical value as FALSE." ; Text[ chinese_simplified ] = "设定逻辑值 FALSE 。"; - Text[ russian ] = "Óñòàíàâëèâàåò ëîãè÷åñêîå çíà÷åíèå ËÎÆÜ."; + Text[ russian ] = "Ïðèñâàèâàåò ëîãè÷åñêîå çíà÷åíèå ËÎÆÜ."; Text[ polish ] = "Zwraca wartoœæ logiczn¹ FA£SZ."; Text[ japanese ] = "è«–ç†å€¤ FALSE ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "è¨å®šé‚輯值 FALSE 。"; @@ -12598,10 +13005,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Geeft de logische waarde ONWAAR."; Text[ chinese_simplified ] = "设定逻辑值 FALSE 。"; Text[ greek ] = "Ïñßæåé ôç ëïãéêÞ ôéìÞ ØÅÕÄÇÓ (FALSE)."; - Text[ korean ] = "논리 ê°’ì„ FALSEë¡œ ì •ì˜"; + Text[ korean ] = "논리 ê°’ì„ FALSEë¡œ ì •ì˜í•©ë‹ˆë‹¤."; Text[ turkish ] = "Mantýksal deðeri YANLIÞ olarak tanýmlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix el valor lògic com a FALSE."; + Text[ thai ] = "ระบุค่าทางตรรà¸à¸°à¹€à¸›à¹‡à¸™ เท็จ"; }; ExtraData = { @@ -12629,7 +13037,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Invierte el valor lógico del argumento." ; Text [ english_us ] = "Reverses the value of the argument." ; Text[ chinese_simplified ] = "对å‚数值求å。"; - Text[ russian ] = "Ìåíÿåò íà ïðîòèâîïîëîæíîå ëîãè÷åñêîå çíà÷åíèå àðãóìåíòà."; + Text[ russian ] = "Ïðèñâàèâàåò îáðàòíîå ëîãè÷åñêîå çíà÷åíèå."; Text[ polish ] = "Odwraca wartoœæ argumentu."; Text[ japanese ] = "引数㌠TRUE ã®ã¨ã FALSE ã‚’ã€FALSE ã®ã¨ã TRUE ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å°åƒæ•¸å€¼æ±‚å。"; @@ -12641,6 +13049,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðiþkenin deðerini tersine çevirir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Inverteix el valor de l'argument."; + Text[ thai ] = "สงวนค่าขà¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; ExtraData = { @@ -12661,7 +13070,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Valeur_logique" ; Text [ swedish ] = "logiskt värde" ; Text [ dutch ] = "Logische waarde" ; - Text [ spanish ] = "valor_lógico" ; + Text [ spanish ] = "Valor lógico" ; Text [ english_us ] = "Logical value" ; Text[ chinese_simplified ] = "logical value"; Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå"; @@ -12676,6 +13085,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Mantýksal deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor lògic"; + Text[ thai ] = "ค่าทางตรรà¸à¸°"; }; String 3 // Description of Parameter 1 { @@ -12685,7 +13095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore o espressione che può dare come risultato VERO o FALSO." ; Text [ portuguese_brazilian ] = "Ein Ausdruck, der WAHR oder FALSCH annehmen kann." ; Text [ portuguese ] = "é um valor ou uma expressão que pode ser avaliado como VERDADEIRO ou FALSO." ; - Text [ finnish ] = "Lauseke, jonka arvo voi olla TRUE tai UNTRUE." ; + Text [ finnish ] = "Lauseke, jonka arvo voi olla TOSI tai EPÄTOSI." ; Text [ danish ] = "Et udtryk som kan evalueres som SAND eller FALSK." ; Text [ french ] = "Une expression qui peut prendre la valeur VRAI ou FAUX." ; Text [ swedish ] = "Ett uttryck som kan vara SANT eller FALSKT." ; @@ -12693,7 +13103,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es un valor o expresión que se puede evaluar como VERDADERO o FALSO." ; Text [ english_us ] = "An expression that can be either TRUE or FALSE." ; Text[ chinese_simplified ] = "一个能够计算出 TRUE 或 FALSE 的表达å¼ã€‚"; - Text[ russian ] = "Çíà÷åíèå, êîòîðîå ìîæåò äàâàòü ÈÑÒÈÍÀ èëè ËÎÆÜ."; + Text[ russian ] = "Çíà÷åíèå, êîòîðîå ìîæåò áûòü ÈÑÒÈÍÀ èëè ËÎÆÜ."; Text[ polish ] = "Wyra¿enie, które mo¿e przyj¹æ wartoœæ PRAWDA lub FA£SZ."; Text[ japanese ] = "è«–ç†å€¤ã‚ã‚‹ã„ã¯çµæžœãŒ TRUE ã¾ãŸã¯ FALSE ã«ãªã‚‹è«–ç†å¼ã€‚"; Text[ chinese_traditional ] = "ä¸€å€‹èƒ½å¤ è¨ˆç®—å‡º TRUE 或 FALSE 的表é”å¼ã€‚"; @@ -12705,6 +13115,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "DOÐRU ya da YANLIÞ olabilen bir terim."; Text[ language_user1 ] = " "; Text[ catalan ] = "Expressió que tant pot ser TRUE com FALSE."; + Text[ thai ] = "นิพจน์ที่สามารถเป็นไม่ จริง à¸à¹‡ เท็จ"; }; }; // -=*# Resource for function WAHR #*=- @@ -12718,7 +13129,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il valore logico VERO." ; Text [ portuguese_brazilian ] = "Setzt den Wahrheitswert WAHR." ; Text [ portuguese ] = "Devolve o valor lógico VERDADEIRO." ; - Text [ finnish ] = "Palauttaa loogisen arvon TRUE." ; + Text [ finnish ] = "Palauttaa loogisen arvon TOSI." ; Text [ danish ] = "Returnerer den logiske værdi SAND." ; Text [ french ] = "Renvoie la valeur logique VRAI." ; Text [ swedish ] = "Returnerar det logiska värdet SANT." ; @@ -12726,7 +13137,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el valor lógico VERDADERO." ; Text [ english_us ] = "Returns the logical value TRUE." ; Text[ chinese_simplified ] = "设定逻辑值 TRUE 。"; - Text[ russian ] = "Âîçâðàùàåò ëîãè÷åñêîå çíà÷åíèå ÈÑÒÈÍÀ."; + Text[ russian ] = "Ïðèñâàèâàåòñÿ ëîãè÷åñêîå çíà÷åíèå ÈÑÒÈÍÀ."; Text[ polish ] = "Zwraca wartoœæ logiczn¹ PRAWDA."; Text[ japanese ] = "è«–ç†å€¤ TRUE ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "返回é‚輯數值 TRUE 。"; @@ -12738,6 +13149,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "DOÐRU mantýksal deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor lògic TRUE."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าทางตรรà¸à¸° จริง"; }; ExtraData = { @@ -12766,7 +13178,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Especifica una prueba lógica que se desea efectuar." ; Text [ english_us ] = "Specifies a logical test to be performed." ; Text[ chinese_simplified ] = "指定一个è¦æ‰§è¡Œçš„逻辑值检查。"; - Text[ russian ] = "Çàäàåò ëîãè÷åñêèé êîíòðîëü, êîòîðûé íåîáõîäèìî âûïîëíèòü."; + Text[ russian ] = "Óêàçûâàåò ëîãè÷åñêèé òåñò, êîòîðûé íåîáõîäèìî âûïîëíèòü."; Text[ polish ] = "Definiuje test logiczny, który ma zostaæ wykonany."; Text[ japanese ] = "è«–ç†å¼ã®çµæžœã«å¿œã˜ã¦ã€æŒ‡å®šã—ãŸå€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "執行é‚輯值檢查。"; @@ -12778,6 +13190,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yapýlacak bir mantýksal denetim belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica una verificació lògica que s'ha de realitzar."; + Text[ thai ] = "ระบุà¸à¸²à¸£à¸—ดสà¸à¸šà¸—างตรรà¸à¸°à¸—ี่จะถูà¸à¹à¸ªà¸”ง"; }; ExtraData = { @@ -12799,10 +13212,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Test" ; Text [ swedish ] = "test" ; Text [ dutch ] = "Test" ; - Text [ spanish ] = "Prueba_lógica" ; + Text [ spanish ] = "Prueba" ; Text [ english_us ] = "Test" ; Text[ chinese_simplified ] = "logical_test"; - Text[ russian ] = "Ëîã_êîíòðîëü"; + Text[ russian ] = "Òåñò"; Text[ polish ] = "test_logiczny"; Text[ japanese ] = "è«–ç†å¼"; Text[ chinese_traditional ] = "logical_test"; @@ -12814,6 +13227,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetim"; Text[ language_user1 ] = " "; Text[ catalan ] = "Verificació"; + Text[ thai ] = "ทดสà¸à¸š"; }; String 3 // Description of Parameter 1 { @@ -12823,7 +13237,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore o espressione qualsiasi che può dare come risultato VERO o FALSO." ; Text [ portuguese_brazilian ] = "Ein beliebiger Wert oder Ausdruck, der WAHR oder FALSCH sein kann." ; Text [ portuguese ] = "é qualquer valor ou expressão que pode ser VERDADEIRO ou FALSO." ; - Text [ finnish ] = "Arvo tai lauseke, joka voi olla joko TRUE tai UNTRUE." ; + Text [ finnish ] = "Arvo tai lauseke, joka voi olla joko TOSI tai EPÄTOSI." ; Text [ danish ] = "En vilkårlig værdi eller et vilkårligt udtryk som kan være SAND eller FALSK." ; Text [ french ] = "Toute valeur ou expression dont le résultat peut être VRAI ou FAUX." ; Text [ swedish ] = "Ett valfritt värde eller uttryck som kan beräknas till SANT eller FALSKT." ; @@ -12843,6 +13257,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "DOÐRU ya da YANLIÞ olabilecek herhangi bir deðer ya da terim."; Text[ language_user1 ] = " "; Text[ catalan ] = "Qualsevol valor o expressió que tant pot ser TRUE com FALSE."; + Text[ thai ] = "ค่าหรืà¸à¸™à¸´à¸žà¸ˆà¸™à¹Œà¹ƒà¸” ๆ ที่ไม่ จริงà¸à¹‡ เท็จ"; }; String 4 // Name of Parameter 2 { @@ -12860,7 +13275,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor_si_verdadero" ; Text [ english_us ] = "Then_value" ; Text[ chinese_simplified ] = "value_if_true"; - Text[ russian ] = "Çíà÷åíèå_åñëè_èñòèíà"; + Text[ russian ] = "Òîãäà çíà÷åíèå"; Text[ polish ] = "wartoœæ_je¿eli_prawda"; Text[ japanese ] = "TRUE ã®å ´åˆ"; Text[ chinese_traditional ] = "value_if_true"; @@ -12872,6 +13287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "O halde_deðeri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Then_value"; + Text[ thai ] = "ฉะนั้น_ค่า"; }; String 5 // Description of Parameter 2 { @@ -12882,7 +13298,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore che viene restituito se Test è VERO." ; Text [ portuguese_brazilian ] = "Das Resultat der Funktion, wenn die Wahrheitspr?ung WAHR ergibt." ; Text [ portuguese ] = "é o valor devolvido se teste_lógico for VERDADEIRO." ; - Text [ finnish ] = "Funktion tulos, jos loogisen testin tulos on TRUE." ; + Text [ finnish ] = "Funktion tulos, jos loogisen testin tulos on TOSI." ; Text [ danish ] = "Funktionens resultat hvis logisk_test er SAND." ; Text [ french ] = "La valeur renvoyée si le test logique est VRAI." ; Text [ swedish ] = "Resultatet av funktionen om det logiska testet är SANT." ; @@ -12890,7 +13306,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el valor que se devolverá si prueba_lógica es VERDADERO." ; Text [ english_us ] = "The result of the function if the logical test returns a TRUE." ; Text[ chinese_simplified ] = "如果逻辑测试结果为 TRUE ，则å馈函数值。"; - Text[ russian ] = "Çíà÷åíèå, êîòîðîå âîçâðàùàåòñÿ, åñëè ëîã_êîíòðîëü èìååò çíà÷åíèå ÈÑÒÈÍÀ."; + Text[ russian ] = "Çíà÷åíèå, êîòîðîå âîçâðàùàåòñÿ, åñëè òåñò èìååò çíà÷åíèå ÈÑÒÈÍÀ."; Text[ polish ] = "Wynik funkcji, jeœli test_logiczny wyznaczy wartoœæ PRAWDA."; Text[ japanese ] = "è«–ç†å¼ã®çµæžœãŒ TRUE ã®ã¨ãã«è¿”ã™å€¤ã€‚"; Text[ chinese_traditional ] = "如果é‚輯測試çµæžœç‚º TRUE ï¹å‰‡å‚³å›žå‡½æ•¸å€¼ã€‚"; @@ -12902,6 +13318,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Mantýksal denetim DOÐRU sonucuna ulaþtýðýnda fonksiyonun sonucu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Resultat de la funció si la verificació lògica torna un TRUE."; + Text[ thai ] = "ผลลัพธ์ขà¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™à¸–้าà¸à¸²à¸£à¸—ดสà¸à¸šà¸—างตรรà¸à¸°à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸š จริง"; }; String 6 // Name of Parameter 3 { @@ -12919,7 +13336,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor_si_falso" ; Text [ english_us ] = "Otherwise_value" ; Text[ chinese_simplified ] = "value_if_false"; - Text[ russian ] = "Çíà÷åíèå_åñëè_ëîæü"; + Text[ russian ] = "Èíà÷å çíà÷åíèå"; Text[ polish ] = "wartoœæ_je¿eli_fa³sz"; Text[ japanese ] = "FALSE ã®å ´åˆ"; Text[ chinese_traditional ] = "value_if_false"; @@ -12931,6 +13348,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yoksa_deðeri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Otherwise_value"; + Text[ thai ] = "มิฉะนั้น_ค่า"; }; String 7 // Description of Parameter 3 { @@ -12941,7 +13359,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore che viene restituito se Test è FALSO." ; Text [ portuguese_brazilian ] = "Das Resultat der Funktion, wenn die Wahrheitspr?ung FALSCH ergibt." ; Text [ portuguese ] = "é o valor devolvido se teste_lógico for FALSO" ; - Text [ finnish ] = "Funktion tulos, jos loogisen testin tulos on UNTRUE." ; + Text [ finnish ] = "Funktion tulos, jos loogisen testin tulos on EPÄTOSI." ; Text [ danish ] = "Funktionens resultat hvis logisk_test er FALSK." ; Text [ french ] = "La valeur renvoyée si le test logique est FAUX." ; Text [ swedish ] = "Resultatet av funktionen om det logiska testet är FALSKT." ; @@ -12949,7 +13367,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el valor que se devolverá si prueba_lógica es FALSO." ; Text [ english_us ] = "The result of the function if the logical test returns FALSE." ; Text[ chinese_simplified ] = "如果逻辑测试结果为 FALSE ，则å馈函数值。"; - Text[ russian ] = "Çíà÷åíèå, êîòîðîå âîçâðàùàåòñÿ, åñëè ëîã_êîíòðîëü èìååò çíà÷åíèå ËÎÆÜ."; + Text[ russian ] = "Çíà÷åíèå, êîòîðîå âîçâðàùàåòñÿ, åñëè òåñò èìååò çíà÷åíèå ËÎÆÜ."; Text[ polish ] = "Wynik funkcji, jeœli test_logiczny wyznaczy wartoœæ FA£SZ."; Text[ japanese ] = "è«–ç†å¼ã®çµæžœãŒ FALSE ã®ã¨ãã«è¿”ã™å€¤ã€‚"; Text[ chinese_traditional ] = "如果é‚輯測試çµæžœç‚º FALSE ï¹å‰‡å‚³å›žå‡½æ•¸å€¼ã€‚"; @@ -12961,6 +13379,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Mantýksal denetim YANLIÞ sonucuna ulaþtýðýnda fonksiyonun sonucu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Resultat de la funció si la verificació lògica torna FALSE."; + Text[ thai ] = "ผลลัพธ์ขà¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™à¸–้าà¸à¸²à¸£à¸—ดสà¸à¸šà¸—างตรรà¸à¸°à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸š เท็จ"; }; }; // -=*# Resource for function ODER #*=- @@ -12974,7 +13393,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se almeno un argomento è VERO." ; Text [ portuguese_brazilian ] = "Setzt WAHR, wenn ein Argument WAHR ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se algum dos argumentos for VERDADEIRO." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos kaikki argumentit ovat tosia." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos kaikki argumentit ovat tosia." ; Text [ danish ] = "Returnerer SAND, hvis et argument er SAND." ; Text [ french ] = "Renvoie VRAI si un argument est VRAI." ; Text [ swedish ] = "Returnerar SANT om ett argument är SANT." ; @@ -12994,6 +13413,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðiþken DOÐRU ise DOÐRU sonucunu verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si un argument és TRUE."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าà¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์เป็น จริง"; }; ExtraData = { @@ -13009,12 +13429,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore logico " ; Text [ portuguese_brazilian ] = "Wahrheitswert " ; Text [ portuguese ] = "Valor_lógico " ; - Text [ finnish ] = "Looginen arvo" ; + Text [ finnish ] = "Looginen arvo " ; Text [ danish ] = "Logisk værdi " ; Text [ french ] = "Valeur_logique " ; Text [ swedish ] = "Logiskt värde " ; - Text [ dutch ] = "Logische waarde " ; - Text [ spanish ] = "valor_lógico " ; + Text [ dutch ] = "Logische waarde" ; + Text [ spanish ] = "Valor lógico " ; Text [ english_us ] = "Logical value " ; Text[ chinese_simplified ] = "logical value "; Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå "; @@ -13022,13 +13442,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "è«–ç†å€¤ "; Text[ chinese_traditional ] = "Logical Value "; Text[ arabic ] = "Logical Value "; - Text[ dutch ] = "Logische waarde "; + Text[ dutch ] = "Logische waarde"; Text[ chinese_simplified ] = "logical value "; Text[ greek ] = "ËïãéêÞ ôéìÞ "; Text[ korean ] = "논리 ê°’"; Text[ turkish ] = "Mantýksal deðer "; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor lògic "; + Text[ thai ] = "ค่าทางตรรà¸à¸° "; }; String 3 // Description of Parameter 1 { @@ -13039,7 +13460,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore logico 1; Valore logico 2;... sono da 1 a 30 condizioni da verificare che possono avere il valore VERO o FALSO." ; Text [ portuguese_brazilian ] = "Wahrheitswert 1;Wahrheitswert 2;... sind 1 bis 30 Bedingungen, die ?berpr?t werden sollen und jeweils entweder WAHR oder FALSCH liefern." ; Text [ portuguese ] = "é 1 até 30 condições a testar como VERDADEIRA ou FALSA." ; - Text [ finnish ] = "Looginen arvo 1, looginen arvo 2 ja niin edelleen ovat 1 - 30 ehtoa, jotka testataan ja jotka palauttavat joko arvon TRUE tai UNTRUE." ; + Text [ finnish ] = "Looginen arvo 1, looginen arvo 2 ja niin edelleen ovat 1 - 30 ehtoa, jotka testataan ja jotka palauttavat joko arvon TOSI tai EPÄTOSI." ; Text [ danish ] = "Logisk 1; logisk 2; ... er 1 til 30 betingelser, der skal testes og hver kan være enten SAND eller FALSK." ; Text [ french ] = "Valeur_logique 1, valeur_logique 2, ... sont de 1 à 30 conditions que vous souhaitez tester, et qui peuvent être soit VRAI, soit FAUX." ; Text [ swedish ] = "logisk1; logisk 2;... är 1 till 30 villkor som skall testas och som kan returnera antingen SANT eller FALSKT." ; @@ -13059,6 +13480,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Mantýksal deðer 1;mantýksal deðer 2;... Denetlenmeleri istenen ve DOÐRU ya da YANLIÞ sonucunu veren 1 - 30 arasý koþuldur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor lògic 1, valor lògic 2,... són entre 1 i 30 condicions que s'han de verificar i que tornen TRUE o bé FALSE."; + Text[ thai ] = "ค่าทางตรรà¸à¸° 1, ค่าทางตรรà¸à¸° 2,... เป็นเงื่à¸à¸™à¹„ขตั้งà¹à¸•à¹ˆ 1 ถึง 30 จะถูà¸à¸—ดสà¸à¸šà¹à¸¥à¸°à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸šà¹„ม่จริงà¸à¹‡à¹€à¸—็จ"; }; }; // -=*# Resource for function UND #*=- @@ -13072,7 +13494,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO solo se tutti gli argomenti hanno valore VERO." ; Text [ portuguese_brazilian ] = "Setzt WAHR, wenn alle Argumente WAHR sind." ; Text [ portuguese ] = "Devolver VERDADEIRO, se todos os argumentos forem VERDADEIROS" ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos kaikki argumentit ovat tosia." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos kaikki argumentit ovat tosia." ; Text [ danish ] = "Returnerer SAND, hvis alle argumenter er SAND." ; Text [ french ] = "Renvoie VRAI si tous les arguments sont VRAI." ; Text [ swedish ] = "Returnerar SANT om alla argument är lika med SANT.." ; @@ -13092,6 +13514,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tüm deðiþkenler DOÐRU ise DOÐRU verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si tots els arguments són TRUE."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าà¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ทั้งหมดเป็นจริง"; }; ExtraData = { @@ -13107,12 +13530,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore logico " ; Text [ portuguese_brazilian ] = "Wahrheitswert " ; Text [ portuguese ] = "Valor lógico " ; - Text [ finnish ] = "Looginen arvo" ; + Text [ finnish ] = "Looginen arvo " ; Text [ danish ] = "Logisk værdi " ; Text [ french ] = "Valeur logique " ; Text [ swedish ] = "logiskt värde " ; - Text [ dutch ] = "Logische waarde " ; - Text [ spanish ] = "Valor_lógico " ; + Text [ dutch ] = "Logische waarde" ; + Text [ spanish ] = "Valor lógico " ; Text [ english_us ] = "Logical value " ; Text[ chinese_simplified ] = "logical value "; Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå "; @@ -13120,13 +13543,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "è«–ç†å€¤ "; Text[ chinese_traditional ] = "Logical Value "; Text[ arabic ] = "Logical Value "; - Text[ dutch ] = "Logische waarde "; + Text[ dutch ] = "Logische waarde"; Text[ chinese_simplified ] = "logical value "; Text[ greek ] = "ËïãéêÞ ôéìÞ "; Text[ korean ] = "논리 ê°’"; Text[ turkish ] = "Mantýksal deðer "; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor lògic "; + Text[ thai ] = "ค่าทางตรรà¸à¸° "; }; String 3 // Description of Parameter 1 { @@ -13137,11 +13561,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valore logico 1; Valore logico 2;... sono da 1 a 30 condizioni da verificare che possono avere valore VERO o FALSO." ; Text [ portuguese_brazilian ] = "Wahrheitswert 1;Wahrheitswert 2;... sind 1 bis 30 Bedingungen, die ?berpr?t werden sollen und jeweils entweder WAHR oder FALSCH liefern." ; Text [ portuguese ] = "Valor lógico 1;Valor lógico 2;...são 1 a 30 condições a ser verificadas e a devolver como VERDADEIRO ou FALSO." ; - Text [ finnish ] = "Looginen arvo 1, looginen arvo 2 ja niin edelleen ovat 1 - 30 ehtoa, jotka testataan ja joista jokainen palauttaa joko arvon TRUE tai UNTRUE." ; + Text [ finnish ] = "Looginen arvo 1, looginen arvo 2 ja niin edelleen ovat 1 - 30 ehtoa, jotka testataan ja joista jokainen palauttaa joko arvon TOSI tai EPÄTOSI." ; Text [ danish ] = "Logisk 1; logisk 2; ... er 1 til 30 betingelser, der skal testes og hver kan være enten SAND eller FALSK." ; Text [ french ] = "Valeur logique 1, valeur logique 2, ... représentent 1 à 30 conditions qui doivent être testées et qui renvoient soit VRAI, soit FAUX." ; Text [ swedish ] = "Logisk1; logisk2;... är de 1 till 30 villkor som skall kontrolleras och som vardera returnerar antingen SANN eller FALSK." ; - Text [ dutch ] = "Logisch 1;Logisch 2;... zijn 1 tot 30 voorwaarden die moeten worden gecontroleerd en die ofwel WAAR of FOUT opleveren." ; + Text [ dutch ] = "Logisch 1;Logisch 2;... zijn 1 tot 30 voorwaarden die moeten worden gecontroleerd en die ofwel WAAR of ONWAAR opleveren." ; Text [ spanish ] = "Valor lógico 1; Valor lógico 2;...son de 1 a 30 condiciones que desea comprobar y que pueden ser VERDADERO o FALSO." ; Text [ english_us ] = "Logical value 1, logical value 2;...are 1 to 30 conditions to be tested and each returns either TRUE or FALSE." ; Text[ chinese_simplified ] = "逻辑值 1;逻辑值 2;... 是 1 至 30 个待检查的æ¡ä»¶å€¼ï¼Œ\n结果为 TRUE 或 FALSE 。"; @@ -13150,13 +13574,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "è«–ç†å€¤ 1;è«–ç†å€¤ 2;...㯠TRUE ã‹ FALSE ã‹ã‚’評価ã™ã‚‹1ã‹ã‚‰30個ã¾ã§ã®è«–ç†å€¤ã€‚"; Text[ chinese_traditional ] = "é‚輯值 1;é‚輯值 2;... 是 1 至 30 個待檢查的æ¢ä»¶å€¼ï¹çµæžœç‚º TRUE 或 FALSE 。"; Text[ arabic ] = "logical1;logical 2;... ãä 1 Åáì 30 ÔÑØÇð íÌÈ ÝÍÕåÇ æãä Çáããßä Ãä Êßæä TRUE Ãæ FALSE."; - Text[ dutch ] = "Logisch 1;Logisch 2;... zijn 1 tot 30 voorwaarden die moeten worden gecontroleerd en die ofwel WAAR of FOUT opleveren."; + Text[ dutch ] = "Logisch 1;Logisch 2;... zijn 1 tot 30 voorwaarden die moeten worden gecontroleerd en die ofwel WAAR of ONWAAR opleveren."; Text[ chinese_simplified ] = "逻辑值 1;逻辑值 2;... 是 1 至 30 个待检查的æ¡ä»¶å€¼ï¼Œ\n结果为 TRUE 或 FALSE 。"; Text[ greek ] = "ËïãéêÞ ôéìÞ 1, ËïãéêÞ ôéìÞ 2;...åßíáé áðü 1 Ýùò 30 óõíèÞêåò ïé ïðïßåò ðñÝðåé íá åëåã÷èïýí êáé äßíïõí Þ TRUE (ÁËÇÈÇÓ) Þ FALSE (ËÁÈÏÓ)."; Text[ korean ] = "논리 ê°’ 1, 논리 ê°’ 2;...는 테스트ë˜ì–´ì•¼ 하는 1ì—ì„œ 30ê¹Œì§€ì˜ ì¡°ê±´ì´ë©°, TRUE ë˜ëŠ” FALSE를 반환합니다."; Text[ turkish ] = "Mantýksal deðer 1;Mantýksal deðer 2;... kontrol edilmesi istenen, DOÐRU ya da YANLIÞ veren 1 - 30 arasý koþuldur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor lògic 1, valor lògic 2,... són entre 1 i 30 condicions que s'han de verificar i cada una de les quals tornen TRUE o FALSE."; + Text[ thai ] = "ค่าทางตรรà¸à¸° 1, ค่าทางตรรà¸à¸° 2;...เป็นเงื่à¸à¸™à¹„ขตั้งà¹à¸•à¹ˆ 1 ถึง 30 จะถูà¸à¸—ดสà¸à¸šà¹à¸¥à¸°à¹à¸•à¹ˆà¸¥à¸°à¹€à¸‡à¸·à¹ˆà¸à¸™à¹„ขจะส่งà¸à¸¥à¸±à¸šà¹„ม่จริงà¸à¹‡à¹€à¸—็จ"; }; }; // -=*# Resource for function ABS #*=- @@ -13178,7 +13603,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Valor absoluto de un número." ; Text [ english_us ] = "Absolute value of a number." ; Text[ chinese_simplified ] = "一个数å—çš„ç»å¯¹å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò àáñîëþòíîå çíà÷åíèå ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå ÷èñåë ïî ìîäóëþ (àáñîëþòíîå çíà÷åíèå ÷èñëà)."; Text[ polish ] = "Oblicza wartoœæ bezwzglêdn¹ liczby."; Text[ japanese ] = "数値ã®çµ¶å¯¾å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "一個數å—的絕å°å€¼ã€‚"; @@ -13190,6 +13615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn mutlak deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor absolut d'un nombre."; + Text[ thai ] = "ค่าสัมบูรณ์ขà¸à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚"; }; ExtraData = { @@ -13225,6 +13651,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -13242,7 +13669,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "número real cuyo valor absoluto se desea obtener." ; Text [ english_us ] = "The number whose absolute value is to be returned." ; Text[ chinese_simplified ] = "è¦è®¡ç®—å…¶ç»å¯¹å€¼çš„æ•°å—。"; - Text[ russian ] = "×èñëî, äëÿ êîòîðîãî âû÷èñëÿåòñÿ àáñîëþòíîå çíà÷åíèå."; + Text[ russian ] = "×èñëî, äëÿ êîòîðîãî âîçâðàùàåòñÿ àáñîëþòíîå çíà÷åíèå."; Text[ polish ] = "Liczba, której wartoœæ bezwzglêdna ma zostaæ obliczona."; Text[ japanese ] = "絶対値を求ã‚る実数。"; Text[ chinese_traditional ] = "è¦è¨ˆç®—其絕å°å€¼çš„數å—。"; @@ -13254,6 +13681,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Mutlak deðeri hesaplanan sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre el valor absolut del qual s'ha de tornar."; + Text[ thai ] = "ตัวเลขขà¸à¸‡à¸„่าสัมบูรณ์ที่ถูà¸à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸š"; }; }; // -=*# Resource for function POTENZ #*=- @@ -13267,7 +13695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il risultato di un numero elevato alla potenza indicata." ; Text [ portuguese_brazilian ] = "Potenziert eine Zahl mit einer anderen." ; Text [ portuguese ] = "Devolve o valor de um número elevado a uma potência." ; - Text [ finnish ] = "Korottaa luvun potenssiin (joka määräytyy toisen luvun perusteella)." ; + Text [ finnish ] = "Korottaa luvun potenssiin, joka määräytyy toisen luvun perusteella." ; Text [ danish ] = "Beregner resultatet af et tal opløftet til en potens." ; Text [ french ] = "Renvoie la valeur du nombre élevé à une puissance." ; Text [ swedish ] = "Resultatet av ett tal upphöjt till en exponent." ; @@ -13275,7 +13703,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el resultado de elevar el argumento número a una potencia." ; Text [ english_us ] = "Raises a number to the power of another." ; Text[ chinese_simplified ] = "æ•°å—的乘幂。"; - Text[ russian ] = "Âîçâðàùàåò ðåçóëüòàò âîçâåäåíèÿ â ñòåïåíü."; + Text[ russian ] = "Âîçâîäèò ÷èñëî â ñòåïåíü."; Text[ polish ] = "Podaje wartoœæ liczby podniesionej do potêgi."; Text[ japanese ] = "数値ã®ã¹ãä¹—ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "數å—的乘冪。"; @@ -13287,6 +13715,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýyý baþka bir sayýnýn kuvvetine çýkarýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Eleva un nombre a la potència d'un altre."; + Text[ thai ] = "ยà¸à¸à¸³à¸¥à¸±à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚ให้à¸à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚à¸à¸·à¹ˆà¸™"; }; ExtraData = { @@ -13307,7 +13736,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Base" ; Text [ swedish ] = "bas" ; Text [ dutch ] = "Basis" ; - Text [ spanish ] = "número" ; + Text [ spanish ] = "Base" ; Text [ english_us ] = "Base" ; Text[ chinese_simplified ] = "Base"; Text[ russian ] = "Îñíîâàíèå"; @@ -13318,10 +13747,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Basis"; Text[ chinese_simplified ] = "Base"; Text[ greek ] = "ÂÜóç"; - Text[ korean ] = "기본"; + Text[ korean ] = "Base"; Text[ turkish ] = "Taban"; Text[ language_user1 ] = " "; Text[ catalan ] = "Base"; + Text[ thai ] = "à¸à¸²à¸™"; }; String 3 // Description of Parameter 1 { @@ -13351,6 +13781,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kuvveti alýnacak sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'elevar a la potència d'un altre."; + Text[ thai ] = "ตัวเลขที่เป็นตัวถูà¸à¸¢à¸à¸à¸³à¸¥à¸±à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚à¸à¸·à¹ˆà¸™"; }; String 4 // Name of Parameter 2 { @@ -13376,10 +13807,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Macht"; Text[ chinese_simplified ] = "Power"; Text[ greek ] = "Äýíáìç"; - Text[ korean ] = "ê±°ë“ì œê³±"; + Text[ korean ] = "지수"; Text[ turkish ] = "Kuvvet"; Text[ language_user1 ] = " "; Text[ catalan ] = "Potència"; + Text[ thai ] = "ยà¸à¸à¸³à¸¥à¸±à¸‡"; }; String 5 // Description of Parameter 2 { @@ -13397,7 +13829,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el exponente al que desea elevar el número base." ; Text [ english_us ] = "The power by which the number is to be raised." ; Text[ chinese_simplified ] = "指数，底数按该指数次幂乘方。"; - Text[ russian ] = "Ïîêàçàòåëü ñòåïåíè, â êîòîðóþ âîçâîäèòñÿ îñíîâàíèå."; + Text[ russian ] = "Ïîêàçàòåëü ñòåïåíè, â êîòîðóþ âîçâîäèòñÿ ÷èñëî."; Text[ polish ] = "Wyk³adnik potêgi."; Text[ japanese ] = "数値を底ã¨ã™ã‚‹ã¹ãä¹—ã®æŒ‡æ•°ã€‚"; Text[ chinese_traditional ] = "指數ï¹åº•æ•¸æŒ‰è©²æŒ‡æ•¸æ¬¡å†ªä¹˜æ–¹ã€‚"; @@ -13409,6 +13841,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn kuvvetinin alýnacaðý üs"; Text[ language_user1 ] = " "; Text[ catalan ] = "Potència a què s'ha d'elevar el nombre."; + Text[ thai ] = "ยà¸à¸à¸³à¸¥à¸±à¸‡à¹‚ดยตัวเลขยà¸à¸à¸³à¸¥à¸±à¸‡à¸™à¸±à¹‰à¸™"; }; }; // -=*# Resource for function ANZAHLLEEREZELLEN #*=- @@ -13430,7 +13863,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Cuenta el número de celdas vacías dentro de un área." ; Text [ english_us ] = "Counts the blank cells in a specified range." ; Text[ chinese_simplified ] = "计算一个区域ä¸ç©ºç™½å•å…ƒæ ¼çš„数目。"; - Text[ russian ] = "Ïîäñ÷èòûâàåò ïóñòûå ÿ÷åéêè â çàäàííîé îáëàñòè."; + Text[ russian ] = "Ïîäñ÷èòûâàåò ïóñòûå ÿ÷åéêè â óêàçàííîé îáëàñòè."; Text[ polish ] = "Liczy puste komórki w wyznaczonym obszarze."; Text[ japanese ] = "指定範囲ã®ç©ºç™½ã‚»ãƒ«ã®æ•°ã‚’æ•°ãˆã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個å€åŸŸä¸ç©ºç™½å„²å˜æ ¼çš„數目。"; @@ -13438,10 +13871,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Telt het aantal cellen in een bereik."; Text[ chinese_simplified ] = "计算一个区域ä¸ç©ºç™½å•å…ƒæ ¼çš„数目。"; Text[ greek ] = "Áñéèìåß ôá êåíÜ êåëéÜ ìéáò ðåñéï÷Þò."; - Text[ korean ] = "ì˜ì—ì—ì„œ 빈 ì…€ 갯수 세기"; + Text[ korean ] = "범위ì—ì„œ 빈 ì…€ 갯수 세기"; Text[ turkish ] = "Belirli bir aralýktaki boþ hücreleri sayar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Compta les cel·les en blanc d'una àrea indicada."; + Text[ catalan ] = "Compta les cel.les en blanc d'una àrea indicada."; + Text[ thai ] = "นับเซลล์ที่ว่างในช่วงที่ระบุ"; }; ExtraData = { @@ -13473,10 +13907,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "range"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "ì˜ì—"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea"; + Text[ thai ] = "ช่วง"; }; String 3 // Description of Parameter 1 { @@ -13502,10 +13937,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bereik waarin lege cellen worden geteld."; Text[ chinese_simplified ] = "è¦è®¡ç®—å…¶ä¸ç©ºç™½å•å…ƒæ ¼æ•°ç›®çš„区域。"; Text[ greek ] = "Ðåñéï÷Þ óôçí ïðïßá áñéèìïýíôáé ôá êåíÜ êåëéÜ."; - Text[ korean ] = "빈 ì…€ì´ ê³„ìˆ˜ë˜ëŠ” ì˜ì—"; + Text[ korean ] = "빈 ì…€ì´ ê³„ìˆ˜ë˜ëŠ” 범위"; Text[ turkish ] = "Boþ hücrelerin sayýldýðý aralýk."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea les cel·les buides de la qual s'han de comptar."; + Text[ catalan ] = "Àrea les cel.les buides de la qual s'han de comptar."; + Text[ thai ] = "ช่วงในเซลล์ที่ว่างที่ถูà¸à¸™à¸±à¸š"; }; }; // -=*# Resource for function PI #*=- @@ -13527,7 +13963,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el valor del número Pi." ; Text [ english_us ] = "Returns the value of the number Pi." ; Text[ chinese_simplified ] = "求出数å¦å¸¸æ•° π。"; - Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå ÷èñëà Ïè."; + Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå ÷èñëà Ïè (3.14)."; Text[ polish ] = "Podaje wartoœæ liczby Pi."; Text[ japanese ] = "円周率 Ï€ ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "求出數å¸å¸¸æ•¸ π。"; @@ -13539,6 +13975,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Pi sayýsýnýn deðerini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor del nombre pi."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าขà¸à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚ Pi."; }; ExtraData = { @@ -13562,22 +13999,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Lægger argumenterne sammen." ; Text [ french ] = "Calcule la somme des arguments." ; Text [ swedish ] = "Summerar argumenten." ; - Text [ dutch ] = "Geeft als resultaat de som der argumenten." ; + Text [ dutch ] = "Geeft als resultaat de som van de argumenten." ; Text [ spanish ] = "Devuelve la suma de los argumentos." ; Text [ english_us ] = "Returns the sum of all arguments." ; Text[ chinese_simplified ] = "å…ƒç´ æ±‡æ€»æ±‚å’Œã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ñóììó âñåõ àðãóìåíòîâ."; + Text[ russian ] = "Âîçâðàùàåò ñóììó âñåõ àðãóìåíòîâ."; Text[ polish ] = "Sumuje argumenty."; Text[ japanese ] = "引数ã®åˆè¨ˆã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å…ƒç´ åŒ¯ç¸½æ±‚å’Œã€‚"; Text[ arabic ] = "ÊÌãÚ ÇáæÓÇÆØ."; - Text[ dutch ] = "Geeft als resultaat de som der argumenten."; + Text[ dutch ] = "Geeft als resultaat de som van de argumenten."; Text[ chinese_simplified ] = "å…ƒç´ æ±‡æ€»æ±‚å’Œã€‚"; Text[ greek ] = "Áèñïßæåé ôá ïñßóìáôá."; Text[ korean ] = "ë…립 변수를 합산합니다."; Text[ turkish ] = "Deðiþkenlerin toplamýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la suma de tots els arguments."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸£à¸§à¸¡à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ทั้งหมด"; }; ExtraData = { @@ -13593,26 +14031,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "Áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -13642,6 +14081,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý 1; sayý 2;... Toplamý hesaplanacak 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments el total dels quals s'ha de calcular."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ตั้งà¹à¸•à¹ˆ 1 ถึง 30 ขà¸à¸‡à¸à¸²à¸£à¸„ำนวณผลรวมทั้งหมด"; }; }; // -=*# Resource for function QUADRATESUMME #*=- @@ -13675,6 +14115,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðiþkenlerin karelerini toplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la suma dels quadrats dels arguments."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸£à¸§à¸¡à¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; ExtraData = { @@ -13690,26 +14131,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -13739,6 +14181,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý 1; sayý 2;... Karelerinin toplamý alýnacak 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2,... són entre 1 i 30 arguments la suma dels quadrats dels quals s'ha de calcular."; + Text[ thai ] = "เลข 1, เลข 2,... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ตั้งà¹à¸•à¹ˆ 1 ถึง 30 สำหรับผลรวมขà¸à¸‡à¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸—ี่ถูà¸à¸„ำนวณ"; }; }; // -=*# Resource for function PRODUKT #*=- @@ -13772,6 +14215,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðiþkenleri çarpar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Multiplica els arguments."; + Text[ thai ] = "ตัวคูณà¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; ExtraData = { @@ -13787,11 +14231,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "Luku" ; + Text [ finnish ] = "Luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "Number " ; Text[ chinese_simplified ] = "number "; @@ -13800,13 +14244,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "Áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -13836,6 +14281,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý 1; sayý 2;... Çarpýmlarý alýnmak istenen 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments que s'han de multiplicar i tornar un resultat."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ตั้งà¹à¸•à¹ˆ 1 ถึง 30 ที่ถูà¸à¸„ูณà¹à¸¥à¸°à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸šà¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œ"; }; }; // -=*# Resource for function SUMMEWENN #*=- @@ -13870,6 +14316,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Koþullara uyan deðiþkenlerin toplamýný alýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Suma els arguments que compleixen les condicions."; + Text[ thai ] = "à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ทั้งหมดที่พบเงื่à¸à¸™à¹„ข"; }; ExtraData = { @@ -13901,10 +14348,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "range"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "ì˜ì—"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea"; + Text[ thai ] = "ช่วง"; }; String 3 // Description of Parameter 1 { @@ -13930,10 +14378,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bereik waarop de criteria worden toegepast."; Text[ chinese_simplified ] = "采用æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ç ðåñéï÷Þ óôçí ïðïßá èá åöáñìïóôïýí ôá êñéôÞñéá."; - Text[ korean ] = "ê¸°ì¤€ì´ ì ìš©ë ì˜ì—"; + Text[ korean ] = "ê¸°ì¤€ì´ ì ìš©ë 범위"; Text[ turkish ] = "Ölçütlerin uygulanacaðý aralýk."; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea que s'ha d'avaluar pels criteris donats."; + Text[ thai ] = "ช่วงที่ถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าโดยเà¸à¸“ฑ์ที่ให้มา"; }; String 4 // Name of Parameter 2 { @@ -13951,7 +14400,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "criterios" ; Text [ english_us ] = "criteria" ; Text[ chinese_simplified ] = "criteria"; - Text[ russian ] = "Êðèòåðèè"; + Text[ russian ] = "Êðèòåðèé"; Text[ polish ] = "Kryteria"; Text[ japanese ] = "æ¡ä»¶"; Text[ chinese_traditional ] = "criteria"; @@ -13963,6 +14412,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ölçütler"; Text[ language_user1 ] = " "; Text[ catalan ] = "criteris"; + Text[ thai ] = "เà¸à¸“ฑ์"; }; String 5 // Description of Parameter 2 { @@ -13988,10 +14438,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Cellenbereik waarin de zoekcriteria worden aangegeven."; Text[ chinese_simplified ] = "指定的æ¡ä»¶ã€‚"; Text[ greek ] = "Ðåñéï÷Þ êåëéþí, óôçí ïðïßá õðÜñ÷ïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì´ ì£¼ì–´ì§„ ì…€ ì˜ì—."; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ì§€ì •ëœ ì…€ 범위"; Text[ turkish ] = "Arama ölçütlerinin belirtildiði hücre aralýðý."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les en què es donen els criteris de cerca."; + Text[ catalan ] = "Àrea de cel.les en què es donen els criteris de cerca."; + Text[ thai ] = "ช่วงเซลล์ในเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหาที่ให้มา"; }; String 6 // Name of Parameter 3 { @@ -14005,22 +14456,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Sum_område" ; Text [ french ] = "Plage_somme" ; Text [ swedish ] = "summaområde" ; - Text [ dutch ] = "Som-bereik" ; + Text [ dutch ] = "Bereik som" ; Text [ spanish ] = "Área de suma" ; Text [ english_us ] = "sum_range" ; Text[ chinese_simplified ] = "sum_range"; - Text[ russian ] = "Äèàïàçîí_ñóììèðîâàíèÿ"; + Text[ russian ] = "Äèàïàçîí ñóììèðîâàíèÿ"; Text[ polish ] = "Zakres sumowania"; Text[ japanese ] = "åˆè¨ˆç¯„囲"; Text[ chinese_traditional ] = "sum_range"; Text[ arabic ] = "Sum_range"; - Text[ dutch ] = "Som-bereik"; + Text[ dutch ] = "Bereik som"; Text[ chinese_simplified ] = "sum_range"; Text[ greek ] = "Sum_range"; - Text[ korean ] = "합계_범위"; + Text[ korean ] = "합계 범위"; Text[ turkish ] = "Toplam aralýðý"; Text[ language_user1 ] = " "; Text[ catalan ] = "sum_range"; + Text[ thai ] = "ผลรวม_ช่วง"; }; String 7 // Description of Parameter 3 { @@ -14046,10 +14498,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bereik waarvan de waarden worden opgeteld."; Text[ chinese_simplified ] = "需è¦æ±‚和的å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ðåñéï÷Þ áðü ôçí ïðïßá áèñïßæïíôáé ïé ôéìÝò."; - Text[ korean ] = "ê°’ì´ í•©ê³„ë˜ëŠ” 범위."; + Text[ korean ] = "ê°’ì´ í•©ê³„ë˜ëŠ” 범위"; Text[ turkish ] = "Toplanacak deðerlerin bulunduðu aralýk."; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea des de la qual s'han de sumar els valors."; + Text[ thai ] = "ช่วงจาà¸à¸„่าที่ถูà¸à¸£à¸§à¸¡à¸—ั้งหมด"; }; }; // -=*# Resource for function ZÄHLENWENN #*=- @@ -14084,6 +14537,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Koþullara uyan deðiþkenleri sayar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Compta els arguments que compleixen les condicions indicades."; + Text[ thai ] = "นับà¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ที่พบเงื่à¸à¸™à¹„ขขà¸à¸‡à¹€à¸‹à¸•"; }; ExtraData = { @@ -14115,10 +14569,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "range"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "ì˜ì—"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea"; + Text[ thai ] = "ช่วง"; }; String 3 // Description of Parameter 1 { @@ -14144,10 +14599,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Bereik waarop de criteria worden toegepast."; Text[ chinese_simplified ] = "采用æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ç ðåñéï÷Þ óôçí ïðïßá èá åöáñìïóôïýí ôá êñéôÞñéá."; - Text[ korean ] = "ê¸°ì¤€ì´ ì ìš©ë˜ëŠ” ì˜ì—."; + Text[ korean ] = "ê¸°ì¤€ì´ ì ìš©ë˜ëŠ” 범위 "; Text[ turkish ] = "Ölçütlerin uygulandýðý aralýk."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Àrea de cel·les en què s'han d'aplicar els criteris."; + Text[ catalan ] = "Àrea de cel.les en què s'han d'aplicar els criteris."; + Text[ thai ] = "ช่วงขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¹ƒà¸™à¹€à¸à¸“ฑ์ที่ถูà¸à¹ƒà¸Šà¹‰"; }; String 4 // Name of Parameter 2 { @@ -14165,7 +14621,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Criterios" ; Text [ english_us ] = "criteria" ; Text[ chinese_simplified ] = "criteria"; - Text[ russian ] = "Êðèòåðèè"; + Text[ russian ] = "Êðèòåðèé"; Text[ polish ] = "Kryteria"; Text[ japanese ] = "æ¡ä»¶"; Text[ chinese_traditional ] = "criteria"; @@ -14177,6 +14633,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ölçütler"; Text[ language_user1 ] = " "; Text[ catalan ] = "criteris"; + Text[ thai ] = "เà¸à¸“ฑ์"; }; String 5 // Description of Parameter 2 { @@ -14202,10 +14659,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Cellenbereik waarin de zoekcriteria zijn aangegeven."; Text[ chinese_simplified ] = "指定采用æœå¯»æ¡ä»¶çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ðåñéï÷Þ êåëéþí, óôçí ïðïßá õðÜñ÷ïõí ôá êñéôÞñéá áíáæÞôçóçò."; - Text[ korean ] = "검색 ê¸°ì¤€ì´ ì •í•´ì ¸ 있는 ì…€ ì˜ì—"; + Text[ korean ] = "검색 ê¸°ì¤€ì´ ì •í•´ì ¸ 있는 ì…€ 범위 "; Text[ turkish ] = "Arama ölçütlerinin belirtildiði hücre aralýðý."; Text[ language_user1 ] = " "; - Text[ catalan ] = "L'àrea de cel·les en què s'indiquen els criteris."; + Text[ catalan ] = "L'àrea de cel.les en què s'indiquen els criteris."; + Text[ thai ] = "ช่วงเซลล์ในเà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหาที่ให้มา"; }; }; // -=*# Resource for function WURZEL #*=- @@ -14240,6 +14698,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn karekökünü verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna l'arrel quadrada d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸£à¸²à¸à¸—ี่สà¸à¸‡à¸‚à¸à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚"; }; ExtraData = { @@ -14275,6 +14734,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -14305,6 +14765,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Karekökü hesaplanmak istenen pozitif deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor positiu per a què s'ha de calcular l'arrel quadrada."; + Text[ thai ] = "ค่าบวà¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸£à¸²à¸à¸—ี่สà¸à¸‡à¸—ี่ถูà¸à¸„ำนวณ"; }; }; // -=*# Resource for function ZUFALLSZAHL #*=- @@ -14338,6 +14799,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "0 ile 1 arasýnda bulunan bir rasgele sayý verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna un nombre aleatori entre 0 i 1."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚สุ่มระหว่าง 0 à¹à¸¥à¸° 1"; }; ExtraData = { @@ -14357,7 +14819,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un numero pari." ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert eine gerade Zahl ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor é um número par." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on parillinen kokonaisluku." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on parillinen kokonaisluku." ; Text [ danish ] = "Returnerer SAND, hvis værdien er et lige tal." ; Text [ french ] = "Renvoie VRAI si la valeur est un nombre pair." ; Text [ swedish ] = "Returnerar SANT om värdet är ett jämnt tal." ; @@ -14365,7 +14827,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve VERDADERO si el valor es un número par." ; Text [ english_us ] = "Returns TRUE if value is an even integer." ; Text[ chinese_simplified ] = "如果数值是一个å¶æ•°ï¼Œé‚£å°±å馈 TRUE 。"; - Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ ÷åòíûì ÷èñëîì."; + Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ ÷åòíûì öåëûì ÷èñëîì."; Text[ polish ] = "Zwraca wartoœæ PRAWDA, jeœli liczba jest parzysta."; Text[ japanese ] = "値ãŒå¶æ•°ã®å ´åˆã€TRUE ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果數值是一個å¶æ•¸ï¹é‚£å°±å‚³å›ž TRUE 。"; @@ -14377,6 +14839,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer bir çift sayý ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és un enter parell."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเป็นจำนวนเต็มà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸”ียว"; }; ExtraData = { @@ -14412,6 +14875,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -14422,7 +14886,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Il valore da analizzare" ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -14442,6 +14906,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function ISTUNGERADE #*=- @@ -14455,7 +14920,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce VERO se il valore è un numero dispari" ; Text [ portuguese_brazilian ] = "Liefert WAHR, wenn der Wert eine ungerade Zahl ist." ; Text [ portuguese ] = "Devolve VERDADEIRO, se o valor é um número inteiro ímpar." ; - Text [ finnish ] = "Palauttaa arvon TRUE, jos arvo on pariton kokonaisluku." ; + Text [ finnish ] = "Palauttaa arvon TOSI, jos arvo on pariton kokonaisluku." ; Text [ danish ] = "Returnerer SAND, hvis værdien er et ulige tal." ; Text [ french ] = "Renvoie VRAI si la valeur est un nombre impair." ; Text [ swedish ] = "Returnerar SANT om värdet är ett udda tal." ; @@ -14463,7 +14928,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve VERDADERO si el valor es un número impar." ; Text [ english_us ] = "Returns TRUE if value is an odd integer." ; Text[ chinese_simplified ] = "如果这个数值是奇整数，那就å馈 TRUE。"; - Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ íå÷åòíûì ÷èñëîì."; + Text[ russian ] = "Âîçâðàùàåò ÈÑÒÈÍÀ, åñëè çíà÷åíèå ÿâëÿåòñÿ íå÷åòíûì öåëûì ÷èñëîì."; Text[ polish ] = "Zwraca wartoœæ PRAWDA, jeœli wartoœæ jest liczb¹ nieparzyst¹."; Text[ japanese ] = "値ãŒå¥‡æ•°ã®å ´åˆã€TRUE ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果這個數值是奇整數ï¹é‚£å°±å‚³å›ž TRUE。"; @@ -14475,6 +14940,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer bir tek sayý ise sonuç DOÐRU olur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna TRUE si el valor és un enter senar."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š จริง ถ้าค่าเป็นจำนวนเต็มคี่"; }; ExtraData = { @@ -14510,6 +14976,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -14520,7 +14987,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Il valore da controllare" ; Text [ portuguese_brazilian ] = "Der Wert, der gepr?t werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Den værdi som skal testes." ; Text [ french ] = "La valeur à examiner." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -14540,6 +15007,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Denetlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ค่าถูà¸à¸—ดสà¸à¸š"; }; }; // -=*# Resource for function KOMBINATIONEN #*=- @@ -14553,7 +15021,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il numero delle combinazioni di elementi senza ripetizione." ; Text [ portuguese_brazilian ] = "Berechnet die Anzahl der Kombinationen von Elementen ohne Wiederholung." ; Text [ portuguese ] = "Devolve o número de combinações de determinado número de elementos, sem repetições." ; - Text [ finnish ] = "Laskee osien yhdistelmien määrän (ilman toistoja)." ; + Text [ finnish ] = "Laskee osien yhdistelmien määrän ilman toistoja." ; Text [ danish ] = "Beregner antallet af kombinationer for elementer uden gentagelse." ; Text [ french ] = "Renvoie le nombre de combinaisons que l'on peut former avec les éléments, sans répétition." ; Text [ swedish ] = "Beräknar antalet kombinationer av element utan upprepning." ; @@ -14561,7 +15029,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el número de combinaciones para un número determinado de objetos." ; Text [ english_us ] = "Calculates the number of combinations for elements without repetition." ; Text[ chinese_simplified ] = "å…ƒç´ çš„æ‰€æœ‰å¯èƒ½çš„组åˆæ•°ç›®(ä¸é‡å¤è®¡ç®—)。"; - Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî êîìáèíàöèé äëÿ çàäàííîãî ÷èñëà îáúåêòîâ (áåç ïîâòîðåíèé)."; + Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî êîìáèíàöèé äëÿ çàäàííîãî ÷èñëà ýëåìåíòîâ (ñ ïîâòîðåíèåì)."; Text[ polish ] = "Zwraca liczbê kombinacji w podanej liczbie elementów bez powtarzania."; Text[ japanese ] = "n 個ã®ã‚‚ã®ã‹ã‚‰ r 個をã¨ã‚‹çµ„åˆã›ã®ç·æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å…ƒç´ çš„æ‰€æœ‰å¯èƒ½çš„組åˆæ•¸ç›®(ä¸é‡è¤‡è¨ˆç®—)。"; @@ -14573,6 +15041,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yinelenmeyen öðe kombinasyonlarýnýn sayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el nombre de combinacions per als elements sense repetició."; + Text[ thai ] = "คำนวณจำนวนขà¸à¸‡à¸à¸²à¸£à¸£à¸§à¸¡à¸à¸±à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ี่ไม่มีà¸à¸²à¸£à¸—ำซ้ำ"; }; ExtraData = { @@ -14596,7 +15065,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Cantidad_1" ; Text [ english_us ] = "number_1" ; Text[ chinese_simplified ] = "number_1"; - Text[ russian ] = "×èñëî_1"; + Text[ russian ] = "×èñëî 1"; Text[ polish ] = "Liczba_1"; Text[ japanese ] = "n"; Text[ chinese_traditional ] = "number_1"; @@ -14608,6 +15077,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Adet sayýsý_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "number_1"; + Text[ thai ] = "เลข_1"; }; String 3 // Description of Parameter 1 { @@ -14617,7 +15087,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero degli elementi." ; Text [ portuguese_brazilian ] = "Gesamtanzahl der Elemente." ; Text [ portuguese ] = "é a quantidade total de elementos." ; - Text [ finnish ] = "Elementtien kokonaismäärä." ; + Text [ finnish ] = "Elementtien kokonaismäärä" ; Text [ danish ] = "Det samlede antal elementer." ; Text [ french ] = "Le nombre total d'éléments." ; Text [ swedish ] = "Det totala antalet element." ; @@ -14625,7 +15095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el número de objetos." ; Text [ english_us ] = "The total number of elements." ; Text[ chinese_simplified ] = "å…ƒç´ çš„æ€»æ•°ã€‚"; - Text[ russian ] = "Îáùåå ÷èñëî îáúåêòîâ."; + Text[ russian ] = "Îáùåå ÷èñëî ýëåìåíòîâ."; Text[ polish ] = "Ogólna liczba elementów."; Text[ japanese ] = "è¦ç´ ã®ç·æ•°ã€‚"; Text[ chinese_traditional ] = "å…ƒç´ çš„ç¸½æ•¸ã€‚"; @@ -14637,6 +15107,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Toplam öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre total d'elements."; + Text[ thai ] = "รวมจำนวนà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ั้งหมด"; }; String 4 // Name of Parameter 2 { @@ -14654,7 +15125,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Cantidad_2" ; Text [ english_us ] = "number_2" ; Text[ chinese_simplified ] = "number_2"; - Text[ russian ] = "×èñëî_2"; + Text[ russian ] = "×èñëî 2"; Text[ polish ] = "Liczba_2"; Text[ japanese ] = "r"; Text[ chinese_traditional ] = "number_2"; @@ -14666,6 +15137,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Adet sayýsý_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "number_2"; + Text[ thai ] = "เลข_2"; }; String 5 // Description of Parameter 2 { @@ -14675,7 +15147,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero degli oggetti in ciascuna combinazione." ; Text [ portuguese_brazilian ] = "Auswahlanzahl aus den Elementen." ; Text [ portuguese ] = "é o número de elementos em cada combinação." ; - Text [ finnish ] = "Valittujen elementtien määrä." ; + Text [ finnish ] = "Valittujen elementtien määrä" ; Text [ danish ] = "Antallet af elementer i hver kombination." ; Text [ french ] = "Le nombre d'éléments dans chaque combinaison." ; Text [ swedish ] = "Urvalsantal från elementen." ; @@ -14695,6 +15167,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Seçilen öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre d'elements seleccionats."; + Text[ thai ] = "จำนวนà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ี่เลืà¸à¸"; }; }; // -=*# Resource for function KOMBINATIONEN2 #*=- @@ -14708,7 +15181,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il numero delle combinazioni di elementi con ripetizione." ; Text [ portuguese_brazilian ] = "Berechnet die Anzahl der Kombinationen von Elementen mit Wiederholung." ; Text [ portuguese ] = "Devolve o número de combinações de determinado número de objectos, com repetição." ; - Text [ finnish ] = "Laskee osien yhdistelmien määrän (mukaan lukien toistot)." ; + Text [ finnish ] = "Laskee osien yhdistelmien määrän toistot mukaan lukien." ; Text [ danish ] = "Beregner antallet af kombinationer for elementer med gentagelse." ; Text [ french ] = "Renvoie le nombre de combinaisons que l'on peut former avec les éléments, avec répétition." ; Text [ swedish ] = "Beräknar antalet kombinationer av element med upprepning." ; @@ -14716,7 +15189,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el número de combinaciones de elementos incluyendo las repeticiones." ; Text [ english_us ] = "Calculates the number of combinations of elements including repetition." ; Text[ chinese_simplified ] = "å…ƒç´ çš„æ‰€æœ‰å¯èƒ½çš„组åˆæ•°ç›®(é‡å¤è®¡ç®—)。"; - Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî êîìáèíàöèé äëÿ çàäàííîãî ÷èñëà îáúåêòîâ (ñ ïîâòîðåíèåì)."; + Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî êîìáèíàöèé äëÿ çàäàííîãî ÷èñëà ýëåìåíòîâ (ñ ïîâòîðåíèåì)."; Text[ polish ] = "Oblicza liczbê kombinacji elementów ³¹cznie z powtórk¹."; Text[ japanese ] = "n 個ã®ã‚‚ã®ã‹ã‚‰ r 個をã¨ã‚‹é‡è¤‡çµ„åˆã›ã®ç·æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å…ƒç´ çš„æ‰€æœ‰å¯èƒ½çš„組åˆæ•¸ç›®(é‡è¤‡è¨ˆç®—)。"; @@ -14728,6 +15201,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yinelenen öðe kombinasyonlarýnýn sayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el nombre de combinacions d'elements incloent-hi la repetició."; + Text[ thai ] = "คำนวณจำนวนà¸à¸²à¸£à¸£à¸§à¸¡à¸à¸‡à¸„์ประà¸à¸à¸šà¸£à¸§à¸¡à¸—ั้งà¸à¸²à¸£à¸—ำซ้ำ"; }; ExtraData = { @@ -14751,7 +15225,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Cantidad_1" ; Text [ english_us ] = "number_1" ; Text[ chinese_simplified ] = "number_1"; - Text[ russian ] = "×èñëî_1"; + Text[ russian ] = "×èñëî 1"; Text[ polish ] = "Liczba_1"; Text[ japanese ] = "n"; Text[ chinese_traditional ] = "number_1"; @@ -14763,6 +15237,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Adet sayýsý_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "number_1"; + Text[ thai ] = "เลข_1"; }; String 3 // Description of Parameter 1 { @@ -14772,26 +15247,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero totale degli elementi" ; Text [ portuguese_brazilian ] = "Gesamtanzahl der Elemente." ; Text [ portuguese ] = "é a quantidade total de elementos." ; - Text [ finnish ] = "Elementtien kokonaismäärä." ; + Text [ finnish ] = "Elementtien kokonaismäärä" ; Text [ danish ] = "Det samlede antal elementer." ; Text [ french ] = "Le nombre total d'éléments." ; Text [ swedish ] = "Det totala antalet element." ; - Text [ dutch ] = "Het totale aantal elementen." ; + Text [ dutch ] = "Totaal aantal elementen." ; Text [ spanish ] = "Es el número total de objetos." ; Text [ english_us ] = "The total number of elements." ; Text[ chinese_simplified ] = "å…ƒç´ çš„æ€»æ•°ã€‚"; - Text[ russian ] = "Îáùåå ÷èñëî îáúåêòîâ."; + Text[ russian ] = "Îáùåå ÷èñëî ýëåìåíòîâ."; Text[ polish ] = "Ogólna liczba elementów."; Text[ japanese ] = "è¦ç´ ã®ç·æ•°ã€‚"; Text[ chinese_traditional ] = "å…ƒç´ çš„ç¸½æ•¸ã€‚"; Text[ arabic ] = "ÇáÚÏÏ ÇáÅÌãÇáí ááÚäÇÕÑ."; - Text[ dutch ] = "Het totale aantal elementen."; + Text[ dutch ] = "Totaal aantal elementen."; Text[ chinese_simplified ] = "å…ƒç´ çš„æ€»æ•°ã€‚"; Text[ greek ] = "Óõíïëéêüò áñéèìüò óôïé÷åßùí."; Text[ korean ] = "ìš”ì†Œì˜ ì „ì²´ ê°’"; Text[ turkish ] = "Toplam öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre total d'elements."; + Text[ thai ] = "รวมจำนวนà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ั้งหมด"; }; String 4 // Name of Parameter 2 { @@ -14809,7 +15285,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Cantidad_2" ; Text [ english_us ] = "number_2" ; Text[ chinese_simplified ] = "number_2"; - Text[ russian ] = "×èñëî_2"; + Text[ russian ] = "×èñëî 2"; Text[ polish ] = "Liczba_2"; Text[ japanese ] = "r"; Text[ chinese_traditional ] = "number_2"; @@ -14821,6 +15297,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Adet sayýsý_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "number_2"; + Text[ thai ] = "เลข_2"; }; String 5 // Description of Parameter 2 { @@ -14830,7 +15307,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Quantità scelta di elementi" ; Text [ portuguese_brazilian ] = "Auswahlanzahl aus den Elementen." ; Text [ portuguese ] = "é o número de elementos em cada combinação." ; - Text [ finnish ] = "Valittujen elementtien määrä." ; + Text [ finnish ] = "Valittujen elementtien määrä" ; Text [ danish ] = "Antallet af elementer i hver kombination." ; Text [ french ] = "Le nombre d'éléments dans chaque combinaison." ; Text [ swedish ] = "Urvalsantal från elementen." ; @@ -14838,7 +15315,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el número de objetos en cada combinación." ; Text [ english_us ] = "The number of elements selected." ; Text[ chinese_simplified ] = "æ¯ä¸€ç»„åˆä¸å…ƒç´ 的数目。"; - Text[ russian ] = "Âûáðàííîå ÷èñëî îáúåêòîâ èç êàæäîé êîìáèíàöèè."; + Text[ russian ] = "Âûáðàííîå ÷èñëî ýëåìåíòîâ."; Text[ polish ] = "Liczba elementów do wyboru."; Text[ japanese ] = "1組ã®çµ„åˆã›ã«å«ã¾ã‚Œã‚‹è¦ç´ ã®æ•°ã€‚"; Text[ chinese_traditional ] = "æ¯ä¸€çµ„åˆä¸å…ƒç´ 的數目。"; @@ -14850,6 +15327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Seçilen öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre d'elements seleccionats."; + Text[ thai ] = "จำนวนà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ี่เลืà¸à¸"; }; }; // -=*# Resource for function ARCCOS #*=- @@ -14869,10 +15347,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Renvoie l'arc cosinus d'un nombre." ; Text [ swedish ] = "Beräknar arcus cosinus för ett tal." ; Text [ dutch ] = "Geeft de boogcosinus van een getal." ; - Text [ spanish ] = "Devuelve el arco coseno de un número." ; + Text [ spanish ] = "Devuelve el arcocoseno de un número." ; Text [ english_us ] = "Returns the arccosine of a number." ; Text[ chinese_simplified ] = "计算一个数的å余弦值。"; - Text[ russian ] = "Âû÷èñëÿåò àðêêîñèíóñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò àðêêîñèíóñ ÷èñëà."; Text[ polish ] = "Wyznacza arcus cosinus liczby."; Text[ japanese ] = "数値ã®ã‚¢ãƒ¼ã‚¯ã‚³ã‚µã‚¤ãƒ³ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的å余弦值。"; @@ -14884,6 +15362,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn arksinüsünü verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna l'arccosinus d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ arccosine "; }; ExtraData = { @@ -14919,6 +15398,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -14934,10 +15414,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Une valeur entre -1 et 1 dont l'arc cosinus doit être calculé." ; Text [ swedish ] = "Ett värde mellan 1 och 1 vars arcus cosinus skall beräknas." ; Text [ dutch ] = "Een waarde tussen -1 en 1, waarvan de boogcosinus moet worden berekend." ; - Text [ spanish ] = "valor entre -1 y 1, cuyo arcocoseno se desea calcular." ; + Text [ spanish ] = "El valor entre -1 y 1 cuyo arcocoseno se desea calcular." ; Text [ english_us ] = "A value between -1 and 1 for which the arccosine is to be returned." ; Text[ chinese_simplified ] = "一个è¦è®¡ç®—å…¶å余弦值的在 -1 å’Œ 1 之间的数值。"; - Text[ russian ] = "Çíà÷åíèå îò -1 äî 1, àðêêîñèíóñ êîòîðîãî íåîáõîäèìî âû÷èñëèòü."; + Text[ russian ] = "Çíà÷åíèå îò -1 äî 1, àðêêîñèíóñ êîòîðîãî íåîáõîäèìî âåðíóòü."; Text[ polish ] = "Wartoœæ z przedzia³u od -1 do 1, dla której ma zostaæ obliczony arcus cosinus."; Text[ japanese ] = "アークコサインを求ã‚ã‚‹-1ã‹ã‚‰1ã¾ã§ã®æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "一個è¦è¨ˆç®—å…¶å余弦值的在 -1 å’Œ 1 之間的數值。"; @@ -14949,6 +15429,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arksinüsü hesaplanacak -1 ile 1 arasý deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor entre -1 i 1 l'arccosinus del qual s'ha de tornar."; + Text[ thai ] = "ค่าระหว่าง -1 à¹à¸¥à¸° 1 สำหรับส่งà¸à¸¥à¸±à¸š arccosine "; }; }; // -=*# Resource for function ARCSIN #*=- @@ -14968,10 +15449,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Renvoie l'arc sinus d'un nombre." ; Text [ swedish ] = "Beräknar arcus sinus för ett tal." ; Text [ dutch ] = "Berekent de boogsinus van een getal." ; - Text [ spanish ] = "Devuelve el arco seno de un número." ; + Text [ spanish ] = "Devuelve el arcoseno de un número." ; Text [ english_us ] = "Returns the arcsine of a number." ; Text[ chinese_simplified ] = "计算一个数的åæ£å¼¦å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò àðêñèíóñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò àðêñèíóñ ÷èñëà."; Text[ polish ] = "Oblicza arcus sinus liczby."; Text[ japanese ] = "数値ã®ã‚¢ãƒ¼ã‚¯ã‚µã‚¤ãƒ³ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的åæ£å¼¦å€¼ã€‚"; @@ -14983,6 +15464,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn arksinüsünü hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna l'arcsinus d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ arcsine "; }; ExtraData = { @@ -15018,6 +15500,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15033,10 +15516,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Une valeur entre -1 et 1 dont l'arc sinus doit être calculé." ; Text [ swedish ] = "Ett värde mellan 1 och 1 vars inversa sinus skall beräknas." ; Text [ dutch ] = "Een waarde tussen -1 en 1, waarvan de boogsinus moet worden berekend." ; - Text [ spanish ] = "es el valor entre -1 y 1, cuyo arco seno se desea calcular." ; + Text [ spanish ] = "es el valor entre -1 y 1, cuyo arcoseno se desea calcular." ; Text [ english_us ] = "A value between -1 and 1 for which the arcsine is to be returned." ; Text[ chinese_simplified ] = "一个è¦è®¡ç®—å…¶åæ£å¼¦å€¼çš„在 -1 å’Œ 1 之间的数值。"; - Text[ russian ] = "Çíà÷åíèå îò -1 äî 1, àðêñèíóñ êîòîðîãî íåîáõîäèìî âû÷èñëèòü."; + Text[ russian ] = "Çíà÷åíèå îò -1 äî 1, àðêñèíóñ êîòîðîãî íåîáõîäèìî âåðíóòü."; Text[ polish ] = "Wartoœæ z przedzia³u od -1 do 1, dla której ma zostaæ obliczony arcus sinus."; Text[ japanese ] = "アークサインを求ã‚ã‚‹-1ã‹ã‚‰1ã¾ã§ã®æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "一個è¦è¨ˆç®—å…¶åæ£å¼¦å€¼çš„在 -1 å’Œ 1 之間的數值。"; @@ -15048,6 +15531,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arksinüsü hesaplanacak -1 ile 1 arasý deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor entre -1 i 1 l'arcsinus del qual s'ha de tornar."; + Text[ thai ] = "ค่าระหว่าง -1 à¹à¸¥à¸° 1 สำหรับส่งà¸à¸¥à¸±à¸š arcsine "; }; }; // -=*# Resource for function ARCCOSHYP #*=- @@ -15070,7 +15554,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el coseno hiperbólico inverso de un número." ; Text [ english_us ] = "Returns the inverse hyperbolic cosine of a number." ; Text[ chinese_simplified ] = "计算一个数的ååŒæ›²çº¿ä½™å¼¦å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ãèïåðáîëè÷åñêèé àðêêîñèíóñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò ãèïåðáîëè÷åñêèé àðêêîñèíóñ ÷èñëà."; Text[ polish ] = "Oblicza arcus cosinus hiperboliczny liczby."; Text[ japanese ] = "数値ã®åŒæ›²ç·šé€†ä½™å¼¦(ãƒã‚¤ãƒ‘ーボリックコサインã®é€†é–¢æ•°)ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的å雙曲線余弦值。"; @@ -15082,6 +15566,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn ters hiperbolik kosinüsünü verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el cosinus hiperbòlic invers d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸•à¸±à¸§à¹€à¸¥à¸‚ cosine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -15117,6 +15602,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15132,22 +15618,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "En værdi større eller lig med 1, som den inverse hyperbolske cosinus skal beregnes for." ; Text [ french ] = "Une valeur supérieure ou égale à 1 dont le cosinus hyperbolique inverse doit être calculé." ; Text [ swedish ] = "Ett värde större eller lika med 1, för vilket inverterad hyperbolisk cosinus skall beräknas." ; - Text [ dutch ] = "Een waarde groter of gelijk aan 1, waarvan de inverse cosinus hyperbolecus moet worden berekend." ; + Text [ dutch ] = "Een waarde groter of gelijk aan 1, waarvan de inverse cosinus hyperbolicus moet worden berekend." ; Text [ spanish ] = "es el valor mayor o igual a 1,cuyo coseno hiperbólico inverso se desea calcular." ; Text [ english_us ] = "A value greater than or equal to 1 for which the hyperbolic cosine is to be returned." ; Text[ chinese_simplified ] = "一个è¦è®¡ç®—å…¶ååŒæ›²ä½™å¼¦å€¼çš„大于或ç‰äºŽ 1 的数值。"; - Text[ russian ] = "Çíà÷åíèå, êîòîðîå áîëüøå èëè ðàâíî 1, ãèïåðáîëè÷åñêèé àðêêîñèíóñ êîòîðîãî íåîáõîäèìî âû÷èñëèòü."; + Text[ russian ] = "Çíà÷åíèå, áîëüøå èëè ðàâíî 1, ãèïåðáîëè÷åñêèé àðêêîñèíóñ êîòîðîãî íåîáõîäèìî âåðíóòü."; Text[ polish ] = "Dowolna liczba rzeczywista równa lub wiêksza od 1, dla której ma zostaæ obliczony arcus cosinus hiperboliczny."; Text[ japanese ] = "ãƒã‚¤ãƒ‘ーボリックコサインã®é€†é–¢æ•°ã‚’求ã‚ã‚‹1以上ã®æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "一個è¦è¨ˆç®—å…¶å雙曲余弦值的大於或ç‰æ–¼ 1 的數值。"; Text[ arabic ] = "Åí ÑÞã ÍÞíÞí íÓÇæí Ãæ ÃßÈÑ ãä 1."; - Text[ dutch ] = "Een waarde groter of gelijk aan 1, waarvan de inverse cosinus hyperbolecus moet worden berekend."; + Text[ dutch ] = "Een waarde groter of gelijk aan 1, waarvan de inverse cosinus hyperbolicus moet worden berekend."; Text[ chinese_simplified ] = "一个è¦è®¡ç®—å…¶ååŒæ›²ä½™å¼¦å€¼çš„大于或ç‰äºŽ 1 的数值。"; Text[ greek ] = "Ìéá ôéìÞ ìåãáëýôåñç Þ ßóç ôïõ 1, ôçò ïðïßáò èá õðïëïãéóôåß ôï õðåñâïëéêü óõíçìßôïíï."; Text[ korean ] = "ë©´ì 코사ì¸ì´ 계산ë˜ì–´ì•¼ 하는 1ê³¼ 같거나 1보다 í° ê°’."; Text[ turkish ] = "Hiperbolik kosinüsü hesaplanacak 1'den büyük ya da eþit deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor més gran que o igual a 1 el cosinus hiperbòlic del qual s'ha de tornar."; + Text[ thai ] = "ค่ามาà¸à¸à¸§à¹ˆà¸²à¸«à¸£à¸·à¸à¹€à¸—่าà¸à¸±à¸š 1 สำหรับส่งà¸à¸¥à¸±à¸š cosine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function ARCSINHYP #*=- @@ -15170,7 +15657,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el seno hiperbólico inverso de un número." ; Text [ english_us ] = "Returns the inverse hyperbolic sine of a number." ; Text[ chinese_simplified ] = "计算一个数的ååŒæ›²æ£å¼¦å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ãèïåðáîëè÷åñêèé àðêñèíóñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò ãèïåðáîëè÷åñêèé àðêñèíóñ ÷èñëà."; Text[ polish ] = "Oblicza arcus sinus hiperboliczny liczby."; Text[ japanese ] = "数値ã®åŒæ›²ç·šé€†æ£å¼¦(ãƒã‚¤ãƒ‘ーボリックサインã®é€†é–¢æ•°)ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的å雙曲æ£å¼¦å€¼ã€‚"; @@ -15182,6 +15669,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn (ters hiperbolik sinüsünü) verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el sinus hiperbòlic invers d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸•à¸±à¸§à¹€à¸¥à¸‚ sine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -15217,6 +15705,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15235,7 +15724,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor cuyo seno hiperbólico inverso se desea calcular." ; Text [ english_us ] = "The value for which the inverse hyperbolic sine is to be returned." ; Text[ chinese_simplified ] = "一个è¦è®¡ç®—å…¶ååŒæ›²æ£å¼¦å€¼çš„数值。"; - Text[ russian ] = "Çíà÷åíèå, ãèïåðáîëè÷åñêèé àðêñèíóñ êîòîðîãî íåîáõîäèìî âû÷èñëèòü."; + Text[ russian ] = "Çíà÷åíèå, ãèïåðáîëè÷åñêèé àðêñèíóñ êîòîðîãî íåîáõîäèìî âåðíóòü."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony arcus sinus hiperboliczny."; Text[ japanese ] = "åŒæ›²ç·šé€†æ£å¼¦ã‚’求ã‚る数値。"; Text[ chinese_traditional ] = "一個è¦è¨ˆç®—å…¶å雙曲æ£å¼¦å€¼çš„數值。"; @@ -15247,6 +15736,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ters hiperbolik sinüsü hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor el sinus hiperbòlic invers del qual s'ha de tornar."; + Text[ thai ] = "ค่าสำหรับส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¹Œ sine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function ARCCOT #*=- @@ -15269,7 +15759,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el arco cotangente de un número." ; Text [ english_us ] = "Returns the inverse cotangent of a number." ; Text[ chinese_simplified ] = "计算一个数的å余切值。"; - Text[ russian ] = "Âû÷èñëÿåò àðêêîòàíãåíñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò àðêêîòàíãåíñ ÷èñëà."; Text[ polish ] = "Oblicza arcus cotangens k¹ta."; Text[ japanese ] = "数値ã®ã‚¢ãƒ¼ã‚¯ã‚³ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的å余切值。"; @@ -15281,6 +15771,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn ters kotanjantýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la cotangent inversa d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸•à¸±à¸§à¹€à¸¥à¸‚ cotangent "; }; ExtraData = { @@ -15316,6 +15807,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15346,6 +15838,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ters kotanjantý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la cotangent inversa del qual s'ha de tornar."; + Text[ thai ] = "ค่าสำหรับส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ª cotangent "; }; }; // -=*# Resource for function ARCTAN #*=- @@ -15368,7 +15861,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el arco tangente de un número." ; Text [ english_us ] = "Returns the arctangent of a number." ; Text[ chinese_simplified ] = "计算一个数的åæ£åˆ‡å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò àðêòàíãåíñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò àðêòàíãåíñ ÷èñëà."; Text[ polish ] = "Wyznacza arcus tangens liczby."; Text[ japanese ] = "数値ã®ã‚¢ãƒ¼ã‚¯ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的åæ£åˆ‡å€¼ã€‚"; @@ -15380,6 +15873,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn arktanjantýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna l'arctangent d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ arctangent "; }; ExtraData = { @@ -15415,6 +15909,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15433,7 +15928,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor cuyo arco tangente se desea calcular." ; Text [ english_us ] = "The value for which the arctangent is to be returned." ; Text[ chinese_simplified ] = "è¦è®¡ç®—å…¶åæ£åˆ‡å€¼çš„数值。"; - Text[ russian ] = "Çíà÷åíèå, àðêòàíãåíñ êîòîðîãî âû÷èñëÿåòñÿ."; + Text[ russian ] = "Çíà÷åíèå, àðêòàíãåíñ êîòîðîãî âîçâðàùàåòñÿ."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony arcus tangens."; Text[ japanese ] = "アークタンジェントを求ã‚る数値。"; Text[ chinese_traditional ] = "è¦è¨ˆç®—å…¶åæ£åˆ‡å€¼çš„數值。"; @@ -15445,6 +15940,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Arktanjantý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor l'arctangent del qual s'ha de tornar."; + Text[ thai ] = "ค่าสำหรับส่งà¸à¸¥à¸±à¸š arctangent "; }; }; // -=*# Resource for function ARCCOTHYP #*=- @@ -15479,6 +15975,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn (ters hiperbolik kotanjantýný) verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la cotangent hiperbòlica inversa d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸•à¸±à¸§à¹€à¸¥à¸‚ขà¸à¸‡ cotangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -15514,6 +16011,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15533,7 +16031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el valor menor que -1 o mayor que 1, cuyas cotangentes hiperbólicas inversas se desea calcular." ; Text [ english_us ] = "A value smaller than -1 or greater than 1 for which the inverse hyperbolic cotangent is to be returned." ; Text[ chinese_simplified ] = "一个è¦è®¡ç®—å…¶ååŒæ›²ä½™åˆ‡å€¼å°äºŽ -1 和大于 1 之间的数值。"; - Text[ russian ] = "Çíà÷åíèå, êîòîðîå ìåíüøå -1 èëè áîëüøå 1, ãèïåðáîëè÷åñêèé àðêêîòàíãåíñ êîòîðîãî íåîáõîäèìî âû÷èñëèòü."; + Text[ russian ] = "Çíà÷åíèå, ìåíüøå -1 èëè áîëüøå 1, ãèïåðáîëè÷åñêèé àðêêîòàíãåíñ êîòîðîãî íåîáõîäèìî âû÷èñëèòü."; Text[ polish ] = "Wartoœæ równa lub wiêksza od 1, dla którejma zostaæ obliczony arcus cotangens hiperboliczny."; Text[ japanese ] = "åŒæ›²ç·šé€†ã‚³ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆã‚’求ã‚ã‚‹ã€-1よりå°ã•ã„数値ã€ã¾ãŸã¯1より大ãã„数値。"; Text[ chinese_traditional ] = "一個è¦è¨ˆç®—å…¶å雙曲余切值å°æ–¼ -1 和大於 1 之間的數值。"; @@ -15545,6 +16043,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ters hiperbolik kotanjantý hesaplanacak -1'den küçük ya da 1'den büyük deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor més petit que -1 o més gran que 1 la cotangent hiperbòlica inversa del qual s'ha de tornar."; + Text[ thai ] = "ค่าน้à¸à¸¢à¸à¸§à¹ˆà¸² -1 หรืà¸à¸¡à¸²à¸à¸à¸§à¹ˆà¸² 1 สำหรับà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ª cotangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function ARCTANHYP #*=- @@ -15567,7 +16066,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la tangente de área (tangente hiperbólica inversa) de un número." ; Text [ english_us ] = "Returns the inverse hyperbolic tangent of a number." ; Text[ chinese_simplified ] = "计算一个数的ååŒæ›²æ£åˆ‡å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ãèïåðáîëè÷åñêèé àðêòàíãåíñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò ãèïåðáîëè÷åñêèé àðêòàíãåíñ ÷èñëà."; Text[ polish ] = "Oblicza arcus tangens hiperboliczny liczby."; Text[ japanese ] = "数値ã®åŒæ›²ç·šé€†æ£æŽ¥(ãƒã‚¤ãƒ‘ーボリックタンジェントã®é€†é–¢æ•°)ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的å雙曲æ£åˆ‡å€¼ã€‚"; @@ -15579,6 +16078,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn ters hiperbolik tanjantýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la tangent hiperbòlica inversa d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸•à¸±à¸§à¹€à¸¥à¸‚ขà¸à¸‡ tangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -15614,6 +16114,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15644,6 +16145,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ters hiperbolik tanjantý hesaplanacak -1 ile 1 arasý deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor entre -1 i 1 la tangent hiperbòlica inversa del qual s'ha de tornar."; + Text[ thai ] = "ค่าระหว่าง -1 à¹à¸¥à¸° 1 สำหรับà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡ tangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function COS #*=- @@ -15678,6 +16180,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn kosinüsünü verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el cosinus d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¹€à¸¥à¸‚ cosine "; }; ExtraData = { @@ -15713,6 +16216,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15743,6 +16247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kosinüs deðeri hesaplanacak radyan cinsinden açý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Angle en radians el cosinus del qual s'ha de tornar."; + Text[ thai ] = "มุมในส่วนขà¸à¸‡à¸§à¸‡à¸à¸¥à¸¡à¸—ี่มีความà¸à¸§à¹‰à¸²à¸‡à¹€à¸—่าà¸à¸±à¸šà¸£à¸±à¸¨à¸¡à¸µà¸ªà¸³à¸«à¸£à¸±à¸šà¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸š cosine "; }; }; // -=*# Resource for function SIN #*=- @@ -15765,7 +16270,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el seno de un ángulo determinado." ; Text [ english_us ] = "Returns the sine of a number." ; Text[ chinese_simplified ] = "计算给定角度的æ£å¼¦å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ñèíóñ ÷èñëà."; + Text[ russian ] = "Âû÷èñëÿåò ñèíóñ äàííîãî ÷èñëà."; Text[ polish ] = "Oblicza sinus podanego k¹ta."; Text[ japanese ] = "指定ã—ãŸè§’度ã®ã‚µã‚¤ãƒ³ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算輸入角度的æ£å¼¦å€¼ã€‚"; @@ -15777,6 +16282,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn sinüsünü verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el sinus d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ sine "; }; ExtraData = { @@ -15812,6 +16318,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15842,6 +16349,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sinüsü hesaplanacak radyan cinsinden açý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Angle en radians el sinus del qual s'ha de calcular."; + Text[ thai ] = "มุมในส่วนขà¸à¸‡à¸§à¸‡à¸à¸¥à¸¡à¸—ี่มีความà¸à¸§à¹‰à¸²à¸‡à¹€à¸—่าà¸à¸±à¸šà¸£à¸±à¸¨à¸¡à¸µà¸ªà¸³à¸«à¸£à¸±à¸šà¸„ำนวณ sine "; }; }; // -=*# Resource for function COT #*=- @@ -15876,6 +16384,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn kotanjantýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la cotangent d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ cotangent "; }; ExtraData = { @@ -15911,6 +16420,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -15941,6 +16451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kotanjant deðeri hesaplanacak radyan cinsinden açý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Angle en radians el valor de la cotangent del qual s'ha de tornar."; + Text[ thai ] = "มุมในส่วนขà¸à¸‡à¸§à¸‡à¸à¸¥à¸¡à¸—ี่มีความà¸à¸§à¹‰à¸²à¸‡à¹€à¸—่าà¸à¸±à¸šà¸£à¸±à¸¨à¸¡à¸µà¸‚à¸à¸‡à¸„่า cotangent ที่ถูà¸à¸ªà¹ˆà¸‡à¸à¸¥à¸±à¸š"; }; }; // -=*# Resource for function TAN #*=- @@ -15975,6 +16486,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn tanjantýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la tangent d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ tangent "; }; ExtraData = { @@ -16010,6 +16522,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16040,6 +16553,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tanjantý hesaplanacak radyan cinsinden açý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Angle en radians la tangent del qual s'ha de calcular."; + Text[ thai ] = "มุมในส่วนขà¸à¸‡à¸§à¸‡à¸à¸¥à¸¡à¸—ี่มีความà¸à¸§à¹‰à¸²à¸‡à¹€à¸—่าà¸à¸±à¸šà¸£à¸±à¸¨à¸¡à¸µà¸ªà¸³à¸«à¸£à¸±à¸šà¸„ำนวณ tangent "; }; }; // -=*# Resource for function COSHYP #*=- @@ -16062,7 +16576,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el coseno hiperbólico de un número." ; Text [ english_us ] = "Returns the hyperbolic cosine of a number." ; Text[ chinese_simplified ] = "计算一个数的åŒæ›²ä½™å¼¦å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ãèïåðáîëè÷åñêèé êîñèíóñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò ãèïåðáîëè÷åñêèé êîñèíóñ ÷èñëà."; Text[ polish ] = "Oblicza cosinus hiperboliczny liczby."; Text[ japanese ] = "数値ã®åŒæ›²ç·šä½™å¼¦(ãƒã‚¤ãƒ‘ーボリックコサイン)ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的雙曲余弦值。"; @@ -16074,6 +16588,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn hiperbolik kosinüsünü hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el cosinus hiperbòlic d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ cosine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -16109,6 +16624,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16139,6 +16655,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hiperbolik kosinüsü hesaplanacak sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor el cosinus hiperbòlic del qual s'ha de tornar."; + Text[ thai ] = "ค่าสำหรับส่งà¸à¸¥à¸±à¸š cosine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function SINHYP #*=- @@ -16173,6 +16690,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn hiperbolik sinüsünü hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el sinus hiperbòlic d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ sine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -16208,6 +16726,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16238,6 +16757,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hiperbolik sinüsü hesaplanmak istenen deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor el sinus hiperbòlic del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณ sine à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function COTHYP #*=- @@ -16260,7 +16780,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la cotangente hiperbólica de un número." ; Text [ english_us ] = "Returns the hyperbolic cotangent of a number." ; Text[ chinese_simplified ] = "计算一个数的åŒæ›²ä½™åˆ‡å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ãèïåðáîëè÷åñêèé êîòàíãåíñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåòñÿ ãèïåðáîëè÷åñêèé êîòàíãåíñ ÷èñëà."; Text[ polish ] = "Oblicza cotangens hyperboliczny liczby."; Text[ japanese ] = "数値ã®ãƒã‚¤ãƒ‘ーボリックコタンジェントを返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的雙曲余切值。"; @@ -16272,6 +16792,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn hiperbolik kotanjantýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la cotangent hiperbòlica d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ cotangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -16307,6 +16828,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16325,7 +16847,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el valor diferente de 0 cuya cotangente hiperbólica se desea calcular." ; Text [ english_us ] = "A value not equal to 0 for which the hyperbolic cotangent is to be returned." ; Text[ chinese_simplified ] = "è¦è®¡ç®—å…¶åŒæ›²ä½™åˆ‡å€¼çš„ä¸ç‰äºŽé›¶çš„数值。"; - Text[ russian ] = "Çíà÷åíèå, íå ðàâíîå íóëþ, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ãèïåðáîëè÷åñêèé êîòàíãåíñ."; + Text[ russian ] = "Çíà÷åíèå, íå ðàâíîå íóëþ, äëÿ êîòîðîãî âîçâðàùàåòñÿ ãèïåðáîëè÷åñêèé êîòàíãåíñ."; Text[ polish ] = "Wartoœæ ró¿na od zera, dla której ma zostaæ obliczony cotangens hyperboliczny."; Text[ japanese ] = "ãƒã‚¤ãƒ‘ーボリックコタンジェントを求ã‚ã‚‹0ã§ãªã„数値。"; Text[ chinese_traditional ] = "è¦è¨ˆç®—其雙曲余切值的ä¸ç‰æ–¼é›¶çš„數值。"; @@ -16337,6 +16859,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hiperbolik kotanjantý hesaplanacak sýfýra eþit olmayan deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor no igual a 0 la cotangent hiperbòlica del qual s'ha de tornar."; + Text[ thai ] = "ค่าไม่เท่าà¸à¸±à¸š 0 สำหรับส่งà¸à¸¥à¸±à¸š cotangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function TANHYP #*=- @@ -16359,7 +16882,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la tangente hiperbólica de un número." ; Text [ english_us ] = "Returns the hyperbolic tangent of a number." ; Text[ chinese_simplified ] = "计算一个数的åŒæ›²æ£åˆ‡å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ãèïåðáîëè÷åñêèé òàíãåíñ ÷èñëà."; + Text[ russian ] = "Âîçâðàùàåò ãèïåðáîëè÷åñêèé òàíãåíñ ÷èñëà."; Text[ polish ] = "Oblicza tangens hiperboliczny liczby."; Text[ japanese ] = "数値ã®åŒæ›²ç·šæ£æŽ¥(ãƒã‚¤ãƒ‘ーボリックタンジェント)ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數的雙曲æ£åˆ‡å€¼ã€‚"; @@ -16371,6 +16894,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn hiperbolik tanjantýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la tangent hiperbòlica d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ tangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; ExtraData = { @@ -16406,6 +16930,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16436,6 +16961,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hiperbolik tanjantý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la tangent hiperbòlica del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณ tangent à¹à¸šà¸šà¹„ฮเปà¸à¸£à¹Œà¹‚บลา"; }; }; // -=*# Resource for function ARCTAN2 #*=- @@ -16458,7 +16984,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve el arco tangente de las coordenadas especificadas." ; Text [ english_us ] = "Returns the arctangent for the specified coordinates." ; Text[ chinese_simplified ] = "计算给定åæ ‡å€¼çš„ç‚¹çš„åæ£åˆ‡å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò àðêòàíãåíñ äëÿ çàäàííûõ êîîðäèíàò ."; + Text[ russian ] = "Âîçâðàùàåò àðêòàíãåíñ äëÿ óêàçàííûõ êîîðäèíàò ."; Text[ polish ] = "Oblicza arcus tangens na podstawie wspó³rzêdnych x i y."; Text[ japanese ] = "指定ã•ã‚ŒãŸ x-y座標ã®ã‚¢ãƒ¼ã‚¯ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算給定座標值的點的åæ£åˆ‡å€¼ã€‚"; @@ -16470,6 +16996,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Belirtilen koordinatlarýn arktanjantýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna l'arctangent per a les coordenades indicades."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š arctangent สำหรับพิà¸à¸±à¸”ที่ระบุ"; }; ExtraData = { @@ -16493,7 +17020,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Número_x" ; Text [ english_us ] = "number_x" ; Text[ chinese_simplified ] = "number_x"; - Text[ russian ] = "×èñëî_x"; + Text[ russian ] = "×èñëî X"; Text[ polish ] = "Liczba_x"; Text[ japanese ] = "x座標"; Text[ chinese_traditional ] = "number_x"; @@ -16505,6 +17032,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý_x"; Text[ language_user1 ] = " "; Text[ catalan ] = "number_x"; + Text[ thai ] = "เลข_x"; }; String 3 // Description of Parameter 1 { @@ -16535,6 +17063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "X koordinatýnýn deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de la coordenada x."; + Text[ thai ] = "ค่าสำหรับพิà¸à¸±à¸” x "; }; String 4 // Name of Parameter 2 { @@ -16552,7 +17081,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Número_y" ; Text [ english_us ] = "number_y" ; Text[ chinese_simplified ] = "number_y"; - Text[ russian ] = "×èñëî_y"; + Text[ russian ] = "×èñëî Y"; Text[ polish ] = "Liczba_y"; Text[ japanese ] = "y座標"; Text[ chinese_traditional ] = "number_y"; @@ -16564,6 +17093,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý_y"; Text[ language_user1 ] = " "; Text[ catalan ] = "number_y"; + Text[ thai ] = "เลข_y"; }; String 5 // Description of Parameter 2 { @@ -16594,6 +17124,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Y koordinatýnýn deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de la coordenada y."; + Text[ thai ] = "ค่าสำหรับพิà¸à¸±à¸” y "; }; }; // -=*# Resource for function DEG #*=- @@ -16628,6 +17159,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Radyaný dereceye dönüþtürür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un radian en graus."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸ªà¹ˆà¸§à¸™à¸‚à¸à¸‡à¸§à¸‡à¸à¸¥à¸¡à¸—ี่มีความà¸à¸§à¹‰à¸²à¸‡à¹€à¸—่าà¸à¸±à¸šà¸£à¸±à¸¨à¸¡à¸µà¹€à¸›à¹‡à¸™à¸à¸‡à¸¨à¸²"; }; ExtraData = { @@ -16663,6 +17195,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16693,6 +17226,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Radyan içindeki açý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Angle en radians"; + Text[ thai ] = "มุมในส่วนขà¸à¸‡à¸§à¸‡à¸à¸¥à¸¡à¸—ี่มีความà¸à¸§à¹‰à¸²à¸‡à¹€à¸—่าà¸à¸±à¸šà¸£à¸±à¸¨à¸¡à¸µ"; }; }; // -=*# Resource for function RAD #*=- @@ -16727,6 +17261,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Dereceyi radyana dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix graus en radians."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸à¸‡à¸¨à¸²à¹€à¸›à¹‡à¸™à¸ªà¹ˆà¸§à¸™à¸‚à¸à¸‡à¸§à¸‡à¸à¸¥à¸¡à¸—ี่มีความà¸à¸§à¹‰à¸²à¸‡à¹€à¸—่าà¸à¸±à¸šà¸£à¸±à¸¨à¸¡à¸µ"; }; ExtraData = { @@ -16762,6 +17297,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16771,7 +17307,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "L'angolo in gradi." ; Text [ portuguese_brazilian ] = "Der Winkel in Grad." ; Text [ portuguese ] = "é o ângulo em graus que se deseja converter." ; - Text [ finnish ] = "Kulma asteina." ; + Text [ finnish ] = "Kulma asteina" ; Text [ danish ] = "Vinklen i grader." ; Text [ french ] = "L'angle en degrés." ; Text [ swedish ] = "Vinkeln i grader." ; @@ -16791,6 +17327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Derece biriminden açý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Angle en graus."; + Text[ thai ] = "มุมในà¸à¸‡à¸¨à¸²"; }; }; // -=*# Resource for function EXP #*=- @@ -16825,6 +17362,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý e tabanýnýn üssünü alýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula l'exponent per a la base e."; + Text[ thai ] = "คำนวณเลขยà¸à¸à¸³à¸¥à¸±à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸™ e"; }; ExtraData = { @@ -16860,6 +17398,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16877,7 +17416,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Es el exponente aplicado a la base 'e'." ; Text [ english_us ] = "The exponent applied to base e." ; Text[ chinese_simplified ] = "底数为 e 的指数。"; - Text[ russian ] = "×èñëî, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ýêñïîíåíòà ñ îñíîâàíèåì e."; + Text[ russian ] = "Ýêñïîíåíòà, ïðèìåíÿåìàÿ ê îñíîâàíèþ å."; Text[ polish ] = "Wyk³adnik potêgi o podstawie e."; Text[ japanese ] = "e を底ã¨ã™ã‚‹ã¹ãä¹—ã®æŒ‡æ•°ã€‚"; Text[ chinese_traditional ] = "底數為 e 的指數。"; @@ -16889,6 +17428,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý e tabanýna uygulanan üs."; Text[ language_user1 ] = " "; Text[ catalan ] = "Exponent aplicat a la base e."; + Text[ thai ] = "เลขยà¸à¸à¸³à¸¥à¸±à¸‡à¸›à¸£à¸°à¸¢à¸¸à¸à¸•à¹Œà¹ƒà¸Šà¹‰à¸à¸±à¸šà¸à¸²à¸™ e"; }; }; // -=*# Resource for function LOG #*=- @@ -16923,6 +17463,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Herhangi bir tabandaki logaritmayý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el logaritme en qualsevol base indicada."; + Text[ thai ] = "คำนวณลà¸à¸à¸²à¸£à¸´à¸˜à¸¶à¸¡à¹„ปยังà¸à¸²à¸™à¹ƒà¸” ๆ ที่ระบุ"; }; ExtraData = { @@ -16958,6 +17499,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -16988,6 +17530,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Logaritmasý hesaplanan 0'dan büyük deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor més gran que 0 el logaritme del qual s'ha de calcular."; + Text[ thai ] = "ค่ามาà¸à¸à¸§à¹ˆà¸² 0 สำหรับà¸à¸±à¸¥à¸à¸à¸£à¸´à¸˜à¸¶à¸¡à¸—ี่ใช้ในà¸à¸²à¸£à¸„ำนวณ"; }; String 4 // Name of Parameter 2 { @@ -17013,10 +17556,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Basis"; Text[ chinese_simplified ] = "Base"; Text[ greek ] = "ÂÜóç"; - Text[ korean ] = "기본"; + Text[ korean ] = "Base"; Text[ turkish ] = "Taban"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Base anual"; + Text[ catalan ] = "Base"; + Text[ thai ] = "à¸à¸²à¸™"; }; String 5 // Description of Parameter 2 { @@ -17027,7 +17571,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Base del logaritmo." ; Text [ portuguese_brazilian ] = "Die Basis f? die Logarithmusberechnung." ; Text [ portuguese ] = "é a base para o cálculo do logaritmo." ; - Text [ finnish ] = "Logaritmin kantaluku." ; + Text [ finnish ] = "Logaritmin kantaluku" ; Text [ danish ] = "Logaritmens grundtal." ; Text [ french ] = "La base pour le calcul du logarithme." ; Text [ swedish ] = "Basen för logaritmberäkningen." ; @@ -17047,6 +17591,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Logaritma hesabýnýn tabaný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Base del logaritme."; + Text[ thai ] = "à¸à¸²à¸™à¸‚à¸à¸‡à¸à¸±à¸¥à¸à¸à¸£à¸´à¸˜à¸¶à¸¡"; }; }; // -=*# Resource for function LN #*=- @@ -17081,6 +17626,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn doðal logaritmasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el logaritme natural d'un nombre."; + Text[ thai ] = "คำนวณตัวเลขลà¸à¸à¸²à¸£à¸´à¸˜à¸¶à¸¡à¸˜à¸£à¸£à¸¡à¸Šà¸²à¸•à¸´"; }; ExtraData = { @@ -17116,6 +17662,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -17146,6 +17693,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Doðal logaritmasý hesaplanan 0'dan büyük deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor més gran que 0 el logaritme natural del qual s'ha de calcular."; + Text[ thai ] = "ค่ามาà¸à¸à¸§à¹ˆà¸² 0 สำหรับคำนวณลà¸à¸à¸²à¸£à¸´à¸˜à¸¶à¸¡à¸˜à¸£à¸£à¸¡à¸Šà¸²à¸•à¸´"; }; }; // -=*# Resource for function LOG10 #*=- @@ -17180,6 +17728,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýnýn 10 tabanýnda logaritmasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el logaritme en base 10 d'un nombre."; + Text[ thai ] = "คำนวณตัวเลขลà¸à¸à¸²à¸£à¸´à¸˜à¸¶à¸¡à¸à¸²à¸™10 "; }; ExtraData = { @@ -17215,6 +17764,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -17245,6 +17795,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Logaritmasý hesaplanan 0'dan büyük deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Un valor més gran que 0 el logaritme del qual s'ha de calcular."; + Text[ thai ] = "ค่ามาà¸à¸à¸§à¹ˆà¸² 0 สำหรับลà¸à¸à¸²à¸£à¸´à¸˜à¸¶à¸¡à¸—ี่ใช้ในà¸à¸²à¸£à¸„ำนวณ"; }; }; // -=*# Resource for function FAKULTÄT #*=- @@ -17279,6 +17830,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn çarpýmýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula el factorial d'un nombre."; + Text[ thai ] = "คำนวณตัวเลขà¹à¸Ÿà¸„ตà¸à¹€à¸£à¸µà¸¢à¸¥"; }; ExtraData = { @@ -17314,6 +17866,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -17344,6 +17897,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Çarpýmý hesaplanan sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre el factorial del qual s'ha de calcular."; + Text[ thai ] = "ตัวเลขสำหรับคำนวณà¹à¸Ÿà¸„ตà¸à¹€à¸£à¸µà¸¢à¸¥"; }; }; // -=*# Resource for function REST #*=- @@ -17377,6 +17931,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bölüm iþleminden kalaný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la resta d'una divisió."; + Text[ thai ] = "คำนวณเศษขà¸à¸‡à¸à¸²à¸£à¸«à¸²à¸£"; }; ExtraData = { @@ -17412,6 +17967,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kar payý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Dividend"; + Text[ thai ] = "ตัวตั้งหาร"; }; String 3 // Description of Parameter 1 { @@ -17421,7 +17977,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero che viene diviso." ; Text [ portuguese_brazilian ] = "Die Zahl, die geteilt wird." ; Text [ portuguese ] = "é o número a ser dividido." ; - Text [ finnish ] = "Jaettava luku." ; + Text [ finnish ] = "Jaettava luku" ; Text [ danish ] = "Det tal som skal divideres." ; Text [ french ] = "Le nombre à diviser." ; Text [ swedish ] = "Talet som divideras." ; @@ -17429,7 +17985,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es el número que desea dividir y para el cual desea encontrar el residuo." ; Text [ english_us ] = "The number to be divided." ; Text[ chinese_simplified ] = "被除数。"; - Text[ russian ] = "×èñëî, êîòîðîå äåëèòñÿ, è îñòàòîê îò äåëåíèÿ êîòîðîãî îïðåäåëÿåòñÿ."; + Text[ russian ] = "Äåëèìîå."; Text[ polish ] = "Liczba, która zostanie podzielona."; Text[ japanese ] = "割られる数"; Text[ chinese_traditional ] = "被除數。"; @@ -17441,6 +17997,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bölünen sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha de dividir."; + Text[ thai ] = "ตัวเลขที่ถูà¸à¸«à¸²à¸£"; }; String 4 // Name of Parameter 2 { @@ -17466,10 +18023,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Deler"; Text[ chinese_simplified ] = "Divisor"; Text[ greek ] = "ÄéáéñÝôçò"; - Text[ korean ] = "ì œìˆ˜"; + Text[ korean ] = "ì ¯ìˆ˜"; Text[ turkish ] = "Bölen"; Text[ language_user1 ] = " "; Text[ catalan ] = "Divisor"; + Text[ thai ] = "ตัวหาร"; }; String 5 // Description of Parameter 2 { @@ -17499,6 +18057,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bölen sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre pel qual es divideix el dividend."; + Text[ thai ] = "ตัวเลขหารจำนวนที่ถูà¸à¸«à¸²à¸£"; }; }; // -=*# Resource for function VORZEICHEN #*=- @@ -17513,7 +18072,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il segno di un numero." ; Text [ portuguese_brazilian ] = "Liefert das Vorzeichen einer Zahl." ; Text [ portuguese ] = "Determina o sinal de um número." ; - Text [ finnish ] = "Palauttaa luvun etumerkin (plus/miinus)." ; + Text [ finnish ] = "Palauttaa luvun etumerkin." ; Text [ danish ] = "Returnerer et tals fortegn." ; Text [ french ] = "Donne le signe d'un nombre." ; Text [ swedish ] = "Returnerar tecknet för ett tal." ; @@ -17533,6 +18092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýnýn iþaretini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el signe algebraic d'un nombre."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚เครื่à¸à¸‡à¸«à¸¡à¸²à¸¢à¸žà¸µà¸Šà¸„ณิต"; }; ExtraData = { @@ -17568,6 +18128,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -17577,7 +18138,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Un numero reale qualsiasi." ; Text [ portuguese_brazilian ] = "Die Zahl, deren Vorzeichen bestimmt wird." ; Text [ portuguese ] = "é qualquer número real." ; - Text [ finnish ] = "Luku, jonka etumerkki (plus/miinus) määritetään." ; + Text [ finnish ] = "Luku, jonka etumerkki määritetään." ; Text [ danish ] = "Det tal hvis fortegn skal bestemmes." ; Text [ french ] = "Le nombre réel dont vous souhaitez déterminer le signe." ; Text [ swedish ] = "Talet vars tecken bestäms." ; @@ -17597,6 +18158,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýþareti belirlenen sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre el signe algebraic del qual s'ha de determinar."; + Text[ thai ] = "ตัวเลขสำหรับà¸à¸³à¸«à¸™à¸”เครื่à¸à¸‡à¸«à¸¡à¸²à¸¢à¸žà¸µà¸Šà¸„ณิต"; }; }; // -=*# Resource for function TEILERGEBNIS #*=- @@ -17618,7 +18180,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve un subtotal en una hoja de cálculo." ; Text [ english_us ] = "Calculates subtotals in a spreadsheet." ; Text[ chinese_simplified ] = "计算数æ®å•æˆ–æ•°æ®åº“ä¸çš„分类汇总。"; - Text[ russian ] = "Ôóíêöèÿ äëÿ ïîäâåäåíèÿ ïðîìåæóòî÷íûõ èòîãîâ â ýëåêòðîííîé òàáëèöå èëè áàçå äàííûõ."; + Text[ russian ] = "Âû÷èñëÿåò ïðîìåæóòî÷íûå èòîãè â ýëåêòðîííîé òàáëèöå."; Text[ polish ] = "Funkcja do obliczania sum poœrednich w arkuszach kalkulacyjnych."; Text[ japanese ] = "表ã¾ãŸã¯ãƒªã‚¹ãƒˆã®é›†è¨ˆå€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算資料單或資料庫ä¸çš„å°è¨ˆã€‚"; @@ -17630,6 +18192,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tablolarda ara toplam hesaplama fonksiyonu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula els subtotals d'un full de càlcul."; + Text[ thai ] = "คำนวณผลรวมย่à¸à¸¢à¹ƒà¸™à¸à¸£à¸°à¸”าษคำนวณ"; }; ExtraData = { @@ -17653,7 +18216,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "núm_función" ; Text [ english_us ] = "Function" ; Text[ chinese_simplified ] = "function"; - Text[ russian ] = "Íîìåð_ôóíêöèè"; + Text[ russian ] = "Ôóíêöèÿ"; Text[ polish ] = "Funkcja"; Text[ japanese ] = "関数"; Text[ chinese_traditional ] = "function"; @@ -17665,6 +18228,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Fonksiyon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Funció"; + Text[ thai ] = "ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™"; }; String 3 // Description of Parameter 1 { @@ -17675,7 +18239,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero che corrisponde a un indice delle funzioni possibili: somma, max..." ; Text [ portuguese_brazilian ] = "Funktionsindex. Ist ein Index auf die m?lichen Funktion Summe, Max, ..." ; Text [ portuguese ] = "é um número de 1 a 11 que determina qual a função a ser usada para o cálculo dos subtotais de uma lista." ; - Text [ finnish ] = "Funktiohakemisto. Käytettävissä olevien funktioiden hakemisto (summa, enimmäisarvo...)" ; + Text [ finnish ] = "Funktiohakemisto. Käytettävissä olevien funktioiden hakemisto, esimerkiksi summa tai enimmäisarvo." ; Text [ danish ] = "Funktionsindeks. Et indeks for den mulige funktion sum, maks, ..." ; Text [ french ] = "Un nombre compris entre 1 et 11 indiquant quelle fonction utiliser pour calculer les sous-totaux d'une liste." ; Text [ swedish ] = "Funktionsindex. Är ett index för den möjliga funktionen summa, max." ; @@ -17683,7 +18247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es un número que indica qué función debe ser utilizada." ; Text [ english_us ] = "Function index. Is an index of the possible functions Total, Max, ..." ; Text[ chinese_simplified ] = "函数索引，用于指定使用的函数，如 Sum, Max ç‰ã€‚"; - Text[ russian ] = "×èñëî, êîòîðîå óêàçûâàåò, êàêóþ ôóíêöèþ èñïîëüçîâàòü ïðè ïîäâåäåíèè ïðîìåæóòî÷íûõ èòîãîâ âíóòðè ñïèñêà."; + Text[ russian ] = "Èíäåêñ ôóíêöèè. Ýòî èíäåêñ äëÿ ôóíêöèé Total, Max...."; Text[ polish ] = "Indeks funkcji okreœlaj¹cy mo¿liwe funkcje."; Text[ japanese ] = "関数インデックス。使用ã™ã‚‹é–¢æ•°ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€‚"; Text[ chinese_traditional ] = "函數åƒç…§ã€‚用於指定使用的函數，如 SUM，MAX ç‰ã€‚"; @@ -17695,6 +18259,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Fonksiyon dizini. Muhtemel fonksiyonlar Sum, Max ile ilgili bir dizindir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Índex de funcions. És un índex de les funcions possibles Total, Max, ..."; + Text[ thai ] = "ดัชนีฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™ เป็นดัชนีขà¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™à¸—ี่เป็นไปได้ รวมทั้งหมด, มาà¸à¸—ี่สุด, ..."; }; String 4 // Name of Parameter 2 { @@ -17704,26 +18269,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Intervallo " ; Text [ portuguese_brazilian ] = "Bereich " ; Text [ portuguese ] = "Intervalo " ; - Text [ finnish ] = "alue" ; + Text [ finnish ] = "alue " ; Text [ danish ] = "Område " ; Text [ french ] = "Plage " ; Text [ swedish ] = "område " ; - Text [ dutch ] = "Bereik " ; + Text [ dutch ] = "Bereik" ; Text [ spanish ] = "ref1 " ; Text [ english_us ] = "range " ; Text[ chinese_simplified ] = "Range "; - Text[ russian ] = "Äèàïàçîí "; + Text[ russian ] = "Äèàïàçîí"; Text[ polish ] = "Zakres "; Text[ japanese ] = "範囲 "; Text[ chinese_traditional ] = "Range "; Text[ arabic ] = "Range "; - Text[ dutch ] = "Bereik "; + Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "Range "; Text[ greek ] = "Ðåñéï÷Þ "; Text[ korean ] = "범위 "; Text[ turkish ] = "Aralýk "; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea "; + Text[ thai ] = "ช่วง "; }; String 5 // Description of Parameter 2 { @@ -17750,10 +18316,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Het cellenbereik waarover u een berekening wilt maken."; Text[ chinese_simplified ] = "用æ¥è®¡ç®—分类汇总的å•å…ƒæ ¼åŒºåŸŸã€‚"; Text[ greek ] = "Ç ðåñéï÷Þ, ôçò ïðïßáò ôá êåëéÜ èá ëçöèïýí õðüøç."; - Text[ korean ] = "셀로 간주ë˜ëŠ” ì˜ì—."; + Text[ korean ] = "ì…€ì´ ê³ ë ¤ë˜ëŠ” 범위"; Text[ turkish ] = "Hücreleri dikkate alýnacak aralýk."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cel·les de l'àrea que s'han de considerar."; + Text[ catalan ] = "Cel.les de l'àrea que s'han de considerar."; + Text[ thai ] = "เซลล์ขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸—ี่คำนึงถึง"; }; }; // -=*# Resource for function GANZZAHL #*=- @@ -17772,22 +18339,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Runder et tal ned til nærmeste mindre heltal." ; Text [ french ] = "Arrondit un nombre au nombre entier inférieur le plus proche." ; Text [ swedish ] = "Avrundar ett tal nedåt till närmaste mindre heltal." ; - Text [ dutch ] = "Rondt een getal naar beneden af op het dichtsbijzijnde gehele getal." ; + Text [ dutch ] = "Rondt een getal naar beneden af op het dichtstbijzijnde gehele getal." ; Text [ spanish ] = "Redondea un número hasta el entero inferior más próximo." ; Text [ english_us ] = "Rounds a number down to the nearest integer." ; Text[ chinese_simplified ] = "将一个数èˆå…¥ä¸ºæœ€æŽ¥è¿‘çš„(数值å‡å°)整数。"; Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî áëèæàéøåãî ìåíüøåãî öåëîãî."; Text[ polish ] = "Zaokr¹gla liczbê w dó³ do najbli¿szej liczby ca³kowitej."; - Text[ japanese ] = "å°æ•°ç‚¹ä»¥ä¸‹ã‚’切りæ¨ã¦ã¦æ•´æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; + Text[ japanese ] = "数値ã¯ã€æ•´æ•°ã«ä¸¸ã‚る数値ã§ã™ã€‚"; Text[ chinese_traditional ] = "將一個數èˆå…¥ç‚ºæœ€æŽ¥è¿‘çš„(數值減å°)整數。"; Text[ arabic ] = "ÊÞÑÈ ÑÞã ááÃÏäì Åáì ÃÞÑÈ ÚÏÏ ÕÍíÍ."; - Text[ dutch ] = "Rondt een getal naar beneden af op het dichtsbijzijnde gehele getal."; + Text[ dutch ] = "Rondt een getal naar beneden af op het dichtstbijzijnde gehele getal."; Text[ chinese_simplified ] = "将一个数èˆå…¥ä¸ºæœ€æŽ¥è¿‘çš„(数值å‡å°)整数。"; Text[ greek ] = "Óôñïããõëïðïéåß Ýíáí áñéèìü ðñïò ôá êÜôù ðñïò ôïí åðüìåíï ìéêñüôåñï áêÝñáéï."; Text[ korean ] = "가장 가까운 ì •ìˆ˜ë¡œ 반버림"; Text[ turkish ] = "Sayýyý, bir alt tamsayýya yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre a l'enter inferior més pròxim."; + Text[ thai ] = "ปัดเศษตัวเลขลงเป็นจำนวนเต็มที่ใà¸à¸¥à¹‰à¸—ี่สุด"; }; ExtraData = { @@ -17823,6 +18391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -17842,7 +18411,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ chinese_simplified ] = "è¦è¢«èˆå…¥çš„数。"; Text[ russian ] = "Îêðóãëÿåìîå ÷èñëî."; Text[ polish ] = "Liczba do zaokr¹glenia."; - Text[ japanese ] = "切りæ¨ã¦ã®å¯¾è±¡ã¨ãªã‚‹æ•°å€¤ã€‚"; + Text[ japanese ] = "æ•´æ•°ã«ä¸¸ã‚る数値。"; Text[ chinese_traditional ] = "è¦è¢«èˆå…¥çš„數å—。"; Text[ arabic ] = "ÇáÑÞã ÇáãÑÇÏ ÊÞÑíÈå ááÃÏäì."; Text[ dutch ] = "Het getal dat wordt afgerond."; @@ -17852,6 +18421,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Aþaðý yuvarlanan sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir a la baixa."; + Text[ thai ] = "ตัวเลขที่ถูà¸à¸›à¸±à¸”เศษลง"; }; }; // -=*# Resource for function KÜRZEN #*=- @@ -17869,22 +18439,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Afkorter et tals decimaler." ; Text [ french ] = "Réduit le nombre de décimales d'un nombre." ; Text [ swedish ] = "Kortar av ett tals decimaler." ; - Text [ dutch ] = "Beperkt het aantal cijfers achter de komma." ; + Text [ dutch ] = "Beperkt het aantal decimalen." ; Text [ spanish ] = "Trunca un número a un entero." ; Text [ english_us ] = "Truncates the decimal places of a number." ; Text[ chinese_simplified ] = "去除数å—çš„å°æ•°ç‚¹ä½æ•°ã€‚"; - Text[ russian ] = "Îòáðàñûâàåò äðîáíóþ ÷àñòü ÷èñëà. òàê ÷òî îñòàåòñÿ öåëîå ÷èñëî."; + Text[ russian ] = "Îòáðàñûâàåò äðîáíóþ ÷àñòü ÷èñëà."; Text[ polish ] = "Obcina w liczbie miejsca po przecinku "; Text[ japanese ] = "数値ã®ä»»æ„ã®å°æ•°ä½ã‚’切りæ¨ã¦ã¾ã™ã€‚"; Text[ chinese_traditional ] = "去除數å—çš„å°æ•¸é»žä½æ•¸ã€‚"; Text[ arabic ] = "ÊÞØÚ ãäÇÒá ÚÔÑíÉ ãä ÑÞã."; - Text[ dutch ] = "Beperkt het aantal cijfers achter de komma."; + Text[ dutch ] = "Beperkt het aantal decimalen."; Text[ chinese_simplified ] = "去除数å—çš„å°æ•°ç‚¹ä½æ•°ã€‚"; Text[ greek ] = "Áðïêüðôåé ôá äåêáäéêÜ øçößá åíüò áñéèìïý."; - Text[ korean ] = "숫ìžì˜ 소수ì ì´í•˜ë¥¼ ì ˆì‚"; + Text[ korean ] = "숫ìžì˜ 소수ì ì´í•˜ ìžë¦¿ìˆ˜ë¥¼ ìžë¦…니다."; Text[ turkish ] = "Sayýnýn, ondalýk hanelerini keser."; Text[ language_user1 ] = " "; Text[ catalan ] = "Trunca els llocs decimals d'un nombre."; + Text[ thai ] = "ตัดจุดทศนิยมขà¸à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚"; }; ExtraData = { @@ -17920,6 +18491,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -17929,12 +18501,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero di cui si vuole eliminare la parte decimale." ; Text [ portuguese_brazilian ] = "Die Zahl, deren Nachkommastellen abgeschnitten werden." ; Text [ portuguese ] = "é o número cuja casa decimal deseja truncar." ; - Text [ finnish ] = "Katkaistava luku." ; + Text [ finnish ] = "Katkaistava luku" ; Text [ danish ] = "Det tal hvis decimaler skal afkortes." ; Text [ french ] = "Représente le nombre dont les décimales sont à réduire." ; Text [ swedish ] = "Det tal vars decimaler skall avkortas." ; Text [ dutch ] = "Het getal waarvan de decimalen worden afgekapt." ; - Text [ spanish ] = "es el número al que se le eliminan los decimales." ; + Text [ spanish ] = "Representa el número al que se le borran los decimales." ; Text [ english_us ] = "The number to be truncated." ; Text[ chinese_simplified ] = "è¦é™¤åŽ»å°æ•°ç‚¹ä½æ•°çš„æ•°å—。"; Text[ russian ] = "Óñåêàåìîå ÷èñëî."; @@ -17949,6 +18521,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ondalýk haneleri kesilecek sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha de truncar."; + Text[ thai ] = "ตัวเลขที่ถูà¸à¸•à¸±à¸”"; }; String 4 // Name of Parameter 2 { @@ -17978,6 +18551,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hane sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "compta"; + Text[ thai ] = "นับ"; }; String 5 // Description of Parameter 2 { @@ -17995,7 +18569,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "el número de decimales que no se debe truncar." ; Text [ english_us ] = "The number of places after the decimal point that are not to be truncated." ; Text[ chinese_simplified ] = "è¦ä¿ç•™çš„å°æ•°ç‚¹ä½æ•°ã€‚"; - Text[ russian ] = "×èñëî, îïðåäåëÿþùåå òî÷íîñòü óñå÷åíèÿ."; + Text[ russian ] = "Çíàêîâ ïîñëå çàïÿòîé."; Text[ polish ] = "Liczba miejsc po przecinku, które nie zostan¹ obciête."; Text[ japanese ] = "切りæ¨ã¦ã‚’è¡Œã£ãŸå¾Œã®æ¡æ•°ã€‚"; Text[ chinese_traditional ] = "è¦ä¿ç•™çš„å°æ•¸é»žä½æ•¸ã€‚"; @@ -18007,6 +18581,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Kesilmeyen ondalýk hanelerin sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de llocs després del punt decimal que no s'ha de truncar."; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚หลังจุดทศนิยมที่ไม่ถูà¸à¸•à¸±à¸”"; }; }; // -=*# Resource for function RUNDEN #*=- @@ -18028,7 +18603,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Redondea un número al número de decimales especificado." ; Text [ english_us ] = "Rounds a number to a predefined accuracy." ; Text[ chinese_simplified ] = "按指定ä½æ•°å‘上(沿ç»å¯¹å€¼å¢žå¤§çš„æ–¹å‘)èˆå…¥æ•°å—。"; - Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî óêàçàííîãî êîëè÷åñòâà äåñÿòè÷íûõ ðàçðÿäîâ."; + Text[ russian ] = "Îêðóãëÿåò ÷èñëî ñ óêàçàííîé òî÷íîñòüþ."; Text[ polish ] = "Zaokr¹gla liczbê do okreœlonej iloœci cyfr."; Text[ japanese ] = "数値を四æ¨äº”å…¥ã—ã¦æŒ‡å®šã®æ¡æ•°ã«ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "按指定ä½æ•¸å‘上(沿絕å°å€¼å¢žå¤§çš„æ–¹å‘)èˆå…¥æ•¸å—。"; @@ -18040,6 +18615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýyý önceden belirlenen bir doðrulukta yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre a una precisió predefinida."; + Text[ thai ] = "ปัดเศษตัวเลขเพื่à¸à¸„วามเที่ยงตรงที่à¸à¸³à¸«à¸™à¸”ไว้ล่วงหน้า"; }; ExtraData = { @@ -18075,6 +18651,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -18104,6 +18681,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yuvarlanacak sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir."; + Text[ thai ] = "ตัวเลขที่ถูà¸à¸›à¸±à¸”เศษ"; }; String 4 // Name of Parameter 2 { @@ -18121,7 +18699,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "núm_decimales" ; Text [ english_us ] = "count" ; Text[ chinese_simplified ] = "count"; - Text[ russian ] = "Êîëè÷åñòâî_öèôð"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "liczba_cyfr"; Text[ japanese ] = "æ¡æ•°"; Text[ chinese_traditional ] = "count"; @@ -18133,6 +18711,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "compta"; + Text[ thai ] = "นับ"; }; String 5 // Description of Parameter 2 { @@ -18142,7 +18721,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Specifica il numero di cifre a cui si desidera arrotondare il numero." ; Text [ portuguese_brazilian ] = "Die Anzahl der Stellen, auf die gerundet werden soll." ; Text [ portuguese ] = "determina a quantidade de dígitos para a qual se deseja arredondar." ; - Text [ finnish ] = "Pyöristystarkkuus (desimaaleja)." ; + Text [ finnish ] = "Desimaalien pyöristystarkkuus" ; Text [ danish ] = "Det antal decimaler tallet skal rundes til." ; Text [ french ] = "Le nombre de chiffres auquel vous voulez arrondir le nombre." ; Text [ swedish ] = "Antalet decimaler som talet skall avrundas till." ; @@ -18162,6 +18741,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yuvarlanacak rakam sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de llocs decimals a què s'ha d'arrodonir un nombre."; + Text[ thai ] = "จำนวนตำà¹à¸«à¸™à¹ˆà¸‡à¸—ี่จะปัดเศษ"; }; }; // -=*# Resource for function AUFRUNDEN #*=- @@ -18191,10 +18771,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rondt een getal naar boven af op het opgegeven aantal decimalen."; Text[ chinese_simplified ] = "按指定ä½æ•°æ¥èˆå…¥æ•°å—。"; Text[ greek ] = "Óôñïããõëïðïéåß Ýíáí áñéèìü ðñïò ôá åðÜíù ìå ôçí åðéëåãìÝíç áêñßâåéá."; - Text[ korean ] = "ì§€ì •ëœ ìžë¦¬ìˆ˜ë¡œ 반올림."; + Text[ korean ] = "ì§€ì •ëœ ìžë¦¬ìˆ˜ë¡œ 반올림합니다."; Text[ turkish ] = "Sayýyý önceden belirlenen bir doðrulukla yukarý yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre a l'alça a una precisió predefinida."; + Text[ thai ] = "ปัดเศษตัวเลขขึ้นเพื่à¸à¸„วามเที่ยงตรงที่à¸à¸³à¸«à¸™à¸”ไว้ล่วงหน้า"; }; ExtraData = { @@ -18230,6 +18811,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -18259,6 +18841,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yukarý yuvarlanacak sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir a l'alça."; + Text[ thai ] = "ตัวเลขที่ปัดเศษขึ้น"; }; String 4 // Name of Parameter 2 { @@ -18276,7 +18859,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "núm_decimales" ; Text [ english_us ] = "count" ; Text[ chinese_simplified ] = "count"; - Text[ russian ] = "Êîëè÷åñòâî_öèôð"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "liczba_cyfr"; Text[ japanese ] = "æ¡æ•°"; Text[ chinese_traditional ] = "count"; @@ -18288,6 +18871,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hane sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "compta"; + Text[ thai ] = "นับ"; }; String 5 // Description of Parameter 2 { @@ -18297,7 +18881,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero di cifre che si desidera arrotondare." ; Text [ portuguese_brazilian ] = "Die Anzahl der Stellen, auf die aufgerundet werden soll." ; Text [ portuguese ] = "determina a quantidade de dígitos para a qual se deseja arredondar." ; - Text [ finnish ] = "Pyöristystarkkuus (desimaaleja)." ; + Text [ finnish ] = "Desimaalien pyöristystarkkuus" ; Text [ danish ] = "Det antal decimaler tallet skal rundes op til." ; Text [ french ] = "Le nombre de chiffres à prendre en compte pour arrondir l'argument nombre." ; Text [ swedish ] = "Antalet decimaler som talet skall avrundas till uppåt." ; @@ -18317,6 +18901,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yukarý yuvarlanacak rakam sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de llocs decimals a què s'ha d'arrodonir un nombre."; + Text[ thai ] = "จำนวนตำà¹à¸«à¸™à¹ˆà¸‡à¸—ี่จะปัดเศษตัวเลข"; }; }; // -=*# Resource for function ABRUNDEN #*=- @@ -18338,7 +18923,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Redondea un número hacia abajo, en dirección hacia cero." ; Text [ english_us ] = "Rounds a number down to a predefined accuracy." ; Text[ chinese_simplified ] = "按指定ä½æ•°å‘下(沿ç»å¯¹å€¼å‡å°çš„æ–¹å‘)èˆå…¥æ•°å—。"; - Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî óêàçàííîãî êîëè÷åñòâà äåñÿòè÷íûõ ðàçðÿäîâ ñ íåäîñòàòêîì."; + Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî óêàçàííîãî êîëè÷åñòâà äåñÿòè÷íûõ ðàçðÿäîâ."; Text[ polish ] = "Zaokr¹gla liczbê do okreœlonej iloœci cyfr."; Text[ japanese ] = "数値を切りæ¨ã¦ã¦æŒ‡å®šã®æ¡æ•°ã«ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "按指定ä½æ•¸å‘下(沿絕å°å€¼æ¸›å°çš„æ–¹å‘)èˆå…¥æ•¸å—。"; @@ -18346,10 +18931,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Rondt een getal naar beneden af op het opgegeven aantal decimalen."; Text[ chinese_simplified ] = "按指定ä½æ•°å‘下(沿ç»å¯¹å€¼å‡å°çš„æ–¹å‘)èˆå…¥æ•°å—。"; Text[ greek ] = "Óôñïããõëïðïéåß Ýíáí áñéèìü ðñïò ôá êÜôù ìå ôçí åðéëåãìÝíç áêñßâåéá."; - Text[ korean ] = "ì§€ì •ëœ ìžë¦¿ìˆ˜ë¡œ 반버림"; + Text[ korean ] = "ì§€ì •ëœ ìžë¦¿ìˆ˜ë¡œ 반내림합니다."; Text[ turkish ] = "Sayýyý önceden belirlenen bir doðrulukla aþaðý yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre a la baixa a una precisió predefinida."; + Text[ thai ] = "ปัดเศษลงเพื่à¸à¸„วามเที่ยงตรงที่à¸à¸³à¸«à¸™à¸”ไว้ล่วงหน้า"; }; ExtraData = { @@ -18385,6 +18971,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -18414,6 +19001,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Aþaðý yuvarlanacak sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir a la baixa."; + Text[ thai ] = "ตัวเลขที่ปัดเศษลง"; }; String 4 // Name of Parameter 2 { @@ -18431,7 +19019,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "núm_decimales" ; Text [ english_us ] = "count" ; Text[ chinese_simplified ] = "count"; - Text[ russian ] = "Êîëè÷åñòâî_öèôð"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "liczba_cyfr"; Text[ japanese ] = "æ¡æ•°"; Text[ chinese_traditional ] = "count"; @@ -18443,6 +19031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Hane sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "compta"; + Text[ thai ] = "นับ"; }; String 5 // Description of Parameter 2 { @@ -18452,7 +19041,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero di cifre che si desidera arrotondare." ; Text [ portuguese_brazilian ] = "Die Anzahl der Stellen, auf die abgerundet werden soll." ; Text [ portuguese ] = "determina a quantidade de dígitos para a qual se deseja arredondar." ; - Text [ finnish ] = "Alaspäin pyöristettävän luvun pyöristystarkkuus (desimaaleja)." ; + Text [ finnish ] = "Alaspäin pyöristettävän luvun desimaalien pyöristystarkkuus." ; Text [ danish ] = "Det antal decimaler tallet skal rundes ned til." ; Text [ french ] = "Le nombre de chiffres à prendre en compte pour arrondir l'argument nombre." ; Text [ swedish ] = "Antalet decimaler som talet skall avrundas till." ; @@ -18472,6 +19061,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Aþaðý yuvarlanacak rakam sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de llocs decimals a què s'ha d'arrodonir un nombre a la baixa."; + Text[ thai ] = "จำนวนตำà¹à¸«à¸™à¹ˆà¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚ที่ปัดเศษลง"; }; }; // -=*# Resource for function GERADE #*=- @@ -18490,7 +19080,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Runder et tal op til nærmeste lige heltal." ; Text [ french ] = "Arrondi un nombre au nombre entier pair le plus proche en s'éloignant de zéro." ; Text [ swedish ] = "Avrundar ett tal uppåt till närmaste jämna heltal." ; - Text [ dutch ] = "Rondt een getal naar boven af op het dichtsbijzijnde even gehele getal." ; + Text [ dutch ] = "Rondt een getal naar boven af op het dichtstbijzijnde even gehele getal." ; Text [ spanish ] = "Devuelve un número redondeado hasta el número entero par más próximo." ; Text [ english_us ] = "Rounds a number up to the nearest even integer." ; Text[ chinese_simplified ] = "将一个数å—沿ç»å¯¹å€¼å¢žå¤§æ–¹å‘èˆå…¥æˆä¸€ä¸ªæœ€æŽ¥è¿‘çš„å¶æ•°ã€‚"; @@ -18499,13 +19089,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "数値をå¶æ•°ã«åˆ‡ã‚Šä¸Šã’ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將一個數å—å‘上èˆå…¥æˆä¸€å€‹æœ€æŽ¥è¿‘çš„å¶æ•¸ã€‚"; Text[ arabic ] = "ÊÞÑÈ ÑÞã Åáì ÇáÃÚáì áÃÞÑÈ ÑÞã ÕÍíÍ ÒæÌí."; - Text[ dutch ] = "Rondt een getal naar boven af op het dichtsbijzijnde even gehele getal."; + Text[ dutch ] = "Rondt een getal naar boven af op het dichtstbijzijnde even gehele getal."; Text[ chinese_simplified ] = "将一个数å—沿ç»å¯¹å€¼å¢žå¤§æ–¹å‘èˆå…¥æˆä¸€ä¸ªæœ€æŽ¥è¿‘çš„å¶æ•°ã€‚"; Text[ greek ] = "Óôñïããõëïðïéåß Ýíáí áñéèìü ðñïò ôá åðÜíù ðñïò ôïí åðüìåíï ìåãáëýôåñï Üñôéï áêÝñáéï."; Text[ korean ] = "가장 가까운 ì§ìˆ˜ ì •ìˆ˜ë¡œ 반올림"; Text[ turkish ] = "Sayýyý bir üst çift tamsayýya yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre a l'enter parell superior més pròxim."; + Text[ thai ] = "ปัดเศษตัวเลขขึ้นเป็นจำนวนเต็มคู่ที่ใà¸à¸¥à¹‰à¸—ี่สุด"; }; ExtraData = { @@ -18541,6 +19132,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -18570,6 +19162,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yuvarlanan sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir a l'alça."; + Text[ thai ] = "ตัวเลขที่ปัดเศษขึ้น"; }; }; // -=*# Resource for function UNGERADE #*=- @@ -18588,7 +19181,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ danish ] = "Runder et tal op til nærmeste ulige heltal." ; Text [ french ] = "Arrondi un nombre au nombre entier impair le plus proche en s'éloignant de zéro." ; Text [ swedish ] = "Avrundar ett tal uppåt till närmaste udda heltal." ; - Text [ dutch ] = "Rondt een getal naar boven af op het dichtsbijzijnde oneven gehele getal." ; + Text [ dutch ] = "Rondt een getal naar boven af op het dichtstbijzijnde oneven gehele getal." ; Text [ spanish ] = "Redondea un número hasta el próximo entero impar." ; Text [ english_us ] = "Rounds a number up to the nearest odd integer." ; Text[ chinese_simplified ] = "将一个数å‘上èˆå…¥æˆæœ€æŽ¥è¿‘的一个奇整数。"; @@ -18597,13 +19190,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "数値を奇数ã«åˆ‡ã‚Šä¸Šã’ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將一個數å‘上èˆå…¥æˆæœ€æŽ¥è¿‘的一個奇整數。"; Text[ arabic ] = "ÊÞÑÈ ÑÞã ááÃÚáì Åáì ÃÞÑÈ ÚÏÏ ÝÑÏí ÕÍíÍ."; - Text[ dutch ] = "Rondt een getal naar boven af op het dichtsbijzijnde oneven gehele getal."; + Text[ dutch ] = "Rondt een getal naar boven af op het dichtstbijzijnde oneven gehele getal."; Text[ chinese_simplified ] = "将一个数å‘上èˆå…¥æˆæœ€æŽ¥è¿‘的一个奇整数。"; Text[ greek ] = "Óôñïããõëïðïéåß Ýíáí áñéèìü ðñïò ôá åðÜíù ðñïò ôïí åðüìåíï ìåãáëýôåñï ðåñéôôü áêÝñáéï."; Text[ korean ] = "가장 가까운 홀수 ì •ìˆ˜ë¡œ 반올림"; Text[ turkish ] = "Sayýyý bir üst tek tamsayýya yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre a l'enter senar superior més pròxim."; + Text[ thai ] = "ปัดเศษตัวเลขขึ้นเป็นจำนวนเต็มคี่ที่ใà¸à¸¥à¹‰à¸—ี่สุด"; }; ExtraData = { @@ -18639,6 +19233,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -18668,6 +19263,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir üst sayýya yuvarlanan sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir a l'alça."; + Text[ thai ] = "ตัวเลขที่ปัดเศษขึ้น"; }; }; // -=*# Resource for function OBERGRENZE #*=- @@ -18690,7 +19286,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Redondea un número al próximo múltiplo del argumento cifra_significativa, en dirección contraria a cero." ; Text [ english_us ] = "Rounds a number up to the nearest multiple of significance." ; Text[ chinese_simplified ] = "将一个数å—èˆå…¥æˆæœ€æŽ¥è¿‘的整数或其基数的最å°å€æ•°ã€‚"; - Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî êðàòíîãî çàäàííîé òî÷íîñòè ñ èçáûòêîì."; + Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî êðàòíîãî çàäàííîé òî÷íîñòè."; Text[ polish ] = "Podaje wartoœæ liczby zaokr¹glonej do podanej wielokrotnoœci."; Text[ japanese ] = "数値を挟む基準値ã®å€æ•°ã®ã†ã¡ã€å¤§ãã„æ–¹ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將一個數å—èˆå…¥æˆæœ€æŽ¥è¿‘的整數或其基數的最å°å€æ•¸ã€‚"; @@ -18702,6 +19298,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Bir sayýyý, adýmýn bir sonraki katýna yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre al múltiple significatiu superior més pròxim."; + Text[ thai ] = "ปัดเศษตัวเลขขึ้นผลคูณที่ใà¸à¸¥à¹‰à¸—ี่สุดขà¸à¸‡à¹€à¸¥à¸‚นัยสำคัà¸"; }; ExtraData = { @@ -18737,6 +19334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -18766,6 +19364,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Yukarý yuvarlanacak sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir a l'alça."; + Text[ thai ] = "ตัวเลขที่ปัดเศษขึ้น"; }; String 4 // Name of Parameter 2 { @@ -18791,10 +19390,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Stapgrootte"; Text[ chinese_simplified ] = "significance"; Text[ greek ] = "ÂÞìá"; - Text[ korean ] = "ì¦ê°€"; + Text[ korean ] = "significance"; Text[ turkish ] = "Adým"; Text[ language_user1 ] = " "; Text[ catalan ] = "Importància"; + Text[ thai ] = "เลขนัยสำคัà¸"; }; String 5 // Description of Parameter 2 { @@ -18824,6 +19424,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðerin, katlarýndan birine yuvarlandýðý sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre al múltiple del qual s'arrodoneix el valor."; + Text[ thai ] = "ตัวเลขผลคูณที่ถูà¸à¸›à¸±à¸”เศษ"; }; String 6 // Name of Parameter 3 { @@ -18852,6 +19453,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ language_user1 ] = " "; Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "โหมด"; }; String 7 // Description of Parameter 3 { @@ -18875,11 +19477,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Als aangegeven en niet gelijk aan nul, dan wordt bij een negatief getal en stapgrootte naar boven afgerond.."; Text[ chinese_simplified ] = "如果设定ä¸ç‰äºŽé›¶ï¼Œåœ¨è´Ÿæ•°å’Œè´ŸåŸºæ•°çš„情况下沿\nç»å¯¹å€¼å¢žå¤§çš„æ–¹å‘èˆå…¥ã€‚"; Text[ greek ] = "Áí ïñßæåôáé êáé åßíáé äéÜöïñï ôïõ ìçäåíüò, ôüôå óôç ðåñßðôùóç áñíçôéêïý áñéèìïý êáé âÞìáôïò ãßíåôáé óôñïããõëïðïßçóç ðñïò ôá ðÜíù áíáëïãéê? "; - Text[ korean ] = "ì„¤ì •ë˜ì–´ ìžˆê³ , 0ì´ ì•„ë‹ ê²½ìš° ìŒìˆ˜ì™€ ìœ íš¨ìˆ«ìžì˜ 경우 ê°’ì— ë”°ë¼ ë°˜ì˜¬ë¦¼ë©ë‹ˆë‹¤."; + Text[ korean ] = "ì„¤ì •ë˜ì–´ ìžˆê³ , 0ì´ ì•„ë‹ ê²½ìš° ìŒìˆ˜ì™€ ìœ íš¨ìˆ«ìžì˜ 경우 ê°’ì— ë”°ë¼ ë°˜ì˜¬ë¦¼ë©ë‹ˆë‹¤."; Text[ turkish ] = "Belirtildiðinde ve sýfýra eþit olmadýðýnda, negatif sayýlar ve adýmlar için meblaða göre yukarý yuvarlama yapýlýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si s'indica, i no és igual a zero, s'arrodoneix cap amunt segons la quantitat quan és un valor negatiu significatiu"; Text[ finnish ] = "Jos arvo määritetään eikä se ole nolla, negatiivinen luku pyöristetään ylöspäin ensimmäiseen merkittävään lukuun."; + Text[ thai ] = "ถ้าให้มาà¹à¸¥à¸°à¹„ม่เท่าà¸à¸±à¸šà¸¨à¸¹à¸™à¸¢à¹Œà¹ƒà¸«à¹‰à¸›à¸±à¸”เศษขึ้นตามจำนวนลบà¹à¸¥à¸°à¹€à¸¥à¸‚นัยสำคัà¸"; }; }; // -=*# Resource for function UNTERGRENZE #*=- @@ -18902,7 +19505,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Redondea un número al próximo múltiplo del argumento cifra_significativa, en dirección hacia cero." ; Text [ english_us ] = "Rounds number down to the nearest multiple of significance." ; Text[ chinese_simplified ] = "将一个数å—去尾èˆå…¥æˆæœ€æŽ¥è¿‘的基数的å€æ•°ã€‚"; - Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî êðàòíîãî çàäàííîé òî÷íîñòè ñ íåäîñòàòêîì."; + Text[ russian ] = "Îêðóãëÿåò ÷èñëî äî êðàòíîãî çàäàííîé òî÷íîñòè."; Text[ polish ] = "Podaje wartoœæ liczby zaokr¹glonej do podanej wielokrotnoœci."; Text[ japanese ] = "数値を挟む基準値ã®å€æ•°ã®ã†ã¡ã€å°ã•ã„æ–¹ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將一個數å—èˆå…¥æˆæœ€æŽ¥è¿‘的基數的å€æ•¸ã€‚"; @@ -18914,6 +19517,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayýyý, adýmýn bir alt katýna yuvarlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arrodoneix un nombre al múltiple significatiu inferior més pròxim."; + Text[ thai ] = "ปัดเศษตัวเลขลงให้ใà¸à¸¥à¹‰à¸œà¸¥à¸„ูณขà¸à¸‡à¹€à¸¥à¸‚นัยสำคัà¸à¸—ี่สุด"; }; ExtraData = { @@ -18949,6 +19553,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -18978,6 +19583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Aþaðý yuvarlanan sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha d'arrodonir a la baixa."; + Text[ thai ] = "ตัวเลขที่ปัดเศษลง"; }; String 4 // Name of Parameter 2 { @@ -19003,10 +19609,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Stapgrootte"; Text[ chinese_simplified ] = "significance"; Text[ greek ] = "ÂÞìá"; - Text[ korean ] = "단계 í¬ê¸°"; + Text[ korean ] = "Significance"; Text[ turkish ] = "Adým"; Text[ language_user1 ] = " "; Text[ catalan ] = "Importància"; + Text[ thai ] = "เลขนัยสำคัà¸"; }; String 5 // Description of Parameter 2 { @@ -19016,7 +19623,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Multiplo per il quale si desidera arrotondare." ; Text [ portuguese_brazilian ] = "Die Zahl, auf deren Vielfaches der Wert abgerundet wird." ; Text [ portuguese ] = "é o múltiplo do valor que deseja arredondar." ; - Text [ finnish ] = "Luku, jonka monikertaan arvo pyöristetään (alaspäin)." ; + Text [ finnish ] = "Luku, jonka monikertaan arvo pyöristetään alaspäin." ; Text [ danish ] = "Det multiplum der skal rundes ned til." ; Text [ french ] = "Le multiple auquel vous souhaitez arrondir." ; Text [ swedish ] = "Det tal till vars multipel värdet avrundas neråt." ; @@ -19036,6 +19643,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðerin, bir alt katýna yuvarlandýðý sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre al múltiple del qual s'arrodoneix el valor a la baixa."; + Text[ thai ] = "ตัวเลขขà¸à¸‡à¸œà¸¥à¸„ูณที่ปัดเศษลง"; }; String 6 // Name of Parameter 3 { @@ -19064,6 +19672,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ language_user1 ] = " "; Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "โหมด"; }; String 7 // Description of Parameter 3 { @@ -19077,14 +19686,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Se il modo definito è diverso da zero, in caso di numero e peso negativi, l'arrotondamento avviene ad un valore assoluto." ; Text [ spanish ] = "Si el modo no está definido como cero, un número negativo con un significado negativo se redondea hasta conseguir un valor absoluto." ; Text [ french ] = "Si le mode défini est différent de zero, un nombre négatif avec une précision négative sera arrondi à un nombre absolu." ; - Text [ dutch ] = "Indfien aangegeven en niet gelijk aan nul dan wordt bij een negatief getal en bij negatieve stapgrootte afgerond." ; + Text [ dutch ] = "Indien aangegeven en niet gelijk aan nul, wordt bij een negatief getal en bij negatieve stapgrootte afgerond." ; Text[ chinese_simplified ] = "如果设定ä¸ç‰äºŽé›¶ï¼Œåœ¨è´Ÿæ•°å’Œè´ŸåŸºæ•°çš„情况下沿\nç»å¯¹å€¼å‡å°çš„æ–¹å‘去尾èˆå…¥ã€‚"; Text[ russian ] = "Åñëè ñïîñîá çàäàí è íå ðàâåí íóëþ, òî â ñëó÷àå îòðèöàòåëüíîãî ÷èñëà è îòðèöàòåëüíîé çíà÷èìîñòè îêðóãëåíèå ïîñëåäóåò äî àáñîëþòíîãî çíà÷åíèÿ."; Text[ polish ] = "Jeœli tryb nie jest zerem, zaokr¹gla siê w przypadku liczby ujemnej i ujemnej wa¿noœcido wartoœci absolutnej."; Text[ japanese ] = "対象ãŒè² ã®æ•°ã®æ™‚ã€ã“ã“ã«0以外ã®æ•°å€¤ã‚’指定ã™ã‚‹ã¨ã€æ•°å€¤ã‚’挟む基準値ã®å€æ•°ã®ã†ã¡ã€å¤§ãã„æ–¹ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果è¨å®šä¸ç‰æ–¼é›¶ï¹åœ¨è² æ•¸å’Œè² åŸºæ•¸çš„æƒ…æ³ä¸‹æ²¿çµ•å°å€¼æ¸›å°çš„æ–¹å‘去尾èˆå…¥ã€‚"; Text[ arabic ] = "ÅÐÇ Êã ÅÏÎÇá ÞíãÉ ÑÞãíÉ ÛíÑ ãÓÇæíÉ ááÕÝÑ¡ íÊã ÊÞÑíÈåÇ ÑÞãíÇð ááÃÚáì ÊÈÚÇð ááÒíÇÏÉ ÇáãÚØÇÉ¡ æÐáß ÅÐÇ ßÇäÊ ÇáÞíãÉ ÓÇáÈÉ."; - Text[ dutch ] = "Indfien aangegeven en niet gelijk aan nul dan wordt bij een negatief getal en bij negatieve stapgrootte afgerond."; + Text[ dutch ] = "Indien aangegeven en niet gelijk aan nul, wordt bij een negatief getal en bij negatieve stapgrootte afgerond."; Text[ chinese_simplified ] = "如果设定ä¸ç‰äºŽé›¶ï¼Œåœ¨è´Ÿæ•°å’Œè´ŸåŸºæ•°çš„情况下沿\nç»å¯¹å€¼å‡å°çš„æ–¹å‘去尾èˆå…¥ã€‚"; Text[ greek ] = "Áí ïñßæåôáé êáé åßíáé äéÜöïñï ôïõ ìçäÝí, ôüôå óôç ðåñßðôùóç áñíçôéêïý áñéèìïý êáé âÞìáôïò ãßíåôáé óôñïããõëïðïßçóç ðñïò ôá êÜôù áíáëïãéêÜ ð "; Text[ korean ] = "ì •í•´ì ¸ ìžˆê³ 0ì´ ì•„ë‹ˆë©´, ìŒìˆ˜ì™€ 단계 í¬ê¸°ì˜ 경우 ê°’ì— ë”°ë¼ ë°˜ë²„ë¦¼ë©ë‹ˆë‹¤."; @@ -19092,6 +19701,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ language_user1 ] = " "; Text[ catalan ] = "Si s'indica, i no és igual a zero, s'arrodoneix cap avall segons la quantitat quan és un valor negatiu significatiu"; Text[ finnish ] = "Jos arvo määritetään eikä se ole nolla, negatiivinen luku pyöristetään alaspäin ensimmäiseen merkittävään lukuun."; + Text[ thai ] = "ถ้าให้มาà¹à¸¥à¸°à¹„ม่เท่าà¸à¸±à¸šà¸¨à¸¹à¸™à¸¢à¹Œà¹ƒà¸«à¹‰à¸›à¸±à¸”เศษลงตามจำนวนลบà¹à¸¥à¸°à¹€à¸¥à¸‚นัยสำคัà¸"; }; }; // -=*# Resource for function GGT #*=- @@ -19111,10 +19721,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ french ] = "Renvoie le plus grand commun diviseur." ; Text [ swedish ] = "Största gemensamma divisor." ; Text [ dutch ] = "Grootste gemene deler." ; - Text [ spanish ] = "Máximo común divisor." ; + Text [ spanish ] = "Máximo común divisor" ; Text [ english_us ] = "Greatest Common Divisor" ; Text[ chinese_simplified ] = "最大公约数。"; - Text[ russian ] = "Íàèáîëüøèé îáùèé äåëèòåëü."; + Text[ russian ] = "Âû÷èñëÿåò íàèáîëüøèé îáùèé äåëèòåëü äâóõ èëè áîëåå ÷èñåë."; Text[ polish ] = "Najwiêkszy wspólny dzielnik."; Text[ japanese ] = "最大公約数を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "最大公約數。"; @@ -19126,6 +19736,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "En büyük ortak bölen."; Text[ language_user1 ] = " "; Text[ catalan ] = "Màxim comú divisor"; + Text[ thai ] = "ตัวหารร่วมมาà¸"; }; ExtraData = { @@ -19141,26 +19752,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero intero " ; Text [ portuguese_brazilian ] = "Ganzzahl " ; Text [ portuguese ] = "Número inteiro " ; - Text [ finnish ] = "Muuttuja " ; + Text [ finnish ] = "Kokonaiskuku " ; Text [ danish ] = "Heltal " ; Text [ french ] = "Nombre entier " ; Text [ swedish ] = "heltal " ; - Text [ dutch ] = "Integer " ; + Text [ dutch ] = "Integer" ; Text [ spanish ] = "Número " ; Text [ english_us ] = "Integer " ; Text[ chinese_simplified ] = "Integer "; - Text[ russian ] = "Öåëîå ÷èñëî "; + Text[ russian ] = "Öåëîå"; Text[ polish ] = "Liczba ca³kowita "; Text[ japanese ] = "æ•´æ•° "; Text[ chinese_traditional ] = "Integer "; Text[ arabic ] = "Integer "; - Text[ dutch ] = "Integer "; + Text[ dutch ] = "Integer"; Text[ chinese_simplified ] = "Integer "; Text[ greek ] = "ÁêÝñáéïò "; Text[ korean ] = "ì •ê°’"; Text[ turkish ] = "Tamsayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter "; + Text[ thai ] = "จำนวนเต็ม "; }; String 3 // Description of Parameter 1 { @@ -19171,7 +19783,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Valori interi per i quali calcolare il massimo comune divisore" ; Text [ portuguese_brazilian ] = "Ganzzahl 1;Ganzzahl 2,... sind ganze Zahlen, deren gr?ter gemeinsamer Teiler berechnet wird." ; Text [ portuguese ] = "1; 2,... são números inteiros para os quais será calculado o máximo divisor comum." ; - Text [ finnish ] = "Muuttuja 1, muuttuja 2 ja niin edelleen ovat muuttujia, joiden suurin yhteinen jakaja lasketaan." ; + Text [ finnish ] = "Kokonaisluku 1, kokonaisluku 2 ja niin edelleen ovat kokonaislukuja, joiden suurin yhteinen jakaja lasketaan." ; Text [ danish ] = "Heltal 1; heltal 2,... er hele tal, for hvilke den største fællesnævner skal beregnes." ; Text [ french ] = "Nombre entier 1, nombre entier 2, ... sont les nombres entiers dont le plus grand commun diviseur doit être calculé." ; Text [ swedish ] = "heltal 1; heltal 2,... är heltal vars största gemensamma nämnare beräknas." ; @@ -19191,6 +19803,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tamsayý 1;Tamsayý 2,... en büyük ortak bölenleri hesaplanan tamsayýlardýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter 1; enter 2,... són enters el màxim comú divisor dels quals s'ha de calcular"; + Text[ thai ] = "จำนวนเต็ม 1; จำนวนเต็ม 2,... เป็นจำนวนเต็มสำหรับคำนวณตัวหารร่วมมาà¸"; }; }; // -=*# Resource for function KGV #*=- @@ -19212,7 +19825,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Mínimo común múltiplo." ; Text [ english_us ] = "Lowest common multiple" ; Text[ chinese_simplified ] = "最å°å…¬å€æ•°ã€‚"; - Text[ russian ] = "Íàèìåíüøåå îáùåå êðàòíîå."; + Text[ russian ] = "Âû÷èñëÿåò íàèìåíüøåå îáùåå êðàòíîå."; Text[ polish ] = "Najmniejsza wspólna wielokrotnoœæ."; Text[ japanese ] = "最å°å…¬å€æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "最å°å…¬å€æ•¸ã€‚"; @@ -19220,10 +19833,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "Kleinste gemene veelvoud."; Text[ chinese_simplified ] = "最å°å…¬å€æ•°ã€‚"; Text[ greek ] = "ÅëÜ÷éóôï êïéíü ðïëëáðëÜóéï"; - Text[ korean ] = "최소 ê³µ 배수"; + Text[ korean ] = "최소 공배수"; Text[ turkish ] = "En küçük ortak kat."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mínim comú múltiple"; + Text[ thai ] = "ตัวคูณร่วมน้à¸à¸¢"; }; ExtraData = { @@ -19239,26 +19853,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numero intero " ; Text [ portuguese_brazilian ] = "Ganzzahl " ; Text [ portuguese ] = "Número inteiro " ; - Text [ finnish ] = "Muuttuja " ; + Text [ finnish ] = "Kokonaisluku " ; Text [ danish ] = "Heltal " ; Text [ french ] = "Nombre entier " ; Text [ swedish ] = "Heltal " ; - Text [ dutch ] = "Integer " ; + Text [ dutch ] = "Integer" ; Text [ spanish ] = "Número " ; Text [ english_us ] = "Integer " ; Text[ chinese_simplified ] = "Integer "; - Text[ russian ] = "Öåëîå ÷èñëî "; + Text[ russian ] = "Öåëîå"; Text[ polish ] = "Liczba ca³kowita "; Text[ japanese ] = "æ•´æ•° "; Text[ chinese_traditional ] = "Integer "; Text[ arabic ] = "Integer "; - Text[ dutch ] = "Integer "; + Text[ dutch ] = "Integer"; Text[ chinese_simplified ] = "Integer "; Text[ greek ] = "ÁêÝñáéïò "; Text[ korean ] = "ì •ê°’"; Text[ turkish ] = "Tamsayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter "; + Text[ thai ] = "จำนวนเต็ม "; }; String 3 // Description of Parameter 1 { @@ -19268,7 +19883,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Numeri interi per i quali calcolare il minimo comune multiplo" ; Text [ portuguese_brazilian ] = "Ganzzahl 1;Ganzzahl 2,... sind ganze Zahlen, deren kleinstes gemeinsames Vielfaches berechnet wird." ; Text [ portuguese ] = "1; 2,... são números inteiros para os quais será calculado o mínimo múltiplo comum." ; - Text [ finnish ] = "Muuttuja 1, muuttuja 2 ja niin edelleen ovat muuttujia, joiden pienin yhteinen monikerta lasketaan." ; + Text [ finnish ] = "Kokonaisluku 1, Kokonaisluku 2 ja niin edelleen ovat kokonaislukuja, joiden pienin yhteinen monikerta lasketaan." ; Text [ danish ] = "Heltal 1; heltal 2,... er hele tal, for hvilke det mindste fælles multiplum skal beregnes." ; Text [ french ] = "Nombre entier 1, nombre entier 2, ... sont les nombres entiers dont le plus petit commun diviseur doit être calculé" ; Text [ swedish ] = "heltal 1;heltal 2,... är heltal vars minsta gemensamma multipel beräknas." ; @@ -19288,6 +19903,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tamsayý 1;Tamsayý 2,... en küçük ortak katlarý hesaplanan tamsayýlardýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Enter 1; enter 2,... són enters el m?nim comú múltiple dels quals s'ha de calcular"; + Text[ thai ] = "จำนวนเต็ม 1; จำนวนเต็ม 2,... เป็นจำนวนเต็มขà¸à¸‡à¸•à¸±à¸§à¸„ูณร่วมน้à¸à¸¢à¸—ี่ใช้ในà¸à¸²à¸£à¸„ำนวณ"; }; }; // -=*# Resource for function MTRANS #*=- @@ -19301,7 +19917,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Trasposizione di matrice. Scambia righe e colonne della matrice." ; Text [ portuguese_brazilian ] = "Matrixtransponierung. Vertauscht Zeilen und Spalten einer Matrix." ; Text [ portuguese ] = "Devolve a matriz inversa, transpondo as linhas e colunas da matriz especiificada." ; - Text [ finnish ] = "Matriisin transpositio. Vaihtaa matriisien rivien ja sarakkeiden paikat." ; + Text [ finnish ] = "Taulukon transpositio. Vaihtaa taulukoiden rivien ja sarakkeiden paikat." ; Text [ danish ] = "Matrixtransponering. Bytter om på rækker og kolonner i en matrix." ; Text [ french ] = "Donne la transposée d'une matrice en transposant lignes et colonnes." ; Text [ swedish ] = "Matristransponering. Byter rader och kolumner i en matris." ; @@ -19321,6 +19937,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris transpozisyonu. Bir matrisin satýr ve sütunlarýný birbirleri ile deðiþtirir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Transposició de matrius. Intercanvia les files i les columnes d'una matriu."; + Text[ thai ] = "à¸à¸²à¸£à¸—รานสโพสà¹à¸–วลำดับ เปลี่ยนà¹à¸–วà¹à¸¥à¸°à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œà¸‚à¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -19336,15 +19953,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; Text [ dutch ] = "Matrix" ; - Text [ spanish ] = "matriz" ; + Text [ spanish ] = "Matriz" ; Text [ english_us ] = "array" ; Text[ chinese_simplified ] = "Array"; - Text[ russian ] = "Ìàññèâ"; + Text[ russian ] = "Ìàòðèöà"; Text[ polish ] = "Macierz"; Text[ japanese ] = "行列"; Text[ chinese_traditional ] = "Array"; @@ -19356,6 +19973,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 3 // Description of Parameter 1 { @@ -19365,7 +19983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "La matrice le cui righe e colonne vanno scambiate." ; Text [ portuguese_brazilian ] = "Die Matrix, deren Zeilen und Spalten vertauscht werden." ; Text [ portuguese ] = "é a matriz cujas linhas e colunas deseja transpor." ; - Text [ finnish ] = "Matriisi, jonka rivit ja sarakkeet on transponoitu." ; + Text [ finnish ] = "Taulukko, jonka rivit ja sarakkeet on transponoitu." ; Text [ danish ] = "Den matrix som skal transponeres." ; Text [ french ] = "La matrice dont les lignes et les colonnes vont être transposées." ; Text [ swedish ] = "Matrisen vars rader och kolumner byter plats." ; @@ -19373,7 +19991,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "es la matriz cuyas filas y columnas desea transponer." ; Text [ english_us ] = "The array in which the rows and columns have been transposed." ; Text[ chinese_simplified ] = "其列和行需è¦è¿›è¡Œè½¬ç½®çš„矩阵。"; - Text[ russian ] = "Ìàññèâ, ñòðîêè è ñòîëáöû êîòîðîãî ïåðåñòàâëÿþòñÿ."; + Text[ russian ] = "Ìàòðèöà, ñòðîêè è ñòîëáöû êîòîðîé ïåðåñòàâëÿþòñÿ."; Text[ polish ] = "Macierz, której wiersze i kolumny zosta³y zamienione."; Text[ japanese ] = "è¡Œã¨åˆ—を入れ替ãˆã‚‹è¡Œåˆ—。"; Text[ chinese_traditional ] = "其列欄需è¦é€²è¡Œè½‰ç½®çš„矩陣。"; @@ -19385,6 +20003,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Satýr ve sütunlarý birbirleri ile deðiþtirilen matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu les files i columnes de la qual s'han transposat."; + Text[ thai ] = "à¹à¸–วลำดับในà¹à¸–วà¹à¸¥à¸°à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œà¸—ี่ถูà¸à¸—รานสโพส"; }; }; // -=*# Resource for function MMULT #*=- @@ -19398,7 +20017,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il prodotto di due matrici." ; Text [ portuguese_brazilian ] = "Matrixmultiplikation. Bildet das Produkt zweier Matrizen." ; Text [ portuguese ] = "Devolve o produto matricial de duas matrizes." ; - Text [ finnish ] = "Matriisien tulo. Kertoo kahden matriisin arvot." ; + Text [ finnish ] = "Taulukoiden tulo. Kertoo kahden taulukon arvot." ; Text [ danish ] = "Beregner produktet af to matrixer." ; Text [ french ] = "Calcule le produit de deux matrices." ; Text [ swedish ] = "Matrismultiplikation. Bildar produkten av två matriser." ; @@ -19406,7 +20025,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la matriz producto de dos matrices." ; Text [ english_us ] = "Array multiplication. Returns the product of two arrays." ; Text[ chinese_simplified ] = "矩阵乘积。计算两个矩阵的乘积。"; - Text[ russian ] = "Âû÷èñëÿåò ïðîèçâåäåíèå ìàòðèö."; + Text[ russian ] = "Âû÷èñëÿåò ïðîèçâåäåíèå äâóõ ìàòðèö."; Text[ polish ] = "Mno¿enie macierzy. Jest iloczynem dwóch tablic."; Text[ japanese ] = "2ã¤ã®è¡Œåˆ—ã®ç©ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "矩陣乘ç©ã€‚計算兩個矩陣的乘ç©ã€‚"; @@ -19418,6 +20037,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris çarpýmý. Ýki matrisin çarpým sonucunu verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Multiplicació de matrius. Torna el producte de dues matrius."; + Text[ thai ] = "à¸à¸²à¸£à¸„ูณà¹à¸–วลำดับ ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¸‚à¸à¸‡à¸ªà¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -19433,15 +20053,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice 1" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz 1" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; Text [ dutch ] = "Matrix" ; - Text [ spanish ] = "matriz" ; + Text [ spanish ] = "Matriz" ; Text [ english_us ] = "array" ; Text[ chinese_simplified ] = "Array"; - Text[ russian ] = "Ìàòðèöà 1"; + Text[ russian ] = "Ìàòðèöà"; Text[ polish ] = "Macierz"; Text[ japanese ] = "行列 1"; Text[ chinese_traditional ] = "Array"; @@ -19453,6 +20073,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 3 // Description of Parameter 1 { @@ -19463,7 +20084,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "La prima matrice che si desidera moltiplicare." ; Text [ portuguese_brazilian ] = "Die erste Matrix f? das Matrixprodukt." ; Text [ portuguese ] = "é a primeira matriz para obter o produto matricial." ; - Text [ finnish ] = "Matriisitulon ensimmäinen matriisi." ; + Text [ finnish ] = "Taulukkotulon ensimmäinen taulukko" ; Text [ danish ] = "Den første matrix som skal indgå i produktet." ; Text [ french ] = "Matrice1 pour le produit des deux matrices." ; Text [ swedish ] = "Den första matrisen för matrisprodukten." ; @@ -19483,6 +20104,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris çarpýmý için birinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu per al producte de la matriu."; + Text[ thai ] = "à¹à¸–วลำดับà¹à¸£à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¸‚à¸à¸‡à¹à¸–วลำดับ"; }; String 4 // Name of Parameter 2 { @@ -19492,15 +20114,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice 2" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz 2" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; Text [ dutch ] = "Matrix" ; - Text [ spanish ] = "matriz" ; + Text [ spanish ] = "Matriz" ; Text [ english_us ] = "array" ; Text[ chinese_simplified ] = "Array"; - Text[ russian ] = "Ìàòðèöà 2"; + Text[ russian ] = "Ìàòðèöà"; Text[ polish ] = "Macierz"; Text[ japanese ] = "行列 2"; Text[ chinese_traditional ] = "Array"; @@ -19512,6 +20134,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 5 // Description of Parameter 2 { @@ -19521,11 +20144,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "La seconda matrice con lo stesso numero di righe pari al numero di colonne della prima matrice." ; Text [ portuguese_brazilian ] = "Die zweite Matrix mit der gleichen Anzahl von Zeilen, wie die erste Matrix Spalten hat." ; Text [ portuguese ] = "é a segunda matriz com um número de linhas igual ao número de colunas da primeira matriz." ; - Text [ finnish ] = "Toinen matriisi, jossa on yhtä monta riviä kuin ensimmäisessä matriisissa on sarakkeita." ; + Text [ finnish ] = "Toinen taulukko, jossa on yhtä monta riviä kuin ensimmäisessä taulukossa on sarakkeita." ; Text [ danish ] = "Den anden matrix med samme antal rækker som den første matrix har kolonner." ; Text [ french ] = "Matrice2 pour le produit des deux matrices. Elle comporte autant de lignes que matrice1 a de colonnes." ; Text [ swedish ] = "Den andra matrisen med samma antal rader som den första matrisen har kolumner." ; - Text [ dutch ] = "De tweede matrix met hetzelde aantal rijen als de eerste matrix kolommen heeft." ; + Text [ dutch ] = "De tweede matrix met hetzelfde aantal rijen als de eerste matrix kolommen heeft." ; Text [ spanish ] = "Es la segunda matriz con el mismo número de filas y columnas que la primera." ; Text [ english_us ] = "The second array having the same number of rows as the first array has columns." ; Text[ chinese_simplified ] = "第二个矩阵的行数和第一个矩阵和列数相ç‰ã€‚"; @@ -19534,13 +20157,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "行列乗算ã™ã‚‹2ã¤ã‚ã®è¡Œåˆ—。行列1ã®åˆ—æ•°ï¼è¡Œåˆ—2ã®è¡Œæ•°ã€‚"; Text[ chinese_traditional ] = "第二個矩陣的列數和第一個矩陣和欄數相ç‰ã€‚"; Text[ arabic ] = "ÇáãÕÝæÝÉ ÇáËÇäíÉ ÇáÊí ÊÍÊæí Úáì ÚÏÏ ãä ÇáÕÝæÝ ãÓÇæò áÚÏÏ ÃÚãÏÉ ÇáãÕÝæÝÉ ÇáÃæáì."; - Text[ dutch ] = "De tweede matrix met hetzelde aantal rijen als de eerste matrix kolommen heeft."; + Text[ dutch ] = "De tweede matrix met hetzelfde aantal rijen als de eerste matrix kolommen heeft."; Text[ chinese_simplified ] = "第二个矩阵的行数和第一个矩阵和列数相ç‰ã€‚"; Text[ greek ] = "Ç äåýôåñç ìÞôñá ìå ðëÞèïò ãñáììþí ßóï ìå ôïí ðëÞèïò óôçëþí ôçò ðñþôçò ìÞôñáò."; Text[ korean ] = "첫번째 í–‰ë ¬ì˜ ì—´ 수와 ë™ì¼í•œ í–‰ 수를 가진 ë‘번째 í–‰ë ¬ìž…ë‹ˆë‹¤."; Text[ turkish ] = "Birinci matrisin sütun sayýsýna eþit satýr sayýsý olan ikinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "La segona matriu que té tantes files com columnes té la primera matriu."; + Text[ thai ] = "à¹à¸–วลำดับที่สà¸à¸‡à¸¡à¸µà¸ˆà¸³à¸™à¸§à¸™à¹à¸–วเหมืà¸à¸™à¸à¸±à¸šà¹à¸–วลำดับà¹à¸£à¸à¸¡à¸µà¸„à¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; }; // -=*# Resource for function MDET #*=- @@ -19554,7 +20178,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce il determinante di una matrice." ; Text [ portuguese_brazilian ] = "Bestimmt die Matrixdeterminante." ; Text [ portuguese ] = "Devolve o determinante de uma matriz." ; - Text [ finnish ] = "Palauttaa matriisin determinantin." ; + Text [ finnish ] = "Palauttaa taulukon determinantin." ; Text [ danish ] = "Beregner determinanten for en matrix." ; Text [ french ] = "Renvoie le déterminant d'une matrice." ; Text [ swedish ] = "Bestämmer matrisdeterminanten." ; @@ -19562,7 +20186,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la matriz determinante." ; Text [ english_us ] = "Returns the array determinant." ; Text[ chinese_simplified ] = "确定矩阵行列å¼çš„值。"; - Text[ russian ] = "Âîçâðàùàåò îïðåäåëèòåëü ìàòðèöû."; + Text[ russian ] = "Âû÷èñëÿåò îïðåäåëèòåëü ìàòðèöû."; Text[ polish ] = "Okreœla wyznacznik macierzy."; Text[ japanese ] = "行列å¼ã®è§£ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個數組的矩陣行列å¼çš„值。"; @@ -19574,6 +20198,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris determinantýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el determinant de la matriu."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าดีเทà¸à¸£à¹Œà¸¡à¸´à¹à¸™à¹‰à¸™à¸—์ขà¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -19589,7 +20214,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; @@ -19609,6 +20234,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 3 // Description of Parameter 1 { @@ -19618,7 +20244,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice della quale si vuole calcolare il determinante." ; Text [ portuguese_brazilian ] = "Die Matrix, deren Determinante bestimmt wird." ; Text [ portuguese ] = "é uma matriz numérica com um número igual de linhas e colunas." ; - Text [ finnish ] = "Matriisi, jonka determinantti lasketaan." ; + Text [ finnish ] = "Taulukko, jonka determinantti lasketaan." ; Text [ danish ] = "Den matrix determinanten skal bestemmes for." ; Text [ french ] = "La matrice dont vous souhaitez calculer le déterminant." ; Text [ swedish ] = "Matris vars determinant bestäms." ; @@ -19638,6 +20264,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Determinantý belirlenen matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu el determinant de la qual s'ha de determinar."; + Text[ thai ] = "à¹à¸–วลำดับสำหรับà¸à¸³à¸«à¸™à¸”ค่าดีเทà¸à¸£à¹Œà¸¡à¸´à¹à¸™à¹‰à¸™à¸—์"; }; }; // -=*# Resource for function MINV #*=- @@ -19651,7 +20278,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce l'inversa di una matrice." ; Text [ portuguese_brazilian ] = "Bestimmt die Inverse einer Matrix." ; Text [ portuguese ] = "Devolve a matriz inversa da matriz especificada." ; - Text [ finnish ] = "Palauttaa matriisin käänteisarvon." ; + Text [ finnish ] = "Palauttaa taulukon käänteisarvon." ; Text [ danish ] = "Beregner den inverse matrix." ; Text [ french ] = "Donne l'inverse d'une matrice." ; Text [ swedish ] = "Bestämmer inversen för en matris." ; @@ -19659,7 +20286,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la inversa de una matriz." ; Text [ english_us ] = "Returns the inverse of an array." ; Text[ chinese_simplified ] = "求一个矩阵的逆矩阵。"; - Text[ russian ] = "Îïðåäåëÿåò îáðàòíóþ ìàòðèöó äëÿ ìàòðèöû."; + Text[ russian ] = "Âû÷èñëÿåò îáðàòíóþ ìàòðèöó äëÿ òåêóùåé ìàòðèöû."; Text[ polish ] = "Wyznacza odwrotnoœæ macierzy."; Text[ japanese ] = "行列ã®é€†è¡Œåˆ—ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "求一個矩陣的逆矩陣。"; @@ -19671,6 +20298,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matrisin tersini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la inversa d'una matriu."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -19686,7 +20314,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; @@ -19706,6 +20334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 3 // Description of Parameter 1 { @@ -19715,7 +20344,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice da invertire." ; Text [ portuguese_brazilian ] = "Die Matrix, die invertiert wird." ; Text [ portuguese ] = "é a matriz que será invertida." ; - Text [ finnish ] = "Käännettävä matriisi." ; + Text [ finnish ] = "Käännettävä taulukko" ; Text [ danish ] = "Den matrix som skal inverteres." ; Text [ french ] = "La matrice à inverser." ; Text [ swedish ] = "Matrisen som inverteras." ; @@ -19735,6 +20364,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Tersine çevirilen matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu que s'ha d'invertir."; + Text[ thai ] = "สลับà¹à¸–วลำดับ"; }; }; // -=*# Resource for function EINHEITSMATRIX #*=- @@ -19749,7 +20379,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Determina la matrice quadrata unitaria di una certa dimensione." ; Text [ portuguese_brazilian ] = "Bestimmt die quadratische Einheitsmatrix einer bestimmten Gr?e." ; Text [ portuguese ] = "Devolve a matriz quadrada unitária de uma dada dimensão." ; - Text [ finnish ] = "Palauttaa tietynkokoisen yhtenäisen neliömatriisin." ; + Text [ finnish ] = "Palauttaa tietynkokoisen yhtenäisen neliötaulukon." ; Text [ danish ] = "Returnerer den kvadratiske enhedsmatrix for en bestemt størrelse." ; Text [ french ] = "Renvoie la matrice unitaire carrée pour une dimension spécifiée." ; Text [ swedish ] = "Bestämmer den kvadratiska enhetsmatrisen för en bestämd storlek." ; @@ -19757,7 +20387,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la matriz unitaria (con el mismo número de filas y columnas) de un tamaño determinado." ; Text [ english_us ] = "Returns the unitary square array of a certain size." ; Text[ chinese_simplified ] = "确定一个给定行列数的æ£æ–¹å•å…ƒçŸ©é˜µã€‚"; - Text[ russian ] = "Îïðåäåëÿåò êâàäðàòíóþ åäèíè÷íóþ ìàòðèöó çàäàííîãî ðàçìåðà."; + Text[ russian ] = "Âû÷èñëÿåò ìàòðèöó åäèíè÷íîé ïëîùàäè çàäàííîãî ðàçìåðà."; Text[ polish ] = "Okreœla kwadratow¹ macierz unitarn¹ pewnego rozmiaru."; Text[ japanese ] = "指定ã—ãŸæ¬¡å…ƒã®å˜ä½è¡Œåˆ—ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個輸入欄列數的æ£æ–¹å–®å…ƒçŸ©é™£ã€‚"; @@ -19769,6 +20399,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Belirli bir büyüklüðün üniter kare matrisini verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la matriu quadrada unitària d'una certa mida."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸‚นาดที่à¹à¸™à¹ˆà¸™à¸à¸™à¸‚à¸à¸‡à¹à¸–วลำดับจตุรัสเดียว"; }; ExtraData = { @@ -19804,6 +20435,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Boyut"; Text[ language_user1 ] = " "; Text[ catalan ] = "Dimensions"; + Text[ thai ] = "มิติ"; }; String 3 // Description of Parameter 1 { @@ -19814,12 +20446,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Le dimensioni della matrice unitaria" ; Text [ portuguese_brazilian ] = "Die Gr?e der Einheitsmatrix." ; Text [ portuguese ] = "é o tamanho da matriz unitária." ; - Text [ finnish ] = "Yhtenäisen matriisin koko." ; + Text [ finnish ] = "Yhtenäisen taulukon koko" ; Text [ danish ] = "Enhedsmatrixens størrelse." ; Text [ french ] = "La dimension de la matrice unitaire." ; Text [ swedish ] = "Storleken på enhetsmatrisen." ; Text [ dutch ] = "De grootte van de eenheidsmatrix." ; - Text [ spanish ] = "Es el tamaño de la matriz unitaria." ; + Text [ spanish ] = "Tamaño de la matriz unitaria." ; Text [ english_us ] = "The size of the unitary array." ; Text[ chinese_simplified ] = "指定å•å…ƒçŸ©é˜µçš„大å°ã€‚"; Text[ russian ] = "Ðàçìåð åäèíè÷íîé ìàòðèöû."; @@ -19834,6 +20466,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Üniter matris büyüklüðü."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mida de la matriu unitària."; + Text[ thai ] = "ขนาดขà¸à¸‡à¹à¸–วลำดับเดียว"; }; }; // -=*# Resource for function SUMMENPRODUKT #*=- @@ -19847,7 +20480,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restitusce la somma dei prodotti degli argomenti delle matrici (prodotto scalare)." ; Text [ portuguese_brazilian ] = "(Skalarprodukt) Summiert die Produkte der Argumente von Matrizen." ; Text [ portuguese ] = "Devolve a soma dos produtos dos componentes das matrizes correspondentes." ; - Text [ finnish ] = "(Sisätulot) Palauttaa matriisiargumenttien tulosten summan." ; + Text [ finnish ] = "(Sisätulot) Palauttaa taulukkoargumenttien tulosten summan." ; Text [ danish ] = "(Skalarprodukt) Beregner summeren af produkter af argumenter i matrixer." ; Text [ french ] = "Renvoie la somme des produits des éléments correspondants des matrices." ; Text [ swedish ] = "(Skalärprodukt) Summerar produkterna av argument från matriser." ; @@ -19855,7 +20488,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la suma de los productos de los argumentos de las matrices suministradas." ; Text [ english_us ] = "(Inner products) Returns the sum of the products of array arguments." ; Text[ chinese_simplified ] = "å°†æ•°ç»„é—´å¯¹åº”çš„å…ƒç´ ç›¸ä¹˜ï¼Œç„¶åŽå°†ä¹˜ç§¯ç›¸åŠ 。"; - Text[ russian ] = "Âû÷èñëÿåò ñóììó ïðîèçâåäåíèé àðãóìåíòîâ ìàññèâîâ."; + Text[ russian ] = "Ïåðåìíîæàåò ñîîòâåòñòâóþùèå êîìïîíåíòû òåêóùèõ ìàññèâîâ è âû÷èñëÿåò ñîîòâåòñòâóþùèå çíà÷åíèÿ."; Text[ polish ] = "Oblicza sumê iloczynów odpowiadaj¹cych sobie sk³adników tablic."; Text[ japanese ] = "引数ã¨ã—ã¦æŒ‡å®šã—ãŸé…列ã®å¯¾å¿œã™ã‚‹è¦ç´ é–“ã®ç©ã‚’ã¾ãšè¨ˆç®—ã—ã€ã•ã‚‰ã«ãã®å’Œã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將數組間å°æ‡‰çš„å…ƒç´ ç›¸ä¹˜ï¹ç„¶å¾Œå°‡ä¹˜ç©ç›¸åŠ 。"; @@ -19867,6 +20500,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris deðiþkenlerinin çarpýmlarýný toplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "(Productes interiors) Torna la suma dels productes dels arguments de la matriu."; + Text[ thai ] = "(ผลลัพธ์ภายใน) ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸£à¸§à¸¡à¸‚à¸à¸‡à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ขà¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -19882,11 +20516,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice " ; Text [ portuguese_brazilian ] = "Matrix " ; Text [ portuguese ] = "Matriz " ; - Text [ finnish ] = "Matriisi" ; + Text [ finnish ] = "Taulukko " ; Text [ danish ] = "Matrix " ; Text [ french ] = "Matrice " ; Text [ swedish ] = "matris " ; - Text [ dutch ] = "Matrix " ; + Text [ dutch ] = "Matrix" ; Text [ spanish ] = "matriz " ; Text [ english_us ] = "Array " ; Text[ chinese_simplified ] = "Array "; @@ -19895,13 +20529,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ japanese ] = "行列"; Text[ chinese_traditional ] = "Array "; Text[ arabic ] = "Array "; - Text[ dutch ] = "Matrix "; + Text[ dutch ] = "Matrix"; Text[ chinese_simplified ] = "Array "; Text[ greek ] = "ÌÞôñá "; Text[ korean ] = "í–‰ë ¬ "; Text[ turkish ] = "Matris "; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu "; + Text[ thai ] = "à¹à¸–วลำดับ "; }; String 3 // Description of Parameter 1 { @@ -19911,7 +20546,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Sono da 2 a 30 matrici di cui si desidera moltiplicare gli elementi." ; Text [ portuguese_brazilian ] = "Matrix 1; Matrix 2,... sind bis zu 30 Matrizen, deren Argumente multipliziert werden." ; Text [ portuguese ] = "Matriz1, matriz2,... são matrizes até 30, cujos componentes se desejam multiplicar e depois somar." ; - Text [ finnish ] = "Matriisi 1, matriisi 2 ja niin edelleen ovat 1 - 30 matriisia, joiden argumentit kerrotaan." ; + Text [ finnish ] = "Taulukko 1, taulukko 2 ja niin edelleen ovat 1 - 30 taulukkoa, joiden argumentit kerrotaan." ; Text [ danish ] = "Matrix 1; matrix 2,... er op til 30 matrixer, hvis argumenter skal ganges." ; Text [ french ] = "Matrice 1, matrice 2, ... sont jusqu'à 30 matrices dont vous souhaitez multiplier les éléments." ; Text [ swedish ] = "matris 1; matris 2;... är upp till 30 matriser vars argument multipliceras." ; @@ -19931,6 +20566,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris 1; matris 2,... Deðiþkenleri çarpýlan ve sayýlarý 30'u bulan matrislerdir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu 1, matriu 2,... són fins a 30 matrius els arguments de les quals s'han de multiplicar."; + Text[ thai ] = "à¹à¸–วลำดับ 1, à¹à¸–วลำดับ 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¹à¸–วลำดับมาà¸à¸–ึง 30 ขà¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ที่ถูà¸à¸„ูณ"; }; }; // -=*# Resource for function SUMMEX2MY2 #*=- @@ -19944,7 +20580,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce la somma delle differenze dei quadrati di due matrici." ; Text [ portuguese_brazilian ] = "Summiert die Differenzen der Quadrate zweier Matrizen." ; Text [ portuguese ] = "Soma as diferenças dos quadrados de duas matrizes." ; - Text [ finnish ] = "Palauttaa kahden matriisin neliöiden erotuksen." ; + Text [ finnish ] = "Palauttaa kahden taulukon neliöiden erotuksen." ; Text [ danish ] = "Beregner summen af differenser i kvadrater mellem tilsvarende værdier i to matrixer." ; Text [ french ] = "Renvoie la somme de la différence des carrés des valeurs correspondantes de deux matrices" ; Text [ swedish ] = "Summerar kvadraternas differenser för två matriser." ; @@ -19952,7 +20588,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la sumatoria de la diferencia de cuadrados de dos matrices." ; Text [ english_us ] = "Returns the sum of the difference of squares of two arrays." ; Text[ chinese_simplified ] = "两个数组ä¸å¯¹åº”数值的平方差之和。"; - Text[ russian ] = "Âû÷èñëÿåò ñóììó ðàçíîñòåé êâàäðàòîâ ñîîòâåòñòâóþùèõ çíà÷åíèé â äâóõ ìàññèâàõ."; + Text[ russian ] = "Âû÷èñëÿåò ñóììó ðàçíèö êâàäðàòîâ ñîîòâåòñòâóþùèõ ýëåìåíòîâ äâóõ ìàññèâîâ."; Text[ polish ] = "Sumuje ró¿nicê kwadratów dwóch macierzy."; Text[ japanese ] = "2ã¤ã®è¡Œåˆ—ã§å¯¾å¿œã™ã‚‹è¦ç´ ã®å¹³æ–¹å·®ã‚’åˆè¨ˆã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "兩個數組ä¸å°æ‡‰æ•¸å€¼çš„平方差之和。"; @@ -19964,6 +20600,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýki matrisin karelerinin farklarýný toplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la suma de la diferència dels quadrats de dues matrius."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸£à¸§à¸¡à¸‚à¸à¸‡à¸œà¸¥à¸•à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸ªà¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -19979,7 +20616,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice X" ; Text [ portuguese_brazilian ] = "Matrix X" ; Text [ portuguese ] = "Matriz_X" ; - Text [ finnish ] = "matriisi_x" ; + Text [ finnish ] = "taulukko_x" ; Text [ danish ] = "Matrix_X" ; Text [ french ] = "Matrice_X" ; Text [ swedish ] = "matris_x" ; @@ -19987,7 +20624,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Matriz_X" ; Text [ english_us ] = "array_x" ; Text[ chinese_simplified ] = "array_X"; - Text[ russian ] = "Ìàññèâ_X"; + Text[ russian ] = "Ìàññèâ X"; Text[ polish ] = "macierz_X"; Text[ japanese ] = "行列 X"; Text[ chinese_traditional ] = "array_x"; @@ -19999,6 +20636,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "array_x"; + Text[ thai ] = "à¹à¸–วลำดับ_x"; }; String 3 // Description of Parameter 1 { @@ -20008,7 +20646,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Prima matrice di cui si deve aggiungere l'elemento al quadrato." ; Text [ portuguese_brazilian ] = "Erste Matrix, deren Argumente quadriert summiert werden." ; Text [ portuguese ] = "é a primeira matriz ou intervalo de valores." ; - Text [ finnish ] = "Ensimmäinen matriisi, jonka argumenttien neliöt lasketaan yhteen." ; + Text [ finnish ] = "Ensimmäinen taulukko, jonka argumenttien neliöt lasketaan yhteen." ; Text [ danish ] = "Første matrix hvis kvadrerede argumenter summeres." ; Text [ french ] = "La première matrice dont les carrés des éléments vont être additionnés" ; Text [ swedish ] = "Första matrisen vars argument skall summeras kvadrerade." ; @@ -20028,6 +20666,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýçerdiði deðiþkenlerin karelerinin toplandýðý birinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu en què es totalitzen els quadrats dels arguments."; + Text[ thai ] = "à¹à¸–วลำดับà¹à¸£à¸à¸—ี่รวมà¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ทั้งหมด"; }; String 4 // Name of Parameter 2 { @@ -20037,7 +20676,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice Y" ; Text [ portuguese_brazilian ] = "Matrix Y" ; Text [ portuguese ] = "Matriz_Y" ; - Text [ finnish ] = "matriisi_y" ; + Text [ finnish ] = "taulukko_y" ; Text [ danish ] = "Matrix_Y" ; Text [ french ] = "Matrice_Y" ; Text [ swedish ] = "matris_y" ; @@ -20045,7 +20684,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Matriz_Y" ; Text [ english_us ] = "array_y" ; Text[ chinese_simplified ] = "array_Y"; - Text[ russian ] = "Ìàññèâ_Y"; + Text[ russian ] = "Ìàññèâ Y"; Text[ polish ] = "macierz_Y"; Text[ japanese ] = "行列 Y"; Text[ chinese_traditional ] = "array_y"; @@ -20057,6 +20696,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "array_y"; + Text[ thai ] = "à¹à¸–วลำดับ_y"; }; String 5 // Description of Parameter 2 { @@ -20066,7 +20706,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Seconda matrice di cui si deve sottrarre l'elemento al quadrato." ; Text [ portuguese_brazilian ] = "Zweite Matrix, deren Argumente quadriert abgezogen werden." ; Text [ portuguese ] = "é a segunda matriz ou intervalo de valores." ; - Text [ finnish ] = "Toinen matriisi, jonka argumenttien neliöt vähennetään toisistaan." ; + Text [ finnish ] = "Toinen taulukko, jonka argumenttien neliöt vähennetään toisistaan." ; Text [ danish ] = "Anden matrix hvis kvadrerede argumenter trækkes fra." ; Text [ french ] = "La seconde matrice dont les carrés des éléments vont être soustraits." ; Text [ swedish ] = "Andra matrisen vars argument dras ifrån kvadrerade." ; @@ -20086,6 +20726,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýçerdiði deðiþkenlerin karelerinin çýkartýldýðý ikinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "La segona matriu en què s'ha de restar el quadrat dels arguments."; + Text[ thai ] = "à¹à¸–วลำดับที่สà¸à¸‡à¸—ี่ลบà¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; }; // -=*# Resource for function SUMMEX2PY2 #*=- @@ -20099,7 +20740,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce la somma della somma dei quadrati dei valori di due matrici." ; Text [ portuguese_brazilian ] = "Summiert die Quadratesummen zweier Matrizen." ; Text [ portuguese ] = "Devolve as somas dos quadrados de duas matrizes." ; - Text [ finnish ] = "Palauttaa kahden matriisin neliöiden yhteenlasketut summat." ; + Text [ finnish ] = "Palauttaa kahden taulukon neliöiden yhteenlasketut summat." ; Text [ danish ] = "Beregner summen af summen af kvadrater af tilsvarende værdier i to matrixer." ; Text [ french ] = "Additionne les sommes des carrés de deux matrices." ; Text [ swedish ] = "Summerar kvadratsummorna av två matriser." ; @@ -20107,7 +20748,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la sumatoria de la suma de los cuadrados de dos matrices." ; Text [ english_us ] = "Returns the total of the square sum of two arrays." ; Text[ chinese_simplified ] = "两个数组ä¸å¯¹åº”数值的平方和之和。"; - Text[ russian ] = "Âû÷èñëÿåò ñóììó ñóìì êâàäðàòîâ ñîîòâåòñòâóþùèõ ýëåìåíòîâ äâóõ ìàññèâîâ."; + Text[ russian ] = "Âîçâðàùàåò ñóììó ñóìì êâàäðàòîâ ñîîòâåòñòâóþùèõ ýëåìåíòîâ äâóõ ìàññèâîâ."; Text[ polish ] = "Sumuje sumy kwadratów dwóch tablic."; Text[ japanese ] = "2ã¤ã®è¡Œåˆ—ã§å¯¾å¿œã™ã‚‹è¦ç´ ã®å¹³æ–¹å’Œã‚’åˆè¨ˆã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "兩個數組ä¸å°æ‡‰æ•¸å€¼çš„平方和之和。"; @@ -20119,6 +20760,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýki matrisin karelerinin toplamýný alýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el total de la suma dels quadrats de dues matrius."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸£à¸§à¸¡à¸—ั้งหมดขà¸à¸‡à¸œà¸¥à¸£à¸§à¸¡à¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸ªà¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -20134,7 +20776,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice X" ; Text [ portuguese_brazilian ] = "Matrix X" ; Text [ portuguese ] = "Matriz_X" ; - Text [ finnish ] = "matriisi_x" ; + Text [ finnish ] = "taulukko_x" ; Text [ danish ] = "Matrix_X" ; Text [ french ] = "Matrice_X" ; Text [ swedish ] = "matris_x" ; @@ -20142,7 +20784,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Matriz_X" ; Text [ english_us ] = "array_x" ; Text[ chinese_simplified ] = "array_X"; - Text[ russian ] = "Ìàññèâ_X"; + Text[ russian ] = "Ìàññèâ X"; Text[ polish ] = "macierz_X"; Text[ japanese ] = "行列 X"; Text[ chinese_traditional ] = "array_x"; @@ -20154,6 +20796,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "array_x"; + Text[ thai ] = "à¹à¸–วลำดับ_x"; }; String 3 // Description of Parameter 1 { @@ -20163,7 +20806,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Prima matrice di cui si deve aggiundere l'elemento al quadrato." ; Text [ portuguese_brazilian ] = "Erste Matrix, deren Argumente quadriert summiert werden." ; Text [ portuguese ] = "é a primeira matriz ou intervalo de valores." ; - Text [ finnish ] = "Ensimmäinen matriisi, jonka argumenttien neliöt lasketaan yhteen." ; + Text [ finnish ] = "Ensimmäinen taulukko, jonka argumenttien neliöt lasketaan yhteen." ; Text [ danish ] = "Første matrix hvis kvadrerede argumenter summeres." ; Text [ french ] = "La première matrice dont les carrés des éléments vont être additionnés." ; Text [ swedish ] = "Första matrisen vars argument summeras kvadrerade." ; @@ -20179,10 +20822,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ dutch ] = "De eerste matrix waarvan de argumenten in het kwadraat worden opgeteld."; Text[ chinese_simplified ] = "第一个数æ®ç»„。"; Text[ greek ] = "Ðñþôç ìÞôñá, ôçò ïðïßáò áèñïßæïíôáé ôá ôåôñÜãùíá ôùí ïñéóìÜôùí ôçò."; - Text[ korean ] = "ë…립 ë³€ìˆ˜ì˜ ì œê³±ì´ í•©ì‚°ë 첫번째 í–‰ë ¬ìž…ë‹ˆë‹¤."; + Text[ korean ] = "ë…립 ë³€ìˆ˜ì˜ ì œê³±ì´ í•©ì‚°ë 첫번째 í–‰ë ¬ìž…ë‹ˆë‹¤."; Text[ turkish ] = "Ýçerdiði deðiþkenlerin karelerinin toplandýðý birinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu en què es totalitzen els quadrats dels arguments."; + Text[ thai ] = "à¹à¸–วลำดับà¹à¸£à¸à¸—ี่รวมà¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; String 4 // Name of Parameter 2 { @@ -20192,7 +20836,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice Y" ; Text [ portuguese_brazilian ] = "Matrix Y" ; Text [ portuguese ] = "Matriz _Y" ; - Text [ finnish ] = "matriisi_y" ; + Text [ finnish ] = "taulukko_y" ; Text [ danish ] = "Matrix_Y" ; Text [ french ] = "Matrice_Y" ; Text [ swedish ] = "matris_y" ; @@ -20200,7 +20844,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Matriz_Y" ; Text [ english_us ] = "array_y" ; Text[ chinese_simplified ] = "array_Y"; - Text[ russian ] = "Ìàññèâ_Y"; + Text[ russian ] = "Ìàññèâ Y"; Text[ polish ] = "macierz_Y"; Text[ japanese ] = "行列 Y"; Text[ chinese_traditional ] = "array_y"; @@ -20212,6 +20856,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "array_y"; + Text[ thai ] = "à¹à¸–วลำดับ_y"; }; String 5 // Description of Parameter 2 { @@ -20221,7 +20866,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Seconda matrice di cui si deve sottrarre l'elemento al quadrato." ; Text [ portuguese_brazilian ] = "Zweite Matrix, deren Argumente quadriert summiert werden." ; Text [ portuguese ] = "é a segunda matriz ou intervalo de valores." ; - Text [ finnish ] = "Toinen matriisi, jonka argumenttien neliöt lasketaan yhteen." ; + Text [ finnish ] = "Toinen taulukko, jonka argumenttien neliöt lasketaan yhteen." ; Text [ danish ] = "Anden matrix hvis kvadrerede argumenter summeres." ; Text [ french ] = "La seconde matrice dont les carrés des éléments vont être additionnés" ; Text [ swedish ] = "Andra matrisen vars argument summeras kvadrerade" ; @@ -20241,6 +20886,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýçerdiði deðiþkenlerin karelerinin toplandýðý ikinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "La segona matriu en què s'ha de sumar el quadrat dels arguments."; + Text[ thai ] = "à¹à¸–วลำดับที่สà¸à¸‡à¸—ี่รวมà¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; }; // -=*# Resource for function SUMMEXMY2 #*=- @@ -20254,7 +20900,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Restituisce la somma dei quadrati delle differenze di due matrici." ; Text [ portuguese_brazilian ] = "Summiert die Quadrate der Differenzen zweier Matrizen." ; Text [ portuguese ] = "Soma os quadrados das diferenças obtidas em duas matrizes." ; - Text [ finnish ] = "Palauttaa kahden matriisin neliöiden erotusten summan." ; + Text [ finnish ] = "Palauttaa kahden taulukon neliöiden erotusten summan." ; Text [ danish ] = "Beregner summen af kvadrater af differenser mellem tilsvarende værdier i to matrixer." ; Text [ french ] = "Renvoie la somme des carrés des différences entre deux matrices." ; Text [ swedish ] = "Summerar kvadraterna av två matrisers differenser." ; @@ -20262,7 +20908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Devuelve la sumatoria del cuadrado de la diferencia entre dos matrices." ; Text [ english_us ] = "Returns the sum of squares of differences of two arrays." ; Text[ chinese_simplified ] = "两个数组ä¸å¯¹åº”数值之差的平方和。"; - Text[ russian ] = "Âû÷èñëÿåò ñóììó êâàäðàòîâ ðàçíîñòåé ñîîòâåòñòâóþùèõ çíà÷åíèé â äâóõ ìàññèâàõ."; + Text[ russian ] = "Âîçâðàùàåò ñóììó êâàäðàòîâ ðàçíîñòåé äâóõ ìàññèâîâ."; Text[ polish ] = "Oblicza sumê kwadratów odpowiadaj¹cych sobie wartoœci dwóch tablic."; Text[ japanese ] = "2ã¤ã®è¡Œåˆ—ã§å¯¾å¿œã™ã‚‹è¦ç´ ã®å·®ã‚’二乗ã—ãŸä¸Šã§ã€ãã®åˆè¨ˆã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "兩個數組ä¸å°æ‡‰æ•¸å€¼ä¹‹å·®çš„平方和。"; @@ -20274,6 +20920,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Ýki matrisin farklarýnýn karelerini toplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la suma dels quadrats de les diferències de dues matrius."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸£à¸§à¸¡à¸‚à¸à¸‡à¸à¸³à¸¥à¸±à¸‡à¸‚à¸à¸‡à¸œà¸¥à¸•à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸ªà¸à¸‡à¹à¸–วลำดับ"; }; ExtraData = { @@ -20289,7 +20936,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice X" ; Text [ portuguese_brazilian ] = "Matrix X" ; Text [ portuguese ] = "Matriz_X" ; - Text [ finnish ] = "matriisi_x" ; + Text [ finnish ] = "taulukko_x" ; Text [ danish ] = "Matrix_X" ; Text [ french ] = "Matrice_X" ; Text [ swedish ] = "matris_x" ; @@ -20297,7 +20944,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Matriz_X" ; Text [ english_us ] = "array_x" ; Text[ chinese_simplified ] = "array_X"; - Text[ russian ] = "Ìàññèâ_X"; + Text[ russian ] = "Ìàññèâ X"; Text[ polish ] = "macierz_X"; Text[ japanese ] = "行列 X"; Text[ chinese_traditional ] = "array_x"; @@ -20309,6 +20956,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "array_x"; + Text[ thai ] = "à¹à¸–วลำดับ_x"; }; String 3 // Description of Parameter 1 { @@ -20318,7 +20966,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Prima matrice per il calcolo delle differenze tra gli elementi." ; Text [ portuguese_brazilian ] = "Erste Matrix zur Bildung der Argumentdifferenzen." ; Text [ portuguese ] = "é a primeira matriz ou intervalo de valores." ; - Text [ finnish ] = "Ensimmäinen matriisi argumenttien erojen tutkimista varten." ; + Text [ finnish ] = "Ensimmäinen taulukko argumenttien erojen tutkimista varten." ; Text [ danish ] = "Den første matrix til dannelse af argumentdifferenser." ; Text [ french ] = "La première matrice pour le calcul des différences entre les éléments." ; Text [ swedish ] = "Första matrisen för bildning av argumentdifferenserna." ; @@ -20338,6 +20986,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðiþken farklarýnýn oluþturulmasý için birinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu per formar les diferències d'arguments."; + Text[ thai ] = "à¹à¸–วลำดับà¹à¸£à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸ˆà¸±à¸”ผลต่างขà¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; String 4 // Name of Parameter 2 { @@ -20347,7 +20996,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Matrice Y" ; Text [ portuguese_brazilian ] = "Matrix Y" ; Text [ portuguese ] = "Matriz_Y" ; - Text [ finnish ] = "matriisi_y" ; + Text [ finnish ] = "taulukko_y" ; Text [ danish ] = "Matrix_Y" ; Text [ french ] = "Matrice_Y" ; Text [ swedish ] = "matris_y" ; @@ -20355,7 +21004,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ spanish ] = "Matriz_Y" ; Text [ english_us ] = "array_y" ; Text[ chinese_simplified ] = "array_Y"; - Text[ russian ] = "Ìàññèâ_Y"; + Text[ russian ] = "Ìàññèâ Y"; Text[ polish ] = "macierz_Y"; Text[ japanese ] = "行列 Y"; Text[ chinese_traditional ] = "array_y"; @@ -20367,6 +21016,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Matris_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "array_y"; + Text[ thai ] = "à¹à¸–วลำดับ_y"; }; String 5 // Description of Parameter 2 { @@ -20376,7 +21026,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ italian ] = "Seconda matrice per il calcolo delle differenze tra gli argomenti." ; Text [ portuguese_brazilian ] = "Zweite Matrix zur Bildung der Argumentdifferenzen." ; Text [ portuguese ] = "é a segunda matriz ou intervalo de valores." ; - Text [ finnish ] = "Toinen matriisi argumenttien erojen tutkimista varten." ; + Text [ finnish ] = "Toinen taulukko argumenttien erojen tutkimista varten." ; Text [ danish ] = "Den anden matrix til dannelse af argumentdifferenser." ; Text [ french ] = "La seconde matrice pour le calcul des différences entre les éléments." ; Text [ swedish ] = "Andra matrisen för bildning av argumentdifferenserna." ; @@ -20396,6 +21046,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text[ turkish ] = "Deðiþken farklarýnýn oluþturulmasý için birinci matris."; Text[ language_user1 ] = " "; Text[ catalan ] = "La segona matriu per formar les diferències de l'argument."; + Text[ thai ] = "à¹à¸–วลำดับที่สà¸à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸ˆà¸±à¸”ผลต่างขà¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; }; }; @@ -20415,7 +21066,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce una distribuzione di frequenza sotto forma di matrice verticale." ; Text [ portuguese_brazilian ] = "Erstellt eine H?ufigkeitsverteilung als Spaltenmatrix." ; Text [ portuguese ] = "Devolve uma distribuição de frequência como matriz vertical." ; - Text [ finnish ] = "Palauttaa frekvenssijakauman pystymatriisina." ; + Text [ finnish ] = "Palauttaa frekvenssijakauman pystytaulukkona." ; Text [ danish ] = "Returnerer en frekvensfordeling som lodret matrix." ; Text [ french ] = "Renvoie une distribution fréquentielle sous forme de matrice verticale." ; Text [ swedish ] = "Returnerar en frekvensfördelning som en kolumnmatris." ; @@ -20423,7 +21074,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve una distribución de frecuencia como una matriz vertical." ; Text [ english_us ] = "Returns a frequency distribution as a vertical array." ; Text[ chinese_simplified ] = "计算一个频率分布，以列矩阵方å¼æ˜¾ç¤ºç»“果。"; - Text[ russian ] = "Âîçâðàùàåò ðàñïðåäåëåíèå ÷àñòîò â âèäå âåðòèêàëüíîãî ìàññèâà."; + Text[ russian ] = "Âîçâðàùàåò ÷àñòîòíîå ðàñïðåäåëåíèå â âèäå îäíîñòîëáöîâîé ìàòðèöû."; Text[ polish ] = "Wyznacza rozk³ad czêstoœci w postaci pionowej tablicy."; Text[ japanese ] = "データã®é »åº¦åˆ†å¸ƒã‚’１列ã®è¡Œåˆ—ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "è¨ˆç®—ä¸€å€‹é »çŽ‡åˆ†ä½ˆï¹ä»¥æ•¸æ“šåˆ—å½¢å¼é¡¯ç¤ºçµæžœã€‚"; @@ -20435,6 +21086,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sütun matrisi þeklinde bir sýklýk daðýtýmý oluþturur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna una distribució de freq??ncies com a matriu vertical."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¸„วามถี่เป็นà¹à¸–วลำดับà¹à¸™à¸§à¸•à¸±à¹‰à¸‡"; }; ExtraData = { @@ -20458,7 +21110,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "datos" ; Text [ english_us ] = "data" ; Text[ chinese_simplified ] = "data_array"; - Text[ russian ] = "Ìàññèâ_äàííûõ"; + Text[ russian ] = "Äàííûå"; Text[ polish ] = "tablica_dane"; Text[ japanese ] = "データ範囲"; Text[ chinese_traditional ] = "data_array"; @@ -20470,6 +21122,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veriler"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -20479,7 +21132,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten." ; Text [ portuguese ] = "é uma matriz ou referência a um conjunto de valores, dos quais deseja contar as frequências.." ; - Text [ finnish ] = "Tietomatriisi." ; + Text [ finnish ] = "Tietotaulukko" ; Text [ danish ] = "Den matrix af data som hyppigheden skal beregnes af." ; Text [ french ] = "La matrice des données." ; Text [ swedish ] = "Matris med data som frekvensen skall beräknas för." ; @@ -20487,7 +21140,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una matriz de, o una referencia a, un conjunto de valores cuyas frecuencias desea contar." ; Text [ english_us ] = "The array of the data." ; Text[ chinese_simplified ] = "è¦è®¡ç®—其频率分布的数æ®çŸ©é˜µã€‚"; - Text[ russian ] = "Ìàññèâ èëè ññûëêà íà ìíîæåñòâî äàííûõ, äëÿ êîòîðûõ âû÷èñëÿþòñÿ ÷àñòîòû."; + Text[ russian ] = "Ìàññèâ äàííûõ."; Text[ polish ] = "Macierz danych."; Text[ japanese ] = "検査ã®å¯¾è±¡ã¨ãªã‚‹ç¯„囲。"; Text[ chinese_traditional ] = "è¦è¨ˆç®—å…¶é »çŽ‡åˆ†ä½ˆçš„æ•¸æ“šçµ„ã€‚"; @@ -20499,6 +21152,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -20516,7 +21170,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grupos" ; Text [ english_us ] = "classes" ; Text[ chinese_simplified ] = "group_array"; - Text[ russian ] = "Ìàññèâ_ãðóïïû"; + Text[ russian ] = "Êëàññû"; Text[ polish ] = "Klasy"; Text[ japanese ] = "区間"; Text[ chinese_traditional ] = "group_array"; @@ -20528,6 +21182,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sýnýf"; Text[ language_user1 ] = " "; Text[ catalan ] = "classes"; + Text[ thai ] = "คลาส"; }; String 5 // Description of Parameter 2 { @@ -20537,7 +21192,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice per formare classi di valori" ; Text [ portuguese_brazilian ] = "Die Matrix zur Klassenbildung." ; Text [ portuguese ] = "é uma matriz ou referência a intervalos de dados nos quais deseja agrupar os valores da matriz_dados." ; - Text [ finnish ] = "Luokkien muodostusmatriisit." ; + Text [ finnish ] = "Luokkien muodostustaulukot" ; Text [ danish ] = "Den matrix hvor værdierne fra datamatrix skal grupperes." ; Text [ french ] = "La matrice pour la formation de classes." ; Text [ swedish ] = "Matrisen för klassificering" ; @@ -20545,7 +21200,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una matriz de, o una referencia a, intervalos dentro de los cuales se desea agrupar los valores del argumento datos." ; Text [ english_us ] = "The array for forming classes." ; Text[ chinese_simplified ] = "用于构æˆé¢‘率计算分段点的数æ®çŸ©é˜µã€‚"; - Text[ russian ] = "Ìàññèâ èëè ññûëêà íà äèàïàçîí, â êîòîðîì ãðóïïèðóþòñÿ çíà÷åíèÿ â ìàññèâå äàííûõ."; + Text[ russian ] = "Ìàññèâ äëÿ ôîðìèðîâàíèÿ êëàññîâ."; Text[ polish ] = "Macierz dla tworzenia klas."; Text[ japanese ] = "データを区切る間隔。"; Text[ chinese_traditional ] = "用於構æˆé »çŽ‡è¨ˆç®—分段點的數據組。"; @@ -20557,6 +21212,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sýnýf oluþturma matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu per formar les classes."; + Text[ thai ] = "à¹à¸–วลำดับสำหรับà¸à¸²à¸£à¸ˆà¸±à¸”คลาส"; }; }; // -=*# Resource for function RGP #*=- @@ -20571,7 +21227,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce i parametri della regressione lineare sotto forma di matrice." ; Text [ portuguese_brazilian ] = "Berechnet Kenngr?en der linearen Regression als Matrix." ; Text [ portuguese ] = "Devolve os parâmetros de uma tendência linear." ; - Text [ finnish ] = "Laskee lineaarisen regression parametrit matriisina." ; + Text [ finnish ] = "Laskee lineaarisen regression parametrit taulukkona." ; Text [ danish ] = "Bruger de mindste kvadraters metode til at beregne den lige linje, som svarer bedst til dataene, og returnerer en tilsvarende matrix." ; Text [ french ] = "Renvoie les paramètres de la régression linéaire sous forme de matrice." ; Text [ swedish ] = "Beräknar parametrarna för den linjära regressionen som matris." ; @@ -20587,10 +21243,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de parameters van een lineaire trend als matrix."; Text[ chinese_simplified ] = "计算线性回归的数组型系数。"; Text[ greek ] = "Õðïëïãßæåé ôéò ðáñáìÝôñïõò ôçò ãñáììéêÞò ðáëéíäñüìçóçò ùò ìÞôñá."; - Text[ korean ] = "ì„ í˜• íšŒê·€ì˜ íŒŒë¼ë¯¸í„°ë¥¼ í–‰ë ¬ë¡œ 계산합니다."; + Text[ korean ] = "ì„ í˜• íšŒê·€ì˜ ë§¤ê°œ 변수를 í–‰ë ¬ë¡œ 계산합니다."; Text[ turkish ] = "Doðrusal regresyonun parametrelerini matris olarak hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula els paràmetres de la regressió lineal com a una matriu."; + Text[ thai ] = "คำนวณพารามิเตà¸à¸£à¹Œà¸‚à¸à¸‡à¸à¸²à¸£à¸–ดถà¸à¸¢à¹à¸šà¸šà¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡à¹€à¸›à¹‡à¸™à¹à¸–วลำดับ"; }; ExtraData = { @@ -20614,7 +21271,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_äàííûå_Y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "既知㮠Y"; Text[ chinese_traditional ] = "data_Y"; @@ -20626,6 +21283,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -20635,7 +21293,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei valori Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é o conjunto de valores já conhecidos na relação y = mx + b." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -20655,6 +21313,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -20672,7 +21331,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_äàííûå_X"; + Text[ russian ] = "Äàííûå Õ"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "既知㮠X"; Text[ chinese_traditional ] = "data_X"; @@ -20684,6 +21343,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -20693,7 +21353,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati X" ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten." ; Text [ portuguese ] = "é um conjunto facultativo de valores de x já conhecidos na relação y = mx + b." ; - Text [ finnish ] = "Tietomatriisi X." ; + Text [ finnish ] = "Tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data." ; Text [ french ] = "La matrice des données X." ; Text [ swedish ] = "Matrisen med x-data." ; @@ -20713,6 +21373,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X "; }; String 6 // Name of Parameter 3 { @@ -20730,7 +21391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "tipo_lineal" ; Text [ english_us ] = "Linear_type" ; Text[ chinese_simplified ] = "Linear_type"; - Text[ russian ] = "Òèï_ïðÿìîé"; + Text[ russian ] = "Òèï ëèíèè"; Text[ polish ] = "Typ_prostej"; Text[ japanese ] = "ç·šå½¢"; Text[ chinese_traditional ] = "Linear_type"; @@ -20742,6 +21403,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Doðru_türü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Linear_type"; + Text[ thai ] = "เส้นตรง_ชนิด"; }; String 7 // Description of Parameter 3 { @@ -20759,7 +21421,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Si el tipo = 0 las líneas rectas se calcularán mediante el punto cero, sino como líneas de regresión." ; Text [ english_us ] = "If type = 0 the linears will be calculated through the zero point, or else moved linears." ; Text[ chinese_simplified ] = "如果type=0，那么直线ç»è¿‡é›¶ç‚¹ã€‚"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, êîòîðîå óêàçûâàåò, òðåáóåòñÿ ëè, ÷òîáû êîíñòàíòà b áûëà ðàâíà 0."; + Text[ russian ] = "Åñëè òèï = 0, òî ëèíèè ïðîõîäÿò ÷åðåç íà÷àëî êîîðäèíàò, èíà÷å - ñìåùàþòñÿ."; Text[ polish ] = "Wartoœæ logiczna okreœlaj¹ca, czy dla sta³ej b ma zostaæ wymuszona wartoœæ 0."; Text[ japanese ] = "定数 = 0 ã«ã™ã‚‹ã¨å€¤ãŒ0ã«è¨å®šã•ã‚Œã€ãã†ã§ãªã„å ´åˆã¯å€¤ãŒèª¿æ•´ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果const=0ï¹è¡¨ç¤ºç›´ç·šç¶“éŽé›¶é»žã€‚"; @@ -20767,10 +21429,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Indien type=0 dan worden de lijnen door het nulpunt berekend; verschoven lijnen zijn ook mogelijk."; Text[ chinese_simplified ] = "如果type=0，那么直线ç»è¿‡é›¶ç‚¹ã€‚"; Text[ greek ] = "ÅÜí åßíáé Ôýðïò=0, ôüôå õðïëïãßæïíôáé åõèåßåò ïé ïðïßåò äéÝñ÷ïíôáé áðü ôï ìçäåíéêü óçìåßï, áëëéþò êáé ìåôáöåñüìåíåò åõèåßåò."; - Text[ korean ] = "ìœ í˜•=0ì´ë©´, 0ì ì„ í†µê³¼í•˜ëŠ” ì§ì„ ë“¤ì´ ê³„ì‚°ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš° ì´ë™ëœ ì§ì„ ë“¤ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; + Text[ korean ] = "ìœ í˜•=0ì´ë©´, 0ì ì„ í†µê³¼í•˜ëŠ” ì§ì„ ë“¤ì´ ê³„ì‚°ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš° ì´ë™ëœ ì§ì„ ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; Text[ turkish ] = "Tür=0 olursa doðrular, sýfýr noktasý üzerinden hesaplanýr. Diðer durumlarda taþýnmýþ doðrular da hesaplanýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el tipus = 0, les lineals es calcularan a través del punt zero, o si no les lineals mogudes. "; + Text[ thai ] = "ถ้าชนิด = 0 เส้นตรงจะถูà¸à¸„ำนวณผ่านจุดศูนย์, หรืà¸à¸–้าเป็นà¸à¸¢à¹ˆà¸²à¸‡à¸à¸·à¹ˆà¸™à¹ƒà¸«à¹‰à¸¢à¹‰à¸²à¸¢à¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡"; }; String 8 // Name of Parameter 4 { @@ -20789,7 +21452,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "estadística" ; Text [ english_us ] = "stats" ; Text[ chinese_simplified ] = "stats"; - Text[ russian ] = "Ïàðàìåòðû"; + Text[ russian ] = "Ñòàòèñòèêà"; Text[ polish ] = "Parametry"; Text[ japanese ] = "補æ£"; Text[ chinese_traditional ] = "stats"; @@ -20801,6 +21464,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Parametreler"; Text[ language_user1 ] = " "; Text[ catalan ] = "estadístiques"; + Text[ thai ] = "สถิติ"; }; String 9 // Description of Parameter 4 { @@ -20819,7 +21483,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un valor lógico que especifica si se han de devolver estadísticas de regresión adicionales." ; Text [ english_us ] = "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well." ; Text[ chinese_simplified ] = "如果 stats=0 ，åªè®¡ç®—回归系数，å¦åˆ™åŒæ—¶è®¡ç®—å…¶ä»–é™„åŠ æ•°å€¼ã€‚"; - Text[ russian ] = "Åñëè ïàðàìåòðû ðàâíû íóëþ, òî âû÷èñëÿþòñÿ òîëüêî êîýôôèöèåíòû ðåãðåññèè, â ïðîòèâíîì ñëó÷àå òàêæå äîïîëíèòåëüíûå çíà÷åíèÿ."; + Text[ russian ] = "Åñëè ñòàòèñòèêà = 0, òî âû÷èñëÿåòñÿ òîëüêî êîýôôèöèåíò ðåãðåññèè, èíà÷å âû÷èñëÿþòñÿ äîïîëíèòåëüíûå çíà÷åíèÿ."; Text[ polish ] = "Jeœli parametry wynosz¹ 0, obliczane bêd¹ tylko wspó³czynniki regresji, w innych przypadkach równie¿ pozosta³e wartoœci."; Text[ japanese ] = "è£œæ£ = 0 ã«ã™ã‚‹ã¨å›žå¸°ç›´ç·šã®è£œæ£é …ã ã‘ã‚’è¿½åŠ æƒ…å ±ã¨ã—ã¦è¿”ã—ã€ãã†ã§ãªã„å ´åˆã¯ãã®ä»–ã®å€¤ã‚‚è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果 stats=0 ï¹åªè¨ˆç®—回æ¸ç›¸é—œä¿‚數ï¹å¦å‰‡åŒæ™‚è¨ˆç®—å…¶ä»–é™„åŠ æ•¸å€¼ã€‚"; @@ -20827,10 +21491,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Indien parameter=0 dan worden alleen de regressiecoëfficiënten berekend; ook andere waarden zijn mogelijk."; Text[ chinese_simplified ] = "如果 stats=0 ，åªè®¡ç®—回归系数，å¦åˆ™åŒæ—¶è®¡ç®—å…¶ä»–é™„åŠ æ•°å€¼ã€‚"; Text[ greek ] = "ÅÜí åßíáé ðáñÜìåôñïò = 0 , ôüôå èá ãßíåé ìüíï ï õðïëïãéóìüò ôùí óõíôåëåóôþí ðáëéíäñüìçóçò, äéáöïñåôéêÜ èá õðïëïãéóôïýí êáé Üëëåò ôéìÝò."; - Text[ korean ] = "파ë¼ë¯¸í„°=0ì´ë©´ 회귀 계수만 계산ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš° 다른 ê°’ë“¤ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; + Text[ korean ] = "매개 변수=0ì´ë©´ 회귀 계수만 계산ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš°ì—는 다른 ê°’ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; Text[ turkish ] = "Parametreler=0 olursa yalnýzca regresyon katsayýlarý hesaplanýr. Diðer durumlarda diðer deðerler de hesaplanýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el paràmetre = 0 només es calcularà el coeficient de regressió; altrament, també altres valors."; + Text[ thai ] = "ถ้าพารามิเตà¸à¸£à¹Œ = 0 ให้คำนวณสัมประสิทธิ์à¸à¸²à¸£à¸–ดถà¸à¸¢à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸”ียว, ค่าà¸à¸·à¹ˆà¸™ ๆ à¸à¹‡à¹€à¸«à¸¡à¸·à¸à¸™à¸à¸±à¸™"; }; }; // -=*# Resource for function RKP #*=- @@ -20845,7 +21510,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce i parametri della regressione esponenziale sotto forma di matrice." ; Text [ portuguese_brazilian ] = "Berechnet Kenngr?en der exponentiellen Regression als Matrix." ; Text [ portuguese ] = "Calcula os parâmetros da curva de regressão exponencial na forma de matriz." ; - Text [ finnish ] = "Laskee eksponentiaalisen regressiokäyrän parametrit matriisina." ; + Text [ finnish ] = "Laskee eksponentiaalisen regressiokäyrän parametrit taulukkona." ; Text [ danish ] = "Bruger regressionsanalyse til at beregne en eksponentialkurve, som svarer bedst til dataene, og returnerer en tilsvarende matrix." ; Text [ french ] = "Renvoie les paramètres de la régression exponentielle sous forme de matrice." ; Text [ swedish ] = "Beräknar parametrar för den exponentiella regressionen som matris." ; @@ -20853,7 +21518,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve los parámetros de una curva de tendencia exponencial." ; Text [ english_us ] = "Calculates the parameters of the exponential regression curve as an array." ; Text[ chinese_simplified ] = "计算æ述指数回归曲线的数组。"; - Text[ russian ] = "Âû÷èñëÿåò ïàðàìåòðû ýêñïîíåíöèàëüíîé ðåãðåññèè â âèäå ìàññèâà."; + Text[ russian ] = "Âû÷èñëÿåò ïàðàìåòðû êðèâîé ýêñïîíåíöèàëüíîé ðåãðåññèè (y=b*m^x) â âèäå ìàññèâà."; Text[ polish ] = "Wyznacza parametry regresji wyk³adniczej jako macierz."; Text[ japanese ] = "指数トレンドã®ãƒ‘ラメータを返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算æ述指數迴æ¸æ›²ç·šçš„數組。"; @@ -20861,10 +21526,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de parameters van een exponentiële trend als matrix."; Text[ chinese_simplified ] = "计算æ述指数回归曲线的数组。"; Text[ greek ] = "Õðïëïãßæåé ôéò ðáñáìÝôñïõò ôçò åêèåôéêÞò ðáëéíäñüìçóçò ùò ìÞôñá."; - Text[ korean ] = "지수 íšŒê·€ì˜ íŒŒë¼ë¯¸í„°ë¥¼ í–‰ë ¬ë¡œ 계산합니다."; + Text[ korean ] = "지수 íšŒê·€ì˜ ë§¤ê°œ 변수를 í–‰ë ¬ë¡œ 계산합니다."; Text[ turkish ] = "Üstel regresyonun parametrelerini matris olarak hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula els paràmetres de la corba de regressió exponencial com a una matriu."; + Text[ thai ] = "คำนวณพารามิเตà¸à¸£à¹Œà¸‚à¸à¸‡à¹€à¸ªà¹‰à¸™à¹‚ค้งà¸à¸²à¸£à¸–ดถà¸à¸¢à¹à¸šà¸šà¹€à¸à¹‡à¸à¸‹à¹Œà¹‚ปเนนเชียลเป็นà¹à¸–วลำดับ"; }; ExtraData = { @@ -20888,7 +21554,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_äàííûå_Y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "既知㮠Y"; Text[ chinese_traditional ] = "data_Y"; @@ -20900,6 +21566,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -20909,7 +21576,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é o conjunto dos valores y." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -20929,6 +21596,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -20946,7 +21614,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_äàííûå_X"; + Text[ russian ] = "Äàííûå Õ"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "既知㮠X"; Text[ chinese_traditional ] = "data_X"; @@ -20958,6 +21626,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -20967,7 +21636,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati X." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten." ; Text [ portuguese ] = "é um conjunto facultativo de valores x." ; - Text [ finnish ] = "Tietomatriisi X." ; + Text [ finnish ] = "Tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data." ; Text [ french ] = "La matrice des données X." ; Text [ swedish ] = "Matrisen med x-data." ; @@ -20987,6 +21656,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X "; }; String 6 // Name of Parameter 3 { @@ -20996,7 +21666,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Tipo funzione" ; Text [ portuguese_brazilian ] = "Art der Funktion" ; Text [ portuguese ] = "Tipo_de_função" ; - Text [ finnish ] = "Toiminnon_tyyppi" ; + Text [ finnish ] = "Funktion_tyyppi" ; Text [ danish ] = "Konstant" ; Text [ french ] = "Type_de_fonction" ; Text [ swedish ] = "typ_av_funktion" ; @@ -21004,7 +21674,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Tipo_de_función" ; Text [ english_us ] = "Function_type" ; Text[ chinese_simplified ] = "Function_type"; - Text[ russian ] = "Òèï_ôóíêöèè"; + Text[ russian ] = "Òèï ôóíêöèè"; Text[ polish ] = "Typ_funkcji"; Text[ japanese ] = "計算方å¼"; Text[ chinese_traditional ] = "Function_type"; @@ -21016,6 +21686,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Fonksiyon_türü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Function_type"; + Text[ thai ] = "ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™_ชนิด"; }; String 7 // Description of Parameter 3 { @@ -21029,22 +21700,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Er Konstant=0 beregnes funktionerer af formen y=m^x ellers også funktioner af formen y=b*m^x." ; Text [ french ] = "Si Type = 0, ce sont des fonctions de relation y=m^x qui seront calculées, sinon des fonctions y=b*m^x." ; Text [ swedish ] = "Om typ=0, så beräknas funktioner med formen y=m^x, annars även funktioner y=b*m^x." ; - Text [ dutch ] = "Indien type=0 dan worden de functies van de vorm y=m^x berekend, anders ook functies y=b*m^x. " ; + Text [ dutch ] = "Indien Type=0, worden functies berekend waarbij y=m^x. Ook functies waarbij y=b*m^x." ; Text [ spanish ] = "es un valor lógico que especifica si la constante b debe ser igual a 1." ; Text [ english_us ] = "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x." ; Text[ chinese_simplified ] = "æ˜¯ä¸€ä¸ªé€»è¾‘å€¼ã€‚å¦‚æžœæ•°å€¼ä¸ºé›¶ï¼Œå°±æŒ‰ç…§å…¬å¼ y=m^x \n计算，å¦åˆ™å°±æŒ‰ç…§ y=b*m^x 计算。"; - Text[ russian ] = "Åñëè òèï ðàâåí íóëþ, òî ôóíêöèÿ âû÷èñëÿåòñÿ ïî ôîðìóëå y=m^x, â ïðîòèâíîì ñëó÷àå ôóíêöèÿ âû÷èñëÿåòñÿ ïî ôîðìóëå y=b*m^x."; + Text[ russian ] = "Åñëè òèï = 0, òî ôóíêöèè âû÷èñëÿþòñÿ ïî ôîðìóëå y=m^x, ïðè íàëè÷èè çíà÷åíèÿ - ïî ôîðìóëå y=b*m^x."; Text[ polish ] = "Jeœli typ wynosi 0, obliczane bêd¹ funkcje postaci y=m^x, w pozosta³ych przypadkach równie¿ funkcje y=b*m^x."; Text[ japanese ] = "è¨ˆç®—æ–¹å¼ = 0 ã®å ´åˆã¯ Yï¼m^x ã§ã€ãã†ã§ãªã„å ´åˆã¯ Yï¼b*m^x ã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "是一個é‚輯值。如果數值為零ï¹å°±æŒ‰ç…§å…¬å¼ y=m^x 計算ï¹\nå¦å‰‡å°±æŒ‰ç…§ y=b*m^x 計算。"; Text[ arabic ] = "ÞíãÉ ãäØÞíÉ:íÍÓÈ ÇáËÇÈÊ b ÈÔßá ÇÚÊíÇÏí ÅÐÇ ßÇä = TRUE Constº æíÚíä b ãÓÇæíÇð 1 ÅÐÇ ßÇä Const = FALSE Ãæ ãåãáÇð."; - Text[ dutch ] = "Indien type=0 dan worden de functies van de vorm y=m^x berekend, anders ook functies y=b*m^x. "; + Text[ dutch ] = "Indien Type=0, worden functies berekend waarbij y=m^x. Ook functies waarbij y=b*m^x."; Text[ chinese_simplified ] = "æ˜¯ä¸€ä¸ªé€»è¾‘å€¼ã€‚å¦‚æžœæ•°å€¼ä¸ºé›¶ï¼Œå°±æŒ‰ç…§å…¬å¼ y=m^x \n计算，å¦åˆ™å°±æŒ‰ç…§ y=b*m^x 计算。"; Text[ greek ] = "ÅÜí åßíáé Ôýðïò=0, ôüôå õðïëïãßæïíôáé óõíáñôÞóåéò ôçò ìïñöÞò y=m^x, áëëéþò êáé óõíáñôÞóåéòy=b*m^x."; Text[ korean ] = "ìœ í˜•=0ì´ë©´, ì–‘ì‹ì˜ 함수 y=m^xê°€ 계산ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš° 함수 y=b*m^xë„ ê³„ì‚°ë©ë‹ˆë‹¤."; Text[ turkish ] = "Tür=0 olursa y=m^x biçiminde fonksiyonlar hesaplanýr. Diðer durumlarda y=b*m^x þeklinde fonksiyonlar da hesaplanýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el tipus = 0, les funcions es calcularan en la forma y=m^x, o també y=b*m^x."; + Text[ thai ] = "ถ้าชนิด = 0 จาà¸à¸™à¸±à¹‰à¸™à¹ƒà¸«à¹‰à¸„ำนวณฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸‚à¸à¸‡ y=m^x, หรืà¸à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™ y=b*m^x ด้วย"; }; String 8 // Name of Parameter 4 { @@ -21063,7 +21735,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "estadística" ; Text [ english_us ] = "stats" ; Text[ chinese_simplified ] = "stats"; - Text[ russian ] = "Ïàðàìåòðû"; + Text[ russian ] = "Ñòàòèñòèêà"; Text[ polish ] = "Parametry"; Text[ japanese ] = "補æ£"; Text[ chinese_traditional ] = "stats"; @@ -21075,6 +21747,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Parametreler"; Text[ language_user1 ] = " "; Text[ catalan ] = "estadístiques"; + Text[ thai ] = "สถิติ"; }; String 9 // Description of Parameter 4 { @@ -21089,22 +21762,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Er Statistik=0 beregnes kun regressionskoefficienten, ellers returneres også andre værdier." ; Text [ french ] = "Si paramètres = 0, seuls les coefficients de régression seront calculés ; sinon d'autres valeurs." ; Text [ swedish ] = "om statistik=0 så beräknas bara regressionskoefficienterna, annars beräknas ytterligare värden." ; - Text [ dutch ] = "Indien parameter=0 worden alleen de regressiecëfficiëenten berekend; andere waarden zijn ook mogelijk." ; + Text [ dutch ] = "Indien parameter=0 worden alleen de regressiecoëfficiënten berekend; andere waarden zijn ook mogelijk." ; Text [ spanish ] = "es un valor lógico que especifica si se deberán devolver estadísticas de regresión adicionales." ; Text [ english_us ] = "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well." ; Text[ chinese_simplified ] = "是一个逻辑值。如果数值为零，就åªè®¡ç®—回归相关系数，\nå¦åˆ™è¿˜è®¡ç®—å…¶ä»–é™„åŠ æ•°å€¼ã€‚"; - Text[ russian ] = "Åñëè ïàðàìåòðû ðàâíû íóëþ, òî âû÷èñëÿþòñÿ òîëüêî êîýôôèöèåíòû ðåãðåññèè, â ïðîòèâíîì ñëó÷àå åùå è äîïîëíèòåëüíûå çíà÷åíèÿ."; + Text[ russian ] = "Åñëè ñòàòèñòèêà = 0, òî âû÷èñëÿåòñÿ òîëüêî êîýôôèöèåíò ðåãðåññèè, èíà÷å âû÷èñëÿþòñÿ äîïîëíèòåëüíûå çíà÷åíèÿ."; Text[ polish ] = "Jeœli parametry wynosz¹ 0, obliczane bêd¹ tylko wspó³czynniki regresji, w innych przypadkach równie¿ pozosta³e wartoœci."; Text[ japanese ] = "è£œæ£ = 0 ã«ã™ã‚‹ã¨å›žå¸°æŒ‡æ•°æ›²ç·šã®è£œæ£é …ã ã‘ã‚’è¿½åŠ æƒ…å ±ã¨ã—ã¦è¿”ã—ã€ãã†ã§ãªã„å ´åˆã¯ã»ã‹ã®å€¤ã‚‚è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "是一個é‚輯值。如果數值為零ï¹å°±åªè¨ˆç®—回æ¸ç›¸é—œä¿‚數ï¹\nå¦å‰‡é‚„è¨ˆç®—å…¶ä»–é™„åŠ æ•¸å€¼ã€‚"; Text[ arabic ] = "ÞíãÉ ãäØÞíÉ: ÅÑÌÇÚ ÅÍÕÇÆíÇÊ ÇäÍÏÇÑ ÅÖÇÝíÉ TRUE =º ÅÑÌÇÚ ãÚÇãáÇÊ m æÇáËÇÈÊ b = FALSE Ãæ ãåãá."; - Text[ dutch ] = "Indien parameter=0 worden alleen de regressiecëfficiëenten berekend; andere waarden zijn ook mogelijk."; + Text[ dutch ] = "Indien parameter=0 worden alleen de regressiecoëfficiënten berekend; andere waarden zijn ook mogelijk."; Text[ chinese_simplified ] = "是一个逻辑值。如果数值为零，就åªè®¡ç®—回归相关系数，\nå¦åˆ™è¿˜è®¡ç®—å…¶ä»–é™„åŠ æ•°å€¼ã€‚"; Text[ greek ] = "ÅÜí åßíáé ðáñÜìåôñïò = 0 , ôüôå èá ãßíåé ìüíï ï õðïëïãéóìüò ôùí óõíôåëåóôþí ðáëéíäñüìçóçò, äéáöïñåôéêÜ èá õðïëïãéóôïýí êáé Üëëåò ôéìÝò."; - Text[ korean ] = "파ë¼ë¯¸í„°=0ì´ë©´ 회귀 계수만 계산ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš° 다른 ê°’ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; + Text[ korean ] = "매개 변수=0ì´ë©´ 회귀 계수만 계산ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš°ì—는 다른 ê°’ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; Text[ turkish ] = "Parametreler=0 olursa, yalnýzca regresyon katsayýlarý hesaplanýr. Diðer durumlarda diðer deðerler de hesaplanýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el paràmetre = 0 només es calcularà el coeficient de regressió; altrament, també altres valors."; + Text[ thai ] = "ถ้าพารามิเตà¸à¸£à¹Œ = 0 จาà¸à¸™à¸±à¹‰à¸™à¹ƒà¸«à¹‰à¸„ำนวณค่าสัมประสิทธิ์à¹à¸šà¸šà¸–ดถà¸à¸¢à¹€à¸—่านั้น, ค่าà¸à¸·à¹ˆà¸™ ๆ à¸à¹‡à¹€à¸«à¸¡à¸·à¸à¸™à¸à¸±à¸™"; }; }; // -=*# Resource for function TREND #*=- @@ -21126,7 +21800,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve valores que resultan de una tendencia lineal." ; Text [ english_us ] = "Calculates points along a regression line." ; Text[ chinese_simplified ] = "计算回归直线上的一组纵åæ ‡å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèÿ â ñîîòâåòñòâèè ñ ëèíåéíûì òðåíäîì."; + Text[ russian ] = "Âû÷èñëÿåò òî÷êè âäîëü ëèíèè ðåãðåññèè."; Text[ polish ] = "Wyznacza wartoœæ przy za³o¿eniu trendu liniowego."; Text[ japanese ] = "回帰直線ã®åº§æ¨™ã‚’計算ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算回æ¸ç›´ç·šä¸Šçš„一組縱座標值。"; @@ -21138,6 +21812,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Regresyon doðrusu üzerinde nokta hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula els punts al llarg d'una línia de regressió."; + Text[ thai ] = "คำนวณจุดตามเส้นถดถà¸à¸¢"; }; ExtraData = { @@ -21161,7 +21836,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_äàííûå_Y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "既知㮠Y"; Text[ chinese_traditional ] = "data_Y"; @@ -21173,6 +21848,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -21182,7 +21858,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é o conjunto de valores já conhecidos na relação y = mx + b." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -21202,6 +21878,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -21219,7 +21896,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_äàííûå_X"; + Text[ russian ] = "Äàííûå Õ"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "既知㮠X"; Text[ chinese_traditional ] = "data_X"; @@ -21231,6 +21908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -21240,7 +21918,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati X come base per la regressione." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten als Grundlage zur Regression." ; Text [ portuguese ] = "é um conjunto facultativo de valores x já conhecidos na relação y = mx + b." ; - Text [ finnish ] = "Regression perustiedot sisältävä tietomatriisi X." ; + Text [ finnish ] = "Regression perustiedot sisältävä tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data som er grundlag for regressionsberegningen." ; Text [ french ] = "La matrice des données X comme base pour la régression." ; Text [ swedish ] = "Matrisen med x-data som ligger till grund för regressionen." ; @@ -21260,6 +21938,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Regresyon temeli olarak X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X com a la base per a la regressió."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X เป็นà¸à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸–ดถà¸à¸¢"; }; String 6 // Name of Parameter 3 { @@ -21277,7 +21956,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Nuevos_datos_X" ; Text [ english_us ] = "new data_X" ; Text[ chinese_simplified ] = "new data_X"; - Text[ russian ] = "Íîâ_äàííûå_X"; + Text[ russian ] = "Íîâûå äàííûå Õ"; Text[ polish ] = "Nowe_dane_X"; Text[ japanese ] = "æ–°ã—ã„ X"; Text[ chinese_traditional ] = "new data_X"; @@ -21289,6 +21968,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yeni_veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "new data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X ใหม่"; }; String 7 // Description of Parameter 3 { @@ -21298,7 +21978,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati X per il ricalcolo dei valori." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten zur Neuberechnung von Werten." ; Text [ portuguese ] = "são novos valores de x para os quais deseja que TENDÊNCIA devolva valores de y correspondentes." ; - Text [ finnish ] = "Arvojen uudelleenlaskennan tietomatriisi X." ; + Text [ finnish ] = "Arvojen uudelleenlaskennan tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data som nye værdier skal beregnes for." ; Text [ french ] = "La matrice des données X pour le nouveau calcul des valeurs." ; Text [ swedish ] = "Matrisen av x-data för ny beräkning av värden." ; @@ -21306,7 +21986,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "son nuevos valores de x para los cuales se desea que TENDENCIA devuelva los valores de y correspondientes." ; Text [ english_us ] = "The array of X data for recalculating the values." ; Text[ chinese_simplified ] = "用于计算新数值的 X-æ•°æ®ç»„。"; - Text[ russian ] = "Ìàññèâ íîâûõ äàííûõ x, äëÿ êîòîðûõ ÒÅÍÄÅÍÖÈß âû÷èñëÿåò ñîîòâåòñòâóþùèå çíà÷åíèÿ y."; + Text[ russian ] = "Ìàññèâ Õ äëÿ ïåðåñ÷åòà çíà÷åíèé."; Text[ polish ] = "Macierz danych X dla ponownego obliczenia wartoœci."; Text[ japanese ] = "対応ã™ã‚‹ Y ã®å€¤ã‚’計算ã™ã‚‹æ–°ã—ã„ x ã®å€¤ã®è¡Œåˆ—。"; Text[ chinese_traditional ] = "用來計算新數值的 X-數據組。"; @@ -21318,6 +21998,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðerlerin yeniden hesaplanmasý için X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X per tornar a calcular els valors."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥ X สำหรับคำนวณค่าซ้ำ"; }; String 8 // Name of Parameter 4 { @@ -21335,7 +22016,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "tipo_lineal" ; Text [ english_us ] = "Linear_type" ; Text[ chinese_simplified ] = "Linear_type"; - Text[ russian ] = "Òèï_ïðÿìûõ"; + Text[ russian ] = "Òèï ïðÿìûõ"; Text[ polish ] = "Typ_prostej"; Text[ japanese ] = "ç·šå½¢"; Text[ chinese_traditional ] = "Linear_type"; @@ -21347,6 +22028,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Doðru_türü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Linear_type"; + Text[ thai ] = "เส้นตรง_ชนิด"; }; String 9 // Description of Parameter 4 { @@ -21364,7 +22046,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Si el tipo = 0 las líneas rectas se calcularán mediante el punto cero, sino como líneas de regresión." ; Text [ english_us ] = "If type = 0 the linears will be calculated through the zero point, or else moved linears." ; Text[ chinese_simplified ] = "如果 type=0，那么直线当作ç»è¿‡é›¶ç‚¹è®¡ç®—。"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, êîòîðîå óêàçûâàåò, òðåáóåòñÿ ëè, ÷òîáû êîíñòàíòà b áûëà ðàâíà 0."; + Text[ russian ] = "Åñëè òèï = 0, òî ëèíèè ïðîõîäÿò ÷åðåç íà÷àëî êîîðäèíàò, èíà÷å - ñìåùàþòñÿ."; Text[ polish ] = "Wartoœæ logiczna okreœlaj¹ca, czy wymusiæ 0 dla sta³ej b."; Text[ japanese ] = "定数 = 0 ã«ã™ã‚‹ã¨0ã«è¨å®šã•ã‚Œã€ãã†ã§ãªã„å ´åˆã¯èª¿æ•´ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果 const=0 ï¹è¦è¨ˆç®—的直線經éŽé›¶é»žã€‚"; @@ -21372,10 +22054,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Indien type=0 dan worden de lijnen door het nulpunt berekend. Ook verschoven lijnen zijn mogelijk."; Text[ chinese_simplified ] = "如果 type=0，那么直线当作ç»è¿‡é›¶ç‚¹è®¡ç®—。"; Text[ greek ] = "ÅÜí åßíáé Ôýðïò=0, ôüôå õðïëïãßæïíôáé åõèåßåò ïé ïðïßåò äéÝñ÷ïíôáé áðü ôï ìçäåíéêü óçìåßï, áëëéþò êáé ìåôáöåñüìåíåò åõèåßåò."; - Text[ korean ] = "ìœ í˜•=0ì´ë©´, 0ì ì„ í†µê³¼í•˜ëŠ” ì§ì„ ë“¤ì´ ê³„ì‚°ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš° ì´ë™ëœ ì§ì„ ë“¤ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; + Text[ korean ] = "ìœ í˜•=0ì´ë©´, 0ì ì„ í†µê³¼í•˜ëŠ” ì§ì„ ì´ ê³„ì‚°ë˜ë©° ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš° ì´ë™ëœ ì§ì„ ë„ ê³„ì‚°ë©ë‹ˆë‹¤."; Text[ turkish ] = "Tür=0 olursa doðrular, sýfýr noktasý üzerinden hesaplanýr. Diðer durumlarda taþýnmýþ doðrular da hesaplanýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el tipus = 0, les lineals es calcularan a través del punt zero, o si no les lineals mogudes. "; + Text[ thai ] = "ถ้าชนิด = 0 เส้นตรงจะถูà¸à¸„ำนวณผ่านจุดศูนย์, หรืà¸à¸–้าเป็นà¸à¸¢à¹ˆà¸²à¸‡à¸à¸·à¹ˆà¸™à¹ƒà¸«à¹‰à¸¢à¹‰à¸²à¸¢à¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡"; }; }; // -=*# Resource for function VARIATION #*=- @@ -21397,7 +22080,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve los valores a lo largo de una curva exponencial." ; Text [ english_us ] = "Calculates points on the exponential regression function." ; Text[ chinese_simplified ] = "计算指数回归函数值。"; - Text[ russian ] = "Âîçâðàùàåò çíà÷åíèÿ â ñîîòâåòñòâèè ñ ýêñïîíåíöèàëüíûì òðåíäîì."; + Text[ russian ] = "Âû÷èñëÿåò òî÷êè ýêñïîíåíöèàëüíîé ðåãðåññèè."; Text[ polish ] = "Wyznacza wartoœæ przy za³o¿eniu trendu wyk³adniczego."; Text[ japanese ] = "指数曲線上ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算指數回æ¸å‡½æ•¸å€¼ã€‚"; @@ -21409,6 +22092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Üstel regresyon fonksiyonu üzerinde nokta hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula els punts de la funció de regressió exponencial."; + Text[ thai ] = "คำนวณจุดบนฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸à¸²à¸£à¸–ดถà¸à¸¢à¹à¸šà¸šà¹€à¸à¹‡à¸à¸‹à¹Œà¹‚ปเนนเชียล"; }; ExtraData = { @@ -21432,7 +22116,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_çíà÷_y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "既知㮠Y"; Text[ chinese_traditional ] = "data_Y"; @@ -21444,6 +22128,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -21453,7 +22138,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei valori Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é o conjunto de valores y na relação y = b*m^x." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-värden." ; @@ -21473,6 +22158,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -21490,7 +22176,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_çíà÷_x"; + Text[ russian ] = "Äàííûå Õ"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "既知㮠X"; Text[ chinese_traditional ] = "data_X"; @@ -21502,6 +22188,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -21511,7 +22198,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati X come base per la regressione." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten als Grundlage zur Regression." ; Text [ portuguese ] = "é um conjunto opcional de valores x na relação y = b*m^x." ; - Text [ finnish ] = "Regression perustiedot sisältävä tietomatriisi X." ; + Text [ finnish ] = "Regression perustiedot sisältävä tietotaulukko X." ; Text [ danish ] = "Matrixen med X-data som er grundlag for regressionsberegningen." ; Text [ french ] = "La matrice des données X comme base pour la régression." ; Text [ swedish ] = "Matrisen med x-data som grund för regressionen." ; @@ -21531,6 +22218,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Regresyon baz olarak X veri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X com a la base per a la regressió."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X เป็นà¸à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸–ดถà¸à¸¢"; }; String 6 // Name of Parameter 3 { @@ -21548,7 +22236,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Nuevos_Datos_X" ; Text [ english_us ] = "new_data_X" ; Text[ chinese_simplified ] = "new_data_X"; - Text[ russian ] = "Íîâ_çíà÷_x"; + Text[ russian ] = "Íîâûå äàííûå Õ"; Text[ polish ] = "Nowe_dane_X"; Text[ japanese ] = "æ–°ã—ã„ X"; Text[ chinese_traditional ] = "new_data_X"; @@ -21560,6 +22248,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yeni_veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "new_data_X"; + Text[ thai ] = "ใหม่_ข้à¸à¸¡à¸¹à¸¥_X"; }; String 7 // Description of Parameter 3 { @@ -21569,7 +22258,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati X per un ricalcolo dei valori." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten zur Neuberechnung von Werten." ; Text [ portuguese ] = "são novas variáveis x para as quais deseja que CRESCIMENTO forneça os valores y correspondentes." ; - Text [ finnish ] = "Arvojen uudelleenlaskennan tietomatriisi X." ; + Text [ finnish ] = "Arvojen uudelleenlaskennan tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data som nye værdier skal beregnes for." ; Text [ french ] = "La matrice des données X pour le nouveau calcul des valeurs." ; Text [ swedish ] = "Matrisen av x-data för omberäkning av värden." ; @@ -21577,7 +22266,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "son nuevos valores de x nuevos para los cuales se desea que CRECIMIENTO devuelva los valores de y correspondientes." ; Text [ english_us ] = "The array of X data for recalculating the values." ; Text[ chinese_simplified ] = "用于é‡æ–°é¢„测指数趋势值的新的 X æ•°æ®ç»„。"; - Text[ russian ] = "Íîâûå çíà÷åíèÿ x, äëÿ êîòîðûõ ÐÎÑÒ âû÷èñëÿåò ñîîòâåòñòâóþùèå çíà÷åíèÿ y."; + Text[ russian ] = "Ìàññèâ Õ äëÿ ïåðåñ÷åòà çíà÷åíèé."; Text[ polish ] = "Macierz danych X dla ponownego obliczania wartoœci."; Text[ japanese ] = "対応ã™ã‚‹ Y ã®å€¤ã‚’計算ã™ã‚‹æ–°ã—ã„ x ã®å€¤ã®è¡Œåˆ—。"; Text[ chinese_traditional ] = "用來é 測指數趨勢值的新的 X - 數據組。"; @@ -21589,6 +22278,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðerlerin yeniden hesaplanmasý için X veri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X per tornar a calcular els valors."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥ X สำหรับคำนวณค่าซ้ำ"; }; String 8 // Name of Parameter 4 { @@ -21598,7 +22288,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Tipo funzione" ; Text [ portuguese_brazilian ] = "Art der Funktion" ; Text [ portuguese ] = "Tipo_de_função" ; - Text [ finnish ] = "Toiminnon_tyyppi" ; + Text [ finnish ] = "Funktion_tyyppi" ; Text [ danish ] = "Konstant" ; Text [ french ] = "Type_de_fonction" ; Text [ swedish ] = "typ_av_funktion" ; @@ -21606,7 +22296,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Tipo_de_función" ; Text [ english_us ] = "Function_type" ; Text[ chinese_simplified ] = "Function_type"; - Text[ russian ] = "Òèï_ôóíêöèè"; + Text[ russian ] = "Òèï ôóíêöèè"; Text[ polish ] = "Typ_funkcji"; Text[ japanese ] = "計算方å¼"; Text[ chinese_traditional ] = "Function_type"; @@ -21618,6 +22308,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Fonksiyon_türü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Function_type"; + Text[ thai ] = "ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™_ชนิด"; }; String 9 // Description of Parameter 4 { @@ -21635,7 +22326,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un valor lógico que especifica si la constante b debe ser igual a 1." ; Text [ english_us ] = "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x." ; Text[ chinese_simplified ] = "如果 type=0 ï¼Œå‡½æ•°å°±æŒ‰ç…§å…¬å¼ y=m^x 计算，\nå¦åˆ™ä¾¿æŒ‰ç…§å…¬å¼ y=b*m^x 计算。"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, åñëè îíî ðàâíî 0, òî ôóíêöèè âû÷èñëÿþòñÿ ïî ôîðìóëå y=m^x, ïðè íàëè÷èè çíà÷åíèÿ - ïî ôîðìóëå y=b*m^x."; + Text[ russian ] = "Åñëè òèï = 0, òî ôóíêöèè âû÷èñëÿþòñÿ ïî ôîðìóëå y=m^x, ïðè íàëè÷èè çíà÷åíèÿ - ïî ôîðìóëå y=b*m^x."; Text[ polish ] = "Jeœli typ wynosi 0, bêd¹ obliczane funkcje rodzaju y=m^x, w pozosta³ych wypadkach równie¿ funkcje y=b*m^x."; Text[ japanese ] = "è¨ˆç®—æ–¹å¼ = 0 ã®å ´åˆã¯ Yï¼m^xã§ã€ãã†ã§ãªã„å ´åˆã¯ Yï¼b*m^xã§è¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果 const=0 ï¹é‚£éº¼å‡½æ•¸å°±æŒ‰ç…§å…¬å¼ y=m^x 計算ï¹å¦å‰‡å°±æŒ‰ç…§ y=b*m^x 計算。"; @@ -21647,6 +22338,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Art=0 ise y=m^x biçimindeki fonksiyonlar hesaplanýr, diðer hallerde y=b*m^x fonksiyonlarý da hesaplanýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el tipus = 0, les funcions es calcularan en la forma y=m^x, o també y=b*m^x."; + Text[ thai ] = "ถ้าชนิด = 0 จาà¸à¸™à¸±à¹‰à¸™à¹ƒà¸«à¹‰à¸„ำนวณฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸‚à¸à¸‡ y=m^x, หรืà¸à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™ y=b*m^x ด้วย"; }; }; // -=*# Resource for function ANZAHL #*=- @@ -21669,7 +22361,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Cuenta los números que hay en la lista de argumentos." ; Text [ english_us ] = "Counts how many numbers are in the list of arguments." ; Text[ chinese_simplified ] = "计算数å—项的个数。"; - Text[ russian ] = "Ïîäñ÷èòûâàåò, ñêîëüêî ÷èñåë ñîäåðæèòñÿ â ñïèñêå àðãóìåíòîâ."; + Text[ russian ] = "Ñ÷èòàåò, êàê ìíîãî çíà÷åíèé íàõîäèòñÿ â ñïèñêå àðãóìåíòîâ."; Text[ polish ] = "Oblicza, ile liczb zawiera lista argumentów."; Text[ japanese ] = "引数リストå«ã¾ã‚Œã‚‹æ•°å€¤ãƒ‡ãƒ¼ã‚¿ã®å€‹æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算數å—é …çš„å€‹æ•¸ã€‚"; @@ -21681,6 +22373,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðiþken listesinin içerdiði sayý miktarýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Compta quants nombres hi ha a la llista d'arguments."; + Text[ thai ] = "นับจำนวนตัวเลขที่à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸²à¸¢à¸à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; ExtraData = { @@ -21696,26 +22389,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore " ; Text [ portuguese_brazilian ] = "Wert " ; Text [ portuguese ] = "Valor " ; - Text [ finnish ] = "arvo" ; + Text [ finnish ] = "arvo " ; Text [ danish ] = "Værdi " ; Text [ french ] = "Valeur " ; Text [ swedish ] = "värde " ; - Text [ dutch ] = "Waarde " ; + Text [ dutch ] = "Waarde" ; Text [ spanish ] = "valor " ; Text [ english_us ] = "value " ; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "Waarde "; + Text[ dutch ] = "Waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; Text[ catalan ] = "valor "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -21734,7 +22428,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Ref 1; ref 2; ...son entre 1 y 30 argumentos que pueden contener o hacer referencia a distintos tipos de datos, pero sólo se cuentan los números." ; Text [ english_us ] = "Value 1, value 2, ... are 1 to 30 arguments containing different data types but where only numbers are counted." ; Text[ chinese_simplified ] = "数值1; 数值 2;... 是 1 至 30个å«æœ‰å„ç§ç±»åž‹æ•°æ®çš„\nå‚数，但åªè®¡æ•°æ•°å—类型的数æ®ã€‚"; - Text[ russian ] = "Çíà÷åíèå 1; çíà÷åíèå 2;... îò 1 äî 30 àðãóìåíòîâ, êîòîðûå ìîãóò ñîäåðæàòü èëè ññûëàòüñÿ íà äàííûå ðàçëè÷íûõ òèïîâ, íî â ïîäñ÷åòå ó÷àñòâóþò òîëüêî ÷èñëà."; + Text[ russian ] = "Çíà÷åíèå 1; çíà÷åíèå 2;... îò 1 äî 30 àðãóìåíòîâ ðàçëè÷íûõ òèïîâ, íî â ïîäñ÷åòå ó÷àñòâóþò òîëüêî ÷èñëà."; Text[ polish ] = "Od 1 do 30 argumentów, które mog¹ odnosiæ siê do argumentów ró¿nych typów danych, przy czym zliczane bêd¹ tylko liczby."; Text[ japanese ] = "値 1;値 2;...ã¯30個ã¾ã§ã®ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "數值1; 數值 2;... 是 1 至 30個å«æœ‰å„種類型資料的åƒæ•¸ï¹\n但åªè¨ˆæ•¸æ•¸å—類型的資料。"; @@ -21746,6 +22440,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer 1; deðer 2;... Deðiþik veri tipleri içeren ancak yalnýzca sayýlarýn sayýldýðý 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1, valor 2, ... són entre 1 i 30 arguments que contenen tipus de dades diferents però on només es compten els nombres."; + Text[ thai ] = "ค่า 1, ค่า 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 มีชนิดข้à¸à¸¡à¸¹à¸¥à¸•à¹ˆà¸²à¸‡à¸à¸±à¸™à¹à¸•à¹ˆà¸•à¸±à¸§à¹€à¸¥à¸‚เท่านั้นที่ถูà¸à¸™à¸±à¸š"; }; }; // -=*# Resource for function ANZAHL2 #*=- @@ -21780,6 +22475,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðiþken listesinin içerdiði deðer sayýsýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Compta quants valors hi ha a la llista d'arguments."; + Text[ thai ] = "นับจำนวนค่าในรายà¸à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; ExtraData = { @@ -21795,26 +22491,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore " ; Text [ portuguese_brazilian ] = "Wert " ; Text [ portuguese ] = "Valor " ; - Text [ finnish ] = "arvo" ; + Text [ finnish ] = "arvo " ; Text [ danish ] = "Værdi " ; Text [ french ] = "Valeur " ; Text [ swedish ] = "värde " ; - Text [ dutch ] = "Waarde " ; + Text [ dutch ] = "Waarde" ; Text [ spanish ] = "valor " ; Text [ english_us ] = "value " ; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "Waarde "; + Text[ dutch ] = "Waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; Text[ catalan ] = "valor "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -21845,6 +22542,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer 1; deðer 2;... Sayýlacak deðerler temsil eden 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1, valor 2, ... són entre 1 i 30 arguments que representen els valors que s'han de comptar."; + Text[ thai ] = "ค่า 1, ค่า 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 à¹à¸ªà¸”งถึงค่าที่ถูà¸à¸™à¸±à¸š"; }; }; // -=*# Resource for function MAX #*=- @@ -21859,7 +22557,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce il valore massimo di un elenco di argomenti." ; Text [ portuguese_brazilian ] = "Liefert die gr?te Zahl einer Argumentliste." ; Text [ portuguese ] = "Devolve o valor máximo numa lista de argumentos." ; - Text [ finnish ] = "Palauttaa argumenttiluettelon enimmäisarvon." ; + Text [ finnish ] = "Palauttaa argumenttiluettelon suurimman arvon." ; Text [ danish ] = "Beregner den største værdi på en liste med argumenter." ; Text [ french ] = "Renvoie le plus grand nombre de la liste d'arguments." ; Text [ swedish ] = "Returnerar det största talet i en lista med argument." ; @@ -21867,7 +22565,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el valor máximo de una lista de argumentos." ; Text [ english_us ] = "Returns the maximum value in a list of arguments." ; Text[ chinese_simplified ] = "æ•°æ®ç»„ä¸çš„最大数值。"; - Text[ russian ] = "Âîçâðàùàåò ìàêñèìàëüíîå çíà÷åíèå ñïèñêà àðãóìåíòîâ."; + Text[ russian ] = "Âû÷èñëÿåò ìàêñèìàëüíîå çíà÷åíèå èç ñïèñêà àðãóìåíòîâ."; Text[ polish ] = "Wyznacza maksymaln¹ wartoœæ listy argumentów."; Text[ japanese ] = "引数リストã®ä¸ã®æœ€å¤§å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "數據組ä¸çš„最大數值。"; @@ -21879,6 +22577,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðiþken listesinin en büyük sayýsýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor màxim d'una llista d'arguments."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่ามาà¸à¸—ี่สุดในรายà¸à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; ExtraData = { @@ -21894,26 +22593,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Núm1; núm2;... " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -21932,7 +22632,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son entre 1 y 30 números para los que se desea encontrar el valor máximo." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments for which the largest number is to be determined." ; Text[ chinese_simplified ] = "æ•°å— 1; æ•°å— 2;... 是 1 至 30 个è¦æ‰¾å‡ºå…¶æœ€å¤§æ•°å€¼çš„æ•°æ®ã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ìàêñèìàëüíîå çíà÷åíèå êîòîðûõ òðåáóåòñÿ îïðåäåëèòü."; + Text[ russian ] = "Çíà÷åíèå 1, çíà÷åíèå 2,... îò 1 äî 30 àðãóìåíòîâ, ñðåäè êîòîðûõ èùåòñÿ íàèáîëüøåå."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, dla których ma zostaæ okreœlona maksymalna wartoœæ."; Text[ japanese ] = "数値 1;数値 2;...ã¯å¯¾è±¡ã¨ãªã‚‹30個ã¾ã§ã®æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1; æ•¸å— 2;... 是 1 至 30 個è¦æ‰¾å‡ºå…¶æœ€å¤§æ•¸å€¼çš„數據。"; @@ -21944,6 +22644,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... En büyük sayýlarý belirlenecek 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics el nombre més gran dels quals s'ha de determinar."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ที่เป็นตัวเลข 1 ถึง 30 สำหรับà¸à¸³à¸«à¸™à¸”ตัวเลขที่มาà¸à¸—ี่สุด"; }; }; // -=*# Resource for function MAXA #*=- @@ -21963,7 +22664,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Devuelve el valor máximo de una lista de argumentos. El texto se valorará como cero."; Text[ english_us ] = "Returns the maximum value in a list of arguments. Text is evaluated as Zero."; Text[ chinese_simplified ] = "找出一个å‚数列å•ä¸çš„最大数值。文å—是被当作零。"; - Text[ russian ] = "Âîçâðàùàåò íàèáîëüøåå çíà÷åíèå â ñïèñêå àðãóìåíòîâ. Òåêñò ó÷èòûâàåòñÿ êàê íóëü."; + Text[ russian ] = "Âû÷èñëÿåò ìàêñèìàëüíîå çíà÷åíèå èç ñïèñêà àðãóìåíòîâ. Òåêñò ó÷èòûâàåòñÿ êàê 0."; Text[ polish ] = "Wyznacza najwiêksz¹ wartoœæ listy argumentów. Wartoœæ funkcji dla tekstu jest równa zero."; Text[ japanese ] = "引数リストã®ä¸ã®æœ€å¤§å€¤ã‚’è¿”ã—ã¾ã™ã€‚æ–‡å—列ã¯0ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "找出一個åƒæ•¸æ¸…å–®ä¸çš„最大數值。文å—是被當作零。"; @@ -21976,6 +22677,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor màxim d'una llista d'arguments. El text s'avalua com a zero."; Text[ finnish ] = "Palauttaa argumenttiluettelon suurimman arvon. Tekstin arvoksi lasketaan nolla."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่ามาà¸à¸—ี่สุดในรายà¸à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ ข้à¸à¸„วามถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าเป็นศูนย์"; }; ExtraData = { @@ -21993,23 +22695,24 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ danish ] = "Værdi "; Text[ french ] = "Valeur "; Text[ swedish ] = "värde "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ spanish ] = "Valor "; Text[ english_us ] = "value "; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor "; - Text[ finnish ] = "arvo"; + Text[ catalan ] = "valor "; + Text[ finnish ] = "arvo "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -22037,7 +22740,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer 1; deðer 2;... En büyük deðerleri belirlenecek olan 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1, valor 2, ... són entre 1 i 30 arguments el valor més gran dels quals s'ha de determinar."; - Text[ finnish ] = "Arvo 1, arvo 2, ovat 1 - 30 argumenttia, joista selvitetään suurin arvo."; + Text[ finnish ] = "Arvo 1, arvo 2 jne. ovat 1 - 30 argumenttia, joista selvitetään suurin arvo."; + Text[ thai ] = "ค่า 1, ค่า 2, à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 ขà¸à¸‡à¸„่ามาà¸à¸—ี่สุดที่ถูà¸à¸à¸³à¸«à¸™à¸”"; }; }; // -=*# Resource for function MIN #*=- @@ -22059,7 +22763,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el valor mínimo de una lista de argumentos." ; Text [ english_us ] = "Returns the minimum value in a list of arguments." ; Text[ chinese_simplified ] = "确定å‚数表ä¸çš„最å°å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ìèíèìàëüíîå çíà÷åíèå ñïèñêà àðãóìåíòîâ."; + Text[ russian ] = "Âû÷èñëÿåò ìèíèìàëüíîå çíà÷åíèå èç ñïèñêà àðãóìåíòîâ."; Text[ polish ] = "Wyznacza minimaln¹ wartoœæ w liœcie argumentów."; Text[ japanese ] = "引数リストã®ä¸ã®æœ€å°å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定åƒæ•¸è¡¨ä¸çš„最å°å€¼ã€‚"; @@ -22071,6 +22775,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðiþken listesinin en küçük sayýsýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor mínim d'una llista d'arguments."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าน้à¸à¸¢à¸—ี่สุดในรายà¸à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์"; }; ExtraData = { @@ -22086,26 +22791,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Núm1; núm2;... " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -22123,7 +22829,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son entre 1 a 30 números cuyos valores mínimos desea encontrar." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments for which the smallest number is to be determined." ; Text[ chinese_simplified ] = "æ•°å— 1; æ•°å— 2;... 是 1 至 30 个è¦ç¡®å®šå…¶æœ€å°å€¼çš„å‚数。"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ìèíèìàëüíîå çíà÷åíèå êîòîðûõ òðåáóåòñÿ îïðåäåëèòü."; + Text[ russian ] = "×èñëî 1, ×èñëî 2,... îò 1 äî 30 àðãóìåíòîâ, ñðåäè êîòîðûõ èùåòñÿ íàèìåíüøåå."; Text[ polish ] = "Od 1 do 30 liczb, wœród których nast¹pi wyszukanie liczby najmniejszej."; Text[ japanese ] = "数値 1;数値 2;...ã¯å¯¾è±¡ã¨ãªã‚‹30個ã¾ã§ã®æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1; æ•¸å— 2;... 是 1 至 30 個è¦ç¢ºå®šå…¶æœ€å°å€¼çš„åƒæ•¸ã€‚"; @@ -22135,6 +22841,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... En küçük sayýlarý belirlenecek 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics el nombre més petit dels quals s'ha de determinar."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 สำหรับà¸à¸³à¸«à¸™à¸”ตัวเลขที่น้à¸à¸¢à¸—ี่สุด"; }; }; // -=*# Resource for function MINA #*=- @@ -22154,7 +22861,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Devuelve el valor mínimo de una lista de argumentos. El texto se valorará como cero."; Text[ english_us ] = "Returns the smallest value in a list of arguments. Text is evaluated as zero."; Text[ chinese_simplified ] = "找出一个å‚数列å•ä¸çš„最å°æ•°å€¼ã€‚æ–‡å—是被当作零。"; - Text[ russian ] = "Âîçâðàùàåò íàèìåíüøåå çíà÷åíèå â ñïèñêå àðãóìåíòîâ. Òåêñò ó÷èòûâàåòñÿ êàê íóëü."; + Text[ russian ] = "Âû÷èñëÿåò ìèíèìàëüíîå çíà÷åíèå èç ñïèñêà àðãóìåíòîâ. Çíà÷åíèå òåêñòà ðàâíî 0."; Text[ polish ] = "Wyznacza minimaln¹ wartoœæ listy argumentów. Wartoœæ funkcji dla tekstu jest równa zero."; Text[ japanese ] = "引数リストã®ä¸ã®æœ€å°å€¤ã‚’è¿”ã—ã¾ã™ã€‚æ–‡å—列ã¯0ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "找出一個åƒæ•¸æ¸…å–®ä¸çš„最å°æ•¸å€¼ã€‚æ–‡å—是被當作零。"; @@ -22167,6 +22874,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor més petit d'una llista d'arguments. El text s'avalua com a zero."; Text[ finnish ] = "Palauttaa argumenttiluettelon pienimmän arvon. Tekstin arvoksi lasketaan nolla."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าน้à¸à¸¢à¸—ี่สุดในรายà¸à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ ข้à¸à¸„วามถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าเป็นศูนย์"; }; ExtraData = { @@ -22184,23 +22892,24 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ danish ] = "Værdi "; Text[ french ] = "Valeur "; Text[ swedish ] = "värde "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ spanish ] = "Valor "; Text[ english_us ] = "value "; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå"; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor "; - Text[ finnish ] = "arvo"; + Text[ catalan ] = "valor "; + Text[ finnish ] = "arvo "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -22229,6 +22938,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1; valor 2; ... són entre 1 i 30 arguments el valor més petit dels quals s'ha de determinar."; Text[ finnish ] = "Arvo 1; arvo 2;... ovat 1 - 30 argumenttia, joista selvitetään pienin luku."; + Text[ thai ] = "ค่า 1; ค่า 2;... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง ขà¸à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚ที่น้à¸à¸¢à¸—ี่สุดที่ถูà¸à¸à¸³à¸«à¸™à¸”"; }; }; // -=*# Resource for function VARIANZ #*=- @@ -22247,7 +22957,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Calcule la variance en se basant sur un échantillon." ; Text [ swedish ] = "Beräknar variansen baserat på ett stickprov." ; Text [ dutch ] = "Berekent de variantie op basis van een steekproef." ; - Text [ spanish ] = "Calcula la varianza de una muestra." ; + Text [ spanish ] = "Calcula la variancia sobre una muestra." ; Text [ english_us ] = "Calculates the variance based on a sample." ; Text[ chinese_simplified ] = "ä¼°ç®—ä¸€ä¸ªæŠ½æ ·çš„æ–¹å·®ã€‚"; Text[ russian ] = "Âû÷èñëÿåò äèñïåðñèþ ïî âûáîðêå."; @@ -22262,6 +22972,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðe dayanarak varyansý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la variància basada en una mostra."; + Text[ thai ] = "คำนวณà¸à¸²à¸£à¹à¸›à¸£à¸œà¸±à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -22277,26 +22988,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "Áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -22314,7 +23026,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos numéricos que se corresponden con una muestra de población." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample of a population." ; Text[ chinese_simplified ] = "æ•°å—1;æ•°å—2;是1至30ä¸ªè¡¨ç¤ºä¸€ä¸ªæŠ½æ ·çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå èç ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "×èñëî 1, ÷èñëî 2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå èç ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, które przedstawiaj¹ próbkê, odpowiadaj¹c¹ populacji."; Text[ japanese ] = "数値 1;数値 2;...ã¯æ¯é›†å›£ã®30個ã¾ã§ã®æ¨™æœ¬ãƒ‡ãƒ¼ã‚¿ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1ï¹”æ•¸å— 2﹔是 1 至 30 個表示一個抽樣的數å—å…ƒç´ ã€‚"; @@ -22326,6 +23038,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Popülasyondan alýnmýþ bir örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra d'una població."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function VARIANZ #*=- @@ -22342,10 +23055,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ french ] = "Estime la variance d'une population à partir d'un échantillon. La valeur 0 est attribuée au texte."; Text[ swedish ] = "Beräknar variansen baserat på ett stickprov. Text värderas till noll."; Text[ dutch ] = "Berekent de variantie op basis van een steekproef. Tekst heeft de waarde 0."; - Text[ spanish ] = "Calcula la varianza a partir de una muestra. El texto se valorará como cero."; + Text[ spanish ] = "Calcula la variancia a partir de una muestra. El texto se valorará como cero."; Text[ english_us ] = "Returns the variance based on a sample. Text is evaluated as zero."; Text[ chinese_simplified ] = "ä¼°ç®—æŠ½æ ·çš„æ–¹å·®ï¼Œæ–‡å—被定值为零。"; - Text[ russian ] = "Âû÷èñëÿåò äèñïåðñèþ ïî âûáîðêå. Òåêñò ñ÷èòåòñÿ 0."; + Text[ russian ] = "Âû÷èñëÿåò äèñïåðñèþ ïî âûáîðêå. Çíà÷åíèå òåêñòà ðàâíî 0."; Text[ polish ] = "Oblicza wariancjê, bazuj¹c na próbce. Wartoœæ funkcji dla tekstu jest równa zero."; Text[ japanese ] = "ä¸å分散を返ã—ã¾ã™ã€‚æ–‡å—列データ㯠0 ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "估算抽樣的方差ï¹æ–‡å—被定值為零。"; @@ -22358,6 +23071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la variància basada en una mostra. El text s'avalua com a zero."; Text[ finnish ] = "Palauttaa otokseen perustuvan varianssin. Tekstin arvoksi lasketaan nolla."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¹à¸›à¸£à¸œà¸±à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡ ข้à¸à¸„วามถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าเป็นศูนย์"; }; ExtraData = { @@ -22375,23 +23089,24 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ danish ] = "Værdi "; Text[ french ] = "Valeur "; Text[ swedish ] = "värde "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ spanish ] = "Valor "; Text[ english_us ] = "value "; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor "; - Text[ finnish ] = "arvo"; + Text[ catalan ] = "valor "; + Text[ finnish ] = "arvo "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -22407,7 +23122,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Valor 1; Valor 2;... son entre 1 y 30 argumentos que se corresponden con una muestra de población."; Text[ english_us ] = "Value 1; value 2;.. .are 1 to 30 arguments representing a sample taken from a basic total population."; Text[ chinese_simplified ] = "数值1;数值2;...是1至30ä¸ªè¡¨è¾¾ä¸€ä¸ªæŠ½æ ·çš„å…ƒç´ ã€‚"; - Text[ russian ] = "Çíà÷åíèå 1 ,çíà÷åíèå 2,... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå èç ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Çíà÷åíèå 1 ,çíà÷åíèå 2,... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå, âçÿòîé èç îáùåé ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 argumentów, które odpowiadaj¹ próbce populacji."; Text[ japanese ] = "値 1;値 2;...ã¯æ¯é›†å›£ã®30個ã¾ã§ã®æ¨™æœ¬ãƒ‡ãƒ¼ã‚¿ã€‚"; Text[ chinese_traditional ] = "數值1﹔數值2ï¹”...是 1 至 30個表é”ä¸€å€‹æŠ½æ¨£çš„å…ƒç´ ã€‚"; @@ -22419,7 +23134,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer 1; deðer 2;... Popülasyondan alýnan bir örneði temsil eden 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1; valor 2;... són entre 1 i 30 arguments que representen una mostra presa d'una població total bàsica."; - Text[ finnish ] = "Arvo 1; arvo 2;... ovat 1 - 30 argumenttia, jotka esittävät peruskokonaispopulaatiosta otettua otosta."; + Text[ finnish ] = "Arvo 1; arvo 2;.. .ovat 1 - 30 argumenttia, jotka esittävät peruskokonaispopulaatiosta otettua otosta."; + Text[ thai ] = "ค่า 1; ค่า 2;.. .à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 à¹à¸ªà¸”งถึงà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸—ี่เà¸à¸²à¸à¸à¸à¸ˆà¸²à¸à¸œà¸¥à¸£à¸§à¸¡à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function VARIANZEN #*=- @@ -22438,10 +23154,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Calcule la variance en se basant sur la population." ; Text [ swedish ] = "Beräknar variansen baserat på populationen." ; Text [ dutch ] = "Berekent de variantie op basis van de volledige populatie." ; - Text [ spanish ] = "Calcula la varianza de la población total." ; + Text [ spanish ] = "Calcula la variancia de la población total." ; Text [ english_us ] = "Calculates variance based on the entire population." ; Text[ chinese_simplified ] = "è®¡ç®—æŠ½æ ·æ€»ä½“çš„æ–¹å·®ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò äèñïåðñèþ, èñõîäÿ èç ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Âû÷èñëÿåò äèñïåðñèþ, îñíîâàííóþ íà ãåíåðàëüíîé ñîâîêóïíîñòè."; Text[ polish ] = "Oblicza wariancjê, bazuj¹c na populacji."; Text[ japanese ] = "分散を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算抽樣總體的方差。"; @@ -22453,6 +23169,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Popülasyona dayanarak varyansý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la variància basada en tota la població."; + Text[ thai ] = "คำนวณà¸à¸²à¸£à¹à¸›à¸£à¸œà¸±à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸—ั้งประชาà¸à¸£"; }; ExtraData = { @@ -22468,26 +23185,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -22507,7 +23225,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos numéricos que se corresponden con una población." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which represent a population." ; Text[ chinese_simplified ] = "æ•°å—1;æ•°å—2;是1至30ä¸ªè¡¨ç¤ºä¸€ä¸ªæŠ½æ ·çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, które odpowiadaj¹ populacji."; Text[ japanese ] = "数値 1;数値 2;...ã¯æ¯é›†å›£ã®30個ã¾ã§ã®æ¨™æœ¬ãƒ‡ãƒ¼ã‚¿ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1ï¹”æ•¸å— 2﹔是 1 至 30 個表示一個抽樣的數å—å…ƒç´ ã€‚"; @@ -22519,6 +23237,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Bir popülasyonu temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una població."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 ที่à¹à¸ªà¸”งถึงประชาà¸à¸£"; }; }; // -=*# Resource for function VARIANZENA #*=- @@ -22535,10 +23254,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ french ] = "Calcule la variance d'une population à partir de la population entière. La valeur 0 est attribuée au texte."; Text[ swedish ] = "Beräknar variansen baserat på populationen. Text värderas till noll."; Text[ dutch ] = "Berekent de variantie op basis van een steekproef onder een populatie. Aan tekst wordt de waarde 0 toegewezen."; - Text[ spanish ] = "Calcula la varianza a partir de la población total. El texto se valorará como cero."; + Text[ spanish ] = "Calcula la variancia a partir de la población total. El texto se valorará como cero."; Text[ english_us ] = "Returns the variance based on the entire population. Text is evaluated as zero."; Text[ chinese_simplified ] = "è®¡ç®—æŠ½æ ·æ€»ä½“çš„æ–¹å·®ã€‚æ–‡å—被定值为零。"; - Text[ russian ] = "Âû÷èñëÿåò äèñïåðñèþ ïî ãåíåðàëüíîé ñîâîêóïíîñòè. Òåêñò ñ÷èòàåòñÿ 0."; + Text[ russian ] = "Âû÷èñëÿåò äèñïåðñèþ, îñíîâàííóþ íà ãåíåðàëüíîé ñîâîêóïíîñòè. Çíà÷åíèå òåêñòà ðàâíî 0. "; Text[ polish ] = "Oblicza wariancjê, bazuj¹c na populacji. Wartoœæ funkcji dla tekstu jest równa zero."; Text[ japanese ] = "分散を返ã—ã¾ã™ã€‚æ–‡å—列データ㯠0 ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算抽樣總體的方差。文å—被定值為零。"; @@ -22551,6 +23270,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la variància basada en tota la població. El text s'avalua com a zero."; Text[ finnish ] = "Palauttaa koko populaatioon perustuvan varianssin. Tekstin arvoksi lasketaan nolla."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¹à¸›à¸£à¸œà¸±à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸‚à¸à¸‡à¸—ั้งประชาà¸à¸£ ข้à¸à¸„วามถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าเป็นศูนย์"; }; ExtraData = { @@ -22568,23 +23288,24 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ danish ] = "Værdi "; Text[ french ] = "Valeur "; Text[ swedish ] = "värde "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ spanish ] = "Valor "; Text[ english_us ] = "value "; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor "; - Text[ finnish ] = "arvo"; + Text[ catalan ] = "valor "; + Text[ finnish ] = "arvo "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -22600,7 +23321,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Valor 1; Valor 2;... son entre 1 y 30 argumentos que se corresponden con una población."; Text[ english_us ] = "Value 1; value 2;... are 1 to 30 arguments representing a population."; Text[ chinese_simplified ] = "数值1;数值2;... 是 1 至 30ä¸ªè¡¨ç¤ºæŠ½æ ·æ€»ä½“çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "Çíà÷åíèå 1, çíà÷åíèå 2, ... îò1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Çíà÷åíèå 1, çíà÷åíèå 2, ... îò1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 argumentów, które reprezentuj¹ populacjê."; Text[ japanese ] = "数値 1;数値 2;...ã¯æ¯é›†å›£å…¨ä½“ã«å¯¾å¿œã™ã‚‹1ã‹ã‚‰30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "數值1﹔數值2ï¹”... 是 1 至 30個表示抽樣總體的數å—å…ƒç´ ã€‚"; @@ -22613,6 +23334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1; valor 2;... són entre 1 i 30 arguments que representen una població."; Text[ finnish ] = "Arvo 1; arvo 2;... ovat 1 - 30 argumenttia, jotka esittävät populaatiota."; + Text[ thai ] = "ค่า 1; ค่า 2;... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 à¹à¸ªà¸”งถึงประชาà¸à¸£"; }; }; // -=*# Resource for function STABW #*=- @@ -22646,6 +23368,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðe dayanarak standart sapmayý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la desviació estàndard basada en una mostra."; + Text[ thai ] = "คำนวณส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -22661,26 +23384,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -22698,7 +23422,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos numéricos que corresponden a una muestra de población." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample of a population." ; Text[ chinese_simplified ] = "æ•°å— 1;æ•°å— 2;是 1 至 30 ä¸ªè¡¨ç¤ºæŠ½æ ·çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå èç ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, które przedstawiaj¹ próbkê, odpowiadaj¹c¹ populacji."; Text[ japanese ] = "数値 1;数値 2;...ã¯æ¯é›†å›£ã®30個ã¾ã§ã®æ¨™æœ¬ãƒ‡ãƒ¼ã‚¿ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1ï¹”æ•¸å— 2﹔是 1 至 30 個表示抽樣的數å—å…ƒç´ ã€‚"; @@ -22710,6 +23434,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Popülasyondan alýnmýþ bir örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra d'una població."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function STABWA #*=- @@ -22742,6 +23467,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la desviació estàndard basada en una mostra. El text s'avalua com a zero."; Text[ finnish ] = "Palauttaa otokseen perustuvan keskihajonnan. Tekstin arvoksi lasketaan nolla."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ªà¹ˆà¸§à¸™à¹€à¸šà¸µà¹ˆà¸¢à¸‡à¹€à¸šà¸™à¸¡à¸²à¸•à¸£à¸à¸²à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡ ข้à¸à¸„วามถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าเป็นศูนย์"; }; ExtraData = { @@ -22759,23 +23485,24 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ danish ] = "Værdi "; Text[ french ] = "Valeur "; Text[ swedish ] = "värde "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ spanish ] = "Valor "; Text[ english_us ] = "value "; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor "; - Text[ finnish ] = "arvo"; + Text[ catalan ] = "valor "; + Text[ finnish ] = "arvo "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -22791,7 +23518,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Valor 1; Valor 2;... son entre 1 y 30 argumentos que se corresponden con una muestra de población."; Text[ english_us ] = "Value 1; value 2;.. .are 1 to 30 arguments representing a sample taken from a basic total population."; Text[ chinese_simplified ] = "数值1;数值2;...是1至30ä¸ªè¡¨ç¤ºä¸€ä¸ªæŠ½æ ·çš„æ•°å€¼ã€‚"; - Text[ russian ] = "Çíà÷åíèå 1 ,çíà÷åíèå 2,... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå èç ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Çíà÷åíèå 1 ,çíà÷åíèå 2,... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå, âçÿòîé èç îñíîâíîé ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 argumentów, które odpowiadaj¹ próbce populacji."; Text[ japanese ] = "値 1;値 2;...ã¯æ¯é›†å›£ã®30個ã¾ã§ã®æ¨™æœ¬ãƒ‡ãƒ¼ã‚¿ã€‚"; Text[ chinese_traditional ] = "數值1﹔數值2ï¹”...是 1 至 30 個表示一個抽樣的數值。"; @@ -22803,7 +23530,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer 1; Deðer 2;... Bir popülasyondan alýnan bir örneði temsil eden 1 - 30 arasý deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1; valor 2;... són entre 1 i 30 arguments que representen una mostra presa d'una població total bàsica."; - Text[ finnish ] = "Arvo 1; arvo 2;... ovat 1 - 30 argumenttia, jotka esittävät peruskokonaispopulaatiosta otettua otosta."; + Text[ finnish ] = "Arvo 1; arvo 2;.. .ovat 1 - 30 argumenttia, jotka esittävät peruskokonaispopulaatiosta otettua otosta."; + Text[ thai ] = "ค่า 1; ค่า 2;.. .à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 à¹à¸ªà¸”งถึงà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸—ี่เà¸à¸²à¸à¸à¸à¸ˆà¸²à¸à¸œà¸¥à¸£à¸§à¸¡à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function STABWN #*=- @@ -22825,7 +23553,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Calcula la desviación predeterminada de la población total determinada por los argumentos." ; Text [ english_us ] = "Calculates the standard deviation based on the entire population." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæ ·æœ¬æ€»ä½“çš„æ ‡å‡†å差。"; - Text[ russian ] = "Âû÷èñëÿåò ñòàíäàðòíîå îòêëîíåíèå, èñõîäÿ èç ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Âû÷èñëÿåò ñòàíäàðòíîå îòêëîíåíèå, îñíîâàííîå íà ãåíåðàëüíîé ñîâîêóïíîñòè."; Text[ polish ] = "Oblicza odchylenie standardowe, bazuj¹c na populacji."; Text[ japanese ] = "引数をæ¯é›†å›£å…¨ä½“ã§ã‚ã‚‹ã¨è¦‹ãªã—ã¦ã€æ¯é›†å›£ã®æ¨™æº–å差を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個樣本總體的標準å差。"; @@ -22837,6 +23565,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Popülasyona dayanarak standart sapmayý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la desviació estàndard basada en tota la població."; + Text[ thai ] = "คำนวณส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸—ั้งประชาà¸à¸£"; }; ExtraData = { @@ -22852,26 +23581,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -22891,7 +23621,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos numéricos que corresponden a la población." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample of a population." ; Text[ chinese_simplified ] = "æ•°å—1;æ•°å—2;是1到30ä¸ªè¡¨ç¤ºå’Œæ ·æœ¬æ€»ä½“ç›¸å¯¹åº”çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, reprezentuj¹cych populacjê."; Text[ japanese ] = "数値 1;数値 2;...ã¯æ¯é›†å›£å…¨ä½“ã«å¯¾å¿œã™ã‚‹1ã‹ã‚‰30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1ï¹”æ•¸å— 2﹔是1 到 30 個表示和樣本總體相å°æ‡‰çš„數å—å…ƒç´ ã€‚"; @@ -22903,6 +23633,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Popülasyonu temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra d'una població."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function STABWNA #*=- @@ -22922,7 +23653,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Calcula la desviación predeterminada a partir de la población total. El texto se valorará como cero."; Text[ english_us ] = "Returns the standard deviation based on the entire population. Text is evaluated as zero."; Text[ chinese_simplified ] = "ä¼°ç®—ä¸€ä¸ªæŠ½æ ·çš„æ ‡å‡†å差。文å—当作零。"; - Text[ russian ] = "Âû÷èñëÿåò ñòàíäàðòíîå îòêëîíåíèå, èñõîäÿ èç ãåíåðàëüíîé ñîâîêóïíîñòè. Òåêñò ñ÷èòàåòñÿ êàê 0."; + Text[ russian ] = "Âû÷èñëÿåò ñòàíäàðòíîå îòêëîíåíèå, îñíîâàííîå íà ãåíåðàëüíîé ñîâîêóïíîñòè. Òåêñò ñ÷èòàåòñÿ êàê 0."; Text[ polish ] = "Oblicza odchylenie standardowe, bazuj¹c na populacji. Wartoœæ funkcji dla tekstu jest równa zero."; Text[ japanese ] = "引数をæ¯é›†å›£å…¨ä½“ã§ã‚ã‚‹ã¨è¦‹ãªã—ã¦ã€æ¯é›†å›£ã®æ¨™æº–å差を返ã—ã¾ã™ã€‚æ–‡å—列ã¯ã‚¼ãƒã¨è¦‹ãªã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "估算一個抽樣的標準å差。文å—當作零。"; @@ -22935,6 +23666,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la desviació estàndard basada en tota la població. El text s'avalua com a zero."; Text[ finnish ] = "Palauttaa koko populaatioon perustuvan keskihajonnan. Tekstin arvoksi lasketaan nolla."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ªà¹ˆà¸§à¸™à¹€à¸šà¸µà¹ˆà¸¢à¸‡à¹€à¸šà¸™à¸¡à¸²à¸•à¸£à¸à¸²à¸™à¸šà¸™à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸—ั้งประชาà¸à¸£ ข้à¸à¸„วามถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าเป็นศูนย์"; }; ExtraData = { @@ -22952,23 +23684,24 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ danish ] = "Værdi "; Text[ french ] = "Valeur "; Text[ swedish ] = "värde "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ spanish ] = "Valor "; Text[ english_us ] = "value "; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor "; - Text[ finnish ] = "arvo"; + Text[ catalan ] = "valor "; + Text[ finnish ] = "arvo "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -22984,7 +23717,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Valor 1; Valor 2;... son entre 1 y 30 argumentos que se corresponden con una población."; Text[ english_us ] = "Value 1; value 2;... are 1 to 30 arguments corresponding to a population."; Text[ chinese_simplified ] = "数值1;数值2;...是 1 至 30ä¸ªè¡¨ç¤ºæ ·æœ¬æ€»ä½“çš„æ•°å€¼ã€‚"; - Text[ russian ] = "Çíà÷åíèå 1, çíà÷åíèå 2, ... îò1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Çíà÷åíèå 1, çíà÷åíèå 2, ... îò1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 argumentów, które reprezentuj¹ populacjê."; Text[ japanese ] = "数値 1;数値 2;...ã¯æ¯é›†å›£å…¨ä½“ã«å¯¾å¿œã™ã‚‹1ã‹ã‚‰30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "數值1﹔數值2ï¹”...是 1 至 30個表示樣本總體的數值。"; @@ -22997,6 +23730,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1; valor 2;... són entre 1 i 30 arguments que corresponen a una població."; Text[ finnish ] = "Arvo 1; arvo 2;... ovat 1 - 30 argumenttia, jotka vastaavat populaatiota."; + Text[ thai ] = "ค่า 1; ค่า 2;... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 สà¸à¸”คล้à¸à¸‡à¸à¸±à¸šà¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function MITTELWERT #*=- @@ -23018,7 +23752,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el promedio de los argumentos." ; Text [ english_us ] = "Returns the average of a sample." ; Text[ chinese_simplified ] = "ä¸€æ¬¡æŠ½æ ·çš„å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ñðåäíåå (àðèôìåòè÷åñêîå) ñâîèõ àðãóìåíòîâ."; + Text[ russian ] = "Âîçâðàùàåò ñðåäíåå çíà÷åíèå âûáîðêè."; Text[ polish ] = "Oblicza œredni¹ argumentu w próbce."; Text[ japanese ] = "データã®ç®—è¡“å¹³å‡å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "一次抽樣的平å‡å€¼ã€‚"; @@ -23026,10 +23760,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de gemiddelde waarde van een steekproef"; Text[ chinese_simplified ] = "ä¸€æ¬¡æŠ½æ ·çš„å¹³å‡å€¼ã€‚"; Text[ greek ] = "Õðïëïãßæåé ôçí ìÝóç ôéìÞ åíüò äåßãìáôïò."; - Text[ korean ] = "í‘œë³¸ì˜ í‰ê· ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤"; + Text[ korean ] = "í‘œë³¸ì˜ í‰ê· ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Örneðin ortalamasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la mitjana d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเฉลี่ยขà¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -23045,26 +23780,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23082,7 +23818,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; Número2; ...son de 1 a 30 argumentos numéricos de una muestra cuyo promedio se desea obtener." ; Text [ english_us ] = "Number 1, number 2;...are 1 to 30 numeric arguments representing a population sample." ; Text[ chinese_simplified ] = "æ•°å—1; æ•°å—2;... 是 1 至 30个数å—自å˜é‡, 它们表示\nè¦è®¡ç®—其平å‡å€¼çš„ä¸€ä¸ªæŠ½æ ·ã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 àðãóìåíòîâ, äëÿ êîòîðûõ âû÷èñëÿåòñÿ ñðåäíåå âûáîðêè, âûäåëåííîé èç îáùåé ñîâîêóïíîñòè."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 àðãóìåíòîâ, äëÿ êîòîðûõ âû÷èñëÿåòñÿ ñðåäíåå âûáîðêè ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, które przedstawiaj¹ próbkê, odpowiadaj¹c¹ populacji."; Text[ japanese ] = "数値 1;数値 2;...ã¯ç®—è¡“å¹³å‡å€¤ã‚’求ã‚ã‚‹30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "數å—1; 數å—2;... 是 1 至 30個數å—自變é‡, 它們表示è¦è¨ˆç®—其平å‡å€¼çš„一個抽樣。"; @@ -23094,6 +23830,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Bir popülasyondan alýnmýþ örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2;... són entre 1 i 30 arguments numèrics que representen una mostra d'una població."; + Text[ thai ] = "เลข 1, เลข 2;...à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 à¹à¸ªà¸”งถึงà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function MITTELWERTA #*=- @@ -23113,7 +23850,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ spanish ] = "Calcula la media de una muestra. El texto se valorará como cero."; Text[ english_us ] = "Returns the average value for a sample. Text is evaluated as zero."; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·çš„å¹³å‡å€¼ã€‚æ–‡å—当作零。"; - Text[ russian ] = "Âû÷èñëÿåò ñðåäíåå çíà÷åíèå âûáîðêè. Òåêñò ñ÷èòàåòñÿ êàê íóëü."; + Text[ russian ] = "Âû÷èñëÿåò ñðåäíåå çíà÷åíèå âûáîðêè. Òåêñò ñ÷èòàåòñÿ êàê 0."; Text[ polish ] = "Wyznacza œredni¹ próbki. Wartoœæ funkcji dla tekstu jest równa zero."; Text[ japanese ] = "データã®ç®—è¡“å¹³å‡å€¤ã‚’è¿”ã—ã¾ã™ã€‚æ–‡å—列㯠0 ã¨è¦‹ãªã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣的平å‡å€¼ã€‚æ–‡å—當作零。"; @@ -23121,11 +23858,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de gemiddelde waarde van een steekproef. Aan tekst wordt de waarde 0 toegewezen."; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·çš„å¹³å‡å€¼ã€‚æ–‡å—当作零。"; Text[ greek ] = "Õðïëïãßæåé ôçí ìÝóç ôéìÞ åíüò äåßãìáôïò. Êåßìåíï èá áðïôéìÜôáé ùò ìçäÝí."; - Text[ korean ] = "í‘œë³¸ì˜ í‰ê· ê°’ì„ ê³„ì‚°. í…스트는 0으로 í‰ê°€ë©ë‹ˆë‹¤."; + Text[ korean ] = "í‘œë³¸ì˜ í‰ê· ê°’ì„ ê³„ì‚°. í…스트는 0으로 í‰ê°€ë©ë‹ˆë‹¤."; Text[ turkish ] = "Bir örneðin ortalamasýný verir. Metin sýfýr olarak deðerlendirilir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor mitjà d'una mostra. El text s'avalua com a zero."; Text[ finnish ] = "Palauttaa otoksen keskiarvon. Tekstin arvoksi lasketaan nolla."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเฉลี่ยสำหรับà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡ ข้à¸à¸„วามถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¸„่าเป็นศูนย์"; }; ExtraData = { @@ -23143,23 +23881,24 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ danish ] = "Værdi "; Text[ french ] = "Valeur "; Text[ swedish ] = "värde "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ spanish ] = "Valor "; Text[ english_us ] = "value "; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "waarde "; + Text[ dutch ] = "waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor "; - Text[ finnish ] = "arvo"; + Text[ catalan ] = "valor "; + Text[ finnish ] = "arvo "; + Text[ thai ] = "ค่า "; }; String 3 // Description of Parameter 1 { @@ -23176,7 +23915,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ english_us ] = "Value 1; value 2;.. .are 1 to 30 arguments representing a sample taken from a basic total population."; Text[ chinese_simplified ] = "数值1;数值2;...是1至30个è¦è®¡ç®—å…¶æŠ½æ ·å¹³å‡å€¼çš„å…ƒç´ ã€‚"; Text[ language_user1 ] = " "; - Text[ russian ] = "Çíà÷åíèå 1 ,çíà÷åíèå 2,... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå èç ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Çíà÷åíèå 1 ,çíà÷åíèå 2,... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ñîîòâåòñòâóþùèõ âûáîðêå, âçÿòîé èç îáùåé ñîâîêóïíîñòè."; Text[ polish ] = "Od 1 do 30 argumentów, które reprezentuj¹ próbkê."; Text[ japanese ] = "値 1;値 2;...ã¯ç®—è¡“å¹³å‡å€¤ã‚’求ã‚ã‚‹30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "數值1﹔數值2ï¹”...是 1 至 30個è¦è¨ˆç®—其抽樣平å‡å€¼çš„å…ƒç´ ã€‚"; @@ -23187,7 +23926,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ê°’1; ê°’2;...는 모집단ì—ì„œ 추출한 í‘œë³¸ì„ ë‚˜íƒ€ë‚´ëŠ” 1ì—ì„œ 30ê¹Œì§€ì˜ ë…립 변수입니다."; Text[ turkish ] = "Deðer 1; Deðer 2;... Bir popülasyondan alýnan bir örneði temsil eden 1 - 30 arasý deðiþkendir."; Text[ catalan ] = "Valor 1; valor 2;... són entre 1 i 30 arguments que representen una mostra presa d'una població total bàsica."; - Text[ finnish ] = "Arvo 1; arvo 2;... ovat 1 - 30 argumenttia, jotka esittävät peruskokonaispopulaatiosta otettua otosta."; + Text[ finnish ] = "Arvo 1; arvo 2;.. .ovat 1 - 30 argumenttia, jotka esittävät peruskokonaispopulaatiosta otettua otosta."; + Text[ thai ] = "ค่า 1; ค่า 2;.. .à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ 1 ถึง 30 à¹à¸ªà¸”งถึงตัวà¸à¸¢à¹ˆà¸²à¸‡à¸—ี่เà¸à¸²à¸à¸à¸à¸ˆà¸²à¸à¸œà¸¥à¸£à¸§à¸¡à¸žà¸·à¹‰à¸™à¸à¸²à¸™à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function SUMQUADABW #*=- @@ -23201,7 +23941,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Calcola la somma dei quadrati delle deviazioni della media relativa ad un esempio." ; Text [ portuguese_brazilian ] = "Berechnet die Summe quadratischen Abweichung einer Stichprobe vom Mittelwert." ; Text [ portuguese ] = "Devolve a soma dos quadrados dos desvios em relação a um dado exemplo." ; - Text [ finnish ] = "Palauttaa väliarvo-otoksen poikkeamien neliöiden summan." ; + Text [ finnish ] = "Palauttaa otoksen keskiarvosta poikkeamien neliöiden summan." ; Text [ danish ] = "Beregner summen af datapunkternes kvadrerede afvigelser fra middelværdien." ; Text [ french ] = "Renvoie la somme des écarts carrés d'un échantillon de la moyenne." ; Text [ swedish ] = "Beräknar summan av den kvadratiska avvikelsen från medelvärdet hos ett stickprov." ; @@ -23217,10 +23957,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de som van de deviaties in het kwadraat in een steekproef."; Text[ chinese_simplified ] = "è®¡ç®—æŠ½æ ·ä¸Žå¹³å‡å€¼çš„å差的平方和。"; Text[ greek ] = "Õðïëïãßæåé ôï óýíïëï ôùí ôåôñáãþíùí ôùí áðïêëßóåùí åíüò äåßãìáôïò áðü ôç ìÝóç ôéìÞ."; - Text[ korean ] = "í‰ê· ê°’ì˜ í‘œë³¸ì˜ ì œê³± íŽ¸ì°¨ì˜ í•©ì„ ê³„ì‚°í•©ë‹ˆë‹¤"; + Text[ korean ] = "í‰ê· ê°’ì˜ í‘œë³¸ì˜ ì œê³± íŽ¸ì°¨ì˜ í•©ì„ ê³„ì‚°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Örneðin, ortalamadan sapma deðeri karesinin toplamýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la suma dels quadrats de les desviacions d'una mostra des del valor mitjà."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸£à¸§à¸¡à¸‚à¸à¸‡à¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹€à¸šà¸µà¹ˆà¸¢à¸‡à¹€à¸šà¸™à¸‚à¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸ˆà¸²à¸à¸„่าเฉลี่ย"; }; ExtraData = { @@ -23236,26 +23977,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23273,7 +24015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos numéricos cuya suma de las desviaciones cuadradas se desea calcular." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample." ; Text[ chinese_simplified ] = "æ•°å—1; æ•°å— 2;... 是 1 至 30 ä¸ªè¡¨ç¤ºæŠ½æ ·çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, äëÿ êîòîðûõ âû÷èñëÿåòñÿ ñóììà êâàäðàòîâ îòêëîíåíèé."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów reprezentuj¹cych próbkê."; Text[ japanese ] = "æ•° 1;数値 2;...ã¯åå·®ã®å¹³æ–¹å’Œã‚’求ã‚ã‚‹1ã‹ã‚‰30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "數å—1; æ•¸å— 2;... 是 1 至 30 個表示抽樣的數å—å…ƒç´ ã€‚"; @@ -23285,6 +24027,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Bir örneði temsil eden 1- 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; }; // -=*# Resource for function MITTELABW #*=- @@ -23306,7 +24049,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el promedio de las desviaciones absolutas de la media de los puntos de datos." ; Text [ english_us ] = "Returns the average of the absolute deviations of a sample from the mean." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·ä¸Žå¹³å‡å€¼çš„ç»å¯¹å¹³å‡å差。"; - Text[ russian ] = "Âîçâðàùàåò ñðåäíåå àáñîëþòíûõ çíà÷åíèé îòêëîíåíèé òî÷åê äàííûõ îò ñðåäíåãî."; + Text[ russian ] = "Âû÷èñëÿåò ñðåäíåå èç àáñîëþòíûõ çíà÷åíèé. Îòîáðàæàåò ðàñïðîñòðàíåíèå â îáëàñòè äàííûõ."; Text[ polish ] = "Oblicza odchylenie œrednie (œrednia z odchyleñ bezwzglêdnych) punktów danych od ich wartoœci œredniej."; Text[ japanese ] = "データã®å¹³å‡å差を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣與平å‡å€¼çš„絕å°å¹³å‡å差。"; @@ -23314,10 +24057,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de gemiddelde absolute deviatie van een steekproef ten opzichte van de gemiddelde waarde."; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·ä¸Žå¹³å‡å€¼çš„ç»å¯¹å¹³å‡å差。"; Text[ greek ] = "Õðïëïãßæåé ôç ìåóáßá áðüëõôç áðüêëéóç åíüò äåßãìáôïò áðü ôçí ìÝóç ôéìÞ."; - Text[ korean ] = "í‰ê· 값으로부터 ìƒ˜í”Œì˜ í‰ê· ì ˆëŒ€ 편차를 계산합니다"; + Text[ korean ] = "í‰ê· 값으로부터 ìƒ˜í”Œì˜ í‰ê· ì ˆëŒ€ 편차를 계산합니다."; Text[ turkish ] = "Örneðin, ortalama deðerden mutlak sapmasýnýn ortalamasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la mitjana de les desviacions absolutes d'una mostra des de la mitja."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเฉลี่ยขà¸à¸‡à¸„่าสัมบูรณ์ขà¸à¸‡à¸ªà¹ˆà¸§à¸™à¹€à¸šà¸µà¹ˆà¸¢à¸‡à¹€à¸šà¸™à¸‚à¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸ˆà¸²à¸à¸„่าเฉลี่ย"; }; ExtraData = { @@ -23333,26 +24077,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23366,22 +24111,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Tal 1; tal 2; ... er 1 til 30 numeriske argumenter, som udgør en stikprøve." ; Text [ french ] = "Nombre 1, nombre 2, ... sont de 1 à 30 arguments numériques représentant un échantillon." ; Text [ swedish ] = "tal 1; tal 2;... är 1 till 30 numeriska argument som utgör ett stickprov." ; - Text [ dutch ] = "Getal 1; Getal 2;... zijn maximaal 30 numerieke argumenten die een steekproef weegeven." ; + Text [ dutch ] = "Getal 1; Getal 2;... zijn maximaal 30 numerieke argumenten die een steekproef weergeven." ; Text [ spanish ] = "Número 1; Número2;...son de 1 a 30 argumentos numéricos que componen una muestra." ; Text [ english_us ] = "Number 1, number 2;...are 1 to 30 numerical arguments representing a sample." ; Text[ chinese_simplified ] = "æ•°å—1; æ•°å—2;... 是 1 至 30 个数å—自å˜é‡, å®ƒä»¬è¡¨ç¤ºä¸€ä¸ªæŠ½æ ·ã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, äëÿ êîòîðûõ îïðåäåëÿåòñÿ ñðåäíåå àáñîëþòíûõ îòêëîíåíèé."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, reprezentuj¹cych próbkê."; Text[ japanese ] = "数値 1;数値 2;...ã¯å¹³å‡å差を求ã‚ã‚‹30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "數å—1; 數å—2;... 是 1 至 30 個數å—自變é‡, 它們表示一個抽樣。"; Text[ arabic ] = "Number 1, Number 2;... ãä 1 Åáì 30 æÓíØÉ ÚÏÏíÉ ÊãËá ÚíäÉ."; - Text[ dutch ] = "Getal 1; Getal 2;... zijn maximaal 30 numerieke argumenten die een steekproef weegeven."; + Text[ dutch ] = "Getal 1; Getal 2;... zijn maximaal 30 numerieke argumenten die een steekproef weergeven."; Text[ chinese_simplified ] = "æ•°å—1; æ•°å—2;... 是 1 至 30 个数å—自å˜é‡, å®ƒä»¬è¡¨ç¤ºä¸€ä¸ªæŠ½æ ·ã€‚"; Text[ greek ] = "Áñéèìüò 1, Áñéèìüò2, ... åßíáé 1 Ýùò 30 áñéèìçôéêÜ ïñßóìáôá ôá ïðïßá áðïôåëïýí Ýíá äåßãìá."; Text[ korean ] = "ê°’ 1, ê°’ 2;... 는 í‘œë³¸ì„ ë‚˜íƒ€ë‚´ëŠ” 1ì—ì„œ 30ê¹Œì§€ì˜ ìˆ«ìž ë…립 변수입니다."; Text[ turkish ] = "Sayý 1; sayý 2;... Bir örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2;...són entre 1 i 30 arguments numèrics que representen una mostra."; + Text[ thai ] = "เลข 1, เลข 2;...à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 à¹à¸ªà¸”งถึงà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; }; // -=*# Resource for function SCHIEFE #*=- @@ -23415,6 +24161,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Daðýtýmýn eðriliðini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el grau d'asimetria d'una distribució."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸¥à¸²à¸”เà¸à¸µà¸¢à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡"; }; ExtraData = { @@ -23430,26 +24177,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23467,7 +24215,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos cuya asimetría desea calcular." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments portraying a sample of the distribution." ; Text[ chinese_simplified ] = "æ•°å—1;æ•°å—2;æ˜¯è¡¨ç¤ºæŠ½æ ·åˆ†å¸ƒçš„1到30个数å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî1, ÷èñëî2, ... îò 1 äî 30 àðãóìåíòîâ, äëÿ êîòîðûõ âû÷èñëÿåòñÿ àñèììåòðè÷íîñòü."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó ðàñïðåäåëåíèÿ."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów reprezentuj¹cych próbkê rozk³adu."; Text[ japanese ] = "数値 1;数値 2;...ã¯30個ã¾ã§ã®åˆ†å¸ƒã®æ¨™æœ¬ãƒ‡ãƒ¼ã‚¿ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1ï¹”æ•¸å— 2﹔是表示抽樣分佈的 1 到 30 個數å—å…ƒç´ ã€‚"; @@ -23479,6 +24227,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Daðýtýmýn bir örneðini temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra de la distribució."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡"; }; }; // -=*# Resource for function KURT #*=- @@ -23500,7 +24249,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la curtosis de un conjunto de datos." ; Text [ english_us ] = "Returns the kurtosis of a distribution." ; Text[ chinese_simplified ] = "计算一个分布的尖é”度。"; - Text[ russian ] = "Âîçâðàùàåò ýêñöåññ ìíîæåñòâà äàííûõ."; + Text[ russian ] = "Âû÷èñëÿåò ýêñöåññ îáëàñòè äàííûõ (ïî ìåíüøåé ìåðå 4 çíà÷åíèé) - êðóòèçíó ðàñïðåäåëåíèÿ."; Text[ polish ] = "Oblicza kurtozê rozk³adu."; Text[ japanese ] = "引数ã¨ã—ã¦æŒ‡å®šã—ãŸãƒ‡ãƒ¼ã‚¿åˆ†å¸ƒã®å°–度を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個分佈的尖銳度。"; @@ -23512,6 +24261,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Daðýtýmýn eðriliðini (Kurtosis) hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la curtosi d'una distribució."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„วามชันขà¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡"; }; ExtraData = { @@ -23527,26 +24277,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî"; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23564,7 +24315,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos cuya curtosis desea calcular." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments, representing a sample of the distribution." ; Text[ chinese_simplified ] = "æ•°å—1; æ•°å—2;... 是 1 至 30个数å—å…ƒç´ , 它们表示\nä¸€ä¸ªæŠ½æ ·çš„åˆ†å¸ƒã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó ðàñïðåäëåíèÿ, äëÿ êîòîðûõ âû÷èñëÿåòñÿ ýêñöåññ."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó ðàñïðåäåëåíèÿ."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów reprezentuj¹cych próbkê rozk³adu."; Text[ japanese ] = "数値 1;数値 2;...ã¯å°–度を計算ã™ã‚‹ãŸã‚ã®1ã‹ã‚‰30個ã¾ã§ã®æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "數å—1; 數å—2;... 是 1 至 30個數å—å…ƒç´ , 它們表示一個抽樣的分佈。"; @@ -23576,6 +24327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Daðýtýmýn bir örneðini oluþturan 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra de la distribució."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 , à¹à¸ªà¸”งถึงà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡"; }; }; // -=*# Resource for function GEOMITTEL #*=- @@ -23597,7 +24349,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la media geométrica de una matriz o área de datos positivos." ; Text [ english_us ] = "Returns the geometric mean of a sample." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·çš„å‡ ä½•å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ñðåäíåå ãåîìåòðè÷åñêîå âûáîðêè."; + Text[ russian ] = "Âû÷èñëÿåò ñðåäíåå ãåîìåòðè÷åñêîå äàííîé âûáîðêè."; Text[ polish ] = "Oblicza œredni¹ geometryczn¹ przyk³adu."; Text[ japanese ] = "標本ã®å¹¾ä½•å¹³å‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣的幾何平å‡å€¼ã€‚"; @@ -23609,6 +24361,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin geometrik ortalamasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la mitja geomètrica d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเฉลี่ยทางเรขาคณิตขà¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -23624,26 +24377,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23661,7 +24415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;... son de 1 a 30 argumentos cuya media desea calcular." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample." ; Text[ chinese_simplified ] = "æ•°å— 1; æ•°å— 2;... 是 1 至 30 ä¸ªè¡¨ç¤ºä¸€ä¸ªæŠ½æ ·çš„æ•°å—å‚数。"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, äëÿ êîòîðûõ âû÷èñëÿåòñÿ ñðåäíåå."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, dla których ma zostaæ wyznaczona œrednia wartoœæ geometryczna."; Text[ japanese ] = "数値 1;数値 2;...ã¯æ¨™æœ¬ã‚’表ã™1ã‹ã‚‰30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1; æ•¸å— 2;... 是 1 至 30表示一個抽樣的數å—åƒæ•¸ã€‚"; @@ -23673,6 +24427,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Bir örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์à¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; }; // -=*# Resource for function HARMITTEL #*=- @@ -23694,7 +24449,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la media armónica de un conjunto de datos." ; Text [ english_us ] = "Returns the harmonic mean of a sample." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·çš„è°ƒå’Œå¹³å‡å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ãàðìîíè÷åñêîå ñðåäíåå íàáîðà äàííûõ."; + Text[ russian ] = "Âîçâðàùàåò ãàðìîíè÷åñêîå ñðåäíåå âûáîðêè."; Text[ polish ] = "Oblicza wyrywczo œredni¹ harmoniczn¹."; Text[ japanese ] = "1組ã®æ•°å€¤ã®èª¿å’Œå¹³å‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣的調和平å‡å€¼ã€‚"; @@ -23706,6 +24461,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin armonik ortalamasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la mitja harmònica d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเฉลี่ยที่ประสานà¸à¸±à¸™à¸‚à¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -23721,26 +24477,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Número " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値"; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23758,7 +24515,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son de 1 a 30 argumentos numéricos cuya media desea calcular." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample." ; Text[ chinese_simplified ] = "æ•°å— 1; æ•°å— 2;... 是 1 至 30 çš„è¡¨ç¤ºä¸€ä¸ªæŠ½æ ·çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, äëÿ êîòîðûõ âû÷èñëÿåòñÿ ãàðìîíè÷åñêîå ñðäíåå."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, dla których ma zostaæ wyznaczona œrednia wartoœæ geometryczna."; Text[ japanese ] = "数値 1;数値 2;...ã¯è¨ˆç®—ã®å¯¾è±¡ã¨ãªã‚‹1個ã‹ã‚‰30個ã¾ã§ã®æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1; æ•¸å— 2;... 是 1 至 30 的表示一個抽樣的數å—å…ƒç´ ã€‚"; @@ -23770,6 +24527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Bir örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¸·à¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ที่เป็นตัวเลข 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; }; // -=*# Resource for function MODALWERT #*=- @@ -23792,7 +24550,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el valor que se repite con más frecuencia en una matriz o área de datos." ; Text [ english_us ] = "Returns the most common value in a sample." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·ä¸é¢‘率最高的数值。"; - Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå ìîäû äëÿ ìíîæåñòâà äàííûõ."; + Text[ russian ] = "Âû÷èñëÿåò íàèáîëåå îáùåå çíà÷åíèå âûáîðêè.."; Text[ polish ] = "Podaje najczêœciej wystêpuj¹c¹ wartoœæ w zbiorze danych."; Text[ japanese ] = "データä¸ã®æœ€é »å€¤(モード)ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣ä¸é »çŽ‡æœ€é«˜çš„數值。"; @@ -23800,10 +24558,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de meest voorkomende waarde in een steekproef."; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·ä¸é¢‘率最高的数值。"; Text[ greek ] = "Õðïëïãßæåé ôçí óõ÷íüôåñç ôéìÞ åíüò äåßãìáôïò."; - Text[ korean ] = "표본ì—ì„œ 최빈값 계산"; + Text[ korean ] = "표본ì—ì„œ 최대 빈ë„ê°’ 계산"; Text[ turkish ] = "Örnek içinde en sýk bulunan deðeri hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor més comú en una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าร่วมมาà¸à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -23819,26 +24578,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Núm1; núm2;... " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23856,7 +24616,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son entre 1 y 30 argumentos cuya moda desea calcular." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample." ; Text[ chinese_simplified ] = "æ•°å— 1; æ•°å— 2;... 是 1 至 30 ä¸ªè¡¨ç¤ºä¸€ä¸ªæŠ½æ ·çš„æ•°å—å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó, è äëÿ êîòîðûõ âû÷èñëÿåòñÿ ìîäà."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó."; Text[ polish ] = "Od 1 do 30 argumentów, wœród których ma zostaæ znaleziona wartoœæ wystêpuj¹ca najczêœciej."; Text[ japanese ] = "数値 1;数値 2;...ã¯è¨ˆç®—ã™ã‚‹ãŸã‚ã®1ã‹ã‚‰30個ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1; æ•¸å— 2;... 是 1 至 30 個表示一個抽樣的數å—å…ƒç´ ã€‚"; @@ -23868,6 +24628,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... Bir örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¸·à¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ที่เป็นตัวเลข 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; }; // -=*# Resource for function MEDIAN #*=- @@ -23889,7 +24650,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la mediana de los números." ; Text [ english_us ] = "Returns the median of a given sample." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·çš„ä¸ä½æ•°ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ìåäèàíó óêàçàííîé âûáîðêè."; + Text[ russian ] = "Âîçâðàùàåò ìåäèàíó çàäàííîé âûáîðêè."; Text[ polish ] = "Oblicza medianê podanej próbki."; Text[ japanese ] = "データã®ä¸å¤®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣的ä¸ä½æ•¸ã€‚"; @@ -23901,6 +24662,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin ortalamasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la mitja d'una mostra donada."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าà¸à¸¥à¸²à¸‡à¸‚à¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¸—ี่ให้มา"; }; ExtraData = { @@ -23916,26 +24678,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero " ; Text [ portuguese_brazilian ] = "Zahl " ; Text [ portuguese ] = "Núm1; núm2;... " ; - Text [ finnish ] = "luku" ; + Text [ finnish ] = "luku " ; Text [ danish ] = "Tal " ; Text [ french ] = "Nombre " ; Text [ swedish ] = "tal " ; - Text [ dutch ] = "Getal " ; + Text [ dutch ] = "Getal" ; Text [ spanish ] = "número " ; Text [ english_us ] = "number " ; Text[ chinese_simplified ] = "number "; - Text[ russian ] = "×èñëî "; + Text[ russian ] = "×èñëî "; Text[ polish ] = "Liczba "; Text[ japanese ] = "数値 "; Text[ chinese_traditional ] = "number "; Text[ arabic ] = "ÇáÑÞã "; - Text[ dutch ] = "Getal "; + Text[ dutch ] = "Getal"; Text[ chinese_simplified ] = "number "; Text[ greek ] = "Áñéèìüò "; Text[ korean ] = "ê°’"; Text[ turkish ] = "Sayý "; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre "; + Text[ thai ] = "ตัวเลข "; }; String 3 // Description of Parameter 1 { @@ -23953,7 +24716,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número 1; número 2;...son entre 1 y 30 números cuya mediana desea obtener." ; Text [ english_us ] = "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample." ; Text[ chinese_simplified ] = "æ•°å— 1; æ•°å— 2;... 是 1 至 30 ä¸ªè¡¨ç¤ºä¸€ä¸ªæŠ½æ ·çš„å…ƒç´ ã€‚"; - Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó, è äëÿ êîòîðûõ îïðåäåëÿåòñÿ ìåäèàíà."; + Text[ russian ] = "×èñëî 1; ÷èñëî 2;... îò 1 äî 30 ÷èñëîâûõ àðãóìåíòîâ, ïðåäñòàâëÿþùèå âûáîðêó."; Text[ polish ] = "Od 1 do 30 numerycznych argumentów, które okreœlaj¹ medianê."; Text[ japanese ] = "数値 1;数値 2;...ã¯å¯¾è±¡ã¨ãªã‚‹30個ã¾ã§ã®å¼•æ•°ã€‚"; Text[ chinese_traditional ] = "æ•¸å— 1; æ•¸å— 2;... 是 1 至 30 å€‹è¡¨ç¤ºä¸€å€‹æŠ½æ¨£çš„å…ƒç´ ã€‚"; @@ -23965,6 +24728,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý 1; sayý 2;... bir örneði temsil eden 1 - 30 arasý nümerik deðiþkendir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre 1, nombre 2, ... són entre 1 i 30 arguments numèrics que representen una mostra."; + Text[ thai ] = "เลข 1, เลข 2, ... à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸²à¸£à¸·à¸à¸´à¸§à¹€à¸¡à¹‰à¸™à¸—์ที่เป็นตัวเลข 1 ถึง 30 ที่à¸à¸˜à¸´à¸šà¸²à¸¢à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; }; // -=*# Resource for function QUANTIL #*=- @@ -23986,7 +24750,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el k-ésimo percentil de los valores de un área." ; Text [ english_us ] = "Returns the alpha quantile of a sample." ; Text[ chinese_simplified ] = "计算数值区域的 K 百分比数值点。"; - Text[ russian ] = "Âîçâðàùàåò k-óþ ïåðñåíòèëü äëÿ çíà÷åíèé äèàïàçîíà."; + Text[ russian ] = "Âû÷èñëÿåò Àëüôà-êâàðòèëü âûáîðêè."; Text[ polish ] = "Wyznacza k-ty percentyl ci¹gu danych."; Text[ japanese ] = "データã®ä¸ã§ã€ç™¾åˆ†ä½ã§ α 番目ã«ä½ç½®ã™ã‚‹å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算數值å€åŸŸçš„ K 百分比數值點。"; @@ -23998,6 +24762,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin alfa kuvantilini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el quantil alfa d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š alpha quantile ขà¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -24021,7 +24786,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos" ; Text [ english_us ] = "data" ; Text[ chinese_simplified ] = "array"; - Text[ russian ] = "Ìàññèâ"; + Text[ russian ] = "Äàííûå"; Text[ polish ] = "Dane"; Text[ japanese ] = "データ"; Text[ chinese_traditional ] = "array"; @@ -24033,6 +24798,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -24042,7 +24808,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati del campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é a matriz ou intervalo de dados que define a posição relativa." ; - Text [ finnish ] = "Otoksen tietomatriisi." ; + Text [ finnish ] = "Otoksen tietotaulukko" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen av data i stickprovet." ; @@ -24050,7 +24816,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la matriz o área de datos que define la posición relativa." ; Text [ english_us ] = "The array of the data in the sample." ; Text[ chinese_simplified ] = "定义相对ä½ç½®çš„数组或数值区域。"; - Text[ russian ] = "Ìàññèâ èëè äèàïàçîí ñ ÷èñëåííûìè çíà÷åíèÿìè, êîòîðûé îïðåäåëÿåò îòíîñèòåëüíîå ïîëîæåíèå."; + Text[ russian ] = "Ìàññèâ äàííûõ â âûáîðêå."; Text[ polish ] = "Macierz danych w próbce."; Text[ japanese ] = "データã®å…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "定義相å°ä½ç½®çš„數組或數值å€åŸŸã€‚"; @@ -24062,6 +24828,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades de la mostra."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -24079,7 +24846,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "k" ; Text [ english_us ] = "Alpha" ; Text[ chinese_simplified ] = "Alpha"; - Text[ russian ] = "Ê"; + Text[ russian ] = "Àëüôà"; Text[ polish ] = "Alfa"; Text[ japanese ] = "α"; Text[ chinese_traditional ] = "Alpha"; @@ -24091,6 +24858,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 5 // Description of Parameter 2 { @@ -24100,7 +24868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore percentile nell'intervallo tra 0 e 1." ; Text [ portuguese_brazilian ] = "Der Prozentwert des Quantils zwischen 0 und 1." ; Text [ portuguese ] = "é o valor do percentil entre 0 e 1, inclusive." ; - Text [ finnish ] = "kvantiilin (0-1) prosenttiosuus." ; + Text [ finnish ] = "Kvantiilin (0-1) prosenttiosuus" ; Text [ danish ] = "K er en fraktilværdi mellem 0 og 1." ; Text [ french ] = "La valeur de pourcentage du quantile comprise entre 0 et 1." ; Text [ swedish ] = "Procentvärdet för kvantilen mellan 0 och 1." ; @@ -24108,7 +24876,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor de percentil, debe estar en el intervalo de 0 a 1, inclusive." ; Text [ english_us ] = "The percentage rate of the quantile between 0 and 1." ; Text[ chinese_simplified ] = "百分比数值，在 0 到 1 ä¹‹é—´ï¼ŒåŒ…å« 0 å’Œ 1。"; - Text[ russian ] = "Çíà÷åíèå ïåðñåíòèëÿ â èíòåðâàëå îò 0 äî 1 âêëþ÷èòåëüíî."; + Text[ russian ] = "Ïðîöåíò êâàðòèëÿ â äèàïàçîíå îò 0 äî 1."; Text[ polish ] = "Wartoœæ procentowa kwantylu w zakresie miêdzy 0 lub 1."; Text[ japanese ] = "0～1 ã®ç™¾åˆ†ä½ã®å€¤ã€‚"; Text[ chinese_traditional ] = "百分比數值ï¹åœ¨ 0 到 1 之間ï¹åŒ…å« 0 å’Œ 1。"; @@ -24120,6 +24888,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "0 ile 1 arasýndaki kuvantilin yüzde deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Taxa del percentatge del quantil entre 0 i 1."; + Text[ thai ] = "à¸à¸±à¸•à¸£à¸²à¹€à¸›à¸à¸£à¹Œà¹€à¸‹à¹‡à¸™à¸•à¹Œà¸‚à¸à¸‡ quantile ระหว่าง 0 à¹à¸¥à¸° 1"; }; }; // -=*# Resource for function QUARTILE #*=- @@ -24141,7 +24910,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el cuartil de un conjunto de datos." ; Text [ english_us ] = "Returns the quartile of a sample." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·çš„å››åˆ†ä½æ•°ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò êâàðòèëü ìíîæåñòâà äàííûõ."; + Text[ russian ] = "Âîçâðàùàåò êâàðòèëü âûáîðêè."; Text[ polish ] = "Wyznacza kwartyl zbioru danych."; Text[ japanese ] = "1組ã®ãƒ‡ãƒ¼ã‚¿ã®å››åˆ†ä½æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣的四分ä½æ•¸ã€‚"; @@ -24153,6 +24922,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin kartilini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el quartil d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าควà¸à¸£à¹Œà¹„ทล์ขà¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -24176,7 +24946,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos" ; Text [ english_us ] = "data" ; Text[ chinese_simplified ] = "array"; - Text[ russian ] = "Ìàññèâ"; + Text[ russian ] = "Äàííûå"; Text[ polish ] = "Dane"; Text[ japanese ] = "データ"; Text[ chinese_traditional ] = "array"; @@ -24188,6 +24958,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -24197,7 +24968,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati nel campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é a matriz ou intervalo de células de valores numéricos para o qual deseja calcular o valor quartil." ; - Text [ finnish ] = "Otoksen tietomatriisi." ; + Text [ finnish ] = "Otoksen tietotaulukko" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen av data i stickprovet." ; @@ -24205,7 +24976,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la matriz o área de celdas de valores numéricos cuyo cuartil desea obtener." ; Text [ english_us ] = "The array of the data in the sample." ; Text[ chinese_simplified ] = "需è¦æ±‚得四分ä½æ•°å€¼çš„æŠ½æ ·æ•°ç»„æˆ–æ•°å—åž‹å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Ìàññèâ èëè äèàïàçîí ÿ÷ååê ñ ÷èñëîâûìè çíà÷åíèÿìè, äëÿ êîòîðûõ îïðåäåëÿåòñÿ çíà÷åíèå êâàðòèëÿ."; + Text[ russian ] = "Ìàññèâ äàííûõ â âûáîðêå."; Text[ polish ] = "Macierz danych w próbce."; Text[ japanese ] = "データã®å…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "需è¦æ±‚得四分ä½æ•¸å€¼çš„抽樣數組或數å—型儲å˜æ ¼å€åŸŸã€‚"; @@ -24217,6 +24988,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades de la mostra."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -24231,7 +25003,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Type" ; Text [ swedish ] = "typ" ; Text [ dutch ] = "Type" ; - Text [ spanish ] = "cuartil" ; + Text [ spanish ] = "Tipo" ; Text [ english_us ] = "Type" ; Text[ chinese_simplified ] = "type"; Text[ russian ] = "Òèï"; @@ -24246,6 +25018,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 5 // Description of Parameter 2 { @@ -24275,6 +25048,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kartil tipi (0=ASG., 1=%25, 2=%50, 3=%75, 4=AZM.)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica quin valor ha de retornar (0=MIN, 1=25%, 2=50%, 3=75%, 4=MAX)."; + Text[ thai ] = "ชนิดขà¸à¸‡à¸„่าควà¸à¸£à¹Œà¹„ทล์ (0 = MIN, 1 = 25%, 2 = 50 %, 3 = 75 %, 4 =MAX)."; }; }; // -=*# Resource for function KGRÖSSTE #*=- @@ -24297,7 +25071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el k-ésimo mayor valor de un conjunto de datos." ; Text [ english_us ] = "Returns the k-th largest value of a sample." ; Text[ chinese_simplified ] = "è®¡ç®—ä¸€ä¸ªæŠ½æ ·ä¸çš„第 k 个最大值。"; - Text[ russian ] = "Âîçâðàùàåò k-îå íàèáîëüøåå çíà÷åíèå èç ìíîæåñòâà äàííûõ."; + Text[ russian ] = "Âîçâðàùàåò k-îå íàèáîëüøåå çíà÷åíèå âûáîðêè."; Text[ polish ] = "Zwraca k-t¹ najwiêksz¹ wartoœæ ze zbioru danych."; Text[ japanese ] = "指定ã—ãŸãƒ‡ãƒ¼ã‚¿ã®ä¸ã§ k 番目ã«å¤§ããªãƒ‡ãƒ¼ã‚¿ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個抽樣ä¸çš„第 k 個最大值。"; @@ -24309,6 +25083,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin k'ýncý büyük deðerini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el k-è valor més gran d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่ามาà¸à¸—ี่สุดขà¸à¸‡ k-th ขà¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -24332,7 +25107,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos" ; Text [ english_us ] = "data" ; Text[ chinese_simplified ] = "data"; - Text[ russian ] = "Ìàññèâ"; + Text[ russian ] = "Äàííûå"; Text[ polish ] = "Dane"; Text[ japanese ] = "データ"; Text[ chinese_traditional ] = "資料"; @@ -24344,6 +25119,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -24353,7 +25129,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati del campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é a matriz ou intervalo de dados para os quais deseja calcular o maior valor k-ésimo." ; - Text [ finnish ] = "Otoksen tietomatriisi." ; + Text [ finnish ] = "Otoksen tietotaulukko" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen med data i stickprovet." ; @@ -24361,7 +25137,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la matriz o área de datos cuyo k-ésimo mayor valor desea determinar." ; Text [ english_us ] = "The array of the data in the sample." ; Text[ chinese_simplified ] = "ç”±æŠ½æ ·ç»„æˆçš„æ•°æ®ç»„或数æ®åŒºåŸŸã€‚"; - Text[ russian ] = "Ìàññèâ èëè äèàïàçîí äàííûõ, äëÿ êîòîðûõ îïðåäåëÿåòñÿ k-îå íàèáîëüøåå çíà÷åíèå."; + Text[ russian ] = "Ìàññèâ äàííûõ â âûáîðêå."; Text[ polish ] = "Macierz danych w próbce."; Text[ japanese ] = "対象ã¨ãªã‚‹ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "由抽樣組æˆçš„數據組或數據å€åŸŸã€‚"; @@ -24373,6 +25149,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades de la mostra."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -24402,6 +25179,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Derece_C"; Text[ language_user1 ] = " "; Text[ catalan ] = "Rank_c"; + Text[ thai ] = "ชั้น_c"; }; String 5 // Description of Parameter 2 { @@ -24411,7 +25189,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La posizione del valore." ; Text [ portuguese_brazilian ] = "Der Rang des Werts." ; Text [ portuguese ] = "representa a posição dos dados a devolver, determinada a partir do maior valor." ; - Text [ finnish ] = "Arvon sijoitus." ; + Text [ finnish ] = "Arvon sijoitus" ; Text [ danish ] = "K er værdiens position." ; Text [ french ] = "Le rang de la valeur." ; Text [ swedish ] = "Värdets rang." ; @@ -24419,7 +25197,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "representa la posición del dato a devolver, determinada a partir del mayor de los valores." ; Text [ english_us ] = "The ranking of the value." ; Text[ chinese_simplified ] = "数值在数æ®ç»„里的ä½ç½®ã€‚"; - Text[ russian ] = "Ïîçèöèÿ çíà÷åíèé â ìàññèâå èëè äèàïàçîíå."; + Text[ russian ] = "Ïîçèöèÿ çíà÷åíèÿ."; Text[ polish ] = "Pozycja wartoœci."; Text[ japanese ] = "大ãã„æ–¹ã‹ã‚‰æ•°ãˆãŸãƒ‡ãƒ¼ã‚¿é †ä½ã€‚"; Text[ chinese_traditional ] = "數值在數據組裡的ä½ç½®ã€‚"; @@ -24431,6 +25209,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðerin derecesi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Rang del valor."; + Text[ thai ] = "จัดค่าà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¸±à¹‰à¸™"; }; }; // -=*# Resource for function KKLEINSTE #*=- @@ -24452,7 +25231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el k-ésimo menor valor de un conjunto de datos." ; Text [ english_us ] = "Returns the k-th smallest value of a sample." ; Text[ chinese_simplified ] = "计算数æ®ç»„ä¸çš„第 k 个最å°å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò k-îå íàèìåíüøåå çíà÷åíèå â ìíîæåñòâå äàííûõ."; + Text[ russian ] = "Âîçâðàùàåò k-îå íàèìåíüøåå çíà÷åíèå âûáîðêè."; Text[ polish ] = "Podaje k-t¹ najmniejsz¹ wartoœæ w zbiorze danych."; Text[ japanese ] = "指定ã—ãŸãƒ‡ãƒ¼ã‚¿ã®ä¸ã§ k 番目ã«å°ã•ãªãƒ‡ãƒ¼ã‚¿ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算數據組ä¸çš„第 k 個最å°å€¼ã€‚"; @@ -24464,6 +25243,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin k'ýncý küçük deðerini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el k-è valor més petit d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าน้à¸à¸¢à¸—ี่สุดขà¸à¸‡ k-th ขà¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -24499,6 +25279,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -24508,7 +25289,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati di un campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é uma matriz ou intervalo de dados numéricos para os quais deseja calcular o menor valor k-ésimo." ; - Text [ finnish ] = "Otoksen tietomatriisi." ; + Text [ finnish ] = "Otoksen tietotaulukko" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen av data i stickprovet." ; @@ -24528,6 +25309,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades de la mostra."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -24545,7 +25327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "rango_k" ; Text [ english_us ] = "Rank_c" ; Text[ chinese_simplified ] = "rank_c"; - Text[ russian ] = "Äèàïàçîí_K"; + Text[ russian ] = "Ê"; Text[ polish ] = "Rz¹d_K"; Text[ japanese ] = "k"; Text[ chinese_traditional ] = "Rank_c"; @@ -24557,6 +25339,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Derece_C"; Text[ language_user1 ] = " "; Text[ catalan ] = "Rank_c"; + Text[ thai ] = "ชั้น_c"; }; String 5 // Description of Parameter 2 { @@ -24566,7 +25349,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La posizione del valore." ; Text [ portuguese_brazilian ] = "Der Rang des Werts." ; Text [ portuguese ] = "representa dentro da matriz ou intervalo de dados, a posição do dado a devolver, calculada a partir do menor dos valores." ; - Text [ finnish ] = "Arvon sijoitus." ; + Text [ finnish ] = "Arvon sijoitus" ; Text [ danish ] = "K er værdiens position." ; Text [ french ] = "Le rang de la valeur." ; Text [ swedish ] = "Värdets rang" ; @@ -24574,7 +25357,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "representa dentro de la matriz o área de datos, la posición del dato a devolver, determinada a partir del menor de los valores." ; Text [ english_us ] = "The ranking of the value." ; Text[ chinese_simplified ] = "求得的数值在数æ®ç»„里的ä½ç½®ã€‚"; - Text[ russian ] = "Äèàïàçîí çíà÷åíèé."; + Text[ russian ] = "Ïîçèöèÿ çíà÷åíèÿ."; Text[ polish ] = "Rz¹d wartoœci."; Text[ japanese ] = "å°ã•ã„æ–¹ã‹ã‚‰æ•°ãˆãŸãƒ‡ãƒ¼ã‚¿é †ä½ã€‚"; Text[ chinese_traditional ] = "求得的數值在數據組裡的ä½ç½®ã€‚"; @@ -24586,6 +25369,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðerin derecesi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Rang del valor."; + Text[ thai ] = "จัดค่าà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¸±à¹‰à¸™"; }; }; // -=*# Resource for function QUANTILSRANG #*=- @@ -24609,7 +25393,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el área de percentil de un valor en un conjunto de datos." ; Text [ english_us ] = "Returns the percentage rank of a value in a sample." ; Text[ chinese_simplified ] = "计算一个数值在数æ®é›†ä¸çš„百分比排ä½ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ïðîöåíòíóþ ñòåïåíü çíà÷åíèÿ â âûáîðêå."; + Text[ russian ] = "Âû÷èñëÿåò ïðîöåíòíóþ ñòåïåíü (ðàíã) çíà÷åíèÿ â âûáîðêå."; Text[ polish ] = "Wyznacza pozycjê procentow¹ wartoœci w próbce."; Text[ japanese ] = "測定値ã®ç›¸å¯¾é †ä½ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數值在數據集ä¸çš„百分比排ä½ã€‚"; @@ -24621,6 +25405,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnek içinde bir deðerin yüzde sýrasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el rang de percentatge d'un valor d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸Šà¹ˆà¸§à¸‡à¹€à¸›à¸à¸£à¹Œà¹€à¸‹à¹‡à¸™à¸•à¹Œà¸‚à¸à¸‡à¸„่าในà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -24644,7 +25429,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos" ; Text [ english_us ] = "data" ; Text[ chinese_simplified ] = "array"; - Text[ russian ] = "Ìàññèâ"; + Text[ russian ] = "Äàííûå"; Text[ polish ] = "Dane"; Text[ japanese ] = "データ"; Text[ chinese_traditional ] = "array"; @@ -24656,6 +25441,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -24665,7 +25451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati nel campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é a matriz ou intervalo de dados com valores numéricos que define uma posição relativa." ; - Text [ finnish ] = "Otoksen tietomatriisi." ; + Text [ finnish ] = "Otoksen tietotaulukko" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen av data i ett stickprov." ; @@ -24673,7 +25459,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la matriz o área de datos con valores numéricos que define la posición relativa." ; Text [ english_us ] = "The array of the data in the sample." ; Text[ chinese_simplified ] = "æ•°æ®ç»„。"; - Text[ russian ] = "Ìàññèâ èëè äèàïàçîí äàííûõ ñ ÷èñëîâûìè çíà÷åíèÿìè, îïðåäåëÿþùèé îòíîñèòåëüíîå ïîëîæåíèå."; + Text[ russian ] = "Ìàññèâ äàííûõ â âûáîðêå."; Text[ polish ] = "Macierz danych w próbce."; Text[ japanese ] = "データã®å…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "數據組。"; @@ -24685,6 +25471,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades de la mostra."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -24714,6 +25501,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 5 // Description of Parameter 2 { @@ -24723,7 +25511,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore del quale si desidera conoscere il rango percentuale." ; Text [ portuguese_brazilian ] = "Der Wert, dessen prozentualer Rang bestimmt wird." ; Text [ portuguese ] = "é o valor cuja ordem percentual se deseja calcular." ; - Text [ finnish ] = "Arvon, jonka prosenttisijoitus määritetään." ; + Text [ finnish ] = "Arvo, jonka prosenttisijoitus määritetään." ; Text [ danish ] = "Den værdi hvis rang skal bestemmes." ; Text [ french ] = "La valeur dont vous voulez déterminer le rang en pourcentage." ; Text [ swedish ] = "Värdet vars procentuella rang bestäms." ; @@ -24743,6 +25531,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yüzde sýrasý belirlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor el rang del percentatge del qual s'ha de determinar."; + Text[ thai ] = "ค่าสำหรับà¸à¸³à¸«à¸™à¸”à¸à¸²à¸£à¸ˆà¸±à¸”ช่วงเปà¸à¸£à¹Œà¹€à¸‹à¹‡à¸™à¸•à¹Œ"; }; }; // -=*# Resource for function RANG #*=- @@ -24765,7 +25554,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el área de un valor en una muestra." ; Text [ english_us ] = "Returns the ranking of a value in a sample." ; Text[ chinese_simplified ] = "计算一个数值在一组数值ä¸çš„排ä½ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ðàíã çíà÷åíèÿ â âûáîðêå."; + Text[ russian ] = "Âû÷èñëÿåò ðàíã çíà÷åíèé â âûáîðêå."; Text[ polish ] = "Wyznacza pozycjê wartoœci w próbce."; Text[ japanese ] = "標本内ã®æ•°å€¤ã®é †ä½ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個數值在一組數值ä¸çš„排ä½ã€‚"; @@ -24777,6 +25566,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnek içindeki bir deðerin derecesini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el rang d'un valor d'una mostra."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸ˆà¸±à¸”ค่าà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¸±à¹‰à¸™à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; ExtraData = { @@ -24812,6 +25602,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -24821,7 +25612,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di cui si desidera ricercare il rango." ; Text [ portuguese_brazilian ] = "Der Wert, dessen Rang bestimmt wird." ; Text [ portuguese ] = "é o valor do qual deseja determinar a posição." ; - Text [ finnish ] = "Arvon, jonka sijoitus määritetään." ; + Text [ finnish ] = "Arvo, jonka sijoitus määritetään" ; Text [ danish ] = "Den værdi hvis rang skal bestemmes." ; Text [ french ] = "La valeur dont vous voulez déterminer le rang." ; Text [ swedish ] = "Värdet vars rang bestäms." ; @@ -24841,6 +25632,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Derecesi belirlenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor el rang del qual s'ha de determinar."; + Text[ thai ] = "ค่าสำหรับà¸à¸³à¸«à¸™à¸”ช่วง"; }; String 4 // Name of Parameter 2 { @@ -24858,7 +25650,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos" ; Text [ english_us ] = "Data" ; Text[ chinese_simplified ] = "ref"; - Text[ russian ] = "Ññûëêà"; + Text[ russian ] = "Äàííûå"; Text[ polish ] = "Dane"; Text[ japanese ] = "データ"; Text[ chinese_traditional ] = "ref"; @@ -24870,6 +25662,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 5 // Description of Parameter 2 { @@ -24879,7 +25672,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice di numeri nel campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é uma matriz de, ou referência a, uma lista de números." ; - Text [ finnish ] = "Otoksen tietomatriisi." ; + Text [ finnish ] = "Otoksen tietotaulukko" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen av data i stickprovet." ; @@ -24887,7 +25680,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una matriz de, o una referencia a, una lista de números." ; Text [ english_us ] = "The array of the data in the sample." ; Text[ chinese_simplified ] = "包å«ä¸€ç»„æ•°å—的数组或引用。"; - Text[ russian ] = "Ìàññèâ èëè ññûëêà íà ñïèñîê ÷èñåë (âûáîðêó)."; + Text[ russian ] = "Ìàññèâ äàííûõ â âûáîðêå."; Text[ polish ] = "Macierz danych w próbce."; Text[ japanese ] = "データãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "包å«ä¸€çµ„數å—的數組或åƒç…§ã€‚"; @@ -24899,6 +25692,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades de la mostra."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 6 // Name of Parameter 3 { @@ -24916,7 +25710,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Tipo" ; Text [ english_us ] = "Type" ; Text[ chinese_simplified ] = "order"; - Text[ russian ] = "Ïîðÿäîê"; + Text[ russian ] = "Òèï"; Text[ polish ] = "Typ"; Text[ japanese ] = "タイプ"; Text[ chinese_traditional ] = "Order"; @@ -24928,6 +25722,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Tür"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 7 // Description of Parameter 3 { @@ -24945,7 +25740,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un número que especifica cómo clasificar el argumento número." ; Text [ english_us ] = "Sequence order: 0 means ascending, 1 means descending." ; Text[ chinese_simplified ] = "指明排ä½çš„æ–¹å¼ï¼š0 = 按é™åºæŽ’ä½, 1 = 按å‡åºæŽ’ä½ã€‚"; - Text[ russian ] = "×èñëî, îïðåäåëÿþùåå ñïîñîá óïîðÿäî÷åíèÿ: 0 îçíà÷àåò â ïîðÿäêå âîçðàñòàíèÿ, 1 îçíà÷àåò â ïîðÿäêå óáûâàíèÿ."; + Text[ russian ] = "Ïîñëåäîâàòåëüíîñòü äåéñòâèé: 0 - â ïîðÿäêå âîçðàñòàíèÿ, 1 - â ïîðÿäêå óáûâàíèÿ."; Text[ polish ] = "Wyznacza kolejnoœæ pozycji liczb: 0 oznacza rosn¹co, 1 oznacza malej¹co."; Text[ japanese ] = "é †ä½ã®æ•°ãˆæ–¹ã€‚0 を指定ã™ã‚‹ã¨å¤§ãã„æ–¹ã‹ã‚‰ã€1 を指定ã™ã‚‹ã¨å°ã•ã„æ–¹ã‹ã‚‰æ•°ãˆãŸé †ä½ã€‚"; Text[ chinese_traditional ] = "指明排ä½çš„æ–¹å¼ï¹•0 = 按é™åºæŽ’ä½, 1 = 按å‡åºæŽ’ä½ã€‚"; @@ -24957,6 +25752,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Derece sýrasý: 0 artan, 1 ise azalan anlamýna gelir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Ordre de la seqüència: 0 significa ascendent, 1 significa descendent."; + Text[ thai ] = "เรียงลำดับ: 0 หมายถึงจาà¸à¸™à¹‰à¸à¸¢à¹„ปมาà¸, 1 หมายถึงจาà¸à¸¡à¸²à¸à¹„ปน้à¸à¸¢"; }; }; // -=*# Resource for function GESTUTZTMITTEL #*=- @@ -24978,7 +25774,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la media del interior del conjunto de datos." ; Text [ english_us ] = "Returns the mean of a sample without including the marginal values." ; Text[ chinese_simplified ] = "计算一组数æ®åœ¨é™¤åŽ»ä¸¤ç«¯éƒ¨åˆ†æ•°æ®åŽçš„å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ñðåäíåå çíà÷åíèå âíóòðåííåé ÷àñòè ìíîæåñòâà äàííûõ."; + Text[ russian ] = "Âîçâðàùàåò ñðåäíåå çíà÷åíèå âûáîðêè áåç âêëþ÷åíèÿ ïðåäåëüíûõ çíà÷åíèé."; Text[ polish ] = "Wyznacza wartoœæ œredni¹ z wnêtrza zbioru danych."; Text[ japanese ] = "トリム平å‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一組數據在除去兩端部份數據後的平å‡å€¼ã€‚"; @@ -24986,10 +25782,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de gemiddelde waarde van een steekproef zonder de grenswaarden."; Text[ chinese_simplified ] = "计算一组数æ®åœ¨é™¤åŽ»ä¸¤ç«¯éƒ¨åˆ†æ•°æ®åŽçš„å¹³å‡å€¼ã€‚"; Text[ greek ] = "Õðïëïãßæåé ôçí ìÝóç ôéìÞ åíüò äåßãìáôïò ÷ùñßò ôéò ïñéáêÝò ôéìÝò."; - Text[ korean ] = "ê²½ê³„ê°’ì—†ì´ ìƒ˜í”Œì˜ í‰ê· ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤"; + Text[ korean ] = "경계값 ì—†ì´ ìƒ˜í”Œì˜ í‰ê· ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Örneðin ortalamasýný, marj deðerler hariç hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la mitja d'una mostra sense incloure els valors marginals."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าเฉลี่ยขà¸à¸‡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¹‚ดยไม่รวมค่าจำà¸à¸±à¸” "; }; ExtraData = { @@ -25025,6 +25822,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -25034,7 +25832,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati del campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é a matriz ou intervalo de valores cuja média deseja calcular." ; - Text [ finnish ] = "Otoksen tietomatriisi." ; + Text [ finnish ] = "Otoksen tietotaulukko" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen av data i stickprovet." ; @@ -25042,7 +25840,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la matriz o área de valores que desea acotar y de los cuales se calculará la media." ; Text [ english_us ] = "The array of the data in the sample." ; Text[ chinese_simplified ] = "è¦æ±‚其平å‡å€¼çš„æ•°æ®ç»„。"; - Text[ russian ] = "Ìàññèâ èëè èíòåðâàë óñðåäíÿåìûõ çíà÷åíèé â âûáîðêå."; + Text[ russian ] = "Ìàññèâ äàííûõ â âûáîðêå."; Text[ polish ] = "Macierz danych w próbce."; Text[ japanese ] = "計算対象ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "è¦æ±‚其平å‡å€¼çš„數據組。"; @@ -25054,6 +25852,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les dades de la mostra."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -25083,6 +25882,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 5 // Description of Parameter 2 { @@ -25101,7 +25901,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número fraccionario de observaciones que se excluyen del cálculo." ; Text [ english_us ] = "The percentage of marginal data that is not to be taken into account." ; Text[ chinese_simplified ] = "è¦é™¤åŽ»çš„两端数æ®ç‚¹åœ¨æ•°æ®ç»„ä¸å 的百分比。"; - Text[ russian ] = "Ïðîöåíòíàÿ äîëÿ òî÷åê äàííûõ, èñêëþ÷àåìûõ èç âû÷èñëåíèé."; + Text[ russian ] = "Ïðîöåíòíàÿ äîëÿ äàííûõ, èñêëþ÷àåìûõ èç âû÷èñëåíèé."; Text[ polish ] = "Stawka procentowa danych, które nie bêd¹ uwzglêdnione."; Text[ japanese ] = "å¹³å‡å€¤ã®è¨ˆç®—ã‹ã‚‰æŽ’除ã™ã‚‹ãƒ‡ãƒ¼ã‚¿ã®å‰²åˆã€‚"; Text[ chinese_traditional ] = "è¦é™¤åŽ»çš„兩端數據點在數據組ä¸ä½”的百分比。"; @@ -25113,6 +25913,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dikkate alýnmayacak marj verilerinin yüzde oraný."; Text[ language_user1 ] = " "; Text[ catalan ] = "Percentatge de dades marginals que no s'ha de considerar."; + Text[ thai ] = "เปà¸à¸£à¹Œà¹€à¸‹à¹‡à¸™à¸•à¹Œà¸‚à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸ˆà¸³à¸à¸±à¸”ที่ไม่ถูà¸à¸„ำนึงถึง"; }; }; // -=*# Resource for function WAHRSCHBEREICH #*=- @@ -25134,7 +25935,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de que los valores de un área se encuentren entre dos límites." ; Text [ english_us ] = "Returns the discreet probability of an interval." ; Text[ chinese_simplified ] = "计算一个区域内的概率值之和。"; - Text[ russian ] = "Âîçâðàùàåò âåðîÿòíîñòü òîãî, ÷òî çíà÷åíèÿ äèàïàçîíà íàõîäÿòñÿ âíóòðè çàäàííûõ ïðåäåëîâ."; + Text[ russian ] = "Âîçâðàùàåò âåðîÿòíîñòü òîãî, ÷òî çíà÷åíèÿ äèàïàçîíà íàõîäÿòñÿ âíóòðè èíòåðâàëà."; Text[ polish ] = "Wyznacza prawdopodobieñstwo przy ci¹gu wartoœci ograniczonych z do³u i z góry."; Text[ japanese ] = "確率変数ãŒæŒ‡å®šã®ä¸‹é™ã¨ä¸Šé™ã¨ã®é–“ã«ã‚ã‚‹ã¨ãã®ç¢ºçŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算一個å€åŸŸå…§çš„概率值之和。"; @@ -25146,6 +25947,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Aralýðýn ihtiyatlý olasýlýklarýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la probabilitat discreta d'un interval."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„วามน่าจะเป็นที่รà¸à¸šà¸„à¸à¸šà¸‚à¸à¸‡à¸Šà¹ˆà¸§à¸‡ "; }; ExtraData = { @@ -25169,7 +25971,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "intervalo_x" ; Text [ english_us ] = "data" ; Text[ chinese_simplified ] = "x_range"; - Text[ russian ] = "Õ_äèàïàçîí"; + Text[ russian ] = "Äàííûå"; Text[ polish ] = "zakres_x"; Text[ japanese ] = "確率変数"; Text[ chinese_traditional ] = "x_range"; @@ -25181,6 +25983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -25190,7 +25993,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati nel campione." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten in der Stichprobe." ; Text [ portuguese ] = "é o intervalo de valores numéricos de x com probabilidades associadas." ; - Text [ finnish ] = "Tietomatriisimalli." ; + Text [ finnish ] = "Tietotaulukkomalli" ; Text [ danish ] = "Matrix af data i stikprøven." ; Text [ french ] = "La matrice des données de l'échantillon." ; Text [ swedish ] = "Matrisen av data i ett stickprov." ; @@ -25198,7 +26001,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el área de valores numéricos de x con que se asocian las probabilidades." ; Text [ english_us ] = "The sample data array." ; Text[ chinese_simplified ] = "具有å„自相应概率值的 x 数值区域。"; - Text[ russian ] = "Äèàïàçîí ÷èëîâûõ çíà÷åíèé õ, ñ êîòîðûìè ñâÿçàíû âåðîÿòíîñòè."; + Text[ russian ] = "Ìàññèâ äàííûõ âûáîðêè."; Text[ polish ] = "Macierz danych w próbce."; Text[ japanese ] = "確率変数ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "具有å„自相應概率值的 x 數值å€åŸŸã€‚"; @@ -25210,6 +26013,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki verilerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades de mostra."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -25227,7 +26031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "intervalo_probabilidad" ; Text [ english_us ] = "probability" ; Text[ chinese_simplified ] = "pro_range"; - Text[ russian ] = "Äèàïàçîí_âåðîÿò"; + Text[ russian ] = "Âåðîÿòíîñòü"; Text[ polish ] = "zakres_prawdop"; Text[ japanese ] = "確率密度"; Text[ chinese_traditional ] = "pro_range"; @@ -25239,6 +26043,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Olasýlýklar"; Text[ language_user1 ] = " "; Text[ catalan ] = "probabilitat"; + Text[ thai ] = "ความน่าจะเป็น"; }; String 5 // Description of Parameter 2 { @@ -25249,7 +26054,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice delle probabilità associate." ; Text [ portuguese_brazilian ] = "Die Matrix der dazugeh?igen Wahrscheinlichkeiten." ; Text [ portuguese ] = "é um conjunto de probabilidades associado a valores no intervalo_x." ; - Text [ finnish ] = "Todennäköisyyksien matriisi." ; + Text [ finnish ] = "Todennäköisyyksien taulukko" ; Text [ danish ] = "De tilhørende sandsynligheders matrix." ; Text [ french ] = "La matrice des probabilités associées aux données." ; Text [ swedish ] = "Matrisen för de tillhörande sannolikheterna." ; @@ -25257,7 +26062,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un conjunto de probabilidades asociado con valores en intervalo_x." ; Text [ english_us ] = "The array of the associated probabilities." ; Text[ chinese_simplified ] = "与 x_range ä¸æ•°å€¼ç›¸å¯¹åº”的一组概率值。"; - Text[ russian ] = "Ìíîæåñòâî âåðîÿòíîñòåé, ñîîòâåòñòâóþùèõ çíà÷åíèÿì â õ_äèàïàçîíå."; + Text[ russian ] = "Ìàññèâ ñîîòâåòñòâóþùèõ âåðîÿòíîñòåé."; Text[ polish ] = "Macierz z nale¿¹cymi do niej prawdopodobieñstwami."; Text[ japanese ] = "確率密度ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "與 x_range ä¸æ•¸å€¼ç›¸å°æ‡‰çš„一組概率值。"; @@ -25269,6 +26074,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýlgili olasýlýklarýn matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de les probabilitats associades."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸„วามน่าจะเป็นที่สัมพันธ์à¸à¸±à¸™"; }; String 6 // Name of Parameter 3 { @@ -25278,7 +26084,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Limite inferiore" ; Text [ portuguese_brazilian ] = "Anfang" ; Text [ portuguese ] = "Limite_inferior" ; - Text [ finnish ] = "Aloita" ; + Text [ finnish ] = "Alku" ; Text [ danish ] = "Nedre_grænse" ; Text [ french ] = "Début" ; Text [ swedish ] = "start" ; @@ -25286,7 +26092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "límite_inf" ; Text [ english_us ] = "Start" ; Text[ chinese_simplified ] = "lower_limit"; - Text[ russian ] = "Íèæíèé_ïðåäåë"; + Text[ russian ] = "A"; Text[ polish ] = "dolna_granica"; Text[ japanese ] = "下é™"; Text[ chinese_traditional ] = "lower_limit"; @@ -25298,6 +26104,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Baþlangýç"; Text[ language_user1 ] = " "; Text[ catalan ] = "Inici"; + Text[ thai ] = "เริ่มต้น"; }; String 7 // Description of Parameter 3 { @@ -25315,7 +26122,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el límite inferior del valor para el que desea una probabilidad." ; Text [ english_us ] = "The start of the value interval whose probabilities is to be totalled." ; Text[ chinese_simplified ] = "用于概率求和计算的数值下界。"; - Text[ russian ] = "Íèæíÿÿ ãðàíèöà çíà÷åíèÿ, äëÿ êîòîðîãî âû÷èñëÿåòñÿ âåðîÿòíîñòü."; + Text[ russian ] = "Íèæíÿÿ ãðàíèöà èíòåðâàëà, äëÿ êîòîðîãî âû÷èñëÿåòñÿ âåðîÿòíîñòü."; Text[ polish ] = "Opcjonalne górne ograniczenie przedzia³u wartoœci, dla którego nale¿y obliczyæ prawdopodobieñstwo."; Text[ japanese ] = "確率変数ã®ä¸‹é™ã€‚"; Text[ chinese_traditional ] = "用來概率求和計算的數值下界。"; @@ -25327,6 +26134,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Olasýlýklarý toplanacak deðer aralýðýnýn baþlangýcý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Inici de l'interval del valor les probabilitats del qual s'han de sumar."; + Text[ thai ] = "à¸à¸²à¸£à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸‚à¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚à¸à¸‡à¸„่าขà¸à¸‡à¸„วามน่าจะเป็นที่ถูà¸à¸£à¸§à¸¡à¸—ั้งหมด"; }; String 8 // Name of Parameter 4 { @@ -25344,7 +26152,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "límite_sup" ; Text [ english_us ] = "End" ; Text[ chinese_simplified ] = "upper_limit"; - Text[ russian ] = "Âåðõíèé_ïðåäåë"; + Text[ russian ] = "B"; Text[ polish ] = "górna_granica"; Text[ japanese ] = "上é™"; Text[ chinese_traditional ] = "upper_limit"; @@ -25356,6 +26164,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Son"; Text[ language_user1 ] = " "; Text[ catalan ] = "Final"; + Text[ thai ] = "สิ้นสุด"; }; String 9 // Description of Parameter 4 { @@ -25373,7 +26182,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el límite superior opcional del valor para el que desea una probabilidad." ; Text [ english_us ] = "The end of the value interval where the probabilities are to be totalled." ; Text[ chinese_simplified ] = "用于概率求和计算的数值å¯é€‰ä¸Šç•Œã€‚"; - Text[ russian ] = "Âåðõíÿÿ ãðàíèöà çíà÷åíèÿ, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü âåðîÿòíîñòü."; + Text[ russian ] = "Âåðõíÿÿ ãðàíèöà èíòåðâàëà, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü âåðîÿòíîñòü."; Text[ polish ] = "Opcjonalne dolne ograniczenie przedzia³u wartoœci, dla którego nale¿y obliczyæ prawdopodobieñstwo."; Text[ japanese ] = "確率変数ã®ä¸Šé™ã€‚"; Text[ chinese_traditional ] = "用來概率求和計算的數值å¯é¸ä¸Šç•Œã€‚"; @@ -25381,10 +26190,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het einde van het waarde-interval waarvan de kansen worden berekend."; Text[ chinese_simplified ] = "用于概率求和计算的数值å¯é€‰ä¸Šç•Œã€‚"; Text[ greek ] = "Ôï ôÝëïò ôïõ äéáóôÞìáôïò ôçò ôéìÞò, ôïõ ïðïßá èá õðïëïãéóôåß ôï óõíïëéêü Üèñïéóìá ôùí ðéèáíïôÞôùí ôïõ."; - Text[ korean ] = "í™•ë¥ ì´ ì´ê³„ë ê°’êµ¬ê°„ì˜ ë."; + Text[ korean ] = "í™•ë¥ ì´ ì´ê³„ë ê°’ êµ¬ê°„ì˜ ë"; Text[ turkish ] = "Olasýlýklarý toplanacak deðer aralýðýnýn sonu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Final de l'interval del valor on s'han de sumar les probabilitats."; + Text[ thai ] = "à¸à¸²à¸£à¸ªà¸´à¹‰à¸™à¸ªà¸¸à¸”ขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸‚à¸à¸‡à¸„่าที่ความน่าจะเป็นที่ถูà¸à¸£à¸§à¸¡à¸—ั้งหมด"; }; }; // -=*# Resource for function B #*=- @@ -25406,7 +26216,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Calcula la probabilidad de un ensayo siguiendo la distribución binomial." ; Text [ english_us ] = "Returns the probabilityof a trial result using binomial distribution." ; Text[ chinese_simplified ] = "计算二项å¼åˆ†å¸ƒçš„试验结果概率。"; - Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå âåðîÿòíîñòè ðåçóëüòàòà èñïûòàíèé ñ áèíîìèàëüíûì ðàñïðåäåëåíèåì."; + Text[ russian ] = "Âû÷èñëÿåò âåðîÿòíîñòü âûáîðêè áèíîìèàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Oblicza pojedynczy sk³adnik wartoœæ prawdopodobieñstwa dla rozk³adu dwumianowego."; Text[ japanese ] = "äºŒé …åˆ†å¸ƒã®è©¦è¡ŒãŒæˆåŠŸã™ã‚‹ç¢ºçŽ‡ã‚’è¿”ã—ã¾ã™"; Text[ chinese_traditional ] = "è¨ˆç®—äºŒé …å¼åˆ†ä½ˆçš„試驗çµæžœæ¦‚率。"; @@ -25418,6 +26228,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Binom daðýlým kullanýlan bir deney sonucunun olasýlýðýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la probabilitat d'un resultat d'avaluació utilitzant la distribució binomial."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„วามน่าจะเป็นขà¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¸—ดลà¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¹à¸šà¸šà¸—วินาม"; }; ExtraData = { @@ -25453,6 +26264,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney"; Text[ language_user1 ] = " "; Text[ catalan ] = "avaluacions"; + Text[ thai ] = "ทดลà¸à¸‡"; }; String 3 // Description of Parameter 1 { @@ -25462,7 +26274,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero dei tentativi" ; Text [ portuguese_brazilian ] = "Anzahl der Versuche" ; Text [ portuguese ] = "é o número de tentativas independentes." ; - Text [ finnish ] = "Koeyritysten määrä." ; + Text [ finnish ] = "Koeyritysten määrä" ; Text [ danish ] = "Antallet af forsøg" ; Text [ french ] = "Nombre de tentatives" ; Text [ swedish ] = "Antalet försök." ; @@ -25482,6 +26294,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre d'avaluacions."; + Text[ thai ] = "จำนวนขà¸à¸‡à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 4 // Name of Parameter 2 { @@ -25499,7 +26312,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "prob_éxito" ; Text [ english_us ] = "SP" ; Text[ chinese_simplified ] = "probability_s"; - Text[ russian ] = "ÂÅÐÎßÒÍÎÑÒÜ"; + Text[ russian ] = "ÓÑÏÂÅÐ"; Text[ polish ] = "P"; Text[ japanese ] = "確率"; Text[ chinese_traditional ] = "probability_s"; @@ -25511,6 +26324,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Olasýlýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "SP"; + Text[ thai ] = "SP"; }; String 5 // Description of Parameter 2 { @@ -25520,11 +26334,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Probabilità singola per una prova" ; Text [ portuguese_brazilian ] = "Einzelwahrscheinlichkeit eines Versuchsergebnis" ; Text [ portuguese ] = "é a probabilidade de sucesso em cada tentativa." ; - Text [ finnish ] = "Koetuloksen yksittäinen todennäköisyys." ; + Text [ finnish ] = "Koetuloksen yksittäinen todennäköisyys" ; Text [ danish ] = "Enkeltsandsynligheden for et forsøgsresultat." ; Text [ french ] = "La probabilité individuelle d'un succès de tentative." ; Text [ swedish ] = "Enskild sannolikhet för ett försöksresultat." ; - Text [ dutch ] = "Kans op succes bij een test." ; + Text [ dutch ] = "Kans op succes bij test." ; Text [ spanish ] = "cada probabilidad de un resultado de ensayo" ; Text [ english_us ] = "The individual probability of a trial result." ; Text[ chinese_simplified ] = "å•ä¸ªè¯•éªŒçš„æˆåŠŸæ¦‚率"; @@ -25533,13 +26347,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "試行ãŒ1回æˆåŠŸã™ã‚‹ç¢ºçŽ‡ã€‚"; Text[ chinese_traditional ] = "單個試驗的æˆåŠŸæ¦‚率"; Text[ arabic ] = "ÇÍÊãÇá ÇáäÌÇÍ Ýí ßá ÊÌÑÈÉ."; - Text[ dutch ] = "Kans op succes bij een test."; + Text[ dutch ] = "Kans op succes bij test."; Text[ chinese_simplified ] = "å•ä¸ªè¯•éªŒçš„æˆåŠŸæ¦‚率"; Text[ greek ] = "ÌåìïíùìÝíç ðéèáíüôçôá åíüò áðïôåëÝóìáôïò äïêéìÞò"; Text[ korean ] = "ì‹¤í—˜ê²°ê³¼ì˜ ê°œë³„ í™•ë¥ "; Text[ turkish ] = "Deney sonucunun bireysel olasýlýðý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Probabilitat individual d'un resultat d'avaluació."; + Text[ thai ] = "ความน่าจะเป็นเฉพาะขà¸à¸‡à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¸—ี่ทดลà¸à¸‡"; }; String 6 // Name of Parameter 3 { @@ -25557,7 +26372,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "límite_inf" ; Text [ english_us ] = "T_1" ; Text[ chinese_simplified ] = "T_1"; - Text[ russian ] = "T_1"; + Text[ russian ] = "È_1"; Text[ polish ] = "T_1"; Text[ japanese ] = "下é™"; Text[ chinese_traditional ] = "T_1"; @@ -25569,6 +26384,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "T_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "T_1"; + Text[ thai ] = "T_1"; }; String 7 // Description of Parameter 3 { @@ -25578,7 +26394,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Limite inferiore del numero di tentativi" ; Text [ portuguese_brazilian ] = "Untere Schranke der Versuchsanzahl." ; Text [ portuguese ] = "é o número inferior da possibilidade de tentativas." ; - Text [ finnish ] = "Koeyritysten vähimmäismäärä." ; + Text [ finnish ] = "Koeyritysten alaraja" ; Text [ danish ] = "Nedre grænse for antal forsøg." ; Text [ french ] = "Limite inférieure du nombre de tentatives." ; Text [ swedish ] = "Undre gräns för försöksantal." ; @@ -25598,6 +26414,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney sayýsý alt limiti."; Text[ language_user1 ] = " "; Text[ catalan ] = "Límit inferior per al nombre d'avaluacions."; + Text[ thai ] = "ขีดจำà¸à¸±à¸”ล่างสำหรับจำนวนขà¸à¸‡à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 8 // Name of Parameter 4 { @@ -25615,7 +26432,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "límite_sup" ; Text [ english_us ] = "T_2" ; Text[ chinese_simplified ] = "T_2"; - Text[ russian ] = "T_2"; + Text[ russian ] = "È_2"; Text[ polish ] = "T_2"; Text[ japanese ] = "上é™"; Text[ chinese_traditional ] = "T_2"; @@ -25627,6 +26444,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "T_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "T_2"; + Text[ thai ] = "T_2"; }; String 9 // Description of Parameter 4 { @@ -25636,7 +26454,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Limite superiore del numero di tentativi" ; Text [ portuguese_brazilian ] = "Obere Schranke der Versuchsanzahl." ; Text [ portuguese ] = "é o número superior da possibilidade de tentativas." ; - Text [ finnish ] = "Koeyritysten enimmäismäärä." ; + Text [ finnish ] = "Koeyritysten yläraja" ; Text [ danish ] = "Øvre grænse for antal forsøg." ; Text [ french ] = "Limite supérieure du nombre de tentatives." ; Text [ swedish ] = "Övre gräns för försöksantal." ; @@ -25656,6 +26474,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney sayýsý üst limiti."; Text[ language_user1 ] = " "; Text[ catalan ] = "Límit superior per al nombre d'avaluacions."; + Text[ thai ] = "ขีดจำà¸à¸±à¸”บนขà¸à¸‡à¸ˆà¸³à¸™à¸§à¸™à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; }; // -=*# Resource for function PHI #*=- @@ -25669,7 +26488,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce i valori della funzione di distribuzione per una distribuzione normale standard." ; Text [ portuguese_brazilian ] = "Werte der Verteilungsfunktion zur Standardnormalverteilung" ; Text [ portuguese ] = "Devolve os valores da função de distribuição para uma distribuição padrão normal." ; - Text [ finnish ] = "Normaalijakauman jakaumafunktion arvot." ; + Text [ finnish ] = "Normaalijakauman jakaumafunktion arvot" ; Text [ danish ] = "Værdier for standardnormalfordelingen" ; Text [ french ] = "Valeurs de la fonction de distribution pour la distribution normale standard." ; Text [ swedish ] = "Värdet av fördelningsfunktionen för standardnormalfördelningen." ; @@ -25677,7 +26496,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve los valores de la función de distribución para una distribución normal predeterminada" ; Text [ english_us ] = "Values of the distribution function for a standard normal distribution." ; Text[ chinese_simplified ] = "æ ‡å‡†æ£æ€åˆ†å¸ƒçš„分布函数值。"; - Text[ russian ] = "Çíà÷åíèÿ ôóíêöèè ðàñïðåäåëåíèÿ äëÿ ñòàíäàðòíîãî íîðìàëüíîãî ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèÿ ôóíêöèè ðàñïðåäåëåíèÿ äëÿ ñòàíäàðòíîãî íîðìàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wartoœci funkcji gêstoœci dla standardowego rozk³adu normalnego."; Text[ japanese ] = "標準æ£è¦åˆ†å¸ƒã®åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "標準æ£æ…‹åˆ†ä½ˆçš„分佈函數值。"; @@ -25689,6 +26508,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Daðýtým fonksiyonunun, standart normal daðýtým ile ilgili deðerleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la funció de distribució per a una distribució normal estàndard."; + Text[ thai ] = "ค่าขà¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¸›à¸à¸•à¸´à¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; ExtraData = { @@ -25724,6 +26544,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -25733,7 +26554,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore per il quale calcolare la distribuzione normale standard." ; Text [ portuguese_brazilian ] = "Der Wert, zu dem die Standardnormalverteilung berechnet wird." ; Text [ portuguese ] = "é o valor para o qual deseja calcular a distribuição padrão normal." ; - Text [ finnish ] = "Arvo, jonka normaalijakauma (keskiarvo 0, vakiopoikkeama 1) lasketaan." ; + Text [ finnish ] = "Arvo, jonka normaalijakauma lasketaan." ; Text [ danish ] = "Den værdi som standardnormalfordelingen skal beregnes for." ; Text [ french ] = "La valeur pour laquelle vous voulez calculer la distribution normale standard." ; Text [ swedish ] = "Värdet för vilket standardnormalfördelningen beräknas." ; @@ -25753,6 +26574,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Standart normal daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució normal estàndard del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¸›à¸à¸•à¸´à¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; }; // -=*# Resource for function GAUSS #*=- @@ -25770,7 +26592,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Integralværdier for standardnormalfordelingen." ; Text [ french ] = "Renvoie les valeurs de l'intégrale de la distribution normale standard." ; Text [ swedish ] = "Integralvärdet av standardnormalfördelningen." ; - Text [ dutch ] = "Integrale waarden van de standaardnormale verdeling." ; + Text [ dutch ] = "Integrale waarden van de standaard normale verdeling." ; Text [ spanish ] = "Devuelve el valor de la integral de la distribución normal predeterminada." ; Text [ english_us ] = "Returns the integral values of the standard normal cumulative distribution." ; Text[ chinese_simplified ] = "æ ‡å‡†æ£æ€åˆ†å¸ƒçš„积分值。"; @@ -25779,13 +26601,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "標準æ£è¦åˆ†å¸ƒã®ç©åˆ†å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "標準æ£æ…‹åˆ†ä½ˆçš„ç©åˆ†å€¼ã€‚"; Text[ arabic ] = "ÊÍÓÈ ÇáÊæÒíÚ ÇáÊÑÇßãí ÇáØÈíÚí ÇáÞíÇÓí."; - Text[ dutch ] = "Integrale waarden van de standaardnormale verdeling."; + Text[ dutch ] = "Integrale waarden van de standaard normale verdeling."; Text[ chinese_simplified ] = "æ ‡å‡†æ£æ€åˆ†å¸ƒçš„积分值。"; Text[ greek ] = "ÔéìÝò ïëïêëçñþìáôïò ôçò ôõðéêÞò êáíïíéêÞò êáôáíïìÞò."; Text[ korean ] = "표준 ì •ê·œ 분í¬ì˜ ì 분값"; Text[ turkish ] = "Standart normal sapmanýn integral deðerleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna els valors integrals de la distribució acumulativa normal estàndard."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าà¸à¸´à¸™à¸—ิเà¸à¸£à¸•à¸‚à¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¸ªà¸°à¸ªà¸¡à¸›à¸à¸•à¸´à¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; ExtraData = { @@ -25821,6 +26644,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -25838,7 +26662,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor para el cual se desea calcular el valor de la integral de la distribución normal predeterminada" ; Text [ english_us ] = "The value for which the integral value of the standard normal distribution is to be calculated." ; Text[ chinese_simplified ] = "ç”¨äºŽè®¡ç®—æ ‡å‡†æ£æ€åˆ†å¸ƒç§¯åˆ†å€¼çš„数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî íåîáõîäèìî âû÷èñëèòü èíòåãðàëüíîå çíà÷åíèå ñòàíäàðòíîãî íîðìàëüíîãî ðàñïðåäàëåíèÿ."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî íåîáõîäèìî âû÷èñëèòü èíòåãðàëüíîå çíà÷åíèå ñòàíäàðòíîãî íîðìàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony standardowy rozk³ad normalny."; Text[ japanese ] = "標準æ£è¦åˆ†å¸ƒã®ç©åˆ†å€¤ã‚’求ã‚る数値。"; Text[ chinese_traditional ] = "用於計算標準æ£æ…‹åˆ†ä½ˆç©åˆ†å€¼çš„數值。"; @@ -25850,6 +26674,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Standart normal sapmanýn integral deðeri hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor el valor integral de la distribució normal estàndard del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณค่าà¸à¸´à¸™à¸—ิเà¸à¸£à¸•à¸‚à¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¸›à¸à¸•à¸´à¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; }; // -=*# Resource for function FISHER #*=- @@ -25879,10 +26704,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de Fisher-Transformatie."; Text[ chinese_simplified ] = "计算 Fisher å˜æ¢ã€‚"; Text[ greek ] = "Õðïëïãéóìüò ôïõ ìåôáó÷çìáôéóìïý Fisher."; - Text[ korean ] = "Fisher ë³€í™˜ì˜ ê³„ì‚°"; + Text[ korean ] = "Fisher ë³€í™˜ì„ ê³„ì‚°"; Text[ turkish ] = "Fisher transformasyonunun hesaplanmasý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la transformació de Fisher."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸ªà¸±à¸šà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸šà¸š Fisher "; }; ExtraData = { @@ -25918,6 +26744,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -25927,7 +26754,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "è un valore numerico di cui si desidera la trasformazione." ; Text [ portuguese_brazilian ] = "Der Wert, der transformiert wird (-1 < WERT < 1)." ; Text [ portuguese ] = "é um valor numérico a ser transformado." ; - Text [ finnish ] = "Muunnettava arvo (-1 < arvo < 1)." ; + Text [ finnish ] = "Muunnettava arvo (-1 < arvo < 1)" ; Text [ danish ] = "Værdien som skal transformeres (-1 < VÆRDI < 1)." ; Text [ french ] = "La valeur pour laquelle vous voulez effectuer la transformation (-1 < VALEUR < 1)." ; Text [ swedish ] = "Värdet som transformeras. (-1 < VÄRDE < 1)" ; @@ -25947,6 +26774,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dönüþtürülecek deðer (-1 < DEÐER < 1)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de transformar (-1 < VALOR <1)."; + Text[ thai ] = "ค่าที่ถูà¸à¸ªà¸±à¸šà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™ (-1 < ค่า < 1)"; }; }; // -=*# Resource for function FISHERINV #*=- @@ -25980,6 +26808,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters Fisher transformasyonunun hesaplanmasý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la inversa de la transformació de Fisher."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸ªà¸±à¸šà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸šà¸š Fisher "; }; ExtraData = { @@ -26015,6 +26844,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -26025,11 +26855,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore per il quale si desidera eseguire l'inversa della trasformazione." ; Text [ portuguese_brazilian ] = "Der Wert, der r?ktransformiert wird." ; Text [ portuguese ] = "é o valor para o qual se deseja o inverso da transformação." ; - Text [ finnish ] = "Takaisin muunnettava arvo." ; + Text [ finnish ] = "Takaisin muunnettava arvo" ; Text [ danish ] = "Værdien som den inverse transformation skal udføres på." ; Text [ french ] = "La valeur pour laquelle vous voulez effectuer la transformation inverse." ; Text [ swedish ] = "Värdet som återtransformeras." ; - Text [ dutch ] = "De waarde waarop inverse rransformatie toegepast wordt." ; + Text [ dutch ] = "De waarde waarop inverse transformatie toegepast wordt." ; Text [ spanish ] = "es el valor al que se le realizará la transformación inversa." ; Text [ english_us ] = "The value that is to be transformed back." ; Text[ chinese_simplified ] = "需è¦è¿›è¡Œé€†å˜æ¢çš„数值。"; @@ -26038,13 +26868,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "フィッシャーã®z変æ›å€¤ã€‚"; Text[ chinese_traditional ] = "需è¦é€²è¡Œé€†è®Šæ›çš„數值。"; Text[ arabic ] = "ÇáÞíãÉ ÇáÊí ÊÑíÏ ÊÍæíáåÇ ÚßÓíÇð."; - Text[ dutch ] = "De waarde waarop inverse rransformatie toegepast wordt."; + Text[ dutch ] = "De waarde waarop inverse transformatie toegepast wordt."; Text[ chinese_simplified ] = "需è¦è¿›è¡Œé€†å˜æ¢çš„数值。"; Text[ greek ] = "Ç ôéìÞ ãéá ôçí ïðïßá èá åêôåëåóôåß ç áíôéóôñïöÞ ôïõ ìåôáó÷çìáôéóìïý."; Text[ korean ] = "재변형ë ê°’"; Text[ turkish ] = "Geriye dönüþtürülen deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de tornar a transformar."; + Text[ thai ] = "ค่าที่ถูà¸à¸ªà¸±à¸šà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸à¸¥à¸±à¸š"; }; }; // -=*# Resource for function BINOMVERT #*=- @@ -26058,7 +26889,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione binomiale." ; Text [ portuguese_brazilian ] = "Werte der Binomialverteilung." ; Text [ portuguese ] = "Calcula a probabilidade de uma variável aleatória seguindo a distribuição binomial." ; - Text [ finnish ] = "Binomijakauman arvot." ; + Text [ finnish ] = "Binomijakauman arvot" ; Text [ danish ] = "Værdier for binomialfordelingen" ; Text [ french ] = "Valeurs la distribution binomiale." ; Text [ swedish ] = "Binomialfördelningens värden." ; @@ -26066,7 +26897,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria discreta siguiendo una distribución binomial." ; Text [ english_us ] = "Values of the binomial distribution." ; Text[ chinese_simplified ] = "二项å¼åˆ†å¸ƒçš„概率值。"; - Text[ russian ] = "Âîçâðàùàåò îòäåëüíîå çíà÷åíèå áèíîìèàëüíîãî ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò âåðîÿòíîñòü äëÿ îòäåëüíîãî ýëåìåíòà áèíîìèàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza rozk³ad dwumianowy."; Text[ japanese ] = "äºŒé …åˆ†å¸ƒã®ç¢ºçŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "äºŒé …å¼åˆ†ä½ˆçš„概率值。"; @@ -26078,6 +26909,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Binom daðýtýmýnýn deðerleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució binomial."; + Text[ thai ] = "ค่าขà¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¹à¸šà¸šà¸—วินาม"; }; ExtraData = { @@ -26112,7 +26944,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "X"; Text[ turkish ] = "X"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "X"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -26122,7 +26955,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero dei successi in prove." ; Text [ portuguese_brazilian ] = "Die Anzahl der Erfolge in der Versuchsreihe." ; Text [ portuguese ] = "é o número de tentativas bem sucedidas." ; - Text [ finnish ] = "Onnistumisten määrä koeyrityksissä." ; + Text [ finnish ] = "Onnistumisten määrä koeyrityksissä" ; Text [ danish ] = "Antallet af gunstige udfald af forsøgene." ; Text [ french ] = "Le nombre de succès dans la série de tentatives." ; Text [ swedish ] = "Antalet framgångar i en rad försök." ; @@ -26130,7 +26963,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de éxitos en los ensayos." ; Text [ english_us ] = "The number of successes in a series of trials." ; Text[ chinese_simplified ] = "试验系列的æˆåŠŸæ¬¡æ•°ã€‚"; - Text[ russian ] = "Êîëè÷åñòâî óñïåøíûõ èñïûòàíèé."; + Text[ russian ] = "Êîëè÷åñòâî óñïåøíûõ ïîñëåäîâàòåëüíîñòåé èñïûòàíèé."; Text[ polish ] = "Liczba sukcesów podczas prób."; Text[ japanese ] = "試行回数ã«å«ã¾ã‚Œã‚‹æˆåŠŸã®å›žæ•°ã€‚"; Text[ chinese_traditional ] = "試驗系列的æˆåŠŸæ¬¡æ•¸ã€‚"; @@ -26142,6 +26975,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney dizisindeki baþarý sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre d'èxits en una sèrie d'avaluacions."; + Text[ thai ] = "จำนวนความสำเร็จในลำดับขà¸à¸‡à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 4 // Name of Parameter 2 { @@ -26171,6 +27005,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney"; Text[ language_user1 ] = " "; Text[ catalan ] = "avaluacions"; + Text[ thai ] = "à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 5 // Description of Parameter 2 { @@ -26180,7 +27015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero di prove indipendenti." ; Text [ portuguese_brazilian ] = "Die Gesamtanzahl der Versuche." ; Text [ portuguese ] = "é o número de tentativas independentes." ; - Text [ finnish ] = "Koeyritysten kokonaismäärä." ; + Text [ finnish ] = "Koeyritysten kokonaismäärä" ; Text [ danish ] = "Det samlede antal forsøg." ; Text [ french ] = "Le nombre de tentatives." ; Text [ swedish ] = "Det totala antalet försök." ; @@ -26188,7 +27023,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de ensayos independientes." ; Text [ english_us ] = "The total number of trials." ; Text[ chinese_simplified ] = "试验总次数。"; - Text[ russian ] = "×èñëî íåçàâèñèìûõ èñïûòàíèé."; + Text[ russian ] = "Îáùåå ÷èñëî èñïûòàíèé."; Text[ polish ] = "Ogólna liczba prób."; Text[ japanese ] = "独立試行ã®å›žæ•°ã€‚"; Text[ chinese_traditional ] = "試驗總次數。"; @@ -26200,6 +27035,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Toplam deney sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre total d'avaluacions."; + Text[ thai ] = "จำนวนทั้งหมดขà¸à¸‡à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 6 // Name of Parameter 3 { @@ -26217,7 +27053,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "prob_éxito" ; Text [ english_us ] = "SP" ; Text[ chinese_simplified ] = "probabiltiy_s"; - Text[ russian ] = "ÂÅÐÎßÒÍÎÑÒÜ"; + Text[ russian ] = "ÓÑÏÂÅÐ"; Text[ polish ] = "prawdopodob_s"; Text[ japanese ] = "æ¯æ¯”率"; Text[ chinese_traditional ] = "probabiltiy_s"; @@ -26229,6 +27065,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Olasýlýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "SP"; + Text[ thai ] = "SP"; }; String 7 // Description of Parameter 3 { @@ -26238,7 +27075,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Probabilità di successo per ciascuna prova." ; Text [ portuguese_brazilian ] = "Die Erfolgswahrscheinlichkeit eines Versuchs." ; Text [ portuguese ] = "é a probabilidade de sucesso em cada tentativa." ; - Text [ finnish ] = "Koeyrityksen onnistumistodennäköisyys." ; + Text [ finnish ] = "Koeyrityksen onnistumistodennäköisyys" ; Text [ danish ] = "Sandsynligheden for et gunstigt udfald." ; Text [ french ] = "La probabilité de succès d'une tentative." ; Text [ swedish ] = "Sannolikheten att ett försök lyckas." ; @@ -26258,6 +27095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deneyin baþarý olasýlýðý."; Text[ language_user1 ] = " "; Text[ catalan ] = "La probabilitat d'èxit d'una avaluació."; + Text[ thai ] = "ความน่าจะเป็นในความสำเร็จขà¸à¸‡à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 8 // Name of Parameter 4 { @@ -26275,7 +27113,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "acumulado" ; Text [ english_us ] = "C" ; Text[ chinese_simplified ] = "cumulative"; - Text[ russian ] = "Èíòåãðàëüíûé"; + Text[ russian ] = "È"; Text[ polish ] = "Skumulowany"; Text[ japanese ] = "関数形å¼"; Text[ chinese_traditional ] = "cumulative"; @@ -26287,6 +27125,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ turkish ] = "K"; Text[ catalan ] = "C"; + Text[ thai ] = "C"; }; String 9 // Description of Parameter 4 { @@ -26296,7 +27135,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore = 0 calcola la probabilità individuale, se = 1 calcola la probabilità cumulativa." ; Text [ portuguese_brazilian ] = "Kumuliert. K = 0 berechnet die Einzel-, K = 1 die kumulierte Wahrscheinlichkeit." ; Text [ portuguese ] = "é um valor lógico que determina a forma da função. 1 devolve a densidade de probabilidade, 0 devolve a função cumulativa." ; - Text [ finnish ] = "Kumuloitu. C = 0 laskee yksittäisen todennäköisyyden, C = 1 kumulatiivisen todennäköisyyden." ; + Text [ finnish ] = "Kumuloitu C = 0 laskee yksittäisen todennäköisyyden, C = 1 kumulatiivisen todennäköisyyden." ; Text [ danish ] = "Kumulativ. K = 0 beregner enkeltsandsynligheden, K = 1 den kumulerede sandsynlighed." ; Text [ french ] = "Cumulative. C = 0 calcule la probabilité individuelle, C = 1 la probabilité cumulative." ; Text [ swedish ] = "Kumulerat. K = 0 beräknar den enskilda, K = 1 den kumulerade sannolikheten." ; @@ -26304,7 +27143,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un valor lógico que determina la forma de la función. 1 devuelve la densidad de probabilidad, 0 devuelve la función acumulada." ; Text [ english_us ] = "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability." ; Text[ chinese_simplified ] = "逻辑值。K = 0 计算概率密度，K = 1 计算累积概率。"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, îïðåäåëÿþùåå âèä ôóíêöèè: èíòåãðàëüíàÿ ôóíêöèÿ ðàñïðåäåëåíèÿ (1) èëè âåñîâàÿ ôóíêöèÿ ðàñïðåäåëåíèÿ (0)."; + Text[ russian ] = "Èíòåãðàëüíûé. È=0 âû÷èñëÿåò ôóíêöèþ ïëîòíîñòè, È=1 - ðàñïðåäåëåíèå."; Text[ polish ] = "Skumulowany. K = 0 oblicza pojedyncze prawdopodobieñstwo, K = 1 skumulowane prawdopodobieñstwo."; Text[ japanese ] = "é–¢æ•°å½¢å¼ 0 ã¯ç¢ºçŽ‡å¯†åº¦é–¢æ•°ã€1 ã¯ç´¯ç©åˆ†å¸ƒé–¢æ•°ã€‚"; Text[ chinese_traditional ] = "é‚輯值。K = 0 表示計算概率密度ï¹K = 1 表示計算累ç©æ¦‚率。"; @@ -26316,6 +27155,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kümülasyon. K = 0 bireysel, K = 1 ise birikmiþ olasýlýðý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Acumulat. C=0 calcula la probabilitat individual; C=1, la probabilitat acumulada."; + Text[ thai ] = "สะสม C=0 คำนวณความน่าจะเป็นเฉพาะ, C=1 ความน่าจะเป็นà¹à¸šà¸šà¸ªà¸°à¸ªà¸¡"; }; }; // -=*# Resource for function NEGBINOMVERT #*=- @@ -26329,7 +27169,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione binomiale negativa." ; Text [ portuguese_brazilian ] = "Werte der negativen Binomialverteilung." ; Text [ portuguese ] = "Devolve a distribuição binomial negativa." ; - Text [ finnish ] = "Negatiivisen binomijakauman arvot." ; + Text [ finnish ] = "Negatiivisen binomijakauman arvot" ; Text [ danish ] = "Værdier for den negative binomialfordeling" ; Text [ french ] = "Valeurs de la distribution binomiale négative." ; Text [ swedish ] = "Värden för den negativa binomialfördelningen." ; @@ -26337,7 +27177,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria discreta siguiendo una distribución binomial negativa." ; Text [ english_us ] = "Values of the negative binomial distribution." ; Text[ chinese_simplified ] = "负二项å¼åˆ†å¸ƒã€‚"; - Text[ russian ] = "Âîçâðàùàåò îòðèöàòåëüíîå áèíîìèàëüíîå ðàñïðåäåëåíèå."; + Text[ russian ] = "Âû÷èñëÿåò îòðèöàòåëüíîå áèíîìèàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wyznacza rozk³ad dwumianowy przeciwny."; Text[ japanese ] = "è² ã®äºŒé …分布ã®å€¤ã€‚"; Text[ chinese_traditional ] = "è² äºŒé …å¼åˆ†ä½ˆã€‚"; @@ -26349,6 +27189,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Negatif binom daðýtýmý deðerleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució binomial negativa."; + Text[ thai ] = "ค่าลบขà¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¹à¸šà¸šà¸—วินาม"; }; ExtraData = { @@ -26384,6 +27225,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X"; Text[ language_user1 ] = " "; Text[ catalan ] = "X"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -26394,7 +27236,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero degli insuccessi." ; Text [ portuguese_brazilian ] = "Die Anzahl der Mi?erfolge in der Versuchsreihe." ; Text [ portuguese ] = "é o número de insucessos na série de tentativas." ; - Text [ finnish ] = "Koealueen virhemäärä." ; + Text [ finnish ] = "Koealueen virhemäärä" ; Text [ danish ] = "Antallet af mislykkede forsøg." ; Text [ french ] = "Le nombre d'échecs dans une série de tentatives." ; Text [ swedish ] = "Antalet misslyckanden i en rad försök." ; @@ -26414,6 +27256,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deneme aralýðýndaki baþarýsýzlýklarýn sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de fallades en l'àrea d'avaluació."; + Text[ thai ] = "ตัวเลขขà¸à¸‡à¸„วามล้มเหลวในช่วงà¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 4 // Name of Parameter 2 { @@ -26431,7 +27274,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "núm_éxitos" ; Text [ english_us ] = "R" ; Text[ chinese_simplified ] = "number_s"; - Text[ russian ] = "×èñëî_s"; + Text[ russian ] = "R"; Text[ polish ] = "liczba_s"; Text[ japanese ] = "æˆåŠŸæ•°"; Text[ chinese_traditional ] = "number_s"; @@ -26443,6 +27286,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "R"; Text[ language_user1 ] = " "; Text[ catalan ] = "R"; + Text[ thai ] = "R"; }; String 5 // Description of Parameter 2 { @@ -26452,7 +27296,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero dei successi nella serie." ; Text [ portuguese_brazilian ] = "Die Anzahl der Erfolge in der Versuchsreihe." ; Text [ portuguese ] = "é o número de sucessos na série de tentativas." ; - Text [ finnish ] = "Koeyritysten onnistumisten määrä." ; + Text [ finnish ] = "Koeyritysten onnistumisten määrä" ; Text [ danish ] = "Antallet af gunstige udfald." ; Text [ french ] = "Le nombre de succès dans la série de tentatives." ; Text [ swedish ] = "Antalet framgångar i en rad försök." ; @@ -26460,7 +27304,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de éxitos." ; Text [ english_us ] = "The number of successes in the trial sequence." ; Text[ chinese_simplified ] = "试验系统的æˆåŠŸæ¬¡æ•°ã€‚"; - Text[ russian ] = "Êîëè÷åñòâî óäà÷íûõ èñïûòàíèé."; + Text[ russian ] = "Êîëè÷åñòâî óñïåøíûõ ïîñëåäîâàòåëüíîñòåé èñïûòàíèé."; Text[ polish ] = "Liczba sukcesów w serii prób."; Text[ japanese ] = "試行ãŒæˆåŠŸã™ã‚‹å›žæ•°ã€‚"; Text[ chinese_traditional ] = "試驗系列的æˆåŠŸæ¬¡æ•¸ã€‚"; @@ -26472,6 +27316,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney dizisindeki baþarý sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre d'èxits en la seqüència d'avaluació."; + Text[ thai ] = "จำนวนขà¸à¸‡à¸„วามสำเร็จในลำดับà¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 6 // Name of Parameter 3 { @@ -26489,7 +27334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "prob_éxito" ; Text [ english_us ] = "SP" ; Text[ chinese_simplified ] = "probability_s"; - Text[ russian ] = "ÂÅÐÎßÒÍÎÑÒÜ"; + Text[ russian ] = "ÓÑÏÂÅÐ"; Text[ polish ] = "prawdopodob_s"; Text[ japanese ] = "æˆåŠŸçŽ‡"; Text[ chinese_traditional ] = "probability_s"; @@ -26501,6 +27346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Olasýlýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "SP"; + Text[ thai ] = "SP"; }; String 7 // Description of Parameter 3 { @@ -26510,7 +27356,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La probabilità di successo per ogni singola prova." ; Text [ portuguese_brazilian ] = "Die Erfolgswahrscheinlichkeit eines Versuchs." ; Text [ portuguese ] = "é a probabilidade de obter um sucesso." ; - Text [ finnish ] = "Koeyrityksen onnistumistodennäköisyys." ; + Text [ finnish ] = "Koeyrityksen onnistumistodennäköisyys" ; Text [ danish ] = "Sandsynligheden for et gunstigt udfald." ; Text [ french ] = "La probabilité de succès d'une tentative." ; Text [ swedish ] = "Sannolikheten att ett försök lyckas." ; @@ -26530,6 +27376,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deneyin baþarý olasýlýðý."; Text[ language_user1 ] = " "; Text[ catalan ] = "La probabilitat d'èxit d'una avaluació."; + Text[ thai ] = "ความน่าจะเป็นขà¸à¸‡à¸„วามสำเร็จขà¸à¸‡à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; }; // -=*# Resource for function KRITBINOM #*=- @@ -26543,26 +27390,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce gli argomenti limite della distribuzione binomiale." ; Text [ portuguese_brazilian ] = "Grenzargumente der Binomialverteilung." ; Text [ portuguese ] = "Devolve o menor valor, sendo a distribuição binomial cumulativa maior ou igual ao valor de critério." ; - Text [ finnish ] = "Binomijakauman raja-arvot." ; + Text [ finnish ] = "Binomijakauman raja-arvot" ; Text [ danish ] = "Binomialfordelingens grænseargumenter." ; Text [ french ] = "Arguments limites de la distribution binomiale." ; Text [ swedish ] = "Binomialfördelningens gränsargument." ; - Text [ dutch ] = "Berekent de grenswaarden voor een binomiale verdeling." ; - Text [ spanish ] = "Devuelve el menor valor cuya distribución binomial acumulativa es menor o igual que un valor de criterio." ; + Text [ dutch ] = "De grenswaarden voor een binomiale verdeling." ; + Text [ spanish ] = "Argumentos límites de la distribución binomial." ; Text [ english_us ] = "Border arguments of the binomial distribution." ; Text[ chinese_simplified ] = "二项å¼åˆ†å¸ƒçš„最å°å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò íàèìåíüøåå çíà÷åíèå, äëÿ êîòîðîãî áèíîìèàëüíàÿ ôóíêöèÿ ðàñïðåäåëíèÿ áîëüøå èëè ðàâíà çàäàííãî çíà÷åíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò ïðåäåëüíûå àðãóìåíòû áèíîìèàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Podaje najmniejsz¹ wartoœæ, dla której ³¹czny rozk³ad dwumianowy jest wiêkszy lub równy wartoœci krytycznej."; Text[ japanese ] = "äºŒé …åˆ†å¸ƒã®åˆ†å¸ƒé–¢æ•°ã®å€¤ãŒåŸºæº–値以上ã«ãªã‚‹æœ€å°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "äºŒé …å¼åˆ†ä½ˆçš„最å°å€¼ã€‚"; Text[ arabic ] = "ÇáæÓÇÆØ ÇáÍÏæÏíÉ ááÊæÒíÚ Ðí ÇáÍÏíä."; - Text[ dutch ] = "Berekent de grenswaarden voor een binomiale verdeling."; + Text[ dutch ] = "De grenswaarden voor een binomiale verdeling."; Text[ chinese_simplified ] = "二项å¼åˆ†å¸ƒçš„最å°å€¼ã€‚"; Text[ greek ] = "ÏñéáêÜ ïñßóìáôá ôçò äéùíõìéêÞò êáôáíïìÞò"; Text[ korean ] = "ì´í• 분í¬ì˜ 경계 ë…립 변수입니다."; Text[ turkish ] = "Binom daðýtýmýnýn sýnýr deðiþkenleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Arguments límit de la distribució binomial."; + Text[ thai ] = "à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¸™à¸•à¹Œà¹€à¸ªà¹‰à¸™à¸‚à¸à¸šà¸‚à¸à¸‡à¸à¸²à¸£à¹à¸ˆà¸à¹à¸ˆà¸‡à¹à¸šà¸šà¸—วินาม"; }; ExtraData = { @@ -26598,6 +27446,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deney"; Text[ language_user1 ] = " "; Text[ catalan ] = "avaluacions"; + Text[ thai ] = "à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 3 // Description of Parameter 1 { @@ -26607,7 +27456,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero complessivo delle prove." ; Text [ portuguese_brazilian ] = "Die Gesamtanzahl der Versuche." ; Text [ portuguese ] = "é o número total de tentativas." ; - Text [ finnish ] = "Koeyritysten kokonaismäärä." ; + Text [ finnish ] = "Koeyritysten kokonaismäärä" ; Text [ danish ] = "Det samlede antal forsøg." ; Text [ french ] = "Le nombre de tentatives." ; Text [ swedish ] = "Det totala antalet försök." ; @@ -26615,7 +27464,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número total de intentos." ; Text [ english_us ] = "The total number of trials." ; Text[ chinese_simplified ] = "试验次数。"; - Text[ russian ] = "×èñëî èñïûòàíèé Áåðíóëëè."; + Text[ russian ] = "Îáùåå ÷èñëî èñïûòàíèé."; Text[ polish ] = "Liczba prób Bernoulli'ego."; Text[ japanese ] = "試行ã®å›žæ•°ã€‚"; Text[ chinese_traditional ] = "試驗次數。"; @@ -26627,6 +27476,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Toplam deney sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre total d'avaluacions."; + Text[ thai ] = "จำนวนà¸à¸²à¸£à¸—ดลà¸à¸‡à¸—ั้งหมด"; }; String 4 // Name of Parameter 2 { @@ -26644,7 +27494,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "prob_éxito" ; Text [ english_us ] = "SP" ; Text[ chinese_simplified ] = "probability_s"; - Text[ russian ] = "ÂÅÐÎßÒÍÎÑÒÜ"; + Text[ russian ] = "ÓÑÏÂÅÐ"; Text[ polish ] = "P"; Text[ japanese ] = "æˆåŠŸçŽ‡"; Text[ chinese_traditional ] = "probability_s"; @@ -26656,6 +27506,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Olasýlýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "SP"; + Text[ thai ] = "SP"; }; String 5 // Description of Parameter 2 { @@ -26665,7 +27516,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Probabilità di un successo per ogni singola prova." ; Text [ portuguese_brazilian ] = "Die Erfolgswahrscheinlichkeit eines Versuchs." ; Text [ portuguese ] = "é a probabilidade de sucesso de uma tentativa." ; - Text [ finnish ] = "Koeyrityksen onnistumistodennäköisyys." ; + Text [ finnish ] = "Koeyrityksen onnistumistodennäköisyys" ; Text [ danish ] = "Sandsynligheden for et gunstigt udfald." ; Text [ french ] = "La probabilité de succès d'une tentative." ; Text [ swedish ] = "Sannolikheten att ett försök skall lyckas." ; @@ -26673,7 +27524,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la probabilidad de éxito en cada ensayo." ; Text [ english_us ] = "The success probability of a trial." ; Text[ chinese_simplified ] = "æ¯ä¸ªè¯•éªŒçš„æˆåŠŸæ¦‚率。"; - Text[ russian ] = "Âåðîÿòíîñòü óñïåõà â êàæäîì èñïûòàíèè."; + Text[ russian ] = "Âåðîÿòíîñòü óñïåõà êàæäîãî èñïûòàíèÿ."; Text[ polish ] = "Prawdopodobieñstwo sukcesu próby."; Text[ japanese ] = "1回ã®è©¦è¡ŒãŒæˆåŠŸã™ã‚‹ç¢ºçŽ‡ã€‚"; Text[ chinese_traditional ] = "æ¯å€‹è©¦é©—çš„æˆåŠŸæ¦‚率。"; @@ -26685,6 +27536,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deneyin baþarý olasýlýðý."; Text[ language_user1 ] = " "; Text[ catalan ] = "La probabilitat d'èxit d'una avaluació."; + Text[ thai ] = "ความน่าจะเป็นขà¸à¸‡à¸„วามสำเร็จขà¸à¸‡à¸à¸²à¸£à¸—ดลà¸à¸‡"; }; String 6 // Name of Parameter 3 { @@ -26714,6 +27566,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 7 // Description of Parameter 3 { @@ -26724,12 +27577,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La probabilità limite che può essere raggiunta oppure superata." ; Text [ portuguese_brazilian ] = "Die Grenzwahrscheinlichkeit, die erreicht oder ?erschritten wird." ; Text [ portuguese ] = "é o critério de valor." ; - Text [ finnish ] = "Saavutettu tai ylitetty todennäköisyyden raja-arvo." ; + Text [ finnish ] = "Saavutettu tai ylitetty todennäköisyyden raja-arvo" ; Text [ danish ] = "Grænsesandsynligheden som opnås eller overskrides." ; Text [ french ] = "La probabilité limite qui doit être égalée ou excédée." ; Text [ swedish ] = "Gränssannolikheten som uppnås eller överskrids." ; Text [ dutch ] = "De grenzen van een kansbereik." ; - Text [ spanish ] = "es el valor del criterio." ; + Text [ spanish ] = "La probabilidad límite que se puede alcanzar o superar." ; Text [ english_us ] = "The border probability that is attained or exceeded." ; Text[ chinese_simplified ] = "临界值。"; Text[ russian ] = "Ïðåäåëüíàÿ âåðîÿòíîñòü, êîòîðàÿ áóäåò äîñòèãíóòà èëè ïðåâûøåíà."; @@ -26744,6 +27597,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Eriþilen ya da aþýlan sýnýr olasýlýðý."; Text[ language_user1 ] = " "; Text[ catalan ] = "La probabilitat llindar que s'aconsegueix o excedeix."; + Text[ thai ] = "ความน่าจะเป็นขà¸à¸‡à¹€à¸ªà¹‰à¸™à¸‚à¸à¸šà¸—ี่ได้รับหรืà¸à¹€à¸à¸´à¸™"; }; }; // -=*# Resource for function POISSON #*=- @@ -26765,7 +27619,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria siguiendo la distribución de Poisson" ; Text [ english_us ] = "Returns the Poisson distribution." ; Text[ chinese_simplified ] = "计算泊æ¾åˆ†å¸ƒã€‚"; - Text[ russian ] = "Âîçâðàùàåò ðàñïðåäåëåíèå Ïóàññîíà."; + Text[ russian ] = "Âû÷èñëÿåò ðàñïðåäåëåíèå Ïóàññîíà."; Text[ polish ] = "Wyznacza rozk³ad Poissona."; Text[ japanese ] = "ãƒã‚¢ã‚½ãƒ³åˆ†å¸ƒã®å¯†åº¦é–¢æ•°å€¤ã¾ãŸã¯åˆ†å¸ƒé–¢æ•°å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算泊æ¾åˆ†ä½ˆã€‚"; @@ -26777,6 +27631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Poisson daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la distribució de Poisson."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š Poisson "; }; ExtraData = { @@ -26812,6 +27667,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -26829,7 +27685,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de sucesos." ; Text [ english_us ] = "The value for which the Poisson distribution is to be calculated." ; Text[ chinese_simplified ] = "事件数。"; - Text[ russian ] = "Êîëè÷åñòâî ñîáûòèé."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ïóàññîíîâñêîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad Poissona."; Text[ japanese ] = "計算対象ã¨ãªã‚‹æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "事件數。"; @@ -26841,6 +27697,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Poisson daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució de Poisson del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š Poisson "; }; String 4 // Name of Parameter 2 { @@ -26870,6 +27727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama"; Text[ language_user1 ] = " "; Text[ catalan ] = "mitja"; + Text[ thai ] = "ค่าเฉลี่ย"; }; String 5 // Description of Parameter 2 { @@ -26879,7 +27737,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Media della distribuzione di Poisson." ; Text [ portuguese_brazilian ] = "Mittelwert. Der Mittelwert der Poisson-Verteilung." ; Text [ portuguese ] = "é o valor numérico esperado." ; - Text [ finnish ] = "Keskiarvo. Poisson-jakauman keskiarvo." ; + Text [ finnish ] = "Keskiarvo Poisson-jakauman keskiarvo" ; Text [ danish ] = "Middelværdi. Poisson-fordelingens middelværdi." ; Text [ french ] = "La moyenne de la distribution Poisson." ; Text [ swedish ] = "Medelvärde. Medelvärdet för Poissonfördelningen." ; @@ -26887,7 +27745,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor numérico esperado." ; Text [ english_us ] = "Mean. The mean value of the Poisson distribution." ; Text[ chinese_simplified ] = "期望值。"; - Text[ russian ] = "Îæèäàåìîå ÷èñëîâîå çíà÷åíèå."; + Text[ russian ] = "Ñðåäíåå. Ñðåäíåå çíà÷åíèå ïóàññîíîâñêîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Œrednia rozk³adu Poissona."; Text[ japanese ] = "ãƒã‚¢ã‚½ãƒ³å®šæ•°ã€‚å¹³å‡å€¤ã€‚"; Text[ chinese_traditional ] = "期望值。"; @@ -26899,6 +27757,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama deðer. Poisson daðýtýmýnýn ortalama deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mitja. El valor mitjà de la distribució de Poisson."; + Text[ thai ] = "ค่าเฉลี่ย ค่าเฉลี่ยขà¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š Poisson "; }; String 6 // Name of Parameter 3 { @@ -26916,7 +27775,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "acumulado" ; Text [ english_us ] = "C" ; Text[ chinese_simplified ] = "cumulative"; - Text[ russian ] = "Èíòåãðàëüíûé"; + Text[ russian ] = "È"; Text[ polish ] = "Skumulowany"; Text[ japanese ] = "関数形å¼"; Text[ chinese_traditional ] = "cumulative"; @@ -26928,6 +27787,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "C"; Text[ language_user1 ] = " "; Text[ catalan ] = "C"; + Text[ thai ] = "C"; }; String 7 // Description of Parameter 3 { @@ -26937,7 +27797,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore = 0 calcola la densità di probabilità, se = 1 calcola la distribuzione." ; Text [ portuguese_brazilian ] = "Kumuliert. K = 0 berechnet die Dichtefunktion, K = 1 die Verteilung." ; Text [ portuguese ] = "é um valor lógico que determina a forma da distribuição de probabilidades. 0 calcula a função cumulativa; 1 a distribuição." ; - Text [ finnish ] = "Kumuloitu. C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; + Text [ finnish ] = "Kumuloitu C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; Text [ danish ] = "Kumulativ. K = 0 beregner tæthedsfunktionen, K = 1 fordelingen." ; Text [ french ] = "Cumulative. C = 0 calcule la fonction de densité, C = 1 la distribution." ; Text [ swedish ] = "Kumulerat. K = 0 beräknar täthetsfunktionen, K = 1 fördelningen." ; @@ -26945,7 +27805,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un valor lógico que determina la forma de la distribución de probabilidad. Si es 0 calcula la función acumulada, si es 1 la distribución." ; Text [ english_us ] = "Cumulated. C=0 calculates the density function, C=1 the distribution." ; Text[ chinese_simplified ] = "确定概率分布形å¼çš„逻辑值。 K = 0 表示计算密度\n函数， K = 1 表示计算分布函数。"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, îïðåäåëÿþùåå âèä ôóíêöèè: ôóíêöèÿ ïëîòíîñòè (0) èëè ôóíêöèÿ ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Èíòåãðàëüíûé. È=0 âû÷èñëÿåò ôóíêöèþ ïëîòíîñòè, È=1 - ðàñïðåäåëåíèå."; Text[ polish ] = "Skumulowany. 0 wyznacza gêstoœæ, 1 - rozk³ad."; Text[ japanese ] = "関数形å¼ã€‚0 を指定ã™ã‚‹ã¨å¯†åº¦é–¢æ•°ã€1 を指定ã™ã‚‹ã¨åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定概率分佈形å¼çš„é‚輯值。 K = 0 è¨ˆç®—å¯†åº¦å‡½æ•¸ï¹ K = 1 計算分佈函數。"; @@ -26957,6 +27817,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kümülasyon. K = 0 yoðunluk fonksiyonunu, K = 1 ise daðýtýmý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Acumulat. C=0 calcula la funció de densitat; C=1, la distribució."; + Text[ thai ] = "สะสม C=0 คำนวณฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸„วามหนาà¹à¸™à¹ˆà¸™, C=1 à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; }; // -=*# Resource for function NORMVERT #*=- @@ -26970,7 +27831,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione normale." ; Text [ portuguese_brazilian ] = "Werte der Normalverteilung" ; Text [ portuguese ] = "Devolve a distribuição cumulativa normal." ; - Text [ finnish ] = "Normaalijakauman arvot." ; + Text [ finnish ] = "Normaalijakauman arvot" ; Text [ danish ] = "Værdier for normalfordelingen" ; Text [ french ] = "Valeurs de la distribution normale." ; Text [ swedish ] = "Värden för normalfördelningen." ; @@ -26978,7 +27839,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria continua siguiendo una distribución acumulativa normal" ; Text [ english_us ] = "Values of the normal distribution." ; Text[ chinese_simplified ] = "æ£æ€åˆ†å¸ƒå‡½æ•°ã€‚"; - Text[ russian ] = "Âîçâðàùàåò íîðìàëüíóþ ôóíêöèþ ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå ñòàíäàðòíîãî íîðìàëüíîãî èíòåãðàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza rozk³ad normalny."; Text[ japanese ] = "æ£è¦åˆ†å¸ƒã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "æ£æ…‹åˆ†ä½ˆå‡½æ•¸ã€‚"; @@ -26990,6 +27851,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Normal daðýtým deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució normal."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; ExtraData = { @@ -27025,6 +27887,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -27042,7 +27905,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor cuya distribución desea obtener." ; Text [ english_us ] = "The value for which the normal distribution is to be calculated." ; Text[ chinese_simplified ] = "è¦è®¡ç®—å…¶æ£æ€åˆ†å¸ƒçš„数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî îïðåäåëÿåòñÿ ðàñïðåäåëíèå."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ íîðìàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad normalny."; Text[ japanese ] = "関数ã«ä»£å…¥ã™ã‚‹å€¤ã€‚"; Text[ chinese_traditional ] = "è¦è¨ˆç®—å…¶æ£æ…‹åˆ†ä½ˆçš„數值。"; @@ -27054,6 +27917,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Normal daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució normal del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; String 4 // Name of Parameter 2 { @@ -27083,6 +27947,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama"; Text[ language_user1 ] = " "; Text[ catalan ] = "mitja"; + Text[ thai ] = "ค่าเฉลี่ย"; }; String 5 // Description of Parameter 2 { @@ -27092,7 +27957,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La media aritmetica della distribuzione." ; Text [ portuguese_brazilian ] = "Mittelwert. Der Mittelwert der Normalverteilung." ; Text [ portuguese ] = "é a média aritmética da distribuição." ; - Text [ finnish ] = "Keskiarvo. Normaalijakauman keskiarvo." ; + Text [ finnish ] = "Keskiarvo Normaalijakauman keskiarvo" ; Text [ danish ] = "Middelværdi. Normalfordelingens middelværdi." ; Text [ french ] = "La moyenne de la distribution normale." ; Text [ swedish ] = "Medelvärde. Medelvärdet för normalfördelningen." ; @@ -27100,7 +27965,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la media aritmética de la distribución." ; Text [ english_us ] = "The mean value. The mean value of the normal distribution." ; Text[ chinese_simplified ] = "å¹³å‡å€¼ã€‚æ£æ€åˆ†å¸ƒçš„å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Ñðåäíåå àðèôìåòè÷åñêîå ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ñðåäíåå çíà÷åíèå. Ñðåäíåå çíà÷åíèå íîðìàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Œrednia arytmetyczna rozk³adu normalnego."; Text[ japanese ] = "å¹³å‡ã€‚分布ã®ç®—è¡“å¹³å‡(ç›¸åŠ å¹³å‡)。"; Text[ chinese_traditional ] = "å¹³å‡å€¼ã€‚æ£æ…‹åˆ†ä½ˆçš„å¹³å‡å€¼ã€‚"; @@ -27108,10 +27973,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De gemiddelde waarde van de normale verdeling."; Text[ chinese_simplified ] = "å¹³å‡å€¼ã€‚æ£æ€åˆ†å¸ƒçš„å¹³å‡å€¼ã€‚"; Text[ greek ] = "ÌÝóç ôéìÞ. Ç ìÝóç ôéìÞ ôçò êáíïíéêÞò êáôáíïìÞò."; - Text[ korean ] = "í‰ê· ê°’. ì •ê·œë¶„í¬ì˜ í‰ê· ê°’."; + Text[ korean ] = "í‰ê· ê°’. ì •ê·œ 분í¬ì˜ í‰ê· ê°’."; Text[ turkish ] = "Ortalama deðer. Normal daðýtýmýn ortalama deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor mitjà. El valor mitjà de la distribució normal."; + Text[ thai ] = "ค่าเฉลี่ย ค่าเฉลี่ยขà¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; String 6 // Name of Parameter 3 { @@ -27121,7 +27987,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard" ; Text [ portuguese_brazilian ] = "STD" ; Text [ portuguese ] = "Desvio_padrão" ; - Text [ finnish ] = "STDEV" ; + Text [ finnish ] = "KESKIHAJONTA" ; Text [ danish ] = "Standardafv" ; Text [ french ] = "ET" ; Text [ swedish ] = "STD" ; @@ -27129,7 +27995,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "desv_predeterminada" ; Text [ english_us ] = "STDEV" ; Text[ chinese_simplified ] = "standard_dev"; - Text[ russian ] = "Ñòàíäàðòíîå_îòêë"; + Text[ russian ] = "ÑÒÀÍÄÎÒÊË"; Text[ polish ] = "odchylenie_std"; Text[ japanese ] = "標準åå·®"; Text[ chinese_traditional ] = "standard_dev"; @@ -27141,6 +28007,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "STDEV"; Text[ language_user1 ] = " "; Text[ catalan ] = "STDEV"; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™ "; }; String 7 // Description of Parameter 3 { @@ -27150,7 +28017,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard della distribuzione." ; Text [ portuguese_brazilian ] = "Standardabweichung. Die Standardabweichung der Normalverteilung." ; Text [ portuguese ] = "é o desvio padrão da distribuição." ; - Text [ finnish ] = "Vakiopoikkeama. Normaalijakauman vakiopoikkeama." ; + Text [ finnish ] = "Keskihajonta Normaalijakauman keskihajonta" ; Text [ danish ] = "Standardafvigelse. Normalfordelingens standardafvigelse." ; Text [ french ] = "L'écart type de la distribution normale." ; Text [ swedish ] = "Standardavvikelse. Standardavvikelsen för normalfördelningen." ; @@ -27158,7 +28025,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la desviación predeterminada de la distribución." ; Text [ english_us ] = "Standard deviation. The standard deviation of the normal distribution." ; Text[ chinese_simplified ] = "æ ‡å‡†å差。æ£æ€åˆ†å¸ƒçš„æ ‡å‡†å差。"; - Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå. Ñòàíäàðòíîå îòêëîíåíèå íîðìàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Odchylenie standardowe rozk³adu."; Text[ japanese ] = "標準å差。分布ã®æ¨™æº–å差。"; Text[ chinese_traditional ] = "標準å差。æ£æ…‹åˆ†ä½ˆçš„標準å差。"; @@ -27170,6 +28037,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Standart sapma. Normal daðýtýmýn standart sapmasý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desviació estàndard. La desviació estàndard de la distribució normal."; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™ ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; String 8 // Name of Parameter 4 { @@ -27187,7 +28055,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "acum" ; Text [ english_us ] = "C" ; Text[ chinese_simplified ] = "cumulative"; - Text[ russian ] = "Èíòåãðàëüíûé"; + Text[ russian ] = "È"; Text[ polish ] = "Skumulowany"; Text[ japanese ] = "関数形å¼"; Text[ chinese_traditional ] = "cumulative"; @@ -27199,6 +28067,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "C"; Text[ language_user1 ] = " "; Text[ catalan ] = "C"; + Text[ thai ] = "C"; }; String 9 // Description of Parameter 4 { @@ -27208,7 +28077,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore = 0 calcola la densità di probabilità, se = 1 calcola la distribuzione." ; Text [ portuguese_brazilian ] = "Kumuliert. K = 0 berechnet die Dichtefunktion, K = 1 die Verteilung." ; Text [ portuguese ] = "é um valor lógico que determina a forma da função. 0 calcula a função cumulativa; 1 a distribuição." ; - Text [ finnish ] = "Kumuloitu. C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; + Text [ finnish ] = "Kumuloitu C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; Text [ danish ] = "Kumulativ. K = 0 beregner tæthedsfunktionen, K = 1 fordelingen." ; Text [ french ] = "Cumulative. C = 0 calcule la fonction de densité, C = 1 la distribution." ; Text [ swedish ] = "Kumulerat. K = 0 beräknar täthetsfunktionen, K = 1 fördelningen." ; @@ -27216,7 +28085,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un valor lógico que determina la forma de la función." ; Text [ english_us ] = "Cumulated. C=0 calculates the density function, C=1 the distribution." ; Text[ chinese_simplified ] = "逻辑值，指明函数类型。 K = 0 表示计算密度函数， \nK = 1 计算分布函数。"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, îïðåäåëÿþùåå âèä ôóíêöèè: ôóíêöèÿ ïëîòíîñòè (0) èëè ôóíêöèÿ ðàñïðåäåëåíèÿ (1)."; + Text[ russian ] = "Èíòåãðàëüíûé. È=0 âû÷èñëÿåò ôóíêöèþ ïëîòíîñòè, È=1 - ðàñïðåäåëåíèå."; Text[ polish ] = "Skumulowany. 0 oblicza gêstoœæ, 1 - rozk³ad."; Text[ japanese ] = "関数形å¼ã€‚é–¢æ•°å½¢å¼ = 0 ã«ã™ã‚‹ã¨ç¢ºçŽ‡å¯†åº¦é–¢æ•°ã®å€¤ãŒã€é–¢æ•°å½¢å¼ = 1 ã«ã™ã‚‹ã¨ç´¯ç©åˆ†å¸ƒé–¢æ•°ã®å€¤ãŒè¨ˆç®—ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "é‚輯值ï¹æŒ‡æ˜Žå‡½æ•¸é¡žåž‹ã€‚ K = 0 è¡¨ç¤ºè¨ˆç®—å¯†åº¦å‡½æ•¸ï¹ K = 1 表示計算分佈函數。"; @@ -27228,6 +28097,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kümülasyon. K = 0 yoðunluk fonksiyonunu, K = 1 ise daðýtýmý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Acumulat. C=0 calcula la funció de densitat; C=1, la distribució."; + Text[ thai ] = "สะสม C=0 คำนวณฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸„วามหนาà¹à¸™à¹ˆà¸™, C=1 à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; }; // -=*# Resource for function NORMINV #*=- @@ -27241,7 +28111,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce l'inversa della distribuzione normale." ; Text [ portuguese_brazilian ] = "Werte der inversen Normalverteilung" ; Text [ portuguese ] = "Devolve o inverso da distribuição cumulativa normal." ; - Text [ finnish ] = "Käänteisen normaalijakauman arvot." ; + Text [ finnish ] = "Käänteisen normaalijakauman arvot" ; Text [ danish ] = "Værdier for den inverse normalfordeling" ; Text [ french ] = "Valeurs de la distribution normale inverse." ; Text [ swedish ] = "Värden för den inversa normalfördelningen." ; @@ -27249,7 +28119,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve, para una probabilidad dada, el valor de la variable aleatoria siguiendo una distribución acumulativa normal" ; Text [ english_us ] = "Values of the inverse normal distribution." ; Text[ chinese_simplified ] = "æ£æ€åˆ†å¸ƒå‡½æ•°çš„逆函数。"; - Text[ russian ] = "Âîçâðàùàåò îáðàòíîå íîðìàëüíîãî ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå îáðàòíîãî íîðìàëüíîãî èíòåãðàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza odwrotnoœæ normalnego rozk³adu skumulowanego."; Text[ japanese ] = "æ£è¦åˆ†å¸ƒã«ãŠã„ã¦ã€ä¸Šå´ç¢ºçŽ‡ 1-q ã«å¯¾å¿œã™ã‚‹ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "æ£æ…‹åˆ†ä½ˆå‡½æ•¸çš„逆函數。"; @@ -27261,6 +28131,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters normal daðýtým deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució normal inversa."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; ExtraData = { @@ -27296,6 +28167,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -27313,7 +28185,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una probabilidad asociada a la distribución normal." ; Text [ english_us ] = "The probability value for which the inverse normal distribution is to be calculated." ; Text[ chinese_simplified ] = "æ£æ€åˆ†å¸ƒçš„概率值。"; - Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü îáðàòíîå íîðìàëüíîå ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî âû÷èñëÿåòñÿ îáðàòíîå íîðìàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ normalnego rozk³adu."; Text[ japanese ] = "æ£è¦åˆ†å¸ƒã«ãŠã‘る確率。"; Text[ chinese_traditional ] = "æ£æ…‹åˆ†ä½ˆçš„概率值。"; @@ -27325,6 +28197,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters normal daðýtýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució normal inversa del qual s'ha de calcular."; + Text[ thai ] = "ค่าความน่าจะเป็นสำหรับคำนวณà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; String 4 // Name of Parameter 2 { @@ -27354,6 +28227,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama"; Text[ language_user1 ] = " "; Text[ catalan ] = "mitja"; + Text[ thai ] = "ค่าเฉลี่ย"; }; String 5 // Description of Parameter 2 { @@ -27363,7 +28237,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La media aritmetica della distribuzione." ; Text [ portuguese_brazilian ] = "Mittelwert. Der Mittelwert der Normalverteilung." ; Text [ portuguese ] = "é a média aritmética da distribuição." ; - Text [ finnish ] = "Keskiarvo. Normaalijakauman keskiarvo." ; + Text [ finnish ] = "Keskiarvo Normaalijakauman keskiarvo" ; Text [ danish ] = "Middelværdi. Normalfordelingens middelværdi." ; Text [ french ] = "La moyenne de la distribution normale." ; Text [ swedish ] = "Medelvärde. Medelvärdet för normalfördelningen." ; @@ -27371,7 +28245,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la media aritmética de la distribución." ; Text [ english_us ] = "The mean value. The mean value of the normal distribution." ; Text[ chinese_simplified ] = "å¹³å‡å€¼ã€‚æ£æ€åˆ†å¸ƒçš„å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Ñðåäíåå àðèôìåòè÷åñêîå ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ñðåäíåå çíà÷åíèå. Ñðåäíåå çíà÷åíèå íîðìàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Œrednia arytmetyczna rozk³adu normalnego."; Text[ japanese ] = "å¹³å‡ã€‚分布ã®ç®—è¡“å¹³å‡(ç›¸åŠ å¹³å‡)。"; Text[ chinese_traditional ] = "å¹³å‡å€¼ã€‚æ£æ…‹åˆ†ä½ˆçš„å¹³å‡å€¼ã€‚"; @@ -27379,10 +28253,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De gemiddelde waarde van de verdeling."; Text[ chinese_simplified ] = "å¹³å‡å€¼ã€‚æ£æ€åˆ†å¸ƒçš„å¹³å‡å€¼ã€‚"; Text[ greek ] = "ÌÝóç ôéìÞ. Ç ìÝóç ôéìÞ ôçò êáíïíéêÞò êáôáíïìÞò."; - Text[ korean ] = "í‰ê· ê°’. ì •ê·œë¶„í¬ì˜ í‰ê· ê°’."; + Text[ korean ] = "í‰ê· ê°’. ì •ê·œ 분í¬ì˜ í‰ê· ê°’."; Text[ turkish ] = "Ortalama deðer. Normal daðýtýmýn ortalama deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor mitjà. El valor mitjà de la distribució normal."; + Text[ thai ] = "ค่าเฉลี่ย ค่าเฉลี่ยขà¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; String 6 // Name of Parameter 3 { @@ -27392,7 +28267,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard" ; Text [ portuguese_brazilian ] = "STD" ; Text [ portuguese ] = "Desvio_padrão" ; - Text [ finnish ] = "STDEV" ; + Text [ finnish ] = "KESKIHAJONTA" ; Text [ danish ] = "Standardafv" ; Text [ french ] = "ET" ; Text [ swedish ] = "STD" ; @@ -27400,7 +28275,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "desv_predeterminada" ; Text [ english_us ] = "STDEV" ; Text[ chinese_simplified ] = "standard_dev"; - Text[ russian ] = "Ñòàíäàðòíîå_îòêë"; + Text[ russian ] = "ÑÒÀÍÄÎÒÊË"; Text[ polish ] = "odchylenie_std"; Text[ japanese ] = "標準åå·®"; Text[ chinese_traditional ] = "standard_dev"; @@ -27412,6 +28287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "STDEV"; Text[ language_user1 ] = " "; Text[ catalan ] = "STDEV"; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™ "; }; String 7 // Description of Parameter 3 { @@ -27421,7 +28297,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La deviazione standard della distribuzione." ; Text [ portuguese_brazilian ] = "Standardabweichung. Die Standardabweichung der Normalverteilung." ; Text [ portuguese ] = "é o desvio padrão da distribuição." ; - Text [ finnish ] = "Vakiopoikkeama. Normaalijakauman vakiopoikkeama." ; + Text [ finnish ] = "Keskihajonta Normaalijakauman keskihajonta" ; Text [ danish ] = "Standardafvigelse. Normalfordelingens standardafvigelse." ; Text [ french ] = "L'écart type de la distribution normale." ; Text [ swedish ] = "Standardavvikelse. Standardavvikelsen för normalfördelningen." ; @@ -27429,7 +28305,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la desviación predeterminada de la distribución." ; Text [ english_us ] = "Standard deviation. The standard deviation of the normal distribution." ; Text[ chinese_simplified ] = "æ ‡å‡†å差。æ£æ€åˆ†å¸ƒçš„æ ‡å‡†å差。"; - Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå. Ñòàíäàðòíîå îòêëîíåíèå íîðìàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Odchylenie standardowe rozk³adu normalnego."; Text[ japanese ] = "標準å差。分布ã®æ¨™æº–å差。"; Text[ chinese_traditional ] = "標準å差。æ£æ…‹åˆ†ä½ˆçš„標準å差。"; @@ -27441,6 +28317,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Standart sapma. Normal daðýtýmýn standart sapmasý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desviació estàndard. La desviació estàndard de la distribució normal."; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™ ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´"; }; }; // -=*# Resource for function STANDNORMVERT #*=- @@ -27454,26 +28331,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce i valori della distribuzione normale standard." ; Text [ portuguese_brazilian ] = "Werte der Standardnormalverteilung" ; Text [ portuguese ] = "Devolve a distribuição cumulativa normal padrão." ; - Text [ finnish ] = "Tavallisen kumulatiivisen normaalijakauman kokonaislukuarvot." ; + Text [ finnish ] = "Tavallisen kumulatiivisen normaalijakauman kokonaislukuarvot" ; Text [ danish ] = "Værdier for standardnormalfordelingen" ; Text [ french ] = "Valeurs de la distribution normale standard." ; Text [ swedish ] = "Värden för standardnormalfördelningen." ; - Text [ dutch ] = "Geeft als resultaat de cumulatieve standaardnormale verdeling." ; + Text [ dutch ] = "Geeft als resultaat de cumulatieve standaard normale verdeling." ; Text [ spanish ] = "Valores de una distribución normal predeterminada acumulativa" ; Text [ english_us ] = "The values of the standard normal cumulative distribution." ; Text[ chinese_simplified ] = "æ ‡å‡†æ£æ€åˆ†å¸ƒå‡½æ•°ã€‚"; - Text[ russian ] = "Çíà÷åíèÿ ñòàíäàðòíîãî íîðìàëüíîãî èíòåãðàëüíîãî ðàñïðåäåëåíèÿ"; + Text[ russian ] = "Âû÷èñëÿåò ñòàíäàðòíîå íîðìàëüíîå èíòåãðàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wyznacza standardowy rozk³ad normalny"; Text[ japanese ] = "標準æ£è¦åˆ†å¸ƒã®åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "標準æ£æ…‹åˆ†ä½ˆå‡½æ•¸ã€‚"; Text[ arabic ] = "Þíã ÇáÊæÒíÚ ÇáØÈíÚí ÇáÞíÇÓí."; - Text[ dutch ] = "Geeft als resultaat de cumulatieve standaardnormale verdeling."; + Text[ dutch ] = "Geeft als resultaat de cumulatieve standaard normale verdeling."; Text[ chinese_simplified ] = "æ ‡å‡†æ£æ€åˆ†å¸ƒå‡½æ•°ã€‚"; Text[ greek ] = "ÔéìÝò ôçò ôõðéêÞò êáíïíéêÞò êáôáíïìÞò"; Text[ korean ] = "표준 ì •ê·œ 분í¬ì˜ ê°’"; Text[ turkish ] = "Standart normal daðýtým deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució acumulativa normal estàndard."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸ªà¸°à¸ªà¸¡à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; ExtraData = { @@ -27509,6 +28387,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -27518,7 +28397,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore per il quale si desidera la distribuzione." ; Text [ portuguese_brazilian ] = "Der Wert, zu dem die Standardnormalverteilung berechnet werden soll." ; Text [ portuguese ] = "é o o valor para o qual deseja calcular a distribuição." ; - Text [ finnish ] = "Arvo, jonka normaalijakauma (keskiarvo 0, vakiopoikkeama 1) lasketaan." ; + Text [ finnish ] = "Arvo, jonka normaalijakauma lasketaan." ; Text [ danish ] = "Den værdi som standardnormalfordelingen skal beregnes for." ; Text [ french ] = "La valeur pour laquelle vous voulez calculer la distribution normale standard." ; Text [ swedish ] = "Värdet för vilket standardnormalfördelningen skall beräknas." ; @@ -27526,7 +28405,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor cuya distribución desea obtener." ; Text [ english_us ] = "The value for which the standard normal distribution is to be calculated." ; Text[ chinese_simplified ] = "è¦è®¡ç®—å…¶æ ‡å‡†æ£æ€åˆ†å¸ƒçš„数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ñòàíäàðòíîå íîðìàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony standardowy rozk³ad normalny."; Text[ japanese ] = "æ£è¦åˆ†å¸ƒé–¢æ•°ã‚’求ã‚る値"; Text[ chinese_traditional ] = "è¦è¨ˆç®—其標準æ£æ…‹åˆ†ä½ˆçš„數值。"; @@ -27538,6 +28417,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Standart normal daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució normal estàndard del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; }; // -=*# Resource for function STANDNORMINV #*=- @@ -27551,7 +28431,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce l'inversa della distribuzione normale standard." ; Text [ portuguese_brazilian ] = "Werte der inversen Standardnormalverteilung" ; Text [ portuguese ] = "Devolve o inverso da distribuição padrão normal." ; - Text [ finnish ] = "Käänteisen normaalijakauman (keskiarvo 0, vakiopoikkeama 1) arvot." ; + Text [ finnish ] = "Käänteisen normaalijakauman arvot." ; Text [ danish ] = "Værdier for den inverse standardnormalfordeling" ; Text [ french ] = "Valeurs de la distribution normale standard inverse." ; Text [ swedish ] = "Värden för den inversa standardnormalfördelningen." ; @@ -27559,7 +28439,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve, para una probabilidad dada, el valor de la variable aleatoria siguiendo una distribución normal predeterminada acumulativa" ; Text [ english_us ] = "Values of the inverse standard normal distribution." ; Text[ chinese_simplified ] = "æ ‡å‡†æ£æ€åˆ†å¸ƒå‡½æ•°çš„逆函数。"; - Text[ russian ] = "Âû÷èñëÿåò îáðàòíîå çíà÷åíèå ñòàíäàðòíîãî íîðìàëüíîãî ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò îáðàòíîå ñòàíäàðòíîå íîðìàëüíîå èíòåãðàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wyznacza odwrotnoœæ standardowego rozk³adu"; Text[ japanese ] = "標準æ£è¦åˆ†å¸ƒã®ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "標準æ£æ…‹åˆ†ä½ˆå‡½æ•¸çš„逆函數。"; @@ -27571,6 +28451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters standart normal daðýtým deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució normal estàndard inversa."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; ExtraData = { @@ -27606,6 +28487,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -27615,7 +28497,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore di probabilità sul quale deve essere calcolata l'inversa della distribuzione normale standard." ; Text [ portuguese_brazilian ] = "Der Wahrscheinlichkeitswert, zu dem die inverse Standardnormalverteilung berechnet werden soll." ; Text [ portuguese ] = "é a probabilidade para q qual deseja calcular a distribuição padrão normal." ; - Text [ finnish ] = "Todennäköisyysarvo, jonka käänteinen normaalijakauma (keskiarvo 0, vakiopoikkeama 1) lasketaan." ; + Text [ finnish ] = "Todennäköisyysarvo, jonka käänteinen normaalijakauma lasketaan." ; Text [ danish ] = "Sandsynligheden som den inverse standardnormalfordeling skal beregnes for." ; Text [ french ] = "La valeur de probabilité pour laquelle la distribution normale standard inverse doît être calculée." ; Text [ swedish ] = "Sannolikhetsvärdet för vilket den inversa standardnormalfördelningen skall beräknas." ; @@ -27623,7 +28505,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "El valor de probabilidad sobre el que se debe calcular la inversa de la distribución normal estándar." ; Text [ english_us ] = "The probability value for which the inverse standard normal distribution is to be calculated." ; Text[ chinese_simplified ] = "æ ‡å‡†æ£æ€åˆ†å¸ƒçš„概率值。"; - Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî íåîáõîäèìî âû÷èñëèòü îáðàòíîå çíà÷åíèå ñòàíäàðòíîãî íîðìàëüíîãî ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîé âû÷èñëÿåòñÿ íîðìàëüíîå ëîãàðèôìè÷åñêîå ðàñïðåäåëåíèå."; Text[ polish ] = "Prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ standardowego rozk³adu normalnego."; Text[ japanese ] = "標準æ£è¦åˆ†å¸ƒã®ãƒ‘ーセント点を求ã‚る確率。"; Text[ chinese_traditional ] = "標準æ£æ…‹åˆ†ä½ˆçš„概率值。"; @@ -27635,6 +28517,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters standart normal daðýtýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució normal estàndard inversa del qual s'ha de calcular."; + Text[ thai ] = "ค่าความน่าจะเป็นสำหรับคำนวณà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¡à¸²à¸•à¸£à¸à¸²à¸™"; }; }; // -=*# Resource for function LOGNORMVERT #*=- @@ -27648,7 +28531,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione lognormale." ; Text [ portuguese_brazilian ] = "Werte der Lognormalverteilung" ; Text [ portuguese ] = "Devolve a distribuição cumulativa log-normal." ; - Text [ finnish ] = "Lognormal-jakauman arvot." ; + Text [ finnish ] = "Lognormal-jakauman arvot" ; Text [ danish ] = "Værdier for lognormalfordelingen" ; Text [ french ] = "Valeurs de la distribution lognormale." ; Text [ swedish ] = "Värden för lognormalfördelningen." ; @@ -27656,7 +28539,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad para una variable aleatoria continua siguiendo una distribución logarítmico-normal acumulativa" ; Text [ english_us ] = "Values of the log normal distribution." ; Text[ chinese_simplified ] = "对数æ£æ€åˆ†å¸ƒå‡½æ•°å€¼ã€‚"; - Text[ russian ] = "Âîçâðàùàåò èíòåãðàëüíîå ëîãíîðìàëüíîå ðàñïðåäåëåíèå."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå íîðìàëüíîãî ëîãàðèôìè÷åñêîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza skumulowany rozk³ad logarytmiczno-normalny."; Text[ japanese ] = "対数æ£è¦åˆ†å¸ƒã®åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å°æ•¸æ£æ…‹åˆ†ä½ˆå‡½æ•¸å€¼ã€‚"; @@ -27668,6 +28551,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Lognormal daðýtýmýn deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució normal de registre."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; ExtraData = { @@ -27703,6 +28587,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -27720,7 +28605,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor al que desea evaluar la función." ; Text [ english_us ] = "The value for which the log normal distribution is to be calculated." ; Text[ chinese_simplified ] = "用æ¥è®¡ç®—对数æ£æ€åˆ†å¸ƒçš„数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðãî âû÷èñëÿåòñÿ ôóíêöèÿ."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ íîðìàëüíîå ëîãàðèôìè÷åñêîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ wyznaczony rozk³ad logarytmiczno-normalny."; Text[ japanese ] = "関数ã«ä»£å…¥ã™ã‚‹å€¤ã€‚"; Text[ chinese_traditional ] = "用來計算å°æ•¸æ£æ…‹åˆ†ä½ˆçš„數值。"; @@ -27732,6 +28617,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Lognormal daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució normal de registre del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; String 4 // Name of Parameter 2 { @@ -27761,6 +28647,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama"; Text[ language_user1 ] = " "; Text[ catalan ] = "mitja"; + Text[ thai ] = "ค่าเฉลี่ย"; }; String 5 // Description of Parameter 2 { @@ -27770,7 +28657,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La media della distrubuzione lognormale." ; Text [ portuguese_brazilian ] = "Mittelwert. Der Mittelwert der Lognormalverteilung." ; Text [ portuguese ] = "é o valor médio da distribuição log-normal [ln(x)]." ; - Text [ finnish ] = "Keskiarvo! Lognormal-jakauman keskiarvo." ; + Text [ finnish ] = "Keskiarvo Lognormal-jakauman keskiarvo" ; Text [ danish ] = "Middelværdi. Lognormalfordelingens middelværdi." ; Text [ french ] = "La moyenne de la distribution lognormale." ; Text [ swedish ] = "Medelvärdet. Medelvärdet för lognormalfördelningen." ; @@ -27778,7 +28665,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la media de In(x)." ; Text [ english_us ] = "Mean value. The mean value of the log normal distribution." ; Text[ chinese_simplified ] = "对数æ£æ€åˆ†å¸ƒå‡½æ•° ln(x) çš„å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Ñðåäíåå In(x)."; + Text[ russian ] = "Ñðåäíåå çíà÷åíèå. Ñðåäíåå çíà÷åíèå íîðìàëüíîãî ëîãàðèôìè÷åñêîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wartoœæ œrednia dla rozk³adu logarytmiczno-normalnego ln(x)."; Text[ japanese ] = "å¹³å‡ã€‚対数æ£è¦åˆ†å¸ƒã®å¹³å‡å€¤ã€‚"; Text[ chinese_traditional ] = "å°æ•¸æ£æ…‹åˆ†ä½ˆå‡½æ•¸ ln(x) çš„å¹³å‡å€¼ã€‚"; @@ -27790,6 +28677,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama deðer. Lognormal daðýtýmýn ortalama deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor mitjà. El valor mitjà de la distribució normal de registre."; + Text[ thai ] = "ค่าเฉลี่ย ค่าเฉลี่ยขà¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; String 6 // Name of Parameter 3 { @@ -27799,7 +28687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard" ; Text [ portuguese_brazilian ] = "STD" ; Text [ portuguese ] = "Desvio_padrão" ; - Text [ finnish ] = "STDEV" ; + Text [ finnish ] = "KESKIHAJONTA" ; Text [ danish ] = "Standardafv" ; Text [ french ] = "ET" ; Text [ swedish ] = "STD" ; @@ -27807,7 +28695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "desv_predeterminada" ; Text [ english_us ] = "STDEV" ; Text[ chinese_simplified ] = "standard_dev"; - Text[ russian ] = "Ñòàíäàðòíîå_îòêë"; + Text[ russian ] = "ÑÒÀÍÄÎÒÊË"; Text[ polish ] = "Odchylenie standardowe"; Text[ japanese ] = "標準åå·®"; Text[ chinese_traditional ] = "standard_dev"; @@ -27819,6 +28707,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "STDEV"; Text[ language_user1 ] = " "; Text[ catalan ] = "STDEV"; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -27828,26 +28717,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La deviazione standard della distribuzione lognormale." ; Text [ portuguese_brazilian ] = "Standardabweichung. Die Standardabweichung der Lognormalverteilung." ; Text [ portuguese ] = "é o desvio padrão da distribuição log-normal [ln(x)]." ; - Text [ finnish ] = "Vakiopoikkeama. Lognormal-jakauman vakiopoikkeama." ; + Text [ finnish ] = "Keskihajonta Lognormal-jakauman keskihajonta" ; Text [ danish ] = "Standardafvigelse. Lognormalfordelingens standardafvigelse." ; Text [ french ] = "L'écart type de la distribution lognormale." ; Text [ swedish ] = "Standardavvikelse. Standardavvikelsen för lognormalfördelningen." ; - Text [ dutch ] = "De standaarddeviatie geeft aan in hoeverre waarden afwijken van de lognormalre verdeling." ; + Text [ dutch ] = "De standaarddeviatie geeft aan in hoeverre waarden afwijken van de lognormale verdeling." ; Text [ spanish ] = "es la desviación predeterminada de In(x)." ; Text [ english_us ] = "Standard deviation. The standard deviation of the log normal distribution." ; Text[ chinese_simplified ] = "对数æ£æ€åˆ†å¸ƒå‡½æ•° ln(x) çš„æ ‡å‡†å差。"; - Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå In(x)."; + Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå. Ñòàíäàðòíîå îòêëîíåíèå íîðìàëüíîãî ëîãàðèôìè÷åñêîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Odchylenie standardowe dla ln(x)."; Text[ japanese ] = "標準å差。対数æ£è¦åˆ†å¸ƒã®æ¨™æº–å差。"; Text[ chinese_traditional ] = "å°æ•¸æ£æ…‹åˆ†ä½ˆå‡½æ•¸ ln(x) 的標準å差。"; Text[ arabic ] = "ÇáÇäÍÑÇÝ ÇáãÚíÇÑí ááÊæÒíÚ ÇááæÛÇÑíÊãí ÇáØÈíÚí."; - Text[ dutch ] = "De standaarddeviatie geeft aan in hoeverre waarden afwijken van de lognormalre verdeling."; + Text[ dutch ] = "De standaarddeviatie geeft aan in hoeverre waarden afwijken van de lognormale verdeling."; Text[ chinese_simplified ] = "对数æ£æ€åˆ†å¸ƒå‡½æ•° ln(x) çš„æ ‡å‡†å差。"; Text[ greek ] = "ÔõðéêÞ áðüêëéóç. Ç ôõðéêÞ áðüêëéóç ôçò êáíïíéêÞò ëïãáñéèìéêÞò êáôáíïìÞò."; Text[ korean ] = "표준 편차. ë¡œê·¸ì •ê·œë¶„í¬ì˜ 표준 편차"; Text[ turkish ] = "Standart sapma. Lognormal daðýtýmýn standart sapmasý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desviació estàndard. La desviació estàndard de la distribució normal de registre."; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™ ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; }; // -=*# Resource for function LOGINV #*=- @@ -27861,7 +28751,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce l'inversa della funzione di distribuzione lognormale." ; Text [ portuguese_brazilian ] = "Werte der inversen Lognormalverteilung" ; Text [ portuguese ] = "Devolve o inverso da distribuição log-normal." ; - Text [ finnish ] = "Lognormal-jakauman käänteisarvot." ; + Text [ finnish ] = "Lognormal-jakauman käänteisarvot" ; Text [ danish ] = "Værdier for den inverse lognormalfordeling" ; Text [ french ] = "Valeurs de la distribution lognormale inverse." ; Text [ swedish ] = "Värden för den inversa lognormalfördelningen." ; @@ -27869,7 +28759,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el valor de la variable aleatoria siguiendo una distribución logarítmico-normal de x" ; Text [ english_us ] = "Values of the inverse of the lognormal distribution." ; Text[ chinese_simplified ] = "对数æ£æ€åˆ†å¸ƒå‡½æ•°çš„逆函数值。"; - Text[ russian ] = "Âîçâðàùàåò îáðàòíîå ëîãàðèôìè÷åñêîå íîðìàëüíîå ðàñïðåäåëåíèå."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå îáðàòíîãî íîðìàëüíîãî ëîãàðèôìè÷åñêîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza odwrotnoœæ rozk³adu logarytmiczno-naturalnego."; Text[ japanese ] = "対数æ£è¦åˆ†å¸ƒã®ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å°æ•¸æ£æ…‹åˆ†ä½ˆå‡½æ•¸çš„逆函數值。"; @@ -27881,6 +28771,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters lognormal daðýtýmýn deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la inversa de la distribució normal de registre."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; ExtraData = { @@ -27916,6 +28807,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -27933,7 +28825,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una probabilidad asociada con la distribución logarítmico-normal." ; Text [ english_us ] = "The probability value for which the inverse log normal distribution is to be calculated." ; Text[ chinese_simplified ] = "与对数æ£æ€åˆ†å¸ƒç›¸å…³çš„概率值。"; - Text[ russian ] = "Âåðîÿòíîñòü, ñâÿçàííàÿ ñ íîðìàëüíûì ëîãàðèôìè÷åñêèì ðàñïðåäåëåíèåì."; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîé âû÷èñëÿåòñÿ íîðìàëüíîå ëîãàðèôìè÷åñêîå ðàñïðåäåëåíèå."; Text[ polish ] = "Prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ rozk³adu logarytmiczno-naturalnego."; Text[ japanese ] = "計算ã«ä½¿ç”¨ã™ã‚‹ç¢ºçŽ‡ã€‚"; Text[ chinese_traditional ] = "與å°æ•¸æ£æ…‹åˆ†ä½ˆç›¸é—œçš„概率值。"; @@ -27945,6 +28837,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters lognormal daðýtýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució normal de registre inversa del qual s'ha de calcular."; + Text[ thai ] = "ค่าความน่าจะเป็นสำหรับคำนวณà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; String 4 // Name of Parameter 2 { @@ -27974,6 +28867,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama"; Text[ language_user1 ] = " "; Text[ catalan ] = "mitja"; + Text[ thai ] = "ค่าเฉลี่ย"; }; String 5 // Description of Parameter 2 { @@ -27983,7 +28877,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La media della distribuzione lognormale." ; Text [ portuguese_brazilian ] = "Mittelwert. Der Mittelwert der Lognormalverteilung." ; Text [ portuguese ] = "é o valor médio da distribuição log-normal [ln(x)]." ; - Text [ finnish ] = "Keskiarvo! Lognormal-jakauman keskiarvo." ; + Text [ finnish ] = "Keskiarvo Lognormal-jakauman keskiarvo" ; Text [ danish ] = "Middelværdi. Lognormalfordelingens middelværdi." ; Text [ french ] = "La moyenne de la distribution lognormale." ; Text [ swedish ] = "Medelvärde. Medelvärdet för lognormalfördelningen." ; @@ -27991,7 +28885,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la media de ln(x)." ; Text [ english_us ] = "Mean value. The mean value of the log normal distribution." ; Text[ chinese_simplified ] = "对数æ£æ€åˆ†å¸ƒå‡½æ•° ln(x) çš„å¹³å‡å€¼ã€‚"; - Text[ russian ] = "Ñðåäíåå In(x)."; + Text[ russian ] = "Ñðåäíåå çíà÷åíèå. Ñðåäíåå çíà÷åíèå íîðìàëüíîãî ëîãàðèôìè÷åñêîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wartoœæ œrednia dla rozk³adu logarytmiczno-normalnego ln(x)."; Text[ japanese ] = "対数æ£è¦åˆ†å¸ƒã®å¹³å‡å€¤ã€‚"; Text[ chinese_traditional ] = "å°æ•¸æ£æ…‹åˆ†ä½ˆå‡½æ•¸ ln(x) çš„å¹³å‡å€¼ã€‚"; @@ -28003,6 +28897,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama deðer. Lognormal daðýlýmýn ortalama deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor mitjà. El valor mitjà de la distribució normal de registre."; + Text[ thai ] = "ค่าเฉลี่ย ค่าเฉลี่ยขà¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; String 6 // Name of Parameter 3 { @@ -28012,7 +28907,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard" ; Text [ portuguese_brazilian ] = "STD" ; Text [ portuguese ] = "Desvio_padrão" ; - Text [ finnish ] = "STDEV" ; + Text [ finnish ] = "KESKIHAJONTA" ; Text [ danish ] = "Standardafv" ; Text [ french ] = "ET" ; Text [ swedish ] = "STD" ; @@ -28020,7 +28915,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "desv_predeterminada" ; Text [ english_us ] = "STDEV" ; Text[ chinese_simplified ] = "standard_dev"; - Text[ russian ] = "Ñòàíäàðòíîå_îòêë"; + Text[ russian ] = "ÑÒÀÍÄÎÒÊË"; Text[ polish ] = "Odchylenie standardowe"; Text[ japanese ] = "標準åå·®"; Text[ chinese_traditional ] = "standard_dev"; @@ -28032,6 +28927,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "STDEV"; Text[ language_user1 ] = " "; Text[ catalan ] = "STDEV"; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -28041,7 +28937,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard della distribuzione lognormale." ; Text [ portuguese_brazilian ] = "Standardabweichung. Die Standardabweichung der Lognormalverteilung." ; Text [ portuguese ] = "é o desvio padrão da distribuição log-normal [ln(x)]." ; - Text [ finnish ] = "Vakiopoikkeama. Lognormal-jakauman vakiopoikkeama." ; + Text [ finnish ] = "Keskihajonta Lognormal-jakauman keskihajonta" ; Text [ danish ] = "Standardafvigelse. Lognormalfordelingens standardafvigelse." ; Text [ french ] = "L'écart type de la distribution lognormale." ; Text [ swedish ] = "Standardavvikelse. Standardavvikelsen för lognormalfördelningen." ; @@ -28049,7 +28945,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la desviación predeterminada de ln(x)." ; Text [ english_us ] = "Standard deviation. The standard deviation of the log normal distribution." ; Text[ chinese_simplified ] = "对数æ£æ€åˆ†å¸ƒå‡½æ•° ln(x) çš„æ ‡å‡†å差。"; - Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå In(x)."; + Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå. Ñòàíäàðòíîå îòêëîíåíèå íîðìàëüíîãî ëîãàðèôìè÷åñêîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Odchylenie standardowe dal ln(x)."; Text[ japanese ] = "対数æ£è¦åˆ†å¸ƒã®æ¨™æº–å差。"; Text[ chinese_traditional ] = "å°æ•¸æ£æ…‹åˆ†ä½ˆå‡½æ•¸ ln(x) 的標準å差。"; @@ -28061,6 +28957,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Standart sapma. Lognormal daðýtýmýn standart sapmasý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desviació estàndard. La desviació estàndard de la distribució normal de registre."; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™ ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸›à¸à¸•à¸´à¹à¸šà¸šà¸¥à¹‡à¸à¸"; }; }; // -=*# Resource for function EXPONVERT #*=- @@ -28074,7 +28971,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione esponenziale." ; Text [ portuguese_brazilian ] = "Werte der Exponentialverteilung" ; Text [ portuguese ] = "Devolve a distribuição exponencial." ; - Text [ finnish ] = "Eksponentiaalisen jakauman arvot." ; + Text [ finnish ] = "Eksponentiaalisen jakauman arvot" ; Text [ danish ] = "Værdier for eksponentialfordelingen" ; Text [ french ] = "Valeurs de la distribution exponentielle." ; Text [ swedish ] = "Värden för exponentialfördelningen." ; @@ -28082,7 +28979,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria continua siguiendo una distribución exponencial" ; Text [ english_us ] = "Values of the exponential distribution." ; Text[ chinese_simplified ] = "计算指数分布。"; - Text[ russian ] = "Âîçâðàùàåò ýêñïîíåíöèàëüíîå çíà÷åíèå."; + Text[ russian ] = "Âû÷èñëÿåò ýêñïîíåíöèàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wyznacza rozk³ad wyk³adniczy"; Text[ japanese ] = "指数分布ã®å¯†åº¦é–¢æ•°ã¾ãŸã¯åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算指數分佈。"; @@ -28094,6 +28991,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Üstel daðýtýmýn deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució exponencial."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸à¹‡à¸à¸‹à¹Œà¹‚ปเนนเชียล"; }; ExtraData = { @@ -28129,6 +29027,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -28146,7 +29045,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor de la función." ; Text [ english_us ] = "The value to which the exponential distribution is to be calculated." ; Text[ chinese_simplified ] = "函数值。"; - Text[ russian ] = "Çíà÷åíèå ôóíêöèè."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ýêñïîíåíöèàëüíîå ðàñïðåäåëåíèå."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad wyk³adniczy."; Text[ japanese ] = "指数分布を計算ã™ã‚‹æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "函數值。"; @@ -28158,6 +29057,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Üstel daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor a què s'ha de calcular la distribució exponencial."; + Text[ thai ] = "ค่าเพื่à¸à¸„ำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸à¹‡à¸à¸‹à¹Œà¹‚ปเนนเชียล"; }; String 4 // Name of Parameter 2 { @@ -28187,6 +29087,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Lambda"; Text[ language_user1 ] = " "; Text[ catalan ] = "lambda"; + Text[ thai ] = "à¹à¸¥à¸¡à¸šà¹Œà¸”้า"; }; String 5 // Description of Parameter 2 { @@ -28196,7 +29097,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Parametro della distribuzione esponenziale." ; Text [ portuguese_brazilian ] = "Der Parameter der Exponentialverteilung." ; Text [ portuguese ] = "é o valor do parâmetro." ; - Text [ finnish ] = "Eksponentiaalisen jakauman parametrit." ; + Text [ finnish ] = "Eksponentiaalisen jakauman parametrit" ; Text [ danish ] = "Eksponentialfordelingens parameter." ; Text [ french ] = "Le paramètre de la distribution exponentielle." ; Text [ swedish ] = "Exponentialfördelningens parameter." ; @@ -28204,7 +29105,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor del parámetro^de la distribución exponencial." ; Text [ english_us ] = "The parameters of the exponential distribution." ; Text[ chinese_simplified ] = "å‚数值。"; - Text[ russian ] = "Çíà÷åíèå ïàðàìåòðà."; + Text[ russian ] = "Ïàðàìåòðû ýêñïîíåíöèàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr rozk³adu wyk³adniczego."; Text[ japanese ] = "指数定数。"; Text[ chinese_traditional ] = "åƒæ•¸å€¼ã€‚"; @@ -28212,10 +29113,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De parameter van de exponentiële verdeling."; Text[ chinese_simplified ] = "å‚数值。"; Text[ greek ] = "Ç ðáñÜìåôñïò ôçò åêèåôéêÞò êáôáíïìÞò."; - Text[ korean ] = "지수 분í¬ì˜ 파ë¼ë¯¸í„°"; + Text[ korean ] = "지수 분í¬ì˜ 매개 변수."; Text[ turkish ] = "Üstel daðýtýmýn parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetres de la distribució exponencial."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸à¹‡à¸à¸‹à¹Œà¹‚ปเนนเชียล"; }; String 6 // Name of Parameter 3 { @@ -28233,7 +29135,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "acum" ; Text [ english_us ] = "C" ; Text[ chinese_simplified ] = "cumulative"; - Text[ russian ] = "Èíòåãðàëüíûé"; + Text[ russian ] = "È"; Text[ polish ] = "Skumulowany"; Text[ japanese ] = "関数形å¼"; Text[ chinese_traditional ] = "cumulative"; @@ -28245,6 +29147,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "C"; Text[ language_user1 ] = " "; Text[ catalan ] = "C"; + Text[ thai ] = "C"; }; String 7 // Description of Parameter 3 { @@ -28254,7 +29157,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore = 0 calcola la densità di probabilità, = 1 calcola la distribuzione." ; Text [ portuguese_brazilian ] = "Kumuliert. K = 0 berechnet die Dichtefunktion, K = 1 die Verteilung." ; Text [ portuguese ] = "é um valor lógico que indica a forma da função. 0 devolve a função de distribuição cumulativa e 1 a distribuição." ; - Text [ finnish ] = "Kumuloitu. C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; + Text [ finnish ] = "Kumuloitu C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; Text [ danish ] = "Kumulativ. K = 0 beregner tæthedsfunktionen, K = 1 fordelingen." ; Text [ french ] = "Cumulative. C = 0 calcule la fonction de densité, C = 1 la distribution." ; Text [ swedish ] = "Kumulerat. K = 0 beräknar täthetsfunktionen, K = 1 fördelningen." ; @@ -28262,7 +29165,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Cumulativo. C = 0 calcula la función de densidad, C = 1 la distribución." ; Text [ english_us ] = "Cumulated. C=0 calculates the density function, C=1 the distribution." ; Text[ chinese_simplified ] = "指定函数类型的逻辑值。 K = 0 为密度函数， \nK = 1 为累积分布函数。"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, êîòîðîå óêàçûâàåò, ôóíêöèþ êàêîãî âèäà èñïîëüçîâàòü: ôóíêöèþ ïëîòíîñòè (0) èëè ôóíêöèþ ðàñïðåäåëåíèÿ (1)."; + Text[ russian ] = "Èíòåãðàëüíûé. È=0 âû÷èñëÿåò ôóíêöèþ ïëîòíîñòè, È=1 - ðàñïðåäåëåíèå."; Text[ polish ] = "Skumulowany. 0 wyznacza gêstoœæ, 1 - rozk³ad."; Text[ japanese ] = "関数形å¼ã€‚é–¢æ•°å½¢å¼ = 0 ã¯ç´¯ç©ç¢ºçŽ‡ã€é–¢æ•°å½¢å¼ = 1 ã¯ç¢ºçŽ‡å¯†åº¦ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "指定函數類型的é‚輯值。 K = 0 ç‚ºå¯†åº¦å‡½æ•¸ï¹ K = 1 為累ç©åˆ†ä½ˆå‡½æ•¸ã€‚"; @@ -28274,6 +29177,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kümülasyon. K = 0 yoðunluk fonksiyonunu, K = 1 ise daðýtýmý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Acumulat. C=0 calcula la funció de densitat; C=1, la distribució."; + Text[ thai ] = "สะสม C=0 คำนวณฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸„วามหนาà¹à¸™à¹ˆà¸™, C=1 à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; }; // -=*# Resource for function GAMMAVERT #*=- @@ -28287,7 +29191,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione gamma." ; Text [ portuguese_brazilian ] = "Werte der Gamma-Verteilung" ; Text [ portuguese ] = "Devolve a distribuição gama." ; - Text [ finnish ] = "Gamma-jakauman arvot." ; + Text [ finnish ] = "Gamma-jakauman arvot" ; Text [ danish ] = "Værdier for gammafordelingen" ; Text [ french ] = "Valeurs de la distribution Gamma." ; Text [ swedish ] = "Värden för gammafördelningen." ; @@ -28295,7 +29199,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria siguiendo una distribución gamma" ; Text [ english_us ] = "Values of the gamma distribution." ; Text[ chinese_simplified ] = "计算伽玛分布。"; - Text[ russian ] = "Âîçâðàùàåò ãàììà-ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèÿ ãàììà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wartoœci rozk³adu gamma"; Text[ japanese ] = "ガンマ分布関数ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算伽瑪分佈。"; @@ -28307,6 +29211,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Gamma daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució gamma."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; ExtraData = { @@ -28342,6 +29247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -28359,7 +29265,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor al que desea evaluar la distribución." ; Text [ english_us ] = "The value for which the gamma distribution is to be calculated." ; Text[ chinese_simplified ] = "用æ¥è®¡ç®—伽玛分布的数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü ãàììà-ðàñïðåäåëåíèå."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad gamma."; Text[ japanese ] = "関数ã«ä»£å…¥ã™ã‚‹å€¤ã€‚"; Text[ chinese_traditional ] = "用來計算伽瑪分佈的數值。"; @@ -28371,6 +29277,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Gamma daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució gamma del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; String 4 // Name of Parameter 2 { @@ -28400,6 +29307,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 5 // Description of Parameter 2 { @@ -28409,26 +29317,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il parametro alfa della distribuzione gamma." ; Text [ portuguese_brazilian ] = "Der Parameter Alpha der Gamma-Verteilung." ; Text [ portuguese ] = "é o parâmetro alfa da distribuição gama." ; - Text [ finnish ] = "Gamma-jakauman alfa-parametri." ; + Text [ finnish ] = "Gamma-jakauman alfa-parametri" ; Text [ danish ] = "Parameter alfa i gammafordelingen." ; Text [ french ] = "Le paramètre Alpha de la distribution Gamma." ; Text [ swedish ] = "Parametern alfa till fördelningen." ; - Text [ dutch ] = "De paramter Alfa van de gamma-verdeling." ; + Text [ dutch ] = "De parameter Alfa van de gamma-verdeling." ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Alpha parameter of the Gamma distribution." ; Text[ chinese_simplified ] = "伽玛分布的å‚数阿尔法。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ïàðàìåòð Àëüôà ãàììà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr alfa w rozk³adzie gamma."; Text[ japanese ] = "分布ã«å¯¾ã™ã‚‹ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "伽瑪分佈的åƒæ•¸é˜¿çˆ¾æ³•ã€‚"; Text[ arabic ] = "ÇáãÚáãÉ ÃáÝÇ áÊæÒíÚ ÛÇãÇ."; - Text[ dutch ] = "De paramter Alfa van de gamma-verdeling."; + Text[ dutch ] = "De parameter Alfa van de gamma-verdeling."; Text[ chinese_simplified ] = "伽玛分布的å‚数阿尔法。"; Text[ greek ] = "Ç ðáñÜìåôñïò ¢ëöá ôçò êáôáíïìÞò ÃÜììá."; - Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ 파ë¼ë¯¸í„° 알파."; + Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ 알파 매개 변수."; Text[ turkish ] = "Gamma daðýtýmýnýn alfa parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre alfa de la distribució gamma."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¸à¸±à¸¥à¸Ÿà¹ˆà¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; String 6 // Name of Parameter 3 { @@ -28442,7 +29351,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Beta" ; Text [ french ] = "Bêta" ; Text [ swedish ] = "beta" ; - Text [ dutch ] = "Beta" ; + Text [ dutch ] = "Bèta" ; Text [ spanish ] = "beta" ; Text [ english_us ] = "beta" ; Text[ chinese_simplified ] = "beta"; @@ -28451,13 +29360,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "β"; Text[ chinese_traditional ] = "beta"; Text[ arabic ] = "Beta"; - Text[ dutch ] = "Beta"; + Text[ dutch ] = "Bèta"; Text[ chinese_simplified ] = "beta"; Text[ greek ] = "ÂÞôá"; Text[ korean ] = "ë² íƒ€"; Text[ turkish ] = "Beta"; Text[ language_user1 ] = " "; Text[ catalan ] = "beta"; + Text[ thai ] = "เบต้า"; }; String 7 // Description of Parameter 3 { @@ -28467,26 +29377,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il parametro beta della distribuzione gamma." ; Text [ portuguese_brazilian ] = "Der Parameter Beta der Gamma-Verteilung." ; Text [ portuguese ] = "é o parâmetro beta da distribuição gama." ; - Text [ finnish ] = "Gamma-jakauman beeta-parametri." ; + Text [ finnish ] = "Gamma-jakauman beeta-parametri" ; Text [ danish ] = "Parameter beta i gammafordelingen." ; Text [ french ] = "Le paramètre Bêta de la distribution Gamma." ; Text [ swedish ] = "Parametern beta för gammafördelningen." ; - Text [ dutch ] = "De parameter Beta van de gamma-verdeling." ; + Text [ dutch ] = "De parameter Bèta van de gamma-verdeling." ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Beta parameter of the Gamma distribution." ; Text[ chinese_simplified ] = "伽玛分布的å‚æ•°è´å¡”。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ïàðàìåòð Áåòà ãàììà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr beta w rozk³adzie gamma."; Text[ japanese ] = "分布ã«å¯¾ã™ã‚‹ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "伽瑪分佈的åƒæ•¸è²å¡”。"; Text[ arabic ] = "ÇáãÚáãÉ ÈíÊÇ áÊæÒíÚ ÛÇãÇ."; - Text[ dutch ] = "De parameter Beta van de gamma-verdeling."; + Text[ dutch ] = "De parameter Bèta van de gamma-verdeling."; Text[ chinese_simplified ] = "伽玛分布的å‚æ•°è´å¡”。"; Text[ greek ] = "Ç ðáñÜìåôñïò ÂÞôá ôçò êáôáíïìÞò ÃÜììá."; - Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ 파ë¼ë¯¸í„° ë² íƒ€."; + Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ ë² íƒ€ 매개 변수."; Text[ turkish ] = "Gamma daðýtýmýnýn beta parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre beta de la distribució gamma."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¹€à¸šà¸•à¹‰à¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; String 8 // Name of Parameter 4 { @@ -28504,7 +29415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "acum" ; Text [ english_us ] = "C" ; Text[ chinese_simplified ] = "cumulative"; - Text[ russian ] = "Èíòåãðàëüíûé"; + Text[ russian ] = "È"; Text[ polish ] = "Skumulowany"; Text[ japanese ] = "関数形å¼"; Text[ chinese_traditional ] = "cumulative"; @@ -28516,6 +29427,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "C"; Text[ language_user1 ] = " "; Text[ catalan ] = "C"; + Text[ thai ] = "C"; }; String 9 // Description of Parameter 4 { @@ -28525,7 +29437,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore = 0 viene calcolata la densità di probabilità, se = 1 viene calcolata la distribuzione cumulativa." ; Text [ portuguese_brazilian ] = "Kumuliert. K = 0 berechnet die Dichtefunktion, K = 1 die Verteilung." ; Text [ portuguese ] = "é um valor lógico que determina o modo da função. 0 devolve a função cumulativa; 1 devolve a distribuição." ; - Text [ finnish ] = "Kumuloitu. C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; + Text [ finnish ] = "Kumuloitu C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; Text [ danish ] = "Kumulativ. K = 0 beregner tæthedsfunktionen, K = 1 fordelingen." ; Text [ french ] = "Cumulative. C = 0 calcule la fonction de densité, C = 1 la distribution." ; Text [ swedish ] = "Kumulerat. K = 0 beräknar täthetsfunktionen, K = 1 fördelningen." ; @@ -28533,7 +29445,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un valor lógico que determina la forma de la función. Si es 0 devuelve la función de distribución acumulativa, si es 1 devuelve la distribución." ; Text [ english_us ] = "Cumulated. C=0 calculates the density function, C=1 the distribution." ; Text[ chinese_simplified ] = "指定函数类型的逻辑值。 K = 0 为密度函数， \nK = 1 为累积分布函数。"; - Text[ russian ] = "Ëîãè÷åñêîå çíà÷åíèå, îïðåäåëÿþùåå âèä ôóíêöèè: ôóíêöèÿ ïëîòíîñòè (0) èëè ôóíêöèÿ ðàñïðåäåëåíèÿ (1)."; + Text[ russian ] = "Èíòåãðàëüíûé. È=0 âû÷èñëÿåò ôóíêöèþ ïëîòíîñòè, È=1 - ðàñïðåäåëåíèå."; Text[ polish ] = "Skumulowany. 0 wyznacza gêstoœæ, 1 - rozk³ad."; Text[ japanese ] = "関数形å¼ã€‚é–¢æ•°å½¢å¼ = 0 ã¯å¯†åº¦é–¢æ•°ã€é–¢æ•°å½¢å¼ = 1 ã¯åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "指定函數類型的é‚輯值。 K = 0 ç‚ºå¯†åº¦å‡½æ•¸ï¹ K = 1 為累ç©åˆ†ä½ˆå‡½æ•¸ã€‚"; @@ -28545,6 +29457,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kümülasyon. K = 0 yoðunluk fonksiyonunu, K = 1 ise daðýtýmý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Acumulat. C=0 calcula la funció de densitat; C=1, la distribució."; + Text[ thai ] = "สะสม C=0 คำนวณฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸„วามหนาà¹à¸™à¹ˆà¸™, C=1 à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; }; // -=*# Resource for function GAMMAINV #*=- @@ -28558,7 +29471,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce l'inversa della distribuzione gamma." ; Text [ portuguese_brazilian ] = "Werte der inversen Gamma-Verteilung" ; Text [ portuguese ] = "Devolve o inverso da distribuição cumulativa gama." ; - Text [ finnish ] = "Käänteisen gamma-jakauman arvot." ; + Text [ finnish ] = "Käänteisen gamma-jakauman arvot" ; Text [ danish ] = "Værdier for den inverse gammafordeling" ; Text [ french ] = "Valeurs de la distribution Gamma inverse." ; Text [ swedish ] = "Värden för den inversa gammafördelningen." ; @@ -28566,7 +29479,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve, para una probabilidad dada, el valor inverso de la variable aleatoria siguiendo una distribución gamma acumulativa" ; Text [ english_us ] = "Values of the inverse gamma distribution." ; Text[ chinese_simplified ] = "伽玛分布的逆函数值。"; - Text[ russian ] = "Âîçâðàùàåò îáðàòíîå ãàììà-ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèÿ îáðàòíîãî ãàììà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza odwrotnoœæ rozk³adu gamma"; Text[ japanese ] = "ガンマ分布ã®ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "伽瑪分佈的逆函數值。"; @@ -28578,6 +29491,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters gamma daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució gamma inversa."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; ExtraData = { @@ -28613,6 +29527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -28630,7 +29545,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la probabilidad asociada con la distribución gamma." ; Text [ english_us ] = "The probability value for which the inverse gamma distribution is to be calculated." ; Text[ chinese_simplified ] = "伽玛分布的概率值。"; - Text[ russian ] = "Âåðîÿòíîñòü, ñâÿçàííàÿ ñ ãàììà-ðàñïðåäåëåíèåì."; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî âû÷èñëÿåòñÿ îáðàòíîå ãàììà-ðàñïðåäåëåíèå. "; Text[ polish ] = "Prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ rozk³adu gamma."; Text[ japanese ] = "関数ã«ä»£å…¥ã™ã‚‹ç¢ºçŽ‡ã€‚"; Text[ chinese_traditional ] = "伽瑪分佈的概率值。"; @@ -28642,6 +29557,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters gamma daðýtýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució gamma inversa del qual s'ha de calcular."; + Text[ thai ] = "ค่าความน่าจะเป็นสำหรับคำนวณà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; String 4 // Name of Parameter 2 { @@ -28671,6 +29587,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 5 // Description of Parameter 2 { @@ -28680,7 +29597,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Parametro alfa per la distribuzione." ; Text [ portuguese_brazilian ] = "Der Parameter Alpha der Gamma-Verteilung." ; Text [ portuguese ] = "é o parâmetro alfa da distribuição gama." ; - Text [ finnish ] = "Gamma-jakauman alfa-parametri." ; + Text [ finnish ] = "Gamma-jakauman alfa-parametri" ; Text [ danish ] = "Parameter alfa i gammafordelingen." ; Text [ french ] = "Le paramètre Alpha de la distribution Gamma." ; Text [ swedish ] = "Parametern alfa till gammafördelningen." ; @@ -28688,7 +29605,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Alpha parameter of the Gamma distribution." ; Text[ chinese_simplified ] = "伽玛分布的å‚数阿尔法。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ïàðàìåòð Àëüôà ãàììà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr alfa rozk³adu gamma."; Text[ japanese ] = "ガンマ分布ã®ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "伽瑪分佈的åƒæ•¸é˜¿çˆ¾æ³•ã€‚"; @@ -28696,10 +29613,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De parameter Alfa van de gamma-verdeling."; Text[ chinese_simplified ] = "伽玛分布的å‚数阿尔法。"; Text[ greek ] = "Ç ðáñÜìåôñïò ¢ëöá ôçò êáôáíïìÞò ÃÜììá."; - Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ 파ë¼ë¯¸í„° 알파."; + Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ 알파 매개 변수."; Text[ turkish ] = "Gamma daðýtýmýnýn alfa parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre alfa de la distribució gamma."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¸à¸±à¸¥à¸Ÿà¹ˆà¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; String 6 // Name of Parameter 3 { @@ -28713,7 +29631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Beta" ; Text [ french ] = "Bêta" ; Text [ swedish ] = "beta" ; - Text [ dutch ] = "Beta" ; + Text [ dutch ] = "Bèta" ; Text [ spanish ] = "beta" ; Text [ english_us ] = "beta" ; Text[ chinese_simplified ] = "beta"; @@ -28722,13 +29640,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "β"; Text[ chinese_traditional ] = "beta"; Text[ arabic ] = "Beta"; - Text[ dutch ] = "Beta"; + Text[ dutch ] = "Bèta"; Text[ chinese_simplified ] = "beta"; Text[ greek ] = "ÂÞôá"; Text[ korean ] = "ë² íƒ€"; Text[ turkish ] = "Beta"; Text[ language_user1 ] = " "; Text[ catalan ] = "beta"; + Text[ thai ] = "เบต้า"; }; String 7 // Description of Parameter 3 { @@ -28738,26 +29657,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Parametro beta per la distribuzione." ; Text [ portuguese_brazilian ] = "Der Parameter Beta der Gamma-Verteilung." ; Text [ portuguese ] = "é o parâmetro beta da distribuição gama." ; - Text [ finnish ] = "Gamma-jakauman beeta-parametri." ; + Text [ finnish ] = "Gamma-jakauman beeta-parametri" ; Text [ danish ] = "Parameter beta i gammafordelingen." ; Text [ french ] = "Le paramètre Bêta de la distribution Gamma." ; Text [ swedish ] = "Parametern beta till gammafördelningen." ; - Text [ dutch ] = "De parameter Beta van de gamma-verdeling." ; + Text [ dutch ] = "De parameter Bèta van de gamma-verdeling." ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Beta parameter of the Gamma distribution." ; Text[ chinese_simplified ] = "伽玛分布的å‚æ•°è´å¡”。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ïàðàìåòð Áåòà ãàììà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr beta rozk³adu gamma."; Text[ japanese ] = "ガンマ分布ã®ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "伽瑪分佈的åƒæ•¸è²å¡”。"; Text[ arabic ] = "ÇáãÚáãÉ ÈíÊÇ áÊæÒíÚ ÛÇãÇ."; - Text[ dutch ] = "De parameter Beta van de gamma-verdeling."; + Text[ dutch ] = "De parameter Bèta van de gamma-verdeling."; Text[ chinese_simplified ] = "伽玛分布的å‚æ•°è´å¡”。"; Text[ greek ] = "Ç ðáñÜìåôñïò ÂÞôá ôçò êáôáíïìÞò ÃÜììá."; - Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ 파ë¼ë¯¸í„° ë² íƒ€."; + Text[ korean ] = "ê°ë§ˆ 분í¬ì˜ ë² íƒ€ 매개 변수."; Text[ turkish ] = "Gamma daðýtýmýnýn beta parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre beta de la distribució gamma."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¹€à¸šà¸•à¹‰à¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹à¸à¸¡à¸¡à¹ˆà¸²"; }; }; // -=*# Resource for function GAMMALN #*=- @@ -28771,7 +29691,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce il logaritmo naturale di una funzione gamma." ; Text [ portuguese_brazilian ] = "Logarithmische Werte der Gamma-Funktion" ; Text [ portuguese ] = "Devolve o logaritmo natural da função gama." ; - Text [ finnish ] = "Palauttaa gamma-toiminnon luonnollisen logaritmin." ; + Text [ finnish ] = "Palauttaa gamma-funktion luonnollisen logaritmin." ; Text [ danish ] = "Logaritmeværdier til gammafunktionen." ; Text [ french ] = "Renvoie le logarithme népérien de la fonction Gamma." ; Text [ swedish ] = "Logaritmiska värden för gammafunktionen." ; @@ -28791,6 +29711,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Gamma fonksiyonunun logaritmik deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el logaritme natural de la funció gamma."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸¥à¸à¸à¸²à¸£à¸´à¸˜à¸¶à¸¡à¹à¸šà¸šà¸˜à¸£à¸£à¸¡à¸Šà¸²à¸•à¸´à¸‚à¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™à¹à¸à¸¡à¸¡à¹ˆà¸²"; }; ExtraData = { @@ -28826,6 +29747,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -28836,7 +29758,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore per il quale si desidera calcolare il logaritmo naturale della funzione gamma." ; Text [ portuguese_brazilian ] = "Der Wert, zu dem der nat?liche Logarithmus der Gamma-Funktion berechnet werden soll." ; Text [ portuguese ] = "é o valor para o qual deseja calcular o logaritmo natural gama (LNGAMA)." ; - Text [ finnish ] = "Arvo, jolle gamma-toiminnon luonnollinen logaritmi lasketaan." ; + Text [ finnish ] = "Arvo, jolle gamma-funktion luonnollinen logaritmi lasketaan." ; Text [ danish ] = "Den værdi som gammafunktionens naturlige logaritme skal beregnes for." ; Text [ french ] = "La valeur pour laquelle vous voulez calculer le logarithme népérien de la fonction Gamma." ; Text [ swedish ] = "Värdet som den naturliga logaritmen för gammafunktionen skall beräknas för." ; @@ -28844,7 +29766,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor cuya función GAMMA.LN desea calcular." ; Text [ english_us ] = "The value for which the natural logarithm of the gamma function is to be calculated." ; Text[ chinese_simplified ] = "需è¦è®¡ç®—伽玛函数的自然对数的数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî íåîáõîäèìî âû÷èñëèòü íàòóðàëüíûé ëîãàðèôì ãàììà-ôóíêöèè."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ íàòóðàëüíûé ëîãàðèôì ãàììà-ôóíêöèè."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad liniowy gamma (GAMMLN)."; Text[ japanese ] = "関数ã«ä»£å…¥ã™ã‚‹æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "需è¦è¨ˆç®—伽瑪函數的自然å°æ•¸çš„數值。"; @@ -28856,6 +29778,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Gamma fonksiyonunun doðal logaritmasýnýn hesaplanacaðý deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor el logaritme natural de la funció gamma del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณลà¸à¸à¸²à¸£à¸´à¸˜à¸¶à¸¡à¹à¸šà¸šà¸˜à¸£à¸£à¸¡à¸Šà¸²à¸•à¸´à¸‚à¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™à¹à¸à¸¡à¸¡à¹ˆà¸²"; }; }; // -=*# Resource for function BETAVERT #*=- @@ -28869,26 +29792,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione beta." ; Text [ portuguese_brazilian ] = "Werte der Beta-Verteilung" ; Text [ portuguese ] = "Devolve a função de densidade da probabilidade beta cumulativa." ; - Text [ finnish ] = "Beeta-jakauman arvot." ; + Text [ finnish ] = "Beeta-jakauman arvot" ; Text [ danish ] = "Værdier for betafordelingen" ; Text [ french ] = "Valeurs de la distribution Bêta." ; Text [ swedish ] = "Betafördelningens värden." ; - Text [ dutch ] = "Waarden van de beta-verdeling" ; + Text [ dutch ] = "Waarden van de bèta-verdeling" ; Text [ spanish ] = "Devuelve la probabilidad para una variable aleatoria continua siguiendo una función de densidad de probabilidad beta acumulativa" ; Text [ english_us ] = "Values of the beta distribution." ; Text[ chinese_simplified ] = "è´å¡”分布累积函数的函数值。"; - Text[ russian ] = "Âîçâðàùàåò èíòåãðàëüíóþ ôóíêöèþ ïëîòíîñòè áåòà-âåðîÿòíîñòè."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå Áåòà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wartoœci podzia³u beta."; Text[ japanese ] = "ベータ分布ã®åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "è²å¡”分佈累ç©å‡½æ•¸çš„函數值。"; Text[ arabic ] = "Þíã ÊæÒíÚ ÈíÊÇ."; - Text[ dutch ] = "Waarden van de beta-verdeling"; + Text[ dutch ] = "Waarden van de bèta-verdeling"; Text[ chinese_simplified ] = "è´å¡”分布累积函数的函数值。"; Text[ greek ] = "ÔéìÝò ôçò êáôáíïìÞò ÂÞôá."; Text[ korean ] = "ë² íƒ€ 분í¬ì˜ ê°’"; Text[ turkish ] = "Beta daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució beta."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; ExtraData = { @@ -28924,6 +29848,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -28937,22 +29862,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Den værdi som betafordelingen skal beregnes for." ; Text [ french ] = "La valeur à laquelle la distribution Bêta doit être calculée." ; Text [ swedish ] = "Värdet för vilket betafördelningen skall beräknas." ; - Text [ dutch ] = "De waarde waarbij de beta-verdeling moet worden berekend." ; + Text [ dutch ] = "De waarde waarbij de bèta-verdeling moet worden berekend." ; Text [ spanish ] = "es el valor dentro del intervalo [A, B] con el que se evalúa la función." ; Text [ english_us ] = "The value for which the beta distribution is to be calculated." ; Text[ chinese_simplified ] = "用æ¥è¿›è¡Œè´å¡”-分布函数计算的数值。"; - Text[ russian ] = "Çíà÷åíèå â èíòåðâàëå ìåæäó À è Â, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ôóíêöèÿ."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ Áåòà-ðàñïðåäåëåíèå."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad beta."; Text[ japanese ] = "関数を使用ã—ã¦è©•ä¾¡ã™ã‚‹æ•°å€¤ã€‚"; Text[ chinese_traditional ] = "用來進行è²å¡”分佈函數計算的數值。"; Text[ arabic ] = "ÇáÞíãÉ ÇáÊí ÊÑíÏ ÍÓÇÈ ÊæÒíÚ ÈíÊÇ áåÇ."; - Text[ dutch ] = "De waarde waarbij de beta-verdeling moet worden berekend."; + Text[ dutch ] = "De waarde waarbij de bèta-verdeling moet worden berekend."; Text[ chinese_simplified ] = "用æ¥è¿›è¡Œè´å¡”-分布函数计算的数值。"; Text[ greek ] = "Ç ôéìÞ ôçò ïðïßáò èá õðïëïãéóôåß ç êáôáíïìÞ ÂÞôá."; Text[ korean ] = "ë² íƒ€ 분í¬ê°€ 계산ë˜ì–´ì•¼ í• ê°’"; Text[ turkish ] = "Beta daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució beta del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; String 4 // Name of Parameter 2 { @@ -28982,6 +29908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 5 // Description of Parameter 2 { @@ -28991,26 +29918,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Parametro alfa per la distribuzione." ; Text [ portuguese_brazilian ] = "Der Parameter Alpha der Beta-Verteilung." ; Text [ portuguese ] = "é o parâmetro alfa da distribuição-beta." ; - Text [ finnish ] = "Beeta-jakauman alfa-parametri." ; + Text [ finnish ] = "Beeta-jakauman alfa-parametri" ; Text [ danish ] = "Parameter alfa i betafordelingen." ; Text [ french ] = "Le paramètre Alpha de la distribution Bêta." ; Text [ swedish ] = "Parametern alfa för betafördelningen." ; - Text [ dutch ] = "De parameter alfa van de beta-verdeling" ; + Text [ dutch ] = "De parameter alfa van de bèta-verdeling" ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Alpha parameter of the Beta distribution." ; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡é˜¿å°”法。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Àëüôà-ïàðàìåòð Áåòà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr alfa w rozk³adzie beta."; Text[ japanese ] = "ベータ分布ã®ã‚¢ãƒ«ãƒ•ã‚¡ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "è²å¡”分佈的åƒè®Šé‡é˜¿çˆ¾æ³•ã€‚"; Text[ arabic ] = "ÇáãÚáãÉ ÃáÝÇ áÊæÒíÚ ÈíÊÇ."; - Text[ dutch ] = "De parameter alfa van de beta-verdeling"; + Text[ dutch ] = "De parameter alfa van de bèta-verdeling"; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡é˜¿å°”法。"; Text[ greek ] = "Ç ðáñÜìåôñïò ¢ëöá ôçò êáôáíïìÞò ÂÞôá."; - Text[ korean ] = "ë² íƒ€ 분í¬ì˜ 파ë¼ë¯¸í„° 알파"; + Text[ korean ] = "ë² íƒ€ 분í¬ì˜ 알파 매개 변수."; Text[ turkish ] = "Beta daðýtýmýnýn alfa parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre alfa de la distribució beta."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¸à¸±à¸¥à¸Ÿà¹ˆà¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; String 6 // Name of Parameter 3 { @@ -29024,7 +29952,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Beta" ; Text [ french ] = "Bêta" ; Text [ swedish ] = "beta" ; - Text [ dutch ] = "Beta" ; + Text [ dutch ] = "Bèta" ; Text [ spanish ] = "beta" ; Text [ english_us ] = "beta" ; Text[ chinese_simplified ] = "beta"; @@ -29033,13 +29961,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "β"; Text[ chinese_traditional ] = "beta"; Text[ arabic ] = "Beta"; - Text[ dutch ] = "Beta"; + Text[ dutch ] = "Bèta"; Text[ chinese_simplified ] = "beta"; Text[ greek ] = "ÂÞôá"; Text[ korean ] = "ë² íƒ€"; Text[ turkish ] = "Beta"; Text[ language_user1 ] = " "; Text[ catalan ] = "beta"; + Text[ thai ] = "เบต้า"; }; String 7 // Description of Parameter 3 { @@ -29049,26 +29978,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Parametro beta per la distribuzione." ; Text [ portuguese_brazilian ] = "Der Parameter Beta der Beta-Verteilung." ; Text [ portuguese ] = "é o parâmetro da distribuição-beta." ; - Text [ finnish ] = "Beeta-jakauman beeta-parametri." ; + Text [ finnish ] = "Beeta-jakauman beeta-parametri" ; Text [ danish ] = "Parameter beta i betafordelingen." ; Text [ french ] = "Le paramètre Bêta de la distribution Bêta." ; Text [ swedish ] = "Parametern beta för betafördelningen." ; - Text [ dutch ] = "De parameter beta van de beta-verdeling" ; + Text [ dutch ] = "De parameter bèta van de bèta-verdeling" ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Beta parameter of the Beta distribution." ; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡è´å¡”。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Áåòà-ïàðàìåòð Áåòà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr beta w rozk³adzie beta."; Text[ japanese ] = "ベータ分布ã®ãƒ™ãƒ¼ã‚¿ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "è²å¡”分佈的åƒè®Šé‡è²å¡”。"; Text[ arabic ] = "ÇáãÚáãÉ ÈíÊÇ áÊæÒíÚ ÈíÊÇ."; - Text[ dutch ] = "De parameter beta van de beta-verdeling"; + Text[ dutch ] = "De parameter bèta van de bèta-verdeling"; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡è´å¡”。"; Text[ greek ] = "Ç ðáñÜìåôñïò ÂÞôá ôçò êáôáíïìÞò ÂÞôá."; - Text[ korean ] = "ë² íƒ€ 분í¬ì˜ 파ë¼ë¯¸í„° ë² íƒ€."; + Text[ korean ] = "ë² íƒ€ 분í¬ì˜ ë² íƒ€ 매개 변수."; Text[ turkish ] = "Beta daðýtýmýnýn beta parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre beta de la distribució beta."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¹€à¸šà¸•à¹‰à¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; String 8 // Name of Parameter 4 { @@ -29098,6 +30028,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Baþlangýç"; Text[ language_user1 ] = " "; Text[ catalan ] = "Inici"; + Text[ thai ] = "เริ่มต้น"; }; String 9 // Description of Parameter 4 { @@ -29108,7 +30039,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore d'inizio per l'intervallo di valori della distribuzione." ; Text [ portuguese_brazilian ] = "Der Anfangswert f? das Werteintervall der Verteilung." ; Text [ portuguese ] = "é um limite inferior opcional para o intervalo de x." ; - Text [ finnish ] = "Jakauman arvovälin aloitusarvo." ; + Text [ finnish ] = "Jakauman arvoalueen aloitusarvo." ; Text [ danish ] = "Startværdien for fordelingens værdiinterval." ; Text [ french ] = "La valeur initiale pour l'intervalle de valeurs de la distribution." ; Text [ swedish ] = "Startvärdet för fördelningens värdeintervall." ; @@ -29116,7 +30047,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un límite inferior opcional del intervalo de x." ; Text [ english_us ] = "The starting value for the value interval of the distribution." ; Text[ chinese_simplified ] = "分布的数值区间的下é™ã€‚"; - Text[ russian ] = "Íåîáÿçàòåëüíàÿ íèæíÿÿ ãðàíèöà èíòåðâàëà èçìåíåíèÿ x."; + Text[ russian ] = "Âåðõíÿÿ ãðàíèöà èíòåðâàëà ðàñïðåäåëåíèÿ."; Text[ polish ] = "Górna granica dla przedzia³u wartoœci rozk³adu."; Text[ japanese ] = "区間ã®ä¸‹é™ã€‚"; Text[ chinese_traditional ] = "分佈的數值å€é–“的下é™ã€‚"; @@ -29128,6 +30059,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Daðýtýmýn deðer aralýklarýnýn baþlangýç deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor inicial per a l'interval de valors de la distribució."; + Text[ thai ] = "à¸à¸²à¸£à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸„่าสำหรับช่วงขà¸à¸‡à¸„่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; String 10 // Name of Parameter 5 { @@ -29153,10 +30085,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Einde"; Text[ chinese_simplified ] = "end"; Text[ greek ] = "ÔÝëïò"; - Text[ korean ] = "종료"; + Text[ korean ] = "ë"; Text[ turkish ] = "Son"; Text[ language_user1 ] = " "; Text[ catalan ] = "Final"; + Text[ thai ] = "สิ้นสุด"; }; String 11 // Description of Parameter 5 { @@ -29167,7 +30100,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore finale per l'intervallo di valori della distribuzione." ; Text [ portuguese_brazilian ] = "Der Endwert f? das Werteintervall der Verteilung." ; Text [ portuguese ] = "é um limite superior opcional para o intervalo de x." ; - Text [ finnish ] = "Jakauman arvovälin viimeinen arvo." ; + Text [ finnish ] = "Jakauman arvovälin viimeinen arvo" ; Text [ danish ] = "Slutværdien for fordelingens værdiinterval." ; Text [ french ] = "La valeur finale pour l'intervalle de valeurs de la distribution." ; Text [ swedish ] = "Slutvärdet för fördelningens värdeintervall." ; @@ -29175,7 +30108,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un límite superior opcional del intervalo de x." ; Text [ english_us ] = "The final value for the value interval of the distribution." ; Text[ chinese_simplified ] = "分布的数值区间的上é™ã€‚"; - Text[ russian ] = "Íåîáÿçàòåëüíàÿ âåðõíÿÿ ãðàíèöà èíòåðâàëà èçìåíåíèÿ x."; + Text[ russian ] = "Âåðõíÿÿ ãðàíèöà èíòåðâàëà ðàñïðåäåëåíèÿ."; Text[ polish ] = "Dolna granica dla przedzia³u wartoœci rozk³adu."; Text[ japanese ] = "区間ã®ä¸Šé™ã€‚"; Text[ chinese_traditional ] = "分佈的數值å€é–“的上é™ã€‚"; @@ -29187,6 +30120,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Daðýtýmýn deðer aralýklarýnýn son deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor final per a l'interval de valors de la distribució."; + Text[ thai ] = "ค่าสุดท้ายสำหรับช่วงขà¸à¸‡à¸„่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; }; // -=*# Resource for function BETAINV #*=- @@ -29200,7 +30134,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce l'inversa della distribuzione beta." ; Text [ portuguese_brazilian ] = "Werte der inversen Beta-Verteilung" ; Text [ portuguese ] = "Devolve o inverso da função de densidade da probabilidade beta cumulativa." ; - Text [ finnish ] = "Käänteisen beeta-jakauman arvot." ; + Text [ finnish ] = "Käänteisen beeta-jakauman arvot" ; Text [ danish ] = "Værdier for den inverse betafordelingen" ; Text [ french ] = "Valeurs de la distribution Bêta inverse." ; Text [ swedish ] = "Värden för den inversa betafördelningen." ; @@ -29208,7 +30142,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve, para una probabilidad dada, el valor de la variable aleatoria siguiendo una distribución beta." ; Text [ english_us ] = "Values of the inverse beta distribution." ; Text[ chinese_simplified ] = "è´å¡”分布累积函数的逆函数值"; - Text[ russian ] = "Âîçâðàùàåò îáðàòíóþ ôóíêöèþ ê èíòåãðàëüíîé ôóíêöèè ïëîòíîñòè áåòà-âåðîÿòíîñòè."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå îáðàòíîãî Áåòà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza odwrotnoœæ rozk³adu beta"; Text[ japanese ] = "ベータ分布ã®ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "è²å¡”分佈累ç©å‡½æ•¸çš„逆函數值"; @@ -29220,6 +30154,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters beta daðýtýmýnýn deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució beta inversa."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; ExtraData = { @@ -29255,6 +30190,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -29268,22 +30204,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Sandsynligheden som den inverse betafordeling skal beregnes for." ; Text [ french ] = "La valeur de probabilité à laquelle la distribution bêta inverse doit être calculée." ; Text [ swedish ] = "Sannolikhetsvärdet för vilket betafördelningen skall beräknas." ; - Text [ dutch ] = "De kans die met de inverse beta-verdeling wordt berekend." ; + Text [ dutch ] = "De kans die met de inverse bèta-verdeling wordt berekend." ; Text [ spanish ] = "es una probabilidad asociada con la distribución beta." ; Text [ english_us ] = "The probability value for which the inverse beta distribution is to be calculated." ; Text[ chinese_simplified ] = "用于è´å¡”分布逆函数值计算的概率值。"; - Text[ russian ] = "Âåðîÿòíîñòü, ñâÿçàííàÿ ñ áåòà-ðàñïðåäåëåíèåì."; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî âû÷èñëÿåòñÿ îáðàòíîå Áåòà-ðàñïðåäåëåíèå."; Text[ polish ] = "Wyznacza prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ rozk³adu beta."; Text[ japanese ] = "ベータ分布ã®åˆ†å¸ƒé–¢æ•°ã®å€¤ã€‚"; Text[ chinese_traditional ] = "用於è²å¡”分佈逆函數值計算的概率值。"; Text[ arabic ] = "ÇáÇÍÊãÇá ÇáãÞÊÑä ãÚ ÊæÒíÚ ÈíÊÇ."; - Text[ dutch ] = "De kans die met de inverse beta-verdeling wordt berekend."; + Text[ dutch ] = "De kans die met de inverse bèta-verdeling wordt berekend."; Text[ chinese_simplified ] = "用于è´å¡”分布逆函数值计算的概率值。"; Text[ greek ] = "Ç ôéìÞ ðéèáíüôçôáò ãéá ôçí ïðïßá ðñüêåéôáé íá õðïëïãéóôåß ç áíôßóôñïöç êáôáíïìÞ ÂÞôá."; Text[ korean ] = "ì— ë² íƒ€ 분í¬ê°€ 계산ë˜ì–´ì•¼ í• í™•ë¥ ê°’."; Text[ turkish ] = "Ters beta daðýlýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució beta inversa del qual s'ha de calcular."; + Text[ thai ] = "ค่าความน่าจะเป็นสำหรับคำนวณà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; String 4 // Name of Parameter 2 { @@ -29313,6 +30250,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 5 // Description of Parameter 2 { @@ -29322,26 +30260,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Parametro alfa per la distribuzione." ; Text [ portuguese_brazilian ] = "Der Parameter Alpha der Beta-Verteilung." ; Text [ portuguese ] = "é o parâmetro alfa da distribuição-beta." ; - Text [ finnish ] = "Beeta-jakauman alfa-parametri." ; + Text [ finnish ] = "Beeta-jakauman alfa-parametri" ; Text [ danish ] = "Parameter alfa i betafordelingen." ; Text [ french ] = "Le paramètre Alpha de la distribution Bêta." ; Text [ swedish ] = "Parametern alfa för betafördelningen." ; - Text [ dutch ] = "De parameter alfa van de beta-verdeling." ; + Text [ dutch ] = "De parameter alfa van de bèta-verdeling." ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Alpha parameter of the Beta distribution." ; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡é˜¿å°”法。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Àëüôà-ïàðàìåòð Áåòà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr alfa w rozk³adzie beta."; Text[ japanese ] = "ベータ分布ã®ã‚¢ãƒ«ãƒ•ã‚¡ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "è²å¡”分佈的åƒè®Šé‡é˜¿çˆ¾æ³•ã€‚"; Text[ arabic ] = "ÇáãÚáãÉ ÃáÝÇ áÊæÒíÚ ÈíÊÇ."; - Text[ dutch ] = "De parameter alfa van de beta-verdeling."; + Text[ dutch ] = "De parameter alfa van de bèta-verdeling."; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡é˜¿å°”法。"; Text[ greek ] = "Ç ðáñÜìåôñïò ¢ëöá ôçò êáôáíïìÞò ÂÞôá."; - Text[ korean ] = "ë² íƒ€ 분í¬ì˜ 파ë¼ë¯¸í„° 알파．"; + Text[ korean ] = "ë² íƒ€ 분í¬ì˜ 알파 매개 변수．"; Text[ turkish ] = "Beta daðýtýmýn alfa parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre alfa de la distribució beta."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¸à¸±à¸¥à¸Ÿà¹ˆà¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; String 6 // Name of Parameter 3 { @@ -29355,7 +30294,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Beta" ; Text [ french ] = "Bêta" ; Text [ swedish ] = "beta" ; - Text [ dutch ] = "Beta" ; + Text [ dutch ] = "Bèta" ; Text [ spanish ] = "beta" ; Text [ english_us ] = "beta" ; Text[ chinese_simplified ] = "beta"; @@ -29364,13 +30303,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "β"; Text[ chinese_traditional ] = "beta"; Text[ arabic ] = "Beta"; - Text[ dutch ] = "Beta"; + Text[ dutch ] = "Bèta"; Text[ chinese_simplified ] = "beta"; Text[ greek ] = "ÂÞôá"; Text[ korean ] = "ë² íƒ€"; Text[ turkish ] = "Beta"; Text[ language_user1 ] = " "; Text[ catalan ] = "beta"; + Text[ thai ] = "เบต้า"; }; String 7 // Description of Parameter 3 { @@ -29380,26 +30320,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Parametro beta per la distribuzione." ; Text [ portuguese_brazilian ] = "Der Parameter Beta der Beta-Verteilung." ; Text [ portuguese ] = "é o parâmetro da distribuição-beta." ; - Text [ finnish ] = "Beeta-jakauman beeta-parametri." ; + Text [ finnish ] = "Beeta-jakauman beeta-parametri" ; Text [ danish ] = "Parameter beta i betafordelingen." ; Text [ french ] = "Le paramètre Bêta de la distribution Bêta." ; Text [ swedish ] = "Parametern beta för betafördelningen." ; - Text [ dutch ] = "De parameter beta van de beta-verdeling." ; + Text [ dutch ] = "De parameter bèta van de bèta-verdeling." ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Beta parameter of the Beta distribution." ; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡è´å¡”。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Áåòà-ïàðàìåòð Áåòà-ðàñïðåäåëåíèÿ."; Text[ polish ] = "Parametr beta w rozk³adzie beta."; Text[ japanese ] = "ベータ分布ã®ãƒ™ãƒ¼ã‚¿ãƒ‘ラメータ。"; Text[ chinese_traditional ] = "è²å¡”分佈的åƒè®Šé‡è²å¡”。"; Text[ arabic ] = "ÇáãÚáãÉ ÈíÊÇ áÊæÒíÚ ÈíÊÇ."; - Text[ dutch ] = "De parameter beta van de beta-verdeling."; + Text[ dutch ] = "De parameter bèta van de bèta-verdeling."; Text[ chinese_simplified ] = "è´å¡”分布的å‚å˜é‡è´å¡”。"; Text[ greek ] = "Ç ðáñÜìåôñïò ÂÞôá ôçò êáôáíïìÞò ÂÞôá."; - Text[ korean ] = "ë² íƒ€ 분í¬ì˜ 파ë¼ë¯¸í„° ë² íƒ€"; + Text[ korean ] = "ë² íƒ€ 분í¬ì˜ ë² íƒ€ 매개 변수."; Text[ turkish ] = "Beta daðýtýmýn beta parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre beta de la distribució beta."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¹€à¸šà¸•à¹‰à¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸šà¸•à¹‰à¸²"; }; String 8 // Name of Parameter 4 { @@ -29429,6 +30370,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Baþlangýç"; Text[ language_user1 ] = " "; Text[ catalan ] = "Inici"; + Text[ thai ] = "เริ่มต้น"; }; String 9 // Description of Parameter 4 { @@ -29439,7 +30381,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore facoltativo per l'intervallo dei valori della distribuzione." ; Text [ portuguese_brazilian ] = "Der Anfangswert f? das Werteintervall der Verteilung." ; Text [ portuguese ] = "é um limite inferior opcional para o intervalo de x." ; - Text [ finnish ] = "Jakauman arvovälin aloitusarvo." ; + Text [ finnish ] = "Jakauman arvovälin aloitusarvo" ; Text [ danish ] = "Startværdien for fordelingens værdiinterval." ; Text [ french ] = "La valeur initiale pour l'intervalle de valeurs de la distribution." ; Text [ swedish ] = "Startvärdet för fördelningens värdeintervall." ; @@ -29447,7 +30389,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un límite inferior opcional del intervalo de x." ; Text [ english_us ] = "The starting value for the value interval of the distribution." ; Text[ chinese_simplified ] = "分布的数值区间的下é™ã€‚"; - Text[ russian ] = "Íåîáÿçàòåëüíàÿ íèæíÿÿ ãðàíèöà èíòåðâàëà èçìåíåíèÿ x."; + Text[ russian ] = "Íèæíÿÿ ãðàíèöà èíòåðâàëà ðàñïðåäåëåíèÿ."; Text[ polish ] = "Górna granica dla przedzia³u wartoœci rozk³adu."; Text[ japanese ] = "区間ã®ä¸‹é™ã€‚"; Text[ chinese_traditional ] = "分佈的數值å€é–“的下é™ã€‚"; @@ -29459,6 +30401,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Daðýtýmýn deðer aralýklarýnýn baþlangýç deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor inicial per a l'interval de valors de la distribució."; + Text[ thai ] = "à¸à¸²à¸£à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸„่าสำหรับช่วงขà¸à¸‡à¸„่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; String 10 // Name of Parameter 5 { @@ -29476,7 +30419,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Fin" ; Text [ english_us ] = "End" ; Text[ chinese_simplified ] = "end"; - Text[ russian ] = "Â"; + Text[ russian ] = "B"; Text[ polish ] = "Koniec"; Text[ japanese ] = "上é™"; Text[ chinese_traditional ] = "End"; @@ -29484,10 +30427,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Einde"; Text[ chinese_simplified ] = "end"; Text[ greek ] = "ÔÝëïò"; - Text[ korean ] = "종료"; + Text[ korean ] = "ë"; Text[ turkish ] = "Son"; Text[ language_user1 ] = " "; Text[ catalan ] = "Final"; + Text[ thai ] = "สิ้นสุด"; }; String 11 // Description of Parameter 5 { @@ -29498,7 +30442,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore finale per l'intervallo dei valori della distribuzione." ; Text [ portuguese_brazilian ] = "Der Endwert f? das Werteintervall der Verteilung." ; Text [ portuguese ] = "é um limite superior opcional para o intervalo de x." ; - Text [ finnish ] = "Jakauman arvovälin viimeinen arvo." ; + Text [ finnish ] = "Jakauman arvovälin viimeinen arvo" ; Text [ danish ] = "Slutværdien for fordelingens værdiinterval." ; Text [ french ] = "La valeur finale pour l'intervalle de valeurs de la distribution." ; Text [ swedish ] = "Slutvärdet för fördelningens värdeintervall." ; @@ -29506,7 +30450,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un límite superior opcional del intervalo de x." ; Text [ english_us ] = "The final value for the value interval of the distribution." ; Text[ chinese_simplified ] = "分布的数值区间的上é™ã€‚"; - Text[ russian ] = "Íåîáÿçàòåëüíàÿ âåðõíÿÿ ãðàíèöà èíòåðâàëà èçìåíåíèÿ x."; + Text[ russian ] = "Âåðõíÿÿ ãðàíèöà èíòåðâàëà ðàñïðåäåëåíèÿ."; Text[ polish ] = "Dolna granica dla przedzia³u wartoœci rozk³adu."; Text[ japanese ] = "区間ã®ä¸Šé™ã€‚"; Text[ chinese_traditional ] = "分佈的數值å€é–“的上é™ã€‚"; @@ -29518,6 +30462,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Daðýtýmýn deðer aralýklarýnýn son deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor final per a l'interval de valors de la distribució."; + Text[ thai ] = "ค่าสุดท้ายสำหรับช่วงขà¸à¸‡à¸„่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; }; // -=*# Resource for function WEIBULL #*=- @@ -29539,7 +30484,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria siguiendo una distribución de Weibull" ; Text [ english_us ] = "Returns the values of the Weibull distribution." ; Text[ chinese_simplified ] = "韦伯分布"; - Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå ðàñïðåäåëåíèÿ Âåéáóëëà."; + Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå ðàñïðåäåëåíèÿ Âåéáóëëà."; Text[ polish ] = "Wyznacza rozk³ad Weibulla."; Text[ japanese ] = "ワイブル分布ã®åˆ†å¸ƒé–¢æ•°ã¾ãŸã¯å¯†åº¦é–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™"; Text[ chinese_traditional ] = "韋伯分佈"; @@ -29551,6 +30496,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Weibull daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna els valors de la distribució Weibull."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š Weibull "; }; ExtraData = { @@ -29586,6 +30532,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -29615,6 +30562,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Weibull daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució Weibull del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š Weibull "; }; String 4 // Name of Parameter 2 { @@ -29644,6 +30592,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 5 // Description of Parameter 2 { @@ -29653,7 +30602,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il parametro alfa della distribuzione Weibull." ; Text [ portuguese_brazilian ] = "Der Parameter Alpha der Weibull-Verteilung." ; Text [ portuguese ] = "é um parâmetro de distribuição." ; - Text [ finnish ] = "Weibull-jakauman alfa-parametri." ; + Text [ finnish ] = "Weibull-jakauman alfa-parametri" ; Text [ danish ] = "Parameter alfa i Weibull-fordelingen." ; Text [ french ] = "Le paramètre Alpha de la distribution Weibull." ; Text [ swedish ] = "Parametern alfa för Weibull-fördelningen." ; @@ -29661,7 +30610,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Alpha parameter of the Weibull distribution." ; Text[ chinese_simplified ] = "韦伯分布的阿尔法å‚数。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ Âåéáóëëà."; + Text[ russian ] = "Ïàðàìåòð Àëüôà ðàñïðåäåëåíèÿ Âåéáóëëà."; Text[ polish ] = "Parametr alfa rozk³adu Weibulla."; Text[ japanese ] = "ワイブル分布ã®ãƒ‘ラメータ｡"; Text[ chinese_traditional ] = "韋伯分佈的阿爾法åƒæ•¸ã€‚"; @@ -29669,10 +30618,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De parameter alfa van de Weibull-verdeling."; Text[ chinese_simplified ] = "韦伯分布的阿尔法å‚数。"; Text[ greek ] = "Ç ðáñÜìåôñïò ¢ëöá ôçò êáôáíïìÞò Weibull."; - Text[ korean ] = "Weibull 분í¬ì˜ 파ë¼ë¯¸í„° 알파."; + Text[ korean ] = "Weibull 분í¬ì˜ 알파 매개 변수."; Text[ turkish ] = "Weibull daðýtýmýnýn alfa parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre alfa de la distribució Weibull."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¸à¸±à¸¥à¸Ÿà¹ˆà¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š Weibull "; }; String 6 // Name of Parameter 3 { @@ -29686,7 +30636,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Beta" ; Text [ french ] = "Bêta" ; Text [ swedish ] = "beta" ; - Text [ dutch ] = "Beta" ; + Text [ dutch ] = "Bèta" ; Text [ spanish ] = "beta" ; Text [ english_us ] = "beta" ; Text[ chinese_simplified ] = "beta"; @@ -29695,13 +30645,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "β"; Text[ chinese_traditional ] = "Beta"; Text[ arabic ] = "Beta"; - Text[ dutch ] = "Beta"; + Text[ dutch ] = "Bèta"; Text[ chinese_simplified ] = "beta"; Text[ greek ] = "ÂÞôá"; Text[ korean ] = "ë² íƒ€"; Text[ turkish ] = "Beta"; Text[ language_user1 ] = " "; Text[ catalan ] = "beta"; + Text[ thai ] = "เบต้า"; }; String 7 // Description of Parameter 3 { @@ -29711,26 +30662,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il parametro beta della distribuzione Weibull." ; Text [ portuguese_brazilian ] = "Der Parameter Beta der Weibull-Verteilung." ; Text [ portuguese ] = "é o parâmetro beta de distribuição." ; - Text [ finnish ] = "Weibull-jakauman beeta-parametri." ; + Text [ finnish ] = "Weibull-jakauman beeta-parametri" ; Text [ danish ] = "Parameter beta i Weibull-fordelingen." ; Text [ french ] = "Le paramètre Bêta de la distribution Weibull." ; Text [ swedish ] = "Parametern beta för Weibull-fördelningen." ; - Text [ dutch ] = "De parameter beta van de Weibull-verdeling." ; + Text [ dutch ] = "De parameter bèta van de Weibull-verdeling." ; Text [ spanish ] = "es un parámetro de la distribución." ; Text [ english_us ] = "The Beta parameter of the Weibull distribution." ; Text[ chinese_simplified ] = "韦伯分布的è´å¡”å‚数。"; - Text[ russian ] = "Ïàðàìåòð ðàñïðåäåëåíèÿ Âåéáóëëà."; + Text[ russian ] = "Ïàðàìåòð Áåòà ðàñïðåäåëåíèÿ Âåéáóëëà."; Text[ polish ] = "Parametr beta rozk³adu Weibulla."; Text[ japanese ] = "ワイブル分布ã®ãƒ‘ラメータ｡"; Text[ chinese_traditional ] = "韋伯分佈的è²å¡”åƒæ•¸ã€‚"; Text[ arabic ] = "ãÚáãÉ ááÊæÒíÚ."; - Text[ dutch ] = "De parameter beta van de Weibull-verdeling."; + Text[ dutch ] = "De parameter bèta van de Weibull-verdeling."; Text[ chinese_simplified ] = "韦伯分布的è´å¡”å‚数。"; Text[ greek ] = "Ç ðáñÜìåôñïò ÂÞôá ôçò êáôáíïìÞò Weibull."; - Text[ korean ] = "Weibull 분í¬ì˜ 파ë¼ë¯¸í„° ë² íƒ€."; + Text[ korean ] = "Weibull 분í¬ì˜ ë² íƒ€ 매개 변수."; Text[ turkish ] = "Weibull daðýtýmýnýn beta parametresi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Paràmetre beta de la distribució Weibull."; + Text[ thai ] = "พารามิเตà¸à¸£à¹Œà¹€à¸šà¸•à¹‰à¸²à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š Weibull "; }; String 8 // Name of Parameter 4 { @@ -29748,7 +30700,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "acumulado" ; Text [ english_us ] = "C" ; Text[ chinese_simplified ] = "cumulative"; - Text[ russian ] = "Èíòåãðàëüíûé"; + Text[ russian ] = "È"; Text[ polish ] = "Skumulowany"; Text[ japanese ] = "関数形å¼"; Text[ chinese_traditional ] = "cumulative"; @@ -29760,6 +30712,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "C"; Text[ language_user1 ] = " "; Text[ catalan ] = "C"; + Text[ thai ] = "C"; }; String 9 // Description of Parameter 4 { @@ -29769,7 +30722,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore = 0 calcola la densità di probabilità, se è = 1 la distribuzione." ; Text [ portuguese_brazilian ] = "Kumuliert. K = 0 berechnet die Dichtefunktion, K = 1 die Verteilung." ; Text [ portuguese ] = "é um valor lógico que determina a forma da função. 0 devolve a função de probabilidade; 1 devolve a distribuição cumulativa." ; - Text [ finnish ] = "Kumuloitu. C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; + Text [ finnish ] = "Kumuloitu C = 0 laskee tiheysfunktion ja C = 1 jakauman." ; Text [ danish ] = "Kumulativ. K = 0 beregner tæthedsfunktionen, K = 1 fordelingen." ; Text [ french ] = "Cumulative. C = 0 calcule la fonction de densité, C = 1 la distribution." ; Text [ swedish ] = "Kumulerat. K = 0 beräknar täthetsfunktionen, K = 1 fördelningen." ; @@ -29777,7 +30730,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor lógico que determina la forma de la función. Si es 0 calcula la función acumulada, si es 1 la distribución." ; Text [ english_us ] = "Cumulated. C=0 calculates the density function, C=1 the distribution." ; Text[ chinese_simplified ] = "逻辑值，用于确定函数的类型。 K = 0 表示计算\n密度函数， K = 1 表示计算累积分布函数。"; - Text[ russian ] = "Îïðåäåëÿåò âèä ôóíêöèè: ôóíêöèÿ ïëîòíîñòè (0) èëè ôóíêöèÿ ðàñïðåäåëåíèÿ (1)."; + Text[ russian ] = "Èíòåãðàëüíûé. È=0 âû÷èñëÿåò ôóíêöèþ ïëîòíîñòè, È=1 - ðàñïðåäåëåíèå."; Text[ polish ] = "Skumulowany. 0 oblicza gêstoœæ, 1 - rozk³ad."; Text[ japanese ] = "0 を指定ã™ã‚‹ã¨å¯†åº¦é–¢æ•°ã€1 を指定ã™ã‚‹ã¨åˆ†å¸ƒé–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "é‚輯值ï¹ç”¨ä¾†ç¢ºå®šå‡½æ•¸çš„類型。 K = 0 è¡¨ç¤ºè¨ˆç®—å¯†åº¦å‡½æ•¸ï¹ K = 1 \n表示計算累ç©åˆ†ä½ˆå‡½æ•¸ã€‚"; @@ -29789,6 +30742,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kümülasyon. K = 0 yoðunluk fonksiyonunu, K = 1 ise daðýtýmý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Acumulat. C=0 calcula la funció de densitat; C=1, la distribució."; + Text[ thai ] = "สะสม C=0 คำนวณฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸„วามหนาà¹à¸™à¹ˆà¸™, C=1 à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢"; }; }; // -=*# Resource for function HYPGEOMVERT #*=- @@ -29802,7 +30756,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione ipergeometrica." ; Text [ portuguese_brazilian ] = "Werte der hypergeometrischen Verteilung" ; Text [ portuguese ] = "Devolve a distribuição hipergeométrica." ; - Text [ finnish ] = "Hypergeometrisen jakauman arvot." ; + Text [ finnish ] = "Hypergeometrisen jakauman arvot" ; Text [ danish ] = "Værdier for den hypergeometriske fordeling" ; Text [ french ] = "Valeurs de la distribution hypergéométrique." ; Text [ swedish ] = "Värden för den hypergeometriska fördelningen." ; @@ -29810,7 +30764,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad para una variable aleatoria discreta siguiendo una distribución hipergeométrica" ; Text [ english_us ] = "Values of the hypergeometric distribution." ; Text[ chinese_simplified ] = "è¶…å‡ ä½•åˆ†å¸ƒå€¼"; - Text[ russian ] = "Âîçâðàùàåò ãèïåðãåîìåòðè÷åñêîå ðàñïðåäåëåíèå."; + Text[ russian ] = "Âû÷èñëÿåò ãèïåðãåîìåòðè÷åñêîå ðàñïðåäåëåíèå."; Text[ polish ] = "Oblicza rozk³ad hipergeometryczny."; Text[ japanese ] = "超幾何分布ã®å¯†åº¦é–¢æ•°ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "超幾何分佈值"; @@ -29822,6 +30776,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Hipergeometrik daðýtýmýn deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució hipergeomètrica."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹€à¸£à¸‚าคณิตขั้นสูง"; }; ExtraData = { @@ -29857,6 +30812,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örn"; Text[ language_user1 ] = " "; Text[ catalan ] = "X"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -29866,7 +30822,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero di successi nel campione." ; Text [ portuguese_brazilian ] = "Die Anzahl der Erfolge in der Stichprobe." ; Text [ portuguese ] = "é o número de sucessos num exemplo." ; - Text [ finnish ] = "Onnistumisten määrä otoksessa." ; + Text [ finnish ] = "Onnistumisten määrä otoksessa" ; Text [ danish ] = "Antallet af gunstige udfald i stikprøven." ; Text [ french ] = "Le nombre de succès de l'échantillon." ; Text [ swedish ] = "Antalet lyckade försök i stickprovet." ; @@ -29886,6 +30842,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örnekteki baþarý sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre d'èxits de la mostra."; + Text[ thai ] = "จำนวนความสำเร็จในà¸à¸¥à¸¸à¹ˆà¸¡à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡"; }; String 4 // Name of Parameter 2 { @@ -29903,7 +30860,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "n_muestra" ; Text [ english_us ] = "n_sample" ; Text[ chinese_simplified ] = "n_sample"; - Text[ russian ] = "Ðàçìåð_âûáîðêè"; + Text[ russian ] = "Ðàçìåð âûáîðêè"; Text[ polish ] = "wielk_próbki"; Text[ japanese ] = "n"; Text[ chinese_traditional ] = "n_sample"; @@ -29915,6 +30872,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "N_örnek"; Text[ language_user1 ] = " "; Text[ catalan ] = "n_sample"; + Text[ thai ] = "n_ตัวà¸à¸¢à¹ˆà¸²à¸‡"; }; String 5 // Description of Parameter 2 { @@ -29925,7 +30883,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Dimensione del campione." ; Text [ portuguese_brazilian ] = "Die Gr?e der Stichprobe." ; Text [ portuguese ] = "é o tamanho do exemplo." ; - Text [ finnish ] = "Otoksen koko." ; + Text [ finnish ] = "Otoksen koko" ; Text [ danish ] = "Stikprøvens størrelse." ; Text [ french ] = "La taille de l'échantillon." ; Text [ swedish ] = "Storleken på stickprovet." ; @@ -29945,6 +30903,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örneðin büyüklüðü."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mida de la mostra."; + Text[ thai ] = "ขนาดตัวà¸à¸¢à¹ˆà¸²à¸‡"; }; String 6 // Name of Parameter 3 { @@ -29962,7 +30921,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "pobl_éxito" ; Text [ english_us ] = "successes" ; Text[ chinese_simplified ] = "population_s"; - Text[ russian ] = "Ãåí_ñîâîêóïíîñòü_s"; + Text[ russian ] = "Óñïåøíûå"; Text[ polish ] = "populacja_s"; Text[ japanese ] = "D"; Text[ chinese_traditional ] = "population_s"; @@ -29974,6 +30933,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Baþarý"; Text[ language_user1 ] = " "; Text[ catalan ] = "èxits"; + Text[ thai ] = "ความสำเร็จ"; }; String 7 // Description of Parameter 3 { @@ -29983,7 +30943,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero di successi nella popolazione." ; Text [ portuguese_brazilian ] = "Die Anzahl der Erfolge in der Grundgesamtheit." ; Text [ portuguese ] = "é o número de sucessos na população." ; - Text [ finnish ] = "Populaation onnistumisten määrä." ; + Text [ finnish ] = "Populaation onnistumisten määrä" ; Text [ danish ] = "Antallet af gunstige udfald i populationen." ; Text [ french ] = "Le nombre de succès de la population." ; Text [ swedish ] = "Antalet lyckade försök i populationen." ; @@ -29991,7 +30951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de éxitos en la población." ; Text [ english_us ] = "The number of successes in the population." ; Text[ chinese_simplified ] = "æŠ½æ ·æ€»ä½“ä¸çš„æˆåŠŸæ¬¡æ•°ã€‚"; - Text[ russian ] = "Êîëè÷åñòâî óñïåøíûõ èñïûòàíèé â ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Êîëè÷åñòâî óñïåøíûõ èñïûòàíèé â ñîâîêóïíîñòè."; Text[ polish ] = "Liczba sukcesów w populacji."; Text[ japanese ] = "æ¯é›†å›£å†…ã§æˆåŠŸã™ã‚‹æ•°ã€‚"; Text[ chinese_traditional ] = "抽樣總體ä¸çš„æˆåŠŸæ¬¡æ•¸ã€‚"; @@ -30003,6 +30963,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Popülasyondaki baþarý sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre d'èxits en la població."; + Text[ thai ] = "จำนวนขà¸à¸‡à¸„วามสำเร็จในประชาà¸à¸£"; }; String 8 // Name of Parameter 4 { @@ -30020,7 +30981,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "n_total" ; Text [ english_us ] = "n_population" ; Text[ chinese_simplified ] = "n_population"; - Text[ russian ] = "Ðàçìåð_ãåí_ñîâîêóïíîñòè"; + Text[ russian ] = "Ðàçìåð ñîâîêóïíîñòè"; Text[ polish ] = "N_³¹cznie"; Text[ japanese ] = "N"; Text[ chinese_traditional ] = "n_population"; @@ -30032,6 +30993,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "N_toplam"; Text[ language_user1 ] = " "; Text[ catalan ] = "n_population"; + Text[ thai ] = "n_ประชาà¸à¸£"; }; String 9 // Description of Parameter 4 { @@ -30042,7 +31004,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Dimensione della popolazione." ; Text [ portuguese_brazilian ] = "Die Gr?e der Grundgesamtheit." ; Text [ portuguese ] = "é o tamanho da população." ; - Text [ finnish ] = "Populaation koko." ; + Text [ finnish ] = "Populaation koko" ; Text [ danish ] = "Populationens størrelse." ; Text [ french ] = "La taille de la population." ; Text [ swedish ] = "Storleken på populationen." ; @@ -30050,7 +31012,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el tamaño de la población." ; Text [ english_us ] = "The population size." ; Text[ chinese_simplified ] = "æŠ½æ ·çš„æ€»ä½“æ•°ç›®ã€‚"; - Text[ russian ] = "Ðàçìåð ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Ðàçìåð ñîâîêóïíîñòè."; Text[ polish ] = "Wielkoœæ populacji."; Text[ japanese ] = "æ¯é›†å›£ã®å¤§ãã•ã€‚"; Text[ chinese_traditional ] = "抽樣的總體數目。"; @@ -30062,6 +31024,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Popülasyonun büyüklüðü."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mida de la població."; + Text[ thai ] = "ขนาดประชาà¸à¸£"; }; }; // -=*# Resource for function TVERT #*=- @@ -30084,7 +31047,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria siguiendo una distribución t de Student" ; Text [ english_us ] = "Returns the t-distribution." ; Text[ chinese_simplified ] = "计算å¦ç”Ÿæ° t 分布。"; - Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå t-ðàñïðåäåëåíèå Ñòüþäåíòà."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå t-ðàñïðåäåëåíèÿ Ñòüþäåíòà."; Text[ polish ] = "Wartoœci rozk³adu t"; Text[ japanese ] = "t 分布ã®ç‰‡å´ç¢ºçŽ‡ã¾ãŸã¯ä¸¡å´ç¢ºçŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算å¸ç”Ÿæ° t 分佈。"; @@ -30096,6 +31059,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "T daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la distribució T."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š t"; }; ExtraData = { @@ -30131,6 +31095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -30148,7 +31113,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor numérico al que se ha de evaluar la distribución." ; Text [ english_us ] = "The value for which the T distribution is to be calculated." ; Text[ chinese_simplified ] = "è¦è®¡ç®—å…¶ t-分布的数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü ðàñïðåäåëåíèå Ò."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad t."; Text[ japanese ] = "t ã®å€¤ã€‚"; Text[ chinese_traditional ] = "è¦è¨ˆç®—å…¶ t-分佈的數值。"; @@ -30160,6 +31125,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "T daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució T del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š T "; }; String 4 // Name of Parameter 2 { @@ -30177,7 +31143,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad" ; Text [ english_us ] = "degrees_freedom" ; Text[ chinese_simplified ] = "degrees_freedom"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû"; + Text[ russian ] = "Ñòåïåíè ñâîáîäû"; Text[ polish ] = "Stopnie swobody"; Text[ japanese ] = "自由度"; Text[ chinese_traditional ] = "degrees_freedom"; @@ -30189,6 +31155,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük dereceleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°"; }; String 5 // Description of Parameter 2 { @@ -30206,7 +31173,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un entero que indica el número de grados de libertad." ; Text [ english_us ] = "The degrees of freedom of the T distribution." ; Text[ chinese_simplified ] = "t-分布的自由度。"; - Text[ russian ] = "Êîëè÷åñòâî ñòåïåíåé ñâîáîäû t-ðàñïðåäåëíèÿ."; + Text[ russian ] = "Êîëè÷åñòâî ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ T."; Text[ polish ] = "Stopnie swobody w rozk³adzie t."; Text[ japanese ] = "t 分布ã®è‡ªç”±åº¦ã€‚"; Text[ chinese_traditional ] = "t-分佈的自由度。"; @@ -30218,6 +31185,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "T daðýtýmýnýn özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat de la distribució T."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š T "; }; String 6 // Name of Parameter 3 { @@ -30247,6 +31215,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kip"; Text[ language_user1 ] = " "; Text[ catalan ] = "mode"; + Text[ thai ] = "โหมด"; }; String 7 // Description of Parameter 3 { @@ -30264,7 +31233,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica el número de colas de la distribución que se ha de devolver." ; Text [ english_us ] = "Mode = 1calculates the one-tailed test, 2 = two-tailed distribution." ; Text[ chinese_simplified ] = "tails = 1 计算å•é¡µçš„试验，tails = 2 计算åŒé¡µçš„试验。"; - Text[ russian ] = "Åñëè õâîñòû = 1, òî ôóíêöèÿ ÑÒÜÞÄÐÀÑÏ âû÷èñëÿåò îäíîñòîðîííåå ðàñïðåäåëåíèå. Åñëè õâîñòû = 2, òî ôóíêöèÿ ÑÒÜÞÄÐÀÑÏ âîçâðàùàåò äâóñòîðîííåå ðàñïðåäåëåíèå."; + Text[ russian ] = "Åñëè ðåæèì = 1, òî ôóíêöèÿ âû÷èñëÿåò îäíîñòîðîííåå ðàñïðåäåëåíèå. Åñëè ðåæèì = 2, òî ôóíêöèÿ âîçâðàùàåò äâóñòîðîííåå ðàñïðåäåëåíèå."; Text[ polish ] = "Tryb = 1 oblicza jednoœladowy test, Tryb = 2 dwuœladowy."; Text[ japanese ] = "1 を指定ã™ã‚‹ã¨ç‰‡å´ç¢ºçŽ‡ã€2 を指定ã™ã‚‹ã¨ä¸¡å´ç¢ºçŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "tails = 1 計算單é 的試驗ï¹tails = 2 計算雙é 的試驗。"; @@ -30276,6 +31245,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kip = 1, tek kuyruklu deneyi, Kip = 2 ise iki kuyruklu deneyi hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mode = 1 calcula la verificació d'una cua; 2 = distribució de dues cues."; + Text[ thai ] = "โหมด = 1คำนวณà¸à¸²à¸£à¸—ดสà¸à¸šà¹à¸šà¸šà¸«à¸²à¸‡à¹€à¸”ียว, 2 = à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¸ªà¸à¸‡à¸«à¸²à¸‡"; }; }; // -=*# Resource for function TINV #*=- @@ -30298,7 +31268,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve, para una probabilidad dada, el valor de la variable aleatoria siguiendo una distribución t inversa de Student" ; Text [ english_us ] = "Values of the inverse t-distribution." ; Text[ chinese_simplified ] = "åŒå°¾å¦ç”Ÿæ° t 分布的逆函数。"; - Text[ russian ] = "Âû÷èñëÿåò îáðàòíîå çíà÷åíèå t-ðàñïðåäåëåíèÿ Ñòüþäåíòà."; + Text[ russian ] = "Âû÷èñëÿåò îáðàòíîå t-ðàñïðåäåëåíèå."; Text[ polish ] = "Wyznacza odwrotnoœæ rozk³adu t Studenta."; Text[ japanese ] = "t 分布ã®ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "雙尾å¸ç”Ÿæ° t 分佈的逆函數。"; @@ -30310,6 +31280,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters T daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució T inversa."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š t "; }; ExtraData = { @@ -30345,6 +31316,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -30362,7 +31334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la probabilidad asociada con la distribución t de Student dos colas." ; Text [ english_us ] = "The probability value for which the inverse T distribution is to be calculated." ; Text[ chinese_simplified ] = "对应于åŒå°¾å¦ç”Ÿæ° t 分布的概率。"; - Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî íåîáõîäèìî âû÷èñëèòü îáðàòîíîå t-ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî íåîáõîäèìî âû÷èñëèòü îáðàòíîå ðàñïðåäåëåíèå Ò."; Text[ polish ] = "Prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ rozk³adu t Studenta."; Text[ japanese ] = "パーセント点を求ã‚る両å´ç¢ºçŽ‡ã€‚"; Text[ chinese_traditional ] = "å°æ‡‰æ–¼é›™å°¾å¸ç”Ÿæ° t 分佈的概率。"; @@ -30374,6 +31346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters T daðýtýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució T inversa del qual s'ha de calcular."; + Text[ thai ] = "ค่าความน่าจะเป็นสำหรับคำนวณà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š T "; }; String 4 // Name of Parameter 2 { @@ -30391,7 +31364,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad" ; Text [ english_us ] = "degrees_freedom" ; Text[ chinese_simplified ] = "degrees_freedom"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû"; + Text[ russian ] = "Ñòåïåíè ñâîáîäû"; Text[ polish ] = "Stopnie swobody"; Text[ japanese ] = "自由度"; Text[ chinese_traditional ] = "degrees_freedom"; @@ -30403,6 +31376,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük dereceleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°"; }; String 5 // Description of Parameter 2 { @@ -30420,7 +31394,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de grados de libertad para diferenciar la distribución." ; Text [ english_us ] = "The degrees of freedom of the T distribution." ; Text[ chinese_simplified ] = "t-分布的自由度。"; - Text[ russian ] = "×èñëî ñòåïåíåé ñâîáîäû t-ðàñïðåäåëåíèÿ."; + Text[ russian ] = "×èñëî ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ T."; Text[ polish ] = "Stopnie swobody w rozk³adzie t."; Text[ japanese ] = "t 分布ã®è‡ªç”±åº¦ã€‚"; Text[ chinese_traditional ] = "t-分佈的自由度。"; @@ -30432,6 +31406,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "T daðýtýmý özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat de la distribució T."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š T "; }; }; // -=*# Resource for function FVERT #*=- @@ -30445,7 +31420,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione F." ; Text [ portuguese_brazilian ] = "Werte der F-Verteilung" ; Text [ portuguese ] = "Devolve a distribuição da probabilidade F." ; - Text [ finnish ] = "F-todennäköisyysjakauma arvot." ; + Text [ finnish ] = "F-todennäköisyysjakauman arvot" ; Text [ danish ] = "Værdier for F-fordelingen" ; Text [ french ] = "Valeurs de la distribution F." ; Text [ swedish ] = "Värden för F-fördelningen." ; @@ -30453,7 +31428,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria siguiendo una distribución de probabilidad F" ; Text [ english_us ] = "Values of the F probability distribution." ; Text[ chinese_simplified ] = "计算 F - 概率分布。"; - Text[ russian ] = "Âîçâðàùàåò F-ðàñïðåäåëåíèå âåðîÿòíîñòè."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèÿ ðàñïðåäåëåíèÿ F."; Text[ polish ] = "Wyznacza rozk³ad F prawdopodobieñstwa"; Text[ japanese ] = "F 分布ã®ä¸Šå´ç¢ºçŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算 F - 概率分佈。"; @@ -30465,6 +31440,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "F daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució de probabilitat F."; + Text[ thai ] = "ค่าความน่าจะเป็นà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; ExtraData = { @@ -30500,6 +31476,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -30517,7 +31494,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor al que desea evaluar la función." ; Text [ english_us ] = "The value for which the F distribution is to be calculated." ; Text[ chinese_simplified ] = "用于计算 F - 概率分布的数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ F-ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî âû÷èñëÿåòñÿ ðàñïðåäåëåíèå F."; Text[ polish ] = "Wartoœæ, dla której ma zostaæ obliczony rozk³ad F prawdopodobieñstwa."; Text[ japanese ] = "F 値。"; Text[ chinese_traditional ] = "用來計算 F-概率分佈的數值。"; @@ -30525,10 +31502,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De waarde waarop de F-verdeling moet worden berekend."; Text[ chinese_simplified ] = "用于计算 F - 概率分布的数值。"; Text[ greek ] = "Ç ôéìÞ ãéá ôçí ïðïßá èá õðïëïãéóôåß ç êáôáíïìÞ F."; - Text[ korean ] = "F분í¬ê°€ 계산ë˜ì–´ì•¼ í• ê°’"; + Text[ korean ] = "F 분í¬ë¥¼ 계산해야 í• ê°’"; Text[ turkish ] = "F daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució F del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; String 4 // Name of Parameter 2 { @@ -30546,7 +31524,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad 1" ; Text [ english_us ] = "degrees_freedom_1" ; Text[ chinese_simplified ] = "degrees_freedom_1"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû_1"; + Text[ russian ] = "Ñòåïåíè ñâîáîäû 1"; Text[ polish ] = "Stopnie swobody_1"; Text[ japanese ] = "自由度 1"; Text[ chinese_traditional ] = "degrees_freedom_1"; @@ -30558,6 +31536,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük_dereceleri_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom_1"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°_1"; }; String 5 // Description of Parameter 2 { @@ -30568,15 +31547,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "sono i gradi di libertà al numeratore." ; Text [ portuguese_brazilian ] = "Die Freiheitsgrade im Z?hler der F-Verteilung." ; Text [ portuguese ] = "são os graus de liberdade no numerador da distribuição F." ; - Text [ finnish ] = "F-jakauman osoittajan vapausaste." ; + Text [ finnish ] = "F-jakauman osoittajan vapausaste" ; Text [ danish ] = "Frihedsgrader i F-fordelingens tæller." ; Text [ french ] = "Les degrés de liberté du numérateur de la distribution F." ; Text [ swedish ] = "Frihetsgraderna i F-fördelningens täljare." ; Text [ dutch ] = "De vrijheidsgraden in de teller van de F-verdeling." ; - Text [ spanish ] = "es el número de grados de libertad del numerador." ; + Text [ spanish ] = "Los grados de libertad del numerador de la distribución F." ; Text [ english_us ] = "The degrees of freedom in the numerator of the F distribution." ; Text[ chinese_simplified ] = "F - 概率分布的分å自由度。"; - Text[ russian ] = "×èñëèòåëü ñòåïåíåé ñâîáîäû."; + Text[ russian ] = "×èñëèòåëü ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ F."; Text[ polish ] = "Licznik stopni swobody w rozk³adzie F."; Text[ japanese ] = "自由度ã®åˆ†å。"; Text[ chinese_traditional ] = "F-概率分佈的分å自由度。"; @@ -30588,6 +31567,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "F daðýtýmýnýn payýndaki özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat en el numerador de la distribució F."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¹ƒà¸™à¸•à¸±à¸§à¸™à¸±à¸šà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; String 6 // Name of Parameter 3 { @@ -30605,7 +31585,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad 2" ; Text [ english_us ] = "degrees_freedom_2" ; Text[ chinese_simplified ] = "degrees_freedom_2"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû_2"; + Text[ russian ] = "Ñòåïåíè ñâîáîäû 2"; Text[ polish ] = "Stopnie swobody_2"; Text[ japanese ] = "自由度 2"; Text[ chinese_traditional ] = "degrees_freedom_2"; @@ -30617,6 +31597,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük_dereceleri_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom_2"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°_2"; }; String 7 // Description of Parameter 3 { @@ -30626,7 +31607,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Gradi di libertà al denominatore." ; Text [ portuguese_brazilian ] = "Die Freiheitsgrade im Nenner der F-Verteilung." ; Text [ portuguese ] = "são os graus de liberdade no denominador da distribuição F." ; - Text [ finnish ] = "F-jakauman nimittäjän vapausaste." ; + Text [ finnish ] = "F-jakauman nimittäjän vapausaste" ; Text [ danish ] = "Frihedsgrader i F-fordelingens nævner." ; Text [ french ] = "Les degrés de liberté du dénominateur de la distribution F." ; Text [ swedish ] = "Frihetsgraderna i F-fördelningens nämnare." ; @@ -30634,7 +31615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de grados de libertad del denominador." ; Text [ english_us ] = "The degrees of freedom in the denominator of the F distribution." ; Text[ chinese_simplified ] = "F - 概率分布的分æ¯è‡ªç”±åº¦ã€‚"; - Text[ russian ] = "Çíàìåíàòåëü ñòåïåíåé ñâîáîäû."; + Text[ russian ] = "Çíàìåíàòåëü ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ F."; Text[ polish ] = "Mianownik stopni swobody w rozk³adzie F."; Text[ japanese ] = "自由度ã®åˆ†æ¯ã€‚"; Text[ chinese_traditional ] = "F-概率分佈的分æ¯è‡ªç”±åº¦ã€‚"; @@ -30646,6 +31627,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "F daðýtýmýnýn paydasýndaki özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat en el denominador de la distribució F."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¹ƒà¸™à¸•à¸±à¸§à¸«à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; }; // -=*# Resource for function FINV #*=- @@ -30659,7 +31641,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce l'inversa della distribuzione F." ; Text [ portuguese_brazilian ] = "Werte der inversen F-Verteilung" ; Text [ portuguese ] = "Devolve o inverso de distribuição da probabilidade F." ; - Text [ finnish ] = "Käänteisen F-jakauman arvot." ; + Text [ finnish ] = "Käänteisen F-jakauman arvot" ; Text [ danish ] = "Værdier for den inverse F-fordeling" ; Text [ french ] = "Valeurs de la distribution F inverse." ; Text [ swedish ] = "Värden för den inversa F-fördelningen." ; @@ -30667,7 +31649,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la inversa del valor de la variable aleatoria siguiendo una distribución de probabilidad F" ; Text [ english_us ] = "Values of the inverse F distribution." ; Text[ chinese_simplified ] = "计算 F - 概率分布的逆函数值。"; - Text[ russian ] = "Âû÷èñëÿåò îáðàòíîå çíà÷åíèå äëÿ F-ðàñïðåäåëåíèÿ âåðîÿòíîñòåé."; + Text[ russian ] = "Âû÷èñëÿåò îáðàòíîå ðàñïðåäåëåíèå âåðîÿòíîñòè F."; Text[ polish ] = "Wyznacza odwrotnoœæ rozk³adu F prawdopodobieñstwa."; Text[ japanese ] = "F 分布ã®ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算 F-概率分佈的逆函數值。"; @@ -30679,6 +31661,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters F daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució F inversa."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; ExtraData = { @@ -30702,7 +31685,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "probabilidad" ; Text [ english_us ] = "number" ; Text[ chinese_simplified ] = "probability"; - Text[ russian ] = "×èñëî"; + Text[ russian ] = "÷èñëî"; Text[ polish ] = "Liczba"; Text[ japanese ] = "確率"; Text[ chinese_traditional ] = "Probability"; @@ -30714,6 +31697,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -30731,7 +31715,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una probabilidad asociada con la función de distribución acumulativa F." ; Text [ english_us ] = "The probability value for which the inverse F distribution is to be calculated." ; Text[ chinese_simplified ] = "F-分布的概率值。"; - Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî âû÷èñëÿåòñÿ îáðàòíîå F-ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîãî âû÷èñëÿåòñÿ îáðàòíîå ðàñïðåäåëåíèå F."; Text[ polish ] = "Prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ rozk³adu F."; Text[ japanese ] = "上å´ç¢ºçŽ‡ã€‚"; Text[ chinese_traditional ] = "F-分佈的概率值。"; @@ -30739,10 +31723,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Der kans waarop de inverse F-verdeling moet worden berekend."; Text[ chinese_simplified ] = "F-分布的概率值。"; Text[ greek ] = "Ç ôéìÞ ðéèáíüôçôáò ãéá ôçí ïðïßá ðñüêåéôáé íá õðïëïãéóôåß ç áíôßóôñïöç êáôáíïìÞ F."; - Text[ korean ] = "ì— F 분í¬ê°€ 계산ë˜ì–´ì•¼ í• í™•ë¥ ê°’."; + Text[ korean ] = "ì— F 분í¬ë¥¼ 계산해야 í• í™•ë¥ ê°’"; Text[ turkish ] = "Ters F daðýtýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució F inversa del qual s'ha de calcular."; + Text[ thai ] = "คำนวณค่าน่าจะเป็นสำหรับà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; String 4 // Name of Parameter 2 { @@ -30760,7 +31745,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad 1" ; Text [ english_us ] = "degrees_freedom_1" ; Text[ chinese_simplified ] = "degrees_freedom_1"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû_1"; + Text[ russian ] = "ñòåïåíè ñâîáîäû 1"; Text[ polish ] = "Stopnie swobody_1"; Text[ japanese ] = "自由度 1"; Text[ chinese_traditional ] = "degrees_freedom_1"; @@ -30772,6 +31757,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük_dereceleri_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom_1"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°_1"; }; String 5 // Description of Parameter 2 { @@ -30782,15 +31768,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Gradi di libertà al numeratore della distribuzione F." ; Text [ portuguese_brazilian ] = "Die Freiheitsgrade im Z?hler der F-Verteilung." ; Text [ portuguese ] = "são os graus de liberdade no numerador da distribuição F." ; - Text [ finnish ] = "F-jakauman osoittajan vapausaste." ; + Text [ finnish ] = "F-jakauman osoittajan vapausaste" ; Text [ danish ] = "Frihedsgraderne i F-fordelingens tæller." ; Text [ french ] = "Les degrés de liberté du numérateur de la distribution F." ; Text [ swedish ] = "Frihetsgraderna i F-fördelningens täljare." ; Text [ dutch ] = "De vrijheidsgraden in de teller van de F-verdeling." ; - Text [ spanish ] = "es el número de grados de libertad del numerador." ; + Text [ spanish ] = "Los grados de libertad del numerador de la distribución F." ; Text [ english_us ] = "The degrees of freedom in the numerator of the F distribution." ; Text[ chinese_simplified ] = "F - 概率分布的分å自由度。"; - Text[ russian ] = "×èñëèòåëü ñòåïåíåé ñâîáîäû."; + Text[ russian ] = "×èñëèòåëü ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ F."; Text[ polish ] = "Licznik stopni swobody w rozk³adzie F."; Text[ japanese ] = "第１自由度。"; Text[ chinese_traditional ] = "F - 概率分佈的分å自由度。"; @@ -30802,6 +31788,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "F daðýtýmýnýn payýndaki özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat en el numerador de la distribució F."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¹ƒà¸™à¸•à¸±à¸§à¸™à¸±à¸šà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; String 6 // Name of Parameter 3 { @@ -30819,7 +31806,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad 2" ; Text [ english_us ] = "degrees_freedom_2" ; Text[ chinese_simplified ] = "degrees_freedom_2"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû_2"; + Text[ russian ] = "ñòåïåíè ñâîáîäû 2"; Text[ polish ] = "Stopnie swobody_2"; Text[ japanese ] = "自由度 2"; Text[ chinese_traditional ] = "degrees_freedom_2"; @@ -30831,6 +31818,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük_dereceleri_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom_2"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°_2"; }; String 7 // Description of Parameter 3 { @@ -30840,7 +31828,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Gradi libertà al denominatore della distribuzione F." ; Text [ portuguese_brazilian ] = "Die Freiheitsgrade im Nenner der F-Verteilung." ; Text [ portuguese ] = "são os graus de liberdade no denominador da distribuição F." ; - Text [ finnish ] = "F-jakauman nimittäjän vapausaste." ; + Text [ finnish ] = "F-jakauman nimittäjän vapausaste" ; Text [ danish ] = "Frihedsgraderne i F-fordelingens nævner." ; Text [ french ] = "Les degrés de liberté du dénominateur de la distribution F." ; Text [ swedish ] = "Frihetsgraderna i F-fördelningens nämnare." ; @@ -30848,7 +31836,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de grados de libertad del denominador." ; Text [ english_us ] = "The degrees of freedom in the denominator of the F distribution." ; Text[ chinese_simplified ] = "F - 概率分布的分æ¯è‡ªç”±åº¦ã€‚"; - Text[ russian ] = "Çíàìåíàòåëü ñòåïåíåé ñâîáîäû."; + Text[ russian ] = "Çíàìåíàòåëü ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ F."; Text[ polish ] = "Mianownik stopni swobody w rozk³adzie F."; Text[ japanese ] = "第２自由度。"; Text[ chinese_traditional ] = "F - 概率分佈的分æ¯è‡ªç”±åº¦ã€‚"; @@ -30860,6 +31848,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "F daðýtýmýnýn paydasýndaki özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat en el denominador de la distribució F."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¹ƒà¸™à¸•à¸±à¸§à¸«à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸š F "; }; }; // -=*# Resource for function CHIVERT #*=- @@ -30873,26 +31862,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce la distribuzione CHI al quadrato." ; Text [ portuguese_brazilian ] = "Werte der Chi-Quadrat-Verteilung" ; Text [ portuguese ] = "Devolve a probabilidade de uma varíável aleatória contínua seguindo a distribuição do Qui-quadrado." ; - Text [ finnish ] = "Khii-neliöjakauman arvot." ; + Text [ finnish ] = "Khii-neliöjakauman arvot" ; Text [ danish ] = "Værdier for chi2-fordelingen" ; Text [ french ] = "Valeurs de la distribution Khi-deux." ; Text [ swedish ] = "Chi-två-fördelningens värden." ; - Text [ dutch ] = "Berekent de kans van de chikwadraatsverdeling" ; + Text [ dutch ] = "Berekent de kans van de chi-kwadraatsverdeling" ; Text [ spanish ] = "Devuelve la probabilidad de una variable aleatoria continua siguiendo una distribución ji cuadrado de una sola cola" ; Text [ english_us ] = "Values of the chi square distribution." ; Text[ chinese_simplified ] = "Chi 平方分布的å•å°¾æ¦‚率。"; - Text[ russian ] = "Âîçâðàùàåò îäíîñòîðîííþþ âåðîÿòíîñòü ðàñïðåäåëåíèÿ õè-êâàäðàò."; + Text[ russian ] = "Âîçâðàùàåò ðàñïðåäåëåíèå õè-êâàäðàò."; Text[ polish ] = "Wyznacza wartoœci rozk³adu chi-kwadrat"; Text[ japanese ] = "指定ã—ãŸè‡ªç”±åº¦ã«ãŠã‘るカイ2乗分布ã®ä¸Šå´ç¢ºçŽ‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "Chi 平方分佈的單尾概率。"; Text[ arabic ] = "Þíã ÊæÒíÚ Chi ÇáÊÑÈíÚí."; - Text[ dutch ] = "Berekent de kans van de chikwadraatsverdeling"; + Text[ dutch ] = "Berekent de kans van de chi-kwadraatsverdeling"; Text[ chinese_simplified ] = "Chi 平方分布的å•å°¾æ¦‚率。"; Text[ greek ] = "ÔéìÝò ôçò êáôáíïìÞò ×-ôåôñÜãùíï."; Text[ korean ] = "ì¹´ì´ ì œê³± 분í¬ì˜ ê°’"; Text[ turkish ] = "Chi-kare daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució quadrada khi."; + Text[ thai ] = "ค่าà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹„คสà¹à¸„วร์"; }; ExtraData = { @@ -30928,6 +31918,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -30941,22 +31932,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Den værdi som chi2-fordelingen skal beregnes for." ; Text [ french ] = "La valeur pour laquelle vous voulez calculer la distribution Khi-deux." ; Text [ swedish ] = "Värdet för vilket chi-två-fördelningen skall beräknas." ; - Text [ dutch ] = "De waarde, waarop de chikwadraatsverdeling moet worden berekend." ; + Text [ dutch ] = "De waarde, waarop de chi-kwadraatsverdeling moet worden berekend." ; Text [ spanish ] = "es el valor al que desea evaluar la distribución." ; Text [ english_us ] = "The value for which the chi square distribution is to be calculated." ; Text[ chinese_simplified ] = "用æ¥è®¡ç®— Chi 平方分布å•å°¾æ¦‚率的数值。"; - Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü ðàñïðåäåëåíèå."; + Text[ russian ] = "Çíà÷åíèå, äëÿ êîòîðîãî òðåáóåòñÿ âû÷èñëèòü ðàñïðåäåëåíèå õè-êâàäðàò."; Text[ polish ] = "Wartoœæ, dla kórej ma zostaæ obliczony rozk³ad chi-kwadrat."; Text[ japanese ] = "カイ2乗値。"; Text[ chinese_traditional ] = "用來計算 Chi 平方分佈單尾概率的數值。"; Text[ arabic ] = "ÇáÞíãÉ ÇáÊí ÊÑíÏ ÚäÏåÇ ÊÞííã ÇáÊæÒíÚ."; - Text[ dutch ] = "De waarde, waarop de chikwadraatsverdeling moet worden berekend."; + Text[ dutch ] = "De waarde, waarop de chi-kwadraatsverdeling moet worden berekend."; Text[ chinese_simplified ] = "用æ¥è®¡ç®— Chi 平方分布å•å°¾æ¦‚率的数值。"; Text[ greek ] = "Ç ôéìÞ ôçò ïðïßáò èá õðïëïãéóôåß ç êáôáíïìÞ ÷-ôåôñÜãùíï."; Text[ korean ] = "ì¹´ì´ ì œê³± 분í¬ê°€ 계산ë˜ì–´ì•¼ 하는 ê°’."; Text[ turkish ] = "Chi-kare daðýtýmý hesaplanacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor la distribució quadrada khi del qual s'ha de calcular."; + Text[ thai ] = "ค่าสำหรับคำนวณà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹„คสà¹à¸„วร์"; }; String 4 // Name of Parameter 2 { @@ -30974,7 +31966,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad" ; Text [ english_us ] = "degrees_freedom" ; Text[ chinese_simplified ] = "degrees_freedom"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû"; + Text[ russian ] = "Ñòåïåíè ñâîáîäû"; Text[ polish ] = "Stopnie swobody"; Text[ japanese ] = "自由度"; Text[ chinese_traditional ] = "degrees_freedom"; @@ -30986,6 +31978,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük dereceleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°"; }; String 5 // Description of Parameter 2 { @@ -30995,26 +31988,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero di gradi di libertà." ; Text [ portuguese_brazilian ] = "Die Freiheitsgrade der Chi-Quadrat-Verteilung." ; Text [ portuguese ] = "é o número de graus de liberdade do Qui-quadrado." ; - Text [ finnish ] = "Khii-neliöjakauman vapausasteet." ; + Text [ finnish ] = "Khii-neliöjakauman vapausasteet" ; Text [ danish ] = "Frihedsgraderne i chi2-fordelingen." ; Text [ french ] = "Les degrés de liberté de la distribution Khi-deux." ; Text [ swedish ] = "Chi-två-fördelningens frihetsgrader." ; - Text [ dutch ] = "Het aantal vrijheidsgraden van de chikwadraatsverdeling" ; + Text [ dutch ] = "Het aantal vrijheidsgraden van de chi-kwadraatsverdeling" ; Text [ spanish ] = "es el número de grados de libertad." ; Text [ english_us ] = "The degrees of freedom of the chi square distribution." ; Text[ chinese_simplified ] = "Chi 平方分布的自由度。"; - Text[ russian ] = "×èñëî ñòåïåíåé ñâîáîäû."; + Text[ russian ] = "×èñëî ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ õè-êâàäðàò."; Text[ polish ] = "Stopnie swobody w rozk³adzie chi-kwadrat."; Text[ japanese ] = "カイ2乗分布ã®è‡ªç”±åº¦ã€‚"; Text[ chinese_traditional ] = "Chi 平方分佈的自由度。"; Text[ arabic ] = "ÚÏÏ ÏÑÌÇÊ ÇáÍÑíÉ."; - Text[ dutch ] = "Het aantal vrijheidsgraden van de chikwadraatsverdeling"; + Text[ dutch ] = "Het aantal vrijheidsgraden van de chi-kwadraatsverdeling"; Text[ chinese_simplified ] = "Chi 平方分布的自由度。"; Text[ greek ] = "Ïé âáèìïß åëåõèåñßáò ôçò êáôáíïìÞò ×-ôåôñÜãùíï."; Text[ korean ] = "ì¹´ì´ ì œê³± 분í¬ì˜ ìžìœ ë„"; Text[ turkish ] = "Chi-kare daðýtýmýnýn özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat de la distribució quadrada khi."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹„คสà¹à¸„วร์"; }; }; // -=*# Resource for function CHIINV #*=- @@ -31028,26 +32022,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce l'inversa della distribuzione del chi quadrato." ; Text [ portuguese_brazilian ] = "Werte der inversen Chi-Quadrat-Verteilung" ; Text [ portuguese ] = "Devolve o inverso da probabilidade de uma varíável aleatória contínua seguindo a distribuição do Qui-quadrado." ; - Text [ finnish ] = "Käänteisen khii-neliöjakauman arvot." ; + Text [ finnish ] = "Käänteisen khii-neliöjakauman arvot" ; Text [ danish ] = "Værdier for den inverse chi2-fordeling" ; Text [ french ] = "Valeurs de la distribution Khi-deux inverse." ; Text [ swedish ] = "Den inversa chi-två-fördelningens värden." ; - Text [ dutch ] = "Waarden van de inverse chi kwadraatverdeling." ; + Text [ dutch ] = "Waarden van de inverse chi-kwadraatverdeling." ; Text [ spanish ] = "Devuelve los valores de la distribución ji cuadrado inversa" ; Text [ english_us ] = "Values of the inverse chi-squared distribution." ; Text[ chinese_simplified ] = "Chi 平方分布å•å°¾æ¦‚率的逆函数。"; - Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå, îáðàòíîå ê îäíîñòîðîííåé âåðîÿòíîñòè ðàñïðåäåëíèÿ õè-êâàäðàò."; + Text[ russian ] = "Çíà÷åíèå îáðàòíîãî ðàñïðåäåëåíèÿ õè-êâàäðàò."; Text[ polish ] = "Wyznacza odwrotnoœæ rozk³adu chi-kwadrat."; Text[ japanese ] = "指定ã—ãŸè‡ªç”±åº¦ã«ãŠã‘るカイ2乗分布ã®ãƒ‘ーセント点を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "Chi 平方分佈單尾概率的逆函數。"; Text[ arabic ] = "Þíã ÚßÓ ÊæÒíÚ Chi ÇáÊÑÈíÚí."; - Text[ dutch ] = "Waarden van de inverse chi kwadraatverdeling."; + Text[ dutch ] = "Waarden van de inverse chi-kwadraatverdeling."; Text[ chinese_simplified ] = "Chi 平方分布å•å°¾æ¦‚率的逆函数。"; Text[ greek ] = "ÔéìÝò ôçò áíôßóôñïöçò êáôáíïìÞò ×-ôåôñÜãùíï."; Text[ korean ] = "ì— ì¹´ì´ ì œê³± 분í¬ì˜ ê°’"; Text[ turkish ] = "Ters chi-kare daðýtýmý deðerleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valors de la distribució khi-quadrada inversa."; + Text[ thai ] = "ค่าà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹„คสà¹à¸„วร์"; }; ExtraData = { @@ -31083,6 +32078,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -31100,7 +32096,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una probabilidad asociada con la distribución ji cuadrado." ; Text [ english_us ] = "The probability value for which the inverse chi square distribution is to be calculated." ; Text[ chinese_simplified ] = "Chi 平方分布的å•å°¾æ¦‚率。"; - Text[ russian ] = "Âåðîÿòíîñòü, ñâÿçàííàÿ ñ ðàñïðåäåëåíèåì õè-êâàäðàò"; + Text[ russian ] = "Çíà÷åíèå âåðîÿòíîñòè, äëÿ êîòîðîé âû÷èñëåíî îáðàòíîå ðàñïðåäåëåíèå õè-êâàäðàò."; Text[ polish ] = "Prawdopodobieñstwo, dla którego ma zostaæ obliczona odwrotnoœæ rozk³adu chi-kwadrat."; Text[ japanese ] = "関数ã«ä½¿ç”¨ã™ã‚‹ä¸Šå´ç¢ºçŽ‡ã€‚"; Text[ chinese_traditional ] = "Chi 平方分佈的單尾概率。"; @@ -31112,6 +32108,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ters chi-kare daðýtýmý hesaplanacak olasýlýk deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de probabilitat la distribució quadrada khi inversa s'ha de calcular."; + Text[ thai ] = "คำนวณค่าน่าจะเป็นสำหรับà¸à¸´à¸™à¹€à¸§à¸´à¸£à¹Œà¸ªà¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹„คสà¹à¸„วร์"; }; String 4 // Name of Parameter 2 { @@ -31129,7 +32126,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "grados_libertad" ; Text [ english_us ] = "degrees_freedom" ; Text[ chinese_simplified ] = "degrees_freedom"; - Text[ russian ] = "Ñòåïåíè_ñâîáîäû"; + Text[ russian ] = "Ñòåïåíè ñâîáîäû"; Text[ polish ] = "Stopnie swobody"; Text[ japanese ] = "自由度"; Text[ chinese_traditional ] = "degrees_freedom"; @@ -31141,6 +32138,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Özgürlük dereceleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "degrees_freedom"; + Text[ thai ] = "ระดับ_ความà¸à¸´à¸ªà¸£à¸°"; }; String 5 // Description of Parameter 2 { @@ -31150,7 +32148,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero di gradi di libertà." ; Text [ portuguese_brazilian ] = "Die Freiheitsgrade der Chi-Quadrat-Verteilung." ; Text [ portuguese ] = "é o número de graus de liberdade do Qui-quadrado." ; - Text [ finnish ] = "Khii-neliöjakauman vapausasteet." ; + Text [ finnish ] = "Khii-neliöjakauman vapausasteet" ; Text [ danish ] = "Frihedsgraderne i chi2-fordelingen." ; Text [ french ] = "Les degrés de liberté de la distribution Khi-deux." ; Text [ swedish ] = "Chi-två-fördelningens frihetsgrader." ; @@ -31158,7 +32156,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de grados de libertad." ; Text [ english_us ] = "The degrees of freedom of the chi square distribution." ; Text[ chinese_simplified ] = "Chi 平方分布的自由度。"; - Text[ russian ] = "×èñëî ñòåïåíåé ñâîáîäû."; + Text[ russian ] = "×èñëî ñòåïåíåé ñâîáîäû ðàñïðåäåëåíèÿ õè-êâàäðàò."; Text[ polish ] = "Stopnie swobody w rozk³adzie chi-kwadrat."; Text[ japanese ] = "カイ2乗分布ã®è‡ªç”±åº¦ã€‚"; Text[ chinese_traditional ] = "Chi 平方分佈的自由度。"; @@ -31170,6 +32168,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Chi-kare daðýtýmýnýn özgürlük dereceleri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els graus de llibertat de la distribució quadrada khi."; + Text[ thai ] = "ระดับความà¸à¸´à¸ªà¸£à¸°à¸‚à¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¹„คสà¹à¸„วร์"; }; }; // -=*# Resource for function STANDARDISIERUNG #*=- @@ -31203,6 +32202,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Raslantý deðiþkenini standartlaþtýrýlmýþ deðerlere dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix una variable aleatòria en un valor normalitzat."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸•à¸±à¸§à¹à¸›à¸£à¹à¸šà¸šà¸ªà¸¸à¹ˆà¸¡à¹€à¸›à¹‡à¸™à¸„่าปà¸à¸•à¸´"; }; ExtraData = { @@ -31238,6 +32238,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -31247,7 +32248,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore che si desidera normalizzare." ; Text [ portuguese_brazilian ] = "Der Wert, der standardisiert werden soll." ; Text [ portuguese ] = "é o valor que deseja normalizar." ; - Text [ finnish ] = "Normalisoitava arvo." ; + Text [ finnish ] = "Normalisoitava arvo" ; Text [ danish ] = "Den værdi som skal standardiseres." ; Text [ french ] = "La valeur à standardiser." ; Text [ swedish ] = "Värdet som skall standardiseras." ; @@ -31267,6 +32268,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Standartlaþtýrýlacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha d'estandarditzar."; + Text[ thai ] = "ทำให้ค่าเป็นมาตรà¸à¸²à¸™"; }; String 4 // Name of Parameter 2 { @@ -31296,6 +32298,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ortalama"; Text[ language_user1 ] = " "; Text[ catalan ] = "mitja"; + Text[ thai ] = "ค่าเฉลี่ย"; }; String 5 // Description of Parameter 2 { @@ -31305,7 +32308,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La media utilizzata per lo spostamento." ; Text [ portuguese_brazilian ] = "Der Mittelwert, um den verschoben wird." ; Text [ portuguese ] = "é a média aritmética da distribuição." ; - Text [ finnish ] = "Siirrossa käytetty keskiarvo." ; + Text [ finnish ] = "Siirrossa käytetty keskiarvo" ; Text [ danish ] = "Middelværdien for forskydningen." ; Text [ french ] = "La moyenne à utiliser pour le décalage." ; Text [ swedish ] = "Medelvärdet för förflyttningen." ; @@ -31313,7 +32316,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el promedio utilizado para el desplazamiento" ; Text [ english_us ] = "The mean value used for moving." ; Text[ chinese_simplified ] = "分布的算术平å‡å€¼ã€‚"; - Text[ russian ] = "Ñðåäíåå àðèôìåòè÷åñêîå ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ñðåäíåå àðèôìåòè÷åñêîå, èñïîëüçóåìîå äëÿ ïåðåìåùåíèÿ."; Text[ polish ] = "Œrednia arytmetyczna przesuniêcia."; Text[ japanese ] = "分布ã®ç®—è¡“å¹³å‡å€¤ã€‚"; Text[ chinese_traditional ] = "分佈的算術平å‡å€¼ã€‚"; @@ -31325,6 +32328,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Taþýma için kullanýlan ortalama deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor mitjà utilitzat per al moviment."; + Text[ thai ] = "ใช้ค่าเฉลี่ยเพื่à¸à¸¢à¹‰à¸²à¸¢"; }; String 6 // Name of Parameter 3 { @@ -31334,7 +32338,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard" ; Text [ portuguese_brazilian ] = "STD" ; Text [ portuguese ] = "Desvio_padrão" ; - Text [ finnish ] = "STDEV" ; + Text [ finnish ] = "KESKIHAJONTA" ; Text [ danish ] = "Standardafv" ; Text [ french ] = "ET" ; Text [ swedish ] = "STD" ; @@ -31342,7 +32346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "desv_predeterminada" ; Text [ english_us ] = "STDEV" ; Text[ chinese_simplified ] = "standard_dev"; - Text[ russian ] = "Ñòàíäàðòíîå_îòêë"; + Text[ russian ] = "ÑÒÀÍÄÎÒÊË"; Text[ polish ] = "Odchylenie standardowe"; Text[ japanese ] = "標準åå·®"; Text[ chinese_traditional ] = "standard_dev"; @@ -31354,6 +32358,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "STDEV"; Text[ language_user1 ] = " "; Text[ catalan ] = "STDEV"; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™"; }; String 7 // Description of Parameter 3 { @@ -31363,7 +32368,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La deviazione standard della distribuzione." ; Text [ portuguese_brazilian ] = "Die Standardabweichung, um die skaliert wird." ; Text [ portuguese ] = "é o desvio padrão da distribuição." ; - Text [ finnish ] = "Skaalauksessa käytettävä vakiopoikkeama." ; + Text [ finnish ] = "Skaalauksessa käytettävä keskihajonta" ; Text [ danish ] = "Standardafvigelsen for skaleringen." ; Text [ french ] = "L'écart type à utiliser pour l'étalonnage." ; Text [ swedish ] = "Standardavvikelsen för skalning." ; @@ -31371,7 +32376,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la desviación predeterminada de la distribución." ; Text [ english_us ] = "The standard deviation used for scaling." ; Text[ chinese_simplified ] = "æ˜¯åˆ†å¸ƒçš„æ ‡å‡†å差。"; - Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå, èñïîëüçóåìîå äëÿ ìàñøòàáèðîâàíèÿ."; Text[ polish ] = "Odchylenie standardowe, o które nast¹pi skalowanie."; Text[ japanese ] = "分布ã®æ¨™æº–å差値。"; Text[ chinese_traditional ] = "是分佈的標準å差。"; @@ -31379,10 +32384,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De standaarddeviatie die gebruikt wordt voor de schaalberekening."; Text[ chinese_simplified ] = "æ˜¯åˆ†å¸ƒçš„æ ‡å‡†å差。"; Text[ greek ] = "Ç ôõðéêÞ áðüêëéóç ç ïðïßá ÷ñçóéìïðïéåßôáé ãéá ôç êëéìÜêùóç."; - Text[ korean ] = "ë°°ìœ¨ì— ì´ìš©ë˜ëŠ” 표준 편차입니다."; + Text[ korean ] = "배율 ì¡°ì •ì— ì´ìš©ë˜ëŠ” 표준 편차입니다."; Text[ turkish ] = "Ölçekleme için kullanýlan standart sapma."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desviació estàndard utilitzada per al redimensionament."; + Text[ thai ] = "ใช้ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸—ำสเà¸à¸¥"; }; }; // -=*# Resource for function VARIATIONEN #*=- @@ -31404,7 +32410,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el número de permutaciones para un número determinado de objetos." ; Text [ english_us ] = "Returns the number of permutations for a given number of elements without repetition." ; Text[ chinese_simplified ] = "åœ¨ç»™å®šå…ƒç´ æ€»æ•°çš„æƒ…å†µä¸‹è®¡ç®—é€‰å–è‹¥å¹²å…ƒç´ çš„\n排列数(ä¸å…许é‡å¤æŽ’列)。"; - Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî ïåðåñòàíîâîê ýëåìåíòîâ (áåç ïîâòîðåíèé)."; + Text[ russian ] = "Âîçâðàùàåò êîëè÷åñòâî ïåðåñòàíîâîê äëÿ çàäàííîãî ÷èñëà ýëåìåíòîâ (áåç ïîâòîðåíèÿ)."; Text[ polish ] = "Wyznacza liczbê permutacji dla podanej liczby elementów."; Text[ japanese ] = "n 個ã®ã‚‚ã®ã‹ã‚‰ r 個をã¨ã‚‹é †åˆ—ã®ç·æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "åœ¨æŒ‡å®šå…ƒç´ ç¸½æ•¸çš„æƒ…æ³ä¸‹è¨ˆç®—é¸å–è‹¥å¹²å…ƒç´ çš„æŽ’åˆ—æ•¸(ä¸å…許é‡è¤‡æŽ’列)。"; @@ -31416,6 +32422,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yinelenmeyen öðeler varyasyonlarý sayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el nombre de permutacions per a un nombre donat d'elements sense repetició."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸ªà¸¥à¸±à¸šà¸¥à¸³à¸”ับสำหรับจำนวนà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ี่ใช้โดยไม่ทำซ้ำ"; }; ExtraData = { @@ -31439,7 +32446,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Cantidad_1" ; Text [ english_us ] = "Count_1" ; Text[ chinese_simplified ] = "Count_1"; - Text[ russian ] = "×èñëî_1"; + Text[ russian ] = "×èñëî 1"; Text[ polish ] = "Liczba_1"; Text[ japanese ] = "n"; Text[ chinese_traditional ] = "Count_1"; @@ -31451,6 +32458,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Adet sayýsý_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Count_1"; + Text[ thai ] = "นับ_1"; }; String 3 // Description of Parameter 1 { @@ -31460,7 +32468,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero totale degli elementi." ; Text [ portuguese_brazilian ] = "Gesamtanzahl der Elemente." ; Text [ portuguese ] = "é um número inteiro que descreve a quantidade de objectos." ; - Text [ finnish ] = "Elementtien kokonaismäärä." ; + Text [ finnish ] = "Elementtien kokonaismäärä" ; Text [ danish ] = "Det samlede antal elementer." ; Text [ french ] = "Le nombre total d'éléments." ; Text [ swedish ] = "Det totala antalet element." ; @@ -31480,6 +32488,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Toplam öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre total d'elements."; + Text[ thai ] = "จำนวนà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ั้งหมด"; }; String 4 // Name of Parameter 2 { @@ -31497,7 +32506,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Cantidad_2" ; Text [ english_us ] = "Count_2" ; Text[ chinese_simplified ] = "Count_2"; - Text[ russian ] = "×èñëî_2"; + Text[ russian ] = "×èñëî 2"; Text[ polish ] = "Liczba_2"; Text[ japanese ] = "r"; Text[ chinese_traditional ] = "Count_2"; @@ -31509,6 +32518,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Adet sayýsý_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Count_2"; + Text[ thai ] = "นับ_2"; }; String 5 // Description of Parameter 2 { @@ -31526,7 +32536,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un número entero que corresponde al número de objetos contenidos en cada permutación." ; Text [ english_us ] = "The selection number taken from the elements." ; Text[ chinese_simplified ] = "æ¯ä¸ªæŽ’列ä¸çš„å…ƒç´ æ•°ç›®ã€‚"; - Text[ russian ] = "×èñëî ýëåìåíòîâ â êàæäîé ïåðåñòàíîâêå."; + Text[ russian ] = "Êîëè÷åñòâî âûáðàííûõ ýëåìåíòîâ."; Text[ polish ] = "Liczba elementów do wyboru."; Text[ japanese ] = "1組ã«å«ã¾ã‚Œã‚‹è¦ç´ ã®æ•°ã€‚"; Text[ chinese_traditional ] = "æ¯å€‹æŽ’列ä¸çš„å…ƒç´ æ•¸ç›®ã€‚"; @@ -31538,6 +32548,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Seçilen öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de selecció pres dels elements."; + Text[ thai ] = "เลืà¸à¸à¸•à¸±à¸§à¹€à¸¥à¸‚ที่ใช้จาà¸à¸à¸‡à¸„์ประà¸à¸à¸š"; }; }; // -=*# Resource for function VARIATIONEN2 #*=- @@ -31559,7 +32570,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la cantidad de permutaciones para un número determinado de elementos con repeticiones." ; Text [ english_us ] = "Returns the number of permutations for a given number of objects (repetition allowed)." ; Text[ chinese_simplified ] = "åœ¨ç»™å®šå…ƒç´ æ€»æ•°çš„æƒ…å†µä¸‹è®¡ç®—é€‰å–è‹¥å¹²å…ƒç´ çš„\n排列数(å…许é‡å¤æŽ’列)。"; - Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî ïåðåñòàíîâîê ýëåìåíòîâ (ñ ïîâòîðåíèåì)."; + Text[ russian ] = "Âîçâðàùàåò êîëè÷åñòâî ïåðåñòàíîâîê äëÿ çàäàííîãî ÷èñëà îáúåêòîâ (ñ ïîâòîðåíèåì)."; Text[ polish ] = "Wyznacza liczbê permutacji dla podanej liczby elementów."; Text[ japanese ] = "n 個ã®ã‚‚ã®ã‹ã‚‰ r 個をã¨ã‚‹é‡è¤‡é †åˆ—ã®ç·æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "åœ¨æŒ‡å®šå…ƒç´ ç¸½æ•¸çš„æƒ…æ³ä¸‹è¨ˆç®—é¸å–è‹¥å¹²å…ƒç´ çš„æŽ’åˆ—æ•¸(å…許é‡è¤‡æŽ’列)。"; @@ -31571,6 +32582,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yinelenen öðeler varyasyonlarý sayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el nombre de permutacions per a un nombre donat d'objectes (es permet la repetició)."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸ªà¸¥à¸±à¸šà¸¥à¸³à¸”ับสำหรับจำนวนวัตถุที่ให้มา (à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸—ำซ้ำ)"; }; ExtraData = { @@ -31594,7 +32606,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Cantidad_1" ; Text [ english_us ] = "Count_1" ; Text[ chinese_simplified ] = "Count_1"; - Text[ russian ] = "×èñëî_1"; + Text[ russian ] = "×èñëî 1"; Text[ polish ] = "Liczba_1"; Text[ japanese ] = "n"; Text[ chinese_traditional ] = "Count_1"; @@ -31606,6 +32618,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Adet sayýsý_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Count_1"; + Text[ thai ] = "นับ_1"; }; String 3 // Description of Parameter 1 { @@ -31615,7 +32628,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero totale degli elementi" ; Text [ portuguese_brazilian ] = "Gesamtanzahl der Elemente." ; Text [ portuguese ] = "é o número total de elementos." ; - Text [ finnish ] = "Elementtien kokonaismäärä." ; + Text [ finnish ] = "Elementtien kokonaismäärä" ; Text [ danish ] = "Det samlede antal elementer." ; Text [ french ] = "Le nombre total d'éléments." ; Text [ swedish ] = "Totalt antal element." ; @@ -31635,6 +32648,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Toplam öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre total d'elements."; + Text[ thai ] = "จำนวนà¸à¸‡à¸„์ประà¸à¸à¸šà¸—ั้งหมด"; }; String 4 // Name of Parameter 2 { @@ -31652,7 +32666,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Cantidad_2" ; Text [ english_us ] = "Count_2" ; Text[ chinese_simplified ] = "Count_2"; - Text[ russian ] = "×èñëî_2"; + Text[ russian ] = "×èñëî 2"; Text[ polish ] = "Liczba_2"; Text[ japanese ] = "r"; Text[ chinese_traditional ] = "Count_2"; @@ -31664,6 +32678,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Adet sayýsý_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Count_2"; + Text[ thai ] = "นับ_2"; }; String 5 // Description of Parameter 2 { @@ -31681,7 +32696,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número entero que corresponde al número de objetos." ; Text [ english_us ] = "The selection number taken from the elements." ; Text[ chinese_simplified ] = "æ¯ä¸ªæŽ’列ä¸çš„å…ƒç´ æ•°ç›®ã€‚"; - Text[ russian ] = "×èñëî ýëåìåíòîâ â êàæäîé ïåðåñòàíîâêå."; + Text[ russian ] = "Êîëè÷åñòâî âûáðàííûõ ýëåìåíòîâ."; Text[ polish ] = "Liczba elementów do wyboru."; Text[ japanese ] = "1組ã«å«ã¾ã‚Œã‚‹è¦ç´ ã®æ•°ã€‚"; Text[ chinese_traditional ] = "æ¯å€‹æŽ’列ä¸çš„å…ƒç´ æ•¸ç›®ã€‚"; @@ -31693,6 +32708,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Seçilen öðe sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de selecció pres dels elements."; + Text[ thai ] = "เลืà¸à¸à¸•à¸±à¸§à¹€à¸¥à¸‚ที่ใช้จาà¸à¸à¸‡à¸„์ประà¸à¸à¸š"; }; }; // -=*# Resource for function KONFIDENZ #*=- @@ -31714,7 +32730,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el intervalo de confianza para la media de una población." ; Text [ english_us ] = "Returns a (1 alpha) confidence interval for a normal distribution." ; Text[ chinese_simplified ] = "计算æ£æ€åˆ†å¸ƒ (1-alpha) 的置信区间。"; - Text[ russian ] = "Âîçâðàùàåò äîâåðèòåëüíûé èíòåðâàë äëÿ ñðåäíåãî ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Âû÷èñëÿåò äîâåðèòåëüíûé èíòåðâàë ìàòåìàòè÷åñêîãî îæèäàíèÿ íîðìàëüíîãî ðàñïðåäåëåíèÿ."; Text[ polish ] = "Wyznacza przedzia³ ufnoœci dla œredniej z populacji."; Text[ japanese ] = "æ¯åˆ†æ•£ãŒæ—¢çŸ¥ã®å ´åˆã«ãŠã‘ã‚‹ã€æ¯å¹³å‡å€¤ã®ä¿¡é ¼åŒºé–“ã®å¹…ã® 1/2 ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算æ£æ…‹åˆ†ä½ˆ (1-alpha) 的置信å€é–“。"; @@ -31726,6 +32742,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Normal daðýtým ile ilgili (1-alfa)-güven aralýðýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna un interval de confiança (alfa 1) per a una distribució normal."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸š (à¸à¸±à¸¥à¸Ÿà¹ˆà¸² 1 ) ช่วงที่วางใจสำหรับà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¸›à¸à¸•à¸´"; }; ExtraData = { @@ -31761,6 +32778,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Alfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alfa"; + Text[ thai ] = "à¸à¸±à¸¥à¸Ÿà¹ˆà¸²"; }; String 3 // Description of Parameter 1 { @@ -31770,7 +32788,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Livello dell'intervallo di confidenza." ; Text [ portuguese_brazilian ] = "Das Niveau des Konfidenzintervalls." ; Text [ portuguese ] = "é o nível de significância utilizado para calcular o nível de confiança." ; - Text [ finnish ] = "Luottamusvälin taso." ; + Text [ finnish ] = "Luottamusvälin taso" ; Text [ danish ] = "Konfidensintervallets niveau." ; Text [ french ] = "Le niveau de l'intervalle de confiance." ; Text [ swedish ] = "Nivån för konfidensintervallet." ; @@ -31778,7 +32796,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el nivel de significación empleado para calcular el nivel de confianza." ; Text [ english_us ] = "The level of the confidence interval." ; Text[ chinese_simplified ] = "用于计算置信度的显著水平å‚数。"; - Text[ russian ] = "Óðîâåíü çíà÷íîñòè, èñïîëüçóåìûé äëÿ âû÷èñëåíèÿ óðîâíÿ íàäåæíîñòè."; + Text[ russian ] = "Óðîâåíü äîâåðèòåëüíîãî èíòåðâàëà."; Text[ polish ] = "Poziom przedzia³u ufnoœci."; Text[ japanese ] = "ä¿¡é ¼çŽ‡ã€‚"; Text[ chinese_traditional ] = "用於計算置信度的顯著水平åƒæ•¸ã€‚"; @@ -31786,10 +32804,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het niveau van de confidentie-interval."; Text[ chinese_simplified ] = "用于计算置信度的显著水平å‚数。"; Text[ greek ] = "Ôï åðßðåäï ôïõ äéáóôÞìáôïò åìðéóôïóýíçò."; - Text[ korean ] = "ì‹ ë¢°êµ¬ê°„ì˜ ìˆ˜ì¤€ìž…ë‹ˆë‹¤."; + Text[ korean ] = "ì‹ ë¢° êµ¬ê°„ì˜ ìˆ˜ì¤€ìž…ë‹ˆë‹¤."; Text[ turkish ] = "Güven aralýðýnýn düzeyi."; Text[ language_user1 ] = " "; Text[ catalan ] = "El nivell de l'interval de confiança."; + Text[ thai ] = "ระดับช่วงวางใจ"; }; String 4 // Name of Parameter 2 { @@ -31799,7 +32818,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard" ; Text [ portuguese_brazilian ] = "STD" ; Text [ portuguese ] = "Desv_padrão" ; - Text [ finnish ] = "STDEV" ; + Text [ finnish ] = "KESKIHAJONTA" ; Text [ danish ] = "Standardafv" ; Text [ french ] = "ET" ; Text [ swedish ] = "STD" ; @@ -31807,7 +32826,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "desv_predeterminada" ; Text [ english_us ] = "STDEV" ; Text[ chinese_simplified ] = "standard_dev"; - Text[ russian ] = "Ñòàíäàðòíîå_îòêë"; + Text[ russian ] = "ÑÒÀÍÄÎÒÊË"; Text[ polish ] = "odchylenie_std"; Text[ japanese ] = "æ¯æ¨™æº–åå·®"; Text[ chinese_traditional ] = "standard_dev"; @@ -31819,6 +32838,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "STDEV"; Text[ language_user1 ] = " "; Text[ catalan ] = "STDEV"; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™"; }; String 5 // Description of Parameter 2 { @@ -31828,7 +32848,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard della popolazione per l'intervallo di dati." ; Text [ portuguese_brazilian ] = "Die Standardabweichung der Grundgesamtheit." ; Text [ portuguese ] = "é o desvio padrão da população para o intervalo de dados." ; - Text [ finnish ] = "Populaation vakiopoikkeama." ; + Text [ finnish ] = "Populaation keskihajonta" ; Text [ danish ] = "Populationens standardafvigelse." ; Text [ french ] = "L'écart type de la population." ; Text [ swedish ] = "Populationens standardavvikelse." ; @@ -31836,7 +32856,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la desviación predeterminada de la población y se asume que es conocida." ; Text [ english_us ] = "The standard deviation of the population." ; Text[ chinese_simplified ] = "æ•°æ®åŒºåŸŸçš„æ€»ä½“æ ‡å‡†å差。"; - Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå ãåíåðàëüíîé ñîâîêóïíîñòè äëÿ èíòåðâàëà äàííûõ."; + Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå ñîâîêóïíîñòè."; Text[ polish ] = "Odchylenie standardowe populacji."; Text[ japanese ] = "æ¯é›†å›£ã®æ¨™æº–å差。"; Text[ chinese_traditional ] = "數據å€åŸŸçš„總體標準å差。"; @@ -31848,6 +32868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Popülasyonun standart sapmasý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desviació estàndard de la població."; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; String 6 // Name of Parameter 3 { @@ -31877,6 +32898,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Büyüklük"; Text[ language_user1 ] = " "; Text[ catalan ] = "mida"; + Text[ thai ] = "ขนาด"; }; String 7 // Description of Parameter 3 { @@ -31887,7 +32909,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Dimensioni del campione." ; Text [ portuguese_brazilian ] = "Die Gr?e der Grundgesamtheit." ; Text [ portuguese ] = "é o tamanho do exemplo." ; - Text [ finnish ] = "Populaation koko." ; + Text [ finnish ] = "Populaation koko" ; Text [ danish ] = "Populationens størrelse." ; Text [ french ] = "La taille de la population." ; Text [ swedish ] = "Populationens storlek." ; @@ -31895,7 +32917,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el tamaño de la muestra." ; Text [ english_us ] = "The size of the population." ; Text[ chinese_simplified ] = "æŠ½æ ·æ€»æ•°ã€‚"; - Text[ russian ] = "Ðàçìåð ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Ðàçìåð ñîâîêóïíîñòè."; Text[ polish ] = "Rozmiar populacji."; Text[ japanese ] = "標本ã®å¤§ãã•ã€‚"; Text[ chinese_traditional ] = "抽樣總數。"; @@ -31907,6 +32929,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Popülasyonun büyüklüðü."; Text[ language_user1 ] = " "; Text[ catalan ] = "Mida de la població."; + Text[ thai ] = "ขนาดประชาà¸à¸£"; }; }; // -=*# Resource for function GTEST #*=- @@ -31925,22 +32948,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Beregner den tosidede P-værdi til en z-test." ; Text [ french ] = "Calcule la probabilité bilatérale pour la distribution normale." ; Text [ swedish ] = "(Gauss-test) Beräknar den tvåsidiga kontrollstatistiken för normalfördelning." ; - Text [ dutch ] = "(Gauss-toets) Berekent de tweezijdige toetsstatistiekbij de normale verdeling." ; + Text [ dutch ] = "(Gauss-toets) Berekent de tweezijdige toetsstatistiek bij de normale verdeling." ; Text [ spanish ] = "Devuelve el valor P de dos colas de una prueba z." ; Text [ english_us ] = "Returns the two-tailed P value of a z test." ; Text[ chinese_simplified ] = "(高斯-检验)计算æ£æ€åˆ†å¸ƒçš„åŒå°¾æ¦‚率。"; - Text[ russian ] = "(Òåñò Ãàóññà) Âû÷èñëÿåò äâóñòîðîííþþ âåðîÿòíîñòü äëÿ íîðìàëüíîãî ðàñïðåäåëåíèÿ."; + Text[ russian ] = "Âû÷èñëÿåò äâóñòîðîííþþ âåðîÿòíîñòü çíà÷åíèé z-òåñòà ïðè ñòàíäàðòíîì ðàñïðåäåëåíèè."; Text[ polish ] = "Wyznacza dwustronny obszar krytyczny da testu z."; Text[ japanese ] = "ガウス検定を行ã„ã€ç‰‡å´ P 値を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "(高斯-檢驗)計算æ£æ…‹åˆ†ä½ˆçš„雙尾概率。"; Text[ arabic ] = "ÊÍÓÈ ÞíãÉ P ÇáËäÇÆíÉ ÇáÃØÑÇÝ z test."; - Text[ dutch ] = "(Gauss-toets) Berekent de tweezijdige toetsstatistiekbij de normale verdeling."; + Text[ dutch ] = "(Gauss-toets) Berekent de tweezijdige toetsstatistiek bij de normale verdeling."; Text[ chinese_simplified ] = "(高斯-检验)计算æ£æ€åˆ†å¸ƒçš„åŒå°¾æ¦‚率。"; Text[ greek ] = "(ÄïêéìÞ ôïõ Gauss) Õðïëïãßæåé ôçí äßðëåõñç óôáôéóôéêÞ åëÝã÷ïõ (ôéìÞ Ñ) ôçò êáíïíéêÞò êáôáíïìÞò (z test)."; Text[ korean ] = "(가우스 테스트) ì •ê·œë¶„í¬ì— 대한 ë‘ë©´ì˜ ì‹œí—˜ 통계를 계산합니다."; Text[ turkish ] = "(Gauss deneyi) normal daðýtým ile ilgili iki kuyruklu denetim istatistiðini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el valor P de dues cues d'una prova z."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่า P à¹à¸šà¸šà¸ªà¸à¸‡à¸«à¸²à¸‡à¸‚à¸à¸‡à¸à¸²à¸£à¸—ดสà¸à¸šà¹à¸šà¸š z "; }; ExtraData = { @@ -31976,6 +33000,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri"; Text[ language_user1 ] = " "; Text[ catalan ] = "dades"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥"; }; String 3 // Description of Parameter 1 { @@ -31985,7 +33010,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati." ; Text [ portuguese_brazilian ] = "Die Matrix der Daten." ; Text [ portuguese ] = "é a matriz ou intervalo de dados em que x será testado." ; - Text [ finnish ] = "Tietomatriisi." ; + Text [ finnish ] = "Tietotaulukko" ; Text [ danish ] = "Den matrix af data som X skal testes mod." ; Text [ french ] = "La matrice des données." ; Text [ swedish ] = "Matrisen för data." ; @@ -32005,6 +33030,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "La matriu de dades."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥"; }; String 4 // Name of Parameter 2 { @@ -32022,7 +33048,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "x" ; Text [ english_us ] = "Number" ; Text[ chinese_simplified ] = "number"; - Text[ russian ] = "X"; + Text[ russian ] = "×èñëî"; Text[ polish ] = "X"; Text[ japanese ] = "定数値"; Text[ chinese_traditional ] = "Number"; @@ -32034,6 +33060,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Örn"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre"; + Text[ thai ] = "ตัวเลข"; }; String 5 // Description of Parameter 2 { @@ -32043,7 +33070,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore da esaminare." ; Text [ portuguese_brazilian ] = "Der Wert, der getestet werden soll." ; Text [ portuguese ] = "é o valor a ser testado." ; - Text [ finnish ] = "Testattava arvo." ; + Text [ finnish ] = "Testattava arvo" ; Text [ danish ] = "Værdien som skal testes." ; Text [ french ] = "La valeur à tester." ; Text [ swedish ] = "Värdet som skall testas." ; @@ -32051,7 +33078,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor a comprobar." ; Text [ english_us ] = "The value to be tested." ; Text[ chinese_simplified ] = "è¦è¢«æ£€éªŒçš„数值。"; - Text[ russian ] = "Ïðîâåðÿåìîå çíà÷åíèå."; + Text[ russian ] = "Òåñòèðóåìîå çíà÷åíèå."; Text[ polish ] = "Wartoœæ do testowania."; Text[ japanese ] = "検定ã™ã‚‹å€¤(æ¯å¹³å‡å€¤)。"; Text[ chinese_traditional ] = "è¦è¢«æª¢é©—的數值。"; @@ -32063,6 +33090,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Denenecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de verificar."; + Text[ thai ] = "ทดสà¸à¸šà¸„่า"; }; String 6 // Name of Parameter 3 { @@ -32091,7 +33119,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "STD"; Text[ turkish ] = "Sigma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "STDEV"; + Text[ catalan ] = "sigma"; + Text[ thai ] = "ผลรวม"; }; String 7 // Description of Parameter 3 { @@ -32101,7 +33130,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Deviazione standard del campione." ; Text [ portuguese_brazilian ] = "Die Standardabweichung der Grundgesamtheit." ; Text [ portuguese ] = "é o desvio padrão da população (conhecido)." ; - Text [ finnish ] = "Populaation vakiopoikkeama." ; + Text [ finnish ] = "Populaation vakiopoikkeama" ; Text [ danish ] = "Populationens standardafvigelse." ; Text [ french ] = "L'écart type de la population." ; Text [ swedish ] = "Standardavvikelsen för populationen." ; @@ -32109,7 +33138,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la desviación predeterminada (conocida) de la población." ; Text [ english_us ] = "The standard deviation of the population." ; Text[ chinese_simplified ] = "æ ·æœ¬æ€»ä½“çš„æ ‡å‡†å差。"; - Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå ãåíåðàëüíîé ñîâîêóïíîñòè."; + Text[ russian ] = "Ñòàíäàðòíîå îòêëîíåíèå ñîâîêóïíîñòè."; Text[ polish ] = "Odchylenie standardowe populacji."; Text[ japanese ] = "既知ã®æ¯åˆ†æ•£ã€‚"; Text[ chinese_traditional ] = "樣本總體的標準å差。"; @@ -32121,6 +33150,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Popülasyonun standart sapmasý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desviació estàndard de la població."; + Text[ thai ] = "ส่วนเบี่ยงเบนมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¸›à¸£à¸°à¸Šà¸²à¸à¸£"; }; }; // -=*# Resource for function CHITEST #*=- @@ -32143,7 +33173,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la prueba de independencia." ; Text [ english_us ] = "Returns the chi square independence test." ; Text[ chinese_simplified ] = "计算 Chi 平方的独立性检验值。"; - Text[ russian ] = "Âîçâðàùàåò òåñò íà íåçàâèñèìîñòü."; + Text[ russian ] = "Âû÷èñëÿåò âåðîÿòíîñòü îòêëîíåíèÿ îò ñëó÷àéíîãî ðàñïðåäåëåíèÿ äëÿ äâóõ ðÿäîâ òåñòèðîâàííûõ äàííûõ."; Text[ polish ] = "Oblicza test na niezale¿noœæ rozk³adu chi-kwadrat."; Text[ japanese ] = "カイ二乗分布を用ã„ã¦ç‹¬ç«‹æ€§ã®æ¤œå®šã‚’è¡Œã„ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算 Chi 平方的ç¨ç«‹æ€§æª¢é©—值。"; @@ -32155,6 +33185,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Chi-kare baðýmsýzlýk deneyini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la verificació d'independència quadrada khi."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸—ดสà¸à¸šà¸à¸´à¸ªà¸£à¸°à¹„คสà¹à¸„วร์"; }; ExtraData = { @@ -32178,7 +33209,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_B" ; Text [ english_us ] = "Data_B" ; Text[ chinese_simplified ] = "data_B"; - Text[ russian ] = "Äàííûå_B"; + Text[ russian ] = "Äàííûå B"; Text[ polish ] = "Dane_O"; Text[ japanese ] = "実測値"; Text[ chinese_traditional ] = "data_B"; @@ -32190,6 +33221,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_B"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_B"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_B"; }; String 3 // Description of Parameter 1 { @@ -32199,7 +33231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati osservati." ; Text [ portuguese_brazilian ] = "Die Matrix der beobachteten Daten." ; Text [ portuguese ] = "é o intervalo de dados que contém observações para serem comparadas com os valores esperados." ; - Text [ finnish ] = "Tutkittu tietomatriisi." ; + Text [ finnish ] = "Tutkittu tietotaulukko" ; Text [ danish ] = "Matrixen med de observerede værdier." ; Text [ french ] = "La plage des données observées." ; Text [ swedish ] = "Matrisen för observerade data." ; @@ -32207,7 +33239,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el área de datos que contiene observaciones para probar frente a valores esperados." ; Text [ english_us ] = "The observed data array." ; Text[ chinese_simplified ] = "å«è§‚察数æ®çš„行列。"; - Text[ russian ] = "Äèàïàçîí, ñîäåðæàùèé íàáëþäåíèÿ, ïîäëåæàùèå ñðàâíåíèþ ñ îæèäàåìûìè çíà÷åíèÿìè."; + Text[ russian ] = "Ïîëó÷åííûé ìàññèâ äàííûõ."; Text[ polish ] = "Macierz obserwowanych danych."; Text[ japanese ] = "実測値ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "å«è§€å¯Ÿæ•¸æ“šçš„行列。"; @@ -32219,6 +33251,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýzlenen deðerlerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades observada."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥à¸—ี่สังเà¸à¸•"; }; String 4 // Name of Parameter 2 { @@ -32236,7 +33269,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_E" ; Text [ english_us ] = "data_E" ; Text[ chinese_simplified ] = "data_E"; - Text[ russian ] = "Äàííûå_Å"; + Text[ russian ] = "Äàííûå Å"; Text[ polish ] = "Dane_T"; Text[ japanese ] = "期待値"; Text[ chinese_traditional ] = "data_E"; @@ -32248,6 +33281,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_E"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_E"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_E"; }; String 5 // Description of Parameter 2 { @@ -32257,7 +33291,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei valori attesi." ; Text [ portuguese_brazilian ] = "Die Matrix der erwarteten Daten." ; Text [ portuguese ] = "É a matriz dos dados necessários." ; - Text [ finnish ] = "Oletettu tietomatriisi." ; + Text [ finnish ] = "Oletettu tietotaulukko" ; Text [ danish ] = "Matrixen med de forventede værdier." ; Text [ french ] = "La plage des données prévues." ; Text [ swedish ] = "Matrisen för förväntade data." ; @@ -32265,7 +33299,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el área de datos que contiene los valores esperados." ; Text [ english_us ] = "The expected data array." ; Text[ chinese_simplified ] = "å«æœŸå¾…æ•°æ®çš„行列。"; - Text[ russian ] = "Äèàïàçîí, ñîäåðæàùèé îòíîøåíèå ïðîèçâåäåíèé èòîãîâ ïî ñòðîêàì è ñòîëáöàì ê îáùåìó èòîãó."; + Text[ russian ] = "Îæèäàåìûé ìàññèâ äàííûõ."; Text[ polish ] = "Macierz oczekiwanych danych."; Text[ japanese ] = "期待値ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "å«æœŸå¾…的數據的行列。"; @@ -32277,6 +33311,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Beklenen deðerlerin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "La matriu de dades esperada."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥à¸—ี่คาดไว้"; }; }; // -=*# Resource for function FTEST #*=- @@ -32295,10 +33330,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Renvoie le résultat d'un test F." ; Text [ swedish ] = "Beräknar F-varianstestet." ; Text [ dutch ] = "Berekent de F-variantietest" ; - Text [ spanish ] = "Devuelve el resultado de una prueba F." ; + Text [ spanish ] = "Calcula el resultado de una prueba F." ; Text [ english_us ] = "Calculates the F test." ; Text[ chinese_simplified ] = "计算 F - 方差检验的结果。"; - Text[ russian ] = "Âîçâðàùàåò ðåçóëüòàò F-òåñòà."; + Text[ russian ] = "Âû÷èñëÿåò F-òåñò."; Text[ polish ] = "Podaje wynik testu F."; Text[ japanese ] = "F 検定ã®çµæžœã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算 F - 方差檢驗的çµæžœã€‚"; @@ -32306,10 +33341,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de F-variantietest"; Text[ chinese_simplified ] = "计算 F - 方差检验的结果。"; Text[ greek ] = "Õðïëïãßæåé ôïí Ýëåã÷ï äéáêýìáíóçò F."; - Text[ korean ] = "Fï¼ë¶„산테스트 계산"; + Text[ korean ] = "F 분산 테스트를 계산합니다."; Text[ turkish ] = "F varyans deneyini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la verificació F."; + Text[ thai ] = "คำนวนà¸à¸²à¸£à¸—ดสà¸à¸šà¹à¸šà¸š F "; }; ExtraData = { @@ -32333,7 +33369,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_1" ; Text [ english_us ] = "data_1" ; Text[ chinese_simplified ] = "data_1"; - Text[ russian ] = "Äàííûå_1"; + Text[ russian ] = "Äàííûå 1"; Text[ polish ] = "Dane_1"; Text[ japanese ] = "データ 1"; Text[ chinese_traditional ] = "data_1"; @@ -32345,6 +33381,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_1"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_1"; }; String 3 // Description of Parameter 1 { @@ -32354,7 +33391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del primo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des ersten Datensatzes." ; Text [ portuguese ] = "é a primeira matriz ou intervalo de dados." ; - Text [ finnish ] = "Ensimmäinen tietuematriisi." ; + Text [ finnish ] = "Ensimmäinen tietuetaulukko" ; Text [ danish ] = "Den første dataposts matrix." ; Text [ french ] = "La matrice du premier enregistrement." ; Text [ swedish ] = "Den första datapostens matris." ; @@ -32362,7 +33399,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la primera matriz o área de datos." ; Text [ english_us ] = "The first record array." ; Text[ chinese_simplified ] = "第一个数æ®ç»„的矩阵。"; - Text[ russian ] = "Ïåðâûé ìàññèâ èëè äèàïàçîí äàííûõ."; + Text[ russian ] = "Ïåðâûé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz pierwszego rekordu."; Text[ japanese ] = "1ã¤ã‚ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第一組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -32374,6 +33411,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Birinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu de registre."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนà¹à¸£à¸"; }; String 4 // Name of Parameter 2 { @@ -32391,7 +33429,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_2" ; Text [ english_us ] = "data_2" ; Text[ chinese_simplified ] = "data_2"; - Text[ russian ] = "Äàííûå_2"; + Text[ russian ] = "Äàííûå 2"; Text[ polish ] = "Dane_2"; Text[ japanese ] = "データ 2"; Text[ chinese_traditional ] = "data_2"; @@ -32403,6 +33441,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_2"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_2"; }; String 5 // Description of Parameter 2 { @@ -32412,15 +33451,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del secondo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des zweiten Datensatzes." ; Text [ portuguese ] = "é a segunda matriz ou intervalo de dados." ; - Text [ finnish ] = "Toinen tietuematriisi." ; + Text [ finnish ] = "Toinen tietuetaulukko" ; Text [ danish ] = "Den anden dataposts matrix." ; Text [ french ] = "La matrice du deuxième enregistrement." ; Text [ swedish ] = "Den andra datapostens matris." ; Text [ dutch ] = "De matrix van de tweede record." ; - Text [ spanish ] = "es la segunda matriz o área de datos." ; + Text [ spanish ] = "La matriz del segundo registro." ; Text [ english_us ] = "The second record array." ; Text[ chinese_simplified ] = "第二个数æ®ç»„的矩阵。"; - Text[ russian ] = "Âòîðîé ìàññèâ èëè äèàïàçîí äàííûõ."; + Text[ russian ] = "Âòîðîé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz drugiego zbioru danych."; Text[ japanese ] = "2ã¤ã‚ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第二組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -32432,6 +33471,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýkinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Segona matriu de registres."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนที่สà¸à¸‡"; }; }; // -=*# Resource for function TTEST #*=- @@ -32453,7 +33493,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la probabilidad asociada con la prueba t de Student." ; Text [ english_us ] = "Calculates the T test." ; Text[ chinese_simplified ] = "计算与å¦ç”Ÿæ°T-检验相关的概率。"; - Text[ russian ] = "Âû÷èñëÿåò âåðîÿòíîñòü, ñîîòâåòñòâóþùóþ t-òåñòó Ñòüþäåíòà."; + Text[ russian ] = "Âû÷èñëÿåò t-òåñò (âåðîÿòíîñòü, àññîöèèðóþùóþñÿ ñ ïðîâåðêîé ïî êðèòåðèþ Ñòüþäåíòà)."; Text[ polish ] = "Wyznacza rozk³ad t Studenta."; Text[ japanese ] = "2個ã®å¹³å‡å€¤ã®å·®ã‚’検定ã—ã€çµæžœã®æœ‰æ„確率（P 値）を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算與å¸ç”Ÿæ°T-檢驗相關的概率。"; @@ -32461,10 +33501,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de Student T-toets."; Text[ chinese_simplified ] = "计算与å¦ç”Ÿæ°T-检验相关的概率。"; Text[ greek ] = "Õðïëïãßæåé ôïí Ýëåã÷ï T."; - Text[ korean ] = "Tï¼í…ŒìŠ¤íŠ¸ 계산"; + Text[ korean ] = "T 테스트를 계산합니다."; Text[ turkish ] = "T deneyini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la verificació T."; + Text[ thai ] = "คำนวณà¸à¸²à¸£à¸—ดสà¸à¸šà¹à¸šà¸š T "; }; ExtraData = { @@ -32488,7 +33529,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_1" ; Text [ english_us ] = "data_1" ; Text[ chinese_simplified ] = "data_1"; - Text[ russian ] = "Äàííûå_1"; + Text[ russian ] = "Äàííûå 1"; Text[ polish ] = "Dane_1"; Text[ japanese ] = "データ 1"; Text[ chinese_traditional ] = "data_1"; @@ -32500,6 +33541,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_1"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_1"; }; String 3 // Description of Parameter 1 { @@ -32509,7 +33551,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del primo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des ersten Datensatzes." ; Text [ portuguese ] = "é o primeiro conjunto de dados." ; - Text [ finnish ] = "Ensimmäinen tietuematriisi." ; + Text [ finnish ] = "Ensimmäinen tietuetaulukko" ; Text [ danish ] = "Den første dataposts matrix." ; Text [ french ] = "La matrice du premier enregistrement." ; Text [ swedish ] = "Den första datapostens matris." ; @@ -32517,7 +33559,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el primer conjunto de datos." ; Text [ english_us ] = "The first record array." ; Text[ chinese_simplified ] = "第一个数æ®ç»„的矩阵。"; - Text[ russian ] = "Ìàññèâ ïåðâîãî ìíîæåñòâà äàííûõ."; + Text[ russian ] = "Ïåðâûé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz pierwszego rekordu."; Text[ japanese ] = "1ã¤ã‚ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第一組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -32529,6 +33571,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Birinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu de registre."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนà¹à¸£à¸"; }; String 4 // Name of Parameter 2 { @@ -32546,7 +33589,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_2" ; Text [ english_us ] = "data_2" ; Text[ chinese_simplified ] = "data_2"; - Text[ russian ] = "Äàííûå_2"; + Text[ russian ] = "Äàííûå 2"; Text[ polish ] = "Dane_2"; Text[ japanese ] = "データ 2"; Text[ chinese_traditional ] = "data_2"; @@ -32558,6 +33601,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_2"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_2"; }; String 5 // Description of Parameter 2 { @@ -32567,15 +33611,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del secondo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des zweiten Datensatzes." ; Text [ portuguese ] = "é o segundo conjunto de dados." ; - Text [ finnish ] = "Toinen tietuematriisi." ; + Text [ finnish ] = "Toinen tietuetaulukko" ; Text [ danish ] = "Den anden dataposts matrix." ; Text [ french ] = "La matrice du deuxième enregistrement." ; Text [ swedish ] = "Den andra datapostens matris." ; Text [ dutch ] = "De matrix van de tweede record." ; - Text [ spanish ] = "es el segundo conjunto de datos." ; + Text [ spanish ] = "La matriz del segundo registro." ; Text [ english_us ] = "The second record array." ; Text[ chinese_simplified ] = "第二个数æ®ç»„。"; - Text[ russian ] = "Ìàññèâ âòîðîãî ìíîæåñòâà äàííûõ."; + Text[ russian ] = "Âòîðîé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz drugiego zbioru danych."; Text[ japanese ] = "2ã¤ã‚ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第二組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -32587,6 +33631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýkinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Segona matriu de registres."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนที่สà¸à¸‡"; }; String 6 // Name of Parameter 3 { @@ -32604,7 +33649,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Modo" ; Text [ english_us ] = "mode" ; Text[ chinese_simplified ] = "tails"; - Text[ russian ] = "Õâîñòû"; + Text[ russian ] = "Ðåæèì"; Text[ polish ] = "Tryb"; Text[ japanese ] = "モード"; Text[ chinese_traditional ] = "Tails"; @@ -32616,6 +33661,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kip"; Text[ language_user1 ] = " "; Text[ catalan ] = "mode"; + Text[ thai ] = "โหมด"; }; String 7 // Description of Parameter 3 { @@ -32633,7 +33679,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica el número de colas de distribución." ; Text [ english_us ] = "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution" ; Text[ chinese_simplified ] = "tails = 1 计算å•å°¾åˆ†å¸ƒï¼Œtails = 2 计算åŒå°¾åˆ†å¸ƒã€‚"; - Text[ russian ] = "Åñëè õâîñòû = 1, òî ôóíêöèÿ ÒÒÅÑÒ èñïîëüçóåò îäíîñòîðîííåå ðàñïðåäåëåíèå. Åñëè õâîñòû = 2, òî ôóíêöèÿ ÒÒÅÑÒ èñïîëüçóåò äâóñòîðîííåå ðàñïðåäåëåíèå."; + Text[ russian ] = "Åñëè ðåæèì = 1, òî ôóíêöèÿ èñïîëüçóåò îäíîñòîðîííåå ðàñïðåäåëåíèå. Åñëè ðåæèì = 2, òî ôóíêöèÿ èñïîëüçóåò äâóñòîðîííåå ðàñïðåäåëåíèå."; Text[ polish ] = "Tryb = 1 oblicza jednoœladowy test, Tryb = 2 dwuœladowy."; Text[ japanese ] = "1 を指定ã™ã‚‹ã¨ç‰‡å´æ¤œå®šã€2 を指定ã™ã‚‹ã¨ä¸¡å´æ¤œå®šã‚’è¡Œã„ã¾ã™ã€‚"; Text[ chinese_traditional ] = "tails = 1 計算單尾分佈ï¹tails = 2 計算雙尾分佈。"; @@ -32645,6 +33691,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kip = 1, tek kuyruklu deneyi, Kip = 2 ise iki kuyruklu deneyi hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "El mode indica el nombre de cues de distribució a tornar. 1 = d'una cua, 2 = distribució de dues cues."; + Text[ thai ] = "โหมดระบุจำนวนหางà¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¸—ี่ส่งà¸à¸¥à¸±à¸š 1= หางเดียว, 2 = à¸à¸²à¸£à¸à¸£à¸°à¸ˆà¸²à¸¢à¹à¸šà¸šà¸ªà¸à¸‡à¸«à¸²à¸‡"; }; String 8 // Name of Parameter 4 { @@ -32674,6 +33721,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 9 // Description of Parameter 4 { @@ -32703,6 +33751,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "T deneyi tipi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus de la verificació T."; + Text[ thai ] = "ชนิดขà¸à¸‡à¸à¸²à¸£à¸—ดสà¸à¸š T "; }; }; // -=*# Resource for function BESTIMMTHEITSMASS #*=- @@ -32720,22 +33769,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Beregner kvadratet på Pearsons korrelationskoefficient." ; Text [ french ] = "Calcule le coefficient de corrélation de Pearson au carré." ; Text [ swedish ] = "Beräknar den Pearsonska korrelationskoefficenten i kvadrerad form." ; - Text [ dutch ] = "Berekent de correlatiecoëfficiënt van Peorson in kwadraatvorm." ; + Text [ dutch ] = "Berekent de correlatiecoëfficiënt van Pearson in kwadraatvorm." ; Text [ spanish ] = "Devuelve el valor R cuadrado para una línea de regresión lineal creada con los datos de los argumentos matriz_x y matriz_y." ; Text [ english_us ] = "Returns the square of the Pearson product moment correlation coefficient." ; Text[ chinese_simplified ] = "计算 Pearson 乘积矩相关系数的平方。"; - Text[ russian ] = "Âû÷èñëÿåò êâàäðàò êîýôôèöèåíòà êîððåëÿöèè Ïèðñîíà ïî òî÷êàì äàííûõ."; + Text[ russian ] = "Âîçâðàùàåò êâàäðàò êîýôôèöèåíòà êîððåëÿöèè ñìåùåííîãî ìîìåíòà Ïèðñîíà."; Text[ polish ] = "Wyznacza kwadrat chwilowego wspó³czynnika korelacji iloczynu Pearsona."; Text[ japanese ] = "ピアソンã®ç©çŽ‡ç›¸é–¢ä¿‚æ•°ã®2ä¹—ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算 Pearson 乘ç©çŸ©ç›¸é—œä¿‚數的平方。"; Text[ arabic ] = "ÊÍÓÈ ÊÑÈíÚ ãÚÇãá Pearson ááÇÑÊÈÇØ ÇáÚÒæãí."; - Text[ dutch ] = "Berekent de correlatiecoëfficiënt van Peorson in kwadraatvorm."; + Text[ dutch ] = "Berekent de correlatiecoëfficiënt van Pearson in kwadraatvorm."; Text[ chinese_simplified ] = "计算 Pearson 乘积矩相关系数的平方。"; Text[ greek ] = "Õðïëïãßæåé ôï ôåôñÜãùíï ôïõ óõíôåëåóôÞ óõó÷Ýôéóçò ôïõ Pearson."; Text[ korean ] = "Pearson ì˜ ìƒê´€ê³„ìˆ˜ì˜ ì œê³±ì„ ê³„ì‚°."; Text[ turkish ] = "Pearson korelasyon katsayýsýnýn karesini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el quadrat del coeficient de Pearson de correlació de moment de producte."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸³à¸¥à¸±à¸‡à¸ªà¸à¸‡à¸‚à¸à¸‡à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¹€à¸žà¸µà¸¢à¸£à¹Œà¸ªà¸±à¸™à¸‚ณะสัมประสิทธิ์สัมพันธ์à¸à¸±à¸™"; }; ExtraData = { @@ -32759,7 +33809,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_äàííûå_Y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "データ Y"; Text[ chinese_traditional ] = "data_Y"; @@ -32771,6 +33821,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -32780,7 +33831,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é a matriz dos dados y." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -32800,6 +33851,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -32817,7 +33869,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_äàííûå_X"; + Text[ russian ] = "Äàííûå X"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "データ X"; Text[ chinese_traditional ] = "data_X"; @@ -32829,6 +33881,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -32838,7 +33891,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati X." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten." ; Text [ portuguese ] = "é a matriz dos dados x." ; - Text [ finnish ] = "Tietomatriisi X." ; + Text [ finnish ] = "Tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data." ; Text [ french ] = "La matrice des données X." ; Text [ swedish ] = "Matrisen med x-data." ; @@ -32858,6 +33911,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X"; }; }; // -=*# Resource for function ACHSENABSCHNITT #*=- @@ -32879,7 +33933,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la intersección del eje de ordenadas con la recta de regresión lineal." ; Text [ english_us ] = "Returns the intercept of the linear regression line and the Y axis." ; Text[ chinese_simplified ] = "计算线性回归线与 Y 轴的交点。"; - Text[ russian ] = "Âîçâðàùàåò îòðåçîê, îòñåêàåìûé íà îñè ëèíèåé ëèíåéíîé ðåãðåññèè."; + Text[ russian ] = "Âû÷èñëÿåò îòðåçîê, îòñåêàåìûé ëèíèåé ëèíåéíîé ðåãðåññèè."; Text[ polish ] = "Oblicza punkt przeciêcia prostej regresji z osi¹ Y."; Text[ japanese ] = "回帰直線ã®åˆ‡ç‰‡ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算線性回æ¸ç·šå’ŒY軸的交點。"; @@ -32891,6 +33945,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Regresyon doðrusunun Y ekseni ile kesiþme noktasýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la intersecció entre la l?nia de regressió lineal i l'eix Y."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸¸à¸”ตัดขà¸à¸‡à¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡à¹à¸šà¸šà¸–ดถà¸à¸¢à¹à¸¥à¸°à¹à¸à¸™ Y "; }; ExtraData = { @@ -32914,7 +33969,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_çíà÷_y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "データ Y"; Text[ chinese_traditional ] = "data_Y"; @@ -32926,6 +33981,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -32935,7 +33991,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é o conjunto dependente de observações ou dados." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -32943,7 +33999,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "representa la serie dependiente de observaciones o de datos." ; Text [ english_us ] = "The Y data array." ; Text[ chinese_simplified ] = "Y-å› å˜é‡æ•°æ®ç»„。"; - Text[ russian ] = "Çàâèñèìîå ìíîæåñòâî íàáëþäåíèé èëè äàííûõ.."; + Text[ russian ] = "Ìàññèâ äàííûõ Y."; Text[ polish ] = "Macierz danych Y."; Text[ japanese ] = "従属変数 Y ã®å€¤ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "Y-å› è®Šé‡æ•¸æ“šçµ„。"; @@ -32955,6 +34011,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -32972,7 +34029,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_çíà÷_x"; + Text[ russian ] = "Äàííûå X"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "データ X"; Text[ chinese_traditional ] = "data_X"; @@ -32984,6 +34041,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -32993,7 +34051,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati X." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten." ; Text [ portuguese ] = "é o conjunto independente de observações ou dados." ; - Text [ finnish ] = "Tietomatriisi X." ; + Text [ finnish ] = "Tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data." ; Text [ french ] = "La matrice des données X." ; Text [ swedish ] = "Matrisen med x-data." ; @@ -33001,7 +34059,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "representa la serie independiente de observaciones o de datos." ; Text [ english_us ] = "The X data array." ; Text[ chinese_simplified ] = "X-自å˜é‡æ•°æ®ç»„。"; - Text[ russian ] = "Íåçàâèñèìîå ìíîæåñòâî íàáëþäåíèé èëè äàííûõ."; + Text[ russian ] = "Ìàññèâ äàííûõ X."; Text[ polish ] = "Macierz danych X."; Text[ japanese ] = "従属変数 X ã®å€¤ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "X-自變é‡æ•¸æ“šçµ„。"; @@ -33013,6 +34071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X "; }; }; // -=*# Resource for function STEIGUNG #*=- @@ -33034,7 +34093,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la pendiente de una línea de regresión lineal." ; Text [ english_us ] = "Returns the slope of the linear regression line." ; Text[ chinese_simplified ] = "计算线性回归直线的斜率。"; - Text[ russian ] = "Âû÷èñëÿåò íàêëîí ëèíèè ëèíåéíîé ðåãðåññèè."; + Text[ russian ] = "Âîçâðàùàåò íàêëîí ëèíèè ëèíåéíîé ðåãðåññèè."; Text[ polish ] = "Wyznacza nachylenie wykresu regresji liniowej."; Text[ japanese ] = "回帰直線ã®å‚¾ãã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算線性回æ¸ç›´ç·šçš„斜率。"; @@ -33046,6 +34105,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Regresyon doðrularýnýn yükseliþini hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna la pendent de la l?nia de regressió lineal."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„วามชันขà¸à¸‡à¸à¸²à¸£à¸–ดถà¸à¸¢à¹à¸šà¸šà¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡"; }; ExtraData = { @@ -33069,7 +34129,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_äàííûå_Y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "データ Y"; Text[ chinese_traditional ] = "data_Y"; @@ -33081,6 +34141,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -33090,7 +34151,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é uma matriz ou intervalo de célula de dados numéricos dependentes." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -33110,6 +34171,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -33127,7 +34189,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_äàííûå_X"; + Text[ russian ] = "Äàííûå X"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "データ X"; Text[ chinese_traditional ] = "data_X"; @@ -33139,6 +34201,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -33148,7 +34211,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati X." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten." ; Text [ portuguese ] = "é o conjunto de dados independentes." ; - Text [ finnish ] = "Tietomatriisi X." ; + Text [ finnish ] = "Tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data." ; Text [ french ] = "La matrice des données X." ; Text [ swedish ] = "Matrisen med x-data." ; @@ -33168,6 +34231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X "; }; }; // -=*# Resource for function STFEHLERYX #*=- @@ -33189,7 +34253,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el error típico del valor a la regresión lineal." ; Text [ english_us ] = "Returns the standard error of the linear regression." ; Text[ chinese_simplified ] = "ç”¨çº¿æ€§å›žå½’æ³•è®¡ç®—é¢„æµ‹å€¼æ—¶æ‰€äº§ç”Ÿçš„æ ‡å‡†è¯¯å·®ã€‚"; - Text[ russian ] = "Âû÷èñëÿåò ñòàíäàðòíóþ îøèáêó ïðåäñêàçàííûõ çíà÷åíèé y äëÿ êàæäîãî çíà÷åíèÿ x â ðåãðåññèè."; + Text[ russian ] = "Âîçâðàùàåò îøèáêó ëèíåéíîé ðåãðåññèè."; Text[ polish ] = "Oblicza standardowy b³¹d regresji liniowej."; Text[ japanese ] = "回帰直線ã®æ¨™æº–誤差を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "用線性回æ¸æ³•è¨ˆç®—é 測值時所產生的標準誤差。"; @@ -33201,6 +34265,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Doðrusal regresyondaki standart hatayý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna l'error estàndard de la regressió lineal."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„วามผิดพลาดมาตรà¸à¸²à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸–ดถà¸à¸¢à¹à¸šà¸šà¹€à¸ªà¹‰à¸™à¸•à¸£à¸‡"; }; ExtraData = { @@ -33224,7 +34289,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_äàííûå_Y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "データ Y"; Text[ chinese_traditional ] = "data_Y"; @@ -33236,6 +34301,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 3 // Description of Parameter 1 { @@ -33245,7 +34311,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é uma matriz ou intervalo de dados dependentes." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -33265,6 +34331,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 4 // Name of Parameter 2 { @@ -33282,7 +34349,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_äàííûå_X"; + Text[ russian ] = "Äàííûå X"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "データ X"; Text[ chinese_traditional ] = "data_X"; @@ -33294,6 +34361,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 5 // Description of Parameter 2 { @@ -33303,7 +34371,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice dei dati X." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten." ; Text [ portuguese ] = "é uma matriz ou intervalo de dados independentes.." ; - Text [ finnish ] = "Tietomatriisi X." ; + Text [ finnish ] = "Tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data." ; Text [ french ] = "La matrice des données X." ; Text [ swedish ] = "Matrisen med x-data." ; @@ -33323,6 +34391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X verileri matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X "; }; }; // -=*# Resource for function PEARSON #*=- @@ -33344,7 +34413,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el coeficiente de correlación producto o momento r de Pearson.." ; Text [ english_us ] = "Returns the Pearson product moment correlation coefficient." ; Text[ chinese_simplified ] = "计算皮尔生相关系数。"; - Text[ russian ] = "Âîçâðàùàåò êîýôôèöèåíò êîððåëÿöèè Ïèðñîíà."; + Text[ russian ] = "Âû÷èñëÿåò ïèðñîíîâñêèé êîýôôèöèåíò êîððåëÿöèè r."; Text[ polish ] = "Oblicza chwilowy wspó³czynnik korelacji iloczynu Pearsona."; Text[ japanese ] = "ピアソンã®ç©çŽ‡ç›¸é–¢ä¿‚æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算皮爾生相關係數。"; @@ -33356,6 +34425,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Pearson korelasyon katsayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el coeficient de Pearson de correlació de moment de producte."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¹€à¸žà¸µà¸¢à¸£à¹Œà¸ªà¸±à¸™à¸‚ณะสัมประสิทธิ์สัมพันธ์à¸à¸±à¸™"; }; ExtraData = { @@ -33379,7 +34449,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_1" ; Text [ english_us ] = "Data_1" ; Text[ chinese_simplified ] = "data_1"; - Text[ russian ] = "Äàííûå_1"; + Text[ russian ] = "Äàííûå 1"; Text[ polish ] = "Dane_1"; Text[ japanese ] = "データ 1"; Text[ chinese_traditional ] = "data_1"; @@ -33391,6 +34461,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_1"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_1"; }; String 3 // Description of Parameter 1 { @@ -33400,7 +34471,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del primo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des ersten Datensatzes." ; Text [ portuguese ] = "é um conjunto de valores independentes." ; - Text [ finnish ] = "Ensimmäinen tietuematriisi." ; + Text [ finnish ] = "Ensimmäinen tietuetaulukko" ; Text [ danish ] = "Den første dataposts matrix." ; Text [ french ] = "La matrice du premier enregistrement." ; Text [ swedish ] = "Den första datapostens matris." ; @@ -33408,7 +34479,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un conjunto de valores independientes." ; Text [ english_us ] = "The first record array." ; Text[ chinese_simplified ] = "第一个数æ®ç»„的矩阵。"; - Text[ russian ] = "Ìíîæåñòâî íåçàâèñèìûõ çíà÷åíèé."; + Text[ russian ] = "Ïåðâûé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz drugiego zbioru danych."; Text[ japanese ] = "変数 X ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第一組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -33420,6 +34491,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Birinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu de registre."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนà¹à¸£à¸"; }; String 4 // Name of Parameter 2 { @@ -33437,7 +34509,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_2" ; Text [ english_us ] = "Data_2" ; Text[ chinese_simplified ] = "data_2"; - Text[ russian ] = "Äàííûå_2"; + Text[ russian ] = "Äàííûå 2"; Text[ polish ] = "Dane_2"; Text[ japanese ] = "データ 2"; Text[ chinese_traditional ] = "data_2"; @@ -33449,6 +34521,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_2"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_2"; }; String 5 // Description of Parameter 2 { @@ -33458,15 +34531,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del secondo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des zweiten Datensatzes." ; Text [ portuguese ] = "é um conjunto de valores dependentes." ; - Text [ finnish ] = "Toinen tietuematriisi." ; + Text [ finnish ] = "Toinen tietuetaulukko" ; Text [ danish ] = "Den anden dataposts matrix." ; Text [ french ] = "La matrice du deuxième enregistrement." ; Text [ swedish ] = "Den andra datapostens matris." ; Text [ dutch ] = "De matrix van het tweede gegevensbereik." ; - Text [ spanish ] = "es un conjunto de valores dependientes." ; + Text [ spanish ] = "La matriz del segundo registro." ; Text [ english_us ] = "The second record array." ; Text[ chinese_simplified ] = "第二个数æ®ç»„的矩阵。"; - Text[ russian ] = "Ìíîæåñòâî çàâèñèìûõ çíà÷åíèé."; + Text[ russian ] = "Âòîðîé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz drugiego zbioru danych."; Text[ japanese ] = "変数 Y ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第二組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -33478,6 +34551,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýkinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Segona matriu de registres."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนที่สà¸à¸‡"; }; }; // -=*# Resource for function KORREL #*=- @@ -33499,7 +34573,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el coeficiente de correlación entre dos conjuntos de datos." ; Text [ english_us ] = "Returns the correlation coefficient." ; Text[ chinese_simplified ] = "计算相关系数。"; - Text[ russian ] = "Âîçâðàùàåò êîýôôèöèåíò êîððåëÿöèè ìåæäó äâóìÿ ìíîæåñòâàìè äàííûõ."; + Text[ russian ] = "Âû÷èñëÿåò êîýôôèöèåíò êîððåëÿöèè äëÿ äâóõ îáëàñòåé äàííûõ."; Text[ polish ] = "Oblicza wspó³czynnik korelacji miêdzy dwoma zbiorami danych."; Text[ japanese ] = "ピアソンã®ç©çŽ‡ç›¸é–¢ä¿‚æ•°ã‚’è¿”ã—ã¾ã™"; Text[ chinese_traditional ] = "計算相關係數。"; @@ -33511,6 +34585,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Korelasyon katsayýsýný hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el coeficient de correlació."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าสัมประสิทธิ์ที่สัมพันธ์à¸à¸±à¸™"; }; ExtraData = { @@ -33534,7 +34609,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_1" ; Text [ english_us ] = "Data_1" ; Text[ chinese_simplified ] = "data_1"; - Text[ russian ] = "Äàííûå_1"; + Text[ russian ] = "Äàííûå 1"; Text[ polish ] = "Dane_1"; Text[ japanese ] = "データ 1"; Text[ chinese_traditional ] = "data_1"; @@ -33546,6 +34621,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_1"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_1"; }; String 3 // Description of Parameter 1 { @@ -33555,7 +34631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del primo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des ersten Datensatzes." ; Text [ portuguese ] = "é um intervalo de valores numa célula." ; - Text [ finnish ] = "Ensimmäinen tietuematriisi." ; + Text [ finnish ] = "Ensimmäinen tietuetaulukko" ; Text [ danish ] = "Den første dataposts matrix." ; Text [ french ] = "La matrice du premier enregistrement." ; Text [ swedish ] = "Den första datapostens matris." ; @@ -33563,7 +34639,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "primer área de celdas de valores." ; Text [ english_us ] = "The first record array." ; Text[ chinese_simplified ] = "第一组数æ®å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Ïåðâûé äèàïàçîí çíà÷åíèé."; + Text[ russian ] = "Ïåðâûé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz pierwszego rekordu."; Text[ japanese ] = "1ã¤ã‚ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第一組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -33575,6 +34651,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Birinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu de registre."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนà¹à¸£à¸"; }; String 4 // Name of Parameter 2 { @@ -33592,7 +34669,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_2" ; Text [ english_us ] = "Data_2" ; Text[ chinese_simplified ] = "data_2"; - Text[ russian ] = "Äàííûå_2"; + Text[ russian ] = "Äàííûå 2"; Text[ polish ] = "Dane_2"; Text[ japanese ] = "データ 2"; Text[ chinese_traditional ] = "data_2"; @@ -33604,6 +34681,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_2"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_2"; }; String 5 // Description of Parameter 2 { @@ -33613,15 +34691,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del secondo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des zweiten Datensatzes." ; Text [ portuguese ] = "é o segundo intervalo de valores numa célula." ; - Text [ finnish ] = "Toinen tietuematriisi." ; + Text [ finnish ] = "Toinen tietuetaulukko" ; Text [ danish ] = "Den anden dataposts matrix." ; Text [ french ] = "La matrice du deuxième enregistrement." ; Text [ swedish ] = "Den andra datapostens matris." ; Text [ dutch ] = "De matrix met de tweede record." ; - Text [ spanish ] = "segunda área de celdas de valores." ; + Text [ spanish ] = "La matriz del segundo registro." ; Text [ english_us ] = "The second record array." ; Text[ chinese_simplified ] = "第二组数æ®å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Âòîðîé äèàïàçîí çíà÷åíèé."; + Text[ russian ] = "Âòîðîé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz drugiego zbioru danych."; Text[ japanese ] = "2ã¤ã‚ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第二組數據儲å˜æ ¼å€åŸŸã€‚"; @@ -33633,6 +34711,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýkinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Segona matriu de registres."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนที่สà¸à¸‡"; }; }; // -=*# Resource for function KOVAR #*=- @@ -33651,10 +34730,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Calcule la covariance." ; Text [ swedish ] = "Beräknar kovariansen." ; Text [ dutch ] = "Berekent de covariantie" ; - Text [ spanish ] = "Devuelve la covarianza, o promedio de los productos entre las desviaciones, de los valores por pares." ; + Text [ spanish ] = "Calcula la covariancia." ; Text [ english_us ] = "Calculates the covariance." ; Text[ chinese_simplified ] = "计算å方差。"; - Text[ russian ] = "Âîçâðàùàåò êîâàðèàöèþ, ñðåäíåå ïîïàðíûõ ïðîèçâåäåíèé îòêëîíåíèé."; + Text[ russian ] = "Âû÷èñëÿåò êîâàðèàöèþ (êîâàðèàíòíîñòü äâóõ îòêëîíåíèé)."; Text[ polish ] = "Oblicza kowariancjê."; Text[ japanese ] = "2ã¤ã®ãƒ‡ãƒ¼ã‚¿ã®å…±åˆ†æ•£ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算å”方差。"; @@ -33666,6 +34745,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Kovaryansý hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la covariància."; + Text[ thai ] = "คำนวณà¸à¸²à¸£à¹à¸›à¸£à¸œà¸±à¸™à¸£à¹ˆà¸§à¸¡"; }; ExtraData = { @@ -33689,7 +34769,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_1" ; Text [ english_us ] = "Data_1" ; Text[ chinese_simplified ] = "data_1"; - Text[ russian ] = "Äàííûå_1"; + Text[ russian ] = "Äàííûå 1"; Text[ polish ] = "Dane_1"; Text[ japanese ] = "データ 1"; Text[ chinese_traditional ] = "data_1"; @@ -33701,6 +34781,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_1"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_1"; }; String 3 // Description of Parameter 1 { @@ -33710,7 +34791,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del primo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des ersten Datensatzes." ; Text [ portuguese ] = "é o primeiro intervalo de números inteiros." ; - Text [ finnish ] = "Ensimmäinen tietuematriisi." ; + Text [ finnish ] = "Ensimmäinen tietuetaulukko" ; Text [ danish ] = "Den første dataposts matrix." ; Text [ french ] = "La matrice du premier enregistrement." ; Text [ swedish ] = "Den första datapostens matris." ; @@ -33718,7 +34799,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "primer área de celdas de números enteros." ; Text [ english_us ] = "The first record array." ; Text[ chinese_simplified ] = "第一个数æ®ç»„çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Ïåðâûé äèàïàçîí ÿ÷ååê öåëûõ ÷èñåë."; + Text[ russian ] = "Ïåðâûé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz pierwszego rekordu."; Text[ japanese ] = "1ã¤ã‚ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "第一個數據組的儲å˜æ ¼å€åŸŸã€‚"; @@ -33730,6 +34811,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Birinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primera matriu de registre."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนà¹à¸£à¸"; }; String 4 // Name of Parameter 2 { @@ -33747,7 +34829,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_2" ; Text [ english_us ] = "Data_2" ; Text[ chinese_simplified ] = "data_2"; - Text[ russian ] = "Äàííûå_2"; + Text[ russian ] = "Äàííûå 2"; Text[ polish ] = "Dane_2"; Text[ japanese ] = "データ 2"; Text[ chinese_traditional ] = "data_2"; @@ -33759,6 +34841,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data_2"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_2"; }; String 5 // Description of Parameter 2 { @@ -33768,15 +34851,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice del secondo record di dati." ; Text [ portuguese_brazilian ] = "Die Matrix des zweiten Datensatzes." ; Text [ portuguese ] = "é o segundo intervalo de números inteiros." ; - Text [ finnish ] = "Toinen tietuematriisi." ; + Text [ finnish ] = "Toinen tietuetaulukko" ; Text [ danish ] = "Den anden dataposts matrix." ; Text [ french ] = "La matrice du deuxième enregistrement." ; Text [ swedish ] = "Den andra datapostens matris." ; Text [ dutch ] = "De matrix met de tweede record." ; - Text [ spanish ] = "segunda área de celdas de números enteros." ; + Text [ spanish ] = "La matriz del segundo registro." ; Text [ english_us ] = "The second record array." ; Text[ chinese_simplified ] = "第二个数æ®ç»„çš„å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Âòîðîé äèàïàçîí ÿ÷ååê öåëûõ ÷èñåë."; + Text[ russian ] = "Âòîðîé ìàññèâ çàïèñåé."; Text[ polish ] = "Macierz drugiego zbioru danych."; Text[ japanese ] = "データãŒå…¥åŠ›ã•ã‚Œã¦ã„ã‚‹ã‚‚ã†1ã¤ã®ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "第二個數據組的儲å˜æ ¼å€åŸŸã€‚"; @@ -33788,6 +34871,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýkinci veri kümesinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Segona matriu de registres."; + Text[ thai ] = "à¹à¸–วลำดับระเบียนที่สà¸à¸‡"; }; }; // -=*# Resource for function SCHÄTZER #*=- @@ -33801,7 +34885,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce un valore su una retta di regressione." ; Text [ portuguese_brazilian ] = "Berechnet einen Wert auf der Regressionsgeraden." ; Text [ portuguese ] = "Devolve um valor baseando-se numa regressão linear." ; - Text [ finnish ] = "Palauttaa lineaarisen regression arvon" ; + Text [ finnish ] = "Palauttaa lineaarisen regression arvon." ; Text [ danish ] = "Beregner en værdi baseret på lineær regression." ; Text [ french ] = "Renvoie une valeur suivant une ligne de régression." ; Text [ swedish ] = "Beräknar ett värde längs en regressionslinje." ; @@ -33809,7 +34893,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve un valor basándose en una regresión lineal." ; Text [ english_us ] = "Returns a value along a linear regression" ; Text[ chinese_simplified ] = "计算线性回归预测值。"; - Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå ïî ëèíåéíîé ðåãðåññèè."; + Text[ russian ] = "Âîçâðàùàåòñÿ çíà÷åíèå ïî ëèíåéíîé ðåãðåññèè."; Text[ polish ] = "Oblicza wartoœæ przy za³o¿eniu regresji liniowej."; Text[ japanese ] = "回帰直線上ã§ã€ç‹¬ç«‹å¤‰æ•°ãŒæŒ‡å®šå€¤ã§ã‚ã‚‹ã¨ãã®å¾“属変数ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "計算線性回æ¸é 測值。"; @@ -33821,6 +34905,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Regresyon doðrusu üzerinde bir deðer hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna un valor al llarg d'una regressió lineal."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸„่าตามเส้นตรงà¹à¸šà¸šà¸–ดถà¸à¸¢"; }; ExtraData = { @@ -33856,6 +34941,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -33885,6 +34971,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Regresyon doðrusu üzerinde Y deðeri hesaplanacak X deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor X per al qual s'ha de calcular el valor Y de la regressió lineal."; + Text[ thai ] = "คำนวณค่า X สำหรับค่า Y บนเส้นตรงà¹à¸šà¸šà¸–ดถà¸à¸¢"; }; String 4 // Name of Parameter 2 { @@ -33902,7 +34989,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_Y" ; Text [ english_us ] = "data_Y" ; Text[ chinese_simplified ] = "data_Y"; - Text[ russian ] = "Èçâ_çíà÷_y"; + Text[ russian ] = "Äàííûå Y"; Text[ polish ] = "Dane_Y"; Text[ japanese ] = "従属変数 ï½™"; Text[ chinese_traditional ] = "data_Y"; @@ -33914,6 +35001,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_Y"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_Y"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_Y"; }; String 5 // Description of Parameter 2 { @@ -33923,7 +35011,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati Y." ; Text [ portuguese_brazilian ] = "Die Matrix der Y-Daten." ; Text [ portuguese ] = "é a matriz ou o intervalo de célula de dados dependentes." ; - Text [ finnish ] = "Tietomatriisi Y." ; + Text [ finnish ] = "Tietotaulukko Y" ; Text [ danish ] = "Matrixen med Y-data." ; Text [ french ] = "La matrice des données Y." ; Text [ swedish ] = "Matrisen med y-data." ; @@ -33931,7 +35019,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "matriz o área de datos dependientes." ; Text [ english_us ] = "The Y data array." ; Text[ chinese_simplified ] = "æ•°æ®ç»„ Y 。"; - Text[ russian ] = "Çàâèñèìûé ìàññèâ èëè äèàïàçîí äàííûõ."; + Text[ russian ] = "Ìàññèâ äàííûõ Y."; Text[ polish ] = "Macierz danych Y."; Text[ japanese ] = "従属変数 y ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "數據組 Y 。"; @@ -33943,6 +35031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Y verilerinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades Y."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ Y "; }; String 6 // Name of Parameter 3 { @@ -33960,7 +35049,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Datos_X" ; Text [ english_us ] = "data_X" ; Text[ chinese_simplified ] = "data_X"; - Text[ russian ] = "Èçâ_çíà÷_x"; + Text[ russian ] = "Äàííûå Õ"; Text[ polish ] = "Dane_X"; Text[ japanese ] = "独立変数 x"; Text[ chinese_traditional ] = "data_X"; @@ -33972,6 +35061,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Veri_X"; Text[ language_user1 ] = " "; Text[ catalan ] = "data_X"; + Text[ thai ] = "ข้à¸à¸¡à¸¹à¸¥_X"; }; String 7 // Description of Parameter 3 { @@ -33981,7 +35071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice dei dati X." ; Text [ portuguese_brazilian ] = "Die Matrix der X-Daten." ; Text [ portuguese ] = "é a matriz ou o intervalo de célula de dados independentes." ; - Text [ finnish ] = "Tietomatriisi X." ; + Text [ finnish ] = "Tietotaulukko X" ; Text [ danish ] = "Matrixen med X-data." ; Text [ french ] = "La matrice des données X." ; Text [ swedish ] = "Matrisen med x-data." ; @@ -33989,7 +35079,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "matriz o área de datos independiente." ; Text [ english_us ] = "The X data array." ; Text[ chinese_simplified ] = "æ•°æ®ç»„ X。"; - Text[ russian ] = "Íåçàâèñèìûé ìàññèâ èëè äèàïàçîí äàííûõ."; + Text[ russian ] = "Ìàññèâ äàííûõ Õ."; Text[ polish ] = "Macierz danych X."; Text[ japanese ] = "独立変数 x ã®ãƒ‡ãƒ¼ã‚¿ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセル範囲。"; Text[ chinese_traditional ] = "數據組 X。"; @@ -34001,6 +35091,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "X verilerinin matrisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu de dades X."; + Text[ thai ] = "à¹à¸–วลำดับข้à¸à¸¡à¸¹à¸¥ X "; }; }; // -=*# Resource for function ADRESSE #*=- @@ -34022,7 +35113,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve una referencia de celda con formato de texto." ; Text [ english_us ] = "Returns the reference to a cell as text." ; Text[ chinese_simplified ] = "用文å—æ¥ç¡®å®šä¸€ä¸ªå•å…ƒæ ¼çš„引用地å€ã€‚"; - Text[ russian ] = "Âîçâðàùàåò ññûëêó íà îäíó ÿ÷åéêó â ðàáî÷åì ëèñòå â âèäå òåêñòà."; + Text[ russian ] = "Âîçâðàùàåò ññûëêó íà ÿ÷åéêó ïî íîìåðàì ñòðîêè è ñòîëáöà."; Text[ polish ] = "Okreœla odwo³anie do komórki jako tekst."; Text[ japanese ] = "数値ã§æŒ‡å®šã—ãŸã‚»ãƒ«å‚照を文å—列ã§è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個當作文å—的儲å˜æ ¼çš„åƒç…§ã€‚"; @@ -34033,7 +35124,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ì— ëŒ€í•œ 참조를 í…스트로 반환"; Text[ turkish ] = "Bir hücreye alýnan referansý metin olarak belirler."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna la referència a una cel·la com a text."; + Text[ catalan ] = "Torna la referència a una cel.la com a text."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์เป็นข้à¸à¸„วาม"; }; ExtraData = { @@ -34069,6 +35161,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Satýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "fila"; + Text[ thai ] = "à¹à¸–ว"; }; String 3 // Description of Parameter 1 { @@ -34078,7 +35171,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero di riga della cella." ; Text [ portuguese_brazilian ] = "Die Zeilennummer der Zelle." ; Text [ portuguese ] = "é o número da linha a usar na referência da célula." ; - Text [ finnish ] = "Solun rivinumero." ; + Text [ finnish ] = "Solun rivinumero" ; Text [ danish ] = "Cellens rækkenummer." ; Text [ french ] = "Le numéro de ligne de la cellule." ; Text [ swedish ] = "Radnumret för cellen." ; @@ -34086,7 +35179,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número de fila de la celda." ; Text [ english_us ] = "The row number of the cell." ; Text[ chinese_simplified ] = "å•å…ƒæ ¼çš„è¡Œå·"; - Text[ russian ] = "Íîìåð ñòðîêè, èñïîëüçóåìûé â ññûëêå ÿ÷åéêè."; + Text[ russian ] = "Íîìåð ñòðîêè ÿ÷åéêè."; Text[ polish ] = "Numer wiersza komórki."; Text[ japanese ] = "セルã®è¡Œç•ªå·ã€‚"; Text[ chinese_traditional ] = "儲å˜æ ¼åˆ—號"; @@ -34097,7 +35190,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ì˜ í–‰ 번호"; Text[ turkish ] = "Hücrenin satýr numarasý."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre de fila de la cel·la."; + Text[ catalan ] = "Nombre de fila de la cel.la."; + Text[ thai ] = "หมายเลขà¹à¸–วขà¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œ"; }; String 4 // Name of Parameter 2 { @@ -34126,7 +35220,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "단"; Text[ turkish ] = "Sütun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "COLUMN"; + Text[ catalan ] = "columna"; + Text[ thai ] = "คà¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; String 5 // Description of Parameter 2 { @@ -34136,7 +35231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero di colonna della cella." ; Text [ portuguese_brazilian ] = "Die Spaltennummer der Zelle." ; Text [ portuguese ] = "é o número da coluna a usar na referência da célula." ; - Text [ finnish ] = "Solun sarakenumero." ; + Text [ finnish ] = "Solun sarakenumero" ; Text [ danish ] = "Cellens kolonnenummer." ; Text [ french ] = "Le numéro de colonne de la cellule." ; Text [ swedish ] = "Cellens kolumnnummer." ; @@ -34144,7 +35239,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Número de columna de la celda." ; Text [ english_us ] = "The column number of the cell." ; Text[ chinese_simplified ] = "å•å…ƒæ ¼çš„列å·"; - Text[ russian ] = "Íîìåð ñòîëáöà, èñïîëüçóåìûé â ññûëêå ÿ÷åéêè."; + Text[ russian ] = "Íîìåð ñòîëáöà ÿ÷åéêè."; Text[ polish ] = "Numer kolumny komórki."; Text[ japanese ] = "セルã®åˆ—番å·ã€‚"; Text[ chinese_traditional ] = "儲å˜æ ¼æ¬„號"; @@ -34155,7 +35250,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ì˜ ì—´ 번호."; Text[ turkish ] = "Hücrenin sütun numarasý."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre de columna de la cel·la."; + Text[ catalan ] = "Nombre de columna de la cel.la."; + Text[ thai ] = "หมายเลขคà¸à¸¥à¸±à¸¡à¸™à¹Œà¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œ"; }; String 6 // Name of Parameter 3 { @@ -34165,7 +35261,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Assoluto" ; Text [ portuguese_brazilian ] = "ABS" ; Text [ portuguese ] = "ABS" ; - Text [ finnish ] = "ABS" ; + Text [ finnish ] = "ITSEISARVO" ; Text [ danish ] = "ABS" ; Text [ french ] = "ABS" ; Text [ swedish ] = "ABS" ; @@ -34173,7 +35269,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "ABS" ; Text [ english_us ] = "ABS" ; Text[ chinese_simplified ] = "abs_num"; - Text[ russian ] = "ABS"; + Text[ russian ] = "Àáñîëþòíûé íîìåð"; Text[ polish ] = "MODU£.LICZBY"; Text[ japanese ] = "種類"; Text[ chinese_traditional ] = "abs_num"; @@ -34185,6 +35281,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "ABS"; Text[ language_user1 ] = " "; Text[ catalan ] = "ABS"; + Text[ thai ] = "ABS"; }; String 7 // Description of Parameter 3 { @@ -34194,7 +35291,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Specifica se il riferimento da utilizzare è assoluto o relativo." ; Text [ portuguese_brazilian ] = "Gibt an, ob absolute oder relative Referenzierung verwendet wird." ; Text [ portuguese ] = "determina se será usada uma referência absoluta ou relativa." ; - Text [ finnish ] = "Määrittää käytetäänkö kiinteää (abs) vai suhteellista viitettä." ; + Text [ finnish ] = "Määrittää käytetäänkö absoluuttista vai suhteellista viitettä." ; Text [ danish ] = "Specificerer om en absolut eller relativ referencetype skal bruges." ; Text [ french ] = "Indique le type de référence à utiliser (absolue ou relative)." ; Text [ swedish ] = "Anger om absolut eller relativ referens används." ; @@ -34202,7 +35299,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Especifica si la referencia usada es absoluta o relativa." ; Text [ english_us ] = "Specifies whether absolute or relative referencing is to be used." ; Text[ chinese_simplified ] = "指定使用的是ç»å¯¹å¼•ç”¨è¿˜æ˜¯ç›¸å¯¹å¼•ç”¨ã€‚"; - Text[ russian ] = "Çàäàíèå òèïà (àáñîëþòíûé èëè îòíîñèòåëüíûé) âîçâðàùàåìîé ññûëêè."; + Text[ russian ] = "Çàäàíèå èñïîëüçóåìîãî òèïà: àáñîëþòíûé èëè îòíîñèòåëüíûé."; Text[ polish ] = "Okreœla, czy zostan¹ u¿yte wzglêdne lub bezwzglêdne adresy."; Text[ japanese ] = "絶対å‚ç…§ã¾ãŸã¯ç›¸å¯¾å‚ç…§ã®ã©ã¡ã‚‰ã‚’使用ã™ã‚‹ã‹æŒ‡å®šã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "指定使用的是絕å°åƒç…§é‚„是相å°åƒç…§ã€‚"; @@ -34210,10 +35307,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Geeft aan of er een absolute of relatieve verwijzing gebruikt wordt."; Text[ chinese_simplified ] = "指定使用的是ç»å¯¹å¼•ç”¨è¿˜æ˜¯ç›¸å¯¹å¼•ç”¨ã€‚"; Text[ greek ] = "Ïñßæåé áí èá ãßíåé ÷ñÞóç ôçò áðüëõôçò Þ ôçò ó÷åôéêÞò êáôá÷þñéóçò."; - Text[ korean ] = "ì ˆëŒ€ì ë˜ëŠ” ìƒëŒ€ì ì°¸ì¡°ì˜ ì‚¬ìš© 여부를 ì •ì˜í•©ë‹ˆë‹¤."; + Text[ korean ] = "ì ˆëŒ€ì ë˜ëŠ” ìƒëŒ€ì ì°¸ì¡°ì˜ ì‚¬ìš© 여부를 ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Mutlak ya da göreceli referanstan hangisinin kullanýlacaðýný belirtir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica si s'ha d'utilitzar la referència relativa o absoluta."; + Text[ thai ] = "ระบุว่าใช้à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹à¸šà¸šà¸ªà¸±à¸¡à¸žà¸±à¸—ธ์หรืà¸à¸ªà¸±à¸¡à¸šà¸¹à¸£à¸“์"; }; String 8 // Name of Parameter 4 { @@ -34223,7 +35321,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Tabella" ; Text [ portuguese_brazilian ] = "Tabelle" ; Text [ portuguese ] = "Folha" ; - Text [ finnish ] = "lomake" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Regneark" ; Text [ french ] = "Feuille" ; Text [ swedish ] = "tabell" ; @@ -34231,7 +35329,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "hoja" ; Text [ english_us ] = "sheet" ; Text[ chinese_simplified ] = "sheet_text"; - Text[ russian ] = "Òåêñò_ëèñòà"; + Text[ russian ] = "Ëèñò"; Text[ polish ] = "Arkusz"; Text[ japanese ] = "表å"; Text[ chinese_traditional ] = "sheet_text"; @@ -34243,6 +35341,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "full"; + Text[ thai ] = "à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™"; }; String 9 // Description of Parameter 4 { @@ -34252,7 +35351,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il nome del foglio elettronico del riferimento." ; Text [ portuguese_brazilian ] = "Der Tabellenname des Zellbezugs." ; Text [ portuguese ] = "especifica o nome da folha de cálculo ou da folha da macro como referência externa." ; - Text [ finnish ] = "Soluviitteen laskentataulukon nimi." ; + Text [ finnish ] = "Soluviitteen laskentataulukon nimi" ; Text [ danish ] = "Cellereferencens regnearksnavn." ; Text [ french ] = "Le nom de la feuille de calcul de la référence." ; Text [ swedish ] = "Tabellnamnet för cellreferensen." ; @@ -34260,7 +35359,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "El nombre de la hoja de cálculo de la referencia de celda." ; Text [ english_us ] = "The spreadsheet name of the cell reference." ; Text[ chinese_simplified ] = "使用å•å…ƒæ ¼å¼•ç”¨çš„工作表å称。"; - Text[ russian ] = "Ñòðîêà, çàäàþùàÿ èìÿ ëèñòà, êîòîðûé èñïîëüçóåòñÿ êàê âíåøíÿÿ ññûëêà."; + Text[ russian ] = "Èìÿ ññûëêè ÿ÷åéêè ýëåêòðîííîé òàáëèöû."; Text[ polish ] = "Nazwa arkusza kalulacyjnego jako odwo³ania do komórki"; Text[ japanese ] = "外部å‚ç…§ã¨ã—ã¦ä½¿ç”¨ã™ã‚‹è¡¨ã®åå‰ã€‚"; Text[ chinese_traditional ] = "儲å˜æ ¼åƒç…§çš„工作表å稱。"; @@ -34271,7 +35370,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ ì°¸ì¡°ì˜ ìŠ¤í”„ë ˆë“œì‹œíŠ¸ ì´ë¦„"; Text[ turkish ] = "Hücre referansýnýn tablo adý."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nom del full de càlcul de la referència de cel·la."; + Text[ catalan ] = "Nom del full de càlcul de la referència de cel.la."; + Text[ thai ] = "ชื่à¸à¸à¸£à¸°à¸”าษคำนวณขà¸à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹€à¸‹à¸¥à¸¥à¹Œ"; }; }; // -=*# Resource for function BEREICHE #*=- @@ -34294,7 +35394,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el número de áreas que pertenecen a un área de celdas (múltiple)." ; Text [ english_us ] = "Returns the number of individual ranges that belong to a (multiple) range." ; Text[ chinese_simplified ] = "求得引用ä¸åŒ…å«çš„区域的å•ä½æ•°ç›®ã€‚"; - Text[ russian ] = "Îïðåäåëÿåò êîëè÷åñòâî îáëàñòåé â ññûëêå, îáðàçóþùèå äèàïàçîí."; + Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî îòäåëüíûõ äèàïàçîíîâ, ïðèíàäëåæàùèõ óêàçàííîé îáëàñòè. "; Text[ polish ] = "Okreœla iloœæ pojedynczych obszarów, które tworz¹ obszar z³o¿ony."; Text[ japanese ] = "セル範囲ã®å€‹æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "求得åƒç…§ä¸åŒ…å«çš„å€åŸŸçš„數目。"; @@ -34302,10 +35402,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Geeft het aantal bereiken in een (meervoudige) verwijzing."; Text[ chinese_simplified ] = "求得引用ä¸åŒ…å«çš„区域的å•ä½æ•°ç›®ã€‚"; Text[ greek ] = "Ïñßæåé ôï ðëÞèïò ôùí ìåìïíùìÝíùí ôìçìÜôùí ðïõ áíÞêïõí óå ìéá (ðïëëáðëÞ) ðåñéï÷Þ åðéëïãÞò."; - Text[ korean ] = "(다중)ì˜ì—ì— ì†í•˜ëŠ” 개별ì ì¸ ì˜ì—ì˜ ìˆ˜ë¥¼ 반환"; + Text[ korean ] = "다중 ë²”ìœ„ì— ì†í•˜ëŠ” 개별ì ì¸ ë²”ìœ„ì˜ ìˆ˜ë¥¼ ì›ëž˜ëŒ€ë¡œ ëŒë¦½ë‹ˆë‹¤."; Text[ turkish ] = "(Çoklu) aralýða dahil bireysel aralýklarýn sayýsýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el nombre d'àrees individuals que pertanyen a una àrea (múltiple)."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸‚à¸à¸‡à¸Šà¹ˆà¸§à¸‡à¹€à¸‰à¸žà¸²à¸°à¸—ี่เป็นขà¸à¸‡ (หลาย) ช่วง"; }; ExtraData = { @@ -34341,6 +35442,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "referència"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -34350,7 +35452,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il riferimento a un'area (multipla)." ; Text [ portuguese_brazilian ] = "Der Bezug auf einen (Mehrfach-)Bereich." ; Text [ portuguese ] = "é uma referência a uma célula ou intervalo de células e pode referir-se a várias áreas." ; - Text [ finnish ] = "Viittaus moniosaiseen alueeseen." ; + Text [ finnish ] = "Viittaus moniosaiseen alueeseen" ; Text [ danish ] = "En reference til et (multi-)område." ; Text [ french ] = "La référence à une plage (multiple)." ; Text [ swedish ] = "Referensen till ett (multi-)område." ; @@ -34358,7 +35460,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la referencia a un área múltiple." ; Text [ english_us ] = "The reference to a (multiple) range." ; Text[ chinese_simplified ] = "引用一个(多é‡)区域。"; - Text[ russian ] = "Ññûëêà íà îäíó îáëàñòü èëè äèàïàçîí."; + Text[ russian ] = "Ññûëêà íà îäèí èëè íåñêîëüêî äèàïàçîíîâ."; Text[ polish ] = "Odwo³anie do obszaru z³o¿onego."; Text[ japanese ] = "複数範囲ã®å‚照。"; Text[ chinese_traditional ] = "åƒç…§ä¸€å€‹(多é‡)å€åŸŸã€‚"; @@ -34366,10 +35468,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De verwijzing naar een (meervoudig) bereik."; Text[ chinese_simplified ] = "引用一个(多é‡)区域。"; Text[ greek ] = "Ç áíáöïñÜ óå ìéá (ðïëëáðëÞ) ðåñéï÷Þ."; - Text[ korean ] = "범위(다중 범위)ì— ëŒ€í•œ 참조입니다."; + Text[ korean ] = "(다중) ë²”ìœ„ì— ëŒ€í•œ 참조입니다."; Text[ turkish ] = "(Çoklu) aralýða referans."; Text[ language_user1 ] = " "; Text[ catalan ] = "Referència a una àrea (múltiple)."; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยัง (หลาย) ช่วง"; }; }; // -=*# Resource for function WAHL #*=- @@ -34392,7 +35495,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Elige un valor de una lista de hasta 30 argumentos." ; Text [ english_us ] = "Selects a value from a list of up to 30 value arguments." ; Text[ chinese_simplified ] = "从 30 个数值ä¸é€‰ä¸€ä¸ªæ•°å€¼ã€‚"; - Text[ russian ] = "Âûáèðàåò çíà÷åíèå èç ñïèñêà äî 30 àðãóìåíòîâ."; + Text[ russian ] = "Âîçâðàùàåò çíà÷åíèÿ èç ñïèñêà 30 àðãóìåíòîâ."; Text[ polish ] = "Wybiera wartoœæ z listy zawieraj¹cej do 30 argumentów."; Text[ japanese ] = "インデックスを使ã£ã¦ã€å¼•æ•°ãƒªã‚¹ãƒˆã®å€¤(1～29)ã®ä¸ã‹ã‚‰ç‰¹å®šã®å€¤ã‚’1ã¤é¸æŠžã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "從 30 個數值ä¸é¸ä¸€å€‹æ•¸å€¼ã€‚"; @@ -34404,6 +35507,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "En fazla 30 deðer arasýndan bir deðer seçer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Selecciona un valor d'una llista de fins a 30 arguments de valors."; + Text[ thai ] = "เลืà¸à¸à¸„่าจาà¸à¸£à¸²à¸¢à¸à¸²à¸£à¸‚à¸à¸‡à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¸™à¸•à¹Œà¸„่าถึง 30 "; }; ExtraData = { @@ -34427,7 +35531,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "índice" ; Text [ english_us ] = "Index" ; Text[ chinese_simplified ] = "index"; - Text[ russian ] = "Íîìåð_èíäåêñà"; + Text[ russian ] = "Èíäåêñ"; Text[ polish ] = "Indeks"; Text[ japanese ] = "インデックス"; Text[ chinese_traditional ] = "index"; @@ -34439,6 +35543,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýndis"; Text[ language_user1 ] = " "; Text[ catalan ] = "Índex"; + Text[ thai ] = "ดัชนี"; }; String 3 // Description of Parameter 1 { @@ -34449,7 +35554,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "L'indice dei valori (da 1 a 30) da selezionare." ; Text [ portuguese_brazilian ] = "Der Index des Wertes (1..30), der ausgew?hlt wird." ; Text [ portuguese ] = "determina qual o argumento de valor (1..30) que será seleccionado." ; - Text [ finnish ] = "Valitun arvon (1 - 30) hakemisto." ; + Text [ finnish ] = "Valitun arvon (1 - 30) hakemisto" ; Text [ danish ] = "Indekset til værdien (1..30) som skal vælges." ; Text [ french ] = "L'indice de la valeur (1...30) qui sera sélectionnée." ; Text [ swedish ] = "Index för värdet (1..30) som väljs ut." ; @@ -34457,7 +35562,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica el argumento de valor que se selecciona." ; Text [ english_us ] = "The index of the value (1..30) selected." ; Text[ chinese_simplified ] = "è¦é€‰æ‹©æ•°å€¼1至30个的索引。"; - Text[ russian ] = "Çàäàíèå âûáèðàåìîãî çíà÷åíèÿ-àðãóìåíòà â äèàïàçîíå îò 1 äî 30."; + Text[ russian ] = "Èíäåêñ âûáèðàåìîãî çíà÷åíèÿ â äèàïàçîíå îò 1 äî 30."; Text[ polish ] = "Okreœla, które wartoœci argumentu (1..30) zostan¹ wybrane."; Text[ japanese ] = "é¸æŠžã—ãŸå€¤(1～30)ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€‚"; Text[ chinese_traditional ] = "è¦é¸æ“‡çš„數值1至30的索引。"; @@ -34469,6 +35574,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Seçilen deðerin (1..30) indisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Índex del valor seleccionat (1..30)."; + Text[ thai ] = "เลืà¸à¸à¸”ัชนีขà¸à¸‡à¸„่า (1..30) "; }; String 4 // Name of Parameter 2 { @@ -34478,26 +35584,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore " ; Text [ portuguese_brazilian ] = "Wert " ; Text [ portuguese ] = "Valor " ; - Text [ finnish ] = "arvo" ; + Text [ finnish ] = "arvo " ; Text [ danish ] = "Værdi " ; Text [ french ] = "Valeur " ; Text [ swedish ] = "värde " ; - Text [ dutch ] = "Waarde " ; + Text [ dutch ] = "Waarde" ; Text [ spanish ] = "valor " ; Text [ english_us ] = "value " ; Text[ chinese_simplified ] = "value "; - Text[ russian ] = "Çíà÷åíèå "; + Text[ russian ] = "Çíà÷åíèå "; Text[ polish ] = "Wartoœæ "; Text[ japanese ] = "値 "; Text[ chinese_traditional ] = "value "; Text[ arabic ] = "ÇáÞíãÉ "; - Text[ dutch ] = "Waarde "; + Text[ dutch ] = "Waarde"; Text[ chinese_simplified ] = "value "; Text[ greek ] = "ÔéìÞ "; Text[ korean ] = "ê°’ "; Text[ turkish ] = "Deðer "; Text[ language_user1 ] = " "; Text[ catalan ] = "valor "; + Text[ thai ] = "ค่า "; }; String 5 // Description of Parameter 2 { @@ -34508,7 +35615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Elenco di argomenti (da 1 a 30) da cui viene estratto un valore." ; Text [ portuguese_brazilian ] = "Wert 1; Wert 2;... Die Liste der Argumente, aus der ein Wert ausgew?hlt wird." ; Text [ portuguese ] = "Valor1; valor2 ... são de 1 a 29 argumentos de valor a partir dos quais SELECCIONAR escolhe um valor ou uma acção a ser realizada com base no núm_índice." ; - Text [ finnish ] = "Arvo 1, arvo 2 ja niin edelleen Argumenttiluettelo, josta arvo valitaan." ; + Text [ finnish ] = "Arvo 1; arvo 2;.. Argumenttiluettelo, josta arvo valitaan." ; Text [ danish ] = "Værdi 1; værdi 2; ... listen af argumenter som en værdi skal vælges fra." ; Text [ french ] = "Valeur 1, valeur 2, ... constituent la liste des arguments dans laquelle la fonction sélectionne une valeur." ; Text [ swedish ] = "värde 1; värde 2;... Argumentlistan från vilken ett värde väljs ut." ; @@ -34516,7 +35623,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Valor 1: Valor 2; ... es la lista de argumentos de la cual se desea elegir un valor." ; Text [ english_us ] = "Value 1, value 2,... The list of arguments from which a value is chosen." ; Text[ chinese_simplified ] = "数值 1; 数值 2;... 用于进行数æ®é€‰æ‹©çš„æ•°æ®è¡¨ã€‚"; - Text[ russian ] = "Çíà÷åíèå 1; çíà÷åíèå 2;... îò 1 äî 29 àðãóìåíòîâ-çíà÷åíèé, èç êîòîðûõ ÂÛÁÎÐ, èïîëüçóÿ íîìåð_èíäåêñà, âûáèðàåò çíà÷åíèå èëè âûïîëíÿåìîå äåéñòâèå."; + Text[ russian ] = "Çíà÷åíèå 1; çíà÷åíèå 2;... Ñïèñîê àðãóìåíòîâ, äëÿ êîòîðûõ âûáðàíî çíà÷åíèå."; Text[ polish ] = "Wartoœæ 1; Wartoœæ 2;... Lista argumentów, z której ma zostaæ wybrana wartoœæ."; Text[ japanese ] = "値 1;値 2;...ã¯å¼•æ•°ãƒªã‚¹ãƒˆã®é …ç›®ã§ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã§é¸æŠžã™ã‚‹å€¤ã€‚"; Text[ chinese_traditional ] = "數值 1; 數值 2;... 用於é¸æ“‡æ•¸å€¼çš„資料表。"; @@ -34528,6 +35635,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer 1; deðer 2;... Deðer seçimi yapýlacak deðiþken listesi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor 1, valor 2,... La llista d'arguments d'entre els quals s'escull un valor."; + Text[ thai ] = "ค่า 1, ค่า 2,... รายà¸à¸²à¸£à¸à¸²à¸£à¹Œà¸à¸´à¸§à¹€à¸¡à¸™à¸•à¹Œà¸ˆà¸²à¸à¸„่าที่เลืà¸à¸"; }; }; // -=*# Resource for function SPALTE #*=- @@ -34549,7 +35657,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el número interno de columna de una referencia dada." ; Text [ english_us ] = "Returns the internal column number of a reference." ; Text[ chinese_simplified ] = "确定一个引用的内部列å·ã€‚"; - Text[ russian ] = "Âîçâðàùàåò íîìåð ñòîëáöà, íà êîòîðûé óêàçûâàåò ññûëêà."; + Text[ russian ] = "Âû÷èñëÿåò íîìåð ñòîëáöà óêàçàííîé îáëàñòè."; Text[ polish ] = "Okreœla wewnêtrzny numer kolumny podanego odwo³ania."; Text[ japanese ] = "指定ã—ãŸç¯„囲ã®åˆ—番å·ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個åƒç…§çš„內部欄號。"; @@ -34561,6 +35669,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referansýn iç sütun numarasýný bulur."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el número intern de columna d'una referència."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œà¸ ายในขà¸à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; ExtraData = { @@ -34596,6 +35705,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "Referència"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -34605,7 +35715,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il riferimento a una cella o a un'area." ; Text [ portuguese_brazilian ] = "Der Bezug auf eine Zelle oder einen Bereich." ; Text [ portuguese ] = "é a referência de células ou intervalos para os quais se deseja encontrar o número de colunas." ; - Text [ finnish ] = "Viittaus soluun tai solualueeseen." ; + Text [ finnish ] = "Viittaus soluun tai solualueeseen" ; Text [ danish ] = "Referencen til en celle eller et område." ; Text [ french ] = "La référence à une cellule ou une plage." ; Text [ swedish ] = "Referensen till en cell eller ett område." ; @@ -34613,7 +35723,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la referencia a una celda o un área de celdas cuyo número de columna se desea conocer." ; Text [ english_us ] = "The reference to a cell or a range." ; Text[ chinese_simplified ] = "è¦èŽ·å¾—å…¶åˆ—æ ‡çš„å•å…ƒæ ¼æˆ–å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "ß÷åéêà èëè äèàïàçîí, äëÿ êîòîðûõ îïðåäåëÿåòñÿ íîìåð ñòîëáöà."; + Text[ russian ] = "Ññûëêà íà ÿ÷åéêó èëè äèàïàçîí."; Text[ polish ] = "Odwo³anie do komórki lub obszaru."; Text[ japanese ] = "列番å·ã‚’調ã¹ã‚‹ã‚»ãƒ«ã¾ãŸã¯ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "è¦ç²å¾—其列標的儲å˜æ ¼æˆ–儲å˜æ ¼å€åŸŸã€‚"; @@ -34624,7 +35734,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ì´ë‚˜ ë²”ìœ„ì— ëŒ€í•œ 참조입니다."; Text[ turkish ] = "Hücre ya da aralýða alýnan referans."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referència a una cel·la o a una àrea."; + Text[ catalan ] = "Referència a una cel.la o a una àrea."; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์หรืà¸à¸Šà¹ˆà¸§à¸‡"; }; }; // -=*# Resource for function ZEILE #*=- @@ -34646,7 +35757,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el número de fila de una referencia." ; Text [ english_us ] = "Defines the internal row number of a reference." ; Text[ chinese_simplified ] = "给定引用的行å·ã€‚"; - Text[ russian ] = "Îïðåäåëÿåò íîìåð ñòðîêè ññûëêè."; + Text[ russian ] = "Âû÷èñëÿåò íîìåð ñòðîêè óêàçàííîé îáëàñòè."; Text[ polish ] = "Okreœla wewnêtrzny numer wiersza w odwo³aniu."; Text[ japanese ] = "指定ã—ãŸã‚»ãƒ«ã¾ãŸã¯ã‚»ãƒ«ç¯„囲ã®è¡Œç•ªå·ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "指定åƒç…§çš„列號。"; @@ -34654,10 +35765,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Geeft als resultaat het rijnummer van een verwijzing."; Text[ chinese_simplified ] = "给定引用的行å·ã€‚"; Text[ greek ] = "Ïñßæåé ôïí åóùôåñéêü áñéèìü ôçò ãñáììÞò ìéáò áíáöïñÜò."; - Text[ korean ] = "ì°¸ì¡°ì˜ ë‚´ë¶€ã€€í–‰ 번호를 ê²°ì •"; + Text[ korean ] = "ì°¸ì¡°ì˜ ë‚´ë¶€ í–‰ 번호를 ì§€ì •"; Text[ turkish ] = "Referansýn iç satýr numarasýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix el número intern de fila interna d'una referència."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”จำนวนà¹à¸–วภายในขà¸à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; ExtraData = { @@ -34693,6 +35805,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "referència"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -34702,7 +35815,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il riferimento a una cella o a un'area." ; Text [ portuguese_brazilian ] = "Der Bezug auf eine Zelle oder einen Bereich." ; Text [ portuguese ] = "é a célula ou intervalo de células para os quais deseja obter o número de linha." ; - Text [ finnish ] = "Viittaus soluun tai solualueeseen." ; + Text [ finnish ] = "Viittaus soluun tai solualueeseen" ; Text [ danish ] = "Referencen til en celle eller et område." ; Text [ french ] = "La référence à une cellule ou une plage." ; Text [ swedish ] = "Referensen till en cell eller ett område." ; @@ -34710,7 +35823,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la celda o área de celdas de los que se desea conocer el número de fila." ; Text [ english_us ] = "The reference to a cell or a range." ; Text[ chinese_simplified ] = "是需è¦å¾—到其行å·çš„å•å…ƒæ ¼æˆ–å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "ß÷åéêà èëè äèàïàçîí ÿ÷ååê, äëÿ êîòîðûõ îïðåäåëÿåòñÿ íîìåð ñòðîêè."; + Text[ russian ] = "Ññûëêà íà ÿ÷åéêó èëè äèàïàçîí."; Text[ polish ] = "Odwo³anie do komórki lub obszaru."; Text[ japanese ] = "行番å·ã‚’調ã¹ã‚‹ã‚»ãƒ«ã¾ãŸã¯ã‚»ãƒ«ç¯„囲。"; Text[ chinese_traditional ] = "是需è¦å¾—到其欄號的儲å˜æ ¼æˆ–儲å˜æ ¼å€åŸŸã€‚"; @@ -34721,7 +35834,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ ë˜ëŠ” ë²”ìœ„ì— ëŒ€í•œ 참조입니다."; Text[ turkish ] = "Hücre ya da aralýk referansý."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referència a una cel·la o a una àrea."; + Text[ catalan ] = "Referència a una cel.la o a una àrea."; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์หรืà¸à¸Šà¹ˆà¸§à¸‡"; }; }; // -=*# Resource for function TABELLE #*=- @@ -34741,7 +35855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Détermine le numéro de feuille interne d'une référence ou d'une chaîne de caractères." ; Text [ dutch ] = "Bepaalt het interne werkbladnummer van een verwijzing of een tekenreeks." ; Text[ chinese_simplified ] = "确定一个引用或一个å—串的工作表å·ç 。"; - Text[ russian ] = "Îïðåäåëÿåò íîìåð ëèñòà çàäàííîé ññûëêè èëè ñòðîêè ñèìâîëîâ."; + Text[ russian ] = "Âîçâðàùàåò íîìåð ëèñòà óêàçàííîé îáëàñòè."; Text[ polish ] = "Wyznacza wewnêtrzny numer tabeli odwo³ania lub ci¹gu znaków."; Text[ japanese ] = "å‚ç…§ã¾ãŸã¯æ–‡å—列ã‹ã‚‰ãƒ‰ã‚ュメント内ã§ã®è¡¨ç•ªå·ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個åƒç…§æˆ–一個å—串的工作表號碼。"; @@ -34753,7 +35867,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans ya da karakter zincirinin iç tablo numarasýný verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el número intern de full d'una referència o una cadena."; - Text[ finnish ] = "Määrittää viitteen tai merkkijonon sisäisen lomakenumeron."; + Text[ finnish ] = "Määrittää viitteen tai merkkijonon sisäisen taulukkonumeron."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™à¸ ายในขà¸à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸«à¸£à¸·à¸à¸ªà¸²à¸¢à¸à¸±à¸à¸‚ระ"; }; ExtraData = { @@ -34787,7 +35902,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "referència"; - Text[ finnish ] = "viite"; + Text[ finnish ] = "viittaus"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -34803,7 +35919,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ dutch ] = "De verwijzing naar een cel, een bereik of naar de tekenreeks van een werkbladnaam." ; Text [ portuguese ] = "A referência a uma célula ou intervalo de células ou a série de caracteres do nome da folha." ; Text[ chinese_simplified ] = "对一个å•å…ƒæ ¼æˆ–一个区域或一个工作表å称å—串的引用。"; - Text[ russian ] = "Ññûëêà íà ÿ÷åéêó, äèàïàçîí ÿ÷ååê èëè ñòðîêó èìåíè ëèñòà."; + Text[ russian ] = "Ññûëêà íà ÿ÷åéêó, äèàïàçîí ÿ÷ååê èëè ñèìâîëüíóþ ñòðîêó èìåíè ëèñòà."; Text[ polish ] = "Odwo³anie do komórki lub obszaru lub ci¹g znaków nazwy arkusza."; Text[ japanese ] = "表ã«ã‚るセルã€ã‚»ãƒ«ç¯„囲ã€ã¾ãŸã¯æ–‡å—列ã¸ã®å‚照。"; Text[ chinese_traditional ] = "åƒç…§ä¸€å€‹å·¥ä½œè¡¨çš„儲å˜æ ¼æˆ–一個å€åŸŸæˆ–一個å—串。"; @@ -34814,8 +35930,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ì´ë‚˜ 범위 ë˜ëŠ” 시트 ì´ë¦„ì˜ ë¬¸ìžì—´ì— 대한 참조입니다."; Text[ turkish ] = "Hücre ya da aralýk ya da bir tablo adýnýn karakter zincirine referans."; Text[ language_user1 ] = " "; - Text[ catalan ] = "La referència a una cel·la o a una àrea, o a la cadena de caràcters d'un nom de full."; - Text[ finnish ] = "Viittaus lomakenimen soluun, solualueeseen tai lomakenimen merkkijonoon."; + Text[ catalan ] = "La referència a una cel.la o a una àrea, o a la cadena de caràcters d'un nom de full."; + Text[ finnish ] = "Viittaus taulukkonimen soluun, solualueeseen tai taulukkonimen merkkijonoon."; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์หรืà¸à¸Šà¹ˆà¸§à¸‡à¸«à¸£à¸·à¸à¸ªà¸²à¸¢à¸à¸±à¸à¸‚ระขà¸à¸‡à¸Šà¸·à¹ˆà¸à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™"; }; }; // -=*# Resource for function SPALTEN #*=- @@ -34829,7 +35946,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce il numero di colonne in una matrice o in un riferimento." ; Text [ portuguese_brazilian ] = "Bestimmt die Anzahl der Spalten eines Bezugs oder einer Matrix." ; Text [ portuguese ] = "Devolve o número de colunas numa referência ou matriz." ; - Text [ finnish ] = "Palauttaa matriisin tai viitteen sarakkeiden määrän." ; + Text [ finnish ] = "Palauttaa taulukon tai viitteen sarakkeiden määrän." ; Text [ danish ] = "Bestemmer antallet af kolonner i en reference eller en matrix." ; Text [ french ] = "Renvoie le nombre de colonnes d'une référence ou d'une matrice." ; Text [ swedish ] = "Bestämmer antalet kolumner för en referens eller en matris." ; @@ -34837,7 +35954,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Determina el número de columnas de una referencia o una matriz." ; Text [ english_us ] = "Returns the number of columns in an array or reference." ; Text[ chinese_simplified ] = "求得一个引用或数组(矩阵)的列数目。"; - Text[ russian ] = "Âîçâðàùàåò êîëè÷åñòâî ñòîëáöîâ â ìàññèâå èëè ññûëêå."; + Text[ russian ] = "Âîçâðàùàåò êîëè÷åñòâî ñòîëáöîâ â óêàçàííîé îáëàñòè."; Text[ polish ] = "Wyznacza liczbê kolumn odwo³ania lub macierzy."; Text[ japanese ] = "指定範囲ã®åˆ—æ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "求得一個åƒç…§æˆ–數組的欄ä½æ•¸ç›®ã€‚"; @@ -34849,6 +35966,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans ya da matrisin sütun sayýsýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el nombre de columnes d'una matriu o una referència."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œà¹ƒà¸™à¹à¸–วลำดับหรืà¸à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; ExtraData = { @@ -34864,12 +35982,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; Text [ dutch ] = "Matrix" ; - Text [ spanish ] = "matriz" ; + Text [ spanish ] = "Matriz" ; Text [ english_us ] = "array" ; Text[ chinese_simplified ] = "array"; Text[ russian ] = "Ìàññèâ"; @@ -34884,6 +36002,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 3 // Description of Parameter 1 { @@ -34893,7 +36012,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice (il riferimenti) di cui si vuole determinare il numero di colonne." ; Text [ portuguese_brazilian ] = "Die Matrix (der Bezug), deren Spaltenanzahl bestimmt wird." ; Text [ portuguese ] = "é uma matriz, fórmula matricial ou uma referência a um intervalo de células cujo número de colunas deseja obter." ; - Text [ finnish ] = "Matriisi (viite), jonka sarakkeisen määrä lasketaan." ; + Text [ finnish ] = "Taulukko (viite), jonka sarakkeisen määrä lasketaan." ; Text [ danish ] = "Den matrix (den reference) hvis kolonneantal skal bestemmes." ; Text [ french ] = "La matrice (référence) dont vous voulez obtenir le nombre de colonnes." ; Text [ swedish ] = "Matrisen (referensen) vars kolumnantal bestäms." ; @@ -34901,7 +36020,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la matriz (la referencia), cuyo número de columnas se desea determinar." ; Text [ english_us ] = "The array (reference) for which the number of columns is to be determined." ; Text[ chinese_simplified ] = "è¦ç¡®å®šå…¶åˆ—æ•°çš„å•å…ƒæ ¼åŒºåŸŸ(引用)。"; - Text[ russian ] = "Ìàññèâ (èëè ññûëêà íà äèàïàçîí), â êîòîðîì îïðåäåëÿåòñÿ êîëè÷åñòâî ñòîëáöîâ."; + Text[ russian ] = "Ìàññèâ (ññûëêà), â êîòîðîì îïðåäåëÿåòñÿ êîëè÷åñòâî ñòîëáöîâ."; Text[ polish ] = "Macierz (odwo³anie), której liczba kolumn ma zostaæ obliczona."; Text[ japanese ] = "列数を検査ã™ã‚‹ç¯„囲。"; Text[ chinese_traditional ] = "è¦è¨ˆç®—其欄數的數組或儲å˜æ ¼å€åŸŸåƒç…§ã€‚"; @@ -34913,6 +36032,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sütun sayýsý belirlenecek matris (referans)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu (referència) el nombre de columnes de la qual s'ha de determinar."; + Text[ thai ] = "à¹à¸–วลำดับ (à¸à¹‰à¸²à¸‡à¸à¸´à¸‡) สำหรับจำนวนคà¸à¸¥à¸±à¸¡à¸™à¹Œà¸—ี่à¸à¸³à¸«à¸™à¸”มา"; }; }; // -=*# Resource for function ZEILEN #*=- @@ -34926,7 +36046,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce il numero di righe in un riferimento o in una matrice." ; Text [ portuguese_brazilian ] = "Bestimmt die Anzahl der Zeilen eines Bezugs oder einer Matrix." ; Text [ portuguese ] = "Devolve o número de linhas numa referência ou matriz." ; - Text [ finnish ] = "Palauttaa matriisin tai viitteen rivien määrän." ; + Text [ finnish ] = "Palauttaa taulukon tai viitteen rivien määrän." ; Text [ danish ] = "Bestemmer antallet af rækker i en reference eller en matrix." ; Text [ french ] = "Donne le nombre de lignes d'une référence ou d'une matrice." ; Text [ swedish ] = "Bestämmer antalet rader i en referens eller matris." ; @@ -34934,7 +36054,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve el número de filas de una referencia o matriz." ; Text [ english_us ] = "Returns the number of rows in a reference or array." ; Text[ chinese_simplified ] = "给定引用或数组的行数。"; - Text[ russian ] = "Îïðåäåëÿåò ÷èñëî ñòðîê â ññûëêå èëè ìàññèâå."; + Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî ñòðîê â ñîîòâåòñòâóþùåì ìàññèâå."; Text[ polish ] = "Wyznacza liczbê wierszy w adresie lub macierzy."; Text[ japanese ] = "指定範囲ã®è¡Œæ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "指定åƒç…§æˆ–數組的列數。"; @@ -34946,6 +36066,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans ya da matris satýr sayýsýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el nombre de files d'una referència o matriu."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¹à¸–วในà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸«à¸£à¸·à¸à¹à¸–วลำดับ"; }; ExtraData = { @@ -34961,12 +36082,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; Text [ dutch ] = "Matrix" ; - Text [ spanish ] = "matriz" ; + Text [ spanish ] = "Matriz" ; Text [ english_us ] = "array" ; Text[ chinese_simplified ] = "array"; Text[ russian ] = "Ìàññèâ"; @@ -34981,6 +36102,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 3 // Description of Parameter 1 { @@ -34990,7 +36112,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice (il riferimento) di cui si vuole determinare il numero di righe." ; Text [ portuguese_brazilian ] = "Die Matrix (der Bezug), deren Zeilenanzahl bestimmt wird." ; Text [ portuguese ] = "é uma matriz, uma fórmula matricial ou uma referência a um intervalo de células cujo número de linhas deseja obter." ; - Text [ finnish ] = "Matriisi (viite), jonka rivien määrä lasketaan." ; + Text [ finnish ] = "Taulukko (viite), jonka rivien määrä lasketaan." ; Text [ danish ] = "Den matrix (den reference) hvis rækkeantal skal bestemmes." ; Text [ french ] = "La matrice (référence) dont vous voulez obtenir le nombre de lignes." ; Text [ swedish ] = "Matrisen (referensen) vars radantal bestäms." ; @@ -34998,7 +36120,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una matriz, fórmula matricial o referencia a un área de celdas de la cual se desea saber el número de filas." ; Text [ english_us ] = "The array (reference) for which the number of rows is to be determined." ; Text[ chinese_simplified ] = "是需è¦å¾—到其行å·çš„矩阵或引用的å•å…ƒæ ¼åŒºåŸŸã€‚"; - Text[ russian ] = "Ìàññèâ (èëè ññûëêà) íà èíòåðâàë ÿ÷ååê, äëÿ êîòîðîãî îïðåäåëÿåòñÿ ÷èñëî ñòðîê."; + Text[ russian ] = "Ìàññèâ (ññûëêà), äëÿ êîòîðîãî îïðåäåëÿåòñÿ ÷èñëî ñòðîê."; Text[ polish ] = "Macierz (odwo³anie), dla której zostanie okreœlona liczba wierszy."; Text[ japanese ] = "行数を検査ã™ã‚‹ç¯„囲。"; Text[ chinese_traditional ] = "是需è¦å¾—到其列號的矩陣或åƒç…§çš„儲å˜æ ¼å€åŸŸã€‚"; @@ -35010,6 +36132,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Satýr sayýsý belirlenen matris (referans)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu (referència) el nombre de files de la qual s'ha de determinar."; + Text[ thai ] = "à¹à¸–วลำดับ (à¸à¹‰à¸²à¸‡à¸à¸´à¸‡) สำหรับจำนวนà¹à¸–วที่à¸à¸³à¸«à¸™à¸”มา"; }; }; // -=*# Resource for function TABELLEN #*=- @@ -35026,22 +36149,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce il numero di tabelle di un riferimento. Se non è stato digitato nessun parametro, verrà restituito il numero delle tabelle del documento." ; Text [ spanish ] = "Determina la cantidad de hojas de una referencia. Si no existe parámetros, la cantidad de hojas de un documento será devuelta." ; Text [ french ] = "Détermine le nombre de feuilles d'une référence. Si aucun paramètre n'est indiqué, le nombre total des feuilles du document sera renvoyé." ; - Text [ dutch ] = "Bepaalt het aantal werkbladen van een verwijzing. Is er geen parameter aangegeven, dan wordt het aantal werkbladen van het document teruggegeven." ; + Text [ dutch ] = "Bepaalt het aantal werkbladen van een verwijzing. Is er geen parameter opgegeven, dan wordt het aantal werkbladen van het document teruggegeven." ; Text [ portuguese ] = "Devolve o número de folhas da referência especificada. Se não forneceu quaisquer parâmetros, ser-lhe-á devolvido o número de folhas do documento." ; Text[ chinese_simplified ] = "确定一个引用的工作表数目。如果没有给定å‚数，\n那么å馈的是文档的工作表总数。"; - Text[ russian ] = "Îïðåäåëÿåò ÷èñëî ëèñòîâ çàäàííîé ññûëêè. Åñëè ïàðàìåòð íå çàäàí, òî ÷èñëî ëèñòîâ äîêóìåíòà âîçâðàùàåòñÿ."; + Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî ëèñòîâ â ññûëêå. Åñëè íå ââåñòè ýòîò ïàðàìåòð, òî ôóíêöèÿ âîçâðàùàåò êîëè÷åñòâî ëèñòîâ òåêóùåãî äîêóìåíòà."; Text[ polish ] = "Okreœla liczbê tabel odwo³añ. Jeœli nie podano parametru, zostanie zwrócona liczba tabel w dokumencie."; Text[ japanese ] = "å‚ç…§ã®è¡¨æ•°ã‚’æ•°ãˆã¾ã™ã€‚å‚照を指定ã—ãªã„å ´åˆã¯ã€ãã®ãƒ‰ã‚ュメントã®è¡¨æ•°ãŒæˆ»ã‚Šã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個åƒç…§çš„工作表數目。如果沒有指定åƒæ•¸ï¹é‚£éº¼å‚³å›žæ–‡ä»¶çš„工作表總數。"; Text[ arabic ] = "ÊÍÏÏ ÚÏÏ ÌÏÇæá ÇáãÑÌÚ ÇáãÚØì. ÅÐÇ áã íÊã ÅÏÎÇá ãÚáãÉ¡ ÝÓæÝ íÊã ÅÑÌÇÚ ÚÏÏ ÇáÌÏÇæá Ýí ÇáãÓÊäÏ."; - Text[ dutch ] = "Bepaalt het aantal werkbladen van een verwijzing. Is er geen parameter aangegeven, dan wordt het aantal werkbladen van het document teruggegeven."; + Text[ dutch ] = "Bepaalt het aantal werkbladen van een verwijzing. Is er geen parameter opgegeven, dan wordt het aantal werkbladen van het document teruggegeven."; Text[ chinese_simplified ] = "确定一个引用的工作表数目。如果没有给定å‚数，\n那么å馈的是文档的工作表总数。"; Text[ greek ] = "Ïñßæåé ôï ðëÞèïò ôùí ôùí ðéíÜêùí ìéáò áíáöïñÜò. Áí äåí ïñéóôåß ðáñÜìåôñïò, åðéóôñÝöåé ï ðëÞèïò ðéíÜêùí åíüò åããñÜöïõ.."; - Text[ korean ] = "ì°¸ì¡°ì˜ í‘œ 개수를 반환. ì •í•´ì§„ 파ë¼ë¯¸í„°ê°€ 없으면 ë¬¸ì„œì— ìžˆëŠ” í‘œì˜ ìˆ˜ê°€ 반환ë©ë‹ˆë‹¤."; + Text[ korean ] = "ì°¸ì¡°ì˜ ì‹œíŠ¸ 개수를 ë˜ëŒë¦½ë‹ˆë‹¤. ì •í•´ì§„ 매개 변수가 없으면 ë¬¸ì„œì— ìžˆëŠ” ì‹œíŠ¸ì˜ ìˆ˜ê°€ ì›ëž˜ëŒ€ë¡œ ë©ë‹ˆë‹¤."; Text[ turkish ] = "Referansýn tablo sayýsýný belirler. Parametre girilmemiþse, belgedeki toplam tablo sayýsý verilir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna el nombre de fulls d'una referència donada. Si no s'ha introduït cap paràmetre, es torna el nombre total de fulls del document."; - Text[ finnish ] = "Palauttaa määritetyn viitteen lomakkeiden määrän. Jos parametriä ei määritetä, toiminto palauttaa asiakirjan lomakkeiden kokonaismäärän."; + Text[ finnish ] = "Palauttaa määritetyn viitteen taulukoiden määrän. Jos parametriä ei määritetä, funktio palauttaa asiakirjan taulukoiden kokonaismäärän."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸—ี่ให้มา ถ้าไม่ใส่พารามิเตà¸à¸£à¹Œ จะส่งà¸à¸¥à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™à¸—ั้งหมดในเà¸à¸à¸ªà¸²à¸£"; }; ExtraData = { @@ -35076,6 +36200,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "referència."; Text[ finnish ] = "viite"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -35091,7 +36216,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ dutch ] = "De verwijzing naar een cel of een bereik." ; Text [ portuguese ] = "A referência de uma célula ou de um intervalo de células" ; Text[ chinese_simplified ] = "一个å•å…ƒæ ¼å¼•ç”¨æˆ–一个区域引用。"; - Text[ russian ] = "Ññûëêà íà ÿ÷åéêó èëè äèàïàçîí ÿ÷ååê, äëÿ êîòîðûõ îïðåäåëÿåòñÿ ÷èñëî ëèñòîâ."; + Text[ russian ] = "Ññûëêà íà ÿ÷åéêó èëè äèàïàçîí ÿ÷ååê."; Text[ polish ] = "Odwo³anie do komórki lub obszaru."; Text[ japanese ] = "セルã¾ãŸã¯ã‚»ãƒ«ç¯„囲ã®å‚照。"; Text[ chinese_traditional ] = "一個儲å˜æ ¼æˆ–一個å€åŸŸçš„åƒç…§ã€‚"; @@ -35102,8 +36227,9 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì…€ì´ë‚˜ ë²”ìœ„ì— ëŒ€í•œ 참조입니다."; Text[ turkish ] = "Hücre ya da aralýða referans."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referència a una cel·la o a una àrea."; - Text[ finnish ] = "Viittaus soluun tai solualueeseen."; + Text[ catalan ] = "Referència a una cel.la o a una àrea."; + Text[ finnish ] = "Viittaus soluun tai solualueeseen"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์หรืà¸à¸Šà¹ˆà¸§à¸‡"; }; }; // -=*# Resource for function WVERWEIS #*=- @@ -35126,7 +36252,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Busca por filas y devuelve el valor de la celda indicada." ; Text [ english_us ] = "Horizontal search and reference to the cells located below." ; Text[ chinese_simplified ] = "水平方å‘æœå¯»æŸä¸ªå•å…ƒæ ¼å¹¶å¼•ç”¨å…¶ä¸‹æ–¹çš„å•å…ƒæ ¼ã€‚"; - Text[ russian ] = "Ïîèñê ïî ñòðîêàì è ññûëêà íà ÿ÷åéêè, íàõîäÿùèåñÿ ñíèçó."; + Text[ russian ] = "Èùåò çíà÷åíèå â ñòðîêàõ è âûáèðàåò íàéäåííîå çíà÷åíèå. "; Text[ polish ] = "Wyszukiwanie poziome i odsy³acz do komórek powy¿ej i poni¿ej."; Text[ japanese ] = "範囲内ã®1行目ã§åˆ—を特定ã—ã€ãã®åˆ—ã®æŒ‡å®šè¡Œã®ã‚»ãƒ«ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "水平方å‘æœå°‹æŸä¸€å„²å˜æ ¼ä¸¦å¼•ç”¨å…¶ä¸‹æ–¹çš„儲å˜æ ¼ã€‚"; @@ -35137,7 +36263,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ê·¸ 아래 위치한 ì…€ì— ëŒ€í•œ ìˆ˜í‰ ê²€ìƒ‰ê³¼ 참조입니다."; Text[ turkish ] = "Altýnda bulunan hücrelere yatay referans ve arama."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referència i cerca horitzontal a les cel·les ubicades a sota."; + Text[ catalan ] = "Referència i cerca horitzontal a les cel.les ubicades a sota."; + Text[ thai ] = "ค้นหาตามà¹à¸™à¸§à¸™à¸à¸™à¹à¸¥à¸°à¸à¹‰à¸²à¸à¸´à¸‡à¹„ปยังเซลล์ข้างล่าง"; }; ExtraData = { @@ -35157,7 +36284,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Opslagsværdi" ; Text [ french ] = "Critère_rech" ; Text [ swedish ] = "sökkriterium" ; - Text [ dutch ] = "Zoeklcriterium" ; + Text [ dutch ] = "Zoekcriterium" ; Text [ spanish ] = "valor_buscado" ; Text [ english_us ] = "search_criteria" ; Text[ chinese_simplified ] = "search_criteria"; @@ -35166,13 +36293,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "検索値"; Text[ chinese_traditional ] = "search_criteria"; Text[ arabic ] = "Search_criteria"; - Text[ dutch ] = "Zoeklcriterium"; + Text[ dutch ] = "Zoekcriterium"; Text[ chinese_simplified ] = "search_criteria"; Text[ greek ] = "ÊñéôÞñéï áíáæÞôçóçò"; Text[ korean ] = "검색_기준"; Text[ turkish ] = "Arama ölçütü"; Text[ language_user1 ] = " "; Text[ catalan ] = "search_criteria"; + Text[ thai ] = "ค้นหา_เà¸à¸“ฑ์"; }; String 3 // Description of Parameter 1 { @@ -35182,7 +36310,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore da ricercare nella prima riga della tabella." ; Text [ portuguese_brazilian ] = "Der Wert, nach dem in der ersten Zeile gesucht wird." ; Text [ portuguese ] = "é o valor a ser localizado na primeira linha da tabela." ; - Text [ finnish ] = "Ensimmäisestä rivistä etsittävä arvo." ; + Text [ finnish ] = "Ensimmäisestä rivistä etsittävä arvo" ; Text [ danish ] = "Den værdi som der skal søges efter i første række." ; Text [ french ] = "La valeur à rechercher dans la première ligne." ; Text [ swedish ] = "Värdet som söks i första raden." ; @@ -35190,7 +36318,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el valor que se busca en la primera fila de matriz_buscar_en." ; Text [ english_us ] = "The value to be found in the first row." ; Text[ chinese_simplified ] = "è¦åœ¨æ•°æ®è¡¨çš„第一行ä¸æŸ¥æ‰¾çš„数值。"; - Text[ russian ] = "Çíà÷åíèå, êîòîðîå òðåáóåòñÿ íàéòè â ïåðâîé ñòðîêå òàáëèöû.."; + Text[ russian ] = "Çíà÷åíèå, êîòîðîå òðåáóåòñÿ íàéòè â ïåðâîé ñòðîêå òàáëèöû."; Text[ polish ] = "Wartoœæ, która jest szukana w pierwszym wierszu tabeli."; Text[ japanese ] = "1行目ã§æ¤œç´¢ã™ã‚‹å€¤ã€‚"; Text[ chinese_traditional ] = "è¦åœ¨æ•¸æ“šè¡¨çš„第一列ä¸æŸ¥æ‰¾çš„數值。"; @@ -35202,6 +36330,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Birinci satýrda aranacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de trobar en la primera fila."; + Text[ thai ] = "พบค่าในà¹à¸–วà¹à¸£à¸"; }; String 4 // Name of Parameter 2 { @@ -35211,15 +36340,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz_tabela" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; Text [ dutch ] = "Matrix" ; - Text [ spanish ] = "matriz_buscar_en" ; + Text [ spanish ] = "Matriz" ; Text [ english_us ] = "array" ; Text[ chinese_simplified ] = "table_array"; - Text[ russian ] = "Ìàññèâ òàáëèöû"; + Text[ russian ] = "Ìàññèâ"; Text[ polish ] = "Macierz"; Text[ japanese ] = "範囲"; Text[ chinese_traditional ] = "table_array"; @@ -35231,6 +36360,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 5 // Description of Parameter 2 { @@ -35241,7 +36371,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice o l'intervallo di celle per il riferimento." ; Text [ portuguese_brazilian ] = "Die Matrix oder der Bereich f? den Verweis." ; Text [ portuguese ] = "é uma tabela de informações para a procura dos dados." ; - Text [ finnish ] = "Matriisi tai viitealue." ; + Text [ finnish ] = "Taulukko tai viitealue" ; Text [ danish ] = "Matrixen eller området for henvisningen." ; Text [ french ] = "La matrice ou la plage pour le renvoi." ; Text [ swedish ] = "Matrisen eller området för hänvisningen." ; @@ -35249,7 +36379,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es una tabla de información en la que se buscan los datos." ; Text [ english_us ] = "The array or the range for the reference." ; Text[ chinese_simplified ] = "是矩阵数æ®ç»„或用æ¥æœå¯»æ•°æ®çš„区域。"; - Text[ russian ] = "Ìàññèâ èëè äèàïàçîí, â êîòîðîì ïðîèçâîäèòñÿ ïîèñê äàííûõ."; + Text[ russian ] = "Ìàññèâ èëè äèàïàçîí äëÿ ññûëêè."; Text[ polish ] = "Macierz lub obszar dla odsy³acza."; Text[ japanese ] = "関数ã®å¯¾è±¡ã¨ãªã‚‹ç¯„囲。"; Text[ chinese_traditional ] = "數據組或用來åƒç…§æ•¸æ“šçš„å€åŸŸã€‚"; @@ -35261,6 +36391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans matrisi ya da aralýðý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu o àrea per a la referència."; + Text[ thai ] = "à¹à¸–วลำดับขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 6 // Name of Parameter 3 { @@ -35278,7 +36409,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Índice" ; Text [ english_us ] = "Index" ; Text[ chinese_simplified ] = "Index"; - Text[ russian ] = "Íîìåð_ñòðîêè"; + Text[ russian ] = "Èíäåêñ"; Text[ polish ] = "Indeks"; Text[ japanese ] = "行番å·"; Text[ chinese_traditional ] = "Index"; @@ -35290,6 +36421,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýndis"; Text[ language_user1 ] = " "; Text[ catalan ] = "Índex"; + Text[ thai ] = "ดัชนี"; }; String 7 // Description of Parameter 3 { @@ -35299,7 +36431,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "L'indice di cella nella matrice." ; Text [ portuguese_brazilian ] = "Zeilenindex in der Matrix." ; Text [ portuguese ] = "é o número da linha em matriz_tabela, da qual são retirados os valores correspondentes." ; - Text [ finnish ] = "Matriisin rivihakemisto." ; + Text [ finnish ] = "Taulukon rivihakemisto" ; Text [ danish ] = "Rækkeindeks i matrixen." ; Text [ french ] = "L'indice de ligne dans la matrice." ; Text [ swedish ] = "Radnumret i matrisen." ; @@ -35307,7 +36439,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de fila en matriz_buscar_en desde el cual se deberá devolver el valor coincidente." ; Text [ english_us ] = "The row index in the array." ; Text[ chinese_simplified ] = "æ•°æ®åŒºå†…çš„è¡Œåºå·ã€‚"; - Text[ russian ] = "Íîìåð ñòðîêè â ìàññèâå."; + Text[ russian ] = "Èíäåêñ ñòðîêè â ìàññèâå."; Text[ polish ] = "Indeks wierszy w macierzy."; Text[ japanese ] = "範囲内ã§ã®è¡Œç•ªå·ã€‚"; Text[ chinese_traditional ] = "數據å€å…§çš„列åºè™Ÿã€‚"; @@ -35319,6 +36451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Matrisdeki satýr indisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Índex de la fila de la matriu."; + Text[ thai ] = "ดัชนีà¹à¸–วในà¹à¸–วลำดับ"; }; String 8 // Name of Parameter 4 { @@ -35336,7 +36469,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "ordenado" ; Text [ english_us ] = "sorted" ; Text[ chinese_simplified ] = "range_lookup"; - Text[ russian ] = "Ñîðòèðîâêà"; + Text[ russian ] = "Îòñîðòèðîâàíî"; Text[ polish ] = "Przesortowany"; Text[ japanese ] = "ãƒ‡ãƒ¼ã‚¿é †åº"; Text[ chinese_traditional ] = "range_lookup"; @@ -35344,10 +36477,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Gesorteerd"; Text[ chinese_simplified ] = "range_lookup"; Text[ greek ] = "Range_lookup"; - Text[ korean ] = "ì •ë ¬ë¨"; + Text[ korean ] = "ì •ë ¬ 순서"; Text[ turkish ] = "Sýralanmýþ"; Text[ language_user1 ] = " "; Text[ catalan ] = "ordenat"; + Text[ thai ] = "เรียง"; }; String 9 // Description of Parameter 4 { @@ -35358,7 +36492,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore è VERO o non presente la riga di ricerca per la matrice deve essere ordinata in modo crescente." ; Text [ portuguese_brazilian ] = "Ist der Wert WAHR oder nicht angegeben, mu? die Suchzeile der Matrix aufsteigend sortiert sein." ; Text [ portuguese ] = "Se o valor for VERDADEIRO ou não indicado, a linha de procura da matriz terá que ser ordenada de forma ascendente." ; - Text [ finnish ] = "Jos arvo on TRUE tai sitä ei ole määritetty, matriisin hakurivi on järjestettävä nousevaan järjestykseen." ; + Text [ finnish ] = "Jos arvo on TOSI tai sitä ei ole määritetty, taulukon hakurivi on järjestettävä nousevaan järjestykseen." ; Text [ danish ] = "Hvis værdien er SAND eller ikke er angivet, skal matrixens søgerække sorteres i stigende orden." ; Text [ french ] = "Si la valeur est VRAI ou n'a pas été spécifiée, la ligne de recherche de la matrice doit être triée dans l'ordre croissant." ; Text [ swedish ] = "Om värdet är SANT eller inte angivet, måste matrisens sökrad vara sorterad i stigande ordning." ; @@ -35366,7 +36500,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Si el valor es VERDADERO o se omite, la línea de búsqueda de la matriz debe ser ordenada ascendentemente." ; Text [ english_us ] = "If the value is TRUE or not given, the search row of the array must be sorted in ascending order." ; Text[ chinese_simplified ] = "若值是\"true\"或没有指定，那么数组\n的查找行就必须按上å‡é¡ºåºæŽ’列。"; - Text[ russian ] = "Ïðè çíà÷åíèè ÈÑÒÈÍÀ èëè îòñóòñòâóþùåì çíà÷åíèè ïîèñêîâàÿ ñòðîêà ìàññèâà äîëæíà ñîðòèðîâàòüñÿ ïî âîçðàñòàíèþ."; + Text[ russian ] = "Ïðè çíà÷åíèè ÈÑÒÈÍÀ èëè íå çàäàííîì çíà÷åíèè ïîèñê ñòðîêè â ìàññèâå äîëæåí îñóùåñòâëÿòüñÿ ïî âîçðàñòàíèþ."; Text[ polish ] = "Jeœli wartoœæ jest PRAWDA lub jeœli nie jest ona podana, wiersz wyszukiwania macierzy musi zostaæ przesortowany w porz¹dku rosn¹cym."; Text[ japanese ] = "指定ãªã—ã€ã‚ã‚‹ã„㯠TRUE を指定ã™ã‚‹ã«ã¯ã€1行目ã®ãƒ‡ãƒ¼ã‚¿ãŒæ˜‡é †ã«ä¸¦ã‚“ã§ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果é‚輯值是<TRUE>或沒有指定，數組查找列就按照å‘上排列。"; @@ -35378,6 +36512,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer DOÐRU ya da belirtilmemiþse, matrisin arama satýrý artan düzende sýralanmalýdýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el valor és TRUE o no s'indica, la fila de cerca de la matriu s'ha d'ordenar de manera ascendent."; + Text[ thai ] = "ถ้าค่าเป็นจริงหรืà¸à¹„ม่ได้ให้มา ให้ค้นหาà¹à¸–วขà¸à¸‡à¹à¸–วลำดับที่ต้à¸à¸‡à¹€à¸£à¸µà¸¢à¸‡à¸ˆà¸²à¸à¸™à¹‰à¸à¸¢à¹„ปมาà¸"; }; }; // -=*# Resource for function SVERWEIS #*=- @@ -35399,7 +36534,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Busca un valor específico en la primera columna y se desplaza a través de la fila y devuelve el valor de la celda indicada." ; Text [ english_us ] = "Vertical search and reference to indicated cells." ; Text[ chinese_simplified ] = "在数æ®ç»„的首列查找指定的数值，并返回数值所在行\nä¸æŒ‡å®šåˆ—处的数值。"; - Text[ russian ] = "Ïîèñê â âåðòèêàëüíîì ïîðÿäêå è ññûëêà íà áëèçëåæàùèå ÿ÷åéêè."; + Text[ russian ] = "Ïîèñê â âåðòèêàëüíîì ïîðÿäêå è âûáîð íàéäåííîãî çíà÷åíèÿ."; Text[ polish ] = "Wyszukiwanie pionowe i adres wskazanej komórki."; Text[ japanese ] = "範囲内ã®1列目ã§è¡Œã‚’特定ã—ã€ãã®è¡Œã®æŒ‡å®šåˆ—ã®ã‚»ãƒ«ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "在資料組的首列查找指定的數值ï¹ä¸¦è¿”回數值所在行ä¸æŒ‡å®šåˆ—處的數值。"; @@ -35410,7 +36545,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì£¼ìœ„ì˜ ì…€ì— ëŒ€í•œ ìˆ˜ì§ ê²€ìƒ‰ê³¼ 참조"; Text[ turkish ] = "Komþu hücrelere referans ve dikey arama."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cerca vertical i referència a les cel·les indicades."; + Text[ catalan ] = "Cerca vertical i referència a les cel.les indicades."; + Text[ thai ] = "ค้นหาตามà¹à¸™à¸§à¸•à¸±à¹‰à¸‡à¹à¸¥à¸°à¸à¹‰à¸²à¸‡à¹„ปยังเซลล์ที่ระบุ"; }; ExtraData = { @@ -35446,6 +36582,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama ölçütü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteri de cerca"; + Text[ thai ] = "ค้นหาเà¸à¸“ฑ์"; }; String 3 // Description of Parameter 1 { @@ -35455,7 +36592,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore da ricercare nella prima colonna della matrice." ; Text [ portuguese_brazilian ] = "Der Wert, nach dem in der ersten Spalte gesucht wird." ; Text [ portuguese ] = "é o valor a localizar na primeira coluna da matriz." ; - Text [ finnish ] = "Ensimmäisestä sarakkeesta etsittävä arvo." ; + Text [ finnish ] = "Ensimmäisestä sarakkeesta etsittävä arvo" ; Text [ danish ] = "Den værdi som der skal søges efter i første kolonne." ; Text [ french ] = "La valeur à rechercher dans la première colonne." ; Text [ swedish ] = "Värdet som skall sökas i den första kolumnen." ; @@ -35475,6 +36612,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Birinci sütunda aranan deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de trobar en la primera columna."; + Text[ thai ] = "พบค่าในคà¸à¸¥à¸±à¸¡à¸™à¹Œà¹à¸£à¸"; }; String 4 // Name of Parameter 2 { @@ -35484,12 +36622,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Matrix" ; Text [ portuguese ] = "Matriz_tabela" ; - Text [ finnish ] = "matriisi" ; + Text [ finnish ] = "taulukko" ; Text [ danish ] = "Matrix" ; Text [ french ] = "Matrice" ; Text [ swedish ] = "matris" ; Text [ dutch ] = "Matrix" ; - Text [ spanish ] = "matriz_buscar_en" ; + Text [ spanish ] = "Matriz" ; Text [ english_us ] = "array" ; Text[ chinese_simplified ] = "table_array"; Text[ russian ] = "Ìàññèâ"; @@ -35504,6 +36642,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Matris"; Text[ language_user1 ] = " "; Text[ catalan ] = "matriu"; + Text[ thai ] = "à¹à¸–วลำดับ"; }; String 5 // Description of Parameter 2 { @@ -35514,7 +36653,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice o l'area per il riferimento." ; Text [ portuguese_brazilian ] = "Die Matrix oder der Bereich f? den Verweis." ; Text [ portuguese ] = "é a tabela de informações para a procura de dados." ; - Text [ finnish ] = "Viitematriisi tai -alue." ; + Text [ finnish ] = "Viitetaulukko tai -alue" ; Text [ danish ] = "Matrixen eller området for henvisningen." ; Text [ french ] = "La matrice ou la plage pour le renvoi." ; Text [ swedish ] = "Matrisen eller området för hänvisningen." ; @@ -35530,10 +36669,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De matrix of het bereik voor de verwijzing."; Text[ chinese_simplified ] = "矩阵数æ®ç»„或一个引用的区域。"; Text[ greek ] = "Ç ìÞôñá Þ ç ðåñéï÷Þ ãéá ôçí áíáöïñÜ."; - Text[ korean ] = "ì°¸ì¡°ì˜ í–‰ë ¬ ë˜ëŠ” ì˜ì—입니다."; + Text[ korean ] = "ì°¸ì¡°ì˜ í–‰ë ¬ ë˜ëŠ” 범위입니다."; Text[ turkish ] = "Referans ile ilgili matris ya da aralýk."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu o àrea per referenciar."; + Text[ thai ] = "à¹à¸–วลำดับหรืà¸à¸Šà¹ˆà¸§à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 6 // Name of Parameter 3 { @@ -35563,6 +36703,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýndis"; Text[ language_user1 ] = " "; Text[ catalan ] = "Índex"; + Text[ thai ] = "ดัชนี"; }; String 7 // Description of Parameter 3 { @@ -35572,7 +36713,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "L'indice di colonna nella matrice." ; Text [ portuguese_brazilian ] = "Spaltenindex in der Matrix." ; Text [ portuguese ] = "é o número da coluna numa matriz_tabela da qual se devolve o valor correspondente." ; - Text [ finnish ] = "Matriisisarakkeen hakemistonumero." ; + Text [ finnish ] = "Taulukkosarakkeen hakemistonumero" ; Text [ danish ] = "Kolonneindeks i matrixen." ; Text [ french ] = "L'indice de la colonne dans la matrice." ; Text [ swedish ] = "Kolumnindex i matrisen." ; @@ -35592,6 +36733,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Matrisin sütun dizini."; Text[ language_user1 ] = " "; Text[ catalan ] = "Número d'índex de la columna en una matriu."; + Text[ thai ] = "ตัวเลขดัชนีคà¸à¸¥à¸±à¸¡à¸™à¹Œà¹ƒà¸™à¹à¸–วลำดับ"; }; String 8 // Name of Parameter 4 { @@ -35609,7 +36751,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "ordenado" ; Text [ english_us ] = "sort order" ; Text[ chinese_simplified ] = "sort order"; - Text[ russian ] = "Ïîðÿäîê_ñîðòèðîâêè"; + Text[ russian ] = "Ïîðÿäîê ñîðòèðîâêè"; Text[ polish ] = "Porz¹dek sortowania"; Text[ japanese ] = "ãƒ‡ãƒ¼ã‚¿é †åº"; Text[ chinese_traditional ] = "sort order"; @@ -35617,10 +36759,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Gesorteerd"; Text[ chinese_simplified ] = "sort order"; Text[ greek ] = "ÔáîéíïìçìÝíá"; - Text[ korean ] = "ì •ë ¬ë¨"; + Text[ korean ] = "ì •ë ¬ 순서"; Text[ turkish ] = "Sýralama"; Text[ language_user1 ] = " "; Text[ catalan ] = "ordenació"; + Text[ thai ] = "เรียง"; }; String 9 // Description of Parameter 4 { @@ -35631,7 +36774,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Se il valore è VERO o non è indicato, la colonna di ricerca per la matrice deve essere ordinata in ordine crescente." ; Text [ portuguese_brazilian ] = "Ist der Wert WAHR oder nicht angegeben, mu? die Suchspalte der Matrix aufsteigend sortiert sein." ; Text [ portuguese ] = "Se o valor for VERDADEIRO ou não indicado, a linha de procura da matriz terá que ser ordenada de forma ascendente." ; - Text [ finnish ] = "Jos arvo on TRUE tai sitä ei ole määritetty, matriisin hakusarake on järjestettävä nousevaan järjestykseen." ; + Text [ finnish ] = "Jos arvo on TOSI tai sitä ei ole määritetty, taulukon hakusarake on järjestettävä nousevaan järjestykseen." ; Text [ danish ] = "Hvis værdien er SAND eller ikke er angivet, skal matrixens søgekolonne sorteres i stigende orden." ; Text [ french ] = "Si la valeur est VRAI ou n'a pas été spécifiée, la colonne de recherche de la matrice doit être triée dans l'ordre croissant." ; Text [ swedish ] = "Om värdet är SANT eller inte angivet, måste sökkolumnen i matrisen vara sorterad stigande." ; @@ -35639,7 +36782,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Si el valor es VERDADERO o se omite, la columna de búsqueda de la matriz debe ser ordenada ascendentemente." ; Text [ english_us ] = "if the value is TRUE or not given, the search column of the array must be sorted in ascending order." ; Text[ chinese_simplified ] = "若值是TRUE或没有指定，那么数组的列在查找时就按上å‡é¡ºåºæŽ’列。"; - Text[ russian ] = "Ïðè çíà÷åíèè ÈÑÒÈÍÀ èëè îïóùåííîì çíà÷åíèè ñòîëáåö ïîèñêà ìàññèâà äîëæåí ñîðòèðîâàòüñÿ ïî âîçðàñòàíèþ."; + Text[ russian ] = "ïðè çíà÷åíèè ÈÑÒÈÍÀ èëè íå çàäàííîì çíà÷åíèè ïîèñê ñòîëáöà â ìàññèâå äîëæåí îñóùåñòâëÿòüñÿ ïî âîçðàñòàíèþ."; Text[ polish ] = "Jeœli wartoœæ jest PRAWDA lub jeœli nie jest ona podana, kolumna wyszukiwania macierzy musi zostaæ przesortowana w porz¹dku rosn¹cym."; Text[ japanese ] = "指定ãªã—ã€ã‚ã‚‹ã„㯠TRUE を指定ã™ã‚‹ã«ã¯ã€1列目ã®ãƒ‡ãƒ¼ã‚¿ãŒæ˜‡é †ã«ä¸¦ã‚“ã§ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"; Text[ chinese_traditional ] = "若數值是 TRUE 或者沒有指定數值ï¹æœå°‹åˆ—陣欄ä½çš„æ–¹å¼å°±å¿…é ˆæ˜¯å‘上。"; @@ -35651,6 +36794,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer DOÐRU ya da belirtilmemiþse, matrisin arama sütunu artan düzende sýralanmalýdýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Si el valor és TRUE o no s'indica, la columna de cerca de la matriu s'ha d'ordenar de manera ascendent."; + Text[ thai ] = "ถ้าค่าเป็นจริงหรืà¸à¹„ม่ได้ให้มา ให้ค้นหาคà¸à¸¥à¸±à¸¡à¸™à¹Œà¸‚à¸à¸‡à¹à¸–วลำดับที่ต้à¸à¸‡à¹€à¸£à¸µà¸¢à¸‡à¸ˆà¸²à¸à¸™à¹‰à¸à¸¢à¹„ปมาà¸"; }; }; // -=*# Resource for function INDEX #*=- @@ -35672,7 +36816,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve una referencia a una celda o a varias celdas determinada dentro del argumento ref." ; Text [ english_us ] = "Returns a reference to a cell from a defined range." ; Text[ chinese_simplified ] = "å馈一个给定区域ä¸çš„å•å…ƒæ ¼å¼•ç”¨å†…容。"; - Text[ russian ] = "Îïðåäåëÿåò ññûëêó íà ÿ÷åéêó èç çàäàííîãî äèàïàçîíà."; + Text[ russian ] = "Âû÷èñëÿåò ñîäåðæèìîå ÿ÷åéêè èç çàäàííîãî äèàïàçîíà."; Text[ polish ] = "Okreœla odwo³anie do komórki z podanego obszaru."; Text[ japanese ] = "指定範囲内ã§æŒ‡å®šã—ãŸã²ã¨ã¤ã®ã‚»ãƒ«ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定在指定å€åŸŸå…§çš„儲å˜æ ¼çš„åƒç…§ã€‚"; @@ -35680,10 +36824,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Definieert een verwijzing naar een cel uit een aangegeven bereik."; Text[ chinese_simplified ] = "å馈一个给定区域ä¸çš„å•å…ƒæ ¼å¼•ç”¨å†…容。"; Text[ greek ] = "Ïñßæåé ìéá áíáöïñÜ óå Ýíá êåëß ìéá åðéëåãìÝíçò ðåñéï÷Þò."; - Text[ korean ] = "ì •ì˜ëœ ì˜ì—ì˜ ì…€ì— ëŒ€í•œ 참조를 ê²°ì •."; + Text[ korean ] = "ì§€ì •ëœ ë²”ìœ„ë¡œë¶€í„° ì…€ì˜ ì°¸ì¡°ë¥¼ 구합니다."; Text[ turkish ] = "Belirtilen aralýktan bir hücre referansý tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna una referència a una cel·la d'una àrea definida."; + Text[ catalan ] = "Torna una referència a una cel.la d'una àrea definida."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังเซลล์จาà¸à¸Šà¹ˆà¸§à¸‡à¸—ี่à¸à¸³à¸«à¸™à¸”"; }; ExtraData = { @@ -35719,6 +36864,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "referència"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -35728,7 +36874,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il riferimento ad un'area (multipla)." ; Text [ portuguese_brazilian ] = "Der Bezug auf einen (Mehrfach-)Bereich." ; Text [ portuguese ] = "é a referência a um ou vários intervalos de células." ; - Text [ finnish ] = "Viittaus moniosaiseen alueeseen." ; + Text [ finnish ] = "Viittaus moniosaiseen alueeseen" ; Text [ danish ] = "En reference til et (multi-)område." ; Text [ french ] = "La référence à une plage (multiple)." ; Text [ swedish ] = "Referensen till ett (multi-)område." ; @@ -35744,10 +36890,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De verwijzing naar één of meer cellenbereiken."; Text[ chinese_simplified ] = "一个(多é‡)区域的引用。"; Text[ greek ] = "Ç áíáöïñÜ óå ìéá (ðïëëáðëÞ) ðåñéï÷Þ."; - Text[ korean ] = "ì˜ì—(다중)ì— ëŒ€í•œ 참조."; + Text[ korean ] = "다중)ë²”ìœ„ì— ëŒ€í•œ 참조"; Text[ turkish ] = "(Çoklu) aralýða alýnan referans."; Text[ language_user1 ] = " "; Text[ catalan ] = "Referència a una àrea (múltiple)."; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยัง (หลาย) ช่วง"; }; String 4 // Name of Parameter 2 { @@ -35777,6 +36924,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Satýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "fila"; + Text[ thai ] = "à¹à¸–ว"; }; String 5 // Description of Parameter 2 { @@ -35786,7 +36934,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La riga nell'area." ; Text [ portuguese_brazilian ] = "Die Zeile in dem Bereich." ; Text [ portuguese ] = "é o número da linha da qual se deseja obter uma referência." ; - Text [ finnish ] = "Alueen rivi." ; + Text [ finnish ] = "Alueen rivi" ; Text [ danish ] = "Rækken i området." ; Text [ french ] = "La ligne de la plage." ; Text [ swedish ] = "Raden i området." ; @@ -35794,7 +36942,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de fila en el argumento ref desde el cual se devolverá una referencia." ; Text [ english_us ] = "The row in the range." ; Text[ chinese_simplified ] = "区域内的行"; - Text[ russian ] = "Êîëè÷åñòâî ñòðîê â îáëàñòè, èç êîòîðûõ âîçâðàùàåòñÿ ññûëêà."; + Text[ russian ] = "Ñòðîêà â äèàïàçîíå."; Text[ polish ] = "Wiersz w obszarze."; Text[ japanese ] = "範囲内ã§ã®è¡Œç•ªå·ã€‚"; Text[ chinese_traditional ] = "å€åŸŸå…§çš„列"; @@ -35802,10 +36950,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De rij in het bereik."; Text[ chinese_simplified ] = "区域内的行"; Text[ greek ] = "Ç ãñáììÞ óôçí ðåñéï÷Þ."; - Text[ korean ] = "ì˜ì—ë‚´ì˜ í–‰"; + Text[ korean ] = "범위 ë‚´ì˜ í–‰"; Text[ turkish ] = "Aralýktaki satýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "La fila de l'àrea."; + Text[ thai ] = "à¹à¸–วในช่วง"; }; String 6 // Name of Parameter 3 { @@ -35835,6 +36984,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sütun"; Text[ language_user1 ] = " "; Text[ catalan ] = "columna"; + Text[ thai ] = "คà¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; String 7 // Description of Parameter 3 { @@ -35844,7 +36994,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La colonna nell'area." ; Text [ portuguese_brazilian ] = "Die Spalte in dem Bereich." ; Text [ portuguese ] = "é o número da coluna da qual se deseja obter uma referência." ; - Text [ finnish ] = "Alueen sarake." ; + Text [ finnish ] = "Alueen sarake" ; Text [ danish ] = "Kolonnen i området." ; Text [ french ] = "La colonne de la plage." ; Text [ swedish ] = "Kolumnen i området." ; @@ -35852,7 +37002,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de la columna en el argumento ref desde el cual se devolverá una referencia." ; Text [ english_us ] = "The column in the range." ; Text[ chinese_simplified ] = "区域内的列。"; - Text[ russian ] = "Êîëè÷åñòâî ñòîëáöîâ â îáëàñòè, èç êîòîðûõ âîçâðàùàåòñÿ ññûëêà."; + Text[ russian ] = "Ñòîëáåö â äèàïàçîíå."; Text[ polish ] = "Kolumna w obszarze."; Text[ japanese ] = "範囲内ã§ã®åˆ—番å·ã€‚"; Text[ chinese_traditional ] = "å€åŸŸå…§çš„欄。"; @@ -35860,10 +37010,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De kolom in het bereik."; Text[ chinese_simplified ] = "区域内的列。"; Text[ greek ] = "Ç óôÞëç óôçí ðåñéï÷Þ."; - Text[ korean ] = "ì˜ì—ë‚´ì˜ ì—´"; + Text[ korean ] = "범위 ë‚´ì˜ ì—´"; Text[ turkish ] = "Aralýktaki sütun."; Text[ language_user1 ] = " "; Text[ catalan ] = "La columna de l'àrea."; + Text[ thai ] = "คà¸à¸¥à¸±à¸¡à¸™à¹Œà¹ƒà¸™à¸Šà¹ˆà¸§à¸‡"; }; String 8 // Name of Parameter 4 { @@ -35881,7 +37032,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Área" ; Text [ english_us ] = "range" ; Text[ chinese_simplified ] = "area_num"; - Text[ russian ] = "Íîìåð_îáëàñòè"; + Text[ russian ] = "Äèàïàçîí"; Text[ polish ] = "Obszar"; Text[ japanese ] = "範囲番å·"; Text[ chinese_traditional ] = "area_num"; @@ -35889,10 +37040,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "area_num"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "ì˜ì—"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea"; + Text[ thai ] = "ช่วง"; }; String 9 // Description of Parameter 4 { @@ -35910,7 +37062,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Selecciona un área en el argumento ref desde el cual se devolverá la intersección entre fila y columna dadas." ; Text [ english_us ] = "The index of the subrange if referring to a multiple range." ; Text[ chinese_simplified ] = "如果是一个多é‡åŒºåŸŸï¼Œé‚£å°±æ˜¯ä¸€ä¸ªéƒ¨åˆ†åŒºåŸŸçš„索引。"; - Text[ russian ] = "Íîìåð îäíîãî äèàïàçîíà, â ñëó÷àå, åñëè ðå÷ü èäåò î íåñêîëüêèõ äèàïàçîíàõ."; + Text[ russian ] = "Èíäåêñ îäíîãî äèàïàçîíà, â ñëó÷àå, åñëè ðå÷ü èäåò î íåñêîëüêèõ äèàïàçîíàõ."; Text[ polish ] = "Indeks obszaru czêœciowego, jeœli chodzi o obszar z³o¿ony."; Text[ japanese ] = "複数ã®ç¯„囲を入力ã—ãŸå ´åˆã€ãã®ä¸ã®1ã¤ã‚’数値ã§æŒ‡å®šã€‚"; Text[ chinese_traditional ] = "如果是一個多é‡å€åŸŸï¹é‚£å°±æ˜¯ä¸€å€‹éƒ¨ä»½å€åŸŸçš„索引。"; @@ -35918,10 +37070,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De index van een bereik uit meer cellenbereiken."; Text[ chinese_simplified ] = "如果是一个多é‡åŒºåŸŸï¼Œé‚£å°±æ˜¯ä¸€ä¸ªéƒ¨åˆ†åŒºåŸŸçš„索引。"; Text[ greek ] = "Ôï åõñåôÞñéï ôïõ ôìÞìáôïò ôçò ðåñéï÷Þò, óôçí ðåñßðôùóç ðïõ ðñüêåéôáé ãéá ìéá ðïëëáðëÞ ðåñéï÷Þ."; - Text[ korean ] = "다중 ì˜ì—ì¼ ê²½ìš° 부분 ì˜ì—ì˜ ìƒ‰ì¸."; + Text[ korean ] = "다중 ë²”ìœ„ì¼ ê²½ìš° 하위 ë²”ìœ„ì˜ ìƒ‰ì¸."; Text[ turkish ] = "Çoklu aralýk olmasý durumunda kýsmi aralýðýn indisi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Índex de la subàrea si es refereix a una àrea múltiple."; + Text[ thai ] = "ดัชนีขà¸à¸‡à¸Šà¹ˆà¸§à¸‡à¸¢à¹ˆà¸à¸¢à¸–้าà¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังหลายช่วง"; }; }; // -=*# Resource for function INDIREKT #*=- @@ -35943,7 +37096,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve una referencia especificada por un valor de texto." ; Text [ english_us ] = "Returns the contents of a cell that is referenced in text form." ; Text[ chinese_simplified ] = "确定一个以文å—æ ¼å¼è¾“入的å•å…ƒæ ¼å¼•ç”¨çš„内容。"; - Text[ russian ] = "Âîçâðàùàåò ññûëêó, çàäàííóþ òåêñòîâûì çíà÷åíèåì."; + Text[ russian ] = "Âîçâðàùàåò ñîäåðæèìîå ññûëêè, óñòàíîâëåííîå òåêñòîâûì çíà÷åíèåì."; Text[ polish ] = "Okreœla zawartoœæ podanej komórki jako odwo³ania w formie tekstu."; Text[ japanese ] = "æ–‡å—列ã§å‚ç…§ã¨ã—ã¦å…¥åŠ›ã•ã‚Œã¦ã„るセルã®å†…容を返ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個以文å—æ ¼å¼è¼¸å…¥çš„儲å˜æ ¼åƒç…§å…§å®¹ã€‚"; @@ -35951,10 +37104,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Definieert de inhoud van een aangegeven cel die een verwijzing bevat in de vorm van tekst."; Text[ chinese_simplified ] = "确定一个以文å—æ ¼å¼è¾“入的å•å…ƒæ ¼å¼•ç”¨çš„内容。"; Text[ greek ] = "Ïñßæåé ôï ðåñéå÷üìåíï åíüò êåëéïý ôï ïðïßï Ý÷åé ïñéóôåß ùò áíáöïñÜ óå ìïñöÞ êåéìÝíïõ."; - Text[ korean ] = "í…스트 ì–‘ì‹ì˜ ì •ì˜ëœ ì…€ ë‚´ìš©ì„ ì°¸ì¡°ë¡œã€€ê²°ì •í•©ë‹ˆë‹¤."; + Text[ korean ] = "문ìžì—´ 형ì‹ì˜ 참조로 ì§€ì •ëœ ì…€ ë‚´ìš©ì„ êµ¬í•©ë‹ˆë‹¤."; Text[ turkish ] = "Metin þeklinde referans alýnan bir hücrenin içeriðini tanýmlar."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Torna el contingut d'una cel·la que està referenciada en forma de text."; + Text[ catalan ] = "Torna el contingut d'una cel.la que està referenciada en forma de text."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¹€à¸™à¸·à¹‰à¸à¸«à¸²à¸‚à¸à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸—ี่ถูà¸à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹ƒà¸™à¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¸‚้à¸à¸„วาม"; }; ExtraData = { @@ -35970,7 +37124,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Riferimento" ; Text [ portuguese_brazilian ] = "Bezug" ; Text [ portuguese ] = "Texto_ref" ; - Text [ finnish ] = "viite" ; + Text [ finnish ] = "viite " ; Text [ danish ] = "Reference" ; Text [ french ] = "Référence" ; Text [ swedish ] = "Referens" ; @@ -35990,6 +37144,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "ref "; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡ "; }; String 3 // Description of Parameter 1 { @@ -36018,7 +37173,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "í…스트 형태(예: \"A1\")ì˜ ì°¸ì¡°ë¡œì„œ ë‚´ìš©ì´ í‰ê°€ë 셀입니다."; Text[ turkish ] = "Ýçeriði deðerlendirilecek hücre metin þeklinde (Örn. \"A1\") referans alýnacak."; Text[ language_user1 ] = " "; - Text[ catalan ] = "es una referencia a una celda, cuyo contenido se desea comprobar y que contiene una referencia en forma de texto (por ej. \"A1\")."; + Text[ catalan ] = "és una referència a una cel.la, el contingut de la qual es vol comprovar i que conté una referència en forma de text (per ex. \"A1\")."; + Text[ thai ] = "เซลล์ขà¸à¸‡à¹€à¸™à¸·à¹‰à¸à¸«à¸²à¸—ี่ถูà¸à¸›à¸£à¸°à¹€à¸¡à¸´à¸™à¹€à¸›à¹‡à¸™à¸à¸²à¸£à¸–ูà¸à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹ƒà¸™à¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¸‚้à¸à¸„วามจาภ(เช่น \"A1\")."; }; }; // -=*# Resource for function VERWEIS #*=- @@ -36040,7 +37196,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Busca valores en una referencia o matriz." ; Text [ english_us ] = "Determines a value in a vector by comparison to values in another vector." ; Text[ chinese_simplified ] = "通过åŒå¦ä¸€ä¸ªçŸ¢é‡çš„数值比较æ¥ç¡®å®šåœ¨ä¸€ä¸ªçŸ¢é‡ä¸çš„数值。"; - Text[ russian ] = "Îïðåäåëÿåò çíà÷åíèå â âåêòîðå ïóòåì ñðàâíåíèÿ çíà÷åíèé ñ äðóãèì âåêòîðîì."; + Text[ russian ] = "Âû÷èñëÿåò ñîäåðæèìîå ÿ÷åéêè èëè îäíîñòðî÷íîãî èëè îäíîñòîëáöîâîãî ìàññèâà."; Text[ polish ] = "Okreœla wartoœæ wektoru przez porównanie wartoœci w innym wektorze."; Text[ japanese ] = "値を1è¡Œã¾ãŸã¯1列ã®ç¯„囲ã§æ¤œæŸ»ã—ã¦ã€å¯¾å¿œã™ã‚‹å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "通éŽåŒå¦ä¸€å€‹å‘é‡çš„數值比較來確定在一個å‘é‡ä¸çš„數值。"; @@ -36048,10 +37204,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Bepaalt de waarde op een vector door vergelijking van waarden op een andere vector."; Text[ chinese_simplified ] = "通过åŒå¦ä¸€ä¸ªçŸ¢é‡çš„数值比较æ¥ç¡®å®šåœ¨ä¸€ä¸ªçŸ¢é‡ä¸çš„数值。"; Text[ greek ] = "Ïñßæåé ìéá ôéìÞ åíüò äéáíýóìáôïò óõãêñßíïíôáò ôéìÝò êÜðïéïõ Üëëïõ äéáíýóìáôïò."; - Text[ korean ] = "다른 벡터ìƒì˜ ê°’ê³¼ 비êµí•˜ì—¬ 벡터ìƒì˜ ê°’ì„ ê²°ì •"; + Text[ korean ] = "다른 ë²¡í„°ì˜ ê°’ê³¼ 비êµí•˜ì—¬ ë²¡í„°ì˜ ê°’ì„ ê²°ì •"; Text[ turkish ] = "Vektördeki deðeri, baþka bir vektör ile deðer karþýlaþtýrmasý yaparak tanýmlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Determina un valor d'un vector per comparació amb valors d'un altre vector."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ค่าในเวคเตà¸à¸£à¹Œà¸”้วยà¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบไปยังค่าในเวคเตà¸à¸£à¹Œà¸à¸·à¹ˆà¸™"; }; ExtraData = { @@ -36087,6 +37244,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama ölçütü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteri de cerca"; + Text[ thai ] = "ค้นหาเà¸à¸“ฑ์"; }; String 3 // Description of Parameter 1 { @@ -36096,7 +37254,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore da utilizzare per il confronto." ; Text [ portuguese_brazilian ] = "Der Wert, mit dem verglichen wird." ; Text [ portuguese ] = "é o valor a procurar no primeiro vector." ; - Text [ finnish ] = "Vertailussa käytettävä arvo." ; + Text [ finnish ] = "Vertailussa käytettävä arvo" ; Text [ danish ] = "Den værdi der skal sammenlignes med." ; Text [ french ] = "La valeur à utiliser pour la comparaison." ; Text [ swedish ] = "Värdet som det jämförs med." ; @@ -36116,6 +37274,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karþýlaþtýrma için kullanýlacak deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha d'utilitzar per a la comparació."; + Text[ thai ] = "ใช้ค่าสำหรับà¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบ"; }; String 4 // Name of Parameter 2 { @@ -36133,7 +37292,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "vector_comparación" ; Text [ english_us ] = "Search vector" ; Text[ chinese_simplified ] = "lookup_vector"; - Text[ russian ] = "Âåêòîð_ïðîñìîòðà"; + Text[ russian ] = "Âåêòîð ïðîñìîòðà"; Text[ polish ] = "Przeszukiwany wektor"; Text[ japanese ] = "検索範囲"; Text[ chinese_traditional ] = "lookup_vector"; @@ -36145,6 +37304,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama vektörü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vector de cerca"; + Text[ thai ] = "ค้นหาเวคเตà¸à¸£à¹Œ"; }; String 5 // Description of Parameter 2 { @@ -36162,7 +37322,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un área que solo contiene una columna o una fila." ; Text [ english_us ] = "The vector (row or column) in which to search." ; Text[ chinese_simplified ] = "è¦åœ¨å…¶ä¸æœå¯»çš„矢é‡(行或者列)。"; - Text[ russian ] = "Âåêòîð (äèàïàçîí, ñîäåðæàùèé òîëüêî îäíó ñòðîêó èëè ñòîëáåö), â êîòîðîì ñëåäóåò èñêàòü."; + Text[ russian ] = "Âåêòîð (ñòðîêà èëè ñòîëáåö), â êîòîðîì ñëåäóåò èñêàòü."; Text[ polish ] = "Wektor (wiersz lub kolumna), w którym nast¹pi wyszukiwanie."; Text[ japanese ] = "検査値を比較ã™ã‚‹1è¡Œã¾ãŸã¯1列ã®ç¯„囲｡"; Text[ chinese_traditional ] = "è¦åœ¨å…¶ä¸æœå°‹çš„å‘é‡(欄或列)。"; @@ -36174,6 +37334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama yapýlan vektör (satýr ya da sütun)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Vector (fila o columna) en què s'ha de cercar."; + Text[ thai ] = "เวคเตà¸à¸£à¹Œ (à¹à¸–วหรืà¸à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œ) ที่ค้นหา"; }; String 6 // Name of Parameter 3 { @@ -36191,7 +37352,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "vector_resultado" ; Text [ english_us ] = "result_vector" ; Text[ chinese_simplified ] = "result_vector"; - Text[ russian ] = "Âåêòîð_ðåçóëüòàòà"; + Text[ russian ] = "Âåêòîð ðåçóëüòàòà"; Text[ polish ] = "Wektor wynikowy"; Text[ japanese ] = "çµæžœç¯„囲"; Text[ chinese_traditional ] = "result_vector"; @@ -36203,6 +37364,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sonuç vektörü"; Text[ language_user1 ] = " "; Text[ catalan ] = "result_vector"; + Text[ thai ] = "ผลลัพธ์_เวคเตà¸à¸£à¹Œ"; }; String 7 // Description of Parameter 3 { @@ -36220,7 +37382,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un área que sólo contiene una columna o una fila." ; Text [ english_us ] = "The vector (row or range) from which the value is to be determined." ; Text[ chinese_simplified ] = "è¦ä»Žä¸å¾—出数值的矢é‡(行或者列)。"; - Text[ russian ] = "Âåêòîð (äèàïàçîí, ñîäåðæàùèé îäíó ñòðîêó èëè ñòîëáåö), èç êîòîðîãî îïðåäåëÿåòñÿ çíà÷åíèå."; + Text[ russian ] = "Âåêòîð (ñòðîêà èëè äèàïàçîí), èç êîòîðîãî îïðåäåëÿåòñÿ çíà÷åíèå."; Text[ polish ] = "Wektor (wiersz lub kolumna), na podstawie którego zostanie okreœlona wartoœæ."; Text[ japanese ] = "戻り値ã®ãƒªã‚¹ãƒˆã§ã‚ã‚‹1è¡Œã¾ãŸã¯1列ã®ç¯„囲｡"; Text[ chinese_traditional ] = "è¦å¾žä¸å¾—出數值的å‘é‡(欄或列)。"; @@ -36228,10 +37390,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De vector (de rij of de kolom) waaruit de waarde resulteert."; Text[ chinese_simplified ] = "è¦ä»Žä¸å¾—出数值的矢é‡(行或者列)。"; Text[ greek ] = "Ôï äéÜíõóìá (ç ãñáììÞ Þ ç óåéñÜ) áðï ôï ïðïßï èá ïñéóôåß ç ôéìÞ."; - Text[ korean ] = "ê°’ì´ ê²°ì •ë 벡터(í–‰ ë˜ëŠ” ì—´)입니다."; + Text[ korean ] = "ê°’ì´ ê²°ì •ë 벡터(í–‰ ë˜ëŠ” 범위)입니다."; Text[ turkish ] = "Deðerin belirleme için esas alýnan vektör (satýr ya da sütun)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Vector (fila o àrea) des del qual s'ha de determinar el valor."; + Text[ thai ] = "เวคเตà¸à¸£à¹Œ (à¹à¸–วหรืà¸à¸Šà¹ˆà¸§à¸‡) จาà¸à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่า"; }; }; // -=*# Resource for function VERGLEICH #*=- @@ -36245,7 +37408,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce una posizione di un elemento in una matrice dopo un confronto di valori." ; Text [ portuguese_brazilian ] = "Bestimmt eine Position in einer Matrix nach einem Wertvergleich." ; Text [ portuguese ] = "Define a posição de um elemento numa matriz, baseando-se na comparação de valores." ; - Text [ finnish ] = "Määrittää matriisin paikan arvovertailun jälkeen." ; + Text [ finnish ] = "Määrittää taulukon paikan arvovertailun jälkeen." ; Text [ danish ] = "Bestemmer en position i en matrix baseret på en sammenligning af værdier." ; Text [ french ] = "Détermine une position dans une matrice après comparaison des valeurs." ; Text [ swedish ] = "Bestämmer en position i en matris enligt en värdejämförelse." ; @@ -36253,7 +37416,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la posición relativa de un elemento en una matriz que coincida con un valor especificado." ; Text [ english_us ] = "Defines a position in a array after comparing values." ; Text[ chinese_simplified ] = "通过数值比较æ¥ç¡®å®šæ•°æ®åœ¨æ•°æ®ç»„ä¸çš„ä½ç½®ã€‚"; - Text[ russian ] = "Îïðåäåëÿåò ïóòåì ñðàâíåíèÿ çíà÷åíèé ïîçèöèþ â ìàññèâå."; + Text[ russian ] = "Âû÷èñëÿåò îòíîñèòåëüíîå ðàñïîëîæåíèå ýëåìåíòà â ìàññèâå ïî îïðåäåë¸ííîìó óñëîâèþ."; Text[ polish ] = "Okreœla pozycjê w macierzy porównuj¹c wartoœæ"; Text[ japanese ] = "値を比較ã—ã¦ç¯„囲内ã®ä½ç½®ã‚’表ã™æ•°å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "通éŽæ•¸å€¼æ¯”較來確定數據在數據組ä¸çš„ä½ç½®ã€‚"; @@ -36265,6 +37428,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer karþýlaþtýrýlmasýndan sonra matrisdeki bir konumu tanýmlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix una posició en una matriu després de comparar valors."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ตำà¹à¸«à¸™à¹ˆà¸‡à¹ƒà¸™à¹à¸–วลำดับหลังà¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบค่า"; }; ExtraData = { @@ -36300,6 +37464,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama ölçütü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Criteri de cerca"; + Text[ thai ] = "เà¸à¸“ฑ์à¸à¸²à¸£à¸„้นหา"; }; String 3 // Description of Parameter 1 { @@ -36309,7 +37474,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore utilizzato per il confronto." ; Text [ portuguese_brazilian ] = "Der Wert, mit dem verglichen wird." ; Text [ portuguese ] = "é o valor usado para determinar o valor numa tabela." ; - Text [ finnish ] = "Vertailussa käytettävä arvo." ; + Text [ finnish ] = "Vertailussa käytettävä arvo" ; Text [ danish ] = "Den værdi der skal sammenlignes med." ; Text [ french ] = "La valeur à utiliser pour la comparaison." ; Text [ swedish ] = "Värdet som det skall jämföras med." ; @@ -36329,6 +37494,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karþýlaþtýrma yapýlan deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha d'utilitzar per a la comparació."; + Text[ thai ] = "ใช้ค่าสำหรับà¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบ"; }; String 4 // Name of Parameter 2 { @@ -36338,15 +37504,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Matrice" ; Text [ portuguese_brazilian ] = "Suchmatrix" ; Text [ portuguese ] = "Matriz_procurada" ; - Text [ finnish ] = "hakumatriisi" ; + Text [ finnish ] = "hakutaulukko" ; Text [ danish ] = "Opslagsmatrix" ; Text [ french ] = "M_recherche" ; Text [ swedish ] = "sökmatris" ; Text [ dutch ] = "Zoekmatrix" ; - Text [ spanish ] = "matriz_buscada" ; + Text [ spanish ] = "buscar_matriz" ; Text [ english_us ] = "lookup_array" ; Text[ chinese_simplified ] = "lookup_array"; - Text[ russian ] = "Ìàññèâ_ïðîñìîòðà"; + Text[ russian ] = "Ìàññèâ"; Text[ polish ] = "przeszukiwana_tab"; Text[ japanese ] = "検査範囲"; Text[ chinese_traditional ] = "lookup_array"; @@ -36358,6 +37524,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama matrisi"; Text[ language_user1 ] = " "; Text[ catalan ] = "lookup_array"; + Text[ thai ] = "ค้นหา_à¹à¸–วลำดับ"; }; String 5 // Description of Parameter 2 { @@ -36367,7 +37534,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La matrice (l'area) nella quale si effettua la ricerca." ; Text [ portuguese_brazilian ] = "Die Matrix (der Bereich), in der gesucht wird." ; Text [ portuguese ] = "é um intervalo de células adjacentes contendo os possíveis valores de equivalência." ; - Text [ finnish ] = "Matriisi (alue), johon haku tehdään." ; + Text [ finnish ] = "Taulukko (alue), johon haku tehdään." ; Text [ danish ] = "Den matrix (det område) der skal søges i." ; Text [ french ] = "La matrice (la plage) à utiliser pour la recherche." ; Text [ swedish ] = "Matrisen (området) som det skall sökas i." ; @@ -36387,6 +37554,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama yapýlan matris (aralýk)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Matriu (àrea) en què es fa la cerca."; + Text[ thai ] = "à¹à¸–วลำดับ (ช่วง) ในà¸à¸²à¸£à¸—ำà¸à¸²à¸£à¸„้นหา"; }; String 6 // Name of Parameter 3 { @@ -36416,6 +37584,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; String 7 // Description of Parameter 3 { @@ -36445,6 +37614,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "1, 0 ya da -1 deðerlerini alabilen tip, yapýlacak aramanýn ölçütlerini belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "El tipus pot prendre el valor 1, 0 o -1 i determina els criteris que s'han d'utilitzar amb finalitats comparatives."; + Text[ thai ] = "ชนิดสามารถใช้ค่า 1, 0 หรืภ-1 à¹à¸¥à¸°à¸à¸³à¸«à¸™à¸”ใช้เà¸à¸“ฑ์สำหรับวัตถุประสงค์ในà¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบ"; }; }; // -=*# Resource for function VERSCHIEBUNG #*=- @@ -36467,7 +37637,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve una referencia especificada y la desvía respecto a otra referencia." ; Text [ english_us ] = "Returns a reference which has been moved in relation to the starting point." ; Text[ chinese_simplified ] = "确定从指定基点出å‘移动åŽçš„引用区域。"; - Text[ russian ] = "Âîçâðàùàåò ññûëêó, ñìåùàåìóþ îòíîñèòåëüíî çàäàííîé ññûëêè."; + Text[ russian ] = "Âû÷èñëÿåò çíà÷åíèå ñìåùåíèÿ îòíîñèòåëüíî óêàçàííîé ññûëêè."; Text[ polish ] = "Okreœla odwo³anie, które zosta³o przesuniête w porównaniu z punktem wyjœciowym."; Text[ japanese ] = "基準ã‹ã‚‰æŒ‡å®šã®è¡Œåˆ—数を移動ã—ãŸä½ç½®ã®ã‚»ãƒ«ã®å€¤ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定從指定基點出發移動後的åƒç…§å€åŸŸã€‚"; @@ -36479,6 +37649,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Çýkýþ noktasýna göre taþýnan bir referans tanýmlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna una referència que s'ha mogut en relació al punt d'inici."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸—ี่ย้ายในความสัมพันธ์ไปสู่จุดเริ่มต้น"; }; ExtraData = { @@ -36514,6 +37685,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "referència"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -36523,7 +37695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il riferimento (la cella) dalla quale viene determinato lo spostamento." ; Text [ portuguese_brazilian ] = "Der Bezug (die Zelle), von der ab die Verschiebung bestimmt wird." ; Text [ portuguese ] = "é a referência (célula) de base para o deslocamento." ; - Text [ finnish ] = "Viite (solu), jonka perusteella siirto lasketaan." ; + Text [ finnish ] = "Viite (solu), jonka perusteella siirto lasketaan" ; Text [ danish ] = "Den reference (den celle) som forskydningen skal baseres på." ; Text [ french ] = "La référence (cellule) sur laquelle baser le décalage." ; Text [ swedish ] = "Referensen (cellen) från vilken förflyttningen bestäms." ; @@ -36531,7 +37703,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la referencia a la celda desde la cual se determina la desviación." ; Text [ english_us ] = "The reference (cell) from which to base the movement." ; Text[ chinese_simplified ] = "用于计算移动的指定基点(å•å…ƒæ ¼)。"; - Text[ russian ] = "Ññûëêà (èëè ÿ÷åéêà), íà÷èíàÿ ñ êîòîðîé îïðåäåëÿåòñÿ ñìåùåíèå."; + Text[ russian ] = "Ññûëêà (ÿ÷åéêà), ñ êîòîðîé íà÷èíàåòñÿ ïåðåìåùåíèå."; Text[ polish ] = "Odwo³anie (komórka), od której nast¹pi przesuniêcie."; Text[ japanese ] = "ã“ã®ã‚»ãƒ«ã¾ãŸã¯ã‚»ãƒ«ç¯„囲ã‹ã‚‰è¡Œåˆ—æ•°ã‚’æ•°ãˆã¾ã™ã€‚"; Text[ chinese_traditional ] = "用來計算移動的指定基點(儲å˜æ ¼)。"; @@ -36542,7 +37714,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ì´ë™ì´ ê²°ì •ë˜ëŠ” 참조 (ì…€)"; Text[ turkish ] = "Taþýnmanýn belirlenmeye baþlanacaðý referans (hücre)."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referència (cel·la) des de la qual basar el moviment."; + Text[ catalan ] = "Referència (cel.la) des de la qual basar el moviment."; + Text[ thai ] = "à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡ (เซลล์) จาà¸à¸—ี่ซึ่งไปยังà¸à¸²à¸£à¹€à¸„ลื่à¸à¸™à¸—ี่พื้นà¸à¸²à¸™"; }; String 4 // Name of Parameter 2 { @@ -36560,7 +37733,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "filas" ; Text [ english_us ] = "rows" ; Text[ chinese_simplified ] = "rows"; - Text[ russian ] = "Ñòðîêè"; + Text[ russian ] = "Ñòðîêà"; Text[ polish ] = "Wiersze"; Text[ japanese ] = "行数"; Text[ chinese_traditional ] = "rows"; @@ -36572,6 +37745,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Satýr"; Text[ language_user1 ] = " "; Text[ catalan ] = "files"; + Text[ thai ] = "à¹à¸–ว"; }; String 5 // Description of Parameter 2 { @@ -36581,7 +37755,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di righe dello spostamento verso l'alto o verso il basso." ; Text [ portuguese_brazilian ] = "Die Anzahl der Zeilen, um die nach oben oder unten verschoben wird." ; Text [ portuguese ] = "é o número de linhas a deslocar para cima ou para baixo." ; - Text [ finnish ] = "Ylös tai alas siirrettävien rivien määrä." ; + Text [ finnish ] = "Ylös tai alas siirrettävien rivien määrä" ; Text [ danish ] = "Antallet af rækker der skal forskydes op eller ned med." ; Text [ french ] = "Le nombre de lignes à décaler vers le haut ou vers le bas." ; Text [ swedish ] = "Antalet rader som förflyttas uppåt eller neråt." ; @@ -36597,10 +37771,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het aantal cellen ten opzichte waarvan naar boven of naar beneden wordt verschoven."; Text[ chinese_simplified ] = "上下移动的行数。"; Text[ greek ] = "Ôï ðëÞèïò ôùí ãñáììþí ðïõ ðñüêåéôáé íá ãßíåé ç ìåôáêßíçóç ðñïò ôá ðÜíù Þ êÜôù."; - Text[ korean ] = "위 ë˜ëŠ” 아래로 ì´ë™ë˜ëŠ” í–‰ì˜ ê°œìˆ˜."; + Text[ korean ] = "위 ë˜ëŠ” 아래로 ì´ë™ë˜ëŠ” í–‰ì˜ ìˆ˜"; Text[ turkish ] = "Yukarý ya da aþaðý taþýnacak satýr sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de files que s'han de moure cap amunt o cap avall."; + Text[ thai ] = "จำนวนà¹à¸–วที่ย้ายไม่ขึ้นà¸à¹‡à¸¥à¸‡"; }; String 6 // Name of Parameter 3 { @@ -36618,7 +37793,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "col" ; Text [ english_us ] = "columns" ; Text[ chinese_simplified ] = "columns"; - Text[ russian ] = "Ñòîëáöû"; + Text[ russian ] = "Ñòîëáåö"; Text[ polish ] = "kolumny"; Text[ japanese ] = "列数"; Text[ chinese_traditional ] = "cols"; @@ -36630,6 +37805,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sütun"; Text[ language_user1 ] = " "; Text[ catalan ] = "columnes"; + Text[ thai ] = "คà¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; String 7 // Description of Parameter 3 { @@ -36639,7 +37815,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di colonne dello spostamento verso sinistra o destra." ; Text [ portuguese_brazilian ] = "Die Anzahl der Spalten, um die nach links oder rechts verschoben wird." ; Text [ portuguese ] = "é o número de colunas a deslocar para a esquerda ou direita." ; - Text [ finnish ] = "Vasemmalle tai oikealle siirrettävien sarakkeiden määrä." ; + Text [ finnish ] = "Vasemmalle tai oikealle siirrettävien sarakkeiden määrä" ; Text [ danish ] = "Antallet af rækker der skal forskydes til venstre eller højre med." ; Text [ french ] = "Le nombre de colonnes à décaler vers la gauche ou vers la droite." ; Text [ swedish ] = "Antalet kolumner som förflyttas till vänster eller till höger." ; @@ -36655,10 +37831,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het aantal kolommen ten opzichte waarvan naar links of naar rechts wordt verschoven."; Text[ chinese_simplified ] = "å·¦å³ç§»åŠ¨çš„列数。"; Text[ greek ] = "Ï áñéèìüò ôùí óôçëþí ðïõ èá ìåôáêéíçèïýí ðñïò ôá áñéóôåñÜ Þ äåîéÜ."; - Text[ korean ] = "왼쪽 ë˜ëŠ” 오른쪽으로 ì´ë™ë˜ëŠ” ì—´ 개수."; + Text[ korean ] = "왼쪽 ë˜ëŠ” 오른쪽으로 ì´ë™ë˜ëŠ” ì—´ 수"; Text[ turkish ] = "Sola ya da saða taþýnacak sütun sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de columnes que s'han de moure a l'esquerra o a la dreta."; + Text[ thai ] = "จำนวนคà¸à¸¥à¸±à¸¡à¸™à¹Œà¸—ี่ย้ายไปทางซ้ายหรืà¸à¸‚วา"; }; String 8 // Name of Parameter 4 { @@ -36689,6 +37866,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yükseklik"; Text[ language_user1 ] = " "; Text[ catalan ] = "alçada"; + Text[ thai ] = "ความสูง"; }; String 9 // Description of Parameter 4 { @@ -36698,7 +37876,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di righe del riferimento spostato." ; Text [ portuguese_brazilian ] = "Die Anzahl der Zeilen des verschobenen Bezugs." ; Text [ portuguese ] = "é o número de linhas da referência deslocada." ; - Text [ finnish ] = "Siirretyn viitteen rivien määrä." ; + Text [ finnish ] = "Siirretyn viitteen rivien määrä" ; Text [ danish ] = "Antallet af rækker i den forskudte reference." ; Text [ french ] = "Le nombre de lignes de la référence décalée." ; Text [ swedish ] = "Antalet rader i den förflyttade referensen." ; @@ -36706,7 +37884,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la altura, en filas, de la referencia desviada." ; Text [ english_us ] = "The number of rows of the moved reference." ; Text[ chinese_simplified ] = "引用区域的行数。"; - Text[ russian ] = "Êîëè÷åñòâî ñòðîê ñìåùàåìîé ññûëêè."; + Text[ russian ] = "Êîëè÷åñòâî ñòðîê ïåðåìåùàåìîé ññûëêè."; Text[ polish ] = "Liczba wierszy przesuniêtego odwo³ania."; Text[ japanese ] = "求ã‚るセル範囲ã®è¡Œæ•°ã€‚"; Text[ chinese_traditional ] = "åƒç…§å€åŸŸçš„列數。"; @@ -36718,6 +37896,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Taþýnan referansýn satýr sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de files de la referència moguda."; + Text[ thai ] = "จำนวนà¹à¸–วขà¸à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸—ี่ย้ายไป"; }; String 10 // Name of Parameter 5 { @@ -36747,6 +37926,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Geniþlik"; Text[ language_user1 ] = " "; Text[ catalan ] = "amplada"; + Text[ thai ] = "ความà¸à¸§à¹‰à¸²à¸‡"; }; String 11 // Description of Parameter 5 { @@ -36756,7 +37936,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di colonne del riferimento spostato." ; Text [ portuguese_brazilian ] = "Die Anzahl der Spalten des verschobenen Bezugs." ; Text [ portuguese ] = "é o número de colunas da referência fornecida." ; - Text [ finnish ] = "Siirretyn viitteen sarakkeiden määrä." ; + Text [ finnish ] = "Siirretyn viitteen sarakkeiden määrä" ; Text [ danish ] = "Antallet af kolonner i den forskudte reference." ; Text [ french ] = "Le nombre de colonnes de la référence décalée." ; Text [ swedish ] = "Antalet kolumner i den flyttade referensen." ; @@ -36764,7 +37944,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el ancho, en columnas, de la referencia desviada." ; Text [ english_us ] = "The number of columns in the moved reference." ; Text[ chinese_simplified ] = "移动的引用区域的列数。"; - Text[ russian ] = "Êîëè÷åñòâî ñòîëáöîâ ñìåùàåìîé ññûëêè."; + Text[ russian ] = "Êîëè÷åñòâî ñòîëáöîâ ïåðåìåùàåìîé ññûëêè."; Text[ polish ] = "Iloœæ kolumn przesuniêtego odwo³ania."; Text[ japanese ] = "求ã‚るセル範囲ã®åˆ—数。"; Text[ chinese_traditional ] = "移動的åƒç…§å€åŸŸçš„欄數。"; @@ -36776,6 +37956,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Taþýnan referansýn sütun sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de columnes en la referència moguda."; + Text[ thai ] = "จำนวนคà¸à¸¥à¸±à¸¡à¸™à¹Œà¹ƒà¸™à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸—ี่ย้ายไป"; }; }; // -=*# Resource for function FEHLERTYP #*=- @@ -36789,7 +37970,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Restituisce il numero corrispondente a un errore determinato." ; Text [ portuguese_brazilian ] = "Bestimmt die Fehlernummer zu aufgetretenen Fehlern." ; Text [ portuguese ] = "Devolve um número correspondente a um erro." ; - Text [ finnish ] = "Palauttaa virhetyyppiä vastaavan luvun" ; + Text [ finnish ] = "Palauttaa virhetyyppiä vastaavan luvun." ; Text [ danish ] = "Returnerer et tal der svarer til en fejltype." ; Text [ french ] = "Détermine le numéro d'erreur correspondant à une erreur survenue." ; Text [ swedish ] = "Returnerar felnumret på uppkomna fel." ; @@ -36797,7 +37978,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve un número que corresponde a un tipo de error." ; Text [ english_us ] = "Returns a number corresponding to an error type" ; Text[ chinese_simplified ] = "确定错误值的对应å·ç 。"; - Text[ russian ] = "Âîçâðàùàåò ÷èñëî, ñîîòâåòñòâóþùåå òèïó îøèáêè."; + Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå, ñîîòâåòñòâóþùåå òèïó îøèáêè."; Text[ polish ] = "Zwraca numer dotycz¹cy danego b³êdu."; Text[ japanese ] = "発生ã—ãŸã‚¨ãƒ©ãƒ¼ã®ç•ªå·ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定錯誤值的å°æ‡‰è™Ÿç¢¼ã€‚"; @@ -36809,6 +37990,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Hata tipleri ile ilgili hata numaralarýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna un nombre corresponent a un tipus d'error"; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ที่ตรงà¸à¸±à¸šà¸Šà¸™à¸´à¸”ที่ผิดพลาด"; }; ExtraData = { @@ -36844,6 +38026,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; Text[ catalan ] = "referència"; + Text[ thai ] = "à¸à¹‰à¸²à¸‡à¸à¸´à¸‡"; }; String 3 // Description of Parameter 1 { @@ -36853,7 +38036,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Riferimento (cella) nella quale si è avuto l'errore" ; Text [ portuguese_brazilian ] = "Der Bezug (die Zelle), in der der Fehler aufgetreten ist." ; Text [ portuguese ] = "é a referência (célula) na qual ocorreu o erro." ; - Text [ finnish ] = "Viite (solu), jossa virhe ilmeni." ; + Text [ finnish ] = "Viite (solu), jossa virhe ilmeni" ; Text [ danish ] = "Den reference (den celle) som fejlen er opstået i." ; Text [ french ] = "La référence (cellule) dans laquelle l'erreur est survenue." ; Text [ swedish ] = "Referensen (cellen) där felet har uppkommit." ; @@ -36861,7 +38044,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la referencia (la celda) en la que el error ha ocurrido." ; Text [ english_us ] = "The reference (cell) in which the error occurred." ; Text[ chinese_simplified ] = "出现错误的å•å…ƒæ ¼å¼•ç”¨ã€‚"; - Text[ russian ] = "Ññûëêà íà ÿ÷åéêó, â êîòîðîé ïðîèçîøëà îøèáêà."; + Text[ russian ] = "Ññûëêà (ÿ÷åéêà), â êîòîðîé ïðîèçîøëà îøèáêà."; Text[ polish ] = "Adres komórki, w której wyst¹pi³ b³¹d."; Text[ japanese ] = "エラーãŒç™ºç”Ÿã—ãŸã‚»ãƒ«ã®å‚照。"; Text[ chinese_traditional ] = "出ç¾éŒ¯èª¤çš„(儲å˜æ ¼)åƒç…§ã€‚"; @@ -36872,7 +38055,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "오류가 ë°œìƒí•œ 참조(ì…€)입니다."; Text[ turkish ] = "Hatanýn meydana geldiði referans (hücre)."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referència (cel·la) en què s'ha produït l'error."; + Text[ catalan ] = "Referència (cel.la) en què s'ha produït l'error."; + Text[ thai ] = "à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡ (เซลล์) ในที่ที่มีข้à¸à¸œà¸´à¸”พลาดเà¸à¸´à¸”ขึ้น"; }; }; // -=*# Resource for function VORLAGE #*=- @@ -36894,7 +38078,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Asigna a la celda un formato predeterminado." ; Text [ english_us ] = "Applies a Style to the formula cell." ; Text[ chinese_simplified ] = "分é…ä¸€ä¸ªæ ¼å¼æ ·å¼ç»™ä¸€ä¸ªå•å…ƒæ ¼ã€‚"; - Text[ russian ] = "Çàäàåò ÿ÷åéêå ôîðìóëû ñòèëü ôîðìàòà."; + Text[ russian ] = "Óñòàíàâëèâàåò ñòèëü äëÿ ÿ÷åéêè, ñîäåðæàùåé ôîðìóëó."; Text[ polish ] = "Przypisuje komórce formu³y styl formatu."; Text[ japanese ] = "æ•°å¼ã‚»ãƒ«ã«æ›¸å¼ã‚¹ã‚¿ã‚¤ãƒ«ã‚’é©ç”¨ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "分é…ä¸€å€‹æ ¼å¼æ¨£å¼çµ¦ä¸€å€‹å„²å˜æ ¼ã€‚"; @@ -36902,10 +38086,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Wijst de formulecel een opmaakprofiel toe."; Text[ chinese_simplified ] = "分é…ä¸€ä¸ªæ ¼å¼æ ·å¼ç»™ä¸€ä¸ªå•å…ƒæ ¼ã€‚"; Text[ greek ] = "Åöáñìüæåé Ýíá ðñüôõðï ìïñöïðïßçóçò óôï êåëß ôïõ ôýðïõ."; - Text[ korean ] = "수ì‹ì…€ì— ì„œì‹ í…œí”Œë¦¿ì„ ì ìš©."; + Text[ korean ] = "ìˆ˜ì‹ ì…€ì— ì„œì‹ ìŠ¤íƒ€ì¼ì„ ì 용합니다."; Text[ turkish ] = "Formül hücresine bir biçim uygular."; - Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EMp.s. Formatvorlage ist Style im Gegensatz zu Dok-vorlage (template). ODER ist es in Calc was Besonderes?"; - Text[ catalan ] = "Aplica un estil a la cel·la de fórmules."; + Text[ language_user1 ] = "All ; All \"Vorlagen\" /Styles are written with a capital S.10.5.00EMp.s. Formatvorlage ist Style im Gegensatz zu Dok-vorlage (template). ODER ist es in Calc was Besonderes?"; + Text[ catalan ] = "Aplica un estil a la cel.la de fórmules."; + Text[ thai ] = "ใช้ลัà¸à¸©à¸“ะเป็นเซลล์สูตร"; }; ExtraData = { @@ -36937,10 +38122,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Profiel"; Text[ chinese_simplified ] = "style"; Text[ greek ] = "Ðñüôõðï"; - Text[ korean ] = "템플릿"; + Text[ korean ] = "스타ì¼"; Text[ turkish ] = "Biçim"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil"; + Text[ thai ] = "ลัà¸à¸©à¸“ะ"; }; String 3 // Description of Parameter 1 { @@ -36950,7 +38136,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il nome del modello da assegnare alla cella." ; Text [ portuguese_brazilian ] = "Der Name der Vorlage, die zugewiesen wird." ; Text [ portuguese ] = "é o nome do estilo a ser aplicado." ; - Text [ finnish ] = "Liitettävän tyylin nimi." ; + Text [ finnish ] = "Liitettävän tyylin nimi" ; Text [ danish ] = "Navnet på den typografi, som skal tildeles." ; Text [ french ] = "Le nom du style qui doit être attribué." ; Text [ swedish ] = "Namnet på formatmallen som tilldelas." ; @@ -36958,7 +38144,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Nombre del estilo que se desea aplicar." ; Text [ english_us ] = "The name of the Style to be applied." ; Text[ chinese_simplified ] = "è¦æŒ‡å®šçš„æ ·å¼å称。"; - Text[ russian ] = "Íàçíà÷àåìîå èìÿ ñòèëÿ."; + Text[ russian ] = "Èìÿ ïðèìåíÿåìîãî ñòèëÿ."; Text[ polish ] = "Nazwa szablonu, który ma zostaæ zastosowany."; Text[ japanese ] = "é©ç”¨ã™ã‚‹ã‚¹ã‚¿ã‚¤ãƒ«ã®åå‰ã€‚"; Text[ chinese_traditional ] = "è¦æŒ‡å®šçš„樣å¼å稱。"; @@ -36966,10 +38152,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De naam van het opmaakprofiel dat wordt toegewezen."; Text[ chinese_simplified ] = "è¦æŒ‡å®šçš„æ ·å¼å称。"; Text[ greek ] = "¼íïìá ôïõ ðñïôýðïõ ðïõ ðñüêåéôáé íá åöáñìïóôåß."; - Text[ korean ] = "ì ìš©ë˜ëŠ” í…œí”Œë¦¿ì˜ ì´ë¦„"; + Text[ korean ] = "ì ìš©ë 스타ì¼ì˜ ì´ë¦„."; Text[ turkish ] = "Uygulanacak biçimin adý."; - Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; + Text[ language_user1 ] = "All ; All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; Text[ catalan ] = "Nom de l'estil que s'ha d'aplicar."; + Text[ thai ] = "ใช้ชื่à¸à¸¥à¸±à¸à¸©à¸“ะ"; }; String 4 // Name of Parameter 2 { @@ -36999,6 +38186,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Zaman"; Text[ language_user1 ] = " "; Text[ catalan ] = "Hora"; + Text[ thai ] = "เวลา"; }; String 5 // Description of Parameter 2 { @@ -37017,7 +38205,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Tiempo de validez (en seg.) del estilo." ; Text [ english_us ] = "The time (in seconds) that the Style is to remain valid." ; Text[ chinese_simplified ] = "æ ·å¼ä¿æŒæœ‰æ•ˆçš„时间(以秒为å•ä½)。"; - Text[ russian ] = "Âðåìÿ (â ñåêóíäàõ), â òå÷åíèå êîòîðîãî ñòèëü îñòàåòñÿ àêòóàëüíûì."; + Text[ russian ] = "Âðåìÿ (â ñåêóíäàõ), â òå÷åíèå êîòîðîãî ñòèëü îñòàåòñÿ äåéñòâèòåëüíûì."; Text[ polish ] = "Limit czasu (w sekundach), w ci¹gu którego ten szablon zachowa wa¿noœæ."; Text[ japanese ] = "スタイルã®æœ‰åŠ¹æ™‚é–“(秒)"; Text[ chinese_traditional ] = "樣å¼ä¿æŒæœ‰æ•ˆçš„時間(以秒為單ä½)。"; @@ -37025,10 +38213,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De tijd (in seconden) waarin het opmaakprofiel geldig blijft."; Text[ chinese_simplified ] = "æ ·å¼ä¿æŒæœ‰æ•ˆçš„时间(以秒为å•ä½)。"; Text[ greek ] = "Ç äéÜñêåéá (óå äåõôåñüëåðôá) êáôÜ ôçí ïðïßá ôï ðñüôõðï ðáñáìÝíåé Ýãêõñï."; - Text[ korean ] = "í…œí”Œë¦¿ì´ ìœ íš¨í•˜ê²Œ 남아있는 시간(ì´ˆ)"; + Text[ korean ] = "ìŠ¤íƒ€ì¼ ìœ íš¨ 시간(ì´ˆ 단위)"; Text[ turkish ] = "Biçimin geçerli olacaðý süre (saniye biriminden)."; - Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; + Text[ language_user1 ] = "All ; All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; Text[ catalan ] = "Temps (en segons) que l'estil romandrà vàlid."; + Text[ thai ] = "เวลา (ในวินาที) ที่ลัà¸à¸©à¸“ะเป็นà¸à¸²à¸£à¹€à¸«à¸¥à¸·à¸à¸à¸¢à¸¹à¹ˆà¸—ี่ถูà¸à¸•à¹‰à¸à¸‡"; }; String 6 // Name of Parameter 3 { @@ -37054,10 +38243,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Profiel2"; Text[ chinese_simplified ] = "style2"; Text[ greek ] = "Ðñüôõðï2"; - Text[ korean ] = "템플릿2"; + Text[ korean ] = "스타ì¼2"; Text[ turkish ] = "Biçim2"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil2"; + Text[ thai ] = "ลัà¸à¸©à¸“ะ2"; }; String 7 // Description of Parameter 3 { @@ -37067,7 +38257,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il modello da assegnare dopo che il tempo è trascorso." ; Text [ portuguese_brazilian ] = "Die Vorlage, die nach Ablauf der Zeit zugewiesen wird." ; Text [ portuguese ] = "é o estilo a ser aplicado depois de terminado o tempo." ; - Text [ finnish ] = "Ajan umpeutumisen jälkeen käyttöön otettava tyyli." ; + Text [ finnish ] = "Ajan umpeutumisen jälkeen käyttöön otettava tyyli" ; Text [ danish ] = "Den typografi som tildeles efter at tiden er udløbet." ; Text [ french ] = "Le style à appliquer après écoulement de la durée fixée." ; Text [ swedish ] = "Formatmallen som tilldelas när tiden har gått ut." ; @@ -37075,7 +38265,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Estilo que se aplicará al transcurrir el tiempo asignado." ; Text [ english_us ] = "The Style to be applied after time expires." ; Text[ chinese_simplified ] = "在时间过期åŽè¦æŒ‡å®šçš„æ ·å¼ã€‚"; - Text[ russian ] = "Ñòèëü, êîòîðûé áóäåò íàçíà÷åí ïî èñòå÷åíèè óêàçàííîãî âðåìåíè."; + Text[ russian ] = "Ñòèëü, êîòîðûé áóäåò ïðèìåíåí ïî èñòå÷åíèè óêàçàííîãî âðåìåíè."; Text[ polish ] = "Szablon, który zostanie przydzielony po up³ywie czasu."; Text[ japanese ] = "有効時間ã®å¾Œã«é©ç”¨ã•ã‚Œã‚‹ã‚¹ã‚¿ã‚¤ãƒ«ã€‚"; Text[ chinese_traditional ] = "在時間éŽæœŸå¾Œè¦æŒ‡å®šçš„樣å¼ã€‚"; @@ -37083,10 +38273,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het opmaakprofiel dat na afloop van de tijd wordt toegewezen."; Text[ chinese_simplified ] = "在时间过期åŽè¦æŒ‡å®šçš„æ ·å¼ã€‚"; Text[ greek ] = "Ôï óôõë ðïõ èá åöáñìïóôåß ìåôÜ ôçí ëÞîç ôïõ ÷ñüíïõ."; - Text[ korean ] = "ì‹œê°„ì´ ê²½ê³¼ëœ í›„, í…œí”Œë¦¿ì´ ì ìš©ë©ë‹ˆë‹¤."; + Text[ korean ] = "ìœ íš¨ ì‹œê°„ì´ ì§€ë‚œ 후 ì ìš©ë˜ëŠ” 스타ì¼."; Text[ turkish ] = "Süre dolduktan sonra uygulanacak biçim."; - Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; + Text[ language_user1 ] = "All ; All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; Text[ catalan ] = "Estil que s'ha d'aplicar després que expiri el temps."; + Text[ thai ] = "ใช้ลัà¸à¸©à¸“ะหลังเวลาหมดà¸à¸²à¸¢à¸¸"; }; }; // -=*# Resource for function DDE #*=- @@ -37101,7 +38292,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Risultato di un collegamento DDE." ; Text [ portuguese_brazilian ] = "Ergebnis einer DDE-Verkn?fung." ; Text [ portuguese ] = "Resultado de uma ligação DDE." ; - Text [ finnish ] = "DDE-linkin tulos." ; + Text [ finnish ] = "DDE-linkin tulos" ; Text [ danish ] = "Resultatet af en DDE-kæde." ; Text [ french ] = "Résultat d'un lien DDE." ; Text [ swedish ] = "Resultatet av en DDE-länkning." ; @@ -37109,7 +38300,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Resultado de un vínculo DDE." ; Text [ english_us ] = "Result of a DDE link." ; Text[ chinese_simplified ] = "一个 DDE 链接的结果。"; - Text[ russian ] = "Ðåçóëüòàò ñâÿçè DDE."; + Text[ russian ] = "Âîçâðàùàåò çíà÷åíèå DDE-ñâÿçè."; Text[ polish ] = "Rezultat ³¹cza DDE."; Text[ japanese ] = "DDE リンクã®çµæžœ"; Text[ chinese_traditional ] = "一個 DDE 連çµçš„çµæžœã€‚"; @@ -37121,6 +38312,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "DDE baðlantýsýnýn sonucu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Resultat d'un enllaç DDE."; + Text[ thai ] = "ผลลัพธ์à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚ยง DDE "; }; ExtraData = { @@ -37156,6 +38348,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sunucu"; Text[ language_user1 ] = " "; Text[ catalan ] = "servidor"; + Text[ thai ] = "เซิร์ฟเวà¸à¸£à¹Œ"; }; String 3 // Description of Parameter 1 { @@ -37165,11 +38358,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il nome dell'applicazione Server." ; Text [ portuguese_brazilian ] = "Der Name der Server-Applikation." ; Text [ portuguese ] = "é o nome da aplicação do servidor." ; - Text [ finnish ] = "Palvelinsovelluksen nimi." ; + Text [ finnish ] = "Palvelinsovelluksen nimi" ; Text [ danish ] = "Server-applikationens navn." ; Text [ french ] = "Le nom de l'application du serveur" ; Text [ swedish ] = "Namnet på servertillämpningen." ; - Text [ dutch ] = "De naam van de server-applicatie." ; + Text [ dutch ] = "De naam van de server-toepassing." ; Text [ spanish ] = "nombre de la aplicación del servidor." ; Text [ english_us ] = "The name of the server application." ; Text[ chinese_simplified ] = "æœåŠ¡å™¨åº”用程åºçš„å称。"; @@ -37178,13 +38371,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "サーãƒãƒ¼ã‚¢ãƒ—リケーションã®åå‰ã€‚"; Text[ chinese_traditional ] = "伺æœå™¨æ‡‰ç”¨ç¨‹å¼å稱。"; Text[ arabic ] = "ÇÓã ÊØÈíÞ ÇáãÒæøÏ."; - Text[ dutch ] = "De naam van de server-applicatie."; + Text[ dutch ] = "De naam van de server-toepassing."; Text[ chinese_simplified ] = "æœåŠ¡å™¨åº”用程åºçš„å称。"; Text[ greek ] = "Ôï üíïìá ôçò åöáñìïãÞò ôïõ äéáêïìéóôÞ."; Text[ korean ] = "서버 ì‘ìš© í”„ë¡œê·¸ëž¨ì˜ ì´ë¦„입니다."; Text[ turkish ] = "Sunucu uygulamasýnýn adý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nom de l'aplicació del servidor."; + Text[ thai ] = "ชื่à¸à¹‚ปรà¹à¸à¸£à¸¡à¸›à¸£à¸°à¸¢à¸¸à¸à¸•à¹Œà¸‚à¸à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ"; }; String 4 // Name of Parameter 2 { @@ -37214,6 +38408,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dosya"; Text[ language_user1 ] = " "; Text[ catalan ] = "Fitxer"; + Text[ thai ] = "à¹à¸Ÿà¹‰à¸¡"; }; String 5 // Description of Parameter 2 { @@ -37223,7 +38418,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Nome del file." ; Text [ portuguese_brazilian ] = "Der Name der Datei." ; Text [ portuguese ] = "é o nome do ficheiro." ; - Text [ finnish ] = "Tiedoston nimi." ; + Text [ finnish ] = "Tiedoston nimi" ; Text [ danish ] = "Filens navn." ; Text [ french ] = "Le nom du fichier." ; Text [ swedish ] = "Namnet på filen." ; @@ -37243,6 +38438,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dosya adý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nom del fitxer."; + Text[ thai ] = "ชื่à¸à¹à¸Ÿà¹‰à¸¡"; }; String 6 // Name of Parameter 3 { @@ -37268,10 +38464,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "range"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "ì˜ì—"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea"; + Text[ thai ] = "ช่วง"; }; String 7 // Description of Parameter 3 { @@ -37289,7 +38486,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "área de celdas de la que se deben leer datos." ; Text [ english_us ] = "The range from which data is to be taken." ; Text[ chinese_simplified ] = "è¦è¯»å–æ•°æ®çš„区域。"; - Text[ russian ] = "Äèàïàçîí ÿ÷ååê, èç êîòîðîãî äîëæíû áûòü ïðî÷èòàíû äàííûå ."; + Text[ russian ] = "Äèàïàçîí ÿ÷ååê, èç êîòîðîãî äîëæíû áûòü âçÿòû äàííûå ."; Text[ polish ] = "Zakres, z którego maj¹ byæ odczytane dane."; Text[ japanese ] = "データãŒèªã¿å–られる範囲。"; Text[ chinese_traditional ] = "è¦è®€å‡ºçš„數據å€åŸŸã€‚"; @@ -37297,10 +38494,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het bereik waaruit de gegevens moeten worden gelezen."; Text[ chinese_simplified ] = "è¦è¯»å–æ•°æ®çš„区域。"; Text[ greek ] = "Ç ðåñéï÷Þ áíÜãíùóçò äåäïìÝíùí"; - Text[ korean ] = "ë°ì´í„°ë¥¼ ì½ì–´ì˜¬ 범위입니다."; + Text[ korean ] = "ë°ì´í„°ê°€ ì½ì–´ì§ˆ 범위입니다."; Text[ turkish ] = "Verilerin alýndýðý aralýk."; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrea des de la qual s'han de prendre les dades."; + Text[ thai ] = "ช่วงจาà¸à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่ได้"; }; String 8 // Name of Parameter 4 { @@ -37329,6 +38527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "mode"; Text[ finnish ] = "tila"; + Text[ thai ] = "โหมด"; }; String 9 // Description of Parameter 4 { @@ -37342,14 +38541,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Definisce come i dati vengono convertiti in numeri." ; Text [ spanish ] = "Define cómo los datos se convierten en números." ; Text [ french ] = "Définit comment convertir les données en nombres." ; - Text [ dutch ] = "Definieert, hoe de gegevens worden veranderd in getallen." ; + Text [ dutch ] = "Definieert, hoe de gegevens worden gewijzigd in getallen." ; Text[ chinese_simplified ] = "定义数æ®å¦‚何转æ¢æˆæ•°å—。"; Text[ russian ] = "Îïðåäåëÿåò ñïîñîá ïðåîáðàçîâàíèÿ äàííûõ â ÷èñëà."; Text[ polish ] = "Okreœla, jak zamieniaæ dane w liczby."; Text[ japanese ] = "データãŒã©ã®ã‚ˆã†ã«æ•°å€¤ã«å¤‰æ›ã•ã‚Œã‚‹ã‹ã®å®šç¾©ã€‚"; Text[ chinese_traditional ] = "定義數據如何轉æ›æˆæ•¸å—。"; Text[ arabic ] = "ÊÍÏÏ ßíÝíÉ ÊÍæíá ÇáÈíÇäÇÊ Åáì ÃÑÞÇã."; - Text[ dutch ] = "Definieert, hoe de gegevens worden veranderd in getallen."; + Text[ dutch ] = "Definieert, hoe de gegevens worden gewijzigd in getallen."; Text[ chinese_simplified ] = "定义数æ®å¦‚何转æ¢æˆæ•°å—。"; Text[ greek ] = "Êáèïñßæåé ôïí ôñüðï ìå ôïí ïðïßï èá ãßíåé ç ìåôáôñïðÞ ôùí äåäïìÝíùí óå áñéèìïýò"; Text[ korean ] = "어떻게 ë°ì´í„°ê°€ 숫ìžë¡œ 변환ë˜ëŠ”지 ì •ì˜í•˜ì‹ì‹œì˜¤."; @@ -37357,6 +38556,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Especifica de quina manera s'han de convertir les dades en nombres."; Text[ finnish ] = "Määrittää, miten tiedot muunnetaan luvuiksi."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ว่าà¹à¸›à¸¥à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹€à¸›à¹‡à¸™à¸•à¸±à¸§à¹€à¸¥à¸‚à¸à¸¢à¹ˆà¸²à¸‡à¹„ร"; }; }; // -=*# Resource for function CODE #*=- @@ -37390,6 +38590,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metnin ilk karakterinin kodunu verir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna un codi numèric per al primer caràcter d'una cadena de text."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸£à¸«à¸±à¸ªà¸•à¸±à¸§à¹€à¸¥à¸‚สำหรับตัวà¸à¸±à¸à¸‚ระตัวà¹à¸£à¸à¹ƒà¸™à¸ªà¸²à¸¢à¸à¸±à¸à¸‚ระข้à¸à¸„วาม"; }; ExtraData = { @@ -37425,6 +38626,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -37455,6 +38657,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýlk karakterinin kodu bulunacak metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "D'aquest text s'ha de trobar el codi del primer caràcter."; + Text[ thai ] = "นี้คืà¸à¸‚้à¸à¸„วามที่ไม่พบรหัสขà¸à¸‡à¸•à¸±à¸§à¸à¸±à¸à¸‚ระตัวà¹à¸£à¸"; }; }; // -=*# Resource for function DM #*=- @@ -37477,7 +38680,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Convierte un número en texto usando un formato monetario" ; Text [ english_us ] = "Converts a number to text in currency format." ; Text[ chinese_simplified ] = "转æ¢æ–‡å—ä¸çš„æ•°å—æˆä¸€ä¸ªè´§å¸æ ¼å¼ã€‚"; - Text[ russian ] = "Ïðåîáðàçóåò ÷èñëîâîå çíà÷åíèå â òåêñò â äåíåæíîì ôîðìàòå."; + Text[ russian ] = "Ïðåîáðàçóåò ÷èñëî â ÷èñëî â äåíåæíîì ôîðìàòå, ñ îêðóãëåíèåì äî îïðåäåë¸ííîãî çíàêà ïîñëå çàïÿòîé."; Text[ polish ] = "Przekszta³ca liczbê na tekst w formacie walutowym."; Text[ japanese ] = "数値を通貨書å¼ã®æ–‡å—列ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "轉æ›æ–‡æœ¬ä¸çš„數å—æˆä¸€å€‹è²¨å¹£æ ¼å¼ã€‚"; @@ -37485,10 +38688,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Converteert een getal naar tekst op basis van de valutanotatie."; Text[ chinese_simplified ] = "转æ¢æ–‡å—ä¸çš„æ•°å—æˆä¸€ä¸ªè´§å¸æ ¼å¼ã€‚"; Text[ greek ] = "ÌåôáôñÝðåé ìéá áñéèìçôéêÞ ôéìÞ óå Ýíá êåßìåíï ìå íïìéóìáôéêÞ ìïñöÞ."; - Text[ korean ] = "통화 형ì‹ì—ì„œ ìˆ˜ê°’ì„ í…스트로 변환"; + Text[ korean ] = "통화 ì„œì‹ì—ì„œ 숫ìžë¥¼ í…스트로 변환합니다."; Text[ turkish ] = "Sayý deðerini, para birimi formatýndaki bir metne dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un nombre en text en format de moneda."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚เป็นข้à¸à¸„วามในรูปà¹à¸šà¸šà¸ªà¸à¸¸à¸¥à¹€à¸‡à¸´à¸™"; }; ExtraData = { @@ -37524,6 +38728,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -37542,7 +38747,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un número, una referencia a una celda que contiene un número o una fórmula que evalúa un número." ; Text [ english_us ] = "Value is a number, a reference to a cell containing a number or a formula that results in a number." ; Text[ chinese_simplified ] = "是一个数å—，一个å«æœ‰æ•°å—çš„å•å…ƒæ ¼å¼•ç”¨ï¼Œ\n或者是一个计算数å—çš„å…¬å¼ã€‚"; - Text[ russian ] = "×èñëî ëèáî ññûëêà íà ÿ÷åéêó, ñîäåðæàùóþ ÷èñëî, ëèáî ôîðìóëà, âû÷èñëåíèå ïî êîòîðîé äàåò ÷èñëî."; + Text[ russian ] = "Çíà÷åíèå - ëèáî ÷èñëî, ëèáî ññûëêà íà ÿ÷åéêó, ñîäåðæàùóþ ÷èñëî, ëèáî ôîðìóëà, âû÷èñëåíèå ïî êîòîðîé äàåò ÷èñëî."; Text[ polish ] = "Wartoœæ jest liczb¹, odwo³aniem do komórki, która zawiera liczbê lub równaniem, którego wynikiem jest liczba."; Text[ japanese ] = "数値ã‚ã‚‹ã„ã¯æ•°å€¤ãŒå…¥åŠ›ã•ã‚Œã¦ã„るセルå‚照。"; Text[ chinese_traditional ] = "是一個數å—ï¹ä¸€å€‹å«æœ‰æ•¸å—的儲å˜æ ¼åƒç…§ï¹æˆ–者是一個計算數å—çš„å…¬å¼ã€‚"; @@ -37553,7 +38758,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ korean ] = "ê°’ì´ëž€ 수, 수를 í¬í•¨í•˜ëŠ” ì…€ì— ëŒ€í•œ 참조 ë˜ëŠ” ê·¸ 결과가 ìˆ˜ì¸ ìˆ˜ì‹ì„ ë§í•©ë‹ˆë‹¤."; Text[ turkish ] = "Deðer, bir sayý, sayý içeren bir hücre referansý ya da sayý veren bir formüldür."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor és un nombre, una referència a una cel·la que conté un nombre o a una fórmula que torna un nombre."; + Text[ catalan ] = "Valor és un nombre, una referència a una cel.la que conté un nombre o a una fórmula que torna un nombre."; + Text[ thai ] = "ค่าเป็นตัวเลข à¸à¹‰à¸²à¸‡à¸–ึงเซลล์ที่มีตัวเลขหรืà¸à¸ªà¸¹à¸•à¸£à¸§à¹ˆà¸²à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œà¹ƒà¸™à¸ˆà¸³à¸™à¸§à¸™à¸«à¸™à¸¶à¹ˆà¸‡"; }; String 4 // Name of Parameter 2 { @@ -37571,7 +38777,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "núm_de_decimales" ; Text [ english_us ] = "decimals" ; Text[ chinese_simplified ] = "decimals"; - Text[ russian ] = "Äåñ_öèôðû"; + Text[ russian ] = "Êîëè÷åñòâî ðàçðÿäîâ"; Text[ polish ] = "Dziesiêtne"; Text[ japanese ] = "å°æ•°ä½"; Text[ chinese_traditional ] = "decimals"; @@ -37583,6 +38789,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ondalýk haneler"; Text[ language_user1 ] = " "; Text[ catalan ] = "decimals"; + Text[ thai ] = "ทศนิยม"; }; String 5 // Description of Parameter 2 { @@ -37592,7 +38799,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di cifre a destra della virgola decimale." ; Text [ portuguese_brazilian ] = "Dezimalstellen. Ist die Anzahl der Ziffern rechts vom Dezimalkomma." ; Text [ portuguese ] = "é o número de dígitos à direita da vírgula decimal." ; - Text [ finnish ] = "Desimaaleja! Määrittää pilkun jälkeisten desimaalien määrän." ; + Text [ finnish ] = "Desimaaleja Määrittää pilkun jälkeisten desimaalien määrän." ; Text [ danish ] = "Decimaler. Antallet af cifre til højre for decimaltegnet." ; Text [ french ] = "Décimales. Représente le nombre de chiffres à droite de la virgule." ; Text [ swedish ] = "Decimaler. Är antalet siffror till höger om decimalkommat." ; @@ -37600,7 +38807,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de dígitos a la derecha del separador decimal." ; Text [ english_us ] = "Decimal places. Denotes the number of digits to the right of the decimal point." ; Text[ chinese_simplified ] = "å°æ•°ç‚¹ä½æ•°ã€‚是å°æ•°ç‚¹å³è¾¹çš„ä½æ•°ã€‚"; - Text[ russian ] = "Êîëè÷åñòâî öèôð ñïðàâà îò äåñÿòè÷íîé çàïÿòîé."; + Text[ russian ] = "Äåñÿòè÷íûå ðàçðÿäû. Óêàçûâàåò êîëè÷åñòâî ñèìâîëîâ ïîñëå çàïÿòîé."; Text[ polish ] = "Jest liczb¹ cyfr na prawo od przecinka."; Text[ japanese ] = "å°æ•°ç‚¹ä»¥ä¸‹ã®æ¡æ•°ã€‚"; Text[ chinese_traditional ] = "å°æ•¸é»žä½æ•¸ã€‚是å°æ•¸é»žå³é‚Šçš„ä½æ•¸ã€‚"; @@ -37608,10 +38815,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Decimalen. Is het aantal decimalen rechts van de decimale komma."; Text[ chinese_simplified ] = "å°æ•°ç‚¹ä½æ•°ã€‚是å°æ•°ç‚¹å³è¾¹çš„ä½æ•°ã€‚"; Text[ greek ] = "ÈÝóåéò äåêáäéêþí. Åßíáé ôï ðëÞèïò ôùí øçößùí äåîéÜ áðü ôï êüììá äåêáäéêïý."; - Text[ korean ] = "소수ì ìžë¦¬. 소수ì 으로부터 ì˜¤ë¥¸ìª½ì— ìžˆëŠ” 숫ìžì˜ 개수입니다."; + Text[ korean ] = "소수ì ì´í•˜ ìžë¦¿ìˆ˜. 소수ì 으로부터 ì˜¤ë¥¸ìª½ì— ìœ„ì¹˜í•œ 숫ìžì˜ 개수입니다."; Text[ turkish ] = "Ondalýk haneler. Virgülün saðýndaki hanelerin sayýsýdýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de decimals. Indica el nombre de d?gits a la dreta de la coma decimal."; + Text[ thai ] = "จุดทศนิยม ใช้à¹à¸—นตัวเลขที่ขวามืà¸à¸‚à¸à¸‡à¸ˆà¸¸à¸”ทศนิยม"; }; }; // -=*# Resource for function ZEICHEN #*=- @@ -37629,22 +38837,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Konverterer en kode til et tegn eller bogstav." ; Text [ french ] = "Convertit un code numérique en caractère ou lettre." ; Text [ swedish ] = "Omvandlar ett kodtal till ett tecken eller bokstav." ; - Text [ dutch ] = "Verandert een codegetal in een teken of letter." ; + Text [ dutch ] = "Wijzigt een codegetal in een teken of letter." ; Text [ spanish ] = "Transforma un código número en un carácter." ; Text [ english_us ] = "Converts a code number into a character or letter." ; Text[ chinese_simplified ] = "将数å—代ç 转化æˆå—符。"; - Text[ russian ] = "Ïðåîáðàçóåò êîäîâîå ÷èñëî â ñèìâîë èëè áóêâó."; + Text[ russian ] = "Ïðåîáðàçóåò ÷èñëî â ñèìâîë."; Text[ polish ] = "Zamienia liczbê kodu w znak lub literê."; Text[ japanese ] = "コード番å·ã«è©²å½“ã™ã‚‹æ–‡å—ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將數å—代碼轉化æˆå—元。"; Text[ arabic ] = "ÊÍæá ÑÞã ßæÏí Åáì ÑãÒ Ãæ ÍÑÝ."; - Text[ dutch ] = "Verandert een codegetal in een teken of letter."; + Text[ dutch ] = "Wijzigt een codegetal in een teken of letter."; Text[ chinese_simplified ] = "将数å—代ç 转化æˆå—符。"; Text[ greek ] = "ÌåôáôñÝðåé Ýíáí áñéèìü êùäéêïý óå Ýíá ÷áñáêôÞñá Þ Ýíá ãñÜììá ôïõ áëöÜâçôïõ."; Text[ korean ] = "코드 번호를 문ìžë¡œ 변환"; Text[ turkish ] = "Kod sayýsýný karakter ya da harfe dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un nombre de codi en un caràcter o lletra."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¹€à¸¥à¸‚รหัสเป็นตัวà¸à¸±à¸à¸‚ระหรืà¸à¸•à¸±à¸§à¸à¸±à¸à¸©à¸£"; }; ExtraData = { @@ -37680,6 +38889,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -37690,7 +38900,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il codice per il carattere" ; Text [ portuguese_brazilian ] = "Der Codewert f? das Zeichen" ; Text [ portuguese ] = "é um número entre 1 e 255 que especifica o carácter desejado." ; - Text [ finnish ] = "Merkin koodiarvo." ; + Text [ finnish ] = "Merkin koodiarvo" ; Text [ danish ] = "Tegnets kodeværdi" ; Text [ french ] = "Valeur codée pour le caractère" ; Text [ swedish ] = "Kodvärdet för tecknet." ; @@ -37698,7 +38908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un número entre 1 y 255 que especifica el carácter deseado" ; Text [ english_us ] = "The code value for the character." ; Text[ chinese_simplified ] = "å—符的代ç 值。"; - Text[ russian ] = "×èñëî â èíòåðâàëå îò 1 äî 255, óêàçûâàþùåå íà íóæíûé ñèìâîë."; + Text[ russian ] = "Êîäîâîå çíà÷åíèå ñèìâîëà."; Text[ polish ] = "Wartoœæ kodu dla znaku"; Text[ japanese ] = "数値ã«ã¯è¿”ã—ãŸã„æ–‡å—を表ã™1ã‹ã‚‰255ã€ãŠã‚ˆã³8481ã‹ã‚‰39038ã¾ã§ã®æ•°å€¤ã‚’指定ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å—元的代碼值。"; @@ -37710,6 +38920,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karakterin kod deðeri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor de codi per al caràcter."; + Text[ thai ] = "ค่ารหัสสำหรับตัวà¸à¸±à¸à¸‚ระ"; }; }; // -=*# Resource for function SÄUBERN #*=- @@ -37729,7 +38940,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Supprime tous les caractères non-imprimables du texte." ; Text [ swedish ] = "Raderar tecken som inte kan skrivas ut från en text." ; Text [ dutch ] = "Verwijdert niet-afdrukbare tekens uit de tekst." ; - Text [ spanish ] = "Elimina del texto caracteres no imprimibles." ; + Text [ spanish ] = "Borra todos los caracteres no imprimibles del texto." ; Text [ english_us ] = "Removes all nonprintable characters from text." ; Text[ chinese_simplified ] = "åˆ é™¤æ–‡å—ä¸ä¸èƒ½æ‰“å°çš„å—符。"; Text[ russian ] = "Óäàëÿåò èç òåêñòà âñå íåïå÷àòàåìûå ñèìâîëû."; @@ -37740,10 +38951,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Verwijdert niet-afdrukbare tekens uit de tekst."; Text[ chinese_simplified ] = "åˆ é™¤æ–‡å—ä¸ä¸èƒ½æ‰“å°çš„å—符。"; Text[ greek ] = "ÄéáãñÜöåé áðü ôï êåßìåíï ôïõò ÷áñáêôÞñåò ïé ïðïßïé äåí åßíáé äõíáôüí íá åêôõðùèïýí."; - Text[ korean ] = "í…스트ì—ì„œ ë‹¨ë½ ê¸°í˜¸ 표시 ì‚ì œ"; + Text[ korean ] = "ì¸ì‡„í• ìˆ˜ 없는 문ìžë¥¼ 문ìžì—´ë¡œë¶€í„° ì œê±°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Yazdýrýlamayan karakterleri metinden siler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Suprimeix del text tots els caràcters no imprimibles."; + Text[ thai ] = "เà¸à¸²à¸•à¸±à¸§à¸à¸±à¸à¸‚ระที่ไม่สามารถพิมพ์ได้ทั้งหมดà¸à¸à¸à¸ˆà¸²à¸à¸‚้à¸à¸„วาม"; }; ExtraData = { @@ -37779,6 +38991,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -37793,7 +39006,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Le texte dont vous voulez supprimer les caractères non-imprimables." ; Text [ swedish ] = "Texten från vilken tecknen, som inte kan skrivas ut, tas bort." ; Text [ dutch ] = "De tekst waaruit de niet-afdrukbare tekens worden verwijderd." ; - Text [ spanish ] = "Es el texto del que se eliminan los caracteres no imprimibles." ; + Text [ spanish ] = "Es el texto del que se borran los caracteres no imprimibles." ; Text [ english_us ] = "The text from which nonprintable characters are to be removed." ; Text[ chinese_simplified ] = "è¦ä»Žä¸åˆ é™¤æ— æ³•æ‰“å°å—符的文å—。"; Text[ russian ] = "Òåêñò, èç êîòîðîãî óäàëÿþòñÿ íåïå÷àòàåìûå ñèìâîëû."; @@ -37804,10 +39017,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De tekst waaruit de niet-afdrukbare tekens worden verwijderd."; Text[ chinese_simplified ] = "è¦ä»Žä¸åˆ é™¤æ— æ³•æ‰“å°å—符的文å—。"; Text[ greek ] = "Ôï êåßìåíï áðü ôï ïðïßï èá áðïìáêñõíèïýí ïé ÷áñáêôÞñåò ðïõ äåí åßíáé äõíáôüí íá åêôõðùèïýí."; - Text[ korean ] = "ë‹¨ë½ ê¸°í˜¸ 표시를 ì‚ì œí•´ì•¼ 하는 í…스트"; + Text[ korean ] = "ì¸ì‡„í• ìˆ˜ 없는 문ìžë¥¼ 문ìžì—´ì—ì„œ ì œê±°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Yazdýrýlamayan karakterlerin silineceði metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text els caràcters no imprimibles del qual s'han de suprimir."; + Text[ thai ] = "เà¸à¸²à¸•à¸±à¸§à¸à¸±à¸à¸‚ระที่ไม่สามารถพิมพ์ได้à¸à¸à¸à¸ˆà¸²à¸à¸‚้à¸à¸„วาม"; }; }; // -=*# Resource for function VERKETTEN #*=- @@ -37829,7 +39043,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Agrupa varios textos en uno sólo." ; Text [ english_us ] = "Combines several text items into one." ; Text[ chinese_simplified ] = "将若干文å—串åˆå¹¶åˆ°ä¸€ä¸ªæ–‡å—串ä¸ã€‚"; - Text[ russian ] = "Îáúåäèíÿåò íåñêîëüêî òåêñòîâ â îäèí."; + Text[ russian ] = "Îáúåäèíÿåò íåñêîëüêî òåêñòîâûõ ýëåìåíòîâ â îäíó ñòðîêó."; Text[ polish ] = "£¹czy elementy tekstu w jeden."; Text[ japanese ] = "複数ã®æ–‡å—列を1ã¤ã«çµåˆã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將若干文å—串åˆä½µåˆ°ä¸€å€‹æ–‡å—串ä¸ã€‚"; @@ -37841,6 +39055,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metinleri tek bir metinde birleþtirir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Combina diversos elements de text en un."; + Text[ thai ] = "เชื่à¸à¸¡à¸«à¸¥à¸²à¸¢à¸‚้à¸à¸„วามเป็นหนึ่งข้à¸à¸„วาม"; }; ExtraData = { @@ -37856,26 +39071,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Testo " ; Text [ portuguese_brazilian ] = "Text " ; Text [ portuguese ] = "Texto " ; - Text [ finnish ] = "teksti" ; + Text [ finnish ] = "teksti " ; Text [ danish ] = "Tekst " ; Text [ french ] = "Texte " ; Text [ swedish ] = "text " ; - Text [ dutch ] = "Tekst " ; + Text [ dutch ] = "Tekst" ; Text [ spanish ] = "texto " ; Text [ english_us ] = "text " ; Text[ chinese_simplified ] = "text "; - Text[ russian ] = "Òåêñò "; + Text[ russian ] = "Òåêñò "; Text[ polish ] = "Tekst "; Text[ japanese ] = "æ–‡å—列 "; Text[ chinese_traditional ] = "text "; Text[ arabic ] = "ÇáäÕ "; - Text[ dutch ] = "Tekst "; + Text[ dutch ] = "Tekst"; Text[ chinese_simplified ] = "text "; Text[ greek ] = "Êåßìåíï "; Text[ korean ] = "í…스트 "; Text[ turkish ] = "Metin "; Text[ language_user1 ] = " "; Text[ catalan ] = "text "; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -37886,7 +39102,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Testo da unire." ; Text [ portuguese_brazilian ] = "Text f? die Textverkettung." ; Text [ portuguese ] = "é 1 de 30 textos a serem agrupados num único." ; - Text [ finnish ] = "Yhdistettävä teksti." ; + Text [ finnish ] = "Yhdistettävä teksti" ; Text [ danish ] = "Tekst som skal sammenkædes." ; Text [ french ] = "Élément de texte pour la concaténation." ; Text [ swedish ] = "Text för textlänkningen." ; @@ -37894,7 +39110,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Texto 1; texto 2 ;...son los textos que se agruparán en uno sólo." ; Text [ english_us ] = "Text for the concatentation." ; Text[ chinese_simplified ] = "是将è¦åˆå¹¶çš„å—串。"; - Text[ russian ] = "Òåêñò 1; òåêñò 2;...îò 1 äî 30 ýëåìåíòîâ òåêñòà, îáúäèíÿåìûõ â îäèí ýëåìåíò òåêñòà."; + Text[ russian ] = "Òåêñò äëÿ îáúåäèíåíèÿ."; Text[ polish ] = "Od 1 do 30 ci¹gów znaków, które maj¹ byæ po³¹czone w jeden ci¹g."; Text[ japanese ] = "çµåˆã™ã‚‹æ–‡å—列。"; Text[ chinese_traditional ] = "是將è¦åˆä½µçš„å—串。"; @@ -37906,6 +39122,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin birleþtirmesi ile ilgili metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text per a la concatenació."; + Text[ thai ] = "ข้à¸à¸„วามสำหรับ concatentation"; }; }; // -=*# Resource for function IDENTISCH #*=- @@ -37919,7 +39136,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Stabilisce se due testi sono uguali." ; Text [ portuguese_brazilian ] = "Gibt an, ob zwei Texte gleich sind" ; Text [ portuguese ] = "Compara se dois textos são iguais, indicando VERDADEIRO no caso de o serem; FALSO no caso contrário." ; - Text [ finnish ] = "Määrittää ovatko kaksi tekstiä identtiset." ; + Text [ finnish ] = "Määrittää, ovatko kaksi tekstiä identtiset." ; Text [ danish ] = "Kontrollerer, om to tekster er identiske." ; Text [ french ] = "Indique si deux textes sont identiques." ; Text [ swedish ] = "Anger om två texter är lika." ; @@ -37927,7 +39144,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Compara si dos textos son idénticos" ; Text [ english_us ] = "Specifies whether two texts are identical." ; Text[ chinese_simplified ] = "比较两个å—符串是å¦ç›¸åŒã€‚"; - Text[ russian ] = "Ïðîâåðÿåò èäåíòè÷íîñòü äâóõ òåêñòîâ."; + Text[ russian ] = "Ñðàâíèâàåò äâå òåêñòîâûå ñòðîêè, è ïðèñâàèâàåò ÈÑÒÈÍÀ, åñëè îíè îäèíàêîâû, è ËÎÆÜ, åñëè ñòðîêè ðàçëè÷àþòñÿ."; Text[ polish ] = "Podaje, czy dwa teksty s¹ identyczne."; Text[ japanese ] = "2ã¤ã®æ–‡å—列ãŒåŒã˜ã‹ã©ã†ã‹ã‚’検査ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "比較兩個å—元串是å¦ç›¸åŒã€‚"; @@ -37939,6 +39156,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýki metnin ayný olup olmadýðýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Indica si dos texts són idèntics."; + Text[ thai ] = "ระบุว่าข้à¸à¸„วามสà¸à¸‡à¸‚้à¸à¸„วามเหมืà¸à¸™à¸à¸±à¸™"; }; ExtraData = { @@ -37962,7 +39180,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "texto_1" ; Text [ english_us ] = "text_1" ; Text[ chinese_simplified ] = "text_1"; - Text[ russian ] = "Òåêñò_1"; + Text[ russian ] = "Òåêñò 1"; Text[ polish ] = "Tekst_1"; Text[ japanese ] = "æ–‡å—列 1"; Text[ chinese_traditional ] = "text_1"; @@ -37974,6 +39192,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin_1"; Text[ language_user1 ] = " "; Text[ catalan ] = "text_1"; + Text[ thai ] = "ข้à¸à¸„วาม_1"; }; String 3 // Description of Parameter 1 { @@ -37984,7 +39203,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il primo testo per il confronto." ; Text [ portuguese_brazilian ] = "Der erste Text f? den Textvergleich." ; Text [ portuguese ] = "é o primeiro texto para a comparação." ; - Text [ finnish ] = "Ensimmäinen tekstien vertailussa käytettävä teksti." ; + Text [ finnish ] = "Ensimmäinen tekstien vertailussa käytettävä teksti" ; Text [ danish ] = "Den første tekst til sammenligning." ; Text [ french ] = "Le premier texte pour la comparaison." ; Text [ swedish ] = "Den första texten för textjämförelsen." ; @@ -38004,6 +39223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karþýlaþtýrma için kullanýlacak birinci metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Primer text que s'ha d'utilitzar per comparar texts."; + Text[ thai ] = "ใช้ข้à¸à¸„วามà¹à¸£à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบข้à¸à¸„วาม"; }; String 4 // Name of Parameter 2 { @@ -38021,7 +39241,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "texto_2" ; Text [ english_us ] = "text_2" ; Text[ chinese_simplified ] = "text_2"; - Text[ russian ] = "Òåêñò_2"; + Text[ russian ] = "Òåêñò 2"; Text[ polish ] = "Tekst_2"; Text[ japanese ] = "æ–‡å—列 2"; Text[ chinese_traditional ] = "text_2"; @@ -38033,6 +39253,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin_2"; Text[ language_user1 ] = " "; Text[ catalan ] = "text_2"; + Text[ thai ] = "ข้à¸à¸„วาม_2"; }; String 5 // Description of Parameter 2 { @@ -38043,7 +39264,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il secondo testo per il confronto." ; Text [ portuguese_brazilian ] = "Der zweite Text f? den Textvergleich." ; Text [ portuguese ] = "é o segundo texto para a comparação." ; - Text [ finnish ] = "Toinen tekstien vertailussa käytettävä teksti." ; + Text [ finnish ] = "Toinen tekstien vertailussa käytettävä teksti" ; Text [ danish ] = "Den anden tekst til sammenligning." ; Text [ french ] = "Le deuxième texte pour la comparaison." ; Text [ swedish ] = "Den andra texten för textjämförelsen." ; @@ -38063,6 +39284,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karþýlaþtýrma için kullanýlacak ikinci metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Segon text per comparar texts."; + Text[ thai ] = "ข้à¸à¸„วามที่สà¸à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบข้à¸à¸„วาม"; }; }; // -=*# Resource for function FINDEN #*=- @@ -38077,7 +39299,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Cerca una parola (o una sua parte) in un testo tenendo in conto le maiuscole/minuscole." ; Text [ portuguese_brazilian ] = "Sucht ein Teilwort in einem Text unter Ber?ksichtigung von Gro?- und Kleinschreibung." ; Text [ portuguese ] = "Procura um texto dentro de um outro texto, distinguindo as maiúsculas e as minúsculas." ; - Text [ finnish ] = "Etsii merkkijonoa tekstistä (kirjainkoon erottelu)" ; + Text [ finnish ] = "Etsii merkkijonoa tekstistä (kirjainkoon erottelu)." ; Text [ danish ] = "Finder en tekststreng i en tekst (skelner mellem store og små bogstaver)." ; Text [ french ] = "Recherche une chaîne de texte dans un texte en respectant la casse (majuscules et minuscules)." ; Text [ swedish ] = "Söker efter en textsträng i en text (versalkänslig)." ; @@ -38085,7 +39307,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Busca un valor de texto dentro de otro tomando en cuenta las mayúsculas y minúsculas." ; Text [ english_us ] = "Looks for a string of text within another (case sensitive)" ; Text[ chinese_simplified ] = "以区分大å°å†™å—æ¯çš„æ–¹å¼åœ¨ä¸€ä¸ªå—串内查找æŸä¸€ä¸ªå—串。"; - Text[ russian ] = "Èùåò ÷àñòü ñëîâà â òåêñòå ñ ó÷åòîì ðåãèñòðà."; + Text[ russian ] = "Èùåò ÷àñòü òåêñòà â òåêñòå (ñ ó÷åòîì ðåãèñòðà)."; Text[ polish ] = "Wyszukuje czêœæ s³owa w tekœcie uwzglêdniaj¹c wielkie i ma³e litery."; Text[ japanese ] = "検査対象ã®æ–‡å—列ã®ä¸ã«ã‚ã‚‹ã€ç‰¹å®šã®æ–‡å—列ã®ä½ç½®ã‚’è¿”ã—ã¾ã™ã€‚アルファベットã®å¤§æ–‡å—ã¨å°æ–‡å—ãŒåŒºåˆ¥ã§ãã¾ã™ã€‚"; Text[ chinese_traditional ] = "以å€åˆ†å—æ¯å¤§å°å¯«çš„æ–¹å¼åœ¨ä¸€å€‹å—串內查找æŸä¸€å€‹å—串。"; @@ -38097,6 +39319,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin içinde sözcük parçalarý arar (büyük/küçük harf duyarlý)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Cerca una cadena de text dins d'una altra (distingeix entre majúscules i minúscules)"; + Text[ thai ] = "หาสายà¸à¸±à¸à¸‚ระขà¸à¸‡à¸‚้à¸à¸„วามในข้à¸à¸„วามà¸à¸·à¹ˆà¸™ (ตรงตามตัวพิมพ์ใหà¸à¹ˆ-เล็à¸)"; }; ExtraData = { @@ -38117,7 +39340,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Texte_cherché" ; Text [ swedish ] = "söktext" ; Text [ dutch ] = "Zoektekst" ; - Text [ spanish ] = "texto a buscar" ; + Text [ spanish ] = "texto buscado" ; Text [ english_us ] = "find_text" ; Text[ chinese_simplified ] = "find_text"; Text[ russian ] = "Íàéòè_òåêñò"; @@ -38128,10 +39351,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Zoektekst"; Text[ chinese_simplified ] = "find_text"; Text[ greek ] = "Êåßìåíï_áíáæÞôçóçò"; - Text[ korean ] = "찾기_í…스트"; + Text[ korean ] = "검색 문ìžì—´"; Text[ turkish ] = "Aranan metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "find_text"; + Text[ thai ] = "หา_ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -38141,7 +39365,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il testo che si desidera trovare." ; Text [ portuguese_brazilian ] = "Der Text, der gesucht wird." ; Text [ portuguese ] = "é o texto que se deseja localizar." ; - Text [ finnish ] = "Haettava teksti." ; + Text [ finnish ] = "Haettava teksti" ; Text [ danish ] = "Den tekst som søges." ; Text [ french ] = "Le texte que vous recherchez." ; Text [ swedish ] = "Texten som söks." ; @@ -38161,6 +39385,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Aranacak metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que s'ha de trobar."; + Text[ thai ] = "ไม่พบข้à¸à¸„วาม"; }; String 4 // Name of Parameter 2 { @@ -38190,6 +39415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 5 // Description of Parameter 2 { @@ -38199,7 +39425,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il testo in cui ricercare." ; Text [ portuguese_brazilian ] = "Der Text, in dem gesucht wird." ; Text [ portuguese ] = "é o texto que contém o texto que deseja localizar." ; - Text [ finnish ] = "Teksti, josta haetaan." ; + Text [ finnish ] = "Teksti, josta haetaan" ; Text [ danish ] = "Den tekst der skal søges i." ; Text [ french ] = "Le texte dans lequel effectuer la recherche." ; Text [ swedish ] = "Texten som det söks i." ; @@ -38219,6 +39445,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Arama yapýlacak metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text en què s'ha de fer la cerca."; + Text[ thai ] = "ทำà¸à¸²à¸£à¸„้นหาในข้à¸à¸„วาม"; }; String 6 // Name of Parameter 3 { @@ -38245,9 +39472,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Positie"; Text[ chinese_simplified ] = "start_num"; Text[ greek ] = "ÈÝóç"; - Text[ korean ] = "위치"; + Text[ korean ] = "시작 위치"; Text[ turkish ] = "Konum"; Text[ catalan ] = "posició"; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡"; }; String 7 // Description of Parameter 3 { @@ -38257,7 +39485,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La posizione del testo in corrispondenza del quale inizia la ricerca." ; Text [ portuguese_brazilian ] = "Die Position im Text, ab der gesucht wird" ; Text [ portuguese ] = "especifica a posição do texto a partir da qual será iniciada a procura." ; - Text [ finnish ] = "Haun aloituskohta tekstissä." ; + Text [ finnish ] = "Haun aloituskohta tekstissä" ; Text [ danish ] = "Den position i teksten søgningen skal starte fra." ; Text [ french ] = "La position dans le texte à partir de laquelle la recherche doit commencer." ; Text [ swedish ] = "Positionen i texten varifrån sökningen sker." ; @@ -38265,7 +39493,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica el carácter a partir del que comenzará la búsqueda" ; Text [ english_us ] = "The position in the text from which the search starts." ; Text[ chinese_simplified ] = "开始查找的起始å—符ä½ç½®ã€‚"; - Text[ russian ] = "Ïîçèöèÿ â òåêñòå, ñ êîòîðîé ñëåäóåò íà÷àòü ïîèñê."; + Text[ russian ] = "Ïîçèöèÿ â òåêñòå, ñ êîòîðîé íà÷èíàåòñÿ ïîèñê."; Text[ polish ] = "Pozycja w tekœcie, od której nast¹pi wyszukiwanie"; Text[ japanese ] = "æ–‡å—列ã§æ¤œç´¢ã™ã‚‹é–‹å§‹ä½ç½®ã€‚"; Text[ chinese_traditional ] = "開始查找的起始å—å…ƒä½ç½®ã€‚"; @@ -38277,6 +39505,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Aramanýn baþlatýlacaðý metin konumu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Posició en el text des de la qual s'inicia la cerca."; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡à¹ƒà¸™à¸‚้à¸à¸„วามจาà¸à¸—ี่เริ่มค้นหา"; }; }; // -=*# Resource for function SUCHEN #*=- @@ -38299,7 +39528,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Busca un valor de texto dentro de otro sin reconocer mayúsculas o minúsculas." ; Text [ english_us ] = "Looks for one text value within another (not case-sensitive)." ; Text[ chinese_simplified ] = "在å—串内查找å—符或å—串的ä½ç½®ï¼Œä¸åŒºåˆ†å—æ¯å¤§å°å†™ã€‚"; - Text[ russian ] = "Íàõîäèò ÷àñòü ñëîâà â òåêñòå áåç ó÷åòà ðåãèñòðà."; + Text[ russian ] = "Âîçâðàùàåò íîìåð ïîçèöèè ñåãìåíòà òåêñòà."; Text[ polish ] = "Znajduje wyst¹pienie tekstu w innym ³añcuchu tekstowym (nie rozró¿niaj¹c du¿ych i ma³ych liter)."; Text[ japanese ] = "検査対象ã®æ–‡å—列ã®ä¸ã«ã‚ã‚‹ã€ç‰¹å®šã®æ–‡å—列ã®ä½ç½®ã‚’è¿”ã—ã¾ã™ã€‚アルファベットã®å¤§æ–‡å—ã¨å°æ–‡å—ã¯åŒºåˆ¥ã•ã‚Œã¾ã›ã‚“。"; Text[ chinese_traditional ] = "在å—串內查找å—符或å—符串的ä½ç½®ï¼Œä¸å€åˆ†å—æ¯å¤§å°å¯«ã€‚"; @@ -38307,10 +39536,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Zoekt een tekenreeks in een tekst (er wordt geen onderscheid gemaakt tussen hoofdletters en kleine letters)."; Text[ chinese_simplified ] = "在å—串内查找å—符或å—串的ä½ç½®ï¼Œä¸åŒºåˆ†å—æ¯å¤§å°å†™ã€‚"; Text[ greek ] = "Áíáæçôåß Ýíá ôìÞìá åíüò êåéìÝíïõ ÷ùñßò íá äéáêñßíåé ìåôáîý êåöáëáßùí êáé ðåæþí."; - Text[ korean ] = "대/ì†Œë¬¸ìž êµ¬ë¶„ ì—†ì´ í…스트ì—ì„œ 반단어 찾기"; + Text[ korean ] = "검색 ëŒ€ìƒ ë¬¸ìžì—´ì—ì„œ íŠ¹ì • 문ìžì—´ì„ ì•ŒíŒŒë²³ì˜ ëŒ€ë¬¸ìž ë° ì†Œë¬¸ìž êµ¬ë¶„ì—†ì´ ì°¾ìŠµë‹ˆë‹¤."; Text[ turkish ] = "Metin içinde metin öðesi arar (Büyük/küçük harf duyarlý deðil)."; Text[ language_user1 ] = " "; Text[ catalan ] = "Cerca un valor de text dins d'un altre (no distingeix entre majúscules i minúscules)."; + Text[ thai ] = "หาค่าข้à¸à¸„วามหนึ่งในข้à¸à¸„วามà¸à¸·à¹ˆà¸™ (ไม่ตรงตามตัวพิมพ์ใหà¸à¹ˆ-เล็à¸)"; }; ExtraData = { @@ -38331,10 +39561,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Texte_cherché" ; Text [ swedish ] = "söktext" ; Text [ dutch ] = "Zoektekst" ; - Text [ spanish ] = "texto a buscar" ; + Text [ spanish ] = "texto buscado" ; Text [ english_us ] = "find_text" ; Text[ chinese_simplified ] = "find_text"; - Text[ russian ] = "Èñêîìûé òåêñò"; + Text[ russian ] = "Íàéòè_òåêñò"; Text[ polish ] = "Szukany_tekst"; Text[ japanese ] = "検索文å—列"; Text[ chinese_traditional ] = "find_text"; @@ -38342,10 +39572,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Zoektekst"; Text[ chinese_simplified ] = "find_text"; Text[ greek ] = "Êåßìåíï_áíáæÞôçóçò"; - Text[ korean ] = "검색 í…스트"; + Text[ korean ] = "검색 문ìžì—´"; Text[ turkish ] = "Aranan metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "find_text"; + Text[ thai ] = "หา_ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -38355,7 +39586,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il testo da trovare." ; Text [ portuguese_brazilian ] = "Der Text, der gesucht wird." ; Text [ portuguese ] = "é o texto que deseja localizar." ; - Text [ finnish ] = "Haettava teksti." ; + Text [ finnish ] = "Haettava teksti" ; Text [ danish ] = "Den tekst som søges." ; Text [ french ] = "Le texte que vous recherchez." ; Text [ swedish ] = "Texten som söks." ; @@ -38375,6 +39606,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Aranacak metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que s'ha de trobar."; + Text[ thai ] = "ไม่พบข้à¸à¸„วาม"; }; String 4 // Name of Parameter 2 { @@ -38404,6 +39636,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 5 // Description of Parameter 2 { @@ -38413,11 +39646,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il testo all'interno del quale si desidera effettuare la ricerca." ; Text [ portuguese_brazilian ] = "Der Text, in dem gesucht wird." ; Text [ portuguese ] = "é o texto que contém o texto que deseja localizar." ; - Text [ finnish ] = "Teksti, josta haetaan." ; + Text [ finnish ] = "Teksti, josta haetaan" ; Text [ danish ] = "Den tekst der skal søges i." ; Text [ french ] = "Le texte dans lequel effectuer la recherche." ; Text [ swedish ] = "Texten där det skall sökas." ; - Text [ dutch ] = "Der tekst waarin wordt gezocht." ; + Text [ dutch ] = "De tekst waarin wordt gezocht." ; Text [ spanish ] = "es el texto en el que se desea encontrar texto_buscado." ; Text [ english_us ] = "The text in which a search is to be made." ; Text[ chinese_simplified ] = "è¦åœ¨å…¶ä¸æŸ¥æ‰¾çš„å—串。"; @@ -38426,13 +39659,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "検索文å—列をå«ã‚€æ–‡å—列｡"; Text[ chinese_traditional ] = "è¦åœ¨å…¶ä¸æŸ¥æ‰¾çš„å—串。"; Text[ arabic ] = "ÇáäÕ ÇáÐí ÊÑíÏ ÇáÈÍË Ýíå."; - Text[ dutch ] = "Der tekst waarin wordt gezocht."; + Text[ dutch ] = "De tekst waarin wordt gezocht."; Text[ chinese_simplified ] = "è¦åœ¨å…¶ä¸æŸ¥æ‰¾çš„å—串。"; Text[ greek ] = "Ôï êåßìåíï ìÝóá óôï ïðïßï ãßíåôáé ç áíáæÞôçóç."; Text[ korean ] = "ê²€ìƒ‰ì´ í–‰í•´ì§€ëŠ” í…스트"; Text[ turkish ] = "Arama yapýlan metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text en què s'ha de fer la cerca."; + Text[ thai ] = "ทำà¸à¸²à¸£à¸„้นหาในข้à¸à¸„วาม"; }; String 6 // Name of Parameter 3 { @@ -38458,10 +39692,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Positie"; Text[ chinese_simplified ] = "start_num"; Text[ greek ] = "start_num"; - Text[ korean ] = "위치"; + Text[ korean ] = "시작 위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; Text[ catalan ] = "posició"; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡"; }; String 7 // Description of Parameter 3 { @@ -38471,7 +39706,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "La posizione del testo a partire dalla quale si desidera iniziare la ricerca." ; Text [ portuguese_brazilian ] = "Die Position im Text, ab der gesucht wird" ; Text [ portuguese ] = "especifica a posição do texto a partir da qual será iniciada a procura." ; - Text [ finnish ] = "Haun aloituskohta tekstissä." ; + Text [ finnish ] = "Haun aloituskohta tekstissä" ; Text [ danish ] = "Den position i teksten søgningen skal starte fra." ; Text [ french ] = "La position dans le texte à partir de laquelle la recherche doit commencer." ; Text [ swedish ] = "Positionen i texten där sökningen skall börja." ; @@ -38491,6 +39726,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Aramanýn baþlatýlacaðý metin konumu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Posició en el text on s'inicia la cerca."; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡à¹ƒà¸™à¸‚้à¸à¸„วามที่เริ่มค้นหา"; }; }; // -=*# Resource for function GLÄTTEN #*=- @@ -38510,7 +39746,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Supprime tous les espaces surperflus entre les mots." ; Text [ swedish ] = "Raderar alla överflödiga mellanslag mellan ord." ; Text [ dutch ] = "Verwijdert overbodige spaties tussen woorden." ; - Text [ spanish ] = "Elimina los espacios del texto, excepto el espacio normal que se deja entre palabras." ; + Text [ spanish ] = "Borra los espacios superfluos entre las palabras." ; Text [ english_us ] = "Removes extra spaces from text." ; Text[ chinese_simplified ] = "åˆ é™¤å—串ä¸çš„ç©ºæ ¼ã€‚"; Text[ russian ] = "Óäàëÿåò ëèøíèå ïðîáåëû ìåæäó ñëîâàìè."; @@ -38521,10 +39757,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Verwijdert overbodige spaties tussen woorden."; Text[ chinese_simplified ] = "åˆ é™¤å—串ä¸çš„ç©ºæ ¼ã€‚"; Text[ greek ] = "ÄéáãñÜöåé ðåñéôôÜ êåíÜ ìåôáîý ôùí ëÝîåùí."; - Text[ korean ] = "í…스트ì—ì„œ ì—¬ë¶„ì˜ ê³µë°±ì„ ì‚ì œ"; + Text[ korean ] = "ë¬¸ìž ì‚¬ì´ì˜ ì—¬ë¶„ì˜ ê³µë°±ì„ ì œê±°í•©ë‹ˆë‹¤."; Text[ turkish ] = "Sözcükler arasýndaki fazla boþluklarý siler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Elimina del text els espais extra."; + Text[ thai ] = "เà¸à¸²à¸Šà¹ˆà¸à¸‡à¸§à¹ˆà¸²à¸‡à¸—ี่เà¸à¸´à¸™à¸à¸à¸à¸ˆà¸²à¸à¸‚้à¸à¸„วาม"; }; ExtraData = { @@ -38560,6 +39797,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -38575,7 +39813,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Le texte dans lequel vous voulez supprimer les espaces superflus entre les mots." ; Text [ swedish ] = "Texten där överflödiga mellanslag mellan ord tas bort." ; Text [ dutch ] = "De tekst waarin overbodige spaties tussen woorden worden verwijderd." ; - Text [ spanish ] = "es el texto del que desea quitar espacios adicionales.." ; + Text [ spanish ] = "El texto del que desean borrar los espacios superfluos entre palabras." ; Text [ english_us ] = "The text in which extra spaces between words are to be deleted." ; Text[ chinese_simplified ] = "需è¦åˆ 除其ä¸ç©ºæ ¼çš„å—串。"; Text[ russian ] = "Òåêñò, èç êîòîðîãî óäàëÿþòñÿ ëèøíèå ïðîáåëû ìåæäó ñëîâàìè."; @@ -38586,10 +39824,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De tekst waarin overbodige spaties tussen woorden worden verwijderd."; Text[ chinese_simplified ] = "需è¦åˆ 除其ä¸ç©ºæ ¼çš„å—串。"; Text[ greek ] = "Ôï êåßìåíï óôï ïðïßï èá ãßíåé äéáãñáöÞ ôùí ðåñéôôþí êåíþí ìåôáîý ôùí ëÝîåùí."; - Text[ korean ] = "단어 ì‚¬ì´ ì—¬ë¶„ ê³µë°±ì´ ì‚ì œë í…스트"; + Text[ korean ] = "ì–´ë‘ì˜ ì—¬ë¶„ ê³µë°±ì„ ì‚ì œí•˜ëŠ” 문ìžì—´"; Text[ turkish ] = "Sözcükler arasýndaki fazla boþluklarýn silineceði metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text els espais extra entre paraules del qual s'han de suprimir."; + Text[ thai ] = "ลบช่à¸à¸‡à¸§à¹ˆà¸²à¸‡à¸—ี่เà¸à¸´à¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸„ำในข้à¸à¸„วาม"; }; }; // -=*# Resource for function GROSS2 #*=- @@ -38608,7 +39847,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Konverterer første bogstav i hvert ord til store bogstav." ; Text [ french ] = "Met en majuscule la première lettre de chaque mot." ; Text [ swedish ] = "Omvandlar begynnelsebokstäverna i alla ord till stora bokstäver." ; - Text [ dutch ] = "Verandert de eerste letter van elk woord in een hoofdletter." ; + Text [ dutch ] = "Wijzigt de eerste letter van elk woord in een hoofdletter." ; Text [ spanish ] = "Convierte en mayúscula la primera letra de cada palabra de un valor de texto." ; Text [ english_us ] = "Capitalizes the first letter in all words." ; Text[ chinese_simplified ] = "将所有首å—æ¯åŠä»»ä½•éžå—æ¯å—符之åŽçš„首å—æ¯è½¬æ¢æˆå¤§å†™ã€‚"; @@ -38617,13 +39856,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "æ–‡å—列ä¸ã®ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆå˜èªžã®å…ˆé æ–‡å—を大文å—ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將所有首å—æ¯åŠä»»ä½•éžå—æ¯å—元之後的首å—æ¯è½‰æ›æˆå¤§å¯«ã€‚"; Text[ arabic ] = "ÊÍæá ßÇÝÉ ÇáÃÍÑÝ ÇáÃæáì Åáì ÃÍÑÝ ßÈíÑÉ."; - Text[ dutch ] = "Verandert de eerste letter van elk woord in een hoofdletter."; + Text[ dutch ] = "Wijzigt de eerste letter van elk woord in een hoofdletter."; Text[ chinese_simplified ] = "将所有首å—æ¯åŠä»»ä½•éžå—æ¯å—符之åŽçš„首å—æ¯è½¬æ¢æˆå¤§å†™ã€‚"; Text[ greek ] = "ÌåôáôñÝðåé üëá ôá áñ÷éêÜ ãñÜììáôá ìéáò ëÝîçò óå êåöáëáßá."; - Text[ korean ] = "ëª¨ë“ ë‹¨ì–´ì˜ ì²« 글ìžë¥¼ 대문ìžë¡œ 변환"; + Text[ korean ] = "í…스트ì—ì„œ ëª¨ë“ ì•ŒíŒŒë²³ ë‹¨ì–´ì˜ ì²« 글ìžë¥¼ 대문ìžë¡œ 변환합니다."; Text[ turkish ] = "Tüm sözcüklerde ilk harfi büyük harfe dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Posa en majúscula la primera lletra de totes les paraules."; + Text[ thai ] = "ทำตัวà¸à¸±à¸à¸©à¸£à¸•à¸±à¸§à¹à¸£à¸à¹ƒà¸™à¸—ุà¸à¸„ำเป็นตัวพิมพ์ใหà¸à¹ˆ"; }; ExtraData = { @@ -38659,6 +39899,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -38673,7 +39914,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Teksten i hvilken første bogstav i hvert ord skal konverteres til stort." ; Text [ french ] = "Le texte dont des débuts de mots doivent être remplacés par des majuscules." ; Text [ swedish ] = "Texten där begynnelsebokstäver ersätts av stora bokstäver." ; - Text [ dutch ] = "De tekst waarin de eerste letter van ieder woord veranderd wordt in een hoofdletter." ; + Text [ dutch ] = "De tekst waarin de eerste letter van ieder woord wijzigt, wordt in een hoofdletter." ; Text [ spanish ] = "es el texto entre comillas, una fórmula que devuelve texto o una referencia a una celda que contiene el texto al que se desea añadir mayúsculas iniciales." ; Text [ english_us ] = "The text in which the beginning of words are to be replaced by capital letters." ; Text[ chinese_simplified ] = "需è¦è¿›è¡Œè½¬æ¢çš„å—符串。"; @@ -38682,13 +39923,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ japanese ] = "アルファベットå˜èªžã®å…ˆé æ–‡å—を大文å—ã«å¤‰æ›ã™ã‚‹æ–‡å—列。"; Text[ chinese_traditional ] = "需è¦é€²è¡Œè½‰æ›çš„å—串。"; Text[ arabic ] = "ÇáäÕ ÇáÐí ÓæÝ íÊã ÇÓÊÈÏÇá ÇáÃÍÑÝ ÇáÃæáì áßáãÇÊå ÈÃÍÑÝ ßÈíÑÉ."; - Text[ dutch ] = "De tekst waarin de eerste letter van ieder woord veranderd wordt in een hoofdletter."; + Text[ dutch ] = "De tekst waarin de eerste letter van ieder woord wijzigt, wordt in een hoofdletter."; Text[ chinese_simplified ] = "需è¦è¿›è¡Œè½¬æ¢çš„å—符串。"; Text[ greek ] = "Ôï êåßìåíï, óôï ïðïßï èá ãßíåé áíôéêáôÜóôáóç ôùí áñ÷éêþí ãñáììÜôùí ôùí ëÝîåùí ìå êåöáëáßá."; - Text[ korean ] = "단어 ì‹œìž‘ì´ ëŒ€ë¬¸ìžë¡œ 변경ë˜ëŠ” í…스트."; + Text[ korean ] = "알파벳 ë‹¨ì–´ì˜ ì²« 글ìžë¥¼ 대문ìžë¡œ 바꿀 문ìžì—´"; Text[ turkish ] = "Sözcüklerin ilk harfleri büyük harfe dönüþtürülen metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text el començament de totes les paraules del qual s'ha de reemplaçar per majúscules."; + Text[ thai ] = "à¹à¸—นที่ส่วนเริ่มต้นขà¸à¸‡à¸„ำในข้à¸à¸„วามด้วยตัวพิมพ์ใหà¸à¹ˆ"; }; }; // -=*# Resource for function GROSS #*=- @@ -38707,22 +39949,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Konverterer alle bogstaver i en tekst til store bogstaver." ; Text [ french ] = "Convertit toutes les lettres d'un texte en majuscules." ; Text [ swedish ] = "Omvandlar alla bokstäver i en text till stora bokstäver." ; - Text [ dutch ] = "Verandert alle letters in een tekst in hoofdletters." ; + Text [ dutch ] = "Wijzigt alle letters in een tekst in hoofdletters." ; Text [ spanish ] = "Convierte el texto en mayúsculas." ; Text [ english_us ] = "Converts text to uppercase." ; Text[ chinese_simplified ] = "å°†å—串内的所有å—æ¯è½¬æ¢æˆå¤§å†™å—æ¯ã€‚"; - Text[ russian ] = "Ïðåîáðàçóåò âñå áóêâû òåêñòà â ïðîïèñíûå."; + Text[ russian ] = "Ïðåîáðàçóåò âñå áóêâû óêàçàííîãî òåêñòà â ïðîïèñíûå."; Text[ polish ] = "Zamienia wszystkie litery tekstu na du¿e."; Text[ japanese ] = "æ–‡å—列ã«å«ã¾ã‚Œã‚‹ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆã‚’ã™ã¹ã¦å¤§æ–‡å—ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å°‡å—串內的所有å—æ¯è½‰æ›æˆå¤§å¯«å—æ¯ã€‚"; Text[ arabic ] = "ÊÍæá ßá ÇáÃÍÑÝ ÇáãæÌæÏÉ Ýí äÕ Åáì ÃÍÑÝ ßÈíÑÉ."; - Text[ dutch ] = "Verandert alle letters in een tekst in hoofdletters."; + Text[ dutch ] = "Wijzigt alle letters in een tekst in hoofdletters."; Text[ chinese_simplified ] = "å°†å—串内的所有å—æ¯è½¬æ¢æˆå¤§å†™å—æ¯ã€‚"; Text[ greek ] = "ÌåôáôñÝðåé óå êåöáëáßá üëá ôá ãñÜììáôá åíüò êåéìÝíïõ."; Text[ korean ] = "í…ìŠ¤íŠ¸ì˜ ëª¨ë“ ë¬¸ìžë¥¼ 대문ìžë¡œ 변환"; Text[ turkish ] = "Metin içindeki tüm harfleri büyük harflere dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix el text en majúscules."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸‚้à¸à¸„วามเป็นตัวพิมพ์ใหà¸à¹ˆ"; }; ExtraData = { @@ -38758,6 +40001,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -38788,6 +40032,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Küçük harflerin, büyük harfler ile deðiþtirildiði metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text les minúscules del qual s'han de convertir en majúscules."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸•à¸±à¸§à¸žà¸´à¸¡à¸žà¹Œà¹€à¸¥à¹‡à¸à¹ƒà¸™à¸‚้à¸à¸„วามเป็นตัวพิมพ์ใหà¸à¹ˆ"; }; }; // -=*# Resource for function KLEIN #*=- @@ -38805,22 +40050,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Konverterer alle bogstaver i en tekst til små bogstaver." ; Text [ french ] = "Convertit toutes les lettres d'un texte minuscules." ; Text [ swedish ] = "Omvandlar alla bokstäver i en text till små bokstäver." ; - Text [ dutch ] = "Verandert alle letters in een tekst in kleine letters." ; + Text [ dutch ] = "Wijzigt alle letters in een tekst in kleine letters." ; Text [ spanish ] = "Convierte todas las mayúsculas de una cadena de texto en minúsculas." ; Text [ english_us ] = "Converts text to lowercase." ; Text[ chinese_simplified ] = "将文å—串ä¸çš„所有å—æ¯è½¬æ¢ä¸ºå°å†™å—æ¯ã€‚"; - Text[ russian ] = "Ïðåîáðàçóåò âñå áóêâû òåêñòà â ñòðî÷íûå."; + Text[ russian ] = "Ïðåîáðàçóåò âñå áóêâû óêàçàííîãî òåêñòà â ñòðî÷íûå."; Text[ polish ] = "Zamienia wszystkie litery tekstu na ma³e."; Text[ japanese ] = "æ–‡å—列ã«å«ã¾ã‚Œã‚‹ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆã‚’ã™ã¹ã¦å°æ–‡å—ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "å°‡å—串ä¸çš„所有å—æ¯è½‰æ›ç‚ºå°å¯«å—æ¯ã€‚"; Text[ arabic ] = "ÊÍæá ßá ÇáÃÍÑÝ ÇáãæÌæÏÉ Ýí äÕ Åáì ÃÍÑÝ ÕÛíÑÉ."; - Text[ dutch ] = "Verandert alle letters in een tekst in kleine letters."; + Text[ dutch ] = "Wijzigt alle letters in een tekst in kleine letters."; Text[ chinese_simplified ] = "将文å—串ä¸çš„所有å—æ¯è½¬æ¢ä¸ºå°å†™å—æ¯ã€‚"; Text[ greek ] = "ÌåôáôñÝðåé óå ðåæÜ üëá ôá ãñÜììáôá åíüò êåéìÝíïõ."; Text[ korean ] = "í…ìŠ¤íŠ¸ì˜ ëª¨ë“ ë¬¸ìžë¥¼ 소문ìžë¡œ 변환"; Text[ turkish ] = "Metin içindeki tüm harfleri küçük harflere dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix el text en minúscules."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸‚้à¸à¸„วามเป็นตัวพิมพ์เล็à¸"; }; ExtraData = { @@ -38856,6 +40102,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -38886,6 +40133,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Büyük harflerin, küçük harflerle deðiþtirileceði metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text les majúscules del qual s'han de convertir en minúscules."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸•à¸±à¸§à¸à¸±à¸à¸©à¸£à¹ƒà¸«à¸à¹‹à¹ƒà¸™à¸‚้à¸à¸„วามเป็นตัวà¸à¸±à¸à¸©à¸£à¹€à¸¥à¹‡à¸"; }; }; // -=*# Resource for function WERT #*=- @@ -38907,7 +40155,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Convierte un texto en un número." ; Text [ english_us ] = "Converts text to a number." ; Text[ chinese_simplified ] = "将文å—转æ¢æˆæ•°å—。"; - Text[ russian ] = "Ïðåîáðàçóåò òåêñò â ÷èñëî"; + Text[ russian ] = "Ïðåîáðàçóåò òåêñò â ÷èñëî."; Text[ polish ] = "Zamienia tekst na liczbê."; Text[ japanese ] = "数値を表ã™æ–‡å—列を数値ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "將文å—轉æ›æˆæ•¸å—。"; @@ -38919,6 +40167,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metni sayýya dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix el text en un nombre."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸‚้à¸à¸„วามเป็นตัวเลข"; }; ExtraData = { @@ -38954,6 +40203,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -38983,6 +40233,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayýya dönüþtürülecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que s'ha de convertir en un nombre."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸‚้à¸à¸„วามเป็นตัวเลข"; }; }; // -=*# Resource for function TEXT #*=- @@ -39013,10 +40264,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Converteert een getal overeenkomstig een opgegeven notatie naar tekst."; Text[ chinese_simplified ] = "æŒ‰ç»™å®šçš„æ ¼å¼è½¬æ¢ä¸€ä¸ªæ•°å—æˆæ–‡å—。"; Text[ greek ] = "ÌåôáôñÝðåé Ýíáí áñéèìü óå êåßìåíï óýìöùíá ìå ôç ìïñöÞ ðïõ åðéëÝãåôáé."; - Text[ korean ] = "숫ìžëŠ” ì§€ì •ëœ í˜•ì‹ì— ë”°ë¼ í…스트로 변환ë©ë‹ˆë‹¤."; + Text[ korean ] = "숫ìžëŠ” ì§€ì •ëœ ì„œì‹ì— ë”°ë¼ í…스트로 변환ë©ë‹ˆë‹¤."; Text[ turkish ] = "Sayýyý belirtilen formata göre metne dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un nombre en un text segons un format donat."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚เป็นข้à¸à¸„วามตามรูปà¹à¸šà¸šà¸—ี่ให้มา"; }; ExtraData = { @@ -39052,6 +40304,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -39061,7 +40314,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore numerico che viene convertito." ; Text [ portuguese_brazilian ] = "Der Zahlwert, der umgewandelt wird." ; Text [ portuguese ] = "é um valor numérico a ser convertido." ; - Text [ finnish ] = "Muunnettava numeerinen arvo." ; + Text [ finnish ] = "Muunnettava numeerinen arvo" ; Text [ danish ] = "Talværdien som skal konverteres." ; Text [ french ] = "Représente la valeur numérique à convertir." ; Text [ swedish ] = "är talvärdet som skall omvandlas." ; @@ -39081,6 +40334,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dönüþtürülecek sayý deðeri."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor numèric que s'ha de convertir."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸„่าตัวเลข"; }; String 4 // Name of Parameter 2 { @@ -39090,7 +40344,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Formato" ; Text [ portuguese_brazilian ] = "Format" ; Text [ portuguese ] = "Formato" ; - Text [ finnish ] = "Muoto" ; + Text [ finnish ] = "Muotoilu" ; Text [ danish ] = "Format" ; Text [ french ] = "Format" ; Text [ swedish ] = "format" ; @@ -39106,10 +40360,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Notatie"; Text[ chinese_simplified ] = "format"; Text[ greek ] = "Format"; - Text[ korean ] = "형ì‹"; + Text[ korean ] = "ì„œì‹"; Text[ turkish ] = "Format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Formata"; + Text[ thai ] = "รูปà¹à¸šà¸š"; }; String 5 // Description of Parameter 2 { @@ -39119,7 +40374,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il testo che descrive il formato." ; Text [ portuguese_brazilian ] = "Der Text, der das Format beschreibt." ; Text [ portuguese ] = "é o texto que descreve o formato." ; - Text [ finnish ] = "Muotoa kuvaava teksti." ; + Text [ finnish ] = "Muotoa kuvaava teksti" ; Text [ danish ] = "Den tekst som beskriver formatet." ; Text [ french ] = "Le texte qui décrit le format." ; Text [ swedish ] = "Texten som beskriver formatet." ; @@ -39127,7 +40382,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un número de formato entre comillas del cuadro de diálogo Número." ; Text [ english_us ] = "The text that describes the format." ; Text[ chinese_simplified ] = "è¦é€‰ç”¨çš„用文å—è¡¨è¾¾çš„æ ¼å¼ã€‚"; - Text[ russian ] = "×èñëîâîé ôîðìàò â òåêñòîâîé ôîðìå."; + Text[ russian ] = "Òåêñò, îïèñûâàþùèé ôîðìàò."; Text[ polish ] = "Tekst, który opisuje format."; Text[ japanese ] = "書å¼ã‚’表ã™æ–‡å—列。"; Text[ chinese_traditional ] = "è¦é¸ç”¨çš„用文å—表é”çš„æ ¼å¼ã€‚"; @@ -39135,10 +40390,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De tekst die de notatie weergeeft."; Text[ chinese_simplified ] = "è¦é€‰ç”¨çš„用文å—è¡¨è¾¾çš„æ ¼å¼ã€‚"; Text[ greek ] = "Ôï êåßìåíï ðïõ ðåñéãñÜöåé ôç ìïñöÞ"; - Text[ korean ] = "형ì‹ì„ 나타내는 í…스트"; + Text[ korean ] = "ì„œì‹ì„ 나타내는 문ìžì—´"; Text[ turkish ] = "Formatý tanýmlayan metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que descriu el format."; + Text[ thai ] = "ข้à¸à¸„วามà¸à¸˜à¸´à¸šà¸²à¸¢à¸£à¸¹à¸›à¹à¸šà¸š"; }; }; // -=*# Resource for function T #*=- @@ -39160,7 +40416,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Convierte un valor en un texto." ; Text [ english_us ] = "Converts a value into text." ; Text[ chinese_simplified ] = "转æ¢ä¸€ä¸ªæ•°å€¼æˆæ–‡å—。"; - Text[ russian ] = "Ïðåîáðàçóåò çíà÷åíèå â òåêñò."; + Text[ russian ] = "Ïðåîáðàçóåò ÷èñëî â òåêñòîâóþ ñòðîêó."; Text[ polish ] = "Zamienia wartoœæ w tekst."; Text[ japanese ] = "値を文å—列ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "轉æ›ä¸€å€‹æ•¸å€¼æˆæ–‡å—。"; @@ -39172,6 +40428,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðeri metne dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un valor en text."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸„่าในข้à¸à¸„วาม"; }; ExtraData = { @@ -39207,6 +40464,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -39216,7 +40474,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il valore che si desidera convertire.." ; Text [ portuguese_brazilian ] = "Der Wert, der umgewandelt wird." ; Text [ portuguese ] = "é o valor a converter." ; - Text [ finnish ] = "Muunnettava arvo." ; + Text [ finnish ] = "Muunnettava arvo" ; Text [ danish ] = "Den værdi som skal konverteres." ; Text [ french ] = "La valeur à convertir." ; Text [ swedish ] = "Värdet som omvandlas." ; @@ -39236,6 +40494,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dönüþtürülecek deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de convertir."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸„่า"; }; }; // -=*# Resource for function ERSETZEN #*=- @@ -39257,7 +40516,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Reemplaza caracteres dentro de una cadena de texto por una cadena de texto diferente." ; Text [ english_us ] = "Replaces characters within a text string with a different text string." ; Text[ chinese_simplified ] = "用æŸä¸€å—串替æ¢å…¶å®ƒå—串ä¸çš„部分内容。"; - Text[ russian ] = "Çàìåíÿåò ñèìâîëû âíóòðè òåêñòà ñèìâîëàìè äðóãîãî òåêñòà."; + Text[ russian ] = "Çàìåíÿåò ÷àñòü ñòðîêè äðóãîé ñòðîêîé."; Text[ polish ] = "Zastêpuje czêœæ tekstu innym tekstem."; Text[ japanese ] = "æ–‡å—列ã®ä¸€éƒ¨ã‚’ä»–ã®æ–‡å—ã«ç½®æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "用æŸä¸€å—串替æ›å…¶å®ƒå—串ä¸çš„部份內容。"; @@ -39265,10 +40524,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Vervangt een deel van een tekst door een andere tekst"; Text[ chinese_simplified ] = "用æŸä¸€å—串替æ¢å…¶å®ƒå—串ä¸çš„部分内容。"; Text[ greek ] = "ÁíôéêáèéóôÜ Ýíá ôìÞìá ôïõ êåéìÝíïõ ìå êÜðïéï Üëëï êåßìåíï."; - Text[ korean ] = "í…ìŠ¤íŠ¸ì˜ ì¼ë¶€ë¥¼ 다른 í…스트로 바꾸기."; + Text[ korean ] = "문ìžì—´ì˜ ì¼ë¶€ë¥¼ 다른 문ìžì—´ë¡œ 바꿉니다."; Text[ turkish ] = "Metnin bir bölümünü baþka bir metin ile deðiþtirir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Reemplaça els caràcters dins d'una cadena de text amb una altra cadena de text."; + Text[ thai ] = "à¹à¸—นที่ตัวà¸à¸±à¸à¸‚ระในสายà¸à¸±à¸à¸‚ระข้à¸à¸„วามด้วยสายà¸à¸±à¸à¸‚ระข้à¸à¸„วามที่ต่างà¸à¸±à¸™"; }; ExtraData = { @@ -39304,6 +40564,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "Text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -39321,7 +40582,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el texto en el que desea reemplazar el número específico de caracteres." ; Text [ english_us ] = "The text in which some characters are to be replaced." ; Text[ chinese_simplified ] = "需è¦è¿›è¡Œéƒ¨åˆ†å—符替æ¢çš„å—串。"; - Text[ russian ] = "Òåêñò, â êîòîðîì ñëåäóåò ïðîèçâåñòè çàìåíó."; + Text[ russian ] = "Òåêñò, â êîòîðîì ñëåäóåò ïðîèçâåñòè çàìåíó íåêîòîðûõ ñèìâîëîâ."; Text[ polish ] = "Tekst, którego czêœæ zostanie zast¹piona."; Text[ japanese ] = "ãã®ä¸€éƒ¨ã‚’ç½®ãæ›ãˆã‚‹æ–‡å—列。"; Text[ chinese_traditional ] = "需è¦é€²è¡Œéƒ¨ä»½å—元替æ›çš„å—串。"; @@ -39329,10 +40590,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De tekst waarvan een deel wordt vervangen"; Text[ chinese_simplified ] = "需è¦è¿›è¡Œéƒ¨åˆ†å—符替æ¢çš„å—串。"; Text[ greek ] = "Ôï êåßìåíï, óôï ïðïßï èá áíôéêáôáóôáèåß Ýíá ôìÞìá."; - Text[ korean ] = "ì¼ë¶€ê°€ 변경ë í…스트입니다."; + Text[ korean ] = "ì¼ë¶€ë¥¼ 바꿀 문ìžì—´"; Text[ turkish ] = "Bir bölümü deðiþtirilen metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text del qual s'han de reemplaçar alguns caràcters."; + Text[ thai ] = "à¹à¸—นที่ตัวà¸à¸±à¸à¸‚ระบางตัวในข้à¸à¸„วาม"; }; String 4 // Name of Parameter 2 { @@ -39358,10 +40620,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Positie"; Text[ chinese_simplified ] = "start_num"; Text[ greek ] = "start_num"; - Text[ korean ] = "위치"; + Text[ korean ] = "시작 위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; Text[ catalan ] = "posició"; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡"; }; String 5 // Description of Parameter 2 { @@ -39379,7 +40642,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la posición del carácter en el argumento texto_original en la cual debe comenzar el reemplazo con el argumento texto_nuevo." ; Text [ english_us ] = "The character position from which text is to be replaced." ; Text[ chinese_simplified ] = "替æ¢çš„å—符的起始ä½ç½®ã€‚"; - Text[ russian ] = "Ïîçèöèÿ ñèìâîëîâ, íà÷èíàÿ ñ êîòîðîé ñëåäóåò ïðîèçâåñòè çàìåíó."; + Text[ russian ] = "Ïîçèöèÿ ñèìâîëîâ, ñ êîòîðîé ñëåäóåò ïðîèçâåñòè çàìåíó."; Text[ polish ] = "Pozycja w tekœcie, od której stary_tekst zostanie zamieniony na nowy_tekst."; Text[ japanese ] = "ç½®æ›æ–‡å—列ã¨ç½®ãæ›ãˆã‚‹å…ˆé æ–‡å—ã®ä½ç½®(æ–‡å—番å·)。"; Text[ chinese_traditional ] = "替æ›çš„å—元的起始ä½ç½®ã€‚"; @@ -39387,10 +40650,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De positie van het teken, vanaf waar wordt vervangen."; Text[ chinese_simplified ] = "替æ¢çš„å—符的起始ä½ç½®ã€‚"; Text[ greek ] = "Ç èÝóç ôïõ ÷áñáêôÞñá, áðü ôçí ïðïßá êáé ìåôÜ èá ãßíåé ç áíôéêáôÜóôáóç."; - Text[ korean ] = "바꾸기를 ì‹œìž‘í• ë¬¸ìž ìœ„ì¹˜"; + Text[ korean ] = "문ìžì—´ì´ 바뀌어질 문ìžì˜ 시작 위치"; Text[ turkish ] = "Deðiþtirmenin baþlatýlacaðý karakter konumu."; Text[ language_user1 ] = " "; Text[ catalan ] = "Posició del caràcter a partir del qual s'ha de reemplaçar el text."; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡à¸•à¸±à¸§à¸à¸±à¸à¸‚ระจาà¸à¸‚้à¸à¸„วามที่ถูà¸à¹à¸—นที่"; }; String 6 // Name of Parameter 3 { @@ -39421,6 +40685,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Uzunluk"; Text[ language_user1 ] = " "; Text[ catalan ] = "longitud"; + Text[ thai ] = "ความยาว"; }; String 7 // Description of Parameter 3 { @@ -39430,7 +40695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di caratteri da sostituire." ; Text [ portuguese_brazilian ] = "Die Anzahl der Zeichen, die ersetzt werden." ; Text [ portuguese ] = "é o número de caracteres em texto_antigo que deseja substituir por novo_texto." ; - Text [ finnish ] = "Korvattavien merkkien määrä." ; + Text [ finnish ] = "Korvattavien merkkien määrä" ; Text [ danish ] = "Antal tegn som skal erstattes." ; Text [ french ] = "Le nombre de caractères à remplacer." ; Text [ swedish ] = "Antalet tecken som ersätts." ; @@ -39438,7 +40703,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "El número de caracteres que se debe reemplazar." ; Text [ english_us ] = "The number of characters to be replaced." ; Text[ chinese_simplified ] = "替æ¢å—符的数目。"; - Text[ russian ] = "Êîëè÷åñòâî ñèìâîëîâ, êîòîðûå òðåáóåòñÿ çàìåíèòü."; + Text[ russian ] = "Êîëè÷åñòâî çàìåíÿåìûõ ñèìâîëîâ."; Text[ polish ] = "Liczba znaków, które maj¹ zostaæ zast¹pione."; Text[ japanese ] = "ç½®æ›æ–‡å—列ã¨ç½®ãæ›ãˆã‚‹æ–‡å—列ã®ä¸ã®æ–‡å—数。"; Text[ chinese_traditional ] = "更替å—元的數目。"; @@ -39446,10 +40711,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het aantal tekens dat wordt vervangen."; Text[ chinese_simplified ] = "替æ¢å—符的数目。"; Text[ greek ] = "Ôï ðëÞèïò ôùí ÷áñáêôÞñùí ðïõ èá áíôéêáôáóôáèïýí."; - Text[ korean ] = "바뀔 문ìžì˜ 개수입니다."; + Text[ korean ] = "대체 문ìžì—´ì˜ 수입니다."; Text[ turkish ] = "Deðiþtirilecek karakter sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de caràcters que s'han de reemplaçar."; + Text[ thai ] = "จำนวนตัวà¸à¸±à¸à¸‚ระที่ถูà¸à¹à¸—นที่"; }; String 8 // Name of Parameter 4 { @@ -39467,7 +40733,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "texto_nuevo" ; Text [ english_us ] = "new text" ; Text[ chinese_simplified ] = "new_text"; - Text[ russian ] = "Íîâû_òåêñò"; + Text[ russian ] = "Íîâûé òåêñò"; Text[ polish ] = "Nowy_tekst"; Text[ japanese ] = "ç½®æ›æ–‡å—列"; Text[ chinese_traditional ] = "new_text"; @@ -39479,6 +40745,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yeni metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text nou"; + Text[ thai ] = "ข้à¸à¸„วามใหม่"; }; String 9 // Description of Parameter 4 { @@ -39488,7 +40755,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il nuovo testo da inserire." ; Text [ portuguese_brazilian ] = "Der Text, der eingesetzt wird." ; Text [ portuguese ] = "é o texto que substitui os caracteres do texto_antigo." ; - Text [ finnish ] = "Lisättävä teksti." ; + Text [ finnish ] = "Lisättävä teksti" ; Text [ danish ] = "Den tekst som skal erstatte den gamle tekst." ; Text [ french ] = "Le texte à utiliser pour le remplacement." ; Text [ swedish ] = "Texten som sätts in." ; @@ -39496,7 +40763,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el texto con el que reemplazará los caracteres en el argumento texto_original." ; Text [ english_us ] = "The text to be inserted." ; Text[ chinese_simplified ] = "æ’入的å—串。"; - Text[ russian ] = "Òåêñò, êîòîðûì çàìåíÿþòñÿ ñèìâîëû ñòàðîãî òåêñòà."; + Text[ russian ] = "Âñòàâëÿåìûé òåêñò."; Text[ polish ] = "Tekst, który zostanie wstawiony."; Text[ japanese ] = "æ–‡å—列ã®ä¸€éƒ¨ã¨ç½®ãæ›ãˆã‚‹æ–‡å—列。"; Text[ chinese_traditional ] = "æ’入的å—串。"; @@ -39508,6 +40775,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Eklenecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que s'ha d'inserir."; + Text[ thai ] = "à¹à¸—รà¸à¸‚้à¸à¸„วาม"; }; }; // -=*# Resource for function FEST #*=- @@ -39525,22 +40793,23 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ danish ] = "Formaterer en tekst med et fast antal decimaler og tusindtalsseparator." ; Text [ french ] = "Formate un nombre avec un nombre spécifié de décimales et séparateurs de milliers (espaces)." ; Text [ swedish ] = "Formaterar ett tal med ett fast antal decimaler och tusentalsavgränsare." ; - Text [ dutch ] = "Geeft een getal weer met een vast aantal plaatsen achter de komma en scheidingsteken voor duizendtallen." ; + Text [ dutch ] = "Geeft een getal weer met een vast aantal decimalen en scheidingsteken voor duizendtallen." ; Text [ spanish ] = "Da formato de texto a un número con una cantidad determinada de decimales." ; Text [ english_us ] = "Formats a number with a fixed number of places after the decimal point and thousands separator." ; Text[ chinese_simplified ] = "用å°æ•°ç‚¹ä½æ•°å’Œåƒä½ç‚¹æ¥æ ¼å¼åŒ–一个数å—。"; - Text[ russian ] = "Ôîðìàòèðóåò ÷èñëî ñ ôèêñèðîâàííûì êîëè÷åñòâîì ýëåìåíòîâ äåñÿòè÷íûõ ðàçðÿäîâ."; + Text[ russian ] = "Çàäàåò ôîðìàò ÷èñëà ñ ôèêñèðîâàííûì êîëè÷åñòâîì çíàêîâ ïîñëå çàïÿòîé è ðàçðÿäîâ."; Text[ polish ] = "Formatuje liczbê jako tekst, przyjmuj¹c podan¹ liczbê miejsc po przecinku."; Text[ japanese ] = "数値ã«æŒ‡å®šæ•°ã®å°æ•°ä½ã¨åƒæ¡åŒºåˆ‡ã‚Š(オプション)を付ã‘ã€æ–‡å—列ã¨ã—ã¦è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "用å°æ•¸é»žä½æ•¸å’Œåƒä½é»žä¾†æ ¼å¼åŒ–一個數å—。"; Text[ arabic ] = "ÊäÓÞ ÑÞã ÈÚÏÏ ËÇÈÊ ãä ÇáãäÇÒá ÇáÚÔÑíÉ."; - Text[ dutch ] = "Geeft een getal weer met een vast aantal plaatsen achter de komma en scheidingsteken voor duizendtallen."; + Text[ dutch ] = "Geeft een getal weer met een vast aantal decimalen en scheidingsteken voor duizendtallen."; Text[ chinese_simplified ] = "用å°æ•°ç‚¹ä½æ•°å’Œåƒä½ç‚¹æ¥æ ¼å¼åŒ–一个数å—。"; Text[ greek ] = "Ìïñöïðïéåß Ýíáí áñéèìü ìå óôáèåñü ðëÞèïò äåêáäéêþí øçößùí êáé äéá÷ùñéóôéêü ÷éëßùí."; - Text[ korean ] = "소수ì ì´í•˜ ìžë¦¬ì™€ 천ìžë¦¬ ì ì˜ ê³ ì •ëœ íšŸìˆ˜ë¡œ 형ì‹ì„ ì§€ì •í•©ë‹ˆë‹¤."; + Text[ korean ] = "소수ì ì´í•˜ ìžë¦¬ì™€ 천ìžë¦¬ ì ì˜ ê³ ì •ëœ íšŸìˆ˜ë¡œ ì„œì‹ì„ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Sabit sayýda ondalýk haneli ve binler hanesi ayýrýcýlý bir sayýyý formatlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Formata un nombre amb un nombre fix de llocs després de la coma decimal i amb delimitadors de milers."; + Text[ thai ] = "รูปà¹à¸šà¸šà¸ˆà¸³à¸™à¸§à¸™à¸à¸±à¸šà¸ˆà¸³à¸™à¸§à¸™à¸—ี่คงที่หลังจุดà¹à¸¥à¸°à¸à¸±à¸šà¸•à¸±à¸§à¸„ั่นจำนวนพัน"; }; ExtraData = { @@ -39576,6 +40845,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -39585,7 +40855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero che si desidera formattare." ; Text [ portuguese_brazilian ] = "Die Zahl, die formatiert wird." ; Text [ portuguese ] = "é o número que deseja formatar." ; - Text [ finnish ] = "Muotoiltava luku." ; + Text [ finnish ] = "Muotoiltava luku" ; Text [ danish ] = "Det tal som skal formateres." ; Text [ french ] = "Le nombre à formater." ; Text [ swedish ] = "Talet som formateras." ; @@ -39601,10 +40871,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het getal dat wordt geconverteerd."; Text[ chinese_simplified ] = "è¦æ ¼å¼åŒ–çš„æ•°å—。"; Text[ greek ] = "Ï áñéèìüò ðïõ èá ìïñöïðïéçèåß."; - Text[ korean ] = "형ì‹ì„ ì§€ì •í• ê°’."; + Text[ korean ] = "ì„œì‹í• 수"; Text[ turkish ] = "Formatlacak sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha de formatar."; + Text[ thai ] = "จัดรูปà¹à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚"; }; String 4 // Name of Parameter 2 { @@ -39622,7 +40893,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Decimales" ; Text [ english_us ] = "Decimals" ; Text[ chinese_simplified ] = "decimals"; - Text[ russian ] = "Äåñ_öèôðû"; + Text[ russian ] = "Êîëè÷åñòâî ðàçðÿäîâ"; Text[ polish ] = "Dziesiêtne"; Text[ japanese ] = "å°æ•°ä½"; Text[ language_user1 ] = " "; @@ -39631,9 +40902,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Aantal decimalen"; Text[ chinese_simplified ] = "decimals"; Text[ greek ] = "ÄåêáäéêÜ"; - Text[ korean ] = "소수ì 다ìŒì˜ ê°’"; + Text[ korean ] = "소수ì ì´í•˜ ìžë¦¿ìˆ˜"; Text[ turkish ] = "Ondalýk haneler"; Text[ catalan ] = "decimals"; + Text[ thai ] = "ทศนิยม"; }; String 5 // Description of Parameter 2 { @@ -39643,7 +40915,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di cifre decimali fisse da visualizzare." ; Text [ portuguese_brazilian ] = "Dezimalstellen. Anzahl des festen Dezimalstellen, die dargestellt werden." ; Text [ portuguese ] = "é o número de dígitos fixado à direita da vírgula decimal." ; - Text [ finnish ] = "Desimaaleja! Näytettävien desimaalien määrä." ; + Text [ finnish ] = "Desimaaleja Näytettävien desimaalien määrä" ; Text [ danish ] = "Decimaler. Antallet af cifre til højre for decimaltegnet." ; Text [ french ] = "Décimales. Le nombre de chiffres après la virgule." ; Text [ swedish ] = "Decimaler. Antalet fasta decimaler som visas." ; @@ -39651,7 +40923,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el número de dígitos a la derecha del separador decimal." ; Text [ english_us ] = "Decimal places. The number of fixed decimal places that are to be displayed." ; Text[ chinese_simplified ] = "应显示的å°æ•°ç‚¹ä½æ•°ã€‚"; - Text[ russian ] = "×èñëî ôèêñèðîâàííûõ öèôð ñïðàâà îò äåñÿòè÷íîé çàïÿòîé."; + Text[ russian ] = "Äåñÿòè÷íûå ðàçðÿäû. Êîëè÷åñòâî çàôèêñèðîâàííûõ îòîáðàæàåìûõ ðàçðÿäîâ."; Text[ polish ] = "Liczba sta³ych miejsc dziesiêtnych."; Text[ japanese ] = "å°æ•°ç‚¹ä»¥ä¸‹ã®æ¡æ•°ã€‚"; Text[ chinese_traditional ] = "è¦é¡¯ç¤ºçš„å°æ•¸é»žä½æ•¸ã€‚"; @@ -39659,10 +40931,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Decimalen. Aantal plaatsen achter de decimale komma die worden weergegeven."; Text[ chinese_simplified ] = "应显示的å°æ•°ç‚¹ä½æ•°ã€‚"; Text[ greek ] = "ÄåêáäéêÜ øçößá. Áñéèìüò ôùí óôáèåñþí äåêáäéêþí øçößùí ðïõ åìöáíßæïíôáé."; - Text[ korean ] = "소수ì ìžë¦¬. 나타낼 ê³ ì • 소수ì ìžë¦¬ì˜ 수입니다."; + Text[ korean ] = "소수ì ì´í•˜ ìžë¦¿ìˆ˜. í‘œì‹œí• ê³ ì • 소수ì ì´í•˜ ìžë¦¿ìˆ˜ìž…니다."; Text[ turkish ] = "Ondalýk haneler. Görüntülenecek sabit ondalýk hane sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de decimals. Nombre de llocs decimals fixos que s'han de visualitzar."; + Text[ thai ] = "จุดทศนิยม à¹à¸ªà¸”งผลจำนวนขà¸à¸‡à¸ˆà¸¸à¸”ทศนิยมที่คงที่ "; }; String 6 // Name of Parameter 3 { @@ -39672,26 +40945,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Nessun separatore migliaia" ; Text [ portuguese_brazilian ] = "T" ; Text [ portuguese ] = "Sem separador de milhares" ; - Text [ finnish ] = "T" ; + Text [ finnish ] = "Ei tuhaterottimia" ; Text [ danish ] = "Ingen tusindtalsseparatorer" ; Text [ french ] = "Sans séparateur de milliers" ; Text [ swedish ] = "Inga tusentalsavgränsare" ; - Text [ dutch ] = "Geen separatoren voor duizendtallen" ; - Text [ spanish ] = "No_separar_millares" ; + Text [ dutch ] = "Geen scheidingsteken voor duizendtallen" ; + Text [ spanish ] = "Sin separador de miles" ; Text [ english_us ] = "No thousands separators" ; Text[ chinese_simplified ] = "T"; - Text[ russian ] = "Áåç ðàçäåëèòåëåé ðàçðÿäîâ"; + Text[ russian ] = "Ðàçäåëèòåëü"; Text[ polish ] = "Bez separatorów tysiêcy"; Text[ japanese ] = "åƒæ¡åŒºåˆ‡ã‚Šãªã—"; Text[ chinese_traditional ] = "T"; Text[ arabic ] = "T"; - Text[ dutch ] = "Geen separatoren voor duizendtallen"; + Text[ dutch ] = "Geen scheidingsteken voor duizendtallen"; Text[ chinese_simplified ] = "T"; Text[ greek ] = "Ô"; - Text[ korean ] = "천단위 분리 부호 ì—†ìŒ"; + Text[ korean ] = "천단위 구분 기호 ì—†ìŒ"; Text[ turkish ] = "Binler hanesi ayýrýcýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "T"; + Text[ thai ] = "T"; }; String 7 // Description of Parameter 3 { @@ -39701,26 +40975,27 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Valore logico che, se VERO (diverso da 0), non consente di includere i separatori delle migliaia." ; Text [ portuguese_brazilian ] = "Tausenderpunkte. Gibt an, ob Tausenderpunkte gesetzt werden." ; Text [ portuguese ] = "Sem separador de milhares. Se o valor lógico existir e for VERDADEIRO (diferente de 0), o separador de milhares não é colocado." ; - Text [ finnish ] = "Tuhaterotin. Määrittää tuhaterotinasetuksen." ; + Text [ finnish ] = "Ei tuhaterottimia Tosiarvo, jos olemassa oleva ja TOSI (eri suuri kuin 0), tuhaterottimia ei aseteta." ; Text [ danish ] = "Ingen tusindtalsseparatorer. Logisk værdi, når til stede og SAND (forskellig fra 0) sættes ingen tusindtalsseparatorer." ; Text [ french ] = "Sans séparateur de milliers si valeur logique = VRAI (différente de 0)." ; Text [ swedish ] = "Inga tusentalsavgränsare. Sannolikhetsvärde, om det finns och är SANT (ej lika med 0) sätts inga tusentalsavgränsare." ; - Text [ dutch ] = "Geen scheidingstekens voor duizendtallen. Als de waarheidswaarde, indien voorhanden, WAAR (ongelijk aan O) is, dan worden er geen scheidingstekens gezet." ; - Text [ spanish ] = "Sin separadores de millares. Si el valor lógico existe y es VERDADERO (no igual a 0) no se mostrarán separadores de millares." ; + Text [ dutch ] = "Geen scheidingstekens voor duizendtallen. Als de waarheidswaarde, indien beschikbaar, WAAR (ongelijk aan O) is, dan worden er geen scheidingstekens gezet." ; + Text [ spanish ] = "Sin separador de miles. Si el valor lógico existe y es VERDADERO (no igual a 0) no se mostrarán separadores de millares." ; Text [ english_us ] = "No thousands separator. True value, if existing and TRUE (unequal to 0), no thousands separators are set." ; Text[ chinese_simplified ] = "åƒä½ç‚¹ã€‚给定是å¦ä½¿ç”¨åƒä½ç‚¹ã€‚如果逻辑值å˜åœ¨å¹¶ä¸”是 true(ä¸ç‰äºŽ0)，则ä¸ä½¿ç”¨åƒä½ç‚¹ã€‚"; - Text[ russian ] = "Îïðåäåëÿåò, äîëæåí ëè ïîÿâèòüñÿ ðàçäåëèòåëü ðàçðÿäîâ."; + Text[ russian ] = "Áåç ðàçäåëèòåëåé ðàçðÿäîâ. Çíà÷åíèå ÈÑÒÈÍÀ (åñëè ñóùåñòâóåò è íå ðàâíî 0), íå óñòàíàâëèâàþòñÿ ðàçäåëèòåëè ðàçðÿäîâ."; Text[ polish ] = "Bez separatorów tysiêcy. Je¿eli jest wartoœæ logiczna PRAWDA (nierówna 0), separatory tysiêcy nie zostan¹ osadzone."; Text[ japanese ] = "åƒæ¡åŒºåˆ‡ã‚Šã‚’付ã‘ã‚‹ã‹ã©ã†ã‹ã‚’è«–ç†å€¤ã§æŒ‡å®šã—ã¾ã™ã€‚ 0 以外ã®æ•°å€¤ã‚’指定ã™ã‚‹ã¨ã€åƒæ¡åŒºåˆ‡ã‚Šã¯ä»˜ãã¾ã›ã‚“。"; Text[ chinese_traditional ] = "åƒä½é»žã€‚指定是å¦ä½¿ç”¨åƒä½é»žã€‚如果é‚輯值å˜åœ¨ä¸¦ä¸”是 true(ä¸ç‰æ–¼0)，則ä¸æ˜¯ä½¿ç”¨åƒä½é»žã€‚"; Text[ arabic ] = "ÞíãÉ ãäØÞíÉ ÊÍÏÏ ãÇ ÅÐÇ ßÇä ãä ÇáÖÑæÑí æÖÚ ÝæÇÕá Èíä ÇáÃÑÞÇã."; - Text[ dutch ] = "Geen scheidingstekens voor duizendtallen. Als de waarheidswaarde, indien voorhanden, WAAR (ongelijk aan O) is, dan worden er geen scheidingstekens gezet."; + Text[ dutch ] = "Geen scheidingstekens voor duizendtallen. Als de waarheidswaarde, indien beschikbaar, WAAR (ongelijk aan O) is, dan worden er geen scheidingstekens gezet."; Text[ chinese_simplified ] = "åƒä½ç‚¹ã€‚给定是å¦ä½¿ç”¨åƒä½ç‚¹ã€‚如果逻辑值å˜åœ¨å¹¶ä¸”是 true(ä¸ç‰äºŽ0)，则ä¸ä½¿ç”¨åƒä½ç‚¹ã€‚"; Text[ greek ] = "Äéá÷ùñéóôéêü ÷éëßùí. Ïñßæåé áí åìöáíßæïíôáé äéá÷ùñéóôéêÜ ÷éëßùí."; - Text[ korean ] = "천단위 분리 부호 ì—†ìŒ. 논리 ê°’ê³¼ TRUE (0ê³¼ 다름)는 천단위 분리 부호를 사용하지 않습니다."; + Text[ korean ] = "천단위 구분 기호 ì—†ìŒ. 논리 ê°’ê³¼ TRUE (0ê³¼ 다름)는 천단위 구분 기호를 사용하지 않습니다."; Text[ turkish ] = "Binler hanesi ayýrýcýsý. Binler hanesi ayýrýcýlarý kullanýlýp kullanýlmayacaðýný belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Delimitador de milers. Defineix si s'han d'establir els delimitadors de milers."; + Text[ thai ] = "ตัวคั่นจำนวนพัน à¸à¸³à¸«à¸™à¸”ตัวคั่นจำนวนพัน"; }; }; // -=*# Resource for function LÄNGE #*=- @@ -39743,7 +41018,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve la longitud de una cadena de texto." ; Text [ english_us ] = "Calculates length of a text string." ; Text[ chinese_simplified ] = "确定一个å—串的长度。"; - Text[ russian ] = "Âû÷èñëÿåò êîëè÷åñòâî ñèìâîëîâ â òåêñòîâîé ñòðîêå."; + Text[ russian ] = "Âû÷èñëÿåò äëèíó ñòðîêè, ó÷èòûâàÿ ïðîáåëû."; Text[ polish ] = "Oblicza d³ugoœæ tekstu."; Text[ japanese ] = "æ–‡å—列ã®æ–‡å—æ•°ã¾ãŸã¯ãƒã‚¤ãƒˆæ•°ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個å—串的長度。"; @@ -39751,10 +41026,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent de lengte van een tekst."; Text[ chinese_simplified ] = "确定一个å—串的长度。"; Text[ greek ] = "Õðïëïãßæåé ôï ìÞêïò åíüò êåéìÝíïõ."; - Text[ korean ] = "í…ìŠ¤íŠ¸ì˜ ê¸¸ì´ë¥¼ 계산합니다"; + Text[ korean ] = "í…스트 문ìžì—´ì˜ 길ì´ë¥¼ 계산합니다."; Text[ turkish ] = "Metnin uzunluðunu hesaplar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Calcula la longitud d'una cadena de text."; + Text[ thai ] = "คำนวณความยาวขà¸à¸‡à¸ªà¸²à¸¢à¸à¸±à¸à¸‚ระข้à¸à¸„วาม"; }; ExtraData = { @@ -39790,6 +41066,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -39808,7 +41085,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el texto cuya longitud desea conocer." ; Text [ english_us ] = "The text in which the length is to be determined." ; Text[ chinese_simplified ] = "è¦ç¡®å®šå…¶é•¿åº¦çš„å—串。"; - Text[ russian ] = "Òåêñòîâàÿ ñòðîêà, äëèíó êîòîðîé ñëåäóåò îïðåäåëèòü."; + Text[ russian ] = "Òåêñò, äëèíó êîòîðîãî ñëåäóåò îïðåäåëèòü."; Text[ polish ] = "Tekst, którego d³ugoœæ trzeba okreœliæ."; Text[ japanese ] = "æ–‡å—æ•°ã¾ãŸã¯ãƒã‚¤ãƒˆæ•°ã‚’調ã¹ã‚‹æ–‡å—列｡"; Text[ chinese_traditional ] = "è¦ç¢ºå®šå…¶é•·åº¦çš„å—串。"; @@ -39820,6 +41097,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Uzunluðu belirlenecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text la longitud del qual s'ha de determinar."; + Text[ thai ] = "ข้à¸à¸„วามในความยาวที่ถูà¸à¸à¸³à¸«à¸™à¸”"; }; }; // -=*# Resource for function LINKS #*=- @@ -39841,7 +41119,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Extrae el carácter o los caracteres situados en el extremo izquierdo de una cadena de texto." ; Text [ english_us ] = "Defines the first character or characters in a text string." ; Text[ chinese_simplified ] = "确定一个å—串的开始部分å—符。"; - Text[ russian ] = "Îïðåäåëÿåò ïåðâûé ñèìâîë èëè ñèìâîëû íåïîëíîãî ñëîâà èç òåêñòîâîé ñòðîêè."; + Text[ russian ] = "Âîçâðàùàåò ïåðâûé ñèìâîë èëè óêàçàííîå ÷èñëî íà÷àëüíûõ ñèìâîëîâ ñòðîêè."; Text[ polish ] = "Wyznacza pierwszy znak w ci¹gu danych tekstu."; Text[ japanese ] = "æ–‡å—列ã®å…ˆé (左端)ã‹ã‚‰æŒ‡å®šæ•°ã®æ–‡å—ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "確定一個å—串的開始部份å—元。"; @@ -39849,10 +41127,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Geeft als resultaat het begin van een tekenreeks in een tekst."; Text[ chinese_simplified ] = "确定一个å—串的开始部分å—符。"; Text[ greek ] = "Ïñßæåé ôï áñ÷éêü ôìÞìá ìéáò ëÝîçò åíüò êåéìÝíïõ."; - Text[ korean ] = "í…ìŠ¤íŠ¸ì˜ ì²« 반단어를 ì§€ì •"; + Text[ korean ] = "í•œ í…스트 문ìžì—´ì—ì„œ 첫 문ìžë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Metnin ilk karakteri ya da karakterlerini tanýmlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix el primer o els primers caràcters d'una cadena de text."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ตัวà¸à¸±à¸à¸‚ระตัวà¹à¸£à¸à¸«à¸£à¸·à¸à¸•à¸±à¸§à¸à¸±à¸à¸‚ระในสายà¸à¸±à¸à¸‚ระข้à¸à¸„วาม"; }; ExtraData = { @@ -39888,6 +41167,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -39917,6 +41197,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Ýlk karakterleri belirlenecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text del qual s'han de determinar les paraules parcials inicials."; + Text[ thai ] = "ข้à¸à¸„วามที่ส่วนเริ่มขà¸à¸‡à¸„ำบางส่วนถูà¸à¸à¸³à¸«à¸™à¸”"; }; String 4 // Name of Parameter 2 { @@ -39934,7 +41215,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "núm_de_caracteres" ; Text [ english_us ] = "number" ; Text[ chinese_simplified ] = "num_chars"; - Text[ russian ] = "×èñëî_ñèìâîëîâ"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "liczba_znaków"; Text[ japanese ] = "æ–‡å—æ•°"; Text[ chinese_traditional ] = "num_chars"; @@ -39946,6 +41227,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karakter sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 5 // Description of Parameter 2 { @@ -39956,7 +41238,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Specifica il numero di caratteri per la parte iniziale della parola." ; Text [ portuguese_brazilian ] = "Die Anzahl der Zeichen f? das Anfangsteilwort." ; Text [ portuguese ] = "especifica o número de caracteres a devolver." ; - Text [ finnish ] = "Aloitustekstin merkkien määrä." ; + Text [ finnish ] = "Aloitustekstin merkkien määrä" ; Text [ danish ] = "Antal tegn VENSTRE skal returnere." ; Text [ french ] = "Le nombre de caractères que vous voulez extraire." ; Text [ swedish ] = "Antalet tecken för begynnelsedelordet." ; @@ -39964,7 +41246,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica cuántos caracteres se desea extraer." ; Text [ english_us ] = "The number of characters for the start text." ; Text[ chinese_simplified ] = "开端部分的å—符数目。"; - Text[ russian ] = "Êîëè÷åñòâî ñèìâîëîâ, êîòîðîå ñëåäóåò èçâëå÷ü."; + Text[ russian ] = "Êîëè÷åñòâî ñèìâîëîâ íà÷àëüíîãî òåêñòà."; Text[ polish ] = "Liczba znaków dla pocz¹tkowej czêœci s³owa."; Text[ japanese ] = "å–り出ã™æ–‡å—数。"; Text[ chinese_traditional ] = "開始部份的å—元數目。"; @@ -39976,6 +41258,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Baþlangýç metninin ilk karakterlerin sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de caràcters per al text d'inici."; + Text[ thai ] = "จำนวนตัวà¸à¸±à¸à¸‚ระสำหรับส่วนเริ่มข้à¸à¸„วาม"; }; }; // -=*# Resource for function RECHTS #*=- @@ -39997,7 +41280,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Extrae los caracteres del extremo derecho de una cadena de texto." ; Text [ english_us ] = "Defines the last character or characters in a text string." ; Text[ chinese_simplified ] = "æå–å—串ä¸æœ€åŽä¸€ä¸ªæˆ–多个å—符。"; - Text[ russian ] = "Îïðåäåëÿåò êîíå÷íóþ ÷àñòü ñëîâà â òåêñòå."; + Text[ russian ] = "Îïðåäåëÿåò ïîñëåäíèé ñèìâîë èëè óêàçàííîå ÷èñëî ïîñëåäíèõ ñèìâîëîâ ñòðîêè."; Text[ polish ] = "Okreœla ostatni znak w ci¹gu znaków."; Text[ japanese ] = "æ–‡å—列ã®æœ«(å³ç«¯)ã‹ã‚‰ã€æŒ‡å®šæ•°ã®æ–‡å—ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "æå–å—串ä¸æœ€å¾Œä¸€å€‹æˆ–多個å—元。"; @@ -40005,10 +41288,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Geeft als resultaat de tekens aan het einde van een tekenreeks in een tekst."; Text[ chinese_simplified ] = "æå–å—串ä¸æœ€åŽä¸€ä¸ªæˆ–多个å—符。"; Text[ greek ] = "Ïñßæåé ôï ôåëéêü ôìÞìá ìéáò ëÝîçò åíüò êåéìÝíïõ."; - Text[ korean ] = "í…ìŠ¤íŠ¸ì˜ ë§ˆì§€ë§‰ 반단어를 ì§€ì •"; + Text[ korean ] = "í•œ í…스트 문ìžì—´ì—ì„œ ë 문ìžë¥¼ ì§€ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Metin içindeki son bir ya da birkaç karakteri tanýmlar."; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'últim o els últims caràcters d'una cadena de text."; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ตัวà¸à¸±à¸à¸‚ระตัวสุดท้ายหรืà¸à¸•à¸±à¸§à¸à¸±à¸à¸‚ระในสายà¸à¸±à¸à¸‚ระข้à¸à¸„วาม"; }; ExtraData = { @@ -40044,6 +41328,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -40061,7 +41346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es la cadena de texto que contiene los caracteres que desea extraer." ; Text [ english_us ] = "The text in which the end partial words are to be determined." ; Text[ chinese_simplified ] = "需è¦ä»Žä¸æå–å—符的å—串。"; - Text[ russian ] = "Òåêñò, êîíå÷íàÿ ÷àñòü êîòîðîãî îïðåäåëÿåòñÿ."; + Text[ russian ] = "Òåêñò, â êîòîðîì îïðåäåëÿþòñÿ ïîñëåäíèå ñèìâîëû."; Text[ polish ] = "Tekst, w którym zostanie okreœlony ostatni znak."; Text[ japanese ] = "å–り出ã™æ–‡å—ã‚’å«ã‚€æ–‡å—列。"; Text[ chinese_traditional ] = "需è¦å¾žä¸æå–å—元的å—串。"; @@ -40073,6 +41358,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Son metin öðeleri belirlenecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text del qual s'han de determinar les paraules parcials finals."; + Text[ thai ] = "ข้à¸à¸„วามในส่วนท้ายขà¸à¸‡à¸„ำที่ถูà¸à¸à¸³à¸«à¸™à¸”"; }; String 4 // Name of Parameter 2 { @@ -40090,7 +41376,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "núm_de_caracteres" ; Text [ english_us ] = "number" ; Text[ chinese_simplified ] = "num_chars"; - Text[ russian ] = "×èñëî ñèìâîëîâ"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "liczba_znaków"; Text[ japanese ] = "æ–‡å—æ•°"; Text[ chinese_traditional ] = "num_chars"; @@ -40102,6 +41388,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karakter sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 5 // Description of Parameter 2 { @@ -40112,7 +41399,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Specifica il numero dei caratteri che si desidera estrarre." ; Text [ portuguese_brazilian ] = "Die Anzahl der Zeichen f? das Endteilwort." ; Text [ portuguese ] = "é o número de caracteres a extrair do texto." ; - Text [ finnish ] = "Lopputekstin merkkien määrä." ; + Text [ finnish ] = "Lopputekstin merkkien määrä" ; Text [ danish ] = "Antal tegn HØJRE skal returnere." ; Text [ french ] = "Le nombre de caractères que vous voulez extraire." ; Text [ swedish ] = "Antalet tecken för slutdelordet." ; @@ -40120,7 +41407,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica el número de caracteres que se desea extraer." ; Text [ english_us ] = "The number of characters for the end text." ; Text[ chinese_simplified ] = "è¦æå–çš„å—串的长度。"; - Text[ russian ] = "Êîëè÷åñòâî ñèìâîëîâ â êîíå÷íîé ÷àñòè ñëîâà."; + Text[ russian ] = "×èñëî ñèìâîëîâ, êîòîðûå íóæíî îïðåäåëèòü."; Text[ polish ] = "Liczba znaków dla koñcowej czêœci s³owa."; Text[ japanese ] = "å–り出ã™æ–‡å—æ•°(å³ã‹ã‚‰ã®æ–‡å—æ•°)。"; Text[ chinese_traditional ] = "è¦æå–çš„å—串的長度。"; @@ -40132,6 +41419,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Son metin öðesinin karakter sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de caràcters per al text final."; + Text[ thai ] = "จำนวนตัวà¸à¸±à¸à¸‚ระสำหรับข้à¸à¸„วามตà¸à¸™à¸ˆà¸š"; }; }; // -=*# Resource for function TEIL #*=- @@ -40153,7 +41441,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Devuelve un número específico de caracteres de una cadena de texto, comenzando en la posición que especifique." ; Text [ english_us ] = "Returns a partial text string of a text." ; Text[ chinese_simplified ] = "找出指定的å—串部分。"; - Text[ russian ] = "Âîçâðàùàåò çàäàííîå ÷èñëî ñèìâîëîâ èç ñòðîêè òåêñòà."; + Text[ russian ] = "Âîçâðàùàåò óêàçàííîå ÷èñëî ñèìâîëîâ, íà÷èíàÿ ñ çàäàííîé ïîçèöèè."; Text[ polish ] = "Zwraca okreœlon¹ liczbê znaków z podanego ci¹gu znaków."; Text[ japanese ] = "æ–‡å—列ã®ç‰¹å®šéƒ¨åˆ†ã‚’è¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "找出指定的å—串部份。"; @@ -40161,10 +41449,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Geeft een bepaald aantal tekens van een tekst."; Text[ chinese_simplified ] = "找出指定的å—串部分。"; Text[ greek ] = "Ïñßæåé Ýíá ôìÞìá ëÝîçò åíüò êåéìÝíïõ."; - Text[ korean ] = "í…ìŠ¤íŠ¸ì˜ ë°˜ë‹¨ì–´ë¥¼ ì •ì˜"; + Text[ korean ] = "문ìžì—´ì˜ íŠ¹ì • 부분 문ìžì—´ì„ ë˜ëŒë¦½ë‹ˆë‹¤."; Text[ turkish ] = "Metin içindeki metin öðelerini belirler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna una cadena de text parcial d'un text."; + Text[ thai ] = "ส่งà¸à¸¥à¸±à¸šà¸ªà¸²à¸¢à¸à¸±à¸à¸‚ระข้à¸à¸„วามบางส่วนขà¸à¸‡à¸‚้à¸à¸„วาม"; }; ExtraData = { @@ -40200,6 +41489,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -40229,6 +41519,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin öðeleri belirlenen metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text del qual s'han de determinar les paraules parcials."; + Text[ thai ] = "ข้à¸à¸„วามในส่วนขà¸à¸‡à¸„ำที่ถูà¸à¸à¸³à¸«à¸™à¸”"; }; String 4 // Name of Parameter 2 { @@ -40246,7 +41537,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "posición_inicial" ; Text [ english_us ] = "start" ; Text[ chinese_simplified ] = "start_num"; - Text[ russian ] = "Íà÷_íîì"; + Text[ russian ] = "Íà÷àëüíûé íîìåð"; Text[ polish ] = "liczba_pocz¹tkowa"; Text[ japanese ] = "開始ä½ç½®"; Text[ chinese_traditional ] = "start_num"; @@ -40258,6 +41549,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Baþlangýç"; Text[ language_user1 ] = " "; Text[ catalan ] = "inici"; + Text[ thai ] = "เริ่มต้น"; }; String 5 // Description of Parameter 2 { @@ -40287,6 +41579,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin öðesi tespitinin baþlayacaðý konum."; Text[ language_user1 ] = " "; Text[ catalan ] = "Posició des de la qual s'ha de determinar la paraula parcial."; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡à¸ˆà¸²à¸à¸ªà¹ˆà¸§à¸™à¸‚à¸à¸‡à¸„ำที่ถูà¸à¸à¸³à¸«à¸™à¸”"; }; String 6 // Name of Parameter 3 { @@ -40304,7 +41597,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "núm_de_caracteres" ; Text [ english_us ] = "number" ; Text[ chinese_simplified ] = "num_chars"; - Text[ russian ] = "×èñëî_ñèìâîëîâ"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "liczba_znaków"; Text[ japanese ] = "æ–‡å—æ•°"; Text[ chinese_traditional ] = "num_chars"; @@ -40316,6 +41609,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Karakter sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 7 // Description of Parameter 3 { @@ -40326,7 +41620,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il numero di caratteri per il testo." ; Text [ portuguese_brazilian ] = "Die Anzahl der Zeichen f? das Teilwort." ; Text [ portuguese ] = "indica a quantidade de caracteres a extrair do texto." ; - Text [ finnish ] = "Tekstin merkkien määrä." ; + Text [ finnish ] = "Tekstin merkkien määrä" ; Text [ danish ] = "Antal tegn som skal returnere." ; Text [ french ] = "Le nombre de caractères contenus dans la chaîne à extraire du texte." ; Text [ swedish ] = "Antalet tecken för delordet." ; @@ -40334,7 +41628,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica el número de caracteres de texto que se han de devolver." ; Text [ english_us ] = "The number of characters for the text." ; Text[ chinese_simplified ] = "è¦æ‰¾å‡ºçš„å—串的长度。"; - Text[ russian ] = "Êîëè÷åñòâî ñèìâîëîâ, êîòîðîå ñëåäóåò èçâëå÷ü èç òåêñòà."; + Text[ russian ] = "Êîëè÷åñòâî ñèìâîëîâ òåêñòà."; Text[ polish ] = "Liczba znaków dla czêœci s³owa."; Text[ japanese ] = "å–り出ã™æ–‡å—数。"; Text[ chinese_traditional ] = "è¦æ‰¾å‡ºçš„å—串的長度。"; @@ -40346,6 +41640,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin öðesinin karakter sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de caràcters per al text."; + Text[ thai ] = "จำนวนตัวà¸à¸±à¸à¸‚ระในข้à¸à¸„วาม"; }; }; // -=*# Resource for function WIEDERHOLEN #*=- @@ -40367,7 +41662,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Repite el texto un número de veces determinado." ; Text [ english_us ] = "Repeats text a given number of times." ; Text[ chinese_simplified ] = "按照给定的次数é‡å¤å—串。"; - Text[ russian ] = "Ïîâòîðÿåò òåêñò çàäàííîå ÷èñëî ðàç."; + Text[ russian ] = "Ñîçäà¸ò êîïèè ââåä¸ííîãî òåêñòà çàäàííî ÷èñëî ðàç."; Text[ polish ] = "Powtarza tekst przez dan¹ liczbê razy."; Text[ japanese ] = "æ–‡å—列を指定ã®å›žæ•°ç¹°ã‚Šè¿”ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "按照指定的次數é‡è¤‡å—串。"; @@ -40379,6 +41674,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metni belirtilen sýklýkta yineler."; Text[ language_user1 ] = " "; Text[ catalan ] = "Repeteix el text un nombre determinat de vegades."; + Text[ thai ] = "ทำข้à¸à¸„วามซ้ำตามจำนวนครั้งที่ให้มา"; }; ExtraData = { @@ -40414,6 +41710,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -40423,7 +41720,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Il testo che si desidera ripetere." ; Text [ portuguese_brazilian ] = "Der Text, der wiederholt wird." ; Text [ portuguese ] = "é o texto a ser repetido." ; - Text [ finnish ] = "Toistettava teksti." ; + Text [ finnish ] = "Toistettava teksti" ; Text [ danish ] = "Den tekst der skal gentages." ; Text [ french ] = "Le texte à répéter." ; Text [ swedish ] = "Texten som upprepas." ; @@ -40443,6 +41740,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yinelenecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que s'ha de repetir."; + Text[ thai ] = "ทำข้à¸à¸„วามซ้ำ"; }; String 4 // Name of Parameter 2 { @@ -40460,7 +41758,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "núm_de_veces" ; Text [ english_us ] = "number" ; Text[ chinese_simplified ] = "num_times"; - Text[ russian ] = "×èñëî ïîâòîðåíèé"; + Text[ russian ] = "Êîëè÷åñòâî"; Text[ polish ] = "Liczba"; Text[ japanese ] = "回数"; Text[ chinese_traditional ] = "num_times"; @@ -40472,6 +41770,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yineleme sayýsý"; Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; + Text[ thai ] = "ตัวเลข"; }; String 5 // Description of Parameter 2 { @@ -40481,7 +41780,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Numero positivo che specifica il numero di volte che si desidera ripetere il testo." ; Text [ portuguese_brazilian ] = "Die Anzahl, wie oft der Text wiederholt wird." ; Text [ portuguese ] = "especifica o número de vezes de repetição do texto." ; - Text [ finnish ] = "Tekstin toistokerrat." ; + Text [ finnish ] = "Tekstin toistokerrat" ; Text [ danish ] = "Det antal gange som teksten skal gentages." ; Text [ french ] = "Le nombre indiquant combien de fois répéter le texte." ; Text [ swedish ] = "Antalet gånger texten upprepas." ; @@ -40489,7 +41788,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es un número positivo que especifica el número de veces que se deberá repetir el texto." ; Text [ english_us ] = "The number of times the text is to be repeated." ; Text[ chinese_simplified ] = "é‡å¤çš„次数。"; - Text[ russian ] = "×èñëî, îïðåäåëÿþùåå ñêîëüêî ðàç äîëæåí ïîâòîðÿòüñÿ òåêñò."; + Text[ russian ] = "Êîëè÷åñòâî ïîâòîðåíèé òåêñòà."; Text[ polish ] = "Okreœla liczbê razy powtórzenia tekstu."; Text[ japanese ] = "æ–‡å—列を繰り返ã™å›žæ•°ã€‚"; Text[ chinese_traditional ] = "é‡è¤‡çš„次數。"; @@ -40501,6 +41800,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metni yineleme sayýsý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre de vegades que s'ha de repetir el text."; + Text[ thai ] = "จำนวนครั้งที่ทำข้à¸à¸„วามซ้ำ"; }; }; // -=*# Resource for function WECHSELN #*=- @@ -40522,7 +41822,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "Reemplaza caracteres dentro del texto." ; Text [ english_us ] = "Substitutes new text for old text in a string." ; Text[ chinese_simplified ] = "多é‡æ›¿æ¢ä¸€ä¸ªå—串内的å—符。"; - Text[ russian ] = "Çàìåíÿåò ìíîãîêðàòíî ÷àñòè ñëîâ â òåêñòå."; + Text[ russian ] = "Çàìåíÿåò ñòàðûé òåêñò â ñòðîêå íà íîâûé."; Text[ polish ] = "Podstawia nowy tekst w miejsce starego we wskazanym ci¹gu znaków."; Text[ japanese ] = "æ–‡å—列ä¸ã®ç‰¹å®šã®æ–‡å—ã‚’ä»–ã®æ–‡å—ã«ç½®ãæ›ãˆã¾ã™ã€‚"; Text[ chinese_traditional ] = "多é‡æ›´æ›¿ä¸€å€‹å—串內的å—元。"; @@ -40530,10 +41830,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Vervangt meermaals tekens in een tekst."; Text[ chinese_simplified ] = "多é‡æ›¿æ¢ä¸€ä¸ªå—串内的å—符。"; Text[ greek ] = "Åêôåëåß ðïëëáðëÞ áíôéêáôÜóôáóç ôìçìÜôùí ëÝîåùí óå Ýíá êåßìåíï."; - Text[ korean ] = "í…스트ì—ì„œ ë‹¤ìˆ˜ì˜ ë°˜ë‹¨ì–´ 바꾸기"; + Text[ korean ] = "문ìžì—´ì—ì„œ 문ìžë¥¼ 바꿉니다."; Text[ turkish ] = "Metin içinde metin öðeleri deðiþtirir."; Text[ language_user1 ] = " "; Text[ catalan ] = "Substitueix un text nou per un d'antic en una cadena."; + Text[ thai ] = "ข้à¸à¸„วามใหม่à¹à¸—นข้à¸à¸„วามเà¸à¹ˆà¸²à¹ƒà¸™à¸ªà¸²à¸¢à¸à¸±à¸à¸‚ระ"; }; ExtraData = { @@ -40569,6 +41870,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -40594,10 +41896,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De tekst waarin tekens worden vervangen."; Text[ chinese_simplified ] = "è¦æ›¿æ¢å…¶ä¸å—符的å—串。"; Text[ greek ] = "Ôï êåßìåíï óôï ïðïßï èá ãßíåé áíôéêáôÜóôáóç ôùí ôìçìÜôùí ëÝîåùí."; - Text[ korean ] = "반단어가 바뀔 í…스트"; + Text[ korean ] = "글ìžì˜ ë¶€ë¶„ì´ ëŒ€ì²´ë 문ìžì—´"; Text[ turkish ] = "Metin öðeleri deðiþtirilecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text del qual s'han de reemplaçar les paraules parcials."; + Text[ thai ] = "ข้à¸à¸„วามในบางส่วนขà¸à¸‡à¸„ำที่ถูà¸à¹à¸—นที่"; }; String 4 // Name of Parameter 2 { @@ -40623,10 +41926,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Zoektekst"; Text[ chinese_simplified ] = "search_text"; Text[ greek ] = "Êåßìåíï áíáæÞôçóçò"; - Text[ korean ] = "찾기_í…스트"; + Text[ korean ] = "검색 문ìžì—´"; Text[ turkish ] = "Aranan metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "search_text"; + Text[ thai ] = "ค้นหา_ข้à¸à¸„วาม"; }; String 5 // Description of Parameter 2 { @@ -40644,7 +41948,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el texto que se desea sustituir." ; Text [ english_us ] = "The partial string to be (repeatedly) replaced." ; Text[ chinese_simplified ] = "è¦(多é‡)替æ¢çš„å—符。"; - Text[ russian ] = "×àñòü ñëîâà, êîòîðóþ íåîáõîäèìî (ìíîãîêðàòíî) çàìåíèòü."; + Text[ russian ] = "×àñòü ñòðîêè, êîòîðóþ íåîáõîäèìî çàìåíèòü (ìíîãîêðàòíî)."; Text[ polish ] = "S³owo cz¹stkowe, które ma zostaæ (wielokrotnie) zast¹pione."; Text[ japanese ] = "ç½®æ›ã•ã‚Œã‚‹æ–‡å—列。"; Text[ chinese_traditional ] = "è¦(多é‡)更替的å—元。"; @@ -40652,10 +41956,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Het woorddeel dat (meermaals) moeten worden vervangen."; Text[ chinese_simplified ] = "è¦(多é‡)替æ¢çš„å—符。"; Text[ greek ] = "Ôï ôìÞìá ôçò ëÝîçò ðïõ ðñüêåéôáé íá áíôéêáôáóôáèåß (ðïëëáðëÜ)."; - Text[ korean ] = "(여러번) 바뀔 반단어"; + Text[ korean ] = "(반복하여) 대체ë 부분 문ìžì—´"; Text[ turkish ] = "(Birçok kez) deðiþtirilecek metin öðesi."; Text[ language_user1 ] = " "; Text[ catalan ] = "Cadena parcial que s'ha de reemplaçar (repetidament)."; + Text[ thai ] = "à¹à¸—นที่สายà¸à¸±à¸à¸‚ระบางส่วน (ทำซ้ำ) "; }; String 6 // Name of Parameter 3 { @@ -40673,7 +41978,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "texto_nuevo" ; Text [ english_us ] = "new text" ; Text[ chinese_simplified ] = "new_text"; - Text[ russian ] = "Íîâûé_òåêñò"; + Text[ russian ] = "Íîâûé òåêñò"; Text[ polish ] = "Nowy tekst"; Text[ japanese ] = "ç½®æ›æ–‡å—列"; Text[ chinese_traditional ] = "new_text"; @@ -40685,6 +41990,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Yeni metin"; Text[ language_user1 ] = " "; Text[ catalan ] = "text nou"; + Text[ thai ] = "ข้à¸à¸„วามใหม่"; }; String 7 // Description of Parameter 3 { @@ -40702,7 +42008,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "es el texto con el que se reemplaza el texto_original." ; Text [ english_us ] = "The text which is to replace the text string." ; Text[ chinese_simplified ] = "用æ¥æ›¿æ¢åŽŸæ¥å—符的å—串。"; - Text[ russian ] = "Òåêñò, çàìåíÿþùèé ÷àñòü ñëîâà."; + Text[ russian ] = "Òåêñò, çàìåíÿþùèé ñòðîêó."; Text[ polish ] = "Tekst, który ma zast¹piæ ci¹g znaków."; Text[ japanese ] = "検索文å—列ã¨ç½®æ›ã™ã‚‹æ–‡å—列。"; Text[ chinese_traditional ] = "用來替æ›åŽŸä¾†å—元的å—串。"; @@ -40710,10 +42016,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De tekst die het woorddeel vervangt."; Text[ chinese_simplified ] = "用æ¥æ›¿æ¢åŽŸæ¥å—符的å—串。"; Text[ greek ] = "Ôï êåßìåíï ðïõ ðñüêåéôáé íá áíôéêáôáóôÞóåé ôï ôìÞìá ëÝîçò."; - Text[ korean ] = "반단어를 바꿀 í…스트"; + Text[ korean ] = "부분 글ìžë¥¼ ëŒ€ì²´í• ë¬¸ìžì—´"; Text[ turkish ] = "Metin öðesi yerine gelecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que ha de reemplaçar la cadena de text."; + Text[ thai ] = "ข้à¸à¸„วามที่ถูà¸à¹à¸—นที่ด้วยสายà¸à¸±à¸à¸‚ระข้à¸à¸„วาม"; }; String 8 // Name of Parameter 4 { @@ -40731,7 +42038,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "múm_de_ocurrencia" ; Text [ english_us ] = "occurrence" ; Text[ chinese_simplified ] = "occurrence"; - Text[ russian ] = "Íîìåð_âõîæäåíèÿ"; + Text[ russian ] = "Âõîæäåíèå"; Text[ polish ] = "Wyst¹pienie"; Text[ japanese ] = "ç½®æ›å¯¾è±¡"; Text[ chinese_traditional ] = "occurrence"; @@ -40743,6 +42050,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Vaka"; Text[ language_user1 ] = " "; Text[ catalan ] = "aparició"; + Text[ thai ] = "à¸à¸²à¸£à¹€à¸à¸´à¸”ขึ้น"; }; String 9 // Description of Parameter 4 { @@ -40760,7 +42068,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ spanish ] = "especifica la ocurrencia del texto que se desea reemplazar." ; Text [ english_us ] = "Which occurence of the old text is to be replaced." ; Text[ chinese_simplified ] = "è¦è¢«æ›¿æ¢çš„æ˜¯ç¬¬å‡ æ¬¡å‡ºçŽ°çš„å—符。"; - Text[ russian ] = "Îïðåäåëÿåò, êàêîå âõîæäåíèå òåêñòà íóæíî çàìåíèòü."; + Text[ russian ] = "Êàêîå âõîæäåíèå òåêñòà íóæíî çàìåíèòü."; Text[ polish ] = "Okreœla, które powtórzenie ci¹gu znaków ma zostaæ zast¹pione."; Text[ japanese ] = "何番目ã®è©²å½“æ–‡å—列を置æ›æ–‡å—列ã«ç½®ãæ›ãˆã‚‹ã‹ã‚’指定ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "è¦è¢«æ›´æ›¿çš„是第幾次出ç¾çš„å—元。"; @@ -40768,10 +42076,11 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Geeft aan bij het hoeveelste optreden het woorddeel moet worden vervangen."; Text[ chinese_simplified ] = "è¦è¢«æ›¿æ¢çš„æ˜¯ç¬¬å‡ æ¬¡å‡ºçŽ°çš„å—符。"; Text[ greek ] = "Ç ðïóïóôÞ åìöÜíéóç ôïõ ôìÞìáôïò ëÝîçò ðïõ èÝëåôå íá áíôéêáôáóôáèåß."; - Text[ korean ] = "몇 ë²ˆì§¸ì— ë‚˜íƒ€ë‚˜ëŠ” 반단어를 바꿀 것ì¸ê°€ìž…니다."; + Text[ korean ] = "몇 ë²ˆì§¸ì— ë‚˜íƒ€ë‚˜ëŠ” 부분 문ìžì—´ì„ 바꿀 것ì¸ê°€ë¥¼ ì„¤ì •í•©ë‹ˆë‹¤."; Text[ turkish ] = "Metin öðesinin hangi vakasý deðiþtirilecek."; Text[ language_user1 ] = " "; Text[ catalan ] = "L'aparició del text vell del qual s'ha de reemplaçar."; + Text[ thai ] = "เà¸à¸´à¸”à¸à¸²à¸£à¹à¸—นที่ข้à¸à¸„วามเà¸à¹ˆà¸²"; }; }; // -=*# Resource for function BASIS #*=- @@ -40789,21 +42098,22 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Converte un numero intero positivo in un testo da un sistema numerico alla base indicata." ; Text [ spanish ] = "Convierte un número entero positivo en un texto de un sistema numérico para la base dada." ; Text [ french ] = "Convertit un nombre entier positif en texte d'un système de numération dans la base spécifiée." ; - Text [ dutch ] = "Verandert een positief rond getal in een tekst uit een aangegeven getalsysteem." ; + Text [ dutch ] = "Wijzigt een positief rond getal in een tekst uit een aangegeven getalsysteem." ; Text[ chinese_simplified ] = "按照给定的数å—系统转æ¢ä¸€ä¸ªæ£æ•´æ•°æˆæ–‡å—。"; - Text[ russian ] = "Ïðåîáðàçóåò ïîëîæèòåëüíîå öåëîå ÷èñëî â òåêñò èç ÷èñëîâîé ñèñòåìû â çàäàííîì áàçèñå."; + Text[ russian ] = "Ïðåîáðàçóåò ïîëîæèòåëüíûå ÷èñëà â òåêñò â óêàçàííóþ ñèñòåìó ñ÷èñëåíèÿ."; Text[ polish ] = "Konwertuje dodatni¹ liczbê ca³kowit¹ na tekst z podanego systemu liczbowego o podanej podstawie."; Text[ japanese ] = "æ£ã®æ•´æ•°ã‚’記数法ã«å¾“ã£ã¦æ–‡å—ã«å¤‰æ›ã—ã¾ã™ã€‚"; Text[ chinese_traditional ] = "按照輸入的數å—系統轉æ›ä¸€å€‹æ£æ•´æ•¸æˆæ–‡å—。"; Text[ arabic ] = "ÊÍæá ÑÞãÇð ÕÍíÍÇð ãæÌÈÇð Åáì äÕ ãä äÙÇã ÃÑÞÇã ãÍÏÏ."; - Text[ dutch ] = "Verandert een positief rond getal in een tekst uit een aangegeven getalsysteem."; + Text[ dutch ] = "Wijzigt een positief rond getal in een tekst uit een aangegeven getalsysteem."; Text[ chinese_simplified ] = "按照给定的数å—系统转æ¢ä¸€ä¸ªæ£æ•´æ•°æˆæ–‡å—。"; Text[ greek ] = "ÌåôáôñÝðåé Ýíáí èåôéêü áêÝñáéï áñéèìü óå Ýíá êåßìåíï åíüò óõóôÞìáôïò áñéèìþí ùò ðñïò ôç åðéëåãìÝíç âÜóç."; Text[ korean ] = "ì–‘ì˜ ì •ìˆ˜ë¥¼ 주어진 ê¸°ì¤€ì— ëŒ€í•œ 수 체계로 ëœ í…스트로 변환합니다."; Text[ turkish ] = "Pozitif bir tamsayýyý belirtilen tabanda sayý sisteminden metne dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un enter positiu en text des d'un sistema numèric a la base indicada."; - Text[ finnish ] = "Muuntaa positiivisen kokonaisluvun tekstiksi määritetyn kantaluvun numerojärjestelmän perusteella."; + Text[ finnish ] = "Muuntaa positiivisen kokonaisluvun tekstiksi määritetyn kantaluvun lukujärjestelmän perusteella."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸ˆà¸³à¸™à¸§à¸™à¹€à¸•à¹‡à¸¡à¸šà¸§à¸à¹€à¸›à¹‡à¸™à¸‚้à¸à¸„วามจาà¸à¸£à¸°à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ไปยังà¸à¸²à¸™à¸—ี่à¸à¸³à¸«à¸™à¸”"; }; ExtraData = { @@ -40838,6 +42148,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "nombre"; Text[ finnish ] = "luku"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -40849,7 +42160,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ swedish ] = "Talet som skall omvandlas." ; Text [ danish ] = "Det tal som skal konverteres." ; Text [ italian ] = "Il numero da convertire." ; - Text [ spanish ] = "Número a convertir." ; + Text [ spanish ] = "Número que convertir." ; Text [ french ] = "Le nombre à convertir." ; Text [ dutch ] = "Het te converteren getal" ; Text[ chinese_simplified ] = "è¦è½¬æ¢çš„æ•°å—。"; @@ -40865,7 +42176,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dönüþtürülecek sayý."; Text[ language_user1 ] = " "; Text[ catalan ] = "Nombre que s'ha de convertir."; - Text[ finnish ] = "Muunnettava luku."; + Text[ finnish ] = "Muunnettava luku"; + Text[ thai ] = "ตัวเลขที่ถูà¸à¹à¸›à¸¥à¸‡"; }; String 4 // Name of Parameter 2 { @@ -40894,6 +42206,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "base de numeració"; Text[ finnish ] = "kantaluku"; + Text[ thai ] = "à¸à¸²à¸™"; }; String 5 // Description of Parameter 2 { @@ -40909,7 +42222,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "La base numérique pour la conversion doit être comprise entre 2 et 36." ; Text [ dutch ] = "De getalwaarde waarnaar wordt geconverteerd moet tussen 2 - 36 liggen." ; Text[ chinese_simplified ] = "转æ¢åŽçš„æ•°å—å¿…é¡»ä½äºŽ 2 å’Œ 36 之间。"; - Text[ russian ] = "×èñëîâîé áàçèñ, â êîòîðûé îñóùåñòâëÿåòñÿ ïðåîáðàçîâàíèå, äîëæåí íàõîäèòüñÿ â äèàïàçîíå îò 2 äî 36."; + Text[ russian ] = "×èñëî, ñîîòâåòñòâóþùåå ñèñòåìå ñ÷èñëåíèÿ â ïðîìåæóòêå îò 2 äî 36."; Text[ polish ] = "Podstawa systemu liczbowego do konwersji musi byæ zawarta w przedziale 2 - 36."; Text[ japanese ] = "何進ã®ä½å–記数法ã§è¡¨ã™ã‹ã‚’ 2 ã‹ã‚‰ 36 ã®é–“ã§æŒ‡å®šã€‚"; Text[ chinese_traditional ] = "所è¦è½‰æ›çš„åŸºæ•¸å¿…é ˆåœ¨ 2 - 36 之間。"; @@ -40917,11 +42230,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De getalwaarde waarnaar wordt geconverteerd moet tussen 2 - 36 liggen."; Text[ chinese_simplified ] = "转æ¢åŽçš„æ•°å—å¿…é¡»ä½äºŽ 2 å’Œ 36 之间。"; Text[ greek ] = "Ç âÜóç ôïõ áñéèìïý ðïõ èá ìåôáôñáðåß ðñÝðåé íá Ý÷åé ôéìÞ áðü 2 Ýùò 36."; - Text[ korean ] = "변환ì„위한 기본수는 2-36 ì˜ ì˜ì—ì— ìžˆì–´ì•¼ 합니다."; + Text[ korean ] = "ë³€í™˜ì„ ìœ„í•œ 기본수는 2-36 ì˜ ë²”ìœ„ì— ìžˆì–´ì•¼ 합니다."; Text[ turkish ] = "Dönüþüm hedefi taban sayýsý 2 - 36 aralýðýnda bulunmalýdýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "El nombre base per a la conversió ha de ser de l'interval 2 - 36."; Text[ finnish ] = "Muunnon perusluvun on oltava jokin luku 2 - 36."; + Text[ thai ] = "เลขà¸à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸›à¸¥à¸‡à¸•à¹‰à¸à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¹ˆà¸§à¸‡ 2 - 36"; }; String 6 // Name of Parameter 3 { @@ -40935,14 +42249,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ italian ] = "Lunghezza minima" ; Text [ spanish ] = "Longitud mínima" ; Text [ french ] = "Longueur_min" ; - Text [ dutch ] = "Minimum lengte" ; + Text [ dutch ] = "Minimumlengte" ; Text[ chinese_simplified ] = "Minimum length"; Text[ russian ] = "Ìèíèìàëüíàÿ äëèíà"; Text[ polish ] = "Minimalna d³ugoœæ"; Text[ japanese ] = "最低ã®é•·ã•"; Text[ chinese_traditional ] = "Minimum length"; Text[ arabic ] = "Minimum length"; - Text[ dutch ] = "Minimum lengte"; + Text[ dutch ] = "Minimumlengte"; Text[ chinese_simplified ] = "Minimum length"; Text[ greek ] = "ÅëÜ÷éóôï ìÞêïò"; Text[ korean ] = "최소 길ì´"; @@ -40950,6 +42264,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Longitud mínima"; Text[ finnish ] = "Vähimmäispituus"; + Text[ thai ] = "ความยาวน้à¸à¸¢à¸—ี่สุด"; }; String 7 // Description of Parameter 3 { @@ -40965,7 +42280,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ french ] = "Si le texte est plus court que la longueur spécifiée, des zéros seront ajoutés à sa gauche." ; Text [ dutch ] = "Als de tekst korter is wordt deze links met nullen opgevuld." ; Text[ chinese_simplified ] = "如果文å—çŸäºŽæŒ‡å®šé•¿åº¦ï¼Œå°±è¯·åœ¨æ–‡å—å·¦æ–¹æ·»åŠ é›¶ã€‚"; - Text[ russian ] = "Åñëè òåêñò ÿâëÿåòñÿ êîðî÷å, îí áóäåò ñëåâà çàïîëíÿòüñÿ íóëÿìè."; + Text[ russian ] = "Åñëè òåêñò ÿâëÿåòñÿ êîðî÷å óêàçàííîé äëèíû, îí áóäåò ñëåâà çàïîëíÿòüñÿ íóëÿìè."; Text[ polish ] = "Jeœli tekst jest krótszy ni¿ podana d³ugoœæ, zostanie uzupe³niony zerami."; Text[ japanese ] = "指定ã—ãŸé•·ã•ã‚ˆã‚ŠçŸã„çµæžœã«ã¯ã€å·¦ã«ã‚¼ãƒãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚"; Text[ chinese_traditional ] = "如果文å—çŸæ–¼æŒ‡å®šé•·åº¦ï¹å°±è«‹åœ¨æ–‡å—å·¦æ–¹æ·»åŠ é›¶ã€‚"; @@ -40978,6 +42293,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Si el text no arriba a la longitud indicada, s'afegiran zeros a l'esquerra de la cadena."; Text[ finnish ] = "Jos teksti on määritystä lyhyempi, merkkijonon eteen lisätään nollia."; + Text[ thai ] = "ถ้าข้à¸à¸„วามสั้นà¸à¸§à¹ˆà¸²à¸„วามยาวที่ระบุ ให้เพิ่มศูนย์ที่ด้านซ้ายขà¸à¸‡à¸ªà¸²à¸¢à¸à¸±à¸à¸‚ระ"; }; }; // -=*# Resource for function DEZIMAL #*=- @@ -40989,7 +42305,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ english ] = "Converts a text of a specified number system to positive integer." ; Text [ english_us ] = "Converts a text of a specified number system to a positive integer in the base given." ; Text[ portuguese ] = "Converte o texto de um determinado sistema numérico em número inteiro positivo numa dada base."; - Text[ russian ] = "Ïðåîáðàçóåò òåêñò èç ÷èñëîâîé ñèñòåìû çàäàííîãî îñíîâàíèÿ â öåëîå ïîëîæèòåëüíîå ÷èñëî."; + Text[ russian ] = "Ïðåîáðàçóåò òåêñò, íàïèñàííûé â çàäàííîé ñèñòåìå ñ÷èñëåíèÿ, â äåñÿòè÷íîå ÷èñëî."; Text[ dutch ] = "Converteert een tekst uit een aangegeven getalsysteem in een positief geheel getal."; Text[ french ] = "Convertit un texte d'un système de numération en nombre entier positif dans la base spécifiée."; Text[ spanish ] = "Convierte un texto de un sistema numérico en un número entero positivo para la base dada."; @@ -41009,7 +42325,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Belirli bir sayý sistemindeki metni, belirtilen tabanda pozitif tamsayýya dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un text d'un sistema numèric indicat en un enter positiu en la base donada."; - Text[ finnish ] = "Muuntaa määritetyn numerojärjestelmän tekstin positiiviseksi kokonaisluvuksi määrättyyn kantaan."; + Text[ finnish ] = "Muuntaa määritetyn lukujärjestelmän tekstin positiiviseksi kokonaisluvuksi määrättyyn kantaan."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸‚้à¸à¸„วามขà¸à¸‡à¸£à¸°à¸šà¸šà¸•à¸±à¸§à¹€à¸¥à¸‚ที่ระบุเป็นจำนวนเต็มบวà¸à¹ƒà¸™à¸à¸²à¸™à¸—ี่ให้มา"; }; ExtraData = { @@ -41044,6 +42361,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "text"; Text[ finnish ] = "teksti"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -41071,7 +42389,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Dönüþtürülecek metin."; Text[ language_user1 ] = " "; Text[ catalan ] = "Text que s'ha de convertir."; - Text[ finnish ] = "Muunnettava teksti."; + Text[ finnish ] = "Muunnettava teksti"; + Text[ thai ] = "ข้à¸à¸„วามที่ถูà¸à¹à¸›à¸¥à¸‡"; }; String 4 // Name of Parameter 2 { @@ -41100,6 +42419,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "base de numeració"; Text[ finnish ] = "kantaluku"; + Text[ thai ] = "à¸à¸²à¸™"; }; String 5 // Description of Parameter 2 { @@ -41107,7 +42427,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ english ] = "The base of the number system for conversion must be in the range 2 - 36." ; Text [ english_us ] = "The base number for conversion must be in the range 2 - 36." ; Text[ portuguese ] = "A base numérica, a partir da qual será efectuada a conversão, terá que estar compreendida entre 2 e 36."; - Text[ russian ] = "×èñëîâîå îñíîâàíèå, èç êîòîðîãî îñóùåñòâëÿåòñÿ ïðåîáðàçîâàíèå, äîëæíî íàõîäèòüñÿ â èíòåðâàëå îò 2 äî 36."; + Text[ russian ] = "×èñëî, ñîîòâåòñòâóþùåå ñèñòåìå ñ÷èñëåíèÿ â ïðîìåæóòêå îò 2 äî 36."; Text[ dutch ] = "De basis van het getalsysteem waaruit wordt geconverteerd moet tussen 2 - 36 liggen."; Text[ french ] = "La base numérique, à partir de laquelle convertir, doit être comprise entre 2 et 36."; Text[ spanish ] = "La base numérica de la que se convertirá debe ser entre 2 - 36."; @@ -41123,11 +42443,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "De basis van het getalsysteem waaruit wordt geconverteerd moet tussen 2 - 36 liggen."; Text[ chinese_simplified ] = "转æ¢åŽçš„æ•°å—å¿…é¡»ä½äºŽ 2 å’Œ 36 之间。"; Text[ greek ] = "Ç âÜóç ôïõ áñéèìïý ðïõ èá ìåôáôñáðåß ðñÝðåé íá Ý÷åé ôéìÞ áðü 2 Ýùò 36."; - Text[ korean ] = "변환ì„위한 기본수는 2-36 ì˜ ì˜ì—ì— ìžˆì–´ì•¼í•©ë‹ˆë‹¤."; + Text[ korean ] = "ë³€í™˜ì„ ìœ„í•œ 기본수는 2-36 ì˜ ë²”ìœ„ì— ìžˆì–´ì•¼ 합니다."; Text[ turkish ] = "Dönüþüm kaynaðý taban sayýsý 2 - 36 aralýðýnda bulunmalýdýr."; Text[ language_user1 ] = " "; Text[ catalan ] = "El nombre base per a la conversió ha de ser de l'interval 2 - 36."; Text[ finnish ] = "Muunnon perusluvun on oltava jokin luku 2 - 36."; + Text[ thai ] = "เลขà¸à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹à¸›à¸¥à¸‡à¸•à¹‰à¸à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¹ˆà¸§à¸‡ 2 - 36"; }; }; // -=*# Resource for function UMRECHNEN #*=- @@ -41139,7 +42460,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ english ] = "Converts a value according to a conversion table defined in the configuration (calc.xml)." ; Text[ english_us ] = "Converts a value according to a conversion table in the configuration (calc.xml)."; Text[ portuguese ] = "Converte um valor partindo da tabela de conversão disponível na configuração (calc.xml)."; - Text[ russian ] = "Ïðåîáðàçóåò çíà÷åíèå íà îñíîâàíèè òàáëèöû ïðåîáðàçîâàíèé èç êîíôèãóðàöèè (calc.xml)."; + Text[ russian ] = "Ïîçâîëÿåò ïðåîáðàçîâûâàòü ëþáóþ âàëþòó â Åâðî è íàîáîðîò. Ïàðàìåòðû ïðåîáðàçîâàíèÿ íàõîäÿòñÿ â ôàéëå calc.xml."; Text[ dutch ] = "Berekent een waarde aan de hand van een omrekeningstabel uit de configuratie (calc.xml)."; Text[ french ] = "Convertit une valeur à l'aide de la table de conversion provenant de la configuration. (calc.xml)"; Text[ spanish ] = "Convierte un valor en base a una tabla de conversión de la configuración (calc.xml)."; @@ -41155,11 +42476,12 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ dutch ] = "Berekent een waarde aan de hand van een omrekeningstabel uit de configuratie (calc.xml)."; Text[ chinese_simplified ] = "按照一个é…置文件(calc.xml)çš„æ¢ç®—表æ¥æ¢ç®—æŸä¸€ä¸ªæ•°å€¼ã€‚"; Text[ greek ] = "ÌåôáôñÝðåé ìéá ôéìÞ óýìöùíá ìå ìéá êáôá÷þñéóç ôïõ ðßíáêá convert.ini."; - Text[ korean ] = "구성(calc.xml)ì˜ í™˜ì‚°í‘œë¥¼ 사용하여 환산합니다"; + Text[ korean ] = "ì„¤ì •(calc.xml)ì˜ í™˜ì‚°í‘œë¥¼ 사용하여 환산합니다."; Text[ turkish ] = "convert.ini tablosundaki giriþe göre deðeri dönüþtürür."; Text[ language_user1 ] = " "; Text[ catalan ] = "Converteix un valor segons una entrada de la taula convert.ini"; Text[ finnish ] = "Muuntaa arvon kokoonpanossa (Calc.xml) olevan muunnostaulukon mukaan."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸„่าตามรายà¸à¸²à¸£à¹ƒà¸™à¸•à¸²à¸£à¸²à¸‡.ini ที่à¹à¸›à¸¥à¸‡"; }; ExtraData = { @@ -41195,6 +42517,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "Deðer"; Text[ language_user1 ] = " "; Text[ catalan ] = "valor"; + Text[ thai ] = "ค่า"; }; String 3 // Description of Parameter 1 { @@ -41203,7 +42526,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ english_us ] = "The value to be converted."; Text[ portuguese ] = "Valor a converter."; Text[ russian ] = "Ïðåîáðàçóåìîå çíà÷åíèå."; - Text[ dutch ] = "De waarde die u wilt coverteren"; + Text[ dutch ] = "De te converteren waarde"; Text[ french ] = "Valeur à convertir."; Text[ spanish ] = "El valor a convertir."; Text[ italian ] = "Valore da convertire."; @@ -41215,14 +42538,15 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ chinese_simplified ] = "è¦è½¬æ¢çš„数值。"; Text[ chinese_traditional ] = "è¦è½‰æ›çš„數值。"; Text[ arabic ] = "ÇáÞíãÉ ÇáãÑÇÏ ÊÍæíáåÇ."; - Text[ dutch ] = "De waarde die u wilt coverteren"; + Text[ dutch ] = "De te converteren waarde"; Text[ chinese_simplified ] = "è¦è½¬æ¢çš„数值。"; Text[ greek ] = "Ç ôéìÞ ðïõ ðñüêåéôáé íá ìåôáôñáðåß"; Text[ korean ] = "변환ë ê°’"; Text[ turkish ] = "Dönüþtürülen deðer."; Text[ language_user1 ] = " "; Text[ catalan ] = "Valor que s'ha de convertir."; - Text[ finnish ] = "Muunnettava arvo."; + Text[ finnish ] = "Muunnettava arvo"; + Text[ thai ] = "ค่าที่ถูà¸à¹à¸›à¸¥à¸‡"; }; String 4 // Name of Parameter 2 { @@ -41251,6 +42575,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "text"; Text[ finnish ] = "teksti"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 5 // Description of Parameter 2 { @@ -41258,8 +42583,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ english ] = "Unit to convert from, case sensitive." ; Text[ english_us ] = "Unit into which something is converted, case-sensitive."; Text[ portuguese ] = "Unidade de conversão; relevância de Maiúsculas/Minúsculas."; - Text[ russian ] = "Åäèíèöà, èç êîòîðîé îñóùåñòâëÿåòñÿ ïðåîáðàçîâàíèå, ñ ó÷åòîì ðåãèñòðà."; - Text[ dutch ] = "Eenheid van waaruit wordt omgerekend, hoofd-/kleine letters zijn relevant."; + Text[ russian ] = "Åäèíèöà, â êîòîðóþ îñóùåñòâëÿåòñÿ ïðåîáðàçîâàíèå, ñ ó÷åòîì ðåãèñòðà."; + Text[ dutch ] = "Eenheid van waaruit wordt omgerekend, hoofdletters/kleine letters zijn relevant."; Text[ french ] = "Unité à partir de laquelle convertir ; respecter la casse."; Text[ spanish ] = "Unidad de la que se convierte; diferenciación mayúsculas/minúsculas"; Text[ italian ] = "Unità a partire dalla quale si converte; sensibile all'utilizzo delle maiuscole/minuscole."; @@ -41271,7 +42596,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ chinese_simplified ] = "è¦è¢«è½¬æ¢çš„原有的货å¸å•ä½ï¼ŒåŒºåˆ†å¤§å°å†™ã€‚"; Text[ chinese_traditional ] = "è¦è¢«è½‰æ›çš„原有的貨幣單ä½ï¼Œå€åˆ†å¤§å°å¯«ã€‚"; Text[ arabic ] = "ÇáæÍÏÉ ÇáÊí íÊã ÇáÊÍæíá ãäåÇ (ãÑÇÚÇÉ ÇáÃÍÑÝ ÇáßÈíÑÉ æÇáÕÛíÑÉ)."; - Text[ dutch ] = "Eenheid van waaruit wordt omgerekend, hoofd-/kleine letters zijn relevant."; + Text[ dutch ] = "Eenheid van waaruit wordt omgerekend, hoofdletters/kleine letters zijn relevant."; Text[ chinese_simplified ] = "è¦è¢«è½¬æ¢çš„原有的货å¸å•ä½ï¼ŒåŒºåˆ†å¤§å°å†™ã€‚"; Text[ greek ] = "ÌïíÜäá áðü ôçí ïðïßá ãßíåôáé ç ìåôáôñïðÞ. ÐåæÜ/Êåöáëáßá ãñÜììáôá èá ëáìâÜíïíôáé õðüøç."; Text[ korean ] = "환산ë˜ëŠ” ë‹¨ìœ„ì— ìžˆì–´ì„œ 대/소문ìžëŠ” 중요합니다."; @@ -41279,6 +42604,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Unitat en què es converteix alguna cosa, distingeix entre majúscules i minúscules."; Text[ finnish ] = "Yksikkö, johon jotakin muunnetaan, suuret ja pienet kirjaimet ovat merkitseviä."; + Text[ thai ] = "หน่วยในบางสิ่งที่à¹à¸›à¸¥à¸‡ ตรงตามตัวพิมพ์ใหà¸à¹ˆ-เล็à¸"; }; String 6 // Name of Parameter 3 { @@ -41307,6 +42633,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "text"; Text[ finnish ] = "teksti"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 7 // Description of Parameter 3 { @@ -41315,7 +42642,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ english_us ] = "Unit into which something is converted, case-sensitive."; Text[ portuguese ] = "Unidade de conversão; relevância de Maiúsculas/Minúsculas"; Text[ russian ] = "Åäèíèöà, â êîòîðóþ îñóùåñòâëÿåòñÿ ïðåîáðàçîâàíèå, ñ ó÷åòîì ðåãèñòðà."; - Text[ dutch ] = "Eenheid waarnaar wordt geconverteerd, hoofd-/kleine letters zijn relevant."; + Text[ dutch ] = "Eenheid waarnaar wordt geconverteerd, hoofdletters/kleine letters zijn relevant."; Text[ french ] = "Unité de conversion ; respecter la casse."; Text[ spanish ] = "Unidad a convertir; diferenciación mayúsculas/minúsculas"; Text[ italian ] = "Unità nella quale si converte; sensibile all'utilizzo delle maiuscole/minuscole."; @@ -41327,7 +42654,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ chinese_simplified ] = "è¦è½¬æ¢æˆçš„è´§å¸å•ä½ï¼ŒåŒºåˆ†å¤§å°å†™ã€‚"; Text[ chinese_traditional ] = "è¦è½‰æ›æˆçš„貨幣單ä½ï¼Œå€åˆ†å—æ¯å¤§å°å¯«ã€‚"; Text[ arabic ] = "ÇáæÍÏÉ ÇáÊí íÊã ÇáÊÍæíá ÅáíåÇ (ãÑÇÚÇÉ ÇáÃÍÑÝ ÇáßÈíÑÉ æÇáÕÛíÑÉ)."; - Text[ dutch ] = "Eenheid waarnaar wordt geconverteerd, hoofd-/kleine letters zijn relevant."; + Text[ dutch ] = "Eenheid waarnaar wordt geconverteerd, hoofdletters/kleine letters zijn relevant."; Text[ chinese_simplified ] = "è¦è½¬æ¢æˆçš„è´§å¸å•ä½ï¼ŒåŒºåˆ†å¤§å°å†™ã€‚"; Text[ greek ] = "ÌïíÜäá áðü ôçí ïðïßá ãßíåôáé ç ìåôáôñïðÞ. ÐåæÜ/Êåöáëáßá ãñÜììáôá èá ëáìâÜíïíôáé õðüøç."; Text[ korean ] = "환산ë˜ëŠ” ë‹¨ìœ„ì— ìžˆì–´ì„œ 대/소문ìžëŠ” 중요합니다."; @@ -41335,6 +42662,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ language_user1 ] = " "; Text[ catalan ] = "Unitat en què es converteix alguna cosa, distingeix entre majúscules i minúscules."; Text[ finnish ] = "Yksikkö, johon jotakin muunnetaan, suuret ja pienet kirjaimet ovat merkitseviä."; + Text[ thai ] = "หน่วยในบางสิ่งที่à¹à¸›à¸¥à¸‡ ตรงตามตัวพิมพ์ใหà¸à¹ˆ-เล็à¸"; }; }; // -=*# Resource for function ROEMISCH #*=- @@ -41346,7 +42674,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ english ] = "Converts a number to roman." ; Text[ english_us ] = "Converts a number to a Roman numeral."; Text[ portuguese ] = "Converte um número em algarismo romano."; - Text[ russian ] = "Ïðåîáðàçóåò àðàáñêîå ÷èñëî â ðèìñêîå."; + Text[ russian ] = "Ïðåîáðàçóåò àðàáñêèå ÷èñëà â ðèìñêîå."; Text[ greek ] = "ÌåôáôñÝðåé Ýíáí áñéèìü óå ëáôéíéêü áñéèìü."; Text[ dutch ] = "Converteert een getal naar een Romeins cijfer."; Text[ french ] = "Convertit un nombre en chiffres romains."; @@ -41364,6 +42692,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ arabic ] = "Converts a number to roman."; Text[ catalan ] = "Converteix un nombre en un nombre romà."; Text[ finnish ] = "Muuntaa luvun roomalaiseksi numeroksi."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚เป็นเลขโรมัน"; }; ExtraData = { @@ -41395,6 +42724,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ arabic ] = "number"; Text[ catalan ] = "Nombre"; Text[ finnish ] = "Luku"; + Text[ thai ] = "ตัวเลข"; }; String 3 // Description of Parameter 1 { @@ -41420,6 +42750,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ arabic ] = "The number to be converted to roman must be in the range 0 - 3999."; Text[ catalan ] = "El nombre que s'ha de convertir en un nombre romà ha d'estar en l'interval 0 - 3999."; Text[ finnish ] = "Roomalaiseksi numeroksi muunnettavan numeron on oltava 0 - 3999."; + Text[ thai ] = "à¹à¸›à¸¥à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚เป็นตัวเลขโรมันต้à¸à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¹ˆà¸§à¸‡ 0 - 3999 "; }; String 4 // Name of Parameter 2 { @@ -41427,7 +42758,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ english ] = "mode" ; Text[ english_us ] = "Mode"; Text[ portuguese ] = "Modo"; - Text[ russian ] = "Ñïîñîá"; + Text[ russian ] = "Ðåæèì"; Text[ greek ] = "ÊáôÜóôáóç"; Text[ dutch ] = "modus"; Text[ french ] = "Mode"; @@ -41445,6 +42776,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ arabic ] = "mode"; Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "โหมด"; }; String 5 // Description of Parameter 2 { @@ -41452,7 +42784,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text [ english ] = "The more this value increases the more is the roman number simplified. The value must be in the range 0 - 4." ; Text[ english_us ] = "The more this value increases, the more the Roman numeral is simplified. The value must be in the 0 - 4 range."; Text[ portuguese ] = "Quanto maior for o valor, mais simplificado será o número romano. O valor deve estar compreendido entre 0 e 4."; - Text[ russian ] = "×åì áîëüøå ýòî çíà÷åíèå, òåì áîëüøå áóäåò óïðîùåíî ðèìñêîå ÷èñëî. Ýòî çíà÷åíèå äîëæíî íàõîäèòüñÿ â îáëàñòè îò 0 äî 4."; + Text[ russian ] = "×åì áîëüøå ýòî çíà÷åíèå, òåì áîëüøå áóäåò óïðîùåíî ðèìñêîå ÷èñëî. Ýòî çíà÷åíèå äîëæíî íàõîäèòüñÿ â äèàïàçîíå îò 0 äî 4."; Text[ greek ] = "¼óï ìåãáëýôåñç åßíáé áõôÞ ç ôéìÞ, ôüóï ðåñéóóüôåñï áðëïðïéåßôáé ï ëáôéíéêüò áñéèìüò. Ç ôéìÞ ðñÝðåé íá åßíáé áðü 0 - 4."; Text[ dutch ] = "Hoe hoger deze waarde is, hoe eenvoudiger het Romeinse getal wordt. De waarde moet tussen 0 en 4 liggen."; Text[ french ] = "Plus cette valeur (comprise entre 0 et 4) est élévée, plus le nombre en chiffres romains sera simplifié."; @@ -41463,13 +42795,14 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ polish ] = "Im wy¿sza wartoœæ, tym bardziej uproszczona zostanie rzymska liczba. Wartoœæ musi siê mieœciæ w zakresie 0 - 4."; Text[ portuguese_brazilian ] = "The more this value increases the more is the roman number simplified. The value must be in the range 0 - 4."; Text[ japanese ] = "0 ã‹ã‚‰ 4 ã®å€¤ã§æŒ‡å®šã€‚値ãŒå¤§ãããªã‚‹ã»ã©ã€ç°¡å˜ãªè¡¨ç¤ºå½¢å¼ã«ãªã‚Šã¾ã™ã€‚"; - Text[ korean ] = "ì´ ê°’ì´ ì¦ê°€ë˜ë©´ ë 수ë¡, ë¡œë§ˆì‹ ìˆ«ìžëŠ” ë” ê°„ë‹¨í•´ì§‘ë‹ˆë‹¤. ê°’ì€ ë°˜ë“œì‹œ 0 - 4 ë²”ìœ„ë‚´ì— ìžˆì–´ì•¼ 합니다."; + Text[ korean ] = "ì´ ê°’ì´ ì¦ê°€ë˜ë©´ ë ìˆ˜ë¡ ë¡œë§ˆì‹ ìˆ«ìžëŠ” ë” ê°„ë‹¨í•´ì§‘ë‹ˆë‹¤. ê°’ì€ ë°˜ë“œì‹œ 0 - 4 범위 ì•ˆì— ìžˆì–´ì•¼ 합니다."; Text[ chinese_simplified ] = "这个数值越高，罗马数å—就会越å°ã€‚这个数值必须在 0 - 4 之间的一个数值。"; Text[ chinese_traditional ] = "這個數值越高，羅馬數å—就會越å°ã€‚é€™å€‹æ•¸å€¼å¿…é ˆæ˜¯ 0 å’Œ 4 之間的數值。"; Text[ turkish ] = "The more this value increases the more is the roman number simplified. The value must be in the range 0 - 4."; Text[ arabic ] = "The more this value increases the more is the roman number simplified. The value must be in the range 0 - 4."; Text[ catalan ] = "Com més s'augmenta aquest valor, més se simplifica el nombre romà. El valor ha d'estar en l'àrea 0 - 4."; Text[ finnish ] = "Mitä suuremmaksi tätä arvoa kasvatetaan, sitä enemmän roomalaista numeroa yksinkertaistetaan. Arvon on oltava 0 - 4."; + Text[ thai ] = "ค่าเพิ่มขึ้นมาà¸à¹€à¸—่าไหร่ ตัวเลขโรมันà¸à¹‡à¸‡à¹ˆà¸²à¸¢à¸‚ึ้นเท่านั้น ค่าต้à¸à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¹ˆà¸§à¸‡ 0 - 4 "; }; }; // -=*# Resource for function ARABISCH #*=- @@ -41499,6 +42832,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ arabic ] = "Calculates the value of a roman number."; Text[ catalan ] = "Calcula el valor d'un nombre romà."; Text[ finnish ] = "Laskee roomalaisen numeron arvon."; + Text[ thai ] = "คำนวณค่าตัวเลขโรมัน"; }; ExtraData = { @@ -41530,6 +42864,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ arabic ] = "äÕ"; Text[ catalan ] = "Text"; Text[ finnish ] = "Teksti"; + Text[ thai ] = "ข้à¸à¸„วาม"; }; String 3 // Description of Parameter 1 { @@ -41554,7 +42889,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 Text[ turkish ] = "The text that represents a roman number."; Text[ arabic ] = "The text that represents a roman number."; Text[ catalan ] = "El text que representa un número romà."; - Text[ finnish ] = "Roomalaista numeroa esittävä teksti."; + Text[ finnish ] = "Roomalaista numeroa esittävä teksti"; + Text[ thai ] = "ข้à¸à¸„วามà¹à¸ªà¸”งในรูปขà¸à¸‡à¸•à¸±à¸§à¹€à¸¥à¸‚โรมัน"; }; }; }; @@ -41591,3 +42927,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 + + + + + diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index 5a2802641255..7e94b4382054 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -2,9 +2,9 @@ * * $RCSfile: scstring.src,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: dr $ $Date: 2002-12-06 11:49:58 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,7 +184,7 @@ String SCSTR_LONG_SCDOC_NAME Text[ greek ] = "%PRODUCTNAME 6.0 Ðßíáêáò"; Text[ dutch ] = "%PRODUCTNAME 6.0 werkblad"; Text[ french ] = "%PRODUCTNAME 6.0 Classeur"; - Text[ spanish ] = "%PRODUCTNAME 6.0 Hoja de cálculo"; + Text[ spanish ] = "%PRODUCTNAME 6.0 - Hoja de cálculo"; Text[ italian ] = "Tabella %PRODUCTNAME 6.0"; Text[ danish ] = "%PRODUCTNAME 6.0-tabel"; Text[ swedish ] = "%PRODUCTNAME 6.0 tabell"; @@ -210,7 +210,7 @@ String SCSTR_50_LONG_DOCNAME Text [ swedish ] = "%PRODUCTNAME 5.0 tabell" ; Text [ danish ] = "%PRODUCTNAME 5.0-tabel" ; Text [ italian ] = "Tabella %PRODUCTNAME 5.0" ; - Text [ spanish ] = "%PRODUCTNAME 5.0 Hoja de cálculo" ; + Text [ spanish ] = "%PRODUCTNAME 5.0 - Hoja de cálculo" ; Text [ french ] = "%PRODUCTNAME 5.0 Classeur" ; Text [ portuguese ] = "%PRODUCTNAME 5.0 Folha de cálculo" ; Text [ portuguese_brazilian ] = "%PRODUCTNAME 4.0 Tabelle" ; @@ -221,7 +221,7 @@ String SCSTR_50_LONG_DOCNAME Text[ chinese_traditional ] = "%PRODUCTNAME 5.0 工作表"; Text[ arabic ] = "ÌÏæá %PRODUCTNAME 5.0"; Text[ greek ] = "%PRODUCTNAME 5.0 - Ðßíáêáò"; - Text[ korean ] = "%PRODUCTNAME Calc 5.0 ìŠ¤í”„ë ˆë“œ 시트"; + Text[ korean ] = "%PRODUCTNAME Calc 5.0 ìŠ¤í”„ë ˆë“œì‹œíŠ¸"; Text[ turkish ] = "%PRODUCTNAME 5.0 tablosu"; Text[ language_user1 ] = " "; Text[ catalan ] = "%PRODUCTNAME 5.0 Full de càlcul"; @@ -237,7 +237,7 @@ String SCSTR_40_LONG_DOCNAME Text [ swedish ] = "%PRODUCTNAME 4.0 tabell" ; Text [ danish ] = "StarCalc 4.0 regneark" ; Text [ italian ] = "Foglio elettronico %PRODUCTNAME 4.0" ; - Text [ spanish ] = "%PRODUCTNAME 4.0 Hoja de cálculo" ; + Text [ spanish ] = "%PRODUCTNAME 4.0 - Hoja de cálculo" ; Text [ french ] = "%PRODUCTNAME 4.0 Classeur" ; Text [ portuguese ] = "%PRODUCTNAME 4.0 Folha de cálculo" ; Text [ portuguese_brazilian ] = "%PRODUCTNAME 4.0 Tabelle" ; @@ -476,7 +476,7 @@ String SCSTR_DRAWSHELL Text[ chinese_traditional ] = "圖形物件"; Text[ arabic ] = "ßÇÆäÇÊ ÕæÑÉ"; Text[ greek ] = "Áíôéêåßìåíá ãñáöéêþí"; - Text[ korean ] = "그래픽 개체"; + Text[ korean ] = "그림 개체"; Text[ turkish ] = "Grafik nesnesi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Objectes gràfics"; @@ -557,7 +557,7 @@ String SCSTR_CHARTSHELL Text[ polish ] = "Obiekty wykresu"; Text[ portuguese_brazilian ] = "Chart-objects"; Text[ japanese ] = "グラフオブジェクト"; - Text[ korean ] = "차트-개체"; + Text[ korean ] = "차트 개체"; Text[ chinese_simplified ] = "图表对象"; Text[ chinese_traditional ] = "圖表物件"; Text[ arabic ] = "ßÇÆäÇÊ ÇáÑÓã ÇáÈíÇäí"; @@ -612,7 +612,7 @@ String SCSTR_GRAPHICSHELL Text[ polish ] = "Grafika"; Text[ portuguese_brazilian ] = "Graphic"; Text[ japanese ] = "図"; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ chinese_simplified ] = "图形"; Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = "ÕæÑÉ"; @@ -1016,7 +1016,7 @@ String SCSTR_UNDEFINED Text[ chinese_traditional ] = "- 未定義的 -"; Text[ arabic ] = "- ÛíÑ ãõÚÑøÝ -"; Text[ greek ] = "- ìç ïñéóìÝíï -"; - Text[ korean ] = "- ì •ì˜ë˜ì§€ ì•ŠìŒ -"; + Text[ korean ] = "- ì§€ì •ë˜ì§€ ì•ŠìŒ -"; Text[ turkish ] = "- tanýmlanmamýþ -"; Text[ language_user1 ] = " "; Text[ catalan ] = "- no definit -"; @@ -1072,7 +1072,7 @@ String SCSTR_EMPTY Text[ chinese_traditional ] = "- 空缺 -"; Text[ arabic ] = "- ÝÇÑÛ -"; Text[ greek ] = "- êåíü -"; - Text[ korean ] = "- ë¹„ì—ˆìŒ -"; + Text[ korean ] = "- 빈 -"; Text[ turkish ] = "- boþ -"; Text[ language_user1 ] = " "; Text[ catalan ] = "- buit -"; @@ -1119,7 +1119,7 @@ String SCSTR_NEWTABLE Text [ french ] = "- nouvelle feuille -" ; Text [ swedish ] = "- ny tabell -" ; Text [ dutch ] = "- nieuw werkblad -" ; - Text [ spanish ] = "- nueva hoja -" ; + Text [ spanish ] = "- hoja nueva -" ; Text [ english_us ] = "- new sheet -" ; Text[ chinese_simplified ] = "- 新建工作表 -"; Text[ russian ] = "- íîâûé ëèñò -"; @@ -1176,7 +1176,7 @@ String SCSTR_STDFILTER Text [ portuguese ] = "- Padrão -" ; Text [ portuguese_brazilian ] = "- Standard -" ; Text[ chinese_simplified ] = "- æ ‡å‡† -"; - Text[ russian ] = "- Ñòàíäàðò -"; + Text[ russian ] = "- Ñòàíäàðòíûé -"; Text[ polish ] = "- Domyœlnie-"; Text[ japanese ] = "- 標準 -"; Text[ chinese_traditional ] = "- 標準 -"; @@ -1238,7 +1238,7 @@ String SCSTR_NONAME Text[ chinese_traditional ] = "未命å"; Text[ arabic ] = "ÈÏæä ÚäæÇä"; Text[ greek ] = "Äß÷ùò üíïìá"; - Text[ korean ] = "ì´ë¦„ì—†ìŒ"; + Text[ korean ] = "ì´ë¦„ ì—†ìŒ"; Text[ turkish ] = "bilinmeyen"; Text[ language_user1 ] = " "; Text[ catalan ] = "sense nom"; @@ -1371,7 +1371,7 @@ String SCSTR_REMOVE Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; Text[ russian ] = "Óäàëèòü"; @@ -1437,7 +1437,7 @@ String SCSTR_MODIFY Text[ chinese_traditional ] = "修改(~Y)"; Text[ arabic ] = "ÊÚÏíá"; Text[ greek ] = "Ôñïðïðïßçóç"; - Text[ korean ] = "ìˆ˜ì •(~Y)"; + Text[ korean ] = "변경(~Y)"; Text[ turkish ] = "~Deðiþtir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Modif~ica"; @@ -1524,7 +1524,7 @@ String SCSTR_SELECTDB Text[ chinese_traditional ] = "é¸æ“‡è³‡æ–™åº«å€åŸŸ"; Text[ arabic ] = "ÇÎÊíÇÑ äØÇÞ ÞÇÚÏÉ ÇáÈíÇäÇÊ"; Text[ greek ] = "ÅðéëïãÞ ðåñéï÷Þò âÜóçò äåäïìÝíùí"; - Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ ì˜ì— ì„ íƒ"; + Text[ korean ] = "ë°ì´í„°ë² ì´ìŠ¤ 범위 ì„ íƒ"; Text[ turkish ] = "Veritabaný aralýðýný seç"; Text[ language_user1 ] = " "; Text[ catalan ] = "Seleccioneu l'àrea de la base de dades"; @@ -1552,7 +1552,7 @@ String SCSTR_AREAS Text[ chinese_traditional ] = "å€åŸŸ"; Text[ arabic ] = "ÇáäØÇÞÇÊ"; Text[ greek ] = "~Ðåñéï÷Ýò"; - Text[ korean ] = "ì˜ì—"; + Text[ korean ] = "범위"; Text[ turkish ] = "Aralýklar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Àrees"; @@ -1705,7 +1705,7 @@ String SCSTR_RENAMEOBJECT Text [ ENGLISH ] = "Name Object" ; Text[ english_us ] = "Name object"; Text[ portuguese ] = "Name Object"; - Text[ russian ] = "Íàçâàòü îáúåêò"; + Text[ russian ] = "Ïåðåèìåíîâàòü îáúåêò"; Text[ greek ] = "Name Object"; Text[ dutch ] = "Naam geven aan object"; Text[ french ] = "Nommer l'objet"; @@ -1717,7 +1717,7 @@ String SCSTR_RENAMEOBJECT Text[ polish ] = "Name Object"; Text[ portuguese_brazilian ] = "Name Object"; Text[ japanese ] = "オブジェクトã«åå‰ã‚’付ã‘ã‚‹"; - Text[ korean ] = "개체 명ì¹"; + Text[ korean ] = "개체 ì´ë¦„ ì§€ì •"; Text[ chinese_simplified ] = "命å对象"; Text[ chinese_traditional ] = "命å物件"; Text[ turkish ] = "Name Object"; @@ -1748,7 +1748,7 @@ String STR_INSERTGRAPHIC Text[ chinese_traditional ] = "æ’入圖形"; Text[ arabic ] = "ÅÏÑÇÌ ÕæÑÉ"; Text[ greek ] = "ÅéóáãùãÞ ãñáöéêïý"; - Text[ korean ] = "그래픽 삽입"; + Text[ korean ] = "그림 삽입"; Text[ turkish ] = "Grafik ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix gràfics"; @@ -1798,7 +1798,7 @@ String SCSTR_HOR_JUSTIFY_CENTER Text [ french ] = "Centré horizontalement" ; Text [ swedish ] = "Horisontellt centrerad" ; Text [ dutch ] = "Horizontaal gecentreerd" ; - Text [ spanish ] = "Centrado horizontal" ; + Text [ spanish ] = "Centrado horizontalmente" ; Text [ english_us ] = "Centered horizontally" ; Text[ chinese_simplified ] = "水平居ä¸"; Text[ russian ] = "Ãîðèçîíòàëüíî ïî öåíòðó"; @@ -1823,7 +1823,7 @@ String SCSTR_HOR_JUSTIFY_RIGHT Text [ portuguese ] = "Ajustar à direita" ; Text [ finnish ] = "Tasaa oikealle" ; Text [ danish ] = "Højrejusteret" ; - Text [ french ] = "Alignement à droite" ; + Text [ french ] = "Aligner à droite" ; Text [ swedish ] = "Högerjustera" ; Text [ dutch ] = "Rechtslijnend" ; Text [ spanish ] = "Alinear a la derecha" ; @@ -1966,7 +1966,7 @@ String SCSTR_VER_JUSTIFY_CENTER Text [ french ] = "Centré verticalement" ; Text [ swedish ] = "Vertikalt centrerad" ; Text [ dutch ] = "Verticaal gecentreerd" ; - Text [ spanish ] = "Centrado vertical" ; + Text [ spanish ] = "Centrado verticalmente" ; Text [ english_us ] = "Centered vertically" ; Text[ chinese_simplified ] = "åž‚ç›´å±…ä¸"; Text[ russian ] = "Âåðòèêàëüíî ïî öåíòðó"; @@ -2003,7 +2003,7 @@ String SCSTR_VER_JUSTIFY_BOTTOM Text[ chinese_traditional ] = "å‘下å°é½Š"; Text[ arabic ] = "ãÍÇÐÇÉ Åáì ÃÓÝá"; Text[ greek ] = "Óôïß÷éóç ðñïò ôá êÜôù"; - Text[ korean ] = "ì•„ëž˜ì— ë§žì¶¤"; + Text[ korean ] = "아래 맞춤"; Text[ turkish ] = "Aþaðý hizala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alinea a la part inferior"; @@ -2047,7 +2047,7 @@ String SCSTR_ORIENTATION_TOPBOTTOM Text [ portuguese ] = "De cima para baixo" ; Text [ finnish ] = "Ylhäältä alas" ; Text [ danish ] = "Fra øverst til nederst" ; - Text [ french ] = "Du haut vers le bas" ; + Text [ french ] = "De haut en bas" ; Text [ swedish ] = "Uppifrån och ned" ; Text [ dutch ] = "Van boven naar beneden" ; Text [ spanish ] = "De arriba hacia abajo" ; @@ -2075,7 +2075,7 @@ String SCSTR_ORIENTATION_BOTTOMTOP Text [ portuguese ] = "De baixo para cima" ; Text [ finnish ] = "Alhaalta ylös" ; Text [ danish ] = "Fra nederst til øverst" ; - Text [ french ] = "Du bas vers le haut" ; + Text [ french ] = "De bas en haut" ; Text [ swedish ] = "Nedifrån och upp" ; Text [ dutch ] = "Van beneden naar boven" ; Text [ spanish ] = "Desde abajo hacia arriba" ; @@ -2115,7 +2115,7 @@ String SCSTR_ORIENTATION_STANDARD Text[ chinese_traditional ] = "æ–‡å—æ–¹å‘ æ¨™æº–"; Text[ arabic ] = "ÇÊÌÇå ÇáßÊÇÈÉ ÇáÇÝÊÑÇÖí"; Text[ greek ] = "ÐñïåðéëïãÞ êáôåýèõíóçò ãñáöÞò"; - Text[ korean ] = "기본 쓰기방향"; + Text[ korean ] = "기본 ë°©í–¥"; Text[ turkish ] = "Standart metin yönü"; Text[ language_user1 ] = " "; Text[ catalan ] = "Orientació per defecte"; @@ -2161,7 +2161,7 @@ String SCSTR_UNPROTECTDOC Text [ portuguese ] = "Desproteger documento" ; Text [ finnish ] = "Poista asiakirjan suojaus" ; Text [ danish ] = "Ophæv dokumentbeskyttelse" ; - Text [ french ] = "Supprimer la protection du document" ; + Text [ french ] = "Annuler la protection de document" ; Text [ swedish ] = "Upphäv dokumentskydd" ; Text [ dutch ] = "Documentbeveiliging opheffen" ; Text [ spanish ] = "Desproteger documento" ; @@ -2248,7 +2248,7 @@ String SCSTR_CHG_PROTECT Text [ portuguese ] = "Proteger histórico" ; Text [ portuguese_brazilian ] = "Protect trace" ; Text[ chinese_simplified ] = "ä¿æŠ¤è®°å½•"; - Text[ russian ] = "Çàùèòà çàïèñåé"; + Text[ russian ] = "Ââåäèòå ïàðîëü"; Text[ polish ] = "Chroñ zapis"; Text[ japanese ] = "記録ã®ä¿è·"; Text[ chinese_traditional ] = "ä¿è·è¨˜éŒ„"; @@ -2275,13 +2275,13 @@ String SCSTR_CHG_UNPROTECT Text [ portuguese ] = "Desactivar protecção do histórico" ; Text [ portuguese_brazilian ] = "Unprotect trace" ; Text[ chinese_simplified ] = "å–消ä¿æŠ¤è®°å½•"; - Text[ russian ] = "Ñíÿòü çàùèòó ñ çàïèñåé"; + Text[ russian ] = "Ñíÿòü çàùèòó çàïèñè èçìåíåíèé"; Text[ polish ] = "Anuluj ochronê historii"; Text[ japanese ] = "記録ã®ä¿è·ã‚’解除"; Text[ chinese_traditional ] = "å–消ä¿è·è¨˜éŒ„"; Text[ arabic ] = "Unprotect trace"; Text[ greek ] = "ÊáôÜñãçóç ðñïóôáóßáò êáôáãñáöþí"; - Text[ korean ] = "ê¸°ë¡ ë³´í˜¸ 취소"; + Text[ korean ] = "ë ˆì½”ë“œ 보호 í•´ì œ"; Text[ turkish ] = "Unprotect trace"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desprotegeix el rastre"; @@ -2310,7 +2310,7 @@ String SCSTR_PASSWORD Text[ chinese_traditional ] = "密碼："; Text[ arabic ] = "ßáãÉ ÇáÓÑ:"; Text[ greek ] = "Êùäéêüò ðñüóâáóçò:"; - Text[ korean ] = "패스워드:"; + Text[ korean ] = "암호:"; Text[ turkish ] = "Þifre:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Contrasenya:"; @@ -2338,7 +2338,7 @@ String SCSTR_PASSWORDOPT Text[ chinese_traditional ] = "密碼(å¯çœç•¥)："; Text[ arabic ] = "ßáãÉ ÇáÓÑ (ÇÎÊíÇÑíÉ):"; Text[ greek ] = "Êùäéêüò ðñüóâáóçò (ðñïáéñåôéêÜ):"; - Text[ korean ] = "패스워드 (옵션):"; + Text[ korean ] = "암호 (옵션):"; Text[ turkish ] = "Þifre (isteðe baðlý):"; Text[ language_user1 ] = " "; Text[ catalan ] = "Contrasenya (opcional):"; @@ -2367,7 +2367,7 @@ String SCSTR_WRONGPASSWORD Text[ chinese_traditional ] = "密碼無效"; Text[ arabic ] = "ßáãÉ ÓÑ ÛíÑ ÕÍíÍÉ"; Text[ greek ] = "ÅóöáëìÝíïò êùäéêüò ðñüóâáóçò"; - Text[ korean ] = "틀린 패스워드"; + Text[ korean ] = "옳지 ì•Šì€ ì•”í˜¸"; Text[ turkish ] = "Þifre yanlýþ"; Text[ language_user1 ] = " "; Text[ catalan ] = "Contrasenya incorrecta"; @@ -2454,7 +2454,7 @@ String SCSTR_UNKNOWN Text[ chinese_traditional ] = "未命å"; Text[ arabic ] = "ÛíÑ ãÚÑæÝ"; Text[ greek ] = "¢ãíùóôï"; - Text[ korean ] = "ì•Œë ¤ì ¸ìžˆì§€ã€€ì•ŠìŒ"; + Text[ korean ] = "ì•Œ 수 ì—†ìŒ"; Text[ turkish ] = "Bilinmiyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desconegut"; @@ -2868,7 +2868,7 @@ String SCSTR_FIELDSEP Text [ portuguese ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{espaço}\t32" ; Text [ french ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{Espace}\t32" ; Text [ dutch ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{Leeg}\t32" ; - Text [ spanish ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{vacío}\t32" ; + Text [ spanish ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{espacio}\t32" ; Text [ danish ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{tom}\t32" ; Text [ swedish ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{tom}\t32" ; Text [ finnish ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{space}\t32 " ; @@ -2946,7 +2946,7 @@ String SCSTR_GRFILTER_OPENERROR Text[ dutch ] = "Grafisch bestand kan niet worden geopend"; Text[ chinese_simplified ] = "æ— æ³•æ‰“å¼€å›¾å½¢æ–‡ä»¶"; Text[ greek ] = "Äåí åßíáé äõíáôüí íá áíïé÷èåß ôï áñ÷åßï ãñáöéêþí"; - Text[ korean ] = "그래픽 파ì¼ì„ ì—´ 수 없습니다."; + Text[ korean ] = "그림 파ì¼ì„ ì—´ 수 없습니다."; Text[ turkish ] = "Grafik dosyasý açýlamýyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot obrir el fitxer gràfic"; @@ -2976,7 +2976,7 @@ String SCSTR_GRFILTER_IOERROR Text[ dutch ] = "Grafisch bestand kan niet worden gelezen"; Text[ chinese_simplified ] = "æ— æ³•è¯»å–图形文件"; Text[ greek ] = "Äåí åßíáé äõíáôÞ ç áíÜãíùóç ôïõ áñ÷åßïõ ãñáöéêþí"; - Text[ korean ] = "그래픽 파ì¼ì„ ì½ì„ 수 없습니다."; + Text[ korean ] = "그림 파ì¼ì„ ì½ì„ 수 없습니다."; Text[ turkish ] = "Grafik dosyasý okunamýyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot llegir el fitxer gràfic"; @@ -3006,7 +3006,7 @@ String SCSTR_GRFILTER_FORMATERROR Text[ dutch ] = "Onbekende grafische-bestandsindeling"; Text[ chinese_simplified ] = "ä¸æ˜Žçš„å›¾å½¢æ ¼å¼"; Text[ greek ] = "¢ãíùóôç ìïñöÞ ãñáöéêþí"; - Text[ korean ] = "알수없는 그래픽 ì„œì‹"; + Text[ korean ] = "ì•Œ 수 없는 그래픽 ì„œì‹"; Text[ turkish ] = "Bilinmeyen grafik dosyasý"; Text[ language_user1 ] = " "; Text[ catalan ] = "El format de la imatge és desconegut"; @@ -3025,7 +3025,7 @@ String SCSTR_GRFILTER_VERSIONERROR Text [ french ] = "Cette version du fichier graphique n'est pas supportée !" ; Text [ swedish ] = "Grafikfilens version stöds inte" ; Text [ dutch ] = "Deze versie van het grafische bestand wordt niet ondersteund" ; - Text [ spanish ] = "No se soporta la versión del archivo gráfico" ; + Text [ spanish ] = "No se admite la versión del archivo gráfico" ; Text [ english_us ] = "This graphic file version is not supported" ; Text[ chinese_simplified ] = "ä¸æ”¯æŒè¿™ä¸ªå›¾å½¢æ–‡ä»¶ç‰ˆæœ¬"; Text[ russian ] = "Íå ïîääåðæèâàåòñÿ âåðñèÿ ãðàôè÷åñêîãî ôèëüòðà"; @@ -3096,7 +3096,7 @@ String SCSTR_GRFILTER_TOOBIG Text[ dutch ] = "Niet genoeg vrij geheugen om de afbeelding in te voegen"; Text[ chinese_simplified ] = "没有足够的内å˜ç”¨äºŽæ’入图形"; Text[ greek ] = "Ç ìíÞìç äåí åðáñêåß ãéá ôçí ðñïóèÞêç ôïõ ãñáöéêïý."; - Text[ korean ] = "메모리가 부족하여 ê·¸ëž˜í”½ì„ ì‚½ìž…í• ìˆ˜ 없습니다."; + Text[ korean ] = "메모리가 부족하여 ê·¸ë¦¼ì„ ì‚½ìž…í• ìˆ˜ 없습니다."; Text[ turkish ] = "Grafiðin eklenmesi için yeterli bellek yok"; Text[ language_user1 ] = " "; Text[ catalan ] = "No hi ha prou memòria per a inserir la imatge"; @@ -3233,7 +3233,7 @@ String STR_REPLCELLSWARN Text[ swedish ] = "Cellerna som du vill klistra in data i innehåller redan data.\nVill du verkligen skriva över dessa data?"; Text[ polish ] = "Do you want to replace the contents of the destination cells?"; Text[ japanese ] = "データを挿入ã—よã†ã¨ã—ã¦ã„るセルã«ã¯ã€ã™ã§ã«ãƒ‡ãƒ¼ã‚¿ãŒã‚ã‚Šã¾ã™ã€‚\næ—¢å˜ã®ãƒ‡ãƒ¼ã‚¿ã«ä¸Šæ›¸ãã—ã¾ã™ã‹ã€‚"; - Text[ korean ] = "ë¶™ì—¬ë„£ê¸°í•˜ë ¤ëŠ” ì…€ì—는 ì´ë¯¸ ë°ì´í„°ê°€ 있습니다. ì •ë§ë¡œ ê¸°ì¡´ì˜ ë°ì´í„°ë¥¼ ê²¹ì³ì“°ì‹œê² 습니까?"; + Text[ korean ] = "ë¶™ì—¬ë„£ê¸°í•˜ë ¤ëŠ” ì…€ì—는 ì´ë¯¸ ë°ì´í„°ê°€ 있습니다. ê¸°ì¡´ì˜ ë°ì´í„°ë¥¼ ë®ì–´ì“°ì‹œê² 습니까?"; Text[ chinese_simplified ] = "è¦ç²˜è´´æ•°æ®çš„å•å…ƒæ ¼å·²ç»å«æœ‰æ•°æ®ã€‚\n真的è¦æ”¹å†™çŽ°å˜çš„æ•°æ®ï¼Ÿ"; Text[ chinese_traditional ] = "è¦è²¼ä¸Šè³‡æ–™çš„儲å˜æ ¼å·²ç¶“å«æœ‰è³‡æ–™ã€‚\n您真的è¦è¦†å¯«ç¾æœ‰çš„資料？"; Text[ turkish ] = "Do you want to replace the contents of the destination cells?"; @@ -3277,18 +3277,18 @@ String STR_ACC_CSVRULER_DESCR Text[ russian ] = "Ruler which manages objects at fixed positions."; Text[ greek ] = "Ruler which manages objects at fixed positions."; Text[ dutch ] = "Ruler which manages objects at fixed positions."; - Text[ french ] = "Ruler which manages objects at fixed positions."; - Text[ spanish ] = "Ruler which manages objects at fixed positions."; + Text[ french ] = "Cette règle gère les objets à des positions fixes."; + Text[ spanish ] = "Esta regla administra los objetos en posiciones fijas. "; Text[ finnish ] = "Ruler which manages objects at fixed positions."; - Text[ italian ] = "Ruler which manages objects at fixed positions."; + Text[ italian ] = "Il righello gestisce oggetti in posizione fissa."; Text[ danish ] = "Ruler which manages objects at fixed positions."; - Text[ swedish ] = "Ruler which manages objects at fixed positions."; + Text[ swedish ] = "Den här linjalen hanterar objekt på fasta positioner."; Text[ polish ] = "Ruler which manages objects at fixed positions."; Text[ portuguese_brazilian ] = "Ruler which manages objects at fixed positions."; - Text[ japanese ] = "Ruler which manages objects at fixed positions."; - Text[ korean ] = "Ruler which manages objects at fixed positions."; - Text[ chinese_simplified ] = "Ruler which manages objects at fixed positions."; - Text[ chinese_traditional ] = "Ruler which manages objects at fixed positions."; + Text[ japanese ] = "ã“ã®ãƒ«ãƒ¼ãƒ©ã‚’使用ã—ã¦ã‚ªãƒ–ジェクトã®é…置を決ã‚ã¾ã™ã€‚"; + Text[ korean ] = "ì´ ëˆˆê¸ˆìžëŠ” ê³ ì •ëœ ìœ„ì¹˜ì— ìžˆëŠ” 개체를 관리합니다."; + Text[ chinese_simplified ] = "é€šè¿‡è¿™ä¸ªå°ºæ ‡æ¥æŽ§åˆ¶å¤„于固定ä½ç½®çš„对象。"; + Text[ chinese_traditional ] = "標尺在固定ä½ç½®ç®¡ç†ç‰©ä»¶ã€‚"; Text[ turkish ] = "Ruler which manages objects at fixed positions."; Text[ arabic ] = "Ruler which manages objects at fixed positions."; Text[ catalan ] = "Ruler which manages objects at fixed positions."; @@ -3304,18 +3304,18 @@ String STR_ACC_CSVGRID_NAME Text[ russian ] = "Preview table"; Text[ greek ] = "Preview table"; Text[ dutch ] = "Preview table"; - Text[ french ] = "Feuille d'aperçu"; + Text[ french ] = "Aperçu"; Text[ spanish ] = "Previsualización"; Text[ finnish ] = "Preview table"; - Text[ italian ] = "Anteprima tabella"; + Text[ italian ] = "Anteprima"; Text[ danish ] = "Preview table"; Text[ swedish ] = "Förhandsvisning"; Text[ polish ] = "Preview table"; Text[ portuguese_brazilian ] = "Preview table"; Text[ japanese ] = "プレビュー"; - Text[ korean ] = "미리보기"; - Text[ chinese_simplified ] = "预视工作表"; - Text[ chinese_traditional ] = "é 覽工作表"; + Text[ korean ] = "미리 보기"; + Text[ chinese_simplified ] = "预览"; + Text[ chinese_traditional ] = "é 覽"; Text[ turkish ] = "Preview table"; Text[ arabic ] = "Preview table"; Text[ catalan ] = "Preview table"; @@ -3331,18 +3331,18 @@ String STR_ACC_CSVGRID_DESCR Text[ russian ] = "This sheet shows, how the data will be arranged in the document."; Text[ greek ] = "This sheet shows, how the data will be arranged in the document."; Text[ dutch ] = "This sheet shows, how the data will be arranged in the document."; - Text[ french ] = "This sheet shows, how the data will be arranged in the document."; - Text[ spanish ] = "This sheet shows, how the data will be arranged in the document."; + Text[ french ] = "Cette feuille montre la disposition des données dans le document."; + Text[ spanish ] = "Esta hoja muestra la disposición de los datos en el documento. "; Text[ finnish ] = "This sheet shows, how the data will be arranged in the document."; - Text[ italian ] = "This sheet shows, how the data will be arranged in the document."; + Text[ italian ] = "La tabella mostra la disposizione dei dati nel documento."; Text[ danish ] = "This sheet shows, how the data will be arranged in the document."; - Text[ swedish ] = "This sheet shows, how the data will be arranged in the document."; + Text[ swedish ] = "Den här tabellen visar hur data ordnas i dokumentet."; Text[ polish ] = "This sheet shows, how the data will be arranged in the document."; Text[ portuguese_brazilian ] = "This sheet shows, how the data will be arranged in the document."; - Text[ japanese ] = "This sheet shows, how the data will be arranged in the document."; - Text[ korean ] = "This sheet shows, how the data will be arranged in the document."; - Text[ chinese_simplified ] = "This sheet shows, how the data will be arranged in the document."; - Text[ chinese_traditional ] = "This sheet shows, how the data will be arranged in the document."; + Text[ japanese ] = "ã“ã®è¡¨ã«ç¤ºã™ã‚ˆã†ã«ãƒ‰ã‚ュメント内ã«ãƒ‡ãƒ¼ã‚¿ãŒé…ç½®ã•ã‚Œã¾ã™ã€‚"; + Text[ korean ] = "ì´ ì‹œíŠ¸ëŠ” ë°ì´í„°ê°€ 문서ì—ì„œ 어떻게 배치ë 것ì¸ì§€ 표시해ì¤ë‹ˆë‹¤."; + Text[ chinese_simplified ] = "这个工作表显示出在文档之内的数æ®æŽ’列方å¼ã€‚"; + Text[ chinese_traditional ] = "這個工作表顯示資料將在文件內排列的方å¼ã€‚"; Text[ turkish ] = "This sheet shows, how the data will be arranged in the document."; Text[ arabic ] = "This sheet shows, how the data will be arranged in the document."; Text[ catalan ] = "This sheet shows, how the data will be arranged in the document."; @@ -3359,7 +3359,7 @@ String STR_ACC_DOC_NAME Text[ greek ] = "Document View"; Text[ dutch ] = "Document View"; Text[ french ] = "Affichage du document"; - Text[ spanish ] = "Ver documento"; + Text[ spanish ] = "Visualización del documento"; Text[ finnish ] = "Document View"; Text[ italian ] = "Vista documento"; Text[ danish ] = "Document View"; @@ -3422,18 +3422,18 @@ String STR_ACC_CELL_NAME Text[ russian ] = "Table Cell %1"; Text[ greek ] = "Table Cell %1"; Text[ dutch ] = "Table Cell %1"; - Text[ french ] = "Cellule de feuille %1"; + Text[ french ] = "Cellule %1"; Text[ spanish ] = "Celda %1"; Text[ finnish ] = "Table Cell %1"; - Text[ italian ] = "Cella della tabella %1"; + Text[ italian ] = "Cella %1"; Text[ danish ] = "Table Cell %1"; - Text[ swedish ] = "Tabellcell %1"; + Text[ swedish ] = "Cell %1"; Text[ polish ] = "Table Cell %1"; Text[ portuguese_brazilian ] = "Table Cell %1"; Text[ japanese ] = "表ã®ã‚»ãƒ« %1"; - Text[ korean ] = "í‘œì˜ ì…€ %1"; - Text[ chinese_simplified ] = "工作表å•å…ƒæ ¼ %1"; - Text[ chinese_traditional ] = "工作表儲å˜æ ¼ %1"; + Text[ korean ] = "ì…€ %1"; + Text[ chinese_simplified ] = "å•å…ƒæ ¼ %1"; + Text[ chinese_traditional ] = "儲å˜æ ¼ %1"; Text[ turkish ] = "Table Cell %1"; Text[ arabic ] = "Table Cell %1"; Text[ catalan ] = "Table Cell %1"; @@ -3455,7 +3455,7 @@ String STR_ACC_PREVIEWDOC_NAME Text[ greek ] = "Page Preview"; Text[ dutch ] = "Page Preview"; Text[ french ] = "Aperçu de page"; - Text[ spanish ] = "Previsualización página"; + Text[ spanish ] = "Vista preliminar"; Text[ finnish ] = "Page Preview"; Text[ italian ] = "Anteprima di pagina"; Text[ danish ] = "Page Preview"; @@ -3463,7 +3463,7 @@ String STR_ACC_PREVIEWDOC_NAME Text[ polish ] = "Page Preview"; Text[ portuguese_brazilian ] = "Page Preview"; Text[ japanese ] = "å°åˆ·ãƒ—レビュー"; - Text[ korean ] = "페ì´ì§€ 미리보기"; + Text[ korean ] = "페ì´ì§€ 미리 보기"; Text[ chinese_simplified ] = "页é¢é¢„览"; Text[ chinese_traditional ] = "é é¢æª¢è¦–"; Text[ turkish ] = "Page Preview"; @@ -3592,18 +3592,18 @@ String STR_ACC_HEADER_NAME Text[ russian ] = "Header"; Text[ greek ] = "Header"; Text[ dutch ] = "Header"; - Text[ french ] = "En-tête"; - Text[ spanish ] = "Encabezamiento"; + Text[ french ] = "En-tête de la page %1"; + Text[ spanish ] = "Encabezamiento de la página %1"; Text[ finnish ] = "Header"; - Text[ italian ] = "Riga d'intestazione"; + Text[ italian ] = "Riga d'intestazione della pagina %1"; Text[ danish ] = "Header"; - Text[ swedish ] = "Sidhuvud"; + Text[ swedish ] = "Sidhuvud sida %1"; Text[ polish ] = "Header"; Text[ portuguese_brazilian ] = "Header"; - Text[ japanese ] = "ヘッダ"; - Text[ korean ] = "머리글"; - Text[ chinese_simplified ] = "页眉"; - Text[ chinese_traditional ] = "é 首"; + Text[ japanese ] = "ページ %1 ã®ãƒ˜ãƒƒãƒ€"; + Text[ korean ] = "%1 페ì´ì§€ì˜ 머리글"; + Text[ chinese_simplified ] = "页眉 页 %1"; + Text[ chinese_traditional ] = "é %1 çš„é 首"; Text[ turkish ] = "Header"; Text[ arabic ] = "Header"; Text[ catalan ] = "Header"; @@ -3624,18 +3624,18 @@ String STR_ACC_FOOTER_NAME Text[ russian ] = "Footer"; Text[ greek ] = "Footer"; Text[ dutch ] = "Footer"; - Text[ french ] = "Pied de page"; - Text[ spanish ] = "Pie de página"; + Text[ french ] = "Pied de page de la page %1"; + Text[ spanish ] = "Pie de página de la página %1"; Text[ finnish ] = "Footer"; - Text[ italian ] = "Piè di pagina"; + Text[ italian ] = "Piè di pagina della pagina %1"; Text[ danish ] = "Footer"; - Text[ swedish ] = "Sidfot"; + Text[ swedish ] = "Sidfot sida %1"; Text[ polish ] = "Footer"; Text[ portuguese_brazilian ] = "Footer"; - Text[ japanese ] = "フッタ"; - Text[ korean ] = "페ì´ì§€ %1ì˜ ë°”ë‹¥ê¸€"; - Text[ chinese_simplified ] = "页脚"; - Text[ chinese_traditional ] = "é å°¾"; + Text[ japanese ] = "ページ %1 ã®ãƒ•ãƒƒã‚¿"; + Text[ korean ] = "%1 페ì´ì§€ì˜ 바닥글"; + Text[ chinese_simplified ] = "页脚 页 %1"; + Text[ chinese_traditional ] = "é %1 çš„é å°¾"; Text[ turkish ] = "Footer"; Text[ arabic ] = "Footer"; Text[ catalan ] = "Footer"; @@ -3656,7 +3656,7 @@ String STR_ACC_EDITLINE_NAME Text[ russian ] = "Editline"; Text[ greek ] = "Editline"; Text[ dutch ] = "Editline"; - Text[ french ] = "Ligne d'édition"; + Text[ french ] = "Ligne de saisie"; Text[ spanish ] = "Línea de edición"; Text[ finnish ] = "Editline"; Text[ italian ] = "Riga di modifica"; @@ -3665,7 +3665,7 @@ String STR_ACC_EDITLINE_NAME Text[ polish ] = "Editline"; Text[ portuguese_brazilian ] = "Editline"; Text[ japanese ] = "入力行"; - Text[ korean ] = "ìž…ë ¥í–‰"; + Text[ korean ] = "ìž…ë ¥ì¤„"; Text[ chinese_simplified ] = "输入行"; Text[ chinese_traditional ] = "輸入欄"; Text[ turkish ] = "Editline"; @@ -3683,18 +3683,18 @@ String STR_ACC_EDITLINE_DESCR Text[ russian ] = "This is where you enter or edit text, numbers and formulas."; Text[ greek ] = "This is where you enter or edit text, numbers and formulas."; Text[ dutch ] = "This is where you enter or edit text, numbers and formulas."; - Text[ french ] = "This is where you enter or edit text, numbers and formulas."; - Text[ spanish ] = "This is where you enter or edit text, numbers and formulas."; + Text[ french ] = "Saisie et édition des textes, nombres et formules"; + Text[ spanish ] = "Aquí se puede introducir y editar texto, números y fórmulas. "; Text[ finnish ] = "This is where you enter or edit text, numbers and formulas."; - Text[ italian ] = "This is where you enter or edit text, numbers and formulas."; + Text[ italian ] = "Spazio per scrivere o modificare testo, numeri e formule."; Text[ danish ] = "This is where you enter or edit text, numbers and formulas."; - Text[ swedish ] = "This is where you enter or edit text, numbers and formulas."; + Text[ swedish ] = "Här kan du mata in och redigera text, tal och formler."; Text[ polish ] = "This is where you enter or edit text, numbers and formulas."; Text[ portuguese_brazilian ] = "This is where you enter or edit text, numbers and formulas."; - Text[ japanese ] = "This is where you enter or edit text, numbers and formulas."; - Text[ korean ] = "This is where you enter or edit text, numbers and formulas."; - Text[ chinese_simplified ] = "This is where you enter or edit text, numbers and formulas."; - Text[ chinese_traditional ] = "This is where you enter or edit text, numbers and formulas."; + Text[ japanese ] = "ã“ã“ã§ãƒ†ã‚ストã€æ•°å€¤ã€æ•°å¼ã®å…¥åŠ›ã¾ãŸã¯ç·¨é›†ã‚’è¡Œã„ã¾ã™ã€‚"; + Text[ korean ] = "여기ì—ì„œ í…스트, 숫ìžì™€ 수ì‹ì„ ìž…ë ¥í•˜ê±°ë‚˜ 편집합니다."; + Text[ chinese_simplified ] = "在æ¤æ‚¨èƒ½å¤Ÿè¾“入和编辑文å—ã€æ•°å—和公å¼ã€‚"; + Text[ chinese_traditional ] = "在æ¤æ‚¨èƒ½å¤ 輸入和編輯文å—ã€æ•¸å—和公å¼ã€‚"; Text[ turkish ] = "This is where you enter or edit text, numbers and formulas."; Text[ arabic ] = "This is where you enter or edit text, numbers and formulas."; Text[ catalan ] = "This is where you enter or edit text, numbers and formulas."; @@ -3710,18 +3710,18 @@ String STR_ACC_EDITCELL_NAME Text[ russian ] = "Table Cell %1"; Text[ greek ] = "Table Cell %1"; Text[ dutch ] = "Table Cell %1"; - Text[ french ] = "Cellule de feuille %1"; + Text[ french ] = "Cellule %1"; Text[ spanish ] = "Celda %1"; Text[ finnish ] = "Table Cell %1"; - Text[ italian ] = "Cella della tabella %1"; + Text[ italian ] = "Cella %1"; Text[ danish ] = "Table Cell %1"; - Text[ swedish ] = "Tabellcell %1"; + Text[ swedish ] = "Cell %1"; Text[ polish ] = "Table Cell %1"; Text[ portuguese_brazilian ] = "Table Cell %1"; Text[ japanese ] = "表ã®ã‚»ãƒ« %1"; - Text[ korean ] = "í‘œì˜ ì…€ %1"; - Text[ chinese_simplified ] = "工作表å•å…ƒæ ¼ %1"; - Text[ chinese_traditional ] = "工作表儲å˜æ ¼ %1"; + Text[ korean ] = "ì…€ %1"; + Text[ chinese_simplified ] = "å•å…ƒæ ¼ %1"; + Text[ chinese_traditional ] = "儲å˜æ ¼ %1"; Text[ turkish ] = "Table Cell %1"; Text[ arabic ] = "Table Cell %1"; Text[ catalan ] = "Table Cell %1"; @@ -3742,18 +3742,18 @@ String STR_ACC_DATAPILOT_ROW_DESCR Text[ russian ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; Text[ greek ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; Text[ dutch ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ french ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ spanish ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; + Text[ french ] = "Les champs que vous positionnez à cet endroit seront affichés comme lignes dans la table finale du pilote de données."; + Text[ spanish ] = "Los campos que coloque aquí se mostrarán como filas en la tabla final del Piloto de datos. "; Text[ finnish ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ italian ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; + Text[ italian ] = "I campi trascinati in questo spazio verranno visualizzati come righe nella tabella finale DataPilot."; Text[ danish ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ swedish ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; + Text[ swedish ] = "Fält som du placerar här visas som rader i den färdiga datapilottabellen."; Text[ polish ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; Text[ portuguese_brazilian ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ japanese ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ korean ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ chinese_simplified ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; - Text[ chinese_traditional ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; + Text[ japanese ] = "ã“ã“ã«ãƒ‰ãƒãƒƒãƒ—ã—ãŸãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ã€DataPilot テーブルã§è¡Œã¨ã—ã¦è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"; + Text[ korean ] = "여기ì—ì„œ ì§€ì •í•˜ëŠ” 필드는 ì™„ì„±ëœ ë°ì´í„° 파ì¼ëŸ¿ í…Œì´ë¸”ì—ì„œ 행으로 표시ë©ë‹ˆë‹¤."; + Text[ chinese_simplified ] = "您在æ¤è®¾å®šçš„å—段将会当作数æ®åŠ©ç†è¡¨æ ¼ä¹‹ä¸çš„行显示出æ¥ã€‚"; + Text[ chinese_traditional ] = "您拖曳到這裡的欄ä½å°‡é¡¯ç¤ºç‚ºæœ€å¾Œ DataPilot è¡¨æ ¼ä¸çš„列。"; Text[ turkish ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; Text[ arabic ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; Text[ catalan ] = "Fields that you drop here will be displayed as rows in the final DataPilot table."; @@ -3769,18 +3769,18 @@ String STR_ACC_DATAPILOT_COL_DESCR Text[ russian ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; Text[ greek ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; Text[ dutch ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ french ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ spanish ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; + Text[ french ] = "Les champs que vous positionnez à cet endroit seront affichés comme colonnes dans la table finale du pilote de données."; + Text[ spanish ] = "Los campos que coloque aquí se mostrarán como columnas en la tabla final del Piloto de datos. "; Text[ finnish ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ italian ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; + Text[ italian ] = "I campi trascinati in questo spazio verranno visualizzati come colonne nella tabella finale DataPilot."; Text[ danish ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ swedish ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; + Text[ swedish ] = "Fält som du placerar här visas som kolumner i den färdiga datapilottabellen."; Text[ polish ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; Text[ portuguese_brazilian ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ japanese ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ korean ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ chinese_simplified ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; - Text[ chinese_traditional ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; + Text[ japanese ] = "ã“ã“ã«ãƒ‰ãƒãƒƒãƒ—ã—ãŸãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ã€DataPilot テーブルã§åˆ—ã¨ã—ã¦è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"; + Text[ korean ] = "여기ì—ì„œ ì§€ì •í•˜ëŠ” 필드는 ì™„ì„±ëœ ë°ì´í„° 파ì¼ëŸ¿ í…Œì´ë¸”ì—ì„œ ì—´ë¡œ 표시ë©ë‹ˆë‹¤."; + Text[ chinese_simplified ] = "您在æ¤è®¾å®šçš„å—段将会当作数æ®åŠ©ç†è¡¨æ ¼ä¹‹ä¸çš„列显示出æ¥ã€‚"; + Text[ chinese_traditional ] = "您拖曳到這裡的欄ä½å°‡é¡¯ç¤ºç‚ºæœ€å¾Œ DataPilot è¡¨æ ¼ä¸çš„欄。"; Text[ turkish ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; Text[ arabic ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; Text[ catalan ] = "Fields that you drop here will be displayed as columns in the final DataPilot table."; @@ -3796,18 +3796,18 @@ String STR_ACC_DATAPILOT_DATA_DESCR Text[ russian ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; Text[ greek ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; Text[ dutch ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ french ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ spanish ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; + Text[ french ] = "Les champs que vous positionnez à cet endroit seront utilisés pour les calculs dans la table finale du pilote de données."; + Text[ spanish ] = "Los campos que coloque aquí se utilizarán para realizar cálculos en la tabla final del Piloto de datos. "; Text[ finnish ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ italian ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; + Text[ italian ] = "I campi trascinati in questo spazio verranno utilizzati per eseguire calcoli nella tabella finale DataPilot."; Text[ danish ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ swedish ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; + Text[ swedish ] = "Fält som du placerar här används för beräkningar i den färdiga datapilottabellen."; Text[ polish ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; Text[ portuguese_brazilian ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ japanese ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ korean ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ chinese_simplified ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; - Text[ chinese_traditional ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; + Text[ japanese ] = "ã“ã“ã«ãƒ‰ãƒãƒƒãƒ—ã—ãŸãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ã€DataPilot テーブルã§ã®è¨ˆç®—ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"; + Text[ korean ] = "여기ì—ì„œ ì§€ì •í•˜ëŠ” 필드는 ì™„ì„±ëœ ë°ì´í„° 파ì¼ëŸ¿ í…Œì´ë¸”ì—ì„œ 계산으로 사용ë©ë‹ˆë‹¤."; + Text[ chinese_simplified ] = "您在æ¤è®¾å®šçš„å—段将会用于数æ®åŠ©ç†è¡¨æ ¼ä¹‹ä¸è®¡ç®—。"; + Text[ chinese_traditional ] = "您拖曳到這裡的欄ä½å°‡åœ¨æœ€å¾Œ DataPilot è¡¨æ ¼ä¸ç”¨æ–¼è¨ˆç®—。"; Text[ turkish ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; Text[ arabic ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; Text[ catalan ] = "Fields that you drop here will be used for calculations in the final DataPilot table."; @@ -3824,21 +3824,26 @@ String STR_ACC_DATAPILOT_SEL_DESCR Text[ russian ] = "List the fields that you can drag to one of the other three areas."; Text[ greek ] = "List the fields that you can drag to one of the other three areas."; Text[ dutch ] = "List the fields that you can drag to one of the other three areas."; - Text[ french ] = "List the fields that you can drag to one of the other three areas."; - Text[ spanish ] = "List the fields that you can drag to one of the other three areas."; + Text[ french ] = "Liste des champs pouvant être déplacés vers l'une des trois zones."; + Text[ spanish ] = "Lista de los campos que se pueden llevar hasta una de las otras tres áreas."; Text[ finnish ] = "List the fields that you can drag to one of the other three areas."; - Text[ italian ] = "List the fields that you can drag to one of the other three areas."; + Text[ italian ] = "Elenco dei campi che potete trascinare in una delle tre aree."; Text[ danish ] = "List the fields that you can drag to one of the other three areas."; - Text[ swedish ] = "List the fields that you can drag to one of the other three areas."; + Text[ swedish ] = "Här är fält listade som du kan dra till ett av de andra tre områdena."; Text[ polish ] = "List the fields that you can drag to one of the other three areas."; Text[ portuguese_brazilian ] = "List the fields that you can drag to one of the other three areas."; - Text[ japanese ] = "List the fields that you can drag to one of the other three areas."; - Text[ korean ] = "List the fields that you can drag to one of the other three areas."; - Text[ chinese_simplified ] = "List the fields that you can drag to one of the other three areas."; - Text[ chinese_traditional ] = "List the fields that you can drag to one of the other three areas."; + Text[ japanese ] = "ä»–ã®3ã¤ã®ç¯„囲ã®ã„ãšã‚Œã‹ã«ãƒ‰ãƒ©ãƒƒã‚°å¯èƒ½ãªãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’リストã—ã¾ã™ã€‚"; + Text[ korean ] = "다른 세 ì˜ì— 중 í•œ ì˜ì—으로 ëŒì–´ì˜¬ 수 있는 필드를 열거합니다."; + Text[ chinese_simplified ] = "在æ¤åˆ—出您能够在三个区域之间移动的å—段。"; + Text[ chinese_traditional ] = "列出您å¯ä»¥æ‹–曳到其他三個å€åŸŸä¹‹ä¸€çš„欄ä½ã€‚"; Text[ turkish ] = "List the fields that you can drag to one of the other three areas."; Text[ arabic ] = "List the fields that you can drag to one of the other three areas."; Text[ catalan ] = "List the fields that you can drag to one of the other three areas."; Text[ thai ] = "List the fields that you can drag to one of the other three areas."; }; + + + + + diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src index ba7509f3dc23..80a6802a042b 100644 --- a/sc/source/ui/src/scwarngs.src +++ b/sc/source/ui/src/scwarngs.src @@ -2,9 +2,9 @@ * * $RCSfile: scwarngs.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-07-14 02:41:01 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,32 +74,33 @@ Resource RID_WRNHDLSC Text [ ENGLISH ] = "The current table has only been saved." ; Text [ english_us ] = "Only the active sheet could be saved." ; Text [ italian ] = "È stata salvata solo la tabella corrente." ; - Text [ spanish ] = "Solo se ha guardado la hoja actual." ; + Text [ spanish ] = "Sólo se ha guardado la hoja actual." ; Text [ french ] = "Seule la feuille active a été enregistrée." ; - Text [ dutch ] = "Alleen de actuele tabel werd opgeslagen." ; + Text [ dutch ] = "Alleen de huidige tabel is opgeslagen." ; Text [ swedish ] = "Det är bara den aktuella tabellen som har sparats." ; Text [ danish ] = "Kun det aktuelle ark blev gemt." ; Text [ portuguese_brazilian ] = "Es wurde nur die aktuelle Tabelle gespeichert." ; Text [ portuguese ] = "Só foi guardada a tabela activa." ; - Text[ chinese_simplified ] = "Ö»´æÅÌÁ˵±Ç°µÄ±í¸ñ¡£"; - Text[ russian ] = "Ñîõðàíåíà òîëüêî òåêóùàÿ òàáëèöà."; + Text[ chinese_simplified ] = "åªå˜ç›˜äº†å½“å‰çš„è¡¨æ ¼ã€‚"; + Text[ russian ] = "Ñîõðàíåí òîëüêî àêòèâíûé ëèñò."; Text[ polish ] = "Tylko aktualny arkusz zosta³ zapisany."; - Text[ japanese ] = "Œ»Ý‚Ì•\\‚¾‚¯‚ª•Û‘¶‚³‚ê‚Ü‚µ‚½B"; - Text[ chinese_traditional ] = "¥uÀx¦s¤F·í«eªºªí®æ¡C"; + Text[ japanese ] = "ç¾åœ¨ã®è¡¨ã ã‘ãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚"; + Text[ chinese_traditional ] = "åªå„²å˜äº†ç›®å‰çš„è¡¨æ ¼ã€‚"; Text[ arabic ] = "Êã ÍÝÙ ÇáÌÏæá ÇáÍÇáí ÝÞØ."; Text[ greek ] = "Áðïèçêåýôçêå ìüíï ï ôñÝ÷ùí ðßíáêáò."; - Text[ korean ] = "È°¼ºÈµÈ ½ÃÆ®¸¸ÀÌ ÀúÀåµÇ¾ú½À´Ï´Ù."; + Text[ korean ] = "í™œì„±í™”ëœ ì‹œíŠ¸ë§Œì´ ì €ìž¥ë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Yalnýzca yürürlükteki tablo kaydedildi."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Solo se ha guardado la hoja actual."; - Text[ finnish ] = "Vain aktiivinen lomake voitiin tallentaa."; + Text[ catalan ] = "Només s'ha pogut desar el full actiu."; + Text[ finnish ] = "Vain aktiivinen taulukko voitiin tallentaa."; + Text[ thai ] = "ไม่สามารถบันทึà¸à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™à¸—ี่ใช้งานà¸à¸¢à¸¹à¹ˆà¹€à¸—่านั้นได้"; }; String ERRCODE_SC_IMPORT_WRN_RNGOVRFLW & SH_MAX { /* ### ACHTUNG: Neuer Text in Resource? Die Maximalanzahl von Zeilen wurde überschritten. überzählige Zeilen wurden nicht mitimportiert! : Die Maximalanzahl von Zeilen wurde ³berschritten. ³berzõhlige Zeilen wurden nicht mitimportiert! */ Text = "Die Maximalanzahl von Zeilen wurde überschritten. überzählige Zeilen wurden nicht mitimportiert!" ; Text [ ENGLISH ] = "The number of rows exceeded the maximum. Additional rows were not importet!" ; - Text [ dutch ] = "Het maximale aantal regels werd overschreden. Het teveel aan regels werd niet geïmporteerd." ; + Text [ dutch ] = "Het maximale aantal regels is overschreden. Het teveel aan regels is niet geïmporteerd." ; Text [ english_us ] = "The number of rows exceeded the maximum. Additional rows were not imported!" ; Text [ italian ] = "È stato superato il numero massimo di righe. Le righe in eccesso non sono state importate!" ; Text [ spanish ] = "¡Se ha excedido el número máximo de filas, las filas adicionales no se importaron!" ; @@ -108,18 +109,19 @@ Resource RID_WRNHDLSC Text [ danish ] = "Det maksimale antal rækker blev overskredet. De overtallige rækker blev ikke importeret!" ; Text [ portuguese ] = "O número máximo de linhas foi ultrapassado. As linhas em excesso não foram importadas!" ; Text [ portuguese_brazilian ] = "Die Maximalanzahl von Zeilen wurde ?erschritten. ?erz?hlige Zeilen wurden nicht mitimportiert!" ; - Text[ chinese_simplified ] = "ÒѾ³¬¹ýÐеÄ×î´óÊýÄ¿£¬³¬¹ýµÄÐÐûÓб»ÊäÈ룡"; + Text[ chinese_simplified ] = "å·²ç»è¶…过行的最大数目，超过的行没有被输入ï¼"; Text[ russian ] = "Ìàêñèìàëüíîå ÷èñëî ñòðîê ïðåâûøåíî. Ñòðîêè, ïðåâûøàþùèå çàäàííîå ÷èñëî, èìïîðòèðîâàíû íå áóäóò!"; Text[ polish ] = "Maksymalna liczba wierszy zosta³a przekroczona. Pozosta³e wiersze nie bêd¹ importowane!"; - Text[ japanese ] = "s‚ÌÅ‚”‚ð’´‚¦‚Ä‚¢‚Ü‚·B‰ßè‚Ìs‚ͲÝÎß°Ä‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"; - Text[ chinese_traditional ] = "¤w¸g¶W¹L¦Cªº³Ì¤j¼Æ¥Ø¡A¨S¦³¶×¤J¶W¹Lªº¦C¡I"; + Text[ japanese ] = "è¡Œã®æœ€é«˜æ•°ã‚’超ãˆã¦ã„ã¾ã™ã€‚éŽå‰°ã®è¡Œã¯ã‚¤ãƒ³ãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"; + Text[ chinese_traditional ] = "已經超éŽåˆ—的最大數目，沒有匯入超éŽçš„列ï¼"; Text[ arabic ] = "Êã ÊÌÇæÒ ÇáÚÏÏ ÇáÃÞÕì ááÕÝæÝ¡ áåÐÇ áã íÊã ÇÓÊíÑÇÏ ÇáÕÝæÝ ÇáÒÇÆÏÉ!"; Text[ greek ] = "¸ãéíå õðÝñâáóç ôïõ ìÝãéóôïõ áñéèìïý ãñáììþí. Äåí èá ãßíåé åéóáãùãÞ ôùí ãñáììþí ðïõ îåðåñíïýí ôï üñéï!"; - Text[ korean ] = "ÇàÀÇ ÃÖ´ë °³¼ö¸¦ ÃÊ°úÇß½À´Ï´Ù. ÇàÀÌ Ãß°¡µÇÁö ¸øÇß½À´Ï´Ù.!"; + Text[ korean ] = "í–‰ì˜ ìµœëŒ€ 개수가 초과했습니다. í–‰ì„ ì¶”ê°€í•˜ì§€ 못했습니다."; Text[ turkish ] = "Azami satýr sayýsý aþýldý. Fazla satýrlar içe aktarýlmadý!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Se ha excedido el número máximo de filas, las filas adicionales no se importaron!"; + Text[ catalan ] = "S'ha excedit el nombre màxim de files. Les files addicionals no s'han importat."; Text[ finnish ] = "Rivimäärä on ylittänyt sallitun enimmäisrajan. Ylimääräisiä rivejä ei tuotu."; + Text[ thai ] = "จำนวนà¹à¸–วเà¸à¸´à¸™à¸ˆà¸³à¸™à¸§à¸™à¸—ี่มาà¸à¸—ี่สุด ไม่ได้นำเข้าà¹à¸–วเพิ่ม!"; }; /* String ERRCODE_SC_ & SH_MAX @@ -133,3 +135,15 @@ Resource RID_WRNHDLSC + + + + + + + + + + + + diff --git a/sc/source/ui/src/simpref.src b/sc/source/ui/src/simpref.src index 05b28c64989c..f279fa0dd2ef 100644 --- a/sc/source/ui/src/simpref.src +++ b/sc/source/ui/src/simpref.src @@ -2,9 +2,9 @@ * * $RCSfile: simpref.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:20:25 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,9 @@ // (C) 1994-96 StarDivision GmbH, Hamburg, Germany // // $Workfile: simpref.src $ - // $Author: kz $ - // $Date: 2001-07-14 20:20:25 $ - // $Revision: 1.10 $ + // $Author: hr $ + // $Date: 2003-03-26 18:06:32 $ + // $Revision: 1.11 $ // $Logfile: T:/sc/source/ui/src/simpref.srv $ //---------------------------------------------------------------------------- @@ -98,17 +98,18 @@ ModelessDialog RID_SCDLG_SIMPLEREF Text [ dutch ] = "Bereik" ; Text [ spanish ] = "Área" ; Text [ english_us ] = "Area" ; - Text[ chinese_simplified ] = "ÇøÓò"; - Text[ russian ] = "Îáëàñòü"; + Text[ chinese_simplified ] = "区域"; + Text[ russian ] = "Äèàïàçîí"; Text[ polish ] = "Obszar"; - Text[ japanese ] = "”͈Í"; - Text[ chinese_traditional ] = "°Ï°ì"; + Text[ japanese ] = "範囲"; + Text[ chinese_traditional ] = "å€åŸŸ"; Text[ arabic ] = "ÇáäØÇÞ"; Text[ greek ] = "Ðåñéï÷Þ"; - Text[ korean ] = "¿µ¿ª"; + Text[ korean ] = "ì˜ì—"; Text[ turkish ] = "Bölüm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Área"; + Text[ catalan ] = "Àrea"; + Text[ thai ] = "พื้นที่"; }; Edit ED_ASSIGN { @@ -136,16 +137,17 @@ ModelessDialog RID_SCDLG_SIMPLEREF QuickHelpText [ portuguese ] = "Afastar" ; QuickHelpText[ russian ] = "Óìåíüøèòü"; QuickHelpText[ polish ] = "Pomniejsz"; - QuickHelpText[ japanese ] = "k¬"; - QuickHelpText[ chinese_simplified ] = "ËõС"; - QuickHelpText[ chinese_traditional ] = "ÁY¤p"; + QuickHelpText[ japanese ] = "縮å°"; + QuickHelpText[ chinese_simplified ] = "缩å°"; + QuickHelpText[ chinese_traditional ] = "縮å°"; QuickHelpText[ arabic ] = "ÊÕÛíÑ"; QuickHelpText[ greek ] = "Óìßêñõíóç"; - QuickHelpText[ korean ] = "Ãà¼Ò"; + QuickHelpText[ korean ] = "축소"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern"; - QuickHelpText[ catalan ] = "Reducir"; + QuickHelpText[ catalan ] = "Redueix"; QuickHelpText[ finnish ] = "Kutista"; + QuickHelpText[ thai ] = "Shrink"; }; OKButton BTN_OK { @@ -169,3 +171,12 @@ ModelessDialog RID_SCDLG_SIMPLEREF + + + + + + + + + diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src index 7e652a70fed5..d27a74664099 100644 --- a/sc/source/ui/src/solvrdlg.src +++ b/sc/source/ui/src/solvrdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: solvrdlg.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:21:36 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,9 @@ // (C) 1994-96 StarDivision GmbH, Hamburg, Germany // // $Workfile: solvrdlg.src $ - // $Author: kz $ - // $Date: 2001-07-14 20:21:36 $ - // $Revision: 1.17 $ + // $Author: hr $ + // $Date: 2003-03-26 18:06:32 $ + // $Revision: 1.18 $ // $Logfile: T:/sc/source/ui/src/solvrdlg.srv $ //---------------------------------------------------------------------------- @@ -84,7 +84,7 @@ ModelessDialog RID_SCDLG_SOLVER Text [ italian ] = "Ricerca valore destinazione" ; Text [ portuguese_brazilian ] = "Resolver" ; Text [ portuguese ] = "Resolver" ; - Text [ finnish ] = "Tuloksen haku" ; + Text [ finnish ] = "Tavoitteen haku" ; Text [ danish ] = "Målsøgning" ; Text [ french ] = "Recherche de valeur cible" ; Text [ swedish ] = "Målvärdessökning" ; @@ -103,24 +103,25 @@ ModelessDialog RID_SCDLG_SOLVER Text [ italian ] = "~Cella formula" ; Text [ portuguese_brazilian ] = "~c?lula de f?mula" ; Text [ portuguese ] = "Célula de ~fórmula" ; - Text [ finnish ] = "Kaavasolu" ; + Text [ finnish ] = "~Kaavasolu" ; Text [ danish ] = "~Formelcelle" ; Text [ french ] = "Cellule de formule" ; Text [ swedish ] = "~Formelcell" ; Text [ dutch ] = "~Formulecel" ; Text [ spanish ] = "Celda de ~fórmula" ; Text [ english_us ] = "~Formula cell" ; - Text[ chinese_simplified ] = "¹«Ê½µ¥Ôª¸ñ(~F)"; - Text[ russian ] = "ß÷åéêà ôîðìóë"; + Text[ chinese_simplified ] = "å…¬å¼å•å…ƒæ ¼(~F)"; + Text[ russian ] = "ß÷åéêà ñ ôîðìóëîé"; Text[ polish ] = "Komórka formu³y"; - Text[ japanese ] = "”Ž®¾Ù(~F)"; - Text[ chinese_traditional ] = "¤½¦¡Àx¦s®æ(~F)"; + Text[ japanese ] = "æ•°å¼ã‚»ãƒ«(~F)"; + Text[ chinese_traditional ] = "å…¬å¼å„²å˜æ ¼(~F)"; Text[ arabic ] = "ÎáíÉ ÕíÛÉ"; Text[ language_user1 ] = " "; Text[ greek ] = "Êåëß ôýðïõ"; - Text[ korean ] = "¼ö½Ä ¼¿(~F)"; + Text[ korean ] = "ìˆ˜ì‹ ì…€(~F)"; Text[ turkish ] = "~Formül hücresi"; - Text[ catalan ] = "Celda de ~fórmula"; + Text[ catalan ] = "Cel.la de ~fórmula"; + Text[ thai ] = "เซลล์ที่เป็น~สูตร"; }; Edit ED_FORMULACELL { @@ -147,17 +148,18 @@ ModelessDialog RID_SCDLG_SOLVER QuickHelpText [ portuguese ] = "Afastar" ; QuickHelpText[ russian ] = "Óìåíüøèòü"; QuickHelpText[ polish ] = "Pomniejsz"; - QuickHelpText[ japanese ] = "k¬"; - QuickHelpText[ chinese_simplified ] = "ËõС"; - QuickHelpText[ chinese_traditional ] = "ÁY¤p"; + QuickHelpText[ japanese ] = "縮å°"; + QuickHelpText[ chinese_simplified ] = "缩å°"; + QuickHelpText[ chinese_traditional ] = "縮å°"; QuickHelpText[ arabic ] = "ÊÕÛíÑ"; QuickHelpText[ greek ] = "Óìßêñõíóç"; - QuickHelpText[ korean ] = "Ãà¼Ò"; + QuickHelpText[ korean ] = "축소"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern"; - QuickHelpText[ catalan ] = "Reducir"; + QuickHelpText[ catalan ] = "Redueix"; QuickHelpText[ finnish ] = "Kutista"; + QuickHelpText[ thai ] = "Shrink"; }; FixedText FT_TARGETVAL { @@ -176,17 +178,18 @@ ModelessDialog RID_SCDLG_SOLVER Text [ dutch ] = "~Doelwaarde" ; Text [ spanish ] = "Valor ~destino" ; Text [ english_us ] = "Target ~value" ; - Text[ chinese_simplified ] = "Ä¿±êÖµ(~V)"; - Text[ russian ] = "Êîíå÷íîå çíà÷åíèå"; + Text[ chinese_simplified ] = "ç›®æ ‡å€¼(~V)"; + Text[ russian ] = "Çíà÷åíèå"; Text[ polish ] = "Wartoœæ docelowa"; - Text[ japanese ] = "–Ú•W’l(~V)"; - Text[ chinese_traditional ] = "¥Ø¼ÐÈ(~V)"; + Text[ japanese ] = "目標値(~V)"; + Text[ chinese_traditional ] = "目標值(~V)"; Text[ arabic ] = "ÇáÞíãÉ ÇáåÏÝ"; Text[ greek ] = "ÔéìÞ ~ðñïïñéóìïý"; - Text[ korean ] = "¸ñÇ¥ °ª(~V)"; + Text[ korean ] = "목표값(~V)"; Text[ turkish ] = "~Hedef deðer"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Valor ~destino"; + Text[ catalan ] = "~Valor de l'objectiu"; + Text[ thai ] = "~ค่าเป้าหมาย"; }; Edit ED_TARGETVAL { @@ -207,22 +210,23 @@ ModelessDialog RID_SCDLG_SOLVER Text [ portuguese ] = "Célula ~variável" ; Text [ finnish ] = "Muuttuja~solu" ; Text [ danish ] = "Variabel celle" ; - Text [ french ] = "Cellule ~variable" ; + Text [ french ] = "Cellule variable" ; Text [ swedish ] = "~Variabel cell" ; Text [ dutch ] = "~Variabele cel" ; Text [ spanish ] = "Celda ~variable" ; Text [ english_us ] = "Variable ~cell" ; - Text[ chinese_simplified ] = "¿É±äµÄµ¥Ôª¸ñ(~C)"; - Text[ russian ] = "èçìåíÿåìàÿ ÿ÷åéêà"; + Text[ chinese_simplified ] = "å¯å˜çš„å•å…ƒæ ¼"; + Text[ russian ] = "Èçìåíÿåìàÿ ÿ÷åéêà"; Text[ polish ] = "Zmienna komórka"; - Text[ japanese ] = "•Ï‰»‚³‚¹‚é¾Ù(~C)"; - Text[ chinese_traditional ] = "¥iÅܪºÀx¦s®æ(~C)"; + Text[ japanese ] = "変化ã•ã›ã‚‹ã‚»ãƒ«(~C)"; + Text[ chinese_traditional ] = "å¯è®Šçš„儲å˜æ ¼(~C)"; Text[ arabic ] = "ÎáíÉ ãÊÛíÑÉ"; Text[ greek ] = "ìåôáâëçôü êåëß"; - Text[ korean ] = "°¡º¯ ¼¿(~C)"; + Text[ korean ] = "변경 가능 ì…€"; Text[ turkish ] = "~Deðiþken hücre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Celda ~variable"; + Text[ catalan ] = "~Cel.la de variable"; + Text[ thai ] = "เ~ซลล์ที่เป็นตัวà¹à¸›à¸£"; }; Edit ED_VARCELL { @@ -249,17 +253,18 @@ ModelessDialog RID_SCDLG_SOLVER QuickHelpText [ portuguese ] = "Afastar" ; QuickHelpText[ russian ] = "Óìåíüøèòü"; QuickHelpText[ polish ] = "Pomniejsz"; - QuickHelpText[ japanese ] = "k¬"; - QuickHelpText[ chinese_simplified ] = "ËõС"; - QuickHelpText[ chinese_traditional ] = "ÁY¤p"; + QuickHelpText[ japanese ] = "縮å°"; + QuickHelpText[ chinese_simplified ] = "缩å°"; + QuickHelpText[ chinese_traditional ] = "縮å°"; QuickHelpText[ arabic ] = "ÊÕÛíÑ"; QuickHelpText[ greek ] = "Óìßêñõíóç"; - QuickHelpText[ korean ] = "Min/Max"; + QuickHelpText[ korean ] = "최소/최대"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern"; - QuickHelpText[ catalan ] = "Reducir"; + QuickHelpText[ catalan ] = "Redueix"; QuickHelpText[ finnish ] = "Kutista"; + QuickHelpText[ thai ] = "Shrink"; }; FixedLine FL_VARIABLES { @@ -271,24 +276,25 @@ ModelessDialog RID_SCDLG_SOLVER Text [ italian ] = "Preimpostazioni" ; Text [ portuguese_brazilian ] = "Vari?veis" ; Text [ portuguese ] = "Predefinições" ; - Text [ finnish ] = "Määritä oletusarvot" ; + Text [ finnish ] = "Oletusasetukset" ; Text [ danish ] = "Forudindstillinger" ; Text [ french ] = "Définitions" ; Text [ swedish ] = "Förinställningar" ; Text [ dutch ] = "Standaard" ; - Text [ spanish ] = "Predeterminaciones" ; + Text [ spanish ] = "Configuración predeterminada" ; Text [ english_us ] = "Default settings" ; - Text[ chinese_simplified ] = "Ô¤ÖÃ"; - Text[ russian ] = "Çàäàííûå çíà÷åíèÿ"; + Text[ chinese_simplified ] = "预置"; + Text[ russian ] = "Íàñòðîéêè"; Text[ polish ] = "Ustawienia domyœlne"; - Text[ japanese ] = "Šù’è’l"; - Text[ chinese_traditional ] = "¹w¸m"; + Text[ japanese ] = "既定値"; + Text[ chinese_traditional ] = "é è¨"; Text[ arabic ] = "ÅÚÏÇÏÇÊ ÇÝÊÑÇÖíÉ"; Text[ greek ] = "ÐñïåðéëïãÝò"; - Text[ korean ] = "±âº»°ª ¼³Á¤"; + Text[ korean ] = "기본 ì„¤ì •"; Text[ turkish ] = "Varsayýlan belirle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Variables"; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ค่าเริ่มต้น"; }; OKButton BTN_OK { @@ -318,24 +324,25 @@ ModelessDialog RID_SCDLG_SOLVER Text [ italian ] = "Valore di destinazione non valido!" ; Text [ portuguese_brazilian ] = "Valor do alvo inv?lido!" ; Text [ portuguese ] = "Valor de destino incorreto!" ; - Text [ finnish ] = "Virheellinen kohdearvo." ; + Text [ finnish ] = "Virheellinen kohdearvo" ; Text [ danish ] = "Ugyldig målværdi!" ; Text [ french ] = "La valeur cible est incorrecte !" ; Text [ swedish ] = "Ogiltigt målvärde!" ; Text [ dutch ] = "Ongeldige doelwaarde!" ; Text [ spanish ] = "¡Valor de destino no válido!" ; Text [ english_us ] = "Invalid target value." ; - Text[ chinese_simplified ] = "Ä¿±êÊýÖµÎÞЧ£¡"; - Text[ russian ] = "Íåäîïóñòèìîå êîíå÷íîå çíà÷åíèå!"; + Text[ chinese_simplified ] = "ç›®æ ‡æ•°å€¼æ— æ•ˆï¼"; + Text[ russian ] = "Íåäîïóñòèìîå çíà÷åíèå."; Text[ polish ] = "Nieprawid³owa wartoœæ docelowa!"; - Text[ japanese ] = "‚±‚ÌÀ°¹Þ¯Ä’l‚Í–³Œø‚Å‚·B"; - Text[ chinese_traditional ] = "¥Ø¼Ð¼ÆȵL®Ä¡I"; + Text[ japanese ] = "ã“ã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆå€¤ã¯ç„¡åŠ¹ã§ã™ã€‚"; + Text[ chinese_traditional ] = "目標數值無效ï¼"; Text[ arabic ] = "ÞíãÉ åÏÝ ÛíÑ ÕÇáÍÉ!"; Text[ greek ] = "Ìç Ýãêõñç ôéìÞ ðñïïñéóìïý!"; - Text[ korean ] = "Çã¿ëµÇÁö ¾Ê´Â ¸ñÇ¥°ª."; + Text[ korean ] = "허용ë˜ì§€ 않는 목표값"; Text[ turkish ] = "Geçerli olmayan hedef deðer!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Valor de destino no válido!"; + Text[ catalan ] = "El valor de l'objectiu no és vàlid."; + Text[ thai ] = "ค่าเป้าหมายไม่ถูà¸à¸•à¹‰à¸à¸‡"; }; String STR_INVALIDVAR { @@ -345,24 +352,25 @@ ModelessDialog RID_SCDLG_SOLVER Text [ italian ] = "Nome non definito per la cella-variabile!" ; Text [ portuguese_brazilian ] = "Nome indefinido para c?lula vari?vel!" ; Text [ portuguese ] = "Nome indefinido para célula variável!" ; - Text [ finnish ] = "Määrittämätön nimi muuttujasoluna." ; + Text [ finnish ] = "Määrittämätön nimi muuttujasoluna" ; Text [ danish ] = "Udefineret navn som variabelcelle!" ; Text [ french ] = "Le nom pour la cellule variable n'a pas été défini !" ; Text [ swedish ] = "Odefinierat namn som variabel cell!" ; Text [ dutch ] = "Niet-gedefinieerde naam voor variabele cel!" ; Text [ spanish ] = "¡Nombre no definido como celda de variable!" ; Text [ english_us ] = "Undefined name for variable cell." ; - Text[ chinese_simplified ] = "䶨ÒåµÄÃû³Æµ±×÷¿É±äÁ¿µÄµ¥Ôª¸ñ£¡"; - Text[ russian ] = "Íåîïðåäåëåííîå èìÿ äëÿ èçìåíÿåìîé ÿ÷åéêè!"; + Text[ chinese_simplified ] = "未定义的å称当作å¯å˜é‡çš„å•å…ƒæ ¼ï¼"; + Text[ russian ] = "Íåîïðåäåëåííîå èìÿ äëÿ èçìåíÿåìîé ÿ÷åéêè."; Text[ polish ] = "Nie zdefiniowana nazwa jako komórka zmienna!"; - Text[ japanese ] = "•Ï‰»‚³‚¹‚é¾Ù‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¥¼©w¸qªº¦WºÙ³Q·í§@¥iÅܶqªºÀx¦s®æ¡I"; + Text[ japanese ] = "変化ã•ã›ã‚‹ã‚»ãƒ«ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "未定義的å稱被當作å¯è®Šé‡çš„儲å˜æ ¼ï¼"; Text[ arabic ] = "ÇÓã ÛíÑ ãõÚÑøÝ ßÎáíÉ ãÊÛíÑÉ!"; Text[ greek ] = "Áüñéóôï üíïìá ùò ìåôáâëçôü êåëß!"; - Text[ korean ] = "°¡º¯ ¼¿·Î¼¡¡Á¤ÀǵÇÁö¡¡¾ÊÀº À̸§"; + Text[ korean ] = "가변 ì…€ì´ ì§€ì •ë˜ì§€ 않았습니다."; Text[ turkish ] = "Tanýmlanmamýþ hücresi için tanýmlanmamýþ ad!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Nombre no definido como celda de variable!"; + Text[ catalan ] = "El nom per a la cel.la de variable no està definit."; + Text[ thai ] = "ไม่ได้à¸à¸³à¸«à¸™à¸”ชื่à¸à¹€à¸‹à¸¥à¸¥à¹Œà¸—ี่เป็นตัวà¹à¸›à¸£"; }; String STR_INVALIDFORM { @@ -372,24 +380,25 @@ ModelessDialog RID_SCDLG_SOLVER Text [ italian ] = "Nome non definito per la cella-formula!" ; Text [ portuguese_brazilian ] = "Nome indefinido para c?lula de f?mula!" ; Text [ portuguese ] = "Nome indefinido para célula fórmula!" ; - Text [ finnish ] = "Määrittämätön nimi kaavasoluna." ; + Text [ finnish ] = "Määrittämätön nimi kaavasoluna" ; Text [ danish ] = "Udefineret navn som formelcelle!" ; Text [ french ] = "Le nom de la cellule de formule n'a pas été défini !" ; Text [ swedish ] = "Odefinierat namn som formelcell!" ; Text [ dutch ] = "Niet-gedefinieerde naam voor formulecel!" ; Text [ spanish ] = "¡Nombre no definido como celda de fórmula!" ; Text [ english_us ] = "Undefined name as formula cell." ; - Text[ chinese_simplified ] = "䶨ÒåµÄÃû³Æµ±×÷¹«Ê½µ¥Ôª¸ñ£¡"; - Text[ russian ] = "Íåîïðåäåëåííîå èìÿ äëÿ ÿ÷åéêè ôîðìóëû!"; + Text[ chinese_simplified ] = "未定义的å称当作公å¼å•å…ƒæ ¼ï¼"; + Text[ russian ] = "Íåîïðåäåëåííîå èìÿ äëÿ ÿ÷åéêè ôîðìóëû."; Text[ polish ] = "Nie zdefiniowana nazwa jako formu³a komórek!"; - Text[ japanese ] = "”Ž®¾Ù‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¥¼©w¸qªº¦WºÙ³Q·í§@¤½¦¡Àx¦s®æ¡I"; + Text[ japanese ] = "æ•°å¼ã‚»ãƒ«ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "未定義的å稱被當作公å¼å„²å˜æ ¼ï¼"; Text[ arabic ] = "ÇÓã ÛíÑ ãõÚÑøÝ ßÎáíÉ ÕíÛÉ!"; Text[ greek ] = "Áüñéóôï üíïìá ùò êåëß ôýðïõ!"; - Text[ korean ] = "¼ö½Ä ¼¿·Î¼¡¡Á¤ÀǵÇÁö¡¡¾ÊÀº À̸§."; + Text[ korean ] = "ìˆ˜ì‹ ì…€ë¡œì„œ ì •ì˜ë˜ì§€ ì•Šì€ ì´ë¦„."; Text[ turkish ] = "Formül hücresi için tanýmlanmamýþ ad!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Nombre no definido como celda de fórmula!"; + Text[ catalan ] = "El nom de la cel.la de fórmula no està definit."; + Text[ thai ] = "ไม่ได้à¸à¸³à¸«à¸™à¸”ชื่à¸à¹€à¸‹à¸¥à¸¥à¹Œà¸—ี่เป็นสูตร"; }; String STR_NOFORMULA { @@ -407,31 +416,45 @@ ModelessDialog RID_SCDLG_SOLVER Text [ dutch ] = "Cel moet een formule bevatten" ; Text [ spanish ] = "¡La celda debe contener una fórmula!" ; Text [ english_us ] = "Cell must contain a formula." ; - Text[ chinese_simplified ] = "µ¥Ôª¸ñÄÚ±ØÐ뺬ÓÐÒ»¸ö¹«Ê½£¡"; - Text[ russian ] = "ß÷åéêà äîëæíà ñîäåðæòü ôîðìóëó!"; + Text[ chinese_simplified ] = "å•å…ƒæ ¼å†…å¿…é¡»å«æœ‰ä¸€ä¸ªå…¬å¼ï¼"; + Text[ russian ] = "ß÷åéêà äîëæíà ñîäåðæàòü ôîðìóëó."; Text[ polish ] = "Komórka musi zawieraæ formu³ê!"; - Text[ japanese ] = "¾Ù‚É”Ž®‚ªŠÜ‚Ü‚ê‚Ä‚¢‚é•K—v‚ª‚ ‚è‚Ü‚·B"; - Text[ chinese_traditional ] = "Àx¦s®æ¥²¶·§t¦³¤@Ó¤½¦¡¡I"; + Text[ japanese ] = "セルã«æ•°å¼ãŒå«ã¾ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"; + Text[ chinese_traditional ] = "儲å˜æ ¼å¿…é ˆå«æœ‰ä¸€å€‹å…¬å¼ï¼"; Text[ arabic ] = "íÌÈ Ãä ÊÍÊæí ÇáÎáíÉ Úáì ÕíÛÉ."; Text[ greek ] = "Ôï êåëß ðñÝðåé íá ðåñéÝ÷åé Ýíáí ôýðï!"; - Text[ korean ] = "¼¿¿¡´Â ¼ö½ÄÀÌ Æ÷ÇԵǾî¾ß¸¸ ÇÕ´Ï´Ù."; + Text[ korean ] = "ì…€ì—는 수ì‹ì´ í¬í•¨ë˜ì–´ì•¼ë§Œ 합니다."; Text[ turkish ] = "Hücre, formül içermeli!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡La celda debe contener una fórmula!"; + Text[ catalan ] = "La cel.la ha de contenir una fórmula."; + Text[ thai ] = "เซลล์ต้à¸à¸‡à¸¡à¸µà¸ªà¸¹à¸•à¸£"; }; - Text[ chinese_simplified ] = "µ¥±äÁ¿Çó½â"; + Text[ chinese_simplified ] = "å•å˜é‡æ±‚解"; Text[ russian ] = "Ïîäáîð ïàðàìåòðà"; Text[ polish ] = "Szukaj wyniku"; - Text[ japanese ] = "ºÞ°Ù¼°¸"; - Text[ chinese_traditional ] = "¥Ø¼Ð·j´M"; + Text[ japanese ] = "ゴールシーク"; + Text[ chinese_traditional ] = "目標æœå°‹"; Text[ arabic ] = "ÇáÈÍË Úä ÇáÞíãÉ ÇáåÏÝ"; Text[ greek ] = "ÁíáæÞôçóç óôü÷ïõ"; - Text[ korean ] = "¸ñÇ¥°ª ã±â"; + Text[ korean ] = "목표값 찾기"; Text[ turkish ] = "Hedef deðer ara"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Buscar valor destino"; + Text[ catalan ] = "Cerca de l'objectiu"; + Text[ thai ] = "ค้นหาค่าเป้าหมาย"; }; + + + + + + + + + + + + diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src index 0691f8557311..db7ff8d596e2 100644 --- a/sc/source/ui/src/sortdlg.src +++ b/sc/source/ui/src/sortdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: sortdlg.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2002-12-09 10:03:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ TabPage RID_SCPAGE_SORT_FIELDS Text [ english_us ] = "~Ascending" ; TabStop = TRUE ; Text[ chinese_simplified ] = "å‘上(~A)"; - Text[ russian ] = "Ïî âîçðàñòàíèþ"; + Text[ russian ] = "Ïî âî~çðàñòàíèþ"; Text[ polish ] = "Rosn¹co"; Text[ japanese ] = "æ˜‡é †(~A)"; Text[ chinese_traditional ] = "å‘上(~A)"; @@ -193,7 +193,7 @@ TabPage RID_SCPAGE_SORT_FIELDS Text [ english_us ] = "A~scending" ; TabStop = TRUE ; Text[ chinese_simplified ] = "å‘上(~S)"; - Text[ russian ] = "Ïî âîçðàñòàíèþ"; + Text[ russian ] = "Ïî âîçðàñ~òàíèþ"; Text[ polish ] = "Rosn¹co"; Text[ japanese ] = "æ˜‡é †(~S)"; Text[ chinese_traditional ] = "å‘上(~S)"; @@ -416,24 +416,24 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text = "Bereich ~enthält Spaltenbeschriftungen" ; Text [ ENGLISH ] = "Source with ~column headers" ; Text [ norwegian ] = "Kilde med ~kolonne topptekst" ; - Text [ italian ] = "L'area ~contiene intestazioni colonna" ; + Text [ italian ] = "L'area ~contiene intestazioni di colonna" ; Text [ portuguese_brazilian ] = "Fonte com ~cabe?alhos de colunas" ; Text [ portuguese ] = "Área contém ~cabeçalhos de colunas" ; Text [ finnish ] = "Alue sisältää sarake~otsikkoja" ; Text [ danish ] = "Området indeholder kolonneoverskrifter" ; - Text [ french ] = "La plage contient des en-têtes de colonne" ; - Text [ swedish ] = "Område innehåller ~kolumnhuvuden" ; + Text [ french ] = "La plage contient des étiquettes de colonne." ; + Text [ swedish ] = "Område innehåller ~kolumnetiketter" ; Text [ dutch ] = "Bereik bevat ~kolomkoppen" ; - Text [ spanish ] = "Area contiene encabezamientos de ~columnas" ; + Text [ spanish ] = "El área contiene los títulos de las ~columnas" ; Text [ english_us ] = "Range contains column la~bels" ; - Text[ chinese_simplified ] = "区域å«æœ‰åˆ—æ ‡ç¾(~H)"; + Text[ chinese_simplified ] = "区域å«æœ‰åˆ—æ ‡é¢˜(~H)"; Text[ russian ] = "Çàãîëîâêè ñòîëáöîâ â îáëàñòè"; Text[ polish ] = "Obszar zawiera nag³ówki kolumn"; Text[ japanese ] = "範囲ã«åˆ—ã®é …目欄をå«ã‚€(~H)"; - Text[ chinese_traditional ] = "å€åŸŸå«æœ‰æ¬„標題(~H)"; + Text[ chinese_traditional ] = "範åœå«æœ‰æ¬„標籤(~H)"; Text[ arabic ] = "ÊÊÖãä ÇáãäØÞÉ ÑÄæÓ ÃÚãÏÉ"; Text[ greek ] = "Ç ðåñéï÷Þ ðåñéÝ÷åé êåöáëßäåò óôçëþí"; - Text[ korean ] = "ì—´ 머리글 í¬í•¨(~H)"; + Text[ korean ] = "ì—´ ë ˆì´ë¸” í¬í•¨(~H)"; Text[ turkish ] = "Bölüm ~sütun baþlýklarý içeriyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea conté ca~pçaleres de columnes"; @@ -449,19 +449,19 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text [ portuguese ] = "Área contém ~cabeçalhos de linhas" ; Text [ finnish ] = "Alue sisältää ~riviotsikoita" ; Text [ danish ] = "Området indeholder rækkeoverskrifter" ; - Text [ french ] = "La plage contient des en-têtes de ~lignes" ; - Text [ swedish ] = "Område innehåller radh~uvuden" ; + Text [ french ] = "La plage contient des étiquettes de ligne." ; + Text [ swedish ] = "Område innehåller ~radetiketter" ; Text [ dutch ] = "Bereik bevat ~rijkoppen" ; - Text [ spanish ] = "Área contiene títulos de ~filas" ; + Text [ spanish ] = "El área contiene los títulos de las ~filas" ; Text [ english_us ] = "Range contains ~row labels" ; - Text[ chinese_simplified ] = "区域å«æœ‰è¡Œæ ‡ç¾(~R)"; + Text[ chinese_simplified ] = "区域å«æœ‰è¡Œæ ‡é¢˜(~R)"; Text[ russian ] = "Çàãîëîâêè ñòðîê â îáëàñòè"; Text[ polish ] = "Obszar zawiera nag³ówki wierszy"; Text[ japanese ] = "範囲ã«è¡Œã®é …目欄をå«ã‚€(~R)"; - Text[ chinese_traditional ] = "å€åŸŸå«æœ‰åˆ—標題(~R)"; + Text[ chinese_traditional ] = "範åœå«æœ‰åˆ—標籤(~R)"; Text[ arabic ] = "ÊÊÖãä ÇáãäØÞÉ ÑÄæÓ ÕÝæÝ"; Text[ greek ] = "Ç ðåñéï÷Þ ðåñéÝ÷åé êåöáëßäåò ãñáììþí"; - Text[ korean ] = "범위ì—는 í–‰ 머리글 í¬í•¨.(~R)"; + Text[ korean ] = "ë²”ìœ„ì— í–‰ ë ˆì´ë¸”ì´ í¬í•¨(~R)"; Text[ turkish ] = "Bölüm sa~týr baþlýklarý içeriyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "L'àrea conté capçaleres de fil~es"; @@ -486,7 +486,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text [ english_us ] = "Include ~formats" ; TabStop = TRUE ; Text[ chinese_simplified ] = "包å«æ ¼å¼(~F)"; - Text[ russian ] = "Âêëþ÷àÿ ôîðìàòû"; + Text[ russian ] = "Âêëþ÷àÿ ~ôîðìàòû"; Text[ polish ] = "Uwzglêdnij formaty"; Text[ japanese ] = "書å¼ã‚’å«ã‚€(~F)"; Text[ chinese_traditional ] = "包å«æ ¼å¼(~F)"; @@ -517,13 +517,13 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text [ english_us ] = "~Copy sort results to:" ; TabStop = TRUE ; Text[ chinese_simplified ] = "å¤åˆ¶æŽ’åºç»“果到(~C)"; - Text[ russian ] = "Âûäàâàòü ðåçóëüòàòû ñîðòèðîâêè â"; + Text[ russian ] = "Âûäàâàòü ðå~çóëüòàòû ñîðòèðîâêè â"; Text[ polish ] = "Kopiuj rezultat sortowania do"; Text[ japanese ] = "並ã¹æ›¿ãˆçµæžœã®è²¼ã‚Šä»˜ã‘å…ˆ(~C)"; Text[ chinese_traditional ] = "複製排åºçµæžœåˆ°(~C)"; Text[ arabic ] = "äÓÎ äÊíÌÉ ÇáÝÑÒ Åáì"; Text[ greek ] = "ÁíôéãñáöÞ áðïôåëåóìÜôùí ôáîéíüìçóçò óôï"; - Text[ korean ] = "다ìŒìœ¼ë¡œ ê²°ê³¼ 복사(~C)"; + Text[ korean ] = "ì •ë ¬ 결과를 ë‹¤ìŒ ìœ„ì¹˜ë¡œ 복사(~C)"; Text[ turkish ] = "Sýralama sonuçlarýnýn kopyalanacaðý ~yer"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Copia els resultats de l'ordenació a:"; @@ -713,7 +713,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text[ chinese_traditional ] = "從上å‘下(排åºåˆ—) (~T)"; Text[ arabic ] = "ãä ÃÚáì Åáì ÃÓÝá (ÝÑÒ ÇáÕÝæÝ)"; Text[ greek ] = "Áðü ðÜíù ðñ~ïò ôá êÜôù (ôáîéíüìçóç ãñáììþí)"; - Text[ korean ] = "위 ì—ì„œ 아래로 (í–‰ ì •ë ¬)(~T)"; + Text[ korean ] = "위ì—ì„œ 아래로(í–‰ ì •ë ¬)(~T)"; Text[ turkish ] = "~Yukarýdan aþaðý (satýrlarý sýrala)"; Text[ language_user1 ] = " "; Text[ catalan ] = "De dal~t a baix (ordena les files)"; @@ -731,8 +731,8 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text [ portuguese ] = "Da ~esquerda para a direita (ordenar colunas)" ; Text [ finnish ] = "~Vasemmalta oikealle (sarakkeiden lajittelu)" ; Text [ danish ] = "Fra venstre til højre (sorter kolonner)" ; - Text [ french ] = "De gauche à droite (tri de colonnes)" ; - Text [ swedish ] = "Från vänster til~l höger (sortera kolumner)" ; + Text [ french ] = "De gauche à droite (trier les colonnes)" ; + Text [ swedish ] = "Från vänster till höger (sortera kolumner)" ; Text [ dutch ] = "Van ~links naar rechts (kolommen sorteren)" ; Text [ spanish ] = "De ~izquierda a derecha (ordenar columnas)" ; Text [ english_us ] = "L~eft to right (sort columns)" ; @@ -741,10 +741,10 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text[ russian ] = "Ñëåâà íàïðàâî (ñîðòèðîâêà ñòîëáöîâ)"; Text[ polish ] = "Sortuj kolumny od lewej do prawej"; Text[ japanese ] = "å·¦ã‹ã‚‰å³ã¸(列ã®ä¸¦ã¹æ›¿ãˆ)(~E)"; - Text[ chinese_traditional ] = "從左å‘å³(欄排åº)(~E)"; + Text[ chinese_traditional ] = "從左å‘å³(排åºæ¬„)(~E)"; Text[ arabic ] = "ãä ÇáíÓÇÑ Åáì Çáíãíä (ÝÑÒ ÇáÃÚãÏÉ)"; Text[ greek ] = "Áðü áñéóôåñÜ ðñïò äåîéÜ (Ôáîéíüìçóç óôçëþí)"; - Text[ korean ] = "왼쪽ì—ì„œ 오른쪽으로 (ì—´ ì •ë ¬)(~E)"; + Text[ korean ] = "왼쪽ì—ì„œ 오른쪽으로(ì—´ ì •ë ¬)(~E)"; Text[ turkish ] = "S~oldan saða (sütunlarý sýrala)"; Text[ language_user1 ] = " "; Text[ catalan ] = "D'es~querra a dreta (ordena les columnes)"; @@ -909,3 +909,5 @@ TabDialog RID_SCDLG_SORT Text[ thai ] = "เรียง"; }; + + diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src index 54fa10a0f91d..3bcf148eade2 100644 --- a/sc/source/ui/src/subtdlg.src +++ b/sc/source/ui/src/subtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: subtdlg.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:42:21 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,19 +80,20 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text[ dutch ] = "Groepen"; Text[ french ] = "Groupes"; Text[ spanish ] = "Grupos"; - Text[ finnish ] = "Groups"; + Text[ finnish ] = "Ryhmät"; Text[ italian ] = "Gruppi"; - Text[ danish ] = "Groups"; + Text[ danish ] = "Grupper"; Text[ swedish ] = "Grupper"; Text[ polish ] = "Grupy"; Text[ portuguese_brazilian ] = "Groups"; - Text[ japanese ] = "ｸﾞﾙｰﾌﾟ"; + Text[ japanese ] = "グループ"; Text[ korean ] = "그룹"; Text[ chinese_simplified ] = "å°ç»„"; Text[ chinese_traditional ] = "群組"; Text[ turkish ] = "Groups"; Text[ arabic ] = "Groups"; - Text[ catalan ] = "Groups"; + Text[ catalan ] = "Grups"; + Text[ thai ] = "à¸à¸¥à¸¸à¹ˆà¸¡"; }; CheckBox BTN_PAGEBREAK { @@ -101,10 +102,10 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text = "Neue Seite bei Gru~ppenwechsel" ; Text [ ENGLISH ] = "Pagebreak for each grou~p" ; Text [ NORWEGIAN ] = "Sideskift for hver grupp~e" ; - Text [ DANISH ] = "Sideskift mellem grupper" ; + Text [ DANISH ] = "Sid~eskift mellem grupper" ; Text [ ENGLISH_US ] = "~Page break between groups" ; Text [ SPANISH ] = "~Nueva página entre grupos" ; - Text [ FINNISH ] = "~Sivunvaihto ryhmien välillä" ; + Text [ FINNISH ] = "S~ivunvaihto ryhmien välillä" ; Text [ FRENCH ] = "Saut de page entre les grou~pes" ; Text [ ITALIAN ] = "Interruzione di pagina ~per ogni cambio di gruppo" ; Text [ DUTCH ] = "~Nieuwe pagina voor elke groep" ; @@ -113,16 +114,17 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text [ PORTUGUESE ] = "Nova página para cada grupo" ; TabStop = TRUE ; Text[ chinese_simplified ] = "å°ç»„之间æ¢é¡µ(~P)"; - Text[ russian ] = "Ðàçðûâ ñòðàíèöû ìåæäó ãðóïïàìè"; + Text[ russian ] = "Ðàçðûâ ñòðàíè~öû ìåæäó ãðóïïàìè"; Text[ polish ] = "Nowa strona przy podziale grup"; - Text[ japanese ] = "ｸﾞﾙｰﾌﾟã”ã¨ã«æ”¹ï¾ï¾Ÿï½°ï½¼ï¾ž(~P)"; + Text[ japanese ] = "グループã”ã¨ã«æ”¹ãƒšãƒ¼ã‚¸(~P)"; Text[ chinese_traditional ] = "群組之間æ›é (~P)"; Text[ arabic ] = "ÕÝÍÉ ÌÏíÏÉ ÚäÏ ÊÛííÑ ÇáãÌãæÚÉ"; Text[ greek ] = "ÍÝá óåëßäá ìå êÜèå áëëáãÞ ïìÜäáò"; - Text[ korean ] = "그룹 ë³€ê²½ì‹œì— ìƒˆ 페ì´ì§€(~P)"; + Text[ korean ] = "그룹 사ì´ì—ì„œ 페ì´ì§€ 나누기(~P)"; Text[ turkish ] = "~Her grup için yeni sayfa baþlat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nueva página entre grupos"; + Text[ catalan ] = "Salt de ~pàgina entre grups"; + Text[ thai ] = "ตัวà¹à¸šà¹ˆà¸‡~หน้าระหว่างà¸à¸¥à¸¸à¹ˆà¸¡"; }; CheckBox BTN_CASE { @@ -136,7 +138,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text [ ENGLISH_US ] = "~Case sensitive" ; Text [ SPANISH ] = "~Mayúsculas/minúsculas" ; Text [ FINNISH ] = "~Kirjainkoon erottelu" ; - Text [ FRENCH ] = "~Respecter la casse" ; + Text [ FRENCH ] = "Respecter la casse" ; Text [ ITALIAN ] = "~Maiuscole/minuscole" ; Text [ DUTCH ] = "~Hoofdletters/kleine letters belangrijk" ; Text [ PORTUGUESE_BRAZILIAN ] = "~Sens?vel a mai sculas/min sculas" ; @@ -144,16 +146,17 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text [ PORTUGUESE ] = "~Maiúsculas/Minúsculas" ; TabStop = TRUE ; Text[ chinese_simplified ] = "区分å—æ¯å¤§å°å†™(~C)"; - Text[ russian ] = "Ó÷èòûâàòü ðåãèñòð"; + Text[ russian ] = "Ó÷èòûâàòü ðå~ãèñòð"; Text[ polish ] = "U~wzglêdnij wielkie i ma³e litery"; - Text[ japanese ] = "大文å—/å°æ–‡å—を区別(~C)"; + Text[ japanese ] = "大文å—ã¨å°æ–‡å—を区別ã™ã‚‹(~C)"; Text[ chinese_traditional ] = "å€åˆ†å—æ¯å¤§å°å¯«(~C)"; Text[ arabic ] = "ãÑÇÚÇÉ ÇáÃÍÑÝ ÇáßÈíÑÉ/ÇáÕÛíÑÉ"; Text[ greek ] = "Óõìöùíßá ðåæþí-êåöáëáßùí"; - Text[ korean ] = "대/ì†Œë¬¸ìž êµ¬ë¶„(~C)"; + Text[ korean ] = "ëŒ€ë¬¸ìž ë° ì†Œë¬¸ìž êµ¬ë¶„(~C)"; Text[ turkish ] = "~Büyük/küçük harf duyarlý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mayúsculas/minúsculas"; + Text[ catalan ] = "Distingeix entre majús~cules i minúscules"; + Text[ thai ] = "~ตรงตามตัวพิมพ์ใหà¸à¹ˆ-เล็à¸"; }; CheckBox BTN_SORT { @@ -176,14 +179,15 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text[ chinese_simplified ] = "区域先按照å°ç»„排åº(~S)"; Text[ russian ] = "Ñîðòèðîâàòü îáëàñòü ñíà÷àëà ïî ãðóïïàì"; Text[ polish ] = "Przesortuj wczeœniej o~bszar wed³ug grup"; - Text[ japanese ] = "範囲をã‚らã‹ã˜ã‚ｸﾞﾙｰﾌﾟ別ã«ä¸¦ã¹ã‚‹(~S)"; + Text[ japanese ] = "範囲をã‚らã‹ã˜ã‚グループ別ã«ä¸¦ã¹ã‚‹(~S)"; Text[ chinese_traditional ] = "å€åŸŸå…ˆæŒ‰ç…§ç¾¤çµ„排åº(~S)"; Text[ arabic ] = "ÝÑÒ ÇáäØÇÞ ÞÈá Ðáß ÍÓÈ ÇáãÌãæÚÇÊ"; Text[ greek ] = "Íá ãßíåé ðñéí ôáîéíüìç~óç ôçò ðåñéï÷Þò êáôÜ ïìÜäåò"; - Text[ korean ] = "ê·¸ë£¹ì— ë”°ë¼ ë²”ìœ„ë¥¼ ì‚¬ì „ì— ì •ë ¬(~S)"; + Text[ korean ] = "그룹별로 ì˜ì—ì„ ìš°ì„ ì •ë ¬(~S)"; Text[ turkish ] = "Bölümü önce gruplara göre ~sýrala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ordenar primero e~l área por grupos"; + Text[ catalan ] = "Preordena l'àrea segons els grup~s"; + Text[ thai ] = "เ~รียงพื้นที่à¸à¹ˆà¸à¸™à¸•à¸²à¸¡à¸à¸¥à¸¸à¹ˆà¸¡"; }; CheckBox BTN_FORMATS { @@ -205,7 +209,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text [ PORTUGUESE ] = "Incluir ~formatos" ; TabStop = TRUE ; Text[ chinese_simplified ] = "包å«æ ¼å¼(~N)"; - Text[ russian ] = "Âêëþ÷àÿ ôîðìàòû"; + Text[ russian ] = "Âêëþ÷àÿ ~ôîðìàòû"; Text[ polish ] = "Uwzglêdnij f~ormaty"; Text[ japanese ] = "書å¼ã‚’å«ã‚€(~N)"; Text[ chinese_traditional ] = "包å«æ ¼å¼(~N)"; @@ -214,7 +218,8 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text[ korean ] = "ì„œì‹ í¬í•¨(~N)"; Text[ turkish ] = "~Formatlamayý da dikkate al"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Incluir formatos"; + Text[ catalan ] = "I~nclou els formats"; + Text[ thai ] = "ร~วมรูปà¹à¸šà¸š"; }; CheckBox BTN_USERDEF { @@ -228,8 +233,8 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text [ SPANISH ] = "~Orden de clasificación definido por el usuario" ; Text [ FINNISH ] = "M~ukautettu lajittelujärjestys" ; Text [ FRENCH ] = "Ordre de tri ~utilisateur" ; - Text [ ITALIAN ] = "Sequenza d'ordine ~definita dall'utente" ; - Text [ DUTCH ] = "~Gebruikergedefinieerde sorteervolgorde" ; + Text [ ITALIAN ] = "Sequenza d'ordine definita dall'~utente" ; + Text [ DUTCH ] = "~Door gebruiker gedefinieerde sorteervolgorde" ; Text [ PORTUGUESE_BRAZILIAN ] = "~Preced?ncia de ordena??o definida pelo usu?rio" ; Text [ SWEDISH ] = "A~nvändardefinierad sorteringsordning" ; Text [ PORTUGUESE ] = "Ordem de classificação definida pelo ~utilizador" ; @@ -241,10 +246,11 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text[ chinese_traditional ] = "使用者自訂排åºè¦å‰‡(~U)"; Text[ arabic ] = "ÊÑÊíÈ ÇáÝÑÒ ÊÈÚÇð áÊÚÑíÝ ÇáãÓÊÎÏã"; Text[ greek ] = "ÓåéñÜ ôáîéíüìçóçò ïñéæüìåíç áðü ôïí ÷ñÞóôç"; - Text[ korean ] = "사용ìžê°€ ì •ì˜í•œ ì •ë ¬ 순서(~U)"; + Text[ korean ] = "ì‚¬ìš©ìž ì •ì˜ ì •ë ¬ 순서(~U)"; Text[ turkish ] = "~Kullanýcý tanýmlý sýralama düzeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Orden de clasificación definido por el usuario"; + Text[ catalan ] = "Tip~us d'ordenació personalitzat"; + Text[ thai ] = "à¸à¸³~หนดà¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸‡à¸¥à¸³à¸”ับเà¸à¸‡"; }; ListBox LB_USERDEF { @@ -265,7 +271,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text [ ENGLISH_US ] = "~Ascending" ; Text [ SPANISH ] = "~Ascendente" ; Text [ FINNISH ] = "~Nouseva" ; - Text [ FRENCH ] = "~Croissant" ; + Text [ FRENCH ] = "Croissant" ; Text [ ITALIAN ] = "Crescente" ; Text [ DUTCH ] = "~Oplopend" ; Text [ PORTUGUESE_BRAZILIAN ] = "~Ascendente" ; @@ -282,7 +288,8 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text[ korean ] = "오름차순(~A)"; Text[ turkish ] = "A~rtan düzende"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ascendente"; + Text[ catalan ] = "~Ascendent"; + Text[ thai ] = "จาà¸~น้à¸à¸¢à¹„ปหามาà¸"; }; RadioButton BTN_DESCENDING { @@ -291,11 +298,11 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text = "Abs~teigend" ; Text [ ENGLISH ] = "~Descending" ; Text [ NORWEGIAN ] = "~Synkende" ; - Text [ DANISH ] = "Faldende" ; + Text [ DANISH ] = "Fal~dende" ; Text [ ENGLISH_US ] = "D~escending" ; Text [ SPANISH ] = "~Descendente" ; Text [ FINNISH ] = "L~askeva" ; - Text [ FRENCH ] = "~Décroissant" ; + Text [ FRENCH ] = "Décroissant" ; Text [ ITALIAN ] = "Decrescente" ; Text [ DUTCH ] = "~Aflopend" ; Text [ PORTUGUESE_BRAZILIAN ] = "~Descendente" ; @@ -312,7 +319,8 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text[ korean ] = "내림차순(~E)"; Text[ turkish ] = "A~zalan düzende"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Descendente"; + Text[ catalan ] = "D~escendent"; + Text[ thai ] = "จาà¸à¸¡à¸²~à¸à¹„ปหาน้à¸à¸¢"; }; FixedLine FL_SORT { @@ -341,7 +349,8 @@ TabPage RID_SCPAGE_SUBT_OPTIONS Text[ korean ] = "ì •ë ¬"; Text[ turkish ] = "Sýralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ordenar"; + Text[ catalan ] = "Ordre"; + Text[ thai ] = "เรียง"; }; }; @@ -361,7 +370,7 @@ TabPage RID_SUBTBASE Text = "~Gruppieren nach" ; Text [ ENGLISH ] = "~Group by" ; Text [ norwegian ] = "~Gruppe ved " ; - Text [ italian ] = "~Raggruppa per" ; + Text [ italian ] = "Ra~ggruppa per" ; Text [ portuguese_brazilian ] = "~Agrupar por" ; Text [ portuguese ] = "~Agrupar por" ; Text [ finnish ] = "~Ryhmittele" ; @@ -374,14 +383,15 @@ TabPage RID_SUBTBASE Text[ chinese_simplified ] = "分组按照(~G)"; Text[ russian ] = "Ãðóïïèðîâàòü ïî"; Text[ polish ] = "Grupuj wed³ug"; - Text[ japanese ] = "ｸﾞﾙｰﾌﾟã®åŸºæº–(~G)"; + Text[ japanese ] = "グループã®åŸºæº–(~G)"; Text[ chinese_traditional ] = "ä¾ç¾¤çµ„(~G)"; Text[ arabic ] = "ÊÌãíÚ ÍÓÈ"; Text[ greek ] = "Ïìáäïðïßçóç êáôÜ"; - Text[ korean ] = "ì—ì˜í•œ 그룹(~G)"; + Text[ korean ] = "그룹 기준(~G)"; Text[ turkish ] = "~Gruplama esasý"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Agrupar por"; + Text[ catalan ] = "~Agrupa per"; + Text[ thai ] = "~จัดà¸à¸¥à¸¸à¹ˆà¸¡à¹‚ดย"; }; ListBox LB_GROUP { @@ -411,16 +421,17 @@ TabPage RID_SUBTBASE Text [ spanish ] = "~Calcular subtotales para" ; Text [ english_us ] = "~Calculate subtotals for" ; Text[ chinese_simplified ] = "分类汇总计算(~C)"; - Text[ russian ] = "Âû÷èñëèòü ïðîìåæóòî÷íûå èòîãè äëÿ"; + Text[ russian ] = "Âû÷èñëèòü ïðîìå~æóòî÷íûå èòîãè äëÿ"; Text[ polish ] = "Oblicz sumy poœrednie dla"; Text[ japanese ] = "å°è¨ˆã‚’計算ã™ã‚‹åˆ—(~C)"; Text[ chinese_traditional ] = "å°è¨ˆç”¨æ–¼(~C)"; Text[ arabic ] = "ÍÓÇÈ ÇáãÌÇãíÚ ÇáÝÑÚíÉ áÜ"; Text[ greek ] = "Õðïëïãéóìüò ìåñéêþí áèñïéóìÜ~ôùí ãéá"; - Text[ korean ] = "ì— ëŒ€í•œ 소계 계산(~C)"; + Text[ korean ] = "부분합 계산하는 ì—´(~C)"; Text[ turkish ] = "~Ara toplamlarý hesaplanacak sütun(lar)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Calcular subtotales para"; + Text[ catalan ] = "~Calcula els subtotals per a"; + Text[ thai ] = "~คำนวณผลรวมย่à¸à¸¢à¸ªà¸³à¸«à¸£à¸±à¸š"; }; Control WND_COLUMNS { @@ -445,19 +456,20 @@ TabPage RID_SUBTBASE Text [ french ] = "~Fonction" ; Text [ swedish ] = "~Beräkningsregler" ; Text [ dutch ] = "~Functie" ; - Text [ spanish ] = "~Usar función" ; + Text [ spanish ] = "Usar función" ; Text [ english_us ] = "Use ~function" ; Text[ chinese_simplified ] = "计算规则(~F)"; - Text[ russian ] = "Èíñòðóêöèÿ ïî âû÷èñëåíèÿì"; + Text[ russian ] = "Èñïîëüçîâàòü ôóíêöèþ"; Text[ polish ] = "Instrukcja obliczania"; Text[ japanese ] = "計算方法(~F)"; Text[ chinese_traditional ] = "計算è¦å‰‡(~F)"; Text[ arabic ] = "ÇáÏÇáÉ"; Text[ greek ] = "Êáíüíáò õðïëïãéóìïý"; - Text[ korean ] = "계산 규칙(~F)"; + Text[ korean ] = "함수 사용(~F)"; Text[ turkish ] = "K~ullanýlacak fonksiyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Usar función"; + Text[ catalan ] = "Utilitza la ~funció"; + Text[ thai ] = "ใช้~ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™"; }; ListBox LB_FUNCTIONS { @@ -553,15 +565,15 @@ TabPage RID_SUBTBASE }; StringList [ finnish ] = { - < "Sum" ; Default ; > ; - < "Lukumäärä" ; Default ; > ; + < "Summa" ; Default ; > ; + < "LASKE" ; Default ; > ; < "Keskiarvo" ; Default ; > ; - < "Enint" ; Default ; > ; - < "Väh" ; Default ; > ; - < "Tuote" ; Default ; > ; - < "Lukumäärä (vain numerot)" ; Default ; > ; - < "StDev (vakiopoikkeama, Otos)" ; Default ; > ; - < "StDevP (vakiopoikkeama, populaatio)" ; Default ; > ; + < "MAKS" ; Default ; > ; + < "MIN" ; Default ; > ; + < "Tulo" ; Default ; > ; + < "LASKE (vain luvut)" ; Default ; > ; + < "KESKIHAJONTA (otos)" ; Default ; > ; + < "KESKIHAJONTAP (populaatio)" ; Default ; > ; < "Var (Otos)" ; Default ; > ; < "VarP (populaatio)" ; Default ; > ; }; @@ -632,8 +644,8 @@ TabPage RID_SUBTBASE < "Cantidad (sólo números)" ; Default ; > ; < "DesvEst (Muestra)" ; Default ; > ; < "DesvEstP (Población)" ; Default ; > ; - < "Varianza (Muestra)" ; Default ; > ; - < "VarP (Población)" ; Default ; > ; + < "Variancia (muestra)" ; Default ; > ; + < "VarP (población)" ; Default ; > ; }; StringList [ english_us ] = { @@ -750,7 +762,7 @@ TabPage RID_SUBTBASE StringList [ korean ] = { < "합계" ; Default ; > ; - < "수" ; Default ; > ; + < "ê°’" ; Default ; > ; < "í‰ê· " ; Default ; > ; < "최대" ; Default ; > ; < "최소" ; Default ; > ; @@ -792,16 +804,30 @@ TabPage RID_SUBTBASE StringList [ catalan ] = { < "Suma" ; Default ; > ; - < "Cantidad" ; Default ; > ; - < "Promedio" ; Default ; > ; - < "Máx." ; Default ; > ; - < "Mín." ; Default ; > ; - < "Producto" ; Default ; > ; - < "Cantidad (solo números)" ; Default ; > ; - < "DesvEst (Muestra)" ; Default ; > ; - < "DesvEstP (Población)" ; Default ; > ; - < "Varianza (Muestra)" ; Default ; > ; - < "VarP (Población)" ; Default ; > ; + < "Compta" ; Default ; > ; + < "Mitjana" ; Default ; > ; + < "Màx" ; Default ; > ; + < "Mín" ; Default ; > ; + < "Producte" ; Default ; > ; + < "Compta (només números)" ; Default ; > ; + < "StDev (mostra)" ; Default ; > ; + < "StDevP (població)" ; Default ; > ; + < "Var (mostra)" ; Default ; > ; + < "VarP (població)" ; Default ; > ; + }; + StringList [ thai ] = + { + < "ผลรวม" ; Default ; > ; + < "นับ" ; Default ; > ; + < "เฉลี่ย" ; Default ; > ; + < "มาà¸à¸—ี่สุด" ; Default ; > ; + < "น้à¸à¸¢à¸—ี่สุด" ; Default ; > ; + < "ผลิตภัณฑ์" ; Default ; > ; + < "นับ (ตัวเลขà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸”ียว)" ; Default ; > ; + < "StDev (ตัวà¸à¸¢à¹ˆà¸²à¸‡)" ; Default ; > ; + < "StDevP (ประชาà¸à¸£)" ; Default ; > ; + < "Var (ตัวà¸à¸¢à¹ˆà¸²à¸‡)" ; Default ; > ; + < "VarP (ประชาà¸à¸£)" ; Default ; > ; }; }; }; @@ -866,16 +892,17 @@ TabDialog RID_SCDLG_SUBTOTALS Text [ spanish ] = "Grupo 1" ; Text [ english_us ] = "1st Group" ; Text[ chinese_simplified ] = "第一组"; - Text[ russian ] = "1-àÿ ãðóïïà"; + Text[ russian ] = "1-ÿ ãðóïïà"; Text[ polish ] = "1 grupa"; - Text[ japanese ] = "ｸﾞﾙｰﾌﾟ 1"; + Text[ japanese ] = "グループ 1"; Text[ chinese_traditional ] = "第一組"; Text[ arabic ] = "ÇáãÌãæÚÉ ÇáÃæáì"; Text[ greek ] = "1ç ÏìÜäá"; - Text[ korean ] = "1번째 그룹"; + Text[ korean ] = "그룹 1"; Text[ turkish ] = "1. Grup"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Grupo 1"; + Text[ catalan ] = "1r grup"; + Text[ thai ] = "à¸à¸¥à¸¸à¹ˆà¸¡à¹à¸£à¸"; }; PageItem { @@ -894,16 +921,17 @@ TabDialog RID_SCDLG_SUBTOTALS Text [ spanish ] = "Grupo 2" ; Text [ english_us ] = "2nd Group" ; Text[ chinese_simplified ] = "第二组"; - Text[ russian ] = "2-àÿ ãðóïïà"; + Text[ russian ] = "2-ÿ ãðóïïà"; Text[ polish ] = "2 grupa"; - Text[ japanese ] = "ｸﾞﾙｰﾌﾟ 2"; + Text[ japanese ] = "グループ 2"; Text[ chinese_traditional ] = "第二組"; Text[ arabic ] = "ÇáãÌãæÚÉ ÇáËÇäíÉ"; Text[ greek ] = "2ç. ÏìÜäá"; - Text[ korean ] = "2번째 그룹"; + Text[ korean ] = "그룹 2"; Text[ turkish ] = "2. Grup"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Grupo 2"; + Text[ catalan ] = "2n grup"; + Text[ thai ] = "à¸à¸¥à¸¸à¹ˆà¸¡à¸—ี่สà¸à¸‡"; }; PageItem { @@ -922,16 +950,17 @@ TabDialog RID_SCDLG_SUBTOTALS Text [ spanish ] = "Grupo 3" ; Text [ english_us ] = "3rd Group" ; Text[ chinese_simplified ] = "第三组"; - Text[ russian ] = "3-üÿ ãðóïïà"; + Text[ russian ] = "3-ÿ ãðóïïà"; Text[ polish ] = "3 grupa"; - Text[ japanese ] = "ｸﾞﾙｰﾌﾟ 3"; + Text[ japanese ] = "グループ 3"; Text[ chinese_traditional ] = "第三組"; Text[ arabic ] = "ÇáãÌãæÚÉ ÇáËÇáËÉ"; Text[ greek ] = "3ç ÏìÜäá"; - Text[ korean ] = "3번째 그룹"; + Text[ korean ] = "그룹 3"; Text[ turkish ] = "3. Grup"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Grupo 3"; + Text[ catalan ] = "3r grup"; + Text[ thai ] = "à¸à¸¥à¸¸à¹ˆà¸¡à¸—ี่สาม"; }; PageItem { @@ -952,14 +981,15 @@ TabDialog RID_SCDLG_SUBTOTALS Text[ chinese_simplified ] = "选项"; Text[ russian ] = "Ïàðàìåòðû"; Text[ polish ] = "Opcje"; - Text[ japanese ] = "ｵﾌﾟｼｮï¾"; + Text[ japanese ] = "オプション"; Text[ chinese_traditional ] = "é¸é …"; Text[ arabic ] = "ÇáÎíÇÑÇÊ"; Text[ greek ] = "ÅðéëïãÝò"; Text[ korean ] = "옵션"; Text[ turkish ] = "Seçenekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones"; + Text[ catalan ] = "Opcions"; + Text[ thai ] = "ตัวเลืà¸à¸"; }; }; }; @@ -976,10 +1006,10 @@ TabDialog RID_SCDLG_SUBTOTALS Text [ portuguese ] = "~Eliminar" ; Text [ finnish ] = "~Poista" ; Text [ danish ] = "Slet" ; - Text [ french ] = "~Supprimer" ; + Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; Text[ chinese_simplified ] = "åˆ é™¤(~D)"; @@ -992,7 +1022,8 @@ TabDialog RID_SCDLG_SUBTOTALS Text[ korean ] = "ì‚ì œ(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~ลบ"; }; Text[ chinese_simplified ] = "分类汇总"; Text[ russian ] = "Ïðîìåæóòî÷íûå èòîãè"; @@ -1001,10 +1032,11 @@ TabDialog RID_SCDLG_SUBTOTALS Text[ chinese_traditional ] = "å°è¨ˆ"; Text[ arabic ] = "ÇáãÌÇãíÚ ÇáÝÑÚíÉ"; Text[ greek ] = "ÌåñéêÜ áèñïßóìáôá"; - Text[ korean ] = "소계"; + Text[ korean ] = "부분합"; Text[ turkish ] = "Ara toplamlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Subtotales"; + Text[ catalan ] = "Subtotals"; + Text[ thai ] = "ผลรวมย่à¸à¸¢"; }; @@ -1019,3 +1051,9 @@ TabDialog RID_SCDLG_SUBTOTALS + + + + + + diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src index 3ef26d01c3b3..f1ac36115f3d 100644 --- a/sc/source/ui/src/tabopdlg.src +++ b/sc/source/ui/src/tabopdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: tabopdlg.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:26:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,9 @@ // (C) 1994-96 StarDivision GmbH, Hamburg, Germany // // $Workfile: tabopdlg.src $ - // $Author: kz $ - // $Date: 2001-07-14 20:26:12 $ - // $Revision: 1.15 $ + // $Author: hr $ + // $Date: 2003-03-26 18:06:33 $ + // $Revision: 1.16 $ // $Logfile: T:/sc/source/ui/src/tabopdlg.srv $ //---------------------------------------------------------------------------- @@ -110,17 +110,18 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "~Formules" ; Text [ spanish ] = "~Fórmulas" ; Text [ english_us ] = "~Formulas" ; - Text[ chinese_simplified ] = "¹«Ê½(~F)"; - Text[ russian ] = "Ôîðìóëà"; + Text[ chinese_simplified ] = "å…¬å¼(~F)"; + Text[ russian ] = "Ôîðìóëû"; Text[ polish ] = "Formu³y"; - Text[ japanese ] = "”Ž®(~F)"; - Text[ chinese_traditional ] = "¤½¦¡(~F)"; + Text[ japanese ] = "æ•°å¼(~F)"; + Text[ chinese_traditional ] = "å…¬å¼(~F)"; Text[ arabic ] = "ÕíÛ"; Text[ greek ] = "~Ôýðïé"; - Text[ korean ] = "¼ö½Ä(~F)"; + Text[ korean ] = "수ì‹(~F)"; Text[ turkish ] = "~Formül"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Fórmulas"; + Text[ catalan ] = "~Fórmules"; + Text[ thai ] = "~สูตร"; }; Edit ED_FORMULARANGE { @@ -146,17 +147,18 @@ ModelessDialog RID_SCDLG_TABOP QuickHelpText [ portuguese ] = "Afastar" ; QuickHelpText[ russian ] = "Óìåíüøèòü"; QuickHelpText[ polish ] = "Pomniejsz"; - QuickHelpText[ japanese ] = "k¬"; - QuickHelpText[ chinese_simplified ] = "ËõС/·Å´ó"; - QuickHelpText[ chinese_traditional ] = "ÁY¤p"; + QuickHelpText[ japanese ] = "縮å°"; + QuickHelpText[ chinese_simplified ] = "缩å°/放大"; + QuickHelpText[ chinese_traditional ] = "縮å°"; QuickHelpText[ arabic ] = "ÊÕÛíÑ"; QuickHelpText[ greek ] = "Óìßêñõíóç"; - QuickHelpText[ korean ] = "Ãà¼Ò"; + QuickHelpText[ korean ] = "축소"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern"; - QuickHelpText[ catalan ] = "Reducir"; + QuickHelpText[ catalan ] = "Redueix"; QuickHelpText[ finnish ] = "Kutista"; + QuickHelpText[ thai ] = "Shrink"; }; FixedText FT_ROWCELL { @@ -175,17 +177,18 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "~Rij" ; Text [ spanish ] = "Fil~a" ; Text [ english_us ] = "~Row input cell" ; - Text[ chinese_simplified ] = "ÐÐ(~R)"; - Text[ russian ] = "Ñòðîêà"; + Text[ chinese_simplified ] = "è¡Œ(~R)"; + Text[ russian ] = "Ñòðîêà ââîäà"; Text[ polish ] = "Wiersz"; - Text[ japanese ] = "s(~R)"; - Text[ chinese_traditional ] = "¦C(~R)"; + Text[ japanese ] = "è¡Œ(~R)"; + Text[ chinese_traditional ] = "列(~R)"; Text[ arabic ] = "ÇáÕÝ"; Text[ greek ] = "~ÃñáììÞ"; - Text[ korean ] = "Çà(~R)"; + Text[ korean ] = "í–‰(~R)"; Text[ turkish ] = "~Satýr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fil~a"; + Text[ catalan ] = "Cel.la d'entrada de la ~fila"; + Text[ thai ] = "à¹~ถวป้à¸à¸™à¹€à¸‹à¸¥à¸¥à¹Œ"; }; Edit ED_ROWCELL { @@ -211,17 +214,18 @@ ModelessDialog RID_SCDLG_TABOP QuickHelpText [ portuguese ] = "Afastar" ; QuickHelpText[ russian ] = "Óìåíüøèòü"; QuickHelpText[ polish ] = "Pomniejsz"; - QuickHelpText[ japanese ] = "k¬"; - QuickHelpText[ chinese_simplified ] = "ËõС"; - QuickHelpText[ chinese_traditional ] = "ÁY¤p"; + QuickHelpText[ japanese ] = "縮å°"; + QuickHelpText[ chinese_simplified ] = "缩å°"; + QuickHelpText[ chinese_traditional ] = "縮å°"; QuickHelpText[ arabic ] = "ÊÕÛíÑ"; QuickHelpText[ greek ] = "Óìßêñõíóç"; - QuickHelpText[ korean ] = "Ãà¼Ò"; + QuickHelpText[ korean ] = "축소"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern"; - QuickHelpText[ catalan ] = "Reducir"; + QuickHelpText[ catalan ] = "Redueix"; QuickHelpText[ finnish ] = "Kutista"; + QuickHelpText[ thai ] = "Shrink"; }; FixedText FT_COLCELL { @@ -235,22 +239,23 @@ ModelessDialog RID_SCDLG_TABOP Text [ portuguese ] = "~Coluna" ; Text [ finnish ] = "~Sarakkeiden syöttösolu" ; Text [ danish ] = "Kolonne" ; - Text [ french ] = "~Colonne" ; + Text [ french ] = "Colonne" ; Text [ swedish ] = "~Kolumn" ; Text [ dutch ] = "~Kolom" ; Text [ spanish ] = "~Columna" ; Text [ english_us ] = "~Column input cell" ; - Text[ chinese_simplified ] = "ÁÐ(~C)"; - Text[ russian ] = "Ñòîëáåö"; + Text[ chinese_simplified ] = "列(~C)"; + Text[ russian ] = "Ñòîëáåö ââîäà"; Text[ polish ] = "Kolumna"; - Text[ japanese ] = "—ñ(~C)"; - Text[ chinese_traditional ] = "Äæ(~C)"; + Text[ japanese ] = "列(~C)"; + Text[ chinese_traditional ] = "欄(~C)"; Text[ arabic ] = "ÇáÚãæÏ"; Text[ greek ] = "~ÓôÞëç"; - Text[ korean ] = "¿(~C)"; + Text[ korean ] = "ì—´(~C)"; Text[ turkish ] = "~Sütun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Columna"; + Text[ catalan ] = "~Cel.la d'entrada de la columna"; + Text[ thai ] = "~คà¸à¸¥à¸±à¸¡à¸™à¹Œà¸›à¹‰à¸à¸™à¹€à¸‹à¸¥à¸¥à¹Œ"; }; Edit ED_COLCELL { @@ -276,17 +281,18 @@ ModelessDialog RID_SCDLG_TABOP QuickHelpText [ portuguese ] = "Afastar" ; QuickHelpText[ russian ] = "Óìåíüøèòü"; QuickHelpText[ polish ] = "Pomniejsz"; - QuickHelpText[ japanese ] = "k¬"; - QuickHelpText[ chinese_simplified ] = "ËõС"; - QuickHelpText[ chinese_traditional ] = "ÁY¤p"; + QuickHelpText[ japanese ] = "縮å°"; + QuickHelpText[ chinese_simplified ] = "缩å°"; + QuickHelpText[ chinese_traditional ] = "縮å°"; QuickHelpText[ arabic ] = "ÊÕÛíÑ"; QuickHelpText[ greek ] = "Óìßêñõíóç"; - QuickHelpText[ korean ] = "Ãà¼Ò"; + QuickHelpText[ korean ] = "축소"; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ language_user1 ] = " "; QuickHelpText[ turkish ] = "Verkleinern"; - QuickHelpText[ catalan ] = "Reducir"; + QuickHelpText[ catalan ] = "Redueix"; QuickHelpText[ finnish ] = "Kutista"; + QuickHelpText[ thai ] = "Shrink"; }; FixedLine FL_VARIABLES { @@ -298,24 +304,25 @@ ModelessDialog RID_SCDLG_TABOP Text [ italian ] = "Predefiniti" ; Text [ portuguese_brazilian ] = "Vari?veis" ; Text [ portuguese ] = "Predefinições" ; - Text [ finnish ] = "Asetukset" ; + Text [ finnish ] = "Oletusasetukset" ; Text [ danish ] = "Forudindstillinger" ; Text [ french ] = "Définitions" ; Text [ swedish ] = "Förinställningar" ; Text [ dutch ] = "Standaard" ; - Text [ spanish ] = "Predeterminaciones" ; + Text [ spanish ] = "Configuración predeterminada" ; Text [ english_us ] = "Default settings" ; - Text[ chinese_simplified ] = "Ô¤ÖÃ"; - Text[ russian ] = "Çàäàííûå çíà÷åíèÿ"; + Text[ chinese_simplified ] = "预置"; + Text[ russian ] = "Ñòàíäàðòíûå íàñòðîéêè"; Text[ polish ] = "Ustawienia domyœlne"; - Text[ japanese ] = "Ý’è"; - Text[ chinese_traditional ] = "¹w¸m"; + Text[ japanese ] = "è¨å®š"; + Text[ chinese_traditional ] = "é è¨"; Text[ arabic ] = "ÅÚÏÇÏÇÊ ÇÝÊÑÇÖíÉ"; Text[ greek ] = "ÐñïåðéëïãÞ"; - Text[ korean ] = "¼³Á¤"; + Text[ korean ] = "기본 ì„¤ì •"; Text[ turkish ] = "Varsayýlan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Variables"; + Text[ thai ] = "à¸à¸³à¸«à¸™à¸”ค่าเริ่มต้น"; }; OKButton BTN_OK { @@ -348,17 +355,18 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "Geen formule gespecificeerd." ; Text [ spanish ] = "¡No se ha especificado ninguna fórmula!" ; Text [ english_us ] = "No formula specified." ; - Text[ chinese_simplified ] = "ûÓÐÊäÈ빫ʽ£¡"; - Text[ russian ] = "Íå âíåñåíà ôîðìóëà!"; + Text[ chinese_simplified ] = "没有输入公å¼ï¼"; + Text[ russian ] = "Íå óêàçàíà ôîðìóëà."; Text[ polish ] = "Nie wpisano formu³y!"; - Text[ japanese ] = "”Ž®‚ª‹L“ü‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¨S¦³«ü©w¤½¦¡¡I"; + Text[ japanese ] = "æ•°å¼ãŒè¨˜å…¥ã•ã‚Œã¦ã„ã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "沒有指定公å¼ï¼"; Text[ arabic ] = "áã íÊã ÊÍÏíÏ ÃíÉ ÇáÕíÛÉ!"; Text[ greek ] = "Äåí ïñßóôçêáí ôýðïé!"; - Text[ korean ] = "¼ö½ÄÀÌ ÀԷµÇÁö¡¡¾Ê¾Ò½À´Ï´Ù."; + Text[ korean ] = "수ì‹ì´ ìž…ë ¥ë˜ì§€ 않았습니다."; Text[ turkish ] = "Formül girilmedi!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡No se ha especificado ninguna fórmula!"; + Text[ catalan ] = "No s'ha indicat cap fórmula."; + Text[ thai ] = "ไม่ได้ระบุสูตร"; }; String STR_NOCOLROW { @@ -375,17 +383,18 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "Noch rij, noch kolom gespecificeerd!" ; Text [ spanish ] = "¡No se ha especificado ni la fila ni la columna!" ; Text [ english_us ] = "Neither row or column specified." ; - Text[ chinese_simplified ] = "ûÓÐÖ¸¶¨ÐкÍÁУ¡"; - Text[ russian ] = "Íè ñòðîêè, íè ñòîëáöû íå çàäàíû!"; + Text[ chinese_simplified ] = "没有指定行和列ï¼"; + Text[ russian ] = "Íè ñòðîêè, íè ñòîëáöû íå óêàçàíû."; Text[ polish ] = "Nie wpisano ani wiersza ani kolumny!"; - Text[ japanese ] = "s—ñ‚Æ‚à‚É‹L“ü‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¨S¦³«ü©wÄæ©M¦C¡I"; + Text[ japanese ] = "行列ã¨ã‚‚ã«è¨˜å…¥ã•ã‚Œã¦ã„ã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "沒有指定欄和列ï¼"; Text[ arabic ] = "áã íÊã ÊÍÏíÏ ÇáÕÝ æáÇ ÇáÚãæÏ!"; Text[ greek ] = "Äåí ïñßóôçêå ïýôå ãñáììÞ, ïýôå óôÞëç!"; - Text[ korean ] = "¿ ¶Ç´Â ÇàÀÌ ÀԷµÇÁö ¾Ê¾Ò½À´Ï´Ù."; + Text[ korean ] = "ì—´ ë˜ëŠ” í–‰ì´ ìž…ë ¥ë˜ì§€ 않았습니다."; Text[ turkish ] = "Ne satýr ne de sütun belirtildi!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡No se ha especificado ni la fila ni la columna!"; + Text[ catalan ] = "No s'ha indicat cap fila ni cap columna."; + Text[ thai ] = "ไม่ได้ระบุทั้งà¹à¸–วà¹à¸¥à¸°à¸„à¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; String STR_WRONGFORMULA { @@ -402,17 +411,18 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "Ongedefinieerde naam of bereik!" ; Text [ spanish ] = "¡Nombre o área no definidos!" ; Text [ english_us ] = "Undefined name or range." ; - Text[ chinese_simplified ] = "ûÓж¨ÒåÃû³Æ»òÇøÓò£¡"; - Text[ russian ] = "Èìÿ èëè îáëàñòü íå îïðåäåëåíû!"; + Text[ chinese_simplified ] = "没有定义å称或区域ï¼"; + Text[ russian ] = "Èìÿ èëè îáëàñòü íå îïðåäåëåíû."; Text[ polish ] = "Nie zdefiniowana nazwa lub obszar!"; - Text[ japanese ] = "–¼‘O‚Ü‚½‚͔͈͂ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¨S¦³©w¸q¦WºÙ©Î°Ï°ì¡I"; + Text[ japanese ] = "åå‰ã¾ãŸã¯ç¯„囲ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "沒有定義å稱或å€åŸŸï¼"; Text[ arabic ] = "ÇÓã Ãæ äØÇÞ ÛíÑ ãõÚÑøÝ!"; Text[ greek ] = "Ìç ïñéóìÝíï üíïìá Þ ìç ïñéóìÝíç ðåñéï÷Þ!"; - Text[ korean ] = "Á¤ÀǵÇÁö ¾ÊÀº À̸§ ¶Ç´Â ±¸¿ª!"; + Text[ korean ] = "ì´ë¦„ ë˜ëŠ” 범위가 ì§€ì •ë˜ì§€ 않았습니다."; Text[ turkish ] = "Tanýmlanmamýþ ad ya da alan!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Nombre o área no definidos!"; + Text[ catalan ] = "El nom o àrea no s'ha definit."; + Text[ thai ] = "ไม่ได้à¸à¸³à¸«à¸™à¸”ชื่à¸à¸«à¸£à¸·à¸à¸Šà¹ˆà¸§à¸‡"; }; String STR_WRONGROWCOL { @@ -429,17 +439,18 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "Ongedefinieerde naam of verkeerde celverwijzing." ; Text [ spanish ] = "¡Nombre no definido o ref. a celda incorrecta!" ; Text [ english_us ] = "Undefined name or wrong cell reference." ; - Text[ chinese_simplified ] = "ûÓж¨ÒåÃû³Æ»ò´íÎóµÄµ¥Ôª¸ñÒýÓã¡"; - Text[ russian ] = "Íåîïðåäåëåíî èìÿ èëè íåïðàâèëüíàÿ ññûëêà ÿ÷åéêè!"; + Text[ chinese_simplified ] = "没有定义å称或错误的å•å…ƒæ ¼å¼•ç”¨ï¼"; + Text[ russian ] = "Íå îïðåäåëåíî èìÿ èëè íåïðàâèëüíàÿ ññûëêà ÿ÷åéêè."; Text[ polish ] = "Nie zdefiniowana nazwa lub z³y adres komórki!"; - Text[ japanese ] = "–¼‘O‚ªŽw’肳‚ê‚Ä‚¢‚È‚¢‚©A‚Ü‚½‚;َQÆ‚ª³‚µ‚‚ ‚è‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¨S¦³©w¸q¦WºÙ©Î¿ù»~ªºÀx¦s®æ°Ñ·Ó¡I"; + Text[ japanese ] = "åå‰ãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã„ã‹ã€ã¾ãŸã¯ã‚»ãƒ«å‚ç…§ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "沒有定義å稱或錯誤的儲å˜æ ¼åƒç…§ï¼"; Text[ arabic ] = "ÇÓã ÛíÑ ãõÚÑøÝ Ãæ ãÑÌÚ ÎáíÉ ÎÇØÆ!"; Text[ greek ] = "Ìç ïñéóìÝíï üíïìá Þ ëÜèïò áíáöïñÜ êåëéïý!."; - Text[ korean ] = "Á¤ÀǵÇÁö ¾ÊÀº À̸§ ¶Ç´Â Ʋ¸° ¼¿ ÂüÁ¶"; + Text[ korean ] = "ì´ë¦„ì´ ì§€ì •ë˜ì§€ 않았거나 ì…€ì˜ ì°¸ì¡°ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤."; Text[ turkish ] = "Tanýmlanmamýþ ad ya da yanlýþ hücre referansý!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Nombre no definido o ref. a celda incorrecta!"; + Text[ catalan ] = "El nom no s'ha definit o bé la referència a la cel.la és incorrecta."; + Text[ thai ] = "ไม่ได้à¸à¸³à¸«à¸™à¸”ชื่à¸à¸«à¸£à¸·à¸à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹€à¸‹à¸¥à¸¥à¹Œà¸œà¸´à¸”"; }; String STR_NOCOLFORMULA { @@ -456,17 +467,18 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "Formules vormen geen kolom!" ; Text [ spanish ] = "¡Las fórmulas no forman columna!" ; Text [ english_us ] = "Formulas don't form a column." ; - Text[ chinese_simplified ] = "¹«Ê½²¢²»¹¹³ÉÁУ¡"; - Text[ russian ] = "Ôîðìóëû íå îáðàçóþò ñòîëáåö!"; + Text[ chinese_simplified ] = "å…¬å¼å¹¶ä¸æž„æˆåˆ—ï¼"; + Text[ russian ] = "Ôîðìóëû íå îáðàçóþò ñòîëáåö."; Text[ polish ] = "Formu³y nie tworz¹ kolumny!"; - Text[ japanese ] = "”Ž®‚Í—ñ‚ðŒ`¬‚µ‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¤½¦¡¨Ã¤£ºc¦¨Äæ¡I"; + Text[ japanese ] = "æ•°å¼ã¯åˆ—ã‚’å½¢æˆã—ã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "å…¬å¼ä¸¦ä¸æ§‹æˆæ¬„ï¼"; Text[ arabic ] = "ÇáÕíÛ áÇ ÊõÔßá ÚãæÏÇð!"; Text[ greek ] = "Ïé ôýðïé äåí áðïôåëïýí ìéá óôÞëç!"; - Text[ korean ] = "¼ö½ÄÀº ¿À» ±¸¼ºÇÏÁö ¾Ê½À´Ï´Ù."; + Text[ korean ] = "수ì‹ì€ ì—´ì„ í˜•ì„±í•˜ì§€ 않습니다."; Text[ turkish ] = "Formüller sütun oluþturmuyor!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Las fórmulas no forman columna!"; + Text[ catalan ] = "Les fórmules no formen una columna."; + Text[ thai ] = "สูตรไม่จัดคà¸à¸¥à¸±à¸¡à¸™à¹Œ"; }; String STR_NOROWFORMULA { @@ -483,31 +495,45 @@ ModelessDialog RID_SCDLG_TABOP Text [ dutch ] = "Formules vormen geen rij!" ; Text [ spanish ] = "¡Fórmulas no forman una fila!" ; Text [ english_us ] = "Formulas don't form a row." ; - Text[ chinese_simplified ] = "¹«Ê½²»¹¹³ÉÐУ¡"; - Text[ russian ] = "Ôîðìóëû íå îáðàçóþò ñòðîêó!"; + Text[ chinese_simplified ] = "å…¬å¼ä¸æž„æˆè¡Œï¼"; + Text[ russian ] = "Ôîðìóëû íå îáðàçóþò ñòðîêó."; Text[ polish ] = "Formu³y nie tworz¹ wiersza!"; - Text[ japanese ] = "”Ž®‚Ís‚ðŒ`¬‚µ‚Ü‚¹‚ñB"; - Text[ chinese_traditional ] = "¤½¦¡¤£ºc¦¨¦C¡I"; + Text[ japanese ] = "æ•°å¼ã¯è¡Œã‚’å½¢æˆã—ã¾ã›ã‚“。"; + Text[ chinese_traditional ] = "å…¬å¼ä¸æ§‹æˆåˆ—ï¼"; Text[ arabic ] = "ÇáÕíÛ áÇ ÊõÔßá ÕÝÇð!"; Text[ greek ] = "Ïé ôýðïé äåí áðïôåëïýí ìéá ãñáììÞ!"; - Text[ korean ] = "¼ö½ÄÀº ÇàÀ» ±¸¼ºÇÏÁö ¾Ê½À´Ï´Ù."; + Text[ korean ] = "수ì‹ì€ í–‰ì„ í˜•ì„±í•˜ì§€ 않습니다."; Text[ turkish ] = "Formüller satýr oluþturmuyor!"; Text[ language_user1 ] = " "; - Text[ catalan ] = "¡Fórmulas no forman una fila!"; + Text[ catalan ] = "Les fórmules no formen una fila."; + Text[ thai ] = "สูตรไม่จัดà¹à¸–ว"; }; - Text[ chinese_simplified ] = "¶àÖؼÆËã"; - Text[ russian ] = "Òàáëèöà ïîäñòàíîâêè"; + Text[ chinese_simplified ] = "多é‡è®¡ç®—"; + Text[ russian ] = "Ñîâìåùåííûå îïåðàöèè"; Text[ polish ] = "Operacje wielokrotne"; - Text[ japanese ] = "•¡”‰‰ŽZ"; - Text[ chinese_traditional ] = "¼Ï¯Ã¤ÀªRªí"; + Text[ japanese ] = "複数演算"; + Text[ chinese_traditional ] = "樞ç´åˆ†æžè¡¨"; Text[ arabic ] = "ÚãáíÇÊ ãÊÚÏÏÉ"; Text[ greek ] = "ÐïëëáðëÝò ëåéôïõñãßåò"; - Text[ korean ] = "´ÙÁß ¿¬»ê"; + Text[ korean ] = "다중 ì—°ì‚°"; Text[ turkish ] = "Çoklu iþlemler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Operaciones múltiples"; + Text[ catalan ] = "Operacions múltiples"; + Text[ thai ] = "หลายปà¸à¸´à¸šà¸±à¸•à¸´à¸à¸²à¸£"; }; + + + + + + + + + + + + diff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src index eac872cdd9f7..12dcd304c409 100644 --- a/sc/source/ui/src/textdlgs.src +++ b/sc/source/ui/src/textdlgs.src @@ -2,9 +2,9 @@ * * $RCSfile: textdlgs.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2001-07-14 02:49:31 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,18 +104,19 @@ TabDialog RID_SCDLG_CHAR Text[ french ] = "Police"; Text[ spanish ] = "Fuente"; Text[ italian ] = "Carattere"; - Text[ danish ] = "Character"; + Text[ danish ] = "Skrifttype"; Text[ swedish ] = "Teckensnitt"; Text[ polish ] = "Czcionka"; Text[ portuguese_brazilian ] = "Character"; - Text[ japanese ] = "Ì«ÝÄ"; - Text[ korean ] = "±Û²Ã"; - Text[ chinese_simplified ] = "×ÖÌå"; - Text[ chinese_traditional ] = "¦r«¬"; + Text[ japanese ] = "フォント"; + Text[ korean ] = "글꼴"; + Text[ chinese_simplified ] = "å—体"; + Text[ chinese_traditional ] = "å—åž‹"; Text[ turkish ] = "Character"; Text[ arabic ] = "ÇáÎØ"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; Text[ finnish ] = "Fontti"; + Text[ thai ] = "ตัวà¸à¸±à¸à¸©à¸£"; }; PageItem { @@ -124,24 +125,25 @@ TabDialog RID_SCDLG_CHAR Text [ ENGLISH ] = "Character Extension" ; Text[ english_us ] = "Font Effects"; Text[ portuguese ] = "Efeitos do tipo de letra"; - Text[ russian ] = "Ýôôåêò øðèôòà"; + Text[ russian ] = "Ýôôåêòû øðèôòà"; Text[ greek ] = "ÅöÝ ãñáììáôïóåéñÜò"; Text[ dutch ] = "Schrifteffect"; Text[ french ] = "Effets de caractères"; Text[ spanish ] = "Efecto de fuente"; Text[ italian ] = "Effetto carattere"; - Text[ danish ] = "Character Extension"; + Text[ danish ] = "Skrifteffekt"; Text[ swedish ] = "Teckeneffekt"; Text[ polish ] = "Efekty czcionek"; Text[ portuguese_brazilian ] = "Character Extension"; - Text[ japanese ] = "Ì«ÝÄŒø‰Ê"; - Text[ korean ] = "±Û²Ã È¿°ú"; - Text[ chinese_simplified ] = "×ÖÌåЧ¹û"; - Text[ chinese_traditional ] = "¦r«¬®ÄªG"; + Text[ japanese ] = "フォント効果"; + Text[ korean ] = "글꼴 효과"; + Text[ chinese_simplified ] = "å—体效果"; + Text[ chinese_traditional ] = "å—型效果"; Text[ turkish ] = "Character Extension"; Text[ arabic ] = "ÊÃËíÑÇÊ ÇáÎØæØ"; - Text[ catalan ] = "Efecto de fuente"; + Text[ catalan ] = "Efectes de lletra"; Text[ finnish ] = "Fonttitehosteet"; + Text[ thai ] = "ลัà¸à¸©à¸“ะตัวà¸à¸±à¸à¸©à¸£"; }; PageItem { @@ -156,18 +158,19 @@ TabDialog RID_SCDLG_CHAR Text[ french ] = "Position"; Text[ spanish ] = "Posición de fuente"; Text[ italian ] = "Posizione carattere"; - Text[ danish ] = "Character Position"; + Text[ danish ] = "Skriftplacering"; Text[ swedish ] = "Teckenposition"; Text[ polish ] = "Pozycja czcionki"; Text[ portuguese_brazilian ] = "Character Position"; - Text[ japanese ] = "Ì«ÝĂ̈ʒu"; - Text[ korean ] = "±Û²Ã À§Ä¡"; - Text[ chinese_simplified ] = "×ÖÌåλÖÃ"; - Text[ chinese_traditional ] = "¦r«¬¦ì¸m"; + Text[ japanese ] = "フォントã®ä½ç½®"; + Text[ korean ] = "글꼴 위치"; + Text[ chinese_simplified ] = "å—体ä½ç½®"; + Text[ chinese_traditional ] = "å—åž‹ä½ç½®"; Text[ turkish ] = "Character Position"; Text[ arabic ] = "ãæÖÚ ÇáÎØ"; - Text[ catalan ] = "Posición de fuente"; + Text[ catalan ] = "Posició del tipus de lletra"; Text[ finnish ] = "Fontin sijainti"; + Text[ thai ] = "ตำà¹à¸«à¸™à¹ˆà¸‡à¸•à¸±à¸§à¸à¸±à¸à¸©à¸£"; }; }; }; @@ -204,33 +207,35 @@ TabDialog RID_SCDLG_CHAR Text [ danish ] = "Tilbage" ; Text [ french ] = "Précédent" ; Text [ swedish ] = "Tillbaka" ; - Text [ dutch ] = "Ongedaan" ; + Text [ dutch ] = "Ongedaan maken" ; Text [ spanish ] = "Regresar" ; Text [ english_us ] = "Back" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "·µ»Ø"; + Text[ chinese_simplified ] = "返回"; Text[ russian ] = "Íàçàä"; Text[ polish ] = "Wstecz"; - Text[ japanese ] = "–ß‚é"; - Text[ chinese_traditional ] = "ªð¦^"; + Text[ japanese ] = "戻る"; + Text[ chinese_traditional ] = "返回"; Text[ arabic ] = "ÇáÓÇÈÞ"; Text[ greek ] = "Ðßóù"; - Text[ korean ] = "µÚ·Î"; + Text[ korean ] = "뒤로"; Text[ turkish ] = "Geri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Regresar"; + Text[ catalan ] = "Enrere"; + Text[ thai ] = "à¸à¸¥à¸±à¸šà¹„ป"; }; - Text[ chinese_simplified ] = "×Ö·û"; - Text[ russian ] = "Çíàê"; + Text[ chinese_simplified ] = "å—符"; + Text[ russian ] = "Ñèìâîë"; Text[ polish ] = "Znak"; - Text[ japanese ] = "•¶Žš"; - Text[ chinese_traditional ] = "¦r¤¸"; + Text[ japanese ] = "æ–‡å—"; + Text[ chinese_traditional ] = "å—å…ƒ"; Text[ arabic ] = "ÇáÍÑÝ"; Text[ greek ] = "×áñáêôÞñåò"; - Text[ korean ] = "¹®ÀÚ"; + Text[ korean ] = "문ìž"; Text[ turkish ] = "Karakter"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Carácter"; + Text[ catalan ] = "Caràcter"; + Text[ thai ] = "ตัวà¸à¸±à¸à¸‚ระ"; }; TabDialog RID_SCDLG_PARAGRAPH @@ -278,17 +283,18 @@ TabDialog RID_SCDLG_PARAGRAPH Text [ spanish ] = "Sangrías y espacios" ; Text [ english_us ] = "Indents & Spacing" ; PageResID = RID_SVXPAGE_STD_PARAGRAPH ; - Text[ chinese_simplified ] = "Ëõ½øºÍ¼ä¸ô"; - Text[ russian ] = "Îòñóïû è èíòåðâàëû"; + Text[ chinese_simplified ] = "缩进和间隔"; + Text[ russian ] = "Îòñòóïû è èíòåðâàëû"; Text[ polish ] = "Wciêcia i odstêpy"; - Text[ japanese ] = "²ÝÃÞÝÄ‚ÆsŠÔŠu"; - Text[ chinese_traditional ] = "ÁY±Æ©M¶¡¹j"; + Text[ japanese ] = "インデントã¨è¡Œé–“éš”"; + Text[ chinese_traditional ] = "縮排和間隔"; Text[ arabic ] = "ÇáÅÒÇÍÉ æÇáÊÈÇÚÏ"; Text[ greek ] = "Åóï÷Ýò êáé áðïóôÜóåéò"; - Text[ korean ] = "µé¿©¾²±â & °£°Ý"; + Text[ korean ] = "들여쓰기 ë° ê°„ê²©"; Text[ turkish ] = "Girinti ve aralýklar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangrías y espacios"; + Text[ catalan ] = "Sagnats i espaiat"; + Text[ thai ] = "ระยะเยื้à¸à¸‡à¹à¸¥à¸°à¸£à¸°à¸¢à¸°à¸«à¹ˆà¸²à¸‡"; }; /* PageItem { @@ -324,18 +330,19 @@ TabDialog RID_SCDLG_PARAGRAPH Text [ french ] = "Alignement" ; Text [ dutch ] = "Uitlijning" ; Text [ portuguese ] = "Alinhamento" ; - Text[ chinese_simplified ] = "¶ÔÆë"; + Text[ chinese_simplified ] = "对é½"; Text[ russian ] = "Âûðàâíèâàíèå"; Text[ polish ] = "Wyrównanie"; - Text[ japanese ] = "”z’u"; - Text[ chinese_traditional ] = "¹ï»ô"; + Text[ japanese ] = "é…ç½®"; + Text[ chinese_traditional ] = "å°é½Š"; Text[ arabic ] = "ÇáãÍÇÐÇÉ"; Text[ greek ] = "Óôïß÷éóç"; - Text[ korean ] = "¸ÂÃã"; + Text[ korean ] = "맞춤"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineación"; + Text[ catalan ] = "Alineament"; Text[ finnish ] = "Tasaus"; + Text[ thai ] = "จัดตำà¹à¸«à¸™à¹ˆà¸‡"; }; PageItem { @@ -344,24 +351,25 @@ TabDialog RID_SCDLG_PARAGRAPH Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asiática"; - Text[ russian ] = "Àçèàòñêèå øðèôòû"; + Text[ russian ] = "Àçèàòñêîå îôîðìëåíèå"; Text[ greek ] = "ÁóéáôéêÞ ôõðïãñáößá"; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipografía asiática"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; Text[ polish ] = "Typografia azjatycka"; Text[ portuguese_brazilian ] = "Asian typography"; - Text[ japanese ] = "“ú–{Œê•¶‚Ì‘ÌÙ"; - Text[ korean ] = "¾Æ½Ã¾Æ¡¡Å¸ÀÌÆ÷±×·¡ÇÇ"; - Text[ chinese_simplified ] = "ÖÐÈÕº«ÎÄ×Ö"; - Text[ chinese_traditional ] = "¤¤¤éÁú¤å¦r"; + Text[ japanese ] = "日本語文ã®ä½“è£"; + Text[ korean ] = "한글 ìž…ë ¥ 체계"; + Text[ chinese_simplified ] = "ä¸æ—¥éŸ©æ–‡å—"; + Text[ chinese_traditional ] = "ä¸æ—¥éŸ“æ–‡å—"; Text[ turkish ] = "Asian typography"; Text[ arabic ] = "ÃÓáæÈ ÇáØÈÇÚÉ ÇáÂÓíæíÉ"; - Text[ catalan ] = "Tipografía asiática"; + Text[ catalan ] = "Tipografia asiàtica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "à¹à¸šà¸šà¸à¸²à¸£à¸žà¸´à¸¡à¸žà¹Œà¹à¸šà¸šà¹€à¸à¹€à¸Šà¸µà¸¢"; }; PageItem { @@ -377,20 +385,21 @@ TabDialog RID_SCDLG_PARAGRAPH Text [ french ] = "Tabulation" ; Text [ swedish ] = "Tabulator" ; Text [ dutch ] = "Tabs" ; - Text [ spanish ] = "Tabulaciones" ; + Text [ spanish ] = "Tabuladores" ; Text [ english_us ] = "Tab" ; PageResID = RID_SVXPAGE_TABULATOR ; - Text[ chinese_simplified ] = "ÖƱí·û"; + Text[ chinese_simplified ] = "制表符"; Text[ russian ] = "Òàáóëÿöèÿ"; Text[ polish ] = "Tabulator"; - Text[ japanese ] = "ÀÌÞ"; - Text[ chinese_traditional ] = "»sªí²Å"; + Text[ japanese ] = "タブ"; + Text[ chinese_traditional ] = "定ä½éµ"; Text[ arabic ] = "ÚáÇãÉ ÌÏæáÉ"; Text[ greek ] = "ÓôçëïèÝôçò"; - Text[ korean ] = "ÅÇ"; + Text[ korean ] = "íƒ"; Text[ turkish ] = "Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabulaciones"; + Text[ catalan ] = "Pestanya"; + Text[ thai ] = "ระยะà¸à¸±à¹‰à¸™"; }; }; }; @@ -427,33 +436,35 @@ TabDialog RID_SCDLG_PARAGRAPH Text [ danish ] = "Tilbage" ; Text [ french ] = "Précédent" ; Text [ swedish ] = "Tillbaka" ; - Text [ dutch ] = "Ongedaan" ; + Text [ dutch ] = "Ongedaan maken" ; Text [ spanish ] = "Regresar" ; Text [ english_us ] = "Back" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "·µ»Ø"; + Text[ chinese_simplified ] = "返回"; Text[ russian ] = "Íàçàä"; Text[ polish ] = "Wstecz"; - Text[ japanese ] = "–ß‚é"; - Text[ chinese_traditional ] = "ªð¦^"; + Text[ japanese ] = "戻る"; + Text[ chinese_traditional ] = "返回"; Text[ arabic ] = "ÇáÓÇÈÞ"; Text[ greek ] = "Ðßóù"; - Text[ korean ] = "µÚ·Î"; + Text[ korean ] = "뒤로"; Text[ turkish ] = "Geri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Regresar"; + Text[ catalan ] = "Enrere"; + Text[ thai ] = "à¸à¸¥à¸±à¸šà¹„ป"; }; - Text[ chinese_simplified ] = "¶ÎÂä"; + Text[ chinese_simplified ] = "段è½"; Text[ russian ] = "Àáçàö"; Text[ polish ] = "Akapit"; - Text[ japanese ] = "’i—Ž"; - Text[ chinese_traditional ] = "¬q¸¨"; + Text[ japanese ] = "段è½"; + Text[ chinese_traditional ] = "段è½"; Text[ arabic ] = "ÇáÝÞÑÉ"; Text[ greek ] = "ÐáñÜãñáöïò"; - Text[ korean ] = "´Ü¶ô"; + Text[ korean ] = "단ë½"; Text[ turkish ] = "Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Párrafo"; + Text[ catalan ] = "Paràgraf"; + Text[ thai ] = "ย่à¸à¸«à¸™à¹‰à¸²"; }; @@ -461,3 +472,12 @@ TabDialog RID_SCDLG_PARAGRAPH + + + + + + + + + diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src index 325461b31ef3..4d78b22219e8 100644 --- a/sc/source/ui/src/toolbox.src +++ b/sc/source/ui/src/toolbox.src @@ -2,9 +2,9 @@ * * $RCSfile: toolbox.src,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:37:24 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ // Toolbox - Resourcen // // (C) 1994 StarDivision GmbH, Hamburg, Germany - // $Author: kz $ $Date: 2002-11-27 16:37:24 $ $Revision: 1.47 $ + // $Author: hr $ $Date: 2003-03-26 18:06:34 $ $Revision: 1.48 $ // $Logfile: T:/sc/source/ui/src/toolbox.srv $ $Workfile: TOOLBOX.SRC $ //================================================================== @@ -180,7 +180,7 @@ String SCSTR_QHELP_INPUTWND Text[ chinese_traditional ] = "輸入欄"; Text[ arabic ] = "ÓØÑ ÇáÅÏÎÇá"; Text[ greek ] = "ÃñáììÞ åéóáãùãÞò"; - Text[ korean ] = "ìž…ë ¥í–‰"; + Text[ korean ] = "ìž…ë ¥ì¤„"; Text[ turkish ] = "Giriþ satýrý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Línia d'entrada"; @@ -200,16 +200,16 @@ String SCSTR_QHELP_BTNCALC Text [ french ] = "AutoPilote de fonctions" ; Text [ swedish ] = "Funktionsautopilot" ; Text [ dutch ] = "Functie-AutoPiloot" ; - Text [ spanish ] = "AutoPiloto de funciones" ; + Text [ spanish ] = "Piloto automático de funciones" ; Text [ english_us ] = "AutoPilot: Functions" ; - Text[ chinese_simplified ] = "函数自动助ç†"; + Text[ chinese_simplified ] = "自动文件助ç†ï¼šå‡½æ•°"; Text[ russian ] = "Ìàñòåð: Ôóíêöèè"; Text[ polish ] = "AutoPilot funkcji"; Text[ japanese ] = "関数オートパイãƒãƒƒãƒˆ"; Text[ chinese_traditional ] = "函數自動助ç†"; Text[ arabic ] = "ÇáãÑÔÏ ÇáÂáí ááÏÇáÇÊ"; Text[ greek ] = "Function Autopilot"; - Text[ korean ] = "ìžë™ 파ì¼ëŸ¿ 기능"; + Text[ korean ] = "ìžë™ 파ì¼ëŸ¿: 기능"; Text[ turkish ] = "Fonksyon OtoPilotu"; Text[ language_user1 ] = " "; Text[ catalan ] = "AutoPilot: funcions"; @@ -227,7 +227,7 @@ String SCSTR_QHELP_BTNOK Text [ portuguese ] = "Aceitar" ; Text [ finnish ] = "Hyväksy" ; Text [ danish ] = "Accepter" ; - Text [ french ] = "Appliquer" ; + Text [ french ] = "Accepter" ; Text [ swedish ] = "Överta" ; Text [ dutch ] = "Accepteren" ; Text [ spanish ] = "Aplicar" ; @@ -326,48 +326,45 @@ String SCSTR_QHELP_BTNEQUAL Text[ chinese_traditional ] = "函數"; Text[ arabic ] = "ÇáÏÇáÉ"; Text[ greek ] = "ÓõíÜñôçóç"; - Text[ korean ] = "함수"; + Text[ korean ] = "ìˆ˜ì‹ ëª¨ìŒ"; Text[ turkish ] = "Ýþlev"; Text[ language_user1 ] = " "; Text[ catalan ] = "Funció"; Text[ thai ] = "ฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™"; }; - //----------------------------------------------------------------------------- - // Applikations-Toolbar - //----------------------------------------------------------------------------- - -String RID_OBJECTBAR_APP +String RID_OBJECTBAR_FORMAT { - Text = "Funktionsleiste" ; - Text [ english ] = "Function Bar" ; - Text [ norwegian ] = "Function Bar" ; - Text [ italian ] = "Barra delle funzioni" ; - Text [ portuguese_brazilian ] = "Barra de Fun??s" ; - Text [ portuguese ] = "Barra de funções" ; - Text [ finnish ] = "Toimintorivi" ; - Text [ danish ] = "Funktionslinje" ; - Text [ french ] = "Barre de fonctions" ; - Text [ swedish ] = "Funktionslist" ; - Text [ dutch ] = "Werkbalk" ; - Text [ spanish ] = "Barra de funciones" ; - Text [ english_us ] = "Function Bar" ; - Text[ chinese_simplified ] = "功能æ "; - Text[ russian ] = "Ïàíåëü ôóíêöèé"; - Text[ polish ] = "Pasek funkcji"; - Text[ japanese ] = "ファンクションãƒãƒ¼"; - Text[ chinese_traditional ] = "工具列"; - Text[ arabic ] = "ÔÑíØ ÇáãåÇã"; - Text[ greek ] = "ÃñáììÞ ëåéôïõñãéþí"; - Text[ korean ] = "함수 모ìŒ"; - Text[ turkish ] = "Ýþlev çubuðu"; + Text = "Tabellenobjektleiste" ; + Text [ english ] = "Table Object Bar" ; + Text [ norwegian ] = "Object Bar" ; + Text [ italian ] = "Barra degli oggetti per tabelle" ; + Text [ portuguese_brazilian ] = "Object Bar" ; + Text [ portuguese ] = "Barra de objectos da folha de cálculo" ; + Text [ french ] = "Barre d'objets de classeur" ; + Text [ dutch ] = "Werkbladobjectbalk" ; + Text [ spanish ] = "Barra de objetos para tablas" ; + Text [ danish ] = "Regnearksobjektlinje" ; + Text [ swedish ] = "Tabellobjektlist" ; + Text [ finnish ] = "Laskentataulukon muotoilurivi" ; + Text [ english_us ] = "Spreadsheet Object Bar" ; + Text[ chinese_simplified ] = "工作表对象æ "; + Text[ russian ] = "Êîíòåêñòíàÿ ïàíåëü ýëåêòðîííîé òàáëèöû"; + Text[ polish ] = "Pasek obiektów arkusza kalkulacyjnego."; + Text[ japanese ] = "表オブジェクトãƒãƒ¼"; + Text[ chinese_traditional ] = "工作表物件列"; + Text[ arabic ] = "ÔÑíØ ßÇÆäÇÊ ÇáÌÏÇæá"; + Text[ greek ] = "ÃñáììÞ áíôéêåéìÝíùí ðéíÜêùí"; + Text[ korean ] = "ìŠ¤í”„ë ˆë“œì‹œíŠ¸ 개체 모ìŒ"; + Text[ turkish ] = "Tablo nesne çubuðu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra de funcions"; - Text[ thai ] = "à¹à¸–บฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™"; + Text[ catalan ] = "Barra d'objectes del full de càlcul"; + Text[ thai ] = "à¹à¸–บวัตถุà¸à¸£à¸°à¸”าษคำนวณ"; }; -ToolBox RID_OBJECTBAR_APP +ToolBox RID_OBJECTBAR_FORMAT { + HelpId = HID_SC_TOOLBOX_TABLE ; Dockable = TRUE ; Moveable = TRUE ; Sizeable = TRUE ; @@ -378,374 +375,505 @@ ToolBox RID_OBJECTBAR_APP LineSpacing = TRUE ; Border = TRUE ; SVLook = TRUE ; + Align = BOXALIGN_TOP ; MenuStrings = TRUE ; - Scroll = TRUE ; ItemList = { ToolBoxItem { - Identifier = SID_NEWDOCDIRECT ; - HelpID = SID_NEWDOCDIRECT ; + ITEM_TOOLBAR_TEMPLATE_APPLY + Hide=TRUE; + }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- + + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_FONT ; + HelpID = SID_ATTR_CHAR_FONT ; + }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_FONTHEIGHT ; + HelpID = SID_ATTR_CHAR_FONTHEIGHT ; + }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_WEIGHT ; + HelpID = SID_ATTR_CHAR_WEIGHT ; }; ToolBoxItem { - Identifier = SID_OPENDOC ; - HelpID = SID_OPENDOC ; + Identifier = SID_ATTR_CHAR_POSTURE ; + HelpID = SID_ATTR_CHAR_POSTURE ; }; ToolBoxItem { - Identifier = SID_SAVEDOC ; - HelpID = SID_SAVEDOC ; + Identifier = SID_ATTR_CHAR_UNDERLINE ; + HelpID = SID_ATTR_CHAR_UNDERLINE ; }; ToolBoxItem { - ITEM_TOOLBAR_PRINTDOCDIRECT + Identifier = SID_ULINE_VAL_DOUBLE; + HelpId = SID_ULINE_VAL_DOUBLE; + Hide=TRUE; + }; + + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_CHAR_COLOR }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_CUT ; - HelpID = SID_CUT ; + Identifier = SID_ALIGNLEFT ; + HelpId = SID_ALIGNLEFT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; ToolBoxItem { - Identifier = SID_COPY ; - HelpID = SID_COPY ; + Identifier = SID_ALIGNCENTERHOR ; + HelpId = SID_ALIGNCENTERHOR ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNRIGHT ; + HelpId = SID_ALIGNRIGHT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; ToolBoxItem { - Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + Identifier = SID_ALIGNBLOCK ; + HelpId = SID_ALIGNBLOCK ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_UNDO ; - HelpID = SID_UNDO ; + Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; + HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; + RadioCheck = TRUE; + Hide = TRUE; }; ToolBoxItem { - Identifier = SID_REDO ; - HelpID = SID_REDO ; + Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; + HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; + RadioCheck = TRUE; + Hide = TRUE; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { - ITEM_TOOLBAR_INSERT_FRAME + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + Hide=TRUE; }; ToolBoxItem { - ITEM_TOOLBAR_INSERT_GRAPHIC + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + Hide=TRUE; }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_IMPORT_DATA ; - HelpId = SID_IMPORT_DATA ; + Identifier = SID_NUMBER_CURRENCY ; + HelpId = SID_NUMBER_CURRENCY ; }; ToolBoxItem { - // mit Aufziehen des Zielbereichs - ITEM_TOOLBAR_DRAW_CHART + Identifier = SID_NUMBER_PERCENT ; + HelpId = SID_NUMBER_PERCENT ; }; ToolBoxItem { - ITEM_TOOLBAR_INSERT_DRAW + Identifier = SID_NUMBER_DATE; + HelpId = SID_NUMBER_DATE ; + Hide=TRUE; }; ToolBoxItem { - Identifier = SID_GALLERY ; - HelpID = SID_GALLERY ; + Identifier = SID_NUMBER_SCIENTIFIC ; + HelpId = SID_NUMBER_SCIENTIFIC; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_NUMBER_STANDARD ; + HelpId = SID_NUMBER_STANDARD ; + }; + + ToolBoxItem + { + Identifier = SID_NUMBER_INCDEC ; + HelpId = SID_NUMBER_INCDEC ; }; ToolBoxItem { - ITEM_TOOLBAR_CHOOSE_CONTROLS + Identifier = SID_NUMBER_DECDEC ; + HelpId = SID_NUMBER_DECDEC ; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_STYLE_DESIGNER ; - HelpId = SID_STYLE_DESIGNER ; + Identifier = SID_DEC_INDENT ; + HelpId = SID_DEC_INDENT ; }; ToolBoxItem { - Identifier = SID_AUTOFORMAT ; - HelpID = SID_AUTOFORMAT ; + Identifier = SID_INC_INDENT ; + HelpId = SID_INC_INDENT ; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- + // Border: nur noch einfach ToolBoxItem { - ITEM_TOOLBAR_SORT_ASCENDING + ITEM_TOOLBAR_ATTR_BORDER }; ToolBoxItem { - ITEM_TOOLBAR_SORT_DESCENDING + Identifier = SID_FRAME_LINESTYLE; + HelpId = SID_FRAME_LINESTYLE; + Hide=TRUE; }; ToolBoxItem { - ITEM_TOOLBAR_AUTO_FILTER + Identifier = SID_FRAME_LINECOLOR; + HelpId = SID_FRAME_LINECOLOR; + Hide=TRUE; }; + // Hintergrund: nur noch einfach ToolBoxItem { - ITEM_TOOLBAR_OUTLINE_MAKE + ITEM_TOOLBAR_BACKGROUND_COLOR + }; + + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- + ToolBoxItem + { + Identifier = SID_ALIGNTOP ; + HelpId = SID_ALIGNTOP ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; ToolBoxItem { - ITEM_TOOLBAR_OUTLINE_REMOVE + Identifier = SID_ALIGNCENTERVER ; + HelpId = SID_ALIGNCENTERVER ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; ToolBoxItem { - Identifier = SID_NAVIGATOR ; - HelpId = SID_SC_NAVIGATOR ; + Identifier = SID_ALIGNBOTTOM ; + HelpId = SID_ALIGNBOTTOM ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { + Identifier = FID_INS_ROW; + HelpId = FID_INS_ROW; + Hide=TRUE; }; ToolBoxItem { - Identifier = SID_EXTENDEDHELP ; - HelpID = SID_EXTENDEDHELP ; + Identifier = FID_INS_COLUMN; + HelpId = FID_INS_COLUMN; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_DEL_ROWS; + HelpId = SID_DEL_ROWS; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_DEL_COLS; + HelpId = SID_DEL_COLS; + Hide=TRUE; }; }; -}; - - //----------------------------------------------------------------------------- - // PlugIn-Toolbar - // (mit Aenderungen aus RID_OBJECTBAR_APP kopiert) - // nicht Closeable / Customize - //----------------------------------------------------------------------------- - -String RID_PLUGINTOOLBOX -{ - /* ### ACHTUNG: Neuer Text in Resource? Funktionsleiste für PlugIns : Funktionsleiste f³r PlugIns */ - Text = "Funktionsleiste für PlugIns" ; - Text [ english ] = "PlugIn Function Bar" ; - Text [ dutch ] = "Werkbalk voor plugins" ; - Text [ english_us ] = "Function Bar for Plug-ins" ; - Text [ italian ] = "Barra delle funzioni per PlugIn" ; - Text [ spanish ] = "Barra de funciones para Plug-ins" ; - Text [ french ] = "Barre de fonctions Plug-ins" ; - Text [ swedish ] = "Funktionslist för plug-ins" ; - Text [ danish ] = "Funktionslinje for PlugIns" ; - Text [ portuguese ] = "Barra para Plugins" ; - Text [ portuguese_brazilian ] = "Funktionsleiste f? PlugIns" ; - Text[ chinese_simplified ] = "用于 Plug-ins 的功能æ "; - Text[ russian ] = "Ïàíåëü ôóíêöèé ïîäêëþ÷àåìûõ ìîäóëåé"; - Text[ polish ] = "Pasek funkcji wtyczek plug-in"; - Text[ japanese ] = "プラグインã®ãƒ•ã‚¡ãƒ³ã‚¯ã‚·ãƒ§ãƒ³ãƒãƒ¼"; - Text[ chinese_traditional ] = "é©ç”¨æ–¼ Plug-ins 的工具列"; - Text[ arabic ] = "ÔÑíØ æÙíÝÉ Plug-Ins"; - Text[ greek ] = "ÃñáììÞ ëåéôïõñãéþí ãéá óõíäåüìåíåò õðïìïíÜäåò"; - Text[ korean ] = "플러그ì¸ì˜ 기능 모ìŒ"; - Text[ turkish ] = "PlugIn iþlev çubuðu"; - Text[ language_user1 ] = " "; - Text[ finnish ] = "Lisäosien toimintorivi"; - Text[ catalan ] = "Barra de funcions per als connectors"; - Text[ thai ] = "à¹à¸–บฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™"; -}; - -ToolBox RID_PLUGINTOOLBOX -{ - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - // Closeable = TRUE; // hier nicht ! - Zoomable = TRUE ; - // Customize = TRUE; // hier nicht ! - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - MenuStrings = TRUE ; - Scroll = TRUE ; - ItemList = + ItemList[arabic] = { ToolBoxItem { - Identifier = SID_SAVEDOC ; - HelpID = SID_SAVEDOC ; + ITEM_TOOLBAR_TEMPLATE_APPLY + Hide=TRUE; }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- + ToolBoxItem { - ITEM_FILE_SAVEASDOC + Identifier = SID_ATTR_CHAR_FONT ; + HelpID = SID_ATTR_CHAR_FONT ; }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_MAIL_SENDDOC ; - HelpID = SID_MAIL_SENDDOC ; + Identifier = SID_ATTR_CHAR_FONTHEIGHT ; + HelpID = SID_ATTR_CHAR_FONTHEIGHT ; + }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_WEIGHT ; + HelpID = SID_ATTR_CHAR_WEIGHT ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_POSTURE ; + HelpID = SID_ATTR_CHAR_POSTURE ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_CHAR_UNDERLINE ; + HelpID = SID_ATTR_CHAR_UNDERLINE ; }; ToolBoxItem { - Identifier = SID_DOCINFO ; - HelpID = SID_DOCINFO ; + Identifier = SID_ULINE_VAL_DOUBLE; + HelpId = SID_ULINE_VAL_DOUBLE; + Hide=TRUE; }; + ToolBoxItem { - ITEM_TOOLBAR_PRINTDOCDIRECT + ITEM_TOOLBAR_ATTR_CHAR_COLOR }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_CUT ; - HelpID = SID_CUT ; + Identifier = SID_ALIGNRIGHT ; + HelpId = SID_ALIGNRIGHT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; ToolBoxItem { - Identifier = SID_COPY ; - HelpID = SID_COPY ; + Identifier = SID_ALIGNCENTERHOR ; + HelpId = SID_ALIGNCENTERHOR ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNLEFT ; + HelpId = SID_ALIGNLEFT ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; ToolBoxItem { - Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + Identifier = SID_ALIGNBLOCK ; + HelpId = SID_ALIGNBLOCK ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_UNDO ; - HelpID = SID_UNDO ; + Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; + HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; + RadioCheck = TRUE; + Hide = TRUE; }; ToolBoxItem { - Identifier = SID_REDO ; - HelpID = SID_REDO ; + Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; + HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; + RadioCheck = TRUE; + Hide = TRUE; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { - ITEM_TOOLBAR_INSERT_FRAME + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + Hide=TRUE; }; ToolBoxItem { - ITEM_TOOLBAR_INSERT_GRAPHIC + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + Hide=TRUE; }; + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- ToolBoxItem { - ITEM_TOOLBAR_SPELLING + Identifier = SID_NUMBER_CURRENCY ; + HelpId = SID_NUMBER_CURRENCY ; }; ToolBoxItem { - ITEM_TOOLBAR_INSERT_DRAW + Identifier = SID_NUMBER_PERCENT ; + HelpId = SID_NUMBER_PERCENT ; + }; + ToolBoxItem + { + Identifier = SID_NUMBER_DATE; + HelpId = SID_NUMBER_DATE ; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_NUMBER_SCIENTIFIC ; + HelpId = SID_NUMBER_SCIENTIFIC; + Hide=TRUE; }; ToolBoxItem { - Identifier = SID_GALLERY ; - HelpID = SID_GALLERY ; + Identifier = SID_NUMBER_STANDARD ; + HelpId = SID_NUMBER_STANDARD ; }; + ToolBoxItem { - ITEM_TOOLBAR_CHOOSE_CONTROLS + Identifier = SID_NUMBER_INCDEC ; + HelpId = SID_NUMBER_INCDEC ; + }; + ToolBoxItem + { + Identifier = SID_NUMBER_DECDEC ; + HelpId = SID_NUMBER_DECDEC ; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_STYLE_DESIGNER ; - HelpId = SID_STYLE_DESIGNER ; + Identifier = SID_DEC_INDENT ; + HelpId = SID_DEC_INDENT ; }; ToolBoxItem { - Identifier = SID_AUTOFORMAT ; - HelpID = SID_AUTOFORMAT ; + Identifier = SID_INC_INDENT ; + HelpId = SID_INC_INDENT ; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- + // Border: nur noch einfach ToolBoxItem { - ITEM_TOOLBAR_SORT_ASCENDING + ITEM_TOOLBAR_ATTR_BORDER }; ToolBoxItem { - ITEM_TOOLBAR_SORT_DESCENDING + Identifier = SID_FRAME_LINESTYLE; + HelpId = SID_FRAME_LINESTYLE; + Hide=TRUE; }; ToolBoxItem { - ITEM_TOOLBAR_AUTO_FILTER + Identifier = SID_FRAME_LINECOLOR; + HelpId = SID_FRAME_LINECOLOR; + Hide=TRUE; }; + // Hintergrund: nur noch einfach ToolBoxItem { - ITEM_TOOLBAR_OUTLINE_MAKE + ITEM_TOOLBAR_BACKGROUND_COLOR }; + + //-------------------------------------------------------------------- + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + //-------------------------------------------------------------------- ToolBoxItem { - ITEM_TOOLBAR_OUTLINE_REMOVE + Identifier = SID_ALIGNTOP ; + HelpId = SID_ALIGNTOP ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; ToolBoxItem { - Identifier = SID_NAVIGATOR ; - HelpID = SID_NAVIGATOR ; + Identifier = SID_ALIGNCENTERVER ; + HelpId = SID_ALIGNCENTERVER ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; + }; + ToolBoxItem + { + Identifier = SID_ALIGNBOTTOM ; + HelpId = SID_ALIGNBOTTOM ; + RadioCheck = TRUE ; + AutoCheck = TRUE ; }; //-------------------------------------------------------------------- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_SCOPTIONS ; - HelpId = SID_SCOPTIONS ; + Identifier = FID_INS_ROW; + HelpId = FID_INS_ROW; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = FID_INS_COLUMN; + HelpId = FID_INS_COLUMN; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_DEL_ROWS; + HelpId = SID_DEL_ROWS; + Hide=TRUE; + }; + ToolBoxItem + { + Identifier = SID_DEL_COLS; + HelpId = SID_DEL_COLS; + Hide=TRUE; }; }; -}; - - -String RID_OBJECTBAR_FORMAT -{ - Text = "Tabellenobjektleiste" ; - Text [ english ] = "Table Object Bar" ; - Text [ norwegian ] = "Object Bar" ; - Text [ italian ] = "Barra degli oggetti per tabelle" ; - Text [ portuguese_brazilian ] = "Object Bar" ; - Text [ portuguese ] = "Barra de objectos da folha de cálculo" ; - Text [ french ] = "Barre d'objets de classeur" ; - Text [ dutch ] = "Werkbladobjectbalk" ; - Text [ spanish ] = "Barra de objetos para tablas" ; - Text [ danish ] = "Regnearksobjektlinje" ; - Text [ swedish ] = "Tabellobjektlist" ; - Text [ finnish ] = "Laskentataulukon muotoilurivi" ; - Text [ english_us ] = "Spreadsheet Object Bar" ; - Text[ chinese_simplified ] = "工作表对象æ "; - Text[ russian ] = "Êîíòåêñòíàÿ ïàíåëü ýëåêòðîííîé òàáëèöû"; - Text[ polish ] = "Pasek obiektów arkusza kalkulacyjnego."; - Text[ japanese ] = "表オブジェクトãƒãƒ¼"; - Text[ chinese_traditional ] = "工作表物件列"; - Text[ arabic ] = "ÔÑíØ ßÇÆäÇÊ ÇáÌÏÇæá"; - Text[ greek ] = "ÃñáììÞ áíôéêåéìÝíùí ðéíÜêùí"; - Text[ korean ] = "ìŠ¤í”„ë ˆë“œì‹œíŠ¸ 개체 모ìŒ"; - Text[ turkish ] = "Tablo nesne çubuðu"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra d'objectes del full de càlcul"; - Text[ thai ] = "à¹à¸–บวัตถุà¸à¸£à¸°à¸”าษคำนวณ"; -}; - -ToolBox RID_OBJECTBAR_FORMAT -{ - HelpId = HID_SC_TOOLBOX_TABLE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = + ItemList[hebrew] = { ToolBoxItem { @@ -803,8 +931,8 @@ ToolBox RID_OBJECTBAR_FORMAT //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ALIGNLEFT ; + Identifier = SID_ALIGNRIGHT ; + HelpId = SID_ALIGNRIGHT ; RadioCheck = TRUE ; AutoCheck = TRUE ; }; @@ -817,8 +945,8 @@ ToolBox RID_OBJECTBAR_FORMAT }; ToolBoxItem { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ALIGNRIGHT ; + Identifier = SID_ALIGNLEFT ; + HelpId = SID_ALIGNLEFT ; RadioCheck = TRUE ; AutoCheck = TRUE ; }; @@ -834,15 +962,15 @@ ToolBox RID_OBJECTBAR_FORMAT //-------------------------------------------------------------------- ToolBoxItem { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; + Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; + HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; RadioCheck = TRUE; Hide = TRUE; }; ToolBoxItem { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; + Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; + HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; RadioCheck = TRUE; Hide = TRUE; }; @@ -1018,7 +1146,7 @@ String RID_OBJECTBAR_PREVIEW Text[ chinese_traditional ] = "é é¢æª¢è¦–物件列"; Text[ arabic ] = "ÔÑíØ ßÇÆäÇÊ ãÚÇíäÉ ÇáÕÝÍÉ"; Text[ greek ] = "ÃñáììÞ áíôéêåéìÝíùí ðñïåðéóêüðçóçò óåëßäáò"; - Text[ korean ] = "페ì´ì§€ 미리보기 개체 모ìŒ"; + Text[ korean ] = "페ì´ì§€ 보기 개체 모ìŒ"; Text[ turkish ] = "Sayfa önizleme nesne çubuðu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'objectes de la visualització de pàgina"; @@ -1733,9 +1861,10 @@ FloatingWindow RID_TBXCTL_INSOBJ SID_EURO_CONVERTER;\ SID_ATTR_GRAF_CROP;\ SID_ENABLE_HYPHENATION; /* 26087 */ \ + SID_ATTR_ZOOM; \ }; \ IdCount = { \ - 167; \ + 168; \ }; @@ -1878,6 +2007,116 @@ ImageList RID_OFFICEIMAGELIST_LCH OFFICE_IDLIST }; +String RID_OBJECTBAR_APP +{ + TEXT = "Funktionsleiste" ; + TEXT [ english ] = "Function bar" ; + Text [ dutch ] = "Werkbalk" ; + Text [ english_us ] = "Function Bar" ; + Text [ italian ] = "Barra delle funzioni" ; + Text [ spanish ] = "Barra de funciones" ; + Text [ french ] = "Barre de fonctions" ; + Text [ swedish ] = "Funktionslist" ; + Text [ danish ] = "Funktionslinje" ; + Text [ portuguese_brazilian ] = "Funktionsleiste" ; + Text [ portuguese ] = "Barra de funções" ; + Text[ chinese_simplified ] = "功能æ "; + Text[ russian ] = "Ïàíåëü ôóíêöèé"; + Text[ polish ] = "Pasek funkcji"; + Text[ japanese ] = "ファンクションãƒãƒ¼"; + Text[ chinese_traditional ] = "工具列"; + Text[ arabic ] = "ÔÑíØ ÇáãåÇã"; + Text[ dutch ] = "Werkbalk"; + Text[ chinese_simplified ] = "功能æ "; + Text[ greek ] = "ÃñáììÞ ëåéôïõñãéþí"; + Text[ korean ] = "함수 모ìŒ"; + Text[ turkish ] = "Ýþlev çubuðu"; + Text[ language_user1 ] = " "; + Text[ catalan ] = "Barra de funcions"; + Text[ finnish ] = "Toimintorivi"; + Text[ thai ] = "à¹à¸–บฟังà¸à¹Œà¸Šà¸±à¹ˆà¸™"; +}; + +ToolBox RID_OBJECTBAR_APP +{ + Border = TRUE ; + SVLook = TRUE ; + Dockable = TRUE ; + Moveable = TRUE ; + Sizeable = TRUE ; + Closeable = TRUE ; + Zoomable = TRUE ; + HideWhenDeactivate = TRUE ; + LineSpacing = TRUE ; + Customize = TRUE ; + MenuStrings = TRUE ; + Hide = TRUE ; + ItemList = + { + ToolBoxItem + { + Identifier = SID_SAVEASDOC ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_EDITDOC ; + }; + ToolBoxItem + { + Identifier = SID_MAIL_SENDDOC ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_DIRECTEXPORTDOCASPDF ; + }; + ToolBoxItem + { + Identifier = SID_PRINTDOCDIRECT ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_COPY ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_SEARCH_DLG ; + }; + ToolBoxItem + { + Identifier = SID_NAVIGATOR ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_ZOOM ; + }; + }; + Scroll = TRUE ; +}; + + + + + diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src index 5c3aa9faf934..61cb865ee906 100644 --- a/sc/source/ui/styleui/scstyles.src +++ b/sc/source/ui/styleui/scstyles.src @@ -2,9 +2,9 @@ * * $RCSfile: scstyles.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: nn $ $Date: 2002-05-31 18:04:06 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,3 +158,5 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; + + diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src index 47abda19ed41..552ae0ee7512 100644 --- a/sc/source/ui/styleui/styledlg.src +++ b/sc/source/ui/styleui/styledlg.src @@ -2,9 +2,9 @@ * * $RCSfile: styledlg.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2001-11-16 22:53:49 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,7 @@ TabDialog RID_SCDLG_STYLES_PAR Text [ italian ] = "Numeri" ; Text [ portuguese_brazilian ] = "N?ero" ; Text [ portuguese ] = "Números" ; - Text [ finnish ] = "Numerot" ; + Text [ finnish ] = "Luku" ; Text [ danish ] = "Tal" ; Text [ french ] = "Nombres" ; Text [ swedish ] = "Tal" ; @@ -115,6 +115,7 @@ TabDialog RID_SCDLG_STYLES_PAR Text[ turkish ] = "Sayý"; Text[ language_user1 ] = " "; Text[ catalan ] = "Números"; + Text[ thai ] = "ตัวเลข"; }; PageItem { @@ -136,14 +137,15 @@ TabDialog RID_SCDLG_STYLES_PAR Text[ chinese_simplified ] = "å—体"; Text[ russian ] = "Øðèôò"; Text[ polish ] = "Czcionka"; - Text[ japanese ] = "ﾌｫï¾ï¾„"; + Text[ japanese ] = "フォント"; Text[ chinese_traditional ] = "å—åž‹"; Text[ arabic ] = "ÎØ"; Text[ greek ] = "ÃñáììáôïóåéñÜ"; Text[ korean ] = "글꼴"; Text[ turkish ] = "Yazýtipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "ตัวà¸à¸±à¸à¸©à¸£"; }; PageItem { @@ -152,24 +154,25 @@ TabDialog RID_SCDLG_STYLES_PAR Text [ ENGLISH ] = "Character Extension" ; Text[ english_us ] = "Font Effects"; Text[ portuguese ] = "Efeitos do tipo de letra"; - Text[ russian ] = "Ýôôåêò øðèôòà"; + Text[ russian ] = "Ýôôåêòû øðèôòà"; Text[ greek ] = "ÅöÝ ãñáììáôïóåéñÜò"; Text[ dutch ] = "Schrifteffect"; Text[ french ] = "Effets de caractères"; Text[ spanish ] = "Efecto de fuente"; Text[ italian ] = "Effetto carattere"; - Text[ danish ] = "Character Extension"; + Text[ danish ] = "Skrifteffekt"; Text[ swedish ] = "Teckeneffekt"; Text[ polish ] = "Efekt czcionki"; Text[ portuguese_brazilian ] = "Character Extension"; - Text[ japanese ] = "ﾌｫï¾ï¾„効果"; + Text[ japanese ] = "フォント効果"; Text[ korean ] = "글꼴 효과"; Text[ chinese_simplified ] = "å—体效果"; Text[ chinese_traditional ] = "å—型效果"; Text[ turkish ] = "Character Extension"; Text[ arabic ] = "ÊÃËíÑÇÊ ÇáÎØæØ"; - Text[ catalan ] = "Efecto de fuente"; + Text[ catalan ] = "Efectes de lletra"; Text[ finnish ] = "Fonttitehosteet"; + Text[ thai ] = "ลัà¸à¸©à¸“ะตัวà¸à¸±à¸à¸©à¸£"; }; PageItem { @@ -197,7 +200,8 @@ TabDialog RID_SCDLG_STYLES_PAR Text[ korean ] = "맞춤"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineación"; + Text[ catalan ] = "Alineament"; + Text[ thai ] = "จัดตำà¹à¸«à¸™à¹ˆà¸‡"; }; PageItem { @@ -206,24 +210,25 @@ TabDialog RID_SCDLG_STYLES_PAR Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asiática"; - Text[ russian ] = "Àçèàòñêèå øðèôòû"; + Text[ russian ] = "Àçèàòñêîå îôîðìëåíèå"; Text[ greek ] = "ÁóéáôéêÞ ôõðïãñáößá"; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipografía asiática"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; Text[ polish ] = "Typografia azjatycka"; Text[ portuguese_brazilian ] = "Asian typography"; Text[ japanese ] = "日本語文ã®ä½“è£"; - Text[ korean ] = "아시아　타ì´í¬ê·¸ëž˜í”¼"; + Text[ korean ] = "한글 ìž…ë ¥ 체계"; Text[ chinese_simplified ] = "ä¸æ—¥éŸ©æ–‡å—"; Text[ chinese_traditional ] = "ä¸æ—¥éŸ“æ–‡å—"; Text[ turkish ] = "Asian typography"; Text[ arabic ] = "ÃÓáæÈ ÇáØÈÇÚÉ ÇáÂÓíæíÉ"; - Text[ catalan ] = "Tipografía asiática"; + Text[ catalan ] = "Tipografia asiàtica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "à¹à¸šà¸šà¸à¸²à¸£à¸žà¸´à¸¡à¸žà¹Œà¸‚à¸à¸‡à¹€à¸à¹€à¸Šà¸µà¸¢"; }; PageItem { @@ -239,7 +244,7 @@ TabDialog RID_SCDLG_STYLES_PAR Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; Text[ chinese_simplified ] = "边框"; Text[ russian ] = "Îáðàìëåíèå"; @@ -248,10 +253,11 @@ TabDialog RID_SCDLG_STYLES_PAR Text[ chinese_traditional ] = "邊框"; Text[ arabic ] = "ÇáÍÏæÏ"; Text[ greek ] = "Ðåñßãñáììá"; - Text[ korean ] = "ê²½ê³„ì„ "; + Text[ korean ] = "í…Œë‘리"; Text[ turkish ] = "Kenarlýk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "เส้นขà¸à¸š"; }; PageItem { @@ -279,7 +285,8 @@ TabDialog RID_SCDLG_STYLES_PAR Text[ korean ] = "ë°°ê²½"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; PageItem { @@ -300,28 +307,30 @@ TabDialog RID_SCDLG_STYLES_PAR Text[ chinese_simplified ] = "ä¿æŠ¤å•å…ƒæ ¼"; Text[ russian ] = "Çàùèòà ÿ÷ååê"; Text[ polish ] = "Ochrona komórek"; - Text[ japanese ] = "ｾﾙã®ä¿è·"; + Text[ japanese ] = "セルã®ä¿è·"; Text[ chinese_traditional ] = "ä¿è·å„²å˜æ ¼"; Text[ arabic ] = "ÍãÇíÉ ÇáÎáíÉ"; Text[ greek ] = "Ðñïóôáóßá êåëéïý"; Text[ korean ] = "ì…€ 보호"; Text[ turkish ] = "Hücre koruma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Protección de celda"; + Text[ catalan ] = "Protecció de cel.les"; + Text[ thai ] = "à¸à¸²à¸£à¸›à¹‰à¸à¸‡à¸à¸±à¸™à¹€à¸‹à¸¥à¸¥à¹Œ"; }; }; }; Text[ chinese_simplified ] = "å•å…ƒæ ¼æ ·å¼"; Text[ russian ] = "Ñòèëü ÿ÷åéêè"; Text[ polish ] = "Styl komórki"; - Text[ japanese ] = "ｾﾙｽﾀｲﾙ"; + Text[ japanese ] = "セルスタイル"; Text[ chinese_traditional ] = "儲å˜æ ¼æ¨£å¼"; Text[ arabic ] = "äãØ ÎáíÉ"; Text[ greek ] = "Óôõë êåëéïý"; - Text[ korean ] = "ì…€ ìœ í˜•"; + Text[ korean ] = "ì…€ 스타ì¼"; Text[ turkish ] = "Hücre biçimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de celda"; + Text[ catalan ] = "Estil de la cel.la"; + Text[ thai ] = "ลัà¸à¸©à¸“ะเซลล์"; }; TabDialog RID_SCDLG_STYLES_PAGE { @@ -339,7 +348,7 @@ TabDialog RID_SCDLG_STYLES_PAGE Text [ french ] = "Style de page" ; Text [ swedish ] = "Sidformatmall" ; Text [ dutch ] = "Pagina-opmaakprofiel" ; - Text [ spanish ] = "Estilo de hoja" ; + Text [ spanish ] = "Estilo de página" ; Text [ english_us ] = "Page Style" ; Moveable = TRUE ; Closeable = FALSE ; @@ -359,7 +368,7 @@ TabDialog RID_SCDLG_STYLES_PAGE Text [ italian ] = "Pagina" ; Text [ portuguese_brazilian ] = "P?gina" ; Text [ portuguese ] = "Página" ; - Text [ finnish ] = "Sivu " ; + Text [ finnish ] = "Sivu" ; Text [ danish ] = "Side" ; Text [ french ] = "Page" ; Text [ swedish ] = "Sida" ; @@ -369,14 +378,15 @@ TabDialog RID_SCDLG_STYLES_PAGE Text[ chinese_simplified ] = "页"; Text[ russian ] = "Ñòðàíèöà"; Text[ polish ] = "Strona"; - Text[ japanese ] = "ï¾ï¾Ÿï½°ï½¼ï¾ž"; + Text[ japanese ] = "ページ"; Text[ chinese_traditional ] = "é "; Text[ arabic ] = "ÕÝÍÉ"; Text[ greek ] = "Óåëßäá"; Text[ korean ] = "페ì´ì§€"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Página"; + Text[ catalan ] = "Pàgina"; + Text[ thai ] = "หน้า"; }; PageItem { @@ -392,7 +402,7 @@ TabDialog RID_SCDLG_STYLES_PAGE Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; Text[ chinese_simplified ] = "边框"; Text[ russian ] = "Îáðàìëåíèå"; @@ -401,10 +411,11 @@ TabDialog RID_SCDLG_STYLES_PAGE Text[ chinese_traditional ] = "邊框"; Text[ arabic ] = "ÇáÍÏæÏ"; Text[ greek ] = "Ðåñßãñáììá"; - Text[ korean ] = "ì™¸ê³½ì„ "; + Text[ korean ] = "í…Œë‘리"; Text[ turkish ] = "Kenarlýk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "เส้นขà¸à¸š"; }; PageItem { @@ -432,7 +443,8 @@ TabDialog RID_SCDLG_STYLES_PAGE Text[ korean ] = "ë°°ê²½"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; PageItem { @@ -443,7 +455,7 @@ TabDialog RID_SCDLG_STYLES_PAGE Text [ italian ] = "Riga d'intestazione" ; Text [ portuguese_brazilian ] = "Cabe?alho" ; Text [ portuguese ] = "Cabeçalho" ; - Text [ finnish ] = "Yläotsikko" ; + Text [ finnish ] = "Ylätunniste" ; Text [ danish ] = "Sidehoved" ; Text [ french ] = "En-tête" ; Text [ swedish ] = "Sidhuvud" ; @@ -453,14 +465,15 @@ TabDialog RID_SCDLG_STYLES_PAGE Text[ chinese_simplified ] = "页眉"; Text[ russian ] = "Âåðõíèé êîëîíòèòóë"; Text[ polish ] = "Nag³ówek"; - Text[ japanese ] = "ï¾ï½¯ï¾€ï¾ž"; + Text[ japanese ] = "ヘッダ"; Text[ chinese_traditional ] = "é 首"; Text[ arabic ] = "ÑÃÓ ÇáÕÝÍÉ"; Text[ greek ] = "Êåöáëßäá"; Text[ korean ] = "머리글"; Text[ turkish ] = "Üstbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento"; + Text[ catalan ] = "Capçalera"; + Text[ thai ] = "หัวà¸à¸£à¸°à¸”าษ"; }; PageItem { @@ -471,7 +484,7 @@ TabDialog RID_SCDLG_STYLES_PAGE Text [ italian ] = "Piè di pagina" ; Text [ portuguese_brazilian ] = "Rodap?" ; Text [ portuguese ] = "Rodapé" ; - Text [ finnish ] = "Alaselite" ; + Text [ finnish ] = "Alatunniste" ; Text [ danish ] = "Sidefod" ; Text [ french ] = "Pied de page" ; Text [ swedish ] = "Sidfot" ; @@ -481,14 +494,15 @@ TabDialog RID_SCDLG_STYLES_PAGE Text[ chinese_simplified ] = "页脚"; Text[ russian ] = "Íèæíèé êîëîíòèòóë"; Text[ polish ] = "Stopka"; - Text[ japanese ] = "ﾌｯﾀ"; + Text[ japanese ] = "フッタ"; Text[ chinese_traditional ] = "é å°¾"; Text[ arabic ] = "ÊÐííá ÇáÕÝÍÉ"; Text[ greek ] = "ÕðïóÝëéäï"; Text[ korean ] = "바닥글"; Text[ turkish ] = "Altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de página"; + Text[ catalan ] = "Peu de pàgina"; + Text[ thai ] = "ท้ายà¸à¸£à¸°à¸”าษ"; }; PageItem { @@ -499,7 +513,7 @@ TabDialog RID_SCDLG_STYLES_PAGE Text [ italian ] = "Tabella" ; Text [ portuguese_brazilian ] = "Tabela" ; Text [ portuguese ] = "Folha" ; - Text [ finnish ] = "Lomake" ; + Text [ finnish ] = "Taulukko" ; Text [ danish ] = "Ark" ; Text [ french ] = "Classeur" ; Text [ swedish ] = "Tabell" ; @@ -516,21 +530,23 @@ TabDialog RID_SCDLG_STYLES_PAGE Text[ korean ] = "시트"; Text[ language_user1 ] = " "; Text[ turkish ] = "Tablo"; - Text[ catalan ] = "Hoja"; + Text[ catalan ] = "Full"; + Text[ thai ] = "à¹à¸œà¹ˆà¸™à¸‡à¸²à¸™"; }; }; }; Text[ chinese_simplified ] = "页é¢æ ·å¼"; Text[ russian ] = "Ñòèëü ñòðàíèöû"; Text[ polish ] = "Styl strony"; - Text[ japanese ] = "ï¾ï¾Ÿï½°ï½¼ï¾žï½½ï¾€ï½²ï¾™"; + Text[ japanese ] = "ページスタイル"; Text[ chinese_traditional ] = "é é¢æ¨£å¼"; Text[ arabic ] = "äãØ ÕÝÍÉ"; Text[ greek ] = "Ðñüôõðï óåëßäáò"; - Text[ korean ] = "페ì´ì§€ ìœ í˜•"; + Text[ korean ] = "페ì´ì§€ 스타ì¼"; Text[ turkish ] = "Sayfa biçimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de hoja"; + Text[ catalan ] = "Estil de la pàgina"; + Text[ thai ] = "ลัà¸à¸©à¸“ะหน้า"; }; @@ -543,3 +559,6 @@ TabDialog RID_SCDLG_STYLES_PAGE + + + diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 7f3ace34509e..4b85b54b7051 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: undocell.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: nn $ $Date: 2002-03-04 19:38:57 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -232,13 +232,16 @@ ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell, __EXPORT ScUndoEnterData::~ScUndoEnterData() { ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); + for (USHORT i=0; i<nCount; i++) if (ppOldCells[i]) ppOldCells[i]->Delete(); - delete ppOldCells; - delete pHasFormat; - delete pOldFormats; - delete pTabs; + delete[] ppOldCells; + + delete[] pHasFormat; + delete[] pOldFormats; + delete[] pTabs; + delete pNewEditData; } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 6301a26d51af..0684a89e5e85 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cellsuno.cxx,v $ * - * $Revision: 1.76 $ + * $Revision: 1.77 $ * - * last change: $Author: sab $ $Date: 2002-10-31 11:23:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1421,11 +1421,14 @@ ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR) : ScCellRangesBase::~ScCellRangesBase() { - ForgetCurrentAttrs(); + // #107294# call RemoveUnoObject first, so no notification can happen + // during ForgetCurrentAttrs if (pDocShell) pDocShell->GetDocument()->RemoveUnoObject(*this); + ForgetCurrentAttrs(); + delete pValueListener; //! XChartDataChangeEventListener abmelden ?? diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 1c8041d99847..67fe2725f877 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: datauno.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: sab $ $Date: 2002-10-21 13:56:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,6 +95,9 @@ #ifndef SC_SCATTR_HXX #include "attrib.hxx" #endif +#ifndef _COMPHELPER_EXTRACT_HXX_ +#include <comphelper/extract.hxx> +#endif using namespace com::sun::star; @@ -110,6 +113,7 @@ const SfxItemPropertyMap* lcl_GetSubTotalPropertyMap() { {MAP_CHAR_LEN(SC_UNONAME_BINDFMT), 0, &getBooleanCppuType(), 0}, {MAP_CHAR_LEN(SC_UNONAME_CASE), 0, &getBooleanCppuType(), 0}, + {MAP_CHAR_LEN(SC_UNONAME_ENABSORT), 0, &getBooleanCppuType(), 0}, {MAP_CHAR_LEN(SC_UNONAME_ENUSLIST), 0, &getBooleanCppuType(), 0}, {MAP_CHAR_LEN(SC_UNONAME_FORMATS), 0, &getBooleanCppuType(), 0}, {MAP_CHAR_LEN(SC_UNONAME_INSBRK), 0, &getBooleanCppuType(), 0}, @@ -327,7 +331,7 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ long ScSortDescriptor::GetPropertyCount() { - return 12; // TableSortDescriptor and SheetSortDescriptor + return 13; // TableSortDescriptor and SheetSortDescriptor } void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq, const ScSortParam& rParam ) @@ -367,38 +371,41 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_ORIENT ); pArray[0].Value <<= eOrient; - pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_CONTHDR ); - ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); + pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_SORTCOLUMNS ); + pArray[1].Value = ::cppu::bool2any(!rParam.bByRow); + + pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_CONTHDR ); + ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, rParam.bHasHeader ); - pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_MAXFLD ); - pArray[2].Value <<= (sal_Int32) MAXSORT; + pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_MAXFLD ); + pArray[3].Value <<= (sal_Int32) MAXSORT; - pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_SORTFLD ); - pArray[3].Value <<= aFields; + pArray[4].Name = rtl::OUString::createFromAscii( SC_UNONAME_SORTFLD ); + pArray[4].Value <<= aFields; - pArray[4].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISCASE ); - ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bCaseSens ); + pArray[5].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISCASE ); + ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, rParam.bCaseSens ); - pArray[5].Name = rtl::OUString::createFromAscii( SC_UNONAME_BINDFMT ); - ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, rParam.bIncludePattern ); + pArray[6].Name = rtl::OUString::createFromAscii( SC_UNONAME_BINDFMT ); + ScUnoHelpFunctions::SetBoolInAny( pArray[6].Value, rParam.bIncludePattern ); - pArray[6].Name = rtl::OUString::createFromAscii( SC_UNONAME_COPYOUT ); - ScUnoHelpFunctions::SetBoolInAny( pArray[6].Value, !rParam.bInplace ); + pArray[7].Name = rtl::OUString::createFromAscii( SC_UNONAME_COPYOUT ); + ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, !rParam.bInplace ); - pArray[7].Name = rtl::OUString::createFromAscii( SC_UNONAME_OUTPOS ); - pArray[7].Value <<= aOutPos; + pArray[8].Name = rtl::OUString::createFromAscii( SC_UNONAME_OUTPOS ); + pArray[8].Value <<= aOutPos; - pArray[8].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISULIST ); - ScUnoHelpFunctions::SetBoolInAny( pArray[8].Value, rParam.bUserDef ); + pArray[9].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISULIST ); + ScUnoHelpFunctions::SetBoolInAny( pArray[9].Value, rParam.bUserDef ); - pArray[9].Name = rtl::OUString::createFromAscii( SC_UNONAME_UINDEX ); - pArray[9].Value <<= (sal_Int32) rParam.nUserIndex; + pArray[10].Name = rtl::OUString::createFromAscii( SC_UNONAME_UINDEX ); + pArray[10].Value <<= (sal_Int32) rParam.nUserIndex; - pArray[10].Name = rtl::OUString::createFromAscii( SC_UNONAME_COLLLOC ); - pArray[10].Value <<= rParam.aCollatorLocale; + pArray[11].Name = rtl::OUString::createFromAscii( SC_UNONAME_COLLLOC ); + pArray[11].Value <<= rParam.aCollatorLocale; - pArray[11].Name = rtl::OUString::createFromAscii( SC_UNONAME_COLLALG ); - pArray[11].Value <<= rtl::OUString( rParam.aCollatorAlgorithm ); + pArray[12].Name = rtl::OUString::createFromAscii( SC_UNONAME_COLLALG ); + pArray[12].Value <<= rtl::OUString( rParam.aCollatorAlgorithm ); } void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<beans::PropertyValue>& rSeq ) @@ -417,6 +424,10 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b ScUnoHelpFunctions::GetEnumFromAny( rProp.Value ); rParam.bByRow = ( eOrient != table::TableOrientation_COLUMNS ); } + else if (aPropName.EqualsAscii( SC_UNONAME_SORTCOLUMNS )) + { + rParam.bByRow = !::cppu::any2bool(rProp.Value); + } else if (aPropName.EqualsAscii( SC_UNONAME_CONTHDR )) rParam.bHasHeader = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value ); else if (aPropName.EqualsAscii( SC_UNONAME_MAXFLD )) @@ -756,6 +767,8 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( aParam.bCaseSens = ScUnoHelpFunctions::GetBoolFromAny( aValue ); else if (aString.EqualsAscii( SC_UNONAME_FORMATS ) || aString.EqualsAscii( SC_UNONAME_BINDFMT )) aParam.bIncludePattern = ScUnoHelpFunctions::GetBoolFromAny( aValue ); + else if (aString.EqualsAscii( SC_UNONAME_ENABSORT )) + aParam.bDoSort = ScUnoHelpFunctions::GetBoolFromAny( aValue ); else if (aString.EqualsAscii( SC_UNONAME_SORTASC )) aParam.bAscending = ScUnoHelpFunctions::GetBoolFromAny( aValue ); else if (aString.EqualsAscii( SC_UNONAME_INSBRK )) @@ -797,6 +810,8 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const rtl::OUStrin ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bCaseSens ); else if (aString.EqualsAscii( SC_UNONAME_FORMATS ) || aString.EqualsAscii( SC_UNONAME_BINDFMT )) ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bIncludePattern ); + else if (aString.EqualsAscii( SC_UNONAME_ENABSORT )) + ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bDoSort ); else if (aString.EqualsAscii( SC_UNONAME_SORTASC )) ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bAscending ); else if (aString.EqualsAscii( SC_UNONAME_INSBRK )) diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 6c1d46513f3a..cd8c08b1736e 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: defltuno.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: nn $ $Date: 2001-08-13 16:24:38 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,10 +81,6 @@ #include "unonames.hxx" #include "docoptio.hxx" -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> -#endif - using namespace ::com::sun::star; //------------------------------------------------------------------------ diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index ac37a032e995..72a2500c8afd 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fielduno.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sab $ $Date: 2002-09-26 08:52:20 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -984,8 +984,8 @@ ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const else if ( pData->ISA( SvxTableField ) ) nFieldType = SC_SERVICE_SHEETFIELD; } - ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Feld ist 1 Zeichen - return new ScHeaderFieldObj( pContentObj, nPart, nType, aSelection ); + ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Field is 1 character + return new ScHeaderFieldObj( pContentObj, nPart, nFieldType, aSelection ); } return NULL; } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index f6c79961e029..048e3e8f6362 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeuno.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: nn $ $Date: 2002-11-27 18:22:29 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -396,13 +396,19 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& throw(beans::UnknownPropertyException, uno::RuntimeException) { ScUnoGuard aGuard; - - //! mix own and aggregated properties + String aNameString = aPropertyName; beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; - uno::Reference<beans::XPropertyState> xAggState = lcl_GetPropertyState(mxShapeAgg); - if ( xAggState.is() ) - eRet = xAggState->getPropertyState( aPropertyName ); + if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) + { + // ImageMap is always "direct" + } + else + { + uno::Reference<beans::XPropertyState> xAggState = lcl_GetPropertyState(mxShapeAgg); + if ( xAggState.is() ) + eRet = xAggState->getPropertyState( aPropertyName ); + } return eRet; } @@ -427,12 +433,31 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyNa throw(beans::UnknownPropertyException, uno::RuntimeException) { ScUnoGuard aGuard; + String aNameString = aPropertyName; - //! mix own and aggregated properties - - uno::Reference<beans::XPropertyState> xAggState = lcl_GetPropertyState(mxShapeAgg); - if ( xAggState.is() ) - xAggState->setPropertyToDefault( aPropertyName ); + if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) + { + SdrObject* pObj = GetSdrObject(); + if ( pObj ) + { + ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo(pObj); + if( pIMapInfo ) + { + ImageMap aEmpty; + pIMapInfo->SetImageMap( aEmpty ); // replace with empty image map + } + else + { + // nothing to do (no need to insert user data for an empty map) + } + } + } + else + { + uno::Reference<beans::XPropertyState> xAggState = lcl_GetPropertyState(mxShapeAgg); + if ( xAggState.is() ) + xAggState->setPropertyToDefault( aPropertyName ); + } } uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aPropertyName ) @@ -440,13 +465,21 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aProperty uno::RuntimeException) { ScUnoGuard aGuard; - - //! mix own and aggregated properties + String aNameString = aPropertyName; uno::Any aAny; - uno::Reference<beans::XPropertyState> xAggState = lcl_GetPropertyState(mxShapeAgg); - if ( xAggState.is() ) - aAny = xAggState->getPropertyDefault( aPropertyName ); + if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) + { + // default: empty ImageMap + uno::Reference< uno::XInterface > xImageMap = SvUnoImageMap_createInstance( GetSupportedMacroItems() ); + aAny <<= uno::Reference< container::XIndexContainer >::query( xImageMap ); + } + else + { + uno::Reference<beans::XPropertyState> xAggState = lcl_GetPropertyState(mxShapeAgg); + if ( xAggState.is() ) + aAny = xAggState->getPropertyDefault( aPropertyName ); + } return aAny; } diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index d963d1ea1182..c0b571d76df3 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srchuno.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,6 +122,8 @@ ScCellSearchObj::ScCellSearchObj() : // Defaults: pSearchItem->SetWordOnly(FALSE); pSearchItem->SetExact(FALSE); + pSearchItem->SetMatchFullHalfWidthForms(FALSE); + pSearchItem->SetUseAsianOptions(FALSE); // or all asian bits would have to be handled pSearchItem->SetBackward(FALSE); pSearchItem->SetSelection(FALSE); pSearchItem->SetRegExp(FALSE); diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx new file mode 100644 index 000000000000..1b4accf8d3b4 --- /dev/null +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -0,0 +1,109 @@ +/************************************************************************* + * + * $RCSfile: unodoc.cxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-26 18:06:45 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +// System - Includes ----------------------------------------------------- + +#include <tools/string.hxx> +#include <sfx2/docfac.hxx> + +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif + +#include "scmod.hxx" + +using namespace ::com::sun::star; + +::rtl::OUString SAL_CALL ScDocument_getImplementationName() throw() +{ + return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.SpreadsheetDocument" ) ); +} + +uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() +{ + uno::Sequence< rtl::OUString > aSeq( 2 ); + aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.OfficeDocument" )); + aSeq[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )); + return aSeq; +} + +uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) +{ + // to create the service the SW_MOD should be already initialized + DBG_ASSERT( SC_MOD(), "No StarCalc module!" ); + + if ( SC_MOD() ) + { + ::rtl::OUString aFactoryURL( RTL_CONSTASCII_USTRINGPARAM ( "private:factory/scalc" ) ); + const SfxObjectFactory* pFactory = SfxObjectFactory::GetFactory( aFactoryURL ); + if ( pFactory ) + { + SfxObjectShell* pShell = pFactory->CreateObject(); + if( pShell ) + return uno::Reference< uno::XInterface >( pShell->GetModel() ); + } + } + + return uno::Reference< uno::XInterface >(); +} + + diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 56b46ed61d19..120e12696c36 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formatsh.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: nn $ $Date: 2002-09-30 14:04:52 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,6 +93,9 @@ #define _ZFORLIST_DECLARE_TABLE #include <svtools/stritem.hxx> #include <svtools/zformat.hxx> +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #include <svx/boxitem.hxx> #include <svx/langitem.hxx> #include <svx/numinf.hxx> @@ -109,7 +112,7 @@ #include <svx/brshitem.hxx> #include <svx/frmdiritem.hxx> #include <svx/scripttypeitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/shaditem.hxx> #include "formatsh.hxx" @@ -726,7 +729,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) Window* pParent = Application::GetDefDialogParent(); if ( !pParent || !pParent->IsDialog() ) - pParent = pTabViewShell->GetDialogParent(); + { + // #107256# GetDefDialogParent currently doesn't return the window + // that was set with SetDefDialogParent (but dynamically finds the + // topmost parent of the focus window), so IsDialog above is FALSE + // even if called from the style catalog. + // -> Use NULL if a modal dialog is open, to enable the Dialog's + // default parent handling. + if ( Application::IsInModalMode() ) + pParent = NULL; + else + pParent = pTabViewShell->GetDialogParent(); + } pTabViewShell->SetInFormatDialog(TRUE); @@ -1589,7 +1603,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) { Color aColor; if ( nTrans == 255 ) - aColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + aColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); else aColor = rBrushItem.GetColor(); rSet.Put( SvxColorItem( aColor, SID_BACKGROUND_COLOR ) ); @@ -1993,6 +2007,10 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) eBidiDir = EE_HTEXTDIR_L2R; } + SvtLanguageOptions aLangOpt; + BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); + BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); + SfxWhichIter aIter( rSet ); USHORT nWhich = aIter.FirstWhich(); while( nWhich ) @@ -2000,28 +2018,35 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) switch( nWhich ) { case SID_TEXTDIRECTION_LEFT_TO_RIGHT: - if( bVertDontCare ) - rSet.InvalidateItem( nWhich ); - else - rSet.Put( SfxBoolItem( nWhich, bLeftRight ) ); - break; case SID_TEXTDIRECTION_TOP_TO_BOTTOM: - if( bVertDontCare ) - rSet.InvalidateItem( nWhich ); + if ( bDisableVerticalText ) + rSet.DisableItem( nWhich ); else - rSet.Put( SfxBoolItem( nWhich, bTopBottom ) ); + { + if( bVertDontCare ) + rSet.InvalidateItem( nWhich ); + else if ( nWhich == SID_TEXTDIRECTION_LEFT_TO_RIGHT ) + rSet.Put( SfxBoolItem( nWhich, bLeftRight ) ); + else + rSet.Put( SfxBoolItem( nWhich, bTopBottom ) ); + } break; case SID_ATTR_PARA_LEFT_TO_RIGHT: case SID_ATTR_PARA_RIGHT_TO_LEFT: - if ( bTopBottom ) + if ( bDisableCTLFont ) rSet.DisableItem( nWhich ); - else if ( bBidiDontCare ) - rSet.InvalidateItem( nWhich ); - else if ( nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT ) - rSet.Put( SfxBoolItem( nWhich, eBidiDir == EE_HTEXTDIR_L2R ) ); else - rSet.Put( SfxBoolItem( nWhich, eBidiDir == EE_HTEXTDIR_R2L ) ); + { + if ( bTopBottom ) + rSet.DisableItem( nWhich ); + else if ( bBidiDontCare ) + rSet.InvalidateItem( nWhich ); + else if ( nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT ) + rSet.Put( SfxBoolItem( nWhich, eBidiDir == EE_HTEXTDIR_L2R ) ); + else + rSet.Put( SfxBoolItem( nWhich, eBidiDir == EE_HTEXTDIR_R2L ) ); + } } nWhich = aIter.NextWhich(); } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index b57f16aec118..82328863a9c4 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gridwin.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: nn $ $Date: 2002-12-12 19:23:29 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -313,6 +313,25 @@ void __EXPORT ScFilterListBox::SelectHdl() } } +// use a System floating window for the above filter listbox +class ScFilterFloatingWindow : public FloatingWindow +{ +public: + ScFilterFloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); + // required for System FloatingWindows that will not process KeyInput by themselves + virtual Window* GetPreferredKeyInputWindow(); +}; + +ScFilterFloatingWindow::ScFilterFloatingWindow( Window* pParent, WinBits nStyle ) : + FloatingWindow( pParent, nStyle|WB_SYSTEMWINDOW ) // make it a system floater + {} + +Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() +{ + // redirect keyinput in the child window + return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD) : NULL; // will be the FilterBox +} + #ifdef AUTOFILTER_POPUP //================================================================== @@ -515,7 +534,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) // Die ListBox direkt unter der schwarzen Linie auf dem Zellgitter // (wenn die Linie verdeckt wird, sieht es komisch aus...) - pFilterFloat = new FloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, SC_FILTERBOX_SCENARIO ); @@ -588,7 +607,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) } pFilterFloat->SetOutputSizePixel( aSize ); - pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN ); + pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS ); pFilterBox->SetUpdateMode(TRUE); pFilterBox->GrabFocus(); @@ -648,7 +667,7 @@ void ScGridWindow::DoAutoFilterMenue( USHORT nCol, USHORT nRow, BOOL bDataSelect aPos.X() -= 1; aPos.Y() += nSizeY - 1; - pFilterFloat = new FloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, bDataSelect ? SC_FILTERBOX_DATASELECT : SC_FILTERBOX_FILTER ); @@ -687,13 +706,46 @@ void ScGridWindow::DoAutoFilterMenue( USHORT nCol, USHORT nRow, BOOL bDataSelect pDoc->GetString( nCol, nRow, nTab, aString ); pFilterBox->SetText( aString ); - // Standard-Eintraege - pFilterBox->InsertEntry( String( ScResId( SCSTR_ALL ) ) ); - pFilterBox->InsertEntry( String( ScResId( SCSTR_STDFILTER ) ) ); - pFilterBox->InsertEntry( String( ScResId( SCSTR_TOP10FILTER ) ) ); + long nMaxText = 0; - // Liste fuellen + // default entries + static const USHORT nDefIDs[] = { SCSTR_ALL, SCSTR_STDFILTER, SCSTR_TOP10FILTER }; + const USHORT nDefCount = sizeof(nDefIDs) / sizeof(USHORT); + for (i=0; i<nDefCount; i++) + { + String aEntry( (ScResId) nDefIDs[i] ); + pFilterBox->InsertEntry( aEntry ); + long nTextWidth = pFilterBox->GetTextWidth( aEntry ); + if ( nTextWidth > nMaxText ) + nMaxText = nTextWidth; + } + + // get list entries pDoc->GetFilterEntries( nCol, nRow, nTab, aStrings ); + + // check widths of numerical entries (string entries are not included) + // so all numbers are completely visible + USHORT nCount = aStrings.GetCount(); + for (i=0; i<nCount; i++) + { + TypedStrData* pData = aStrings[i]; + if ( !pData->IsStrData() ) // only numerical entries + { + long nTextWidth = pFilterBox->GetTextWidth( pData->GetString() ); + if ( nTextWidth > nMaxText ) + nMaxText = nTextWidth; + } + } + + // add scrollbar width if needed (string entries are counted here) + // (scrollbar is shown if the box is exactly full?) + if ( nCount + nDefCount >= SC_FILTERLISTBOX_LINES ) + nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize(); + + nMaxText += 4; // for borders + + if ( nMaxText > nSizeX ) + nSizeX = nMaxText; // just modify width - starting position is unchanged } if (!bEmpty) @@ -714,7 +766,7 @@ void ScGridWindow::DoAutoFilterMenue( USHORT nCol, USHORT nRow, BOOL bDataSelect pFilterBox->SetUpdateMode(FALSE); pFilterFloat->SetOutputSizePixel( aSize ); - pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN ); + pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS); // Listbox fuellen USHORT nCount = aStrings.GetCount(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index a3c50dfccccc..b3573e545d32 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gridwin4.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: nn $ $Date: 2002-11-05 14:52:31 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ #include <svx/eeitem.hxx> #define ITEMID_FIELD EE_FEATURE_FIELD -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/colritem.hxx> #include <svx/editview.hxx> #include <svx/fhgtitem.hxx> @@ -514,8 +514,8 @@ void ScGridWindow::Draw( USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2, ScUpdat aOutputData.SetFmtDevice( pFmtDev ); } - const svx::ColorConfig& rColorCfg = pScMod->GetColorConfig(); - Color aGridColor( rColorCfg.GetColorValue( svx::CALCGRID, FALSE ).nColor ); + const svtools::ColorConfig& rColorCfg = pScMod->GetColorConfig(); + Color aGridColor( rColorCfg.GetColorValue( svtools::CALCGRID, FALSE ).nColor ); if ( aGridColor.GetColor() == COL_TRANSPARENT ) { // use view options' grid color only if color config has "automatic" color @@ -749,7 +749,7 @@ void ScGridWindow::Draw( USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2, ScUpdat } } - Color aRefColor( rColorCfg.GetColorValue(svx::CALCREFERENCE).nColor ); + Color aRefColor( rColorCfg.GetColorValue(svtools::CALCREFERENCE).nColor ); aOutputData.DrawRefMark( pViewData->GetRefStartX(), pViewData->GetRefStartY(), pViewData->GetRefEndX(), pViewData->GetRefEndY(), aRefColor, FALSE ); @@ -787,7 +787,7 @@ void ScGridWindow::Draw( USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2, ScUpdat if ( nX2==MAXCOL || nY2==MAXROW ) { Rectangle aPixRect = Rectangle( Point(), GetOutputSizePixel() ); - SetFillColor( rColorCfg.GetColorValue(svx::APPBACKGROUND).nColor ); + SetFillColor( rColorCfg.GetColorValue(svtools::APPBACKGROUND).nColor ); SetLineColor(); if ( nX2==MAXCOL ) { @@ -858,9 +858,9 @@ void ScGridWindow::DrawPagePreview( USHORT nX1, USHORT nY1, USHORT nX2, USHORT n ScDocument* pDoc = pViewData->GetDocument(); USHORT nTab = pViewData->GetTabNo(); Size aWinSize = GetOutputSizePixel(); - const svx::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig(); - Color aManual( rColorCfg.GetColorValue(svx::CALCPAGEBREAKMANUAL).nColor ); - Color aAutomatic( rColorCfg.GetColorValue(svx::CALCPAGEBREAK).nColor ); + const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig(); + Color aManual( rColorCfg.GetColorValue(svtools::CALCPAGEBREAKMANUAL).nColor ); + Color aAutomatic( rColorCfg.GetColorValue(svtools::CALCPAGEBREAK).nColor ); String aPageText = ScGlobal::GetRscString( STR_PAGE ); if ( nPageScript == 0 ) diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 01411e765ee7..675d30cc556f 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hdrcont.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: nn $ $Date: 2002-10-30 15:59:57 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ #include <sfx2/dispatch.hxx> #include <vcl/help.hxx> #include <vcl/poly.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include "scresid.hxx" #include "sc.hrc" @@ -116,7 +116,8 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn { // --- RTL --- no default mirroring for this window, the spreadsheet itself // is also not mirrored - EnableRTL ( FALSE ); + // #107811# mirror the vertical window for correct border drawing + EnableRTL ( bVertical ); aNormFont = GetFont(); aNormFont.SetTransparent( TRUE ); //! WEIGHT_NORMAL hart setzen ??? @@ -338,7 +339,7 @@ void __EXPORT ScHeaderControl::Paint( const Rectangle& rRect ) if ( nLineEnd < nPEnd ) { - SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svx::APPBACKGROUND).nColor ); + SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::APPBACKGROUND).nColor ); if ( bVertical ) aFillRect = Rectangle( 0, nLineEnd+1, nBarSize-1, nPEnd ); else diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 6724cdbc5158..7136d9095e59 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olinewin.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dr $ $Date: 2002-09-18 14:00:19 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,13 @@ #include "ui_pch.hxx" #endif +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif +#ifndef _SV_TASKPANELIST_HXX #include <vcl/taskpanelist.hxx> +#endif + #include "olinewin.hxx" #include "olinetab.hxx" #include "document.hxx" @@ -91,47 +97,49 @@ ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewDa mrViewData( *pViewData ), meWhich( eWhich ), mbHoriz( eMode == SC_OUTLINE_HOR ), + mbAppRTL( !!Application::GetSettings().GetLayoutRTL() ), mpSymbols( NULL ), maLineColor( COL_BLACK ), mnHeaderSize( 0 ), + mnHeaderPos( 0 ), + mnMainFirstPos( 0 ), + mnMainLastPos( 0 ), mbMTActive( false ), mbMTPressed( false ), mnFocusLevel( 0 ), mnFocusEntry( SC_OL_HEADERENTRY ), mbDontDrawFocus( false ) { + EnableRTL( !mbHoriz ); // #107809# do not mirror (horizontal) column outline window + mbMirrorHdr = mbHoriz && mbAppRTL; + InitSettings(); maFocusRect.SetEmpty(); + SetHeaderSize( 0 ); // insert the window into task pane list for "F6 cycling" - SystemWindow* pSysWin = GetSystemWindow(); - if( pSysWin ) - { - TaskPaneList* pTaskPaneList = pSysWin->GetTaskPaneList(); - if( pTaskPaneList ) + if( SystemWindow* pSysWin = GetSystemWindow() ) + if( TaskPaneList* pTaskPaneList = pSysWin->GetTaskPaneList() ) pTaskPaneList->AddWindow( this ); - } } ScOutlineWindow::~ScOutlineWindow() { // remove the window from task pane list - SystemWindow* pSysWin = GetSystemWindow(); - if( pSysWin ) - { - TaskPaneList* pTaskPaneList = pSysWin->GetTaskPaneList(); - if( pTaskPaneList ) + if( SystemWindow* pSysWin = GetSystemWindow() ) + if( TaskPaneList* pTaskPaneList = pSysWin->GetTaskPaneList() ) pTaskPaneList->RemoveWindow( this ); - } } void ScOutlineWindow::SetHeaderSize( sal_Int32 nNewSize ) { - if ( nNewSize != mnHeaderSize ) - { - mnHeaderSize = nNewSize; + bool bNew = (nNewSize != mnHeaderSize); + mnHeaderSize = nNewSize; + mnHeaderPos = mbMirrorHdr ? (GetOutputSizeEntry() - mnHeaderSize) : 0; + mnMainFirstPos = mbMirrorHdr ? 0 : mnHeaderSize; + mnMainLastPos = GetOutputSizeEntry() - (mbMirrorHdr ? mnHeaderSize : 0) - 1; + if ( bNew ) Invalidate(); - } } sal_Int32 ScOutlineWindow::GetDepthSize() const @@ -147,35 +155,29 @@ void ScOutlineWindow::ScrollPixel( sal_Int32 nDiff ) HideFocus(); mbDontDrawFocus = true; - if ( mnHeaderSize > 0 ) - { - sal_Int32 nStart = mnHeaderSize; - sal_Int32 nEnd = GetOutputSizeEntry() - 1; - - sal_Int32 nInvStart, nInvEnd; - if (nDiff < 0) - { - nStart -= nDiff; - nInvStart = nEnd + nDiff; - nInvEnd = nEnd; - } - else - { - nEnd -= nDiff; - nInvStart = nStart; - nInvEnd = nStart + nDiff; - } + sal_Int32 nStart = mnMainFirstPos; + sal_Int32 nEnd = mnMainLastPos; - ScrollRel( nDiff, nStart, nEnd ); - Invalidate( GetRectangle( 0, nInvStart, GetOutputSizeLevel() - 1, nInvEnd ) ); - Update(); + sal_Int32 nInvStart, nInvEnd; + if (nDiff < 0) + { + nStart -= nDiff; + nInvStart = nEnd + nDiff; + nInvEnd = nEnd; } else - ScrollRel( nDiff ); + { + nEnd -= nDiff; + nInvStart = nStart; + nInvEnd = nStart + nDiff; + } + + ScrollRel( nDiff, nStart, nEnd ); + Invalidate( GetRectangle( 0, nInvStart, GetOutputSizeLevel() - 1, nInvEnd ) ); + Update(); // if focus becomes invisible, move it to next visible button - if ( !IsButtonVisible( mnFocusLevel, mnFocusEntry ) ) - ImplMoveFocusByEntry( nDiff < 0 ); + ImplMoveFocusToVisible( nDiff < 0 ); mbDontDrawFocus = false; ShowFocus(); @@ -206,7 +208,7 @@ void ScOutlineWindow::InitSettings() const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); SetBackground( rStyleSettings.GetFaceColor() ); maLineColor = rStyleSettings.GetButtonTextColor(); - mpSymbols = ScGlobal::GetOutlineSymbols( GetBackground().GetColor().IsDark() ); + mpSymbols = ScGlobal::GetOutlineSymbols( !!GetBackground().GetColor().IsDark() ); Invalidate(); } @@ -310,12 +312,12 @@ sal_Int32 ScOutlineWindow::GetColRowPos( sal_uInt16 nColRowIndex ) const sal_Int32 nDocPos = mbHoriz ? mrViewData.GetScrPos( nColRowIndex, 0, meWhich, TRUE ).X() : mrViewData.GetScrPos( 0, nColRowIndex, meWhich, TRUE ).Y(); - return mnHeaderSize + nDocPos; + return mnMainFirstPos + nDocPos; } sal_Int32 ScOutlineWindow::GetHeaderEntryPos() const { - return (mnHeaderSize - SC_OL_BITMAPSIZE) / 2; + return mnHeaderPos + (mnHeaderSize - SC_OL_BITMAPSIZE) / 2; } bool ScOutlineWindow::GetEntryPos( @@ -360,8 +362,8 @@ bool ScOutlineWindow::GetEntryPos( } // restrict rnStartPos...rnEndPos to valid area - rnStartPos = Max( rnStartPos, mnHeaderSize ); - rnEndPos = Max( rnEndPos, mnHeaderSize ); + rnStartPos = Max( rnStartPos, mnMainFirstPos ); + rnEndPos = Max( rnEndPos, mnMainFirstPos ); // --- all rows filtered? --- @@ -397,7 +399,7 @@ bool ScOutlineWindow::IsButtonVisible( sal_uInt16 nLevel, sal_uInt16 nEntry ) co { bool bRet = false; if ( nEntry == SC_OL_HEADERENTRY ) - bRet = (nLevel < GetLevelCount()); + bRet = (mnHeaderSize > 0) && (nLevel < GetLevelCount()); else { const ScOutlineEntry* pEntry = GetOutlineEntry( nLevel, nEntry ); @@ -529,7 +531,8 @@ void ScOutlineWindow::DoCollapse( sal_uInt16 nLevel, sal_uInt16 nEntry ) const void ScOutlineWindow::Resize() { Window::Resize(); - if ( !IsButtonVisible( mnFocusLevel, mnFocusEntry ) ) + SetHeaderSize( mnHeaderSize ); // recalculates header/group positions + if ( !IsFocusButtonVisible() ) { HideFocus(); ShowFocus(); // calculates valid position @@ -552,7 +555,9 @@ void ScOutlineWindow::DataChanged( const DataChangedEvent& rDCEvt ) void ScOutlineWindow::SetEntryAreaClipRegion() { - SetClipRegion( Rectangle( GetPoint( 0, mnHeaderSize ), GetOutputSizePixel() ) ); + SetClipRegion( Rectangle( + GetPoint( 0, mnMainFirstPos ), + GetPoint( GetOutputSizeLevel() - 1, mnMainLastPos ) ) ); } void ScOutlineWindow::DrawLineRel( @@ -602,20 +607,22 @@ void ScOutlineWindow::ShowFocus() if ( HasFocus() ) { // first move to a visible position - if ( !IsButtonVisible( mnFocusLevel, mnFocusEntry ) ) - ImplMoveFocusByEntry( true ); + ImplMoveFocusToVisible( true ); - Point aPos; - if ( GetImagePos( mnFocusLevel, mnFocusEntry, aPos ) ) + if ( IsFocusButtonVisible() ) { - aPos += Point( 1, 1 ); - maFocusRect = Rectangle( aPos, Size( SC_OL_BITMAPSIZE - 2, SC_OL_BITMAPSIZE - 2 ) ); - bool bClip = (mnFocusEntry != SC_OL_HEADERENTRY); - if ( bClip ) - SetEntryAreaClipRegion(); - InvertTracking( maFocusRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); - if ( bClip ) - SetClipRegion(); + Point aPos; + if ( GetImagePos( mnFocusLevel, mnFocusEntry, aPos ) ) + { + aPos += Point( 1, 1 ); + maFocusRect = Rectangle( aPos, Size( SC_OL_BITMAPSIZE - 2, SC_OL_BITMAPSIZE - 2 ) ); + bool bClip = (mnFocusEntry != SC_OL_HEADERENTRY); + if ( bClip ) + SetEntryAreaClipRegion(); + InvertTracking( maFocusRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); + if ( bClip ) + SetClipRegion(); + } } } } @@ -657,7 +664,8 @@ void ScOutlineWindow::Paint( const Rectangle& rRect ) DrawImageRel( GetLevelPos( nLevel ), nEntryPos, nLevel + 1 ); SetLineColor( maLineColor ); - DrawLineRel( 0, mnHeaderSize - 1, nLevelEnd, mnHeaderSize - 1 ); + sal_Int32 nLinePos = mnHeaderPos + (mbMirrorHdr ? 0 : (mnHeaderSize - 1)); + DrawLineRel( 0, nLinePos, nLevelEnd, nLinePos ); } // --- draw lines & collapse/expand images --- @@ -763,7 +771,12 @@ bool lcl_RotateValue( sal_uInt16& rnValue, sal_uInt16 nMin, sal_uInt16 nMax, boo return bWrap; } -bool ScOutlineWindow::ImplMoveFocusByEntry( bool bForward ) +bool ScOutlineWindow::IsFocusButtonVisible() const +{ + return IsButtonVisible( mnFocusLevel, mnFocusEntry ); +} + +bool ScOutlineWindow::ImplMoveFocusByEntry( bool bForward, bool bFindVisible ) { const ScOutlineArray* pArray = GetOutlineArray(); if ( !pArray ) @@ -771,24 +784,31 @@ bool ScOutlineWindow::ImplMoveFocusByEntry( bool bForward ) bool bWrapped = false; sal_uInt16 nEntryCount = pArray->GetCount( mnFocusLevel ); + sal_uInt16 nOldEntry = mnFocusEntry; do { if ( mnFocusEntry == SC_OL_HEADERENTRY ) { + // move from header to first or last entry if ( nEntryCount > 0 ) - mnFocusEntry = bForward ? 0 : nEntryCount - 1; - if ( !nEntryCount || !bForward ) + mnFocusEntry = bForward ? 0 : (nEntryCount - 1); + /* wrapped, if forward from right header to first entry, + or if backward from left header to last entry */ + if ( !nEntryCount || (bForward == mbMirrorHdr) ) bWrapped = true; } else if ( lcl_RotateValue( mnFocusEntry, 0, nEntryCount - 1, bForward ) ) { + // lcl_RotateValue returns true -> wrapped the entry range -> move to header mnFocusEntry = SC_OL_HEADERENTRY; - if ( bForward ) + /* wrapped, if forward from last entry to left header, + or if backward from first entry to right header */ + if ( bForward != mbMirrorHdr ) bWrapped = true; } } - while ( !IsButtonVisible( mnFocusLevel, mnFocusEntry ) ); + while ( bFindVisible && !IsFocusButtonVisible() && (nOldEntry != mnFocusEntry) ); return bWrapped; } @@ -822,13 +842,13 @@ bool ScOutlineWindow::ImplMoveFocusByLevel( bool bForward ) { // next level -> find first child entry nNewLevel = mnFocusLevel + 1; - bFound = pArray->GetEntryIndexInRange( nNewLevel, nStart, nEnd, nNewEntry ); + bFound = !!pArray->GetEntryIndexInRange( nNewLevel, nStart, nEnd, nNewEntry ); } else if ( !bForward && (mnFocusLevel > 0) ) { // previous level -> find parent entry nNewLevel = mnFocusLevel - 1; - bFound = pArray->GetEntryIndex( nNewLevel, nStart, nNewEntry ); + bFound = !!pArray->GetEntryIndex( nNewLevel, nStart, nNewEntry ); } if ( bFound && IsButtonVisible( nNewLevel, nNewEntry ) ) @@ -842,10 +862,45 @@ bool ScOutlineWindow::ImplMoveFocusByLevel( bool bForward ) return bWrapped; } +bool ScOutlineWindow::ImplMoveFocusByTabOrder( bool bForward, bool bFindVisible ) +{ + bool bRet = false; + sal_uInt16 nOldLevel = mnFocusLevel; + sal_uInt16 nOldEntry = mnFocusEntry; + + do + { + /* one level up, if backward from left header, + or one level down, if forward from right header */ + if ( (bForward == mbMirrorHdr) && (mnFocusEntry == SC_OL_HEADERENTRY) ) + bRet |= ImplMoveFocusByLevel( bForward ); + // move to next/previous entry + bool bWrapInLevel = ImplMoveFocusByEntry( bForward, false ); + bRet |= bWrapInLevel; + /* one level up, if wrapped backward to right header, + or one level down, if wrapped forward to right header */ + if ( (bForward != mbMirrorHdr) && bWrapInLevel ) + bRet |= ImplMoveFocusByLevel( bForward ); + } + while ( bFindVisible && !IsFocusButtonVisible() && ((nOldLevel != mnFocusLevel) || (nOldEntry != mnFocusEntry)) ); + + return bRet; +} + +void ScOutlineWindow::ImplMoveFocusToVisible( bool bForward ) +{ + // first try to find an entry in the same level + if ( !IsFocusButtonVisible() ) + ImplMoveFocusByEntry( bForward, true ); + // then try to find any other entry + if ( !IsFocusButtonVisible() ) + ImplMoveFocusByTabOrder( bForward, true ); +} + void ScOutlineWindow::MoveFocusByEntry( bool bForward ) { HideFocus(); - ImplMoveFocusByEntry( bForward ); + ImplMoveFocusByEntry( bForward, true ); ShowFocus(); } @@ -859,13 +914,7 @@ void ScOutlineWindow::MoveFocusByLevel( bool bForward ) void ScOutlineWindow::MoveFocusByTabOrder( bool bForward ) { HideFocus(); - - if ( !bForward && (mnFocusEntry == SC_OL_HEADERENTRY) ) - ImplMoveFocusByLevel( false ); - bool bWrap = ImplMoveFocusByEntry( bForward ); - if ( bForward && bWrap ) - ImplMoveFocusByLevel( true ); - + ImplMoveFocusByTabOrder( bForward, true ); ShowFocus(); } @@ -964,6 +1013,10 @@ void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) bool bUpDownKey = (nCode == KEY_UP) || (nCode == KEY_DOWN); bool bLeftRightKey = (nCode == KEY_LEFT) || (nCode == KEY_RIGHT); + // revert wrong cursor direction (left/right) in RTL windows + if( bLeftRightKey && mbAppRTL && IsRTLEnabled() ) + nCode = (nCode == KEY_LEFT) ? KEY_RIGHT : KEY_LEFT; + // TAB key if ( (nCode == KEY_TAB) && (bNoMod || bShift) ) // move forward without SHIFT key diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index 6e73a499b392..f5d77e872607 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olkact.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mh $ $Date: 2002-01-16 11:26:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,9 +65,233 @@ #pragma hdrstop +//------------------------------------------------------------------ + +#define _BIGINT_HXX +#define _CACHESTR_HXX +#define _CONFIG_HXX +#define _CURSOR_HXX +#define _CTRLTOOL_HXX +#define _DLGCFG_HXX +#define _DYNARR_HXX +#define _EXTATTR_HXX +#define _FILDLG_HXX +#define _FONTDLG_HXX +#define _FRM3D_HXX +#define _INTRO_HXX +#define _ISETBWR_HXX +#define _NO_SVRTF_PARSER_HXX +#define _MACRODLG_HXX +#define _MODALDLG_HXX +#define _MOREBUTTON_HXX +#define _OUTLINER_HXX +#define _PASSWD_HXX +#define _PRNDLG_HXX +//#define _POLY_HXX +#define _PVRWIN_HXX +#define _QUEUE_HXX +#define _RULER_HXX +#define _SCRWIN_HXX +#define _SETBRW_HXX +#define _STACK_HXX +//#define _STATUS_HXX *** +#define _STDMENU_HXX +#define _TABBAR_HXX +//#define _VCBRW_HXX +#define _VCTRLS_HXX +//#define _VCSBX_HXX +#define _VCONT_HXX +#define _VDRWOBJ_HXX + + +//sfx +#define _SFXAPPWIN_HXX +#define _SFXCTRLITEM +#define _SFXDISPATCH_HXX +#define _SFXFILEDLG_HXX +#define _SFXIMGMGR_HXX +#define _SFXIPFRM_HXX +#define _SFX_MACRO_HXX +#define _SFXMULTISEL_HXX +#define _SFX_MINFITEM_HXX + + +//sfxcore.hxx +//#define _SFXINIMGR_HXX *** +//#define _SFXCFGITEM_HXX +//#define _SFX_PRINTER_HXX +#define _SFXGENLINK_HXX +#define _SFXHINTPOST_HXX +#define _SFXDOCINF_HXX +#define _SFXLINKHDL_HXX +//#define _SFX_PROGRESS_HXX + +//sfxsh.hxx +//#define _SFX_SHELL_HXX +//#define _SFXAPP_HXX +//#define _SFXDISPATCH_HXX +//#define _SFXMSG_HXX *** +//#define _SFXOBJFACE_HXX *** +//#define _SFXREQUEST_HXX +#define _SFXMACRO_HXX + +// SFX +//#define _SFXAPPWIN_HXX *** +#define _SFX_SAVEOPT_HXX +//#define _SFX_CHILDWIN_HXX +//#define _SFXCTRLITEM_HXX +#define _SFXPRNMON_HXX +#define _INTRO_HXX +#define _SFXMSGDESCR_HXX +#define _SFXMSGPOOL_HXX +#define _SFXFILEDLG_HXX +#define _PASSWD_HXX +#define _SFXTBXCTRL_HXX +#define _SFXSTBITEM_HXX +#define _SFXMNUITEM_HXX +#define _SFXIMGMGR_HXX +#define _SFXTBXMGR_HXX +#define _SFXSTBMGR_HXX +#define _SFX_MINFITEM_HXX +#define _SFXEVENT_HXX + +//sfxdoc.hxx +//#define _SFX_OBJSH_HXX +//#define _SFX_CLIENTSH_HXX +//#define _SFXDOCINF_HXX +//#define _SFX_OBJFAC_HXX +#define _SFX_DOCFILT_HXX +//#define _SFXDOCFILE_HXX *** +//define _VIEWFAC_HXX +//#define _SFXVIEWFRM_HXX +//#define _SFXVIEWSH_HXX +//#define _MDIFRM_HXX *** +#define _SFX_IPFRM_HXX +//#define _SFX_INTERNO_HXX + +//sfxdlg.hxx +//#define _SFXTABDLG_HXX +//#define _BASEDLGS_HXX *** +#define _SFX_DINFDLG_HXX +#define _SFXDINFEDT_HXX +#define _SFX_MGETEMPL_HXX +#define _SFX_TPLPITEM_HXX +//#define _SFX_STYLEDLG_HXX +#define _NEWSTYLE_HXX +//#define _SFXDOCTEMPL_HXX *** +//#define _SFXDOCTDLG_HXX *** +//#define _SFX_TEMPLDLG_HXX *** +//#define _SFXNEW_HXX *** +#define _SFXDOCMAN_HXX +//#define _SFXDOCKWIN_HXX + +//sfxitems.hxx +#define _SFX_WHMAP_HXX +#define _ARGS_HXX +//#define _SFXPOOLITEM_HXX +//#define _SFXINTITEM_HXX +//#define _SFXENUMITEM_HXX +#define _SFXFLAGITEM_HXX +//#define _SFXSTRITEM_HXX +#define _SFXPTITEM_HXX +#define _SFXRECTITEM_HXX +//#define _SFXITEMPOOL_HXX +//#define _SFXITEMSET_HXX +#define _SFXITEMITER_HXX +#define _SFX_WHITER_HXX +#define _SFXPOOLCACH_HXX +//#define _AEITEM_HXX +#define _SFXRNGITEM_HXX +//#define _SFXSLSTITM_HXX +//#define _SFXSTYLE_HXX + +//xout.hxx +//#define _XENUM_HXX +//#define _XPOLY_HXX +//#define _XATTR_HXX +//#define _XOUTX_HXX +//#define _XPOOL_HXX +//#define _XTABLE_HXX + +//svdraw.hxx +#define _SDR_NOITEMS +#define _SDR_NOTOUCH +#define _SDR_NOTRANSFORM +//#define _SDR_NOOBJECTS +//#define _SDR_NOVIEWS + + + + +#define _SFXBASIC_HXX +#define _SFX_DOCFILE_HXX +#define _SFX_DOCFILT_HXX +#define _SFX_DOCINF_HXX +#define _SFX_DOCSH_HXX +#define _SFX_TEMPLDLG_HXX +#define _SFXSTBMGR_HXX +#define _SFXTBXMGR_HXX +#define _SFXIMGMGR_HXX +#define _SFXMNUITEM_HXX +#define _SFXMNUMGR_HXX +#define _SFXSTBITEM_HXX +#define _SFXTBXCTRL_HXX +#define _SFXFILEDLG_HXX +#define _SFXREQUEST_HXX +#define _SFXOBJFACE_HXX +#define _SFXMSGPOOL_HXX +#define _SFXMSGDESCR_HXX +#define _SFXMSG_HXX +#define _SFX_PRNMON_HXX + +//si +#define _SI_NOSBXCONTROLS +#define _SI_NOCONTROL +//#define SI_NOITEMS +//#define SI_NODRW +//#define SI_NOOTHERFORMS +#define _SIDLL_HXX +//#define _VCSBX_HXX +//#define _VCBRW_HXX + +//#define _SVDATTR_HXX <--- der wars +#define _SVDXOUT_HXX +#define _SVDEC_HXX +//#define _SVDIO_HXX +//#define _SVDLAYER_HXX +//#define _SVDRAG_HXX +#define _SVINCVW_HXX +#define _SV_MULTISEL_HXX +#define _SVRTV_HXX +#define _SVTABBX_HXX + +#define _SVX_DAILDLL_HXX +#define _SVX_HYPHEN_HXX +#define _SVX_IMPGRF_HXX +#define _SVX_OPTITEMS_HXX +#define _SVX_OPTGERL_HXX +#define _SVX_OPTSAVE_HXX +#define _SVX_OPTSPELL_HXX +#define _SVX_OPTPATH_HXX +#define _SVX_OPTLINGU_HXX +#define _SVX_RULER_HXX +#define _SVX_RULRITEM_HXX +#define _SVX_SPLWRAP_HXX +#define _SVX_SPLDLG_HXX +#define _SVX_THESDLG_HXX + // INCLUDE --------------------------------------------------------------- -class ScViewData; +#include <sfx2/childwin.hxx> +#include <sfx2/objsh.hxx> + +#include "document.hxx" +#include "viewdata.hxx" +#include "drawview.hxx" +#include "drawpage.hxx" +#include "drwlayer.hxx" + +// STATIC DATA ----------------------------------------------------------- // ----------------------------------------------------------------------- @@ -87,3 +311,7 @@ void DeActivateOlk( ScViewData* pViewData ) // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } + + + + diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index bf64d653dfc7..0de323ea8b56 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2,9 +2,9 @@ * * $RCSfile: output.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: nn $ $Date: 2002-12-10 17:24:58 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ #include "scitems.hxx" #include <svx/boxitem.hxx> #include <svx/brshitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/rotmodit.hxx> #include <svx/shaditem.hxx> #include <svx/svxfont.hxx> @@ -255,6 +255,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, nScrH += pRowInfo[nArrY].nHeight; bTabProtected = pDoc->IsTabProtected( nTab ); + nTabTextDirection = pDoc->GetEditTextDirection( nTab ); } ScOutputData::~ScOutputData() @@ -351,9 +352,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) if ( eType == OUTTYPE_WINDOW ) { - const svx::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig(); - aPageColor.SetColor( rColorCfg.GetColorValue(svx::CALCPAGEBREAKAUTOMATIC).nColor ); - aManualColor.SetColor( rColorCfg.GetColorValue(svx::CALCPAGEBREAKMANUAL).nColor ); + const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig(); + aPageColor.SetColor( rColorCfg.GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor ); + aManualColor.SetColor( rColorCfg.GetColorValue(svtools::CALCPAGEBREAKMANUAL).nColor ); } else { @@ -795,7 +796,7 @@ void ScOutputData::DrawBackground() ScModule* pScMod = SC_MOD(); // used only if bSolidBackground is set (only for ScGridWindow): - Color aBgColor( pScMod->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + Color aBgColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); Rectangle aRect; Size aOnePixel = pDev->PixelToLogic(Size(1,1)); @@ -929,7 +930,7 @@ void ScOutputData::DrawShadow() BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); Color aAutoTextColor; if ( bCellContrast ) - aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); long nPosY = nScrY; for (USHORT nArrY=1; nArrY+1<nArrCount; nArrY++) @@ -1031,7 +1032,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); Color aAutoTextColor; if ( bCellContrast ) - aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); long nPosY = nScrY - pRowInfo[0].nHeight; for (USHORT nArrY=0; nArrY<nArrCount; nArrY++) @@ -1146,7 +1147,7 @@ void ScOutputData::DrawClear() long nOneY = aOnePixel.Height(); // (called only for ScGridWindow) - Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); if (bMetaFile) nOneX = nOneY = 0; @@ -1292,8 +1293,45 @@ inline void FinishOldRect( OutputDevice* pDev, Rectangle& rOldRect, BOOL& rOldVa void ScOutputData::DrawFrame() { + ULONG nOldDrawMode = pDev->GetDrawMode(); + + Color aSingleColor; + BOOL bUseSingleColor = FALSE; + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); + + // #107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used + // for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines + // that are drawn with DrawRect, so if the line/background bits are set, the DrawMode + // must be reset and the border colors handled here. + // (Similar to fix for #72796# in SdrObject::ImpDrawLineGeometry) + + if ( ( nOldDrawMode & DRAWMODE_WHITEFILL ) && ( nOldDrawMode & DRAWMODE_BLACKLINE ) ) + { + pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_WHITEFILL) ); + aSingleColor.SetColor( COL_BLACK ); + bUseSingleColor = TRUE; + } + else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) ) + { + pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) ); + aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE + bUseSingleColor = TRUE; + } + else if ( bCellContrast ) + { + aSingleColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); + bUseSingleColor = TRUE; + } + if (bAnyRotated) - DrawRotatedFrame(); // loescht die Linien, die hier weggelassen werden muessen + { + const Color* pForceColor = NULL; + if ( bUseSingleColor ) + pForceColor = &aSingleColor; + DrawRotatedFrame( pForceColor ); // removes the lines that must not be painted here + } USHORT nArrY; USHORT nArrX; @@ -1345,13 +1383,6 @@ void ScOutputData::DrawFrame() BOOL bOldValid2 = FALSE; // zweite Linien Rectangle aOldRect2; - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) - BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); - Color aAutoTextColor; - if ( bCellContrast ) - aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); - pDev->SetLineColor(); pDev->SetFillColor( aOldCol ); @@ -1397,8 +1428,8 @@ void ScOutputData::DrawFrame() if ( pDrawLine != pOldLine ) { Color aColor( pDrawLine->GetColor() ); - if ( bCellContrast ) - aColor = aAutoTextColor; + if ( bUseSingleColor ) + aColor = aSingleColor; if ( aColor != aOldCol ) { FinishOldRect( pDev, aOldRect, bOldValid ); @@ -1533,8 +1564,8 @@ void ScOutputData::DrawFrame() if ( pDrawLine != pOldLine ) { Color aColor( pDrawLine->GetColor() ); - if ( bCellContrast ) - aColor = aAutoTextColor; + if ( bUseSingleColor ) + aColor = aSingleColor; if ( aColor != aOldCol ) { FinishOldRect( pDev, aOldRect, bOldValid ); @@ -1645,6 +1676,8 @@ void ScOutputData::DrawFrame() FinishOldRect( pDev, aOldRect, bOldValid ); FinishOldRect( pDev, aOldRect2, bOldValid2 ); + + pDev->SetDrawMode(nOldDrawMode); } // ------------------------------------------------------------------------- @@ -1874,7 +1907,7 @@ void lcl_VertLine( OutputDevice* pDev, const Point& rTop, const Point& rBottom, } } -void ScOutputData::DrawRotatedFrame() +void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) { //! nRotMax speichern USHORT nRotMax = nX2; @@ -1891,13 +1924,7 @@ void ScOutputData::DrawRotatedFrame() // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); - Color aAutoTextColor; - const Color* pForceColor = NULL; - if ( bCellContrast ) - { - aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); - pForceColor = &aAutoTextColor; - } + // color (pForceColor) is determined externally, including DrawMode changes Rectangle aClipRect( Point(nScrX, nScrY), Size(nScrW, nScrH) ); if (bMetaFile) @@ -2613,7 +2640,7 @@ void ScOutputData::DrawNoteMarks() const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); if ( bUseStyleColor && rStyleSettings.GetHighContrastMode() ) - pDev->SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + pDev->SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); else pDev->SetFillColor(COL_LIGHTRED); @@ -2714,7 +2741,7 @@ void ScOutputData::DrawClipMarks() // use DrawMode to change the arrow's outline color pDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE ); // use text color also for the fill color - aArrowFillCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + aArrowFillCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); } Rectangle aCellRect; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index cba64cb1ef11..7c83cf83b261 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: output2.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: nn $ $Date: 2002-12-10 17:24:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,12 +75,13 @@ #include <svx/adjitem.hxx> #include <svx/algitem.hxx> #include <svx/brshitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/colritem.hxx> #include <svx/editobj.hxx> #include <svx/editstat.hxx> #include <svx/fhgtitem.hxx> #include <svx/forbiddencharacterstable.hxx> +#include <svx/frmdiritem.hxx> #include <svx/langitem.hxx> #include <svx/rotmodit.hxx> #include <svx/scripttypeitem.hxx> @@ -178,6 +179,8 @@ public: BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET == pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE ); } + + BOOL IsRightToLeftAttr() const; }; //================================================================== @@ -205,9 +208,9 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) : bCellContrast = pOutput->bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - const svx::ColorConfig& rColorConfig = pScMod->GetColorConfig(); - aBackConfigColor.SetColor( rColorConfig.GetColorValue(svx::DOCCOLOR).nColor ); - aTextConfigColor.SetColor( rColorConfig.GetColorValue(svx::FONTCOLOR).nColor ); + const svtools::ColorConfig& rColorConfig = pScMod->GetColorConfig(); + aBackConfigColor.SetColor( rColorConfig.GetColorValue(svtools::DOCCOLOR).nColor ); + aTextConfigColor.SetColor( rColorConfig.GetColorValue(svtools::FONTCOLOR).nColor ); } ScDrawStringsVars::~ScDrawStringsVars() @@ -535,6 +538,14 @@ void ScDrawStringsVars::SetHashText() pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen } +BOOL ScDrawStringsVars::IsRightToLeftAttr() const +{ + SvxFrameDirection eCellDir = (SvxFrameDirection)((const SvxFrameDirectionItem&) + pPattern->GetItem( ATTR_WRITINGDIR, pCondSet )).GetValue(); + return ( eCellDir == FRMDIR_HORI_RIGHT_TOP || + ( eCellDir == FRMDIR_ENVIRONMENT && pOutput->nTabTextDirection == EE_HTEXTDIR_R2L ) ); +} + //================================================================== double ScOutputData::GetStretch() @@ -864,6 +875,59 @@ void ScOutputData::GetVisibleCell( USHORT nCol, USHORT nRow, USHORT nTab, ScBase rpCell = NULL; } +BOOL ScOutputData::IsAvailable( USHORT nX, USHORT nY ) +{ + // apply the same logic here as in DrawStrings/DrawEdit: + // Stop at non-empty or merged or overlapped cell, + // where a note is empty as well as a cell that's hidden by protection settings + + const ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) ); + if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE && !IsEmptyCellText( NULL, nX, nY ) ) + { + return FALSE; + } + + const ScPatternAttr* pPattern = pDoc->GetPattern( nX, nY, nTab ); + if ( ((const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE)).IsMerged() || + ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).IsOverlapped() ) + { + return FALSE; + } + + return TRUE; +} + +long ScOutputData::GetAvailableWidth( USHORT nX, USHORT nY, long nNeeded ) +{ + // get the pixel width that's available for the cell's text, + // including cells outside of the current screen area + + long nAvailable = (long) ( pDoc->GetColWidth( nX, nTab ) * nPPTX ); // cell itself + + const ScMergeAttr* pMerge = (const ScMergeAttr*)pDoc->GetAttr( nX, nY, nTab, ATTR_MERGE ); + if ( pMerge->IsMerged() ) + { + // for merged cells, allow only the merged area + USHORT nCount = pMerge->GetColMerge(); + for (USHORT nAdd=1; nAdd<nCount; nAdd++) + nAvailable += (long) ( pDoc->GetColWidth( nX + nAdd, nTab ) * nPPTX ); + } + else + { + // look for empty cells into which the text can be extended + while ( nAvailable < nNeeded && nX < MAXCOL && IsAvailable( nX+1, nY ) ) + { + ++nX; + nAvailable += (long) ( pDoc->GetColWidth( nX, nTab ) * nPPTX ); + } + } + + if ( bMarkClipped && nAvailable < nNeeded ) + nAvailable -= (long)( SC_CLIPMARK_SIZE * nPPTX ); + + return nAvailable; +} + void ScOutputData::DrawStrings( BOOL bPixelToLogic ) { DBG_ASSERT( pDev == pRefDevice || @@ -909,6 +973,9 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; BOOL bEmpty = pInfo->bEmptyCellText; + USHORT nCellX = nX; // position where the cell really starts + USHORT nCellY = nY; + // // Teil von zusammengefasster Zelle ? // @@ -968,6 +1035,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) nOutHeight = (long) (pDoc->GetRowHeight( nOverY, nTab ) * nPPTY); bMergeOver = TRUE; + nCellX = nOverX; + nCellY = nOverY; } else // Edit-Zelle { @@ -1056,6 +1125,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) { bLeftOver = TRUE; } + + nCellX = nTempX; } } } @@ -1091,7 +1162,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) Color aFontColor = ((const SvxColorItem&)pInfo->pPatternAttr-> GetItem( ATTR_FONT_COLOR )).GetValue(); if ( ( aFontColor == COL_AUTO || bForceAutoColor ) && bUseStyleColor ) - aFontColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + aFontColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); pDev->DrawPixel( aPos, aFontColor ); bEmpty = TRUE; } @@ -1593,6 +1664,20 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) nJustPosY++; // Passt sonst nicht zur EditEngine #endif + BOOL bMoveClipped = bHClip && aVars.IsRightToLeftAttr(); + if ( bMoveClipped ) + { + // #i9731# if long text is clipped, and the cell is formatted as rtl, + // move the start position so the right end is visible + + long nNeeded = aVars.GetTextSize().Width() + + (long) ( aVars.GetLeftTotal() * nPPTX ) + + (long) ( aVars.GetMargin()->GetRightMargin() * nPPTX ); + long nAvailable = GetAvailableWidth( nCellX, nCellY, nNeeded ); + if ( nAvailable < nNeeded ) + nJustPosX -= nNeeded - nAvailable; // move the start position + } + Point aDrawTextPos( nJustPosX, nJustPosY ); if ( bPixelToLogic ) { @@ -1717,7 +1802,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); ScModule* pScMod = SC_MOD(); - sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor; + sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -2567,6 +2652,35 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } } + BOOL bMoveClipped = FALSE; + if ( bExtend ) + { + SvxFrameDirection eCellDir = (SvxFrameDirection)((const SvxFrameDirectionItem&) + pPattern->GetItem( ATTR_WRITINGDIR, pCondSet )).GetValue(); + bMoveClipped = ( eCellDir == FRMDIR_HORI_RIGHT_TOP || + ( eCellDir == FRMDIR_ENVIRONMENT && nTabTextDirection == EE_HTEXTDIR_R2L ) ); + } + if ( bMoveClipped ) + { + // #i9731# if long text is clipped, and the cell is formatted as rtl, + // move the start position so the right end is visible + + long nNeeded = bPixelToLogic ? + pRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width() : + nEngineWidth; + nNeeded += (long) ( (pMargin->GetLeftMargin() + nIndent) * nPPTX ) + + (long) ( pMargin->GetRightMargin() * nPPTX ); + + long nAvailable = GetAvailableWidth( nX, nY, nNeeded ); + if ( nAvailable < nNeeded ) + { + long nDiff = nNeeded - nAvailable; + aLogicStart.X() -= bPixelToLogic ? + pRefDevice->PixelToLogic(Size(nDiff,0)).Width() : + nDiff; + } + } + if ( bSimClip && !nOriVal && !bAsianVertical ) { // kein hartes Clipping, aber nur die betroffenen @@ -2624,7 +2738,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); ScModule* pScMod = SC_MOD(); - sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor; + sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index c6d51e4443d2..37dc97c1a5f6 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: preview.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: nn $ $Date: 2002-12-10 17:24:59 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ #include <svx/eeitem.hxx> #define ITEMID_FIELD EE_FEATURE_FIELD -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/fmview.hxx> #include <svx/sizeitem.hxx> #include <sfx2/bindings.hxx> @@ -140,6 +140,7 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView nTabStart( 0 ), nDisplayStart( 0 ) { + SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# SetBackground(); SetHelpId( HID_SC_WIN_PREVIEW ); @@ -351,8 +352,8 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) BOOL bValidPage = ( nPageNo < nTotalPages ); ScModule* pScMod = SC_MOD(); - const svx::ColorConfig& rColorCfg = pScMod->GetColorConfig(); - Color aBackColor( rColorCfg.GetColorValue(svx::APPBACKGROUND).nColor ); + const svtools::ColorConfig& rColorCfg = pScMod->GetColorConfig(); + Color aBackColor( rColorCfg.GetColorValue(svtools::APPBACKGROUND).nColor ); if ( bDoPrint && ( aOffset.X() < 0 || aOffset.Y() < 0 ) && bValidPage ) { @@ -442,7 +443,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) if ( bValidPage ) { - Color aBorderColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + Color aBorderColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); // draw border @@ -505,7 +506,28 @@ void __EXPORT ScPreview::Command( const CommandEvent& rCEvt ) void __EXPORT ScPreview::KeyInput( const KeyEvent& rKEvt ) { - if (!pViewShell->KeyInput(rKEvt)) + // The + and - keys can't be configured as accelerator entries, so they must be handled directly + // (in ScPreview, not ScPreviewShell -> only if the preview window has the focus) + + const KeyCode& rKeyCode = rKEvt.GetKeyCode(); + USHORT nKey = rKeyCode.GetCode(); + BOOL bHandled = FALSE; + if(!rKeyCode.GetModifier()) + { + USHORT nSlot = 0; + switch(nKey) + { + case KEY_ADD: nSlot = SID_PREVIEW_ZOOMIN; break; + case KEY_SUBTRACT: nSlot = SID_PREVIEW_ZOOMOUT; break; + } + if(nSlot) + { + bHandled = TRUE; + pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON ); + } + } + + if ( !bHandled && !pViewShell->KeyInput(rKEvt) ) Window::KeyInput(rKEvt); } diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 1a29c528d2c9..1ffb480d3b13 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: prevloc.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: sab $ $Date: 2002-05-24 14:57:27 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -247,7 +247,7 @@ void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& DBG_ASSERT( nDrawRanges < SC_PREVIEW_MAXRANGES, "too many ranges" ); if ( nDrawRanges < SC_PREVIEW_MAXRANGES ) { - aDrawRectangle[nDrawRanges] = rRect; + aDrawRectangle[nDrawRanges] = aPixelRect; aDrawMapMode[nDrawRanges] = rDrawMap; if (bRepCol) if (bRepRow) diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 66c8aa2ec32f..a3cdbc11ba8a 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: prevwsh.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: nn $ $Date: 2002-11-21 19:10:48 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,7 @@ #include <svx/sizeitem.hxx> #include <svx/srchitem.hxx> +#include <svx/svdview.hxx> #include <svx/zoom.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> @@ -174,6 +175,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), pDocShell( rWin.pDocShell ), aSourceData( rWin.aSourceData ), + nSourceDesignMode( rWin.nSourceDesignMode ), pAccessibilityBroadcaster( NULL ) { Construct( &pViewFrame->GetWindow() ); @@ -183,6 +185,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, Window *pParent ) : SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ), + nSourceDesignMode( SC_FORCEMODE_NONE ), pAccessibilityBroadcaster( NULL ) { Construct( pParent ); @@ -192,6 +195,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ), + nSourceDesignMode( SC_FORCEMODE_NONE ), pAccessibilityBroadcaster( NULL ) { Construct( &pViewFrame->GetWindow() ); @@ -202,9 +206,16 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, //! store live ScViewData instead, and update on ScTablesHint? //! or completely forget aSourceData on ScTablesHint? - ScViewData* pData = ((ScTabViewShell*)pOldSh)->GetViewData(); + ScTabViewShell* pTabViewShell = ((ScTabViewShell*)pOldSh); + ScViewData* pData = pTabViewShell->GetViewData(); pData->WriteUserData( aSourceData ); InitStartTable( pData->GetTabNo() ); + + // #106334# also have to store the TabView's DesignMode state + // (only if draw view exists) + SdrView* pDrawView = pTabViewShell->GetSdrView(); + if ( pDrawView ) + nSourceDesignMode = pDrawView->IsDesignMode(); } } diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index bbbd3bd16d43..c36d7589c063 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -2,9 +2,9 @@ * * $RCSfile: printfun.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: nn $ $Date: 2002-12-10 17:25:00 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ #include <svx/adjitem.hxx> #include <svx/boxitem.hxx> #include <svx/brshitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS #include <svx/fmview.hxx> #include <svx/lrspitem.hxx> @@ -1171,7 +1171,45 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi // is duplicated into a bigger one for better performance) GraphicObject aObject( *pGraphic ); - aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0) ); + + if( pOut->GetPDFWriter() && + (aObject.GetType() == GRAPHIC_BITMAP || aObject.GetType() == GRAPHIC_DEFAULT) ) + { + // #104004# For PDF export, every draw + // operation for bitmaps takes a noticeable + // amount of place (~50 characters). Thus, + // optimize between tile bitmap size and + // number of drawing operations here. + // + // A_out + // n_chars = k1 * ---------- + k2 * A_bitmap + // A_bitmap + // + // minimum n_chars is obtained for (derive for + // A_bitmap, set to 0, take positive + // solution): + // k1 + // A_bitmap = Sqrt( ---- A_out ) + // k2 + // + // where k1 is the number of chars per draw + // operation, and k2 is the number of chars + // per bitmap pixel. This is approximately 50 + // and 7 for current PDF writer, respectively. + // + const double k1( 50 ); + const double k2( 7 ); + const Size aSize( rOrg.GetSize() ); + const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() ); + + aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0), + NULL, GRFMGR_DRAW_STANDARD, + ::std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) ); + } + else + { + aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0) ); + } bDraw = FALSE; // bRetouche = FALSE; @@ -1264,7 +1302,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, if ( pShadow && pShadow->GetLocation() != SVX_SHADOW_NONE ) { if ( bCellContrast ) - pDev->SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + pDev->SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); else pDev->SetFillColor(pShadow->GetColor()); pDev->SetLineColor(); @@ -1557,16 +1595,20 @@ void ScPrintFunc::PrintArea( USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2, Color aGridColor( COL_BLACK ); if ( bUseStyleColor ) - aGridColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + aGridColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); aOutputData.SetGridColor( aGridColor ); - if ( !pPrinter && !bIsRender ) // when rendering (PDF), don't use printer + if ( !pPrinter ) { OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen Fraction aPrintFrac( nZoom, 100 ); // ohne nManualZoom // MapMode, wie er beim Drucken herauskommen wuerde: pRefDev->SetMapMode( MapMode( MAP_100TH_MM, Point(), aPrintFrac, aPrintFrac ) ); - aOutputData.SetRefDevice( pRefDev ); + + // when rendering (PDF), don't use printer as ref device, but printer's MapMode + // has to be set anyway, as charts still use it (#106409#) + if ( !bIsRender ) + aOutputData.SetRefDevice( pRefDev ); } // aOutputData.SetMetaFileMode(TRUE); @@ -1925,7 +1967,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr Color aBackgroundColor( COL_WHITE ); if ( bUseStyleColor ) - aBackgroundColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + aBackgroundColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); pDev->SetMapMode(aOffsetMode); pDev->SetLineColor(); @@ -1988,7 +2030,7 @@ void ScPrintFunc::PrintPage( long nPageNo, USHORT nX1, USHORT nY1, USHORT nX2, U Color aBackgroundColor( COL_WHITE ); if ( bUseStyleColor ) - aBackgroundColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + aBackgroundColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); pDev->SetMapMode(aOffsetMode); pDev->SetLineColor(); @@ -2207,7 +2249,7 @@ void ScPrintFunc::PrintPage( long nPageNo, USHORT nX1, USHORT nY1, USHORT nX2, U Color aGridColor( COL_BLACK ); if ( bUseStyleColor ) - aGridColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor ); + aGridColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); if (aTableParam.bHeaders) { @@ -2484,7 +2526,7 @@ void ScPrintFunc::InitModes() // aus nZoom etc. die MapModes setze Fraction aZoomFract( nEffZoom,10000 ); Fraction aHorFract = aZoomFract; - if (!pPrinter) // Massstab anpassen fuer Preview + if ( !pPrinter && !bIsRender ) // adjust scale for preview { double nFact = pDocShell->GetOutputFactor(); aHorFract = Fraction( (long)( nEffZoom / nFact ), 10000 ); @@ -2510,26 +2552,19 @@ void ScPrintFunc::ApplyPrintSettings() // Size aEnumSize = aPageSize; - if ( bLandscape ) - { - long nTemp = aEnumSize.Width(); - aEnumSize.Width() = aEnumSize.Height(); - aEnumSize.Height() = nTemp; - } - Paper ePaper = SvxPaperInfo::GetSvPaper( aEnumSize, MAP_TWIP, TRUE ); USHORT nPaperBin = ((const SvxPaperBinItem&)pParamSet->Get(ATTR_PAGE_PAPERBIN)).GetValue(); - pPrinter->SetPaper( ePaper ); - if ( PAPER_USER == ePaper ) - { - MapMode aPrinterMode = pPrinter->GetMapMode(); - MapMode aLocalMode( MAP_TWIP ); - pPrinter->SetMapMode( aLocalMode ); - pPrinter->SetPaperSizeUser( aEnumSize ); - pPrinter->SetMapMode( aPrinterMode ); - } - pPrinter->SetPaperBin( nPaperBin ); pPrinter->SetOrientation( bLandscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT ); + + MapMode aPrinterMode = pPrinter->GetMapMode(); + MapMode aLocalMode( MAP_TWIP ); + pPrinter->SetMapMode( aLocalMode ); + + // Let VCL decide which printer paper should be used for printing + pPrinter->SetPaperSizeUser( aEnumSize ); + pPrinter->SetMapMode( aPrinterMode ); + + pPrinter->SetPaperBin( nPaperBin ); } } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 5144229e782b..c34c5e9bba82 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview5.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ssa $ $Date: 2002-09-17 09:43:17 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -230,7 +230,7 @@ __EXPORT ScTabView::~ScTabView() delete pTabControl; } -void ScTabView::MakeDrawView() +void ScTabView::MakeDrawView( BYTE nForceDesignMode ) { if (!pDrawView) { @@ -259,6 +259,11 @@ void ScTabView::MakeDrawView() SetDrawFuncPtr(new FuSelection( aViewData.GetViewShell(), GetActiveWin(), pDrawView, pLayer,aSfxRequest)); + // #106334# used when switching back from page preview: restore saved design mode state + // (otherwise, keep the default from the draw view ctor) + if ( nForceDesignMode != SC_FORCEMODE_NONE ) + pDrawView->SetDesignMode( (BOOL)nForceDesignMode ); + // an der FormShell anmelden FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell(); if (pFormSh) diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 1b20e337b7c1..4189c2c30ae1 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh2.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: nn $ $Date: 2002-12-11 14:13:00 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,9 @@ #include <svtools/aeitem.hxx> #include <svtools/whiter.hxx> #include <svtools/moduleoptions.hxx> +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #include <sfx2/dispatch.hxx> #include "tabvwsh.hxx" @@ -434,6 +437,11 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) nPutId != SID_DRAW_CAPTION_VERTICAL ) nPutId = USHRT_MAX; SfxAllEnumItem aItem( nWhich, nPutId ); + if ( !SvtLanguageOptions().IsVerticalTextEnabled() ) + { + aItem.DisableValue( SID_DRAW_TEXT_VERTICAL ); + aItem.DisableValue( SID_DRAW_CAPTION_VERTICAL ); + } rSet.Put( aItem ); } break; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 8b4353f6e64c..63249194589e 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh3.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: nn $ $Date: 2002-09-20 10:07:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,7 @@ #include <sfx2/topfrm.hxx> #include <svtools/ptitem.hxx> #include <svtools/stritem.hxx> +#include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/fonttype.hxx> @@ -250,6 +251,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET ) bUnmark = ((const SfxBoolItem*)pItem)->GetValue(); + if ( nSlot == SID_JUMPTOMARK ) + { + // #106586# URL has to be decoded for escaped characters (%20) + aAddress = INetURLObject::decode( aAddress, INET_HEX_ESCAPE, + INetURLObject::DECODE_WITH_CHARSET, + RTL_TEXTENCODING_UTF8 ); + } + BOOL bFound = FALSE; ScViewData* pViewData = GetViewData(); ScDocument* pDoc = pViewData->GetDocument(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index eb0eed4ae1cc..a785fceebd70 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh4.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: nn $ $Date: 2002-12-12 19:04:16 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1504,7 +1504,7 @@ FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) //------------------------------------------------------------------ -void ScTabViewShell::Construct() +void ScTabViewShell::Construct( BYTE nForceDesignMode ) { SfxApplication* pSfxApp = SFX_APP(); ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -1582,7 +1582,7 @@ void ScTabViewShell::Construct() // DrawView darf nicht im TabView - ctor angelegt werden, // wenn die ViewShell noch nicht kostruiert ist... if (pDoc->GetDrawLayer()) - MakeDrawView(); + MakeDrawView( nForceDesignMode ); ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an SetUndoManager( pDocSh->GetUndoManager() ); @@ -1706,7 +1706,21 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); - Construct(); + // if switching back from print preview, + // restore the view settings that were active when creating the preview + // #89897# ReadUserData must not happen from ctor, because the view's edit window + // has to be shown by the sfx. ReadUserData is deferred until the first Activate call. + // #106334# old DesignMode state from form layer must be restored, too + + BYTE nForceDesignMode = SC_FORCEMODE_NONE; + if ( pOldSh && pOldSh->ISA( ScPreviewShell ) ) + { + ScPreviewShell* pPreviewShell = ((ScPreviewShell*)pOldSh); + aPendingUserData = pPreviewShell->GetSourceData(); // used in Activate + nForceDesignMode = pPreviewShell->GetSourceDesignMode(); + } + + Construct( nForceDesignMode ); if ( GetViewData()->GetDocShell()->IsPreview() ) { @@ -1725,14 +1739,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) ); SetCurSubShell(OST_Cell); - - // if switching back from print preview, - // restore the view settings that were active when creating the preview - // #89897# ReadUserData must not happen from ctor, because the view's edit window - // has to be shown by the sfx. ReadUserData is deferred until the first Activate call. - - if ( pOldSh && pOldSh->ISA( ScPreviewShell ) ) - aPendingUserData = ((ScPreviewShell*)pOldSh)->GetSourceData(); // used in Activate } #undef __INIT_ScTabViewShell diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index afd41e294afe..ce67faee2cc3 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshb.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: bm $ $Date: 2002-09-09 07:49:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 260f582decc9..47930f6f7fdf 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshf.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2002-09-13 09:35:46 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -543,8 +543,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( pScSh->GetTitle() == aDocName ) { nDoc = i; - nTableCount = pScSh->GetDocument()->GetTableCount(); - bDoIt = TRUE; + ScDocument* pDestDoc = pScSh->GetDocument(); + nTableCount = pDestDoc->GetTableCount(); + bDoIt = pDestDoc->IsDocEditable(); break; } @@ -588,7 +589,14 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { ScDocShell* pSh = ScDocShell::GetShellByNum( nDoc ); if (pSh) + { aDocName = pSh->GetTitle(); + if ( !pSh->GetDocument()->IsDocEditable() ) + { + ErrorMessage(STR_READONLYERR); + bDoIt = FALSE; + } + } } rReq.AppendItem( SfxStringItem( FID_TAB_MOVE, aDocName ) ); // Tabelle ist 1-basiert, wenn nicht APPEND diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 70c0749f9fa6..6033c101841b 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshg.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2002-12-02 14:28:33 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,9 @@ using namespace com::sun::star; #include "document.hxx" #include "drawview.hxx" #include "globstr.hrc" +#ifndef _SV_SOUND_HXX +#include <vcl/sound.hxx> +#endif //------------------------------------------------------------------------ @@ -134,9 +137,13 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, form::FormButtonType eButtonType = form::FormButtonType_URL; aAny <<= eButtonType; xPropSet->setPropertyValue( rtl::OUString::createFromAscii( "ButtonType" ), aAny ); - // #105638# OJ - aAny <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aAny ); + + if ( Sound::IsSoundFile( rURL ) ) + { + // #105638# OJ + aAny <<= sal_True; + xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aAny ); + } Point aPos; if (pInsPos) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 458e7a01f808..fa87b9407a8e 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewdata.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: nn $ $Date: 2002-12-04 18:55:38 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ #include <svx/adjitem.hxx> #include <svx/algitem.hxx> #include <svx/brshitem.hxx> -#include <svx/colorcfg.hxx> +#include <svtools/colorcfg.hxx> #include <svx/editview.hxx> #include <svx/editstat.hxx> #include <svx/outliner.hxx> @@ -82,7 +82,7 @@ #include <vcl/svapp.hxx> #include <vcl/system.hxx> -#include <tools/solmath.hxx> +#include <rtl/math.hxx> #include "viewdata.hxx" #include "docoptio.hxx" @@ -123,6 +123,9 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- +#define SC_GROWY_SMALL_EXTRA 100 +#define SC_GROWY_BIG_EXTRA 200 + #define TAG_TABBARWIDTH "tw:" static BOOL bMoveArea = FALSE; //! Member? @@ -973,7 +976,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) ); - EditGrowY(); // an alten Text anpassen + EditGrowY( TRUE ); // adjust to existing text content EditGrowX(); Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0); @@ -995,7 +998,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, if ( aBackCol.GetTransparency() > 0 || Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { - aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor ); + aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); } pEditView[eWhich]->SetBackgroundColor( aBackCol ); @@ -1090,7 +1093,7 @@ void ScViewData::EditGrowX() } } -void ScViewData::EditGrowY() +void ScViewData::EditGrowY( BOOL bInitial ) { ScSplitPos eWhich = GetActivePart(); ScVSplitPos eVWhich = WhichV(eWhich); @@ -1119,9 +1122,26 @@ void ScViewData::EditGrowY() long nOldBottom = aArea.Bottom(); long nTextHeight = pEngine->GetTextHeight(); + // #106635# When editing a formula in a cell with optimal height, allow a larger portion + // to be clipped before extending to following rows, to avoid obscuring cells for + // reference input (next row is likely to be useful in formulas). + long nAllowedExtra = SC_GROWY_SMALL_EXTRA; + if ( nEditEndRow == nEditRow && !( pDoc->GetRowFlags( nEditRow, nTabNo ) & CR_MANUALSIZE ) && + pEngine->GetParagraphCount() <= 1 ) + { + // If the (only) paragraph starts with a '=', it's a formula. + // If this is the initial call and the text is empty, allow the larger value, too, + // because this occurs in the normal progress of editing a formula. + // Subsequent calls with empty text might involve changed attributes (including + // font height), so they are treated like normal text. + String aText = pEngine->GetText( (USHORT) 0 ); + if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' ) + nAllowedExtra = SC_GROWY_BIG_EXTRA; + } + BOOL bChanged = FALSE; BOOL bMaxReached = FALSE; - while (aArea.GetHeight() + 100 < nTextHeight && nEditEndRow < nBottom && !bMaxReached) + while (aArea.GetHeight() + nAllowedExtra < nTextHeight && nEditEndRow < nBottom && !bMaxReached) { ++nEditEndRow; ScDocument* pDoc = GetDocument(); @@ -1135,6 +1155,7 @@ void ScViewData::EditGrowY() } bChanged = TRUE; + nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row } if (bChanged) @@ -1878,7 +1899,7 @@ void ScViewData::CalcPPT() // if one column is smaller than the column count, // rounding errors are likely to add up to a whole column. - double fRounded = SolarMath::ApproxFloor( fOriginal + 0.5 ); + double fRounded = ::rtl::math::approxFloor( fOriginal + 0.5 ); if ( fRounded > 0.0 ) { double fScale = fRounded / fOriginal + 1E-6; diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index bceef3459e18..cd44a9e7538b 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun5.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: nn $ $Date: 2002-12-04 10:08:52 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 1a145067f169..16938da5c959 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfunc.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: er $ $Date: 2002-11-28 16:15:54 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:06:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,30 +154,17 @@ void ScViewFunc::StartFormatArea() if ( !SC_MOD()->GetInputOptions().GetExtendFormat() ) return; - USHORT nTab = GetViewData()->GetTabNo(); - ScAddress aPos( GetViewData()->GetCurX(), GetViewData()->GetCurY(), nTab ); - BOOL bOk = TRUE; - - ScMarkData& rMark = GetViewData()->GetMarkData(); - if ( rMark.IsMultiMarked() ) - rMark.MarkToSimple(); - if ( rMark.IsMultiMarked() ) + // start only with single cell (marked or cursor position) + ScRange aMarkRange; + BOOL bOk = GetViewData()->GetSimpleArea( aMarkRange ); + if ( bOk && aMarkRange.aStart != aMarkRange.aEnd ) bOk = FALSE; - else if ( rMark.IsMarked() ) - { - ScRange aMarkRange; - rMark.GetMarkArea( aMarkRange ); - if ( aMarkRange.aStart == aMarkRange.aEnd ) - aPos = aMarkRange.aStart; - else - bOk = FALSE; - } if (bOk) { bFormatValid = TRUE; - aFormatSource = aPos; - aFormatArea = ScRange( aPos ); + aFormatSource = aMarkRange.aStart; + aFormatArea = ScRange( aFormatSource ); } else bFormatValid = FALSE; // keinen alten Bereich behalten @@ -1091,8 +1078,8 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, // wenn neue Items Default-Items sind, so muessen die // alten Items geputtet werden: - BOOL bDefNewOuter = ( SFX_ITEMS_STATICDEFAULT == pNewOuter->GetRef() ); - BOOL bDefNewInner = ( SFX_ITEMS_STATICDEFAULT == pNewInner->GetRef() ); + BOOL bDefNewOuter = ( SFX_ITEMS_STATICDEFAULT == pNewOuter->GetKind() ); + BOOL bDefNewInner = ( SFX_ITEMS_STATICDEFAULT == pNewInner->GetKind() ); ApplyPatternLines( aNewAttrs, bDefNewOuter ? pOldOuter : pNewOuter, @@ -1730,7 +1717,8 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) bSimple = TRUE; } - rMark.SetMarking(FALSE); // fuer MarkToMulti + rMark.SetMarking(FALSE); // for MarkToMulti + rMark.MarkToSimple(); // before bMulti test below DBG_ASSERT( rMark.IsMarked() || rMark.IsMultiMarked() || bSimple, "was denn loeschen ???" ) diff --git a/sc/util/hidother.src b/sc/util/hidother.src index 6491c0ccae75..b07e8cac715e 100644 --- a/sc/util/hidother.src +++ b/sc/util/hidother.src @@ -2,9 +2,9 @@ * * $RCSfile: hidother.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: nn $ $Date: 2002-12-03 15:27:11 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:07:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,11 +125,11 @@ hidspecial HID_SELECTTABLES { HelpId = HID_SELECTTABLES; }; hidspecial HID_SC_REPLCELLSWARN { HelpId = HID_SC_REPLCELLSWARN; }; hidspecial HID_SC_DPLAY_COLUMN { HelpId = HID_SC_DPLAY_COLUMN; }; -hidspecial HID_SC_DPLAY_ROW { HelpId = HID_SC_DPLAY_ROW }; -hidspecial HID_SC_DPLAY_DATA { HelpId = HID_SC_DPLAY_DATA }; -hidspecial HID_SC_DPLAY_SELECT { HelpId = HID_SC_DPLAY_SELECT }; +hidspecial HID_SC_DPLAY_ROW { HelpId = HID_SC_DPLAY_ROW; }; +hidspecial HID_SC_DPLAY_DATA { HelpId = HID_SC_DPLAY_DATA; }; +hidspecial HID_SC_DPLAY_SELECT { HelpId = HID_SC_DPLAY_SELECT; }; -hidspecial HID_SC_DRAW_RENAME { HelpId = HID_SC_DRAW_RENAME }; +hidspecial HID_SC_DRAW_RENAME { HelpId = HID_SC_DRAW_RENAME; }; // 2. Seite Funktionsautopilot: nur als Unique-IDs diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index e30a8b2d4bc6..712e94e08490 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: dr $ $Date: 2002-11-21 12:23:15 $ +# last change: $Author: hr $ $Date: 2003-03-26 18:07:00 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,10 +66,12 @@ PRJNAME=SC TARGET=scalc3 #LIBTARGET=NO GEN_HID=TRUE +GEN_HID_OTHER=TRUE # --- Settings ----------------------------------------------------------- .INCLUDE : svpre.mk +.INCLUDE : connectivity/version.mk .INCLUDE : settings.mk .INCLUDE : sv.mk @@ -217,7 +219,6 @@ LIB5OBJFILES=$(OBJ)$/sclib.obj .IF "$(depend)" == "" ALL: \ - $(SRS)$/hidother.hid\ $(MISC)$/linkinc.ls \ ALLTAR \ ea @@ -345,18 +346,6 @@ $(MISCX)$/$(SHL1TARGET).flt: @echo LibMain>>$@ -$(MISC)$/$(PRJNAME).hid : $(SRS)$/hidother.hid - -$(SRS)$/hidother.hid: hidother.src -.IF "$(GUI)"=="WNT" -.IF "$(BUILD_SOSL)"=="" - @+-mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE) - @+echo NO HIDS !!!! -.ENDIF -.ELSE - @echo nix -.ENDIF - ea: .IF "$(GUI)" == "OS2" @+echo extended attributes? siehe sw\util. diff --git a/sc/xml/ScDrawPageObj.xml b/sc/xml/ScDrawPageObj.xml new file mode 100644 index 000000000000..5777913bc915 --- /dev/null +++ b/sc/xml/ScDrawPageObj.xml @@ -0,0 +1,296 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> +<module-description xmlns:xlink="http://www.w3.org/1999/xlink"> + <module-name>sc</module-name> + <component-description> + <author>Sascha Ballach</author> + <name>com.sun.star.comp.office.ScDrawPageObj</name> + <description> + This component provides access to the DrawPage of a sheet in a spreadsheet document. +</description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>com.sun.star.sheet.SpreadsheetDrawPage</supported-service> + <type>com.sun.star.awt.DeviceInfo</type> + <type>com.sun.star.awt.FocusEvent</type> + <type>com.sun.star.awt.FontDescriptor</type> + <type>com.sun.star.awt.FontSlant</type> + <type>com.sun.star.awt.Gradient</type> + <type>com.sun.star.awt.GradientStyle</type> + <type>com.sun.star.awt.InputEvent</type> + <type>com.sun.star.awt.KeyEvent</type> + <type>com.sun.star.awt.MouseEvent</type> + <type>com.sun.star.awt.PaintEvent</type> + <type>com.sun.star.awt.Point</type> + <type>com.sun.star.awt.RasterOperation</type> + <type>com.sun.star.awt.Rectangle</type> + <type>com.sun.star.awt.SimpleFontMetric</type> + <type>com.sun.star.awt.Size</type> + <type>com.sun.star.awt.WindowClass</type> + <type>com.sun.star.awt.WindowDescriptor</type> + <type>com.sun.star.awt.WindowEvent</type> + <type>com.sun.star.awt.XBitmap</type> + <type>com.sun.star.awt.XControl</type> + <type>com.sun.star.awt.XControlContainer</type> + <type>com.sun.star.awt.XControlModel</type> + <type>com.sun.star.awt.XDevice</type> + <type>com.sun.star.awt.XDisplayBitmap</type> + <type>com.sun.star.awt.XFocusListener</type> + <type>com.sun.star.awt.XFont</type> + <type>com.sun.star.awt.XGraphics</type> + <type>com.sun.star.awt.XImageConsumer</type> + <type>com.sun.star.awt.XImageProducer</type> + <type>com.sun.star.awt.XKeyListener</type> + <type>com.sun.star.awt.XMouseListener</type> + <type>com.sun.star.awt.XMouseMotionListener</type> + <type>com.sun.star.awt.XPaintListener</type> + <type>com.sun.star.awt.XPointer</type> + <type>com.sun.star.awt.XRegion</type> + <type>com.sun.star.awt.XTabController</type> + <type>com.sun.star.awt.XTabControllerModel</type> + <type>com.sun.star.awt.XToolkit</type> + <type>com.sun.star.awt.XView</type> + <type>com.sun.star.awt.XWindow</type> + <type>com.sun.star.awt.XWindowListener</type> + <type>com.sun.star.awt.XWindowPeer</type> + <type>com.sun.star.beans.IllegalTypeException</type> + <type>com.sun.star.beans.NotRemoveableException</type> + <type>com.sun.star.beans.Property</type> + <type>com.sun.star.beans.PropertyAttribute</type> + <type>com.sun.star.beans.PropertyChangeEvent</type> + <type>com.sun.star.beans.PropertyExistException</type> + <type>com.sun.star.beans.PropertyState</type> + <type>com.sun.star.beans.PropertyStateChangeEvent</type> + <type>com.sun.star.beans.PropertyValue</type> + <type>com.sun.star.beans.PropertyValues</type> + <type>com.sun.star.beans.PropertyVetoException</type> + <type>com.sun.star.beans.UnknownPropertyException</type> + <type>com.sun.star.beans.XFastPropertySet</type> + <type>com.sun.star.beans.XMultiPropertySet</type> + <type>com.sun.star.beans.XPropertiesChangeListener</type> + <type>com.sun.star.beans.XPropertyAccess</type> + <type>com.sun.star.beans.XPropertyChangeListener</type> + <type>com.sun.star.beans.XPropertyContainer</type> + <type>com.sun.star.beans.XPropertySet</type> + <type>com.sun.star.beans.XPropertySetInfo</type> + <type>com.sun.star.beans.XPropertyState</type> + <type>com.sun.star.beans.XPropertyStateChangeListener</type> + <type>com.sun.star.beans.XVetoableChangeListener</type> + <type>com.sun.star.chart.ChartDataChangeEvent</type> + <type>com.sun.star.chart.ChartDataChangeType</type> + <type>com.sun.star.chart.XChartData</type> + <type>com.sun.star.chart.XChartDataArray</type> + <type>com.sun.star.chart.XChartDataChangeEventListener</type> + <type>com.sun.star.container.ElementExistException</type> + <type>com.sun.star.container.NoSuchElementException</type> + <type>com.sun.star.container.XChild</type> + <type>com.sun.star.container.XContentEnumerationAccess</type> + <type>com.sun.star.container.XElementAccess</type> + <type>com.sun.star.container.XEnumeration</type> + <type>com.sun.star.container.XEnumerationAccess</type> + <type>com.sun.star.container.XHierarchicalNameAccess</type> + <type>com.sun.star.container.XIndexAccess</type> + <type>com.sun.star.container.XNameAccess</type> + <type>com.sun.star.container.XNameContainer</type> + <type>com.sun.star.container.XNameReplace</type> + <type>com.sun.star.container.XNamed</type> + <type>com.sun.star.document.XActionLockable</type> + <type>com.sun.star.document.XDocumentInfo</type> + <type>com.sun.star.document.XDocumentInfoSupplier</type> + <type>com.sun.star.document.XLinkTargetSupplier</type> + <type>com.sun.star.drawing.XDrawPage</type> + <type>com.sun.star.drawing.XDrawPageSupplier</type> + <type>com.sun.star.drawing.XDrawPages</type> + <type>com.sun.star.drawing.XDrawPagesSupplier</type> + <type>com.sun.star.drawing.XShape</type> + <type>com.sun.star.drawing.XShapeBinder</type> + <type>com.sun.star.drawing.XShapeCombiner</type> + <type>com.sun.star.drawing.XShapeDescriptor</type> + <type>com.sun.star.drawing.XShapeGroup</type> + <type>com.sun.star.drawing.XShapeGrouper</type> + <type>com.sun.star.drawing.XShapes</type> + <type>com.sun.star.form.XForm</type> + <type>com.sun.star.form.XFormComponent</type> + <type>com.sun.star.form.XFormController</type> + <type>com.sun.star.form.XFormControllerListener</type> + <type>com.sun.star.form.XFormsSupplier</type> + <type>com.sun.star.form.XImageProducerSupplier</type> + <type>com.sun.star.frame.FrameAction</type> + <type>com.sun.star.frame.FrameActionEvent</type> + <type>com.sun.star.frame.XController</type> + <type>com.sun.star.frame.XFrame</type> + <type>com.sun.star.frame.XFrameActionListener</type> + <type>com.sun.star.frame.XFrames</type> + <type>com.sun.star.frame.XFramesSupplier</type> + <type>com.sun.star.frame.XModel</type> + <type>com.sun.star.frame.XStorable</type> + <type>com.sun.star.io.IOException</type> + <type>com.sun.star.lang.ArrayIndexOutOfBoundsException</type> + <type>com.sun.star.lang.EventObject</type> + <type>com.sun.star.lang.IllegalArgumentException</type> + <type>com.sun.star.lang.IndexOutOfBoundsException</type> + <type>com.sun.star.lang.KCharacterType</type> + <type>com.sun.star.lang.KParseTokens</type> + <type>com.sun.star.lang.KParseType</type> + <type>com.sun.star.lang.Locale</type> + <type>com.sun.star.lang.NoSupportException</type> + <type>com.sun.star.lang.ParseResult</type> + <type>com.sun.star.lang.WrappedTargetException</type> + <type>com.sun.star.lang.XCharacterClassification</type> + <type>com.sun.star.lang.XComponent</type> + <type>com.sun.star.lang.XEventListener</type> + <type>com.sun.star.lang.XMultiServiceFactory</type> + <type>com.sun.star.lang.XServiceInfo</type> + <type>com.sun.star.lang.XServiceName</type> + <type>com.sun.star.lang.XSingleServiceFactory</type> + <type>com.sun.star.lang.XTypeProvider</type> + <type>com.sun.star.lang.XUnoTunnel</type> + <type>com.sun.star.registry.InvalidRegistryException</type> + <type>com.sun.star.registry.InvalidValueException</type> + <type>com.sun.star.registry.RegistryKeyType</type> + <type>com.sun.star.registry.RegistryValueType</type> + <type>com.sun.star.registry.XRegistryKey</type> + <type>com.sun.star.sheet.Border</type> + <type>com.sun.star.sheet.CellDeleteMode</type> + <type>com.sun.star.sheet.CellInsertMode</type> + <type>com.sun.star.sheet.FillDateMode</type> + <type>com.sun.star.sheet.FillDirection</type> + <type>com.sun.star.sheet.FillMode</type> + <type>com.sun.star.sheet.FilterConnection</type> + <type>com.sun.star.sheet.FilterOperator</type> + <type>com.sun.star.sheet.GeneralFunction</type> + <type>com.sun.star.sheet.GoalResult</type> + <type>com.sun.star.sheet.SheetLinkMode</type> + <type>com.sun.star.sheet.SubTotalColumn</type> + <type>com.sun.star.sheet.TableFilterField</type> + <type>com.sun.star.sheet.TableOperationMode</type> + <type>com.sun.star.sheet.TablePageBreakData</type> + <type>com.sun.star.sheet.XAreaLink</type> + <type>com.sun.star.sheet.XAreaLinks</type> + <type>com.sun.star.sheet.XArrayFormulaRange</type> + <type>com.sun.star.sheet.XCalculatable</type> + <type>com.sun.star.sheet.XCellAddressable</type> + <type>com.sun.star.sheet.XCellFormatRangesSupplier</type> + <type>com.sun.star.sheet.XCellRangeAddressable</type> + <type>com.sun.star.sheet.XCellRangeMovement</type> + <type>com.sun.star.sheet.XCellRangeReferrer</type> + <type>com.sun.star.sheet.XCellRangesQuery</type> + <type>com.sun.star.sheet.XCellSeries</type> + <type>com.sun.star.sheet.XConsolidatable</type> + <type>com.sun.star.sheet.XConsolidationDescriptor</type> + <type>com.sun.star.sheet.XDDELink</type> + <type>com.sun.star.sheet.XDataPilotDescriptor</type> + <type>com.sun.star.sheet.XDataPilotTables</type> + <type>com.sun.star.sheet.XDataPilotTablesSupplier</type> + <type>com.sun.star.sheet.XDatabaseRange</type> + <type>com.sun.star.sheet.XDatabaseRanges</type> + <type>com.sun.star.sheet.XDocumentAuditing</type> + <type>com.sun.star.sheet.XFillAcrossSheet</type> + <type>com.sun.star.sheet.XFormulaQuery</type> + <type>com.sun.star.sheet.XGoalSeek</type> + <type>com.sun.star.sheet.XLabelRange</type> + <type>com.sun.star.sheet.XLabelRanges</type> + <type>com.sun.star.sheet.XMultipleOperation</type> + <type>com.sun.star.sheet.XNamedRange</type> + <type>com.sun.star.sheet.XNamedRanges</type> + <type>com.sun.star.sheet.XPrintAreas</type> + <type>com.sun.star.sheet.XScenario</type> + <type>com.sun.star.sheet.XScenarios</type> + <type>com.sun.star.sheet.XScenariosSupplier</type> + <type>com.sun.star.sheet.XSheetAnnotation</type> + <type>com.sun.star.sheet.XSheetAnnotationAnchor</type> + <type>com.sun.star.sheet.XSheetAnnotations</type> + <type>com.sun.star.sheet.XSheetAnnotationsSupplier</type> + <type>com.sun.star.sheet.XSheetAuditing</type> + <type>com.sun.star.sheet.XSheetCellCursor</type> + <type>com.sun.star.sheet.XSheetCellRange</type> + <type>com.sun.star.sheet.XSheetCellRanges</type> + <type>com.sun.star.sheet.XSheetFilterDescriptor</type> + <type>com.sun.star.sheet.XSheetFilterable</type> + <type>com.sun.star.sheet.XSheetFilterableEx</type> + <type>com.sun.star.sheet.XSheetLinkable</type> + <type>com.sun.star.sheet.XSheetOperation</type> + <type>com.sun.star.sheet.XSheetOutline</type> + <type>com.sun.star.sheet.XSheetPageBreak</type> + <type>com.sun.star.sheet.XSpreadsheet</type> + <type>com.sun.star.sheet.XSpreadsheetDocument</type> + <type>com.sun.star.sheet.XSpreadsheets</type> + <type>com.sun.star.sheet.XSubTotalCalculatable</type> + <type>com.sun.star.sheet.XSubTotalDescriptor</type> + <type>com.sun.star.sheet.XSubTotalField</type> + <type>com.sun.star.sheet.XUsedAreaCursor</type> + <type>com.sun.star.style.XStyle</type> + <type>com.sun.star.style.XStyleFamiliesSupplier</type> + <type>com.sun.star.style.XStyleLoader</type> + <type>com.sun.star.table.CellAddress</type> + <type>com.sun.star.table.CellContentType</type> + <type>com.sun.star.table.CellRangeAddress</type> + <type>com.sun.star.table.TableOrientation</type> + <type>com.sun.star.table.XAutoFormattable</type> + <type>com.sun.star.table.XCell</type> + <type>com.sun.star.table.XCellRange</type> + <type>com.sun.star.table.XColumnRowRange</type> + <type>com.sun.star.table.XTableCharts</type> + <type>com.sun.star.table.XTableChartsSupplier</type> + <type>com.sun.star.table.XTableColumns</type> + <type>com.sun.star.table.XTableRows</type> + <type>com.sun.star.text.XSimpleText</type> + <type>com.sun.star.text.XText</type> + <type>com.sun.star.text.XTextContent</type> + <type>com.sun.star.text.XTextCursor</type> + <type>com.sun.star.text.XTextFieldsSupplier</type> + <type>com.sun.star.text.XTextRange</type> + <type>com.sun.star.uno.Any</type> + <type>com.sun.star.uno.Exception</type> + <type>com.sun.star.uno.Reference</type> + <type>com.sun.star.uno.RuntimeException</type> + <type>com.sun.star.uno.Sequence</type> + <type>com.sun.star.uno.Type</type> + <type>com.sun.star.uno.TypeClass</type> + <type>com.sun.star.uno.XAdapter</type> + <type>com.sun.star.uno.XAggregation</type> + <type>com.sun.star.uno.XInterface</type> + <type>com.sun.star.uno.XReference</type> + <type>com.sun.star.uno.XWeak</type> + <type>com.sun.star.uno.genfunc</type> + <type>com.sun.star.util.Date</type> + <type>com.sun.star.util.MalformedNumberFormatException</type> + <type>com.sun.star.util.URL</type> + <type>com.sun.star.util.XImportable</type> + <type>com.sun.star.util.XIndent</type> + <type>com.sun.star.util.XMergeable</type> + <type>com.sun.star.util.XModifiable</type> + <type>com.sun.star.util.XModifyBroadcaster</type> + <type>com.sun.star.util.XModifyListener</type> + <type>com.sun.star.util.XNumberFormats</type> + <type>com.sun.star.util.XNumberFormatsSupplier</type> + <type>com.sun.star.util.XProtectable</type> + <type>com.sun.star.util.XRefreshListener</type> + <type>com.sun.star.util.XRefreshable</type> + <type>com.sun.star.util.XReplaceDescriptor</type> + <type>com.sun.star.util.XReplaceable</type> + <type>com.sun.star.util.XSearchDescriptor</type> + <type>com.sun.star.util.XSearchable</type> + <type>com.sun.star.util.XSortable</type> + <type>com.sun.star.view.XPrintable</type> + </component-description> + <project-build-dependency>cppu</project-build-dependency> + <project-build-dependency>cppuhelper</project-build-dependency> + <project-build-dependency>osl</project-build-dependency> + <project-build-dependency>rsc</project-build-dependency> + <project-build-dependency>rtl</project-build-dependency> + <project-build-dependency>sal</project-build-dependency> + <project-build-dependency>sfx2</project-build-dependency> + <project-build-dependency>so3</project-build-dependency> + <project-build-dependency>sot</project-build-dependency> + <project-build-dependency>stl</project-build-dependency> + <project-build-dependency>svtools</project-build-dependency> + <project-build-dependency>svx</project-build-dependency> + <project-build-dependency>tools</project-build-dependency> + <project-build-dependency>typelib</project-build-dependency> + <project-build-dependency>uno</project-build-dependency> + <project-build-dependency>unotools</project-build-dependency> + <project-build-dependency>vcl</project-build-dependency> + <project-build-dependency>vos</project-build-dependency> +</module-description> |