--- a/locales/loce32/language/src/language_ca.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_ca.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -36,13 +36,13 @@
{
// Fileserver
_S("Ressayer"), // Button 1
- _S("Arrêter"), // Button 2
- _S("Réinsérer le disque"), // Put the card back - line1
- _S("ou des données vont être perdues"), // Put the card back - line2
+ _S("Arrêter"), // Button 2
+ _S("Réinsérer le disque"), // Put the card back - line1
+ _S("ou des données vont être perdues"), // Put the card back - line2
_S("Batterie trop faible"), // Low power - line1
- _S("Impossible de terminer l'écriture sur disque"), // Low power - line2
- _S("Erreur de disque - impossible de terminer l'écriture"), // Disk error - line1
- _S("Ressayer ou des données seront perdues"), // Disk error - line2
+ _S("Impossible de terminer l'écriture sur disque"), // Low power - line2
+ _S("Erreur de disque - impossible de terminer l'écriture"), // Disk error - line1
+ _S("Ressayer ou des données seront perdues"), // Disk error - line2
// SoundDriver
_S("Carillon"), // Chimes
_S("Sonneries"), // Rings
--- a/locales/loce32/language/src/language_cs.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_cs.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -40,15 +40,15 @@
_S("Opakovat"), // Button 1
_S("Stop"), // Button 2
_S("Vlo\x017e" L"te disk zp\x011B" L"t"), // Put the card back - line1
- _S("nebo dojde ke ztrát\x011B" L" dat"), // Put the card back - line2
- _S("Baterie jsou tém\x011B\x0159" L" vybité"), // Low power - line1
- _S("Nelze dokon\x010D" L"it zápis na disk"), // Low power - line2
- _S("Chyba disku - nelze dokon\x010D" L"it zápis"), // Disk error - line1
- _S("Opakujte nebo dojde ke ztrát\x011B" L" dat"), // Disk error - line2
+ _S("nebo dojde ke ztrát\x011B" L" dat"), // Put the card back - line2
+ _S("Baterie jsou tém\x011B\x0159" L" vybité"), // Low power - line1
+ _S("Nelze dokon\x010D" L"it zápis na disk"), // Low power - line2
+ _S("Chyba disku - nelze dokon\x010D" L"it zápis"), // Disk error - line1
+ _S("Opakujte nebo dojde ke ztrát\x011B" L" dat"), // Disk error - line2
// SoundDriver
- _S("Odbíjení"), // Chimes
- _S("Vyzván\x011B" L"ní"), // Rings
- _S("Signál"), // Signal
+ _S("OdbÃjenÃ"), // Chimes
+ _S("Vyzván\x011B" L"nÃ"), // Rings
+ _S("Signál"), // Signal
// MediaDriver diskname (max 16 chars)
_S("Internal"), // Internal
_S("External(01)"), // External(01)
@@ -80,11 +80,11 @@
// The day names
const TText * const LanguageAspect::DayTable[KMaxDays] =
{
- _S("Pond\x011B" L"lí"),
- _S("Úterý"),
+ _S("Pond\x011B" L"lÃ"),
+ _S("Úterý"),
_S("St\x0159"L"eda"),
_S("\x010Ctvrtek"),
- _S("Pátek"),
+ _S("Pátek"),
_S("Sobota"),
_S("Ned\x011B" L"le")
};
@@ -92,10 +92,10 @@
const TText * const LanguageAspect::DayAbbTable[KMaxDays] =
{
_S("Po"),
- _S("Út"),
+ _S("Út"),
_S("St"),
_S("\x010C" L"t"),
- _S("Pá"),
+ _S("Pá"),
_S("So"),
_S("Ne")
};
@@ -103,15 +103,15 @@
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
{
_S("leden"),
- _S("únor"),
+ _S("únor"),
_S("b\x0159"L"ezen"),
_S("duben"),
_S("kv\x011B" L"ten"),
_S("\x010D"L"erven"),
_S("\x010D"L"ervenec"),
_S("srpen"),
- _S("zá\x0159" L"í"),
- _S("\x0159" L"íjen"),
+ _S("zá\x0159" L"Ã"),
+ _S("\x0159" L"Ãjen"),
_S("listopad"),
_S("prosinec")
};
@@ -119,15 +119,15 @@
const TText * const LanguageAspect::MonthAbbTable[KMaxMonths] =
{
_S("led"),
- _S("úno"),
+ _S("úno"),
_S("b\x0159" L"e"),
_S("dub"),
_S("kv\x011b"),
_S("\x010d" L"er"),
_S("\x010d" L"vc"),
_S("srp"),
- _S("zá\x0159"),
- _S("\x0159" L"íj"),
+ _S("zá\x0159"),
+ _S("\x0159" L"Ãj"),
_S("lis"),
_S("pro")
};
--- a/locales/loce32/language/src/language_da.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_da.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -37,14 +37,14 @@
const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] =
{
// Fileserver
- _S("Forsøg igen"), // Button 1
+ _S("Forsøg igen"), // Button 1
_S("Stop"), // Button 2
- _S("Indsæt disken igen,"), // Put the card back - line1
- _S("ellers vil data gå tabt"), // Put the card back - line2
+ _S("Indsæt disken igen,"), // Put the card back - line1
+ _S("ellers vil data gå tabt"), // Put the card back - line2
_S("Batteriniveauet er for lavt"), // Low power - line1
- _S("Skrivning til disk kan ikke fuldføres"), // Low power - line2
- _S("Diskfejl. Skrivningen kan ikke fuldføres"), // Disk error - line1
- _S("Forsøg igen, ellers vil data gå tabt"), // Disk error - line2
+ _S("Skrivning til disk kan ikke fuldføres"), // Low power - line2
+ _S("Diskfejl. Skrivningen kan ikke fuldføres"), // Disk error - line1
+ _S("Forsøg igen, ellers vil data gå tabt"), // Disk error - line2
// SoundDriver
_S("Klokkespil"), // Chimes
_S("Ringetoner"), // Rings
@@ -85,8 +85,8 @@
_S("Onsdag"),
_S("Torsdag"),
_S("Fredag"),
- _S("Lørdag"),
- _S("Søndag")
+ _S("Lørdag"),
+ _S("Søndag")
};
// The abbreviated day names
const TText * const LanguageAspect::DayAbbTable[KMaxDays] =
@@ -96,8 +96,8 @@
_S("Ons"),
_S("Tor"),
_S("Fre"),
- _S("Lør"),
- _S("Søn")
+ _S("Lør"),
+ _S("Søn")
};
// The month names
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
--- a/locales/loce32/language/src/language_de.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_de.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -104,7 +104,7 @@
{
_S("Januar"),
_S("Februar"),
- _S("März"),
+ _S("März"),
_S("April"),
_S("Mai"),
_S("Juni"),
--- a/locales/loce32/language/src/language_es.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_es.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -40,15 +40,15 @@
_S("Reintentar"), // Button 1
_S("Detener"), // Button 2
_S("Vuelva a introducir el disco"), // Put the card back - line1
- _S("o se perderán los datos"), // Put the card back - line2
- _S("Carga de la batería demasiado baja"), // Low power - line1
+ _S("o se perderán los datos"), // Put the card back - line2
+ _S("Carga de la baterÃa demasiado baja"), // Low power - line1
_S("Imposible terminar escritura en el disco"), // Low power - line2
_S("Error de disco - imposible terminar escritura"), // Disk error - line1
- _S("Reinténtelo o se perderán los datos"), // Disk error - line2
+ _S("Reinténtelo o se perderán los datos"), // Disk error - line2
// SoundDriver
- _S("Carillón"), // Chimes
+ _S("Carillón"), // Chimes
_S("Rings"), // Rings
- _S("Señal"), // Signal
+ _S("Señal"), // Signal
// MediaDriver diskname (max 16 chars)
_S("Internal"), // Internal
_S("External(01)"), // External(01)
@@ -82,10 +82,10 @@
{
_S("Lunes"),
_S("Martes"),
- _S("Miércoles"),
+ _S("Miércoles"),
_S("Jueves"),
_S("Viernes"),
- _S("Sábado"),
+ _S("Sábado"),
_S("Domingo")
};
// The abbreviated day names
@@ -93,10 +93,10 @@
{
_S("Lun"),
_S("Mar"),
- _S("Mié"),
+ _S("Mié"),
_S("Jue"),
_S("Vie"),
- _S("Sáb"),
+ _S("Sáb"),
_S("Dom")
};
// The month names
--- a/locales/loce32/language/src/language_es_419.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_es_419.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -40,15 +40,15 @@
_S("Reintentar"), // Button 1
_S("Detener"), // Button 2
_S("Vuelva a introducir el disco"), // Put the card back - line1
- _S("o se perderán los datos"), // Put the card back - line2
- _S("Carga de la batería demasiado baja"), // Low power - line1
+ _S("o se perderán los datos"), // Put the card back - line2
+ _S("Carga de la baterÃa demasiado baja"), // Low power - line1
_S("Imposible terminar escritura en el disco"), // Low power - line2
_S("Error de disco - imposible terminar escritura"), // Disk error - line1
- _S("Reinténtelo o se perderán los datos"), // Disk error - line2
+ _S("Reinténtelo o se perderán los datos"), // Disk error - line2
// SoundDriver
- _S("Carillón"), // Chimes
+ _S("Carillón"), // Chimes
_S("Rings"), // Rings
- _S("Señal"), // Signal
+ _S("Señal"), // Signal
// MediaDriver diskname (max 16 chars)
_S("Internal"), // Internal
_S("External(01)"), // External(01)
@@ -82,10 +82,10 @@
{
_S("Lunes"),
_S("Martes"),
- _S("Miércoles"),
+ _S("Miércoles"),
_S("Jueves"),
_S("Viernes"),
- _S("Sábado"),
+ _S("Sábado"),
_S("Domingo")
};
// The abbreviated day names
@@ -93,10 +93,10 @@
{
_S("Lun."),
_S("Mar."),
- _S("Mié."),
+ _S("Mié."),
_S("Jue."),
_S("Vie."),
- _S("Sáb."),
+ _S("Sáb."),
_S("Dom.")
};
// The month names
--- a/locales/loce32/language/src/language_et.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_et.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -41,9 +41,9 @@
_S("Stopp"), // Button 2
_S("Pane ketas tagasi,"), // Put the card back - line1
_S("muidu andmed kaovad"), // Put the card back - line2
- _S("Aku liiga tühi"), // Low power - line1
- _S("Ei suuda kettale kirjutamist lõpuni viia"), // Low power - line2
- _S("Kettatõrge - ei suuda kirjutamist lõpuni viia"), // Disk error - line1
+ _S("Aku liiga tühi"), // Low power - line1
+ _S("Ei suuda kettale kirjutamist lõpuni viia"), // Low power - line2
+ _S("Kettatõrge - ei suuda kirjutamist lõpuni viia"), // Disk error - line1
_S("Proovi uuesti, muidu andmed kaovad"), // Disk error - line2
// SoundDriver
_S("Kellahelin"), // Chimes
@@ -80,13 +80,13 @@
// The day names
const TText * const LanguageAspect::DayTable[KMaxDays] =
{
- _S("Esmaspäev"),
- _S("Teisipäev"),
- _S("Kolmapäev"),
- _S("Neljapäev"),
+ _S("Esmaspäev"),
+ _S("Teisipäev"),
+ _S("Kolmapäev"),
+ _S("Neljapäev"),
_S("Reede"),
- _S("Laupäev"),
- _S("Pühapäev")
+ _S("Laupäev"),
+ _S("Pühapäev")
};
// The abbreviated day names
const TText * const LanguageAspect::DayAbbTable[KMaxDays] =
@@ -104,7 +104,7 @@
{
_S("jaanuar"),
_S("veebruar"),
- _S("märts"),
+ _S("märts"),
_S("aprill"),
_S("mai"),
_S("juuni"),
@@ -120,7 +120,7 @@
{
_S("jaan"),
_S("veebr"),
- _S("märts"),
+ _S("märts"),
_S("apr"),
_S("mai"),
_S("juuni"),
--- a/locales/loce32/language/src/language_fi.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_fi.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -37,17 +37,17 @@
const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] =
{
// Fileserver
- _S("Yritä uudelleen."), // Button 1
+ _S("Yritä uudelleen."), // Button 1
_S("Lopeta"), // Button 2
_S("Aseta levyke takaisin asemaan"), // Put the card back - line1
- _S("tai tiedot saattavat hävitä"), // Put the card back - line2
- _S("Akun virta ei riitä"), // Low power - line1
+ _S("tai tiedot saattavat hävitä"), // Put the card back - line2
+ _S("Akun virta ei riitä"), // Low power - line1
_S("Levylle kirjoittamista ei voi suorittaa loppuun"), // Low power - line2
_S("Levyvirhe - kirjoittamista ei voi suorittaa loppuun"), // Disk error - line1
- _S("Yritä uudelleen tai tiedot häviävät"), // Disk error - line2
+ _S("Yritä uudelleen tai tiedot häviävät"), // Disk error - line2
// SoundDriver
- _S("Ääni 1"), // Chimes
- _S("Ääni 2"), // Rings
+ _S("Ääni 1"), // Chimes
+ _S("Ääni 2"), // Rings
_S("Signaali"), // Signal
// MediaDriver diskname (max 16 chars)
_S("Internal"), // Internal
@@ -107,8 +107,8 @@
_S("maaliskuu"),
_S("huhtikuu"),
_S("toukokuu"),
- _S("kesäkuu"),
- _S("heinäkuu"),
+ _S("kesäkuu"),
+ _S("heinäkuu"),
_S("elokuu"),
_S("syyskuu"),
_S("lokakuu"),
@@ -123,8 +123,8 @@
_S("maalis"),
_S("huhti"),
_S("touko"),
- _S("kesä"),
- _S("heinä"),
+ _S("kesä"),
+ _S("heinä"),
_S("elo"),
_S("syys"),
_S("loka"),
--- a/locales/loce32/language/src/language_fr.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_fr.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -38,12 +38,12 @@
{
// Fileserver
_S("Ressayer"), // Button 1
- _S("Arrêter"), // Button 2
- _S("Réinsérer le disque"), // Put the card back - line1
- _S("ou des données vont être perdues"), // Put the card back - line2
+ _S("Arrêter"), // Button 2
+ _S("Réinsérer le disque"), // Put the card back - line1
+ _S("ou des données vont être perdues"), // Put the card back - line2
_S("Batterie trop faible"), // Low power - line1
- _S("Impossible de terminer l'écriture sur disque"), // Low power - line2
- _S("Erreur de disque - impossible de terminer l'écriture"), // Disk error - line1
+ _S("Impossible de terminer l'écriture sur disque"), // Low power - line2
+ _S("Erreur de disque - impossible de terminer l'écriture"), // Disk error - line1
_S("\x0052\x00E9\x0065\x0073\x0073\x0061\x0079\x0065\x007A\x0020\x006F\x0075\x0020\x0064\x0065\x0073\x0020\x0064\x006F\x006E\x006E\x00E9\x0065\x0073\x0020\x0073\x0065\x0072\x006F\x006E\x0074\x0020\x0070\x0065\x0072\x0064\x0075\x0065\x0073"), // Disk error - line2
// SoundDriver
_S("Carillon"), // Chimes
@@ -103,33 +103,33 @@
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
{
_S("janvier"),
- _S("février"),
+ _S("février"),
_S("mars"),
_S("avril"),
_S("mai"),
_S("juin"),
_S("juillet"),
- _S("août"),
+ _S("août"),
_S("septembre"),
_S("octobre"),
_S("novembre"),
- _S("décembre")
+ _S("décembre")
};
// The abbreviated month names
const TText * const LanguageAspect::MonthAbbTable[KMaxMonths] =
{
_S("jan"),
- _S("fév"),
+ _S("fév"),
_S("mar"),
_S("avr"),
_S("mai"),
_S("juin"),
_S("juil"),
- _S("aoû"),
+ _S("aoû"),
_S("sep"),
_S("oct"),
_S("nov"),
- _S("déc")
+ _S("déc")
};
// The am/pm strings
const TText * const LanguageAspect::AmPmTable[KMaxAmPms] = {_S("AM"),_S("PM")};
--- a/locales/loce32/language/src/language_fr_ca.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_fr_ca.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -38,13 +38,13 @@
{
// Fileserver
_S("Ressayer"), // Button 1
- _S("Arrêter"), // Button 2
- _S("Réinsérer le disque"), // Put the card back - line1
- _S("ou des données vont être perdues"), // Put the card back - line2
+ _S("Arrêter"), // Button 2
+ _S("Réinsérer le disque"), // Put the card back - line1
+ _S("ou des données vont être perdues"), // Put the card back - line2
_S("Batterie trop faible"), // Low power - line1
- _S("Impossible de terminer l'écriture sur disque"), // Low power - line2
- _S("Erreur de disque - impossible de terminer l'écriture"), // Disk error - line1
- _S("Ressayer ou des données seront perdues"), // Disk error - line2
+ _S("Impossible de terminer l'écriture sur disque"), // Low power - line2
+ _S("Erreur de disque - impossible de terminer l'écriture"), // Disk error - line1
+ _S("Ressayer ou des données seront perdues"), // Disk error - line2
// SoundDriver
_S("Carillon"), // Chimes
_S("Sonneries"), // Rings
@@ -103,33 +103,33 @@
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
{
_S("janvier"),
- _S("février"),
+ _S("février"),
_S("mars"),
_S("avril"),
_S("mai"),
_S("juin"),
_S("juillet"),
- _S("août"),
+ _S("août"),
_S("septembre"),
_S("octobre"),
_S("novembre"),
- _S("décembre")
+ _S("décembre")
};
// The abbreviated month names
const TText * const LanguageAspect::MonthAbbTable[KMaxMonths] =
{
_S("jan."),
- _S("fév."),
+ _S("fév."),
_S("mar."),
_S("avr."),
_S("mai"),
_S("juin"),
_S("juil."),
- _S("août"),
+ _S("août"),
_S("sep."),
_S("oct."),
_S("nov."),
- _S("déc.")
+ _S("déc.")
};
// The am/pm strings
const TText * const LanguageAspect::AmPmTable[KMaxAmPms] = {_S("AM"),_S("PM")};
--- a/locales/loce32/language/src/language_hr.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_hr.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -37,14 +37,14 @@
const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] =
{
// Fileserver
- _S("Pokušajte ponovo"), // Button 1
+ _S("Pokušajte ponovo"), // Button 1
_S("Stani"), // Button 2
_S("Stavite natrag disk"), // Put the card back - line1
_S("ili \x0107"L"e se podaci izgubiti"), // Put the card back - line2
_S("Akumulator preslab"), // Low power - line1
- _S("Ne mogu završiti upis na disk"), // Low power - line2
- _S("Greška diska - ne mogu završiti upis"), // Disk error - line1
- _S("Pokušajte ponovo ili \x0107"L"e se podaci izgubiti"), // Disk error - line2
+ _S("Ne mogu završiti upis na disk"), // Low power - line2
+ _S("Greška diska - ne mogu završiti upis"), // Disk error - line1
+ _S("Pokušajte ponovo ili \x0107"L"e se podaci izgubiti"), // Disk error - line2
// SoundDriver
_S("Zvono sata"), // Chimes
_S("Telefonsko zvono"), // Rings
@@ -104,7 +104,7 @@
{
_S("sije\x010D"L"anj"),
_S("velja\x010D"L"a"),
- _S("ožujak"),
+ _S("ožujak"),
_S("travanj"),
_S("svibanj"),
_S("lipanj"),
@@ -120,7 +120,7 @@
{
_S("sij"),
_S("velj"),
- _S("ožu"),
+ _S("ožu"),
_S("tra"),
_S("svi"),
_S("lip"),
--- a/locales/loce32/language/src/language_hu.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_hu.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -37,18 +37,18 @@
const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] =
{
// Fileserver
- _S("Ismét"), // Button 1
- _S("Leállít"), // Button 2
+ _S("Ismét"), // Button 1
+ _S("LeállÃt"), // Button 2
_S("Tegye vissza a lemezt"), // Put the card back - line1
_S("vagy elvesznek az adatok"), // Put the card back - line2
- _S("Akkumulátor töltése túl alacsony"), // Low power - line1
- _S("Lemezre írás nem lehetséges"), // Low power - line2
- _S("Lemezhiba. Írás nem lehetséges"), // Disk error - line1
- _S("Ismét, vagy elvesznek az adatok"), // Disk error - line2
+ _S("Akkumulátor töltése túl alacsony"), // Low power - line1
+ _S("Lemezre Ãrás nem lehetséges"), // Low power - line2
+ _S("Lemezhiba. Ãrás nem lehetséges"), // Disk error - line1
+ _S("Ismét, vagy elvesznek az adatok"), // Disk error - line2
// SoundDriver
- _S("Harangszó"), // Chimes
- _S("Csengetés"), // Rings
- _S("Jelzés"), // Signal
+ _S("Harangszó"), // Chimes
+ _S("Csengetés"), // Rings
+ _S("Jelzés"), // Signal
// MediaDriver diskname (max 16 chars)
_S("Internal"), // Internal
_S("External(01)"), // External(01)
@@ -80,13 +80,13 @@
// The day names
const TText * const LanguageAspect::DayTable[KMaxDays] =
{
- _S("hétf\x0151"),
+ _S("hétf\x0151"),
_S("kedd"),
_S("szerda"),
- _S("csütörtök"),
- _S("péntek"),
+ _S("csütörtök"),
+ _S("péntek"),
_S("szombat"),
- _S("vasárnap")
+ _S("vasárnap")
};
// The abbreviated day names
const TText * const LanguageAspect::DayAbbTable[KMaxDays] =
@@ -102,16 +102,16 @@
// The month names
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
{
- _S("január"),
- _S("február"),
- _S("március"),
- _S("április"),
- _S("május"),
- _S("június"),
- _S("július"),
+ _S("január"),
+ _S("február"),
+ _S("március"),
+ _S("április"),
+ _S("május"),
+ _S("június"),
+ _S("július"),
_S("augusztus"),
_S("szeptember"),
- _S("október"),
+ _S("október"),
_S("november"),
_S("december")
};
@@ -120,11 +120,11 @@
{
_S("jan."),
_S("febr."),
- _S("márc."),
- _S("ápr."),
- _S("máj."),
- _S("jún."),
- _S("júl."),
+ _S("márc."),
+ _S("ápr."),
+ _S("máj."),
+ _S("jún."),
+ _S("júl."),
_S("aug."),
_S("szept."),
_S("okt."),
--- a/locales/loce32/language/src/language_is.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_is.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -38,17 +38,17 @@
{
// Fileserver
_S("Reyna aftur"), // Button 1
- _S("Hætta"), // Button 2
- _S("Láta diskinn aftur á sinn stað,"), // Put the card back - line1
- _S("annars er hætta á að tapa gögnum"), // Put the card back - line2
- _S("Of lítil orka í rafhlöðunni"), // Low power - line1
- _S("Ekki hægt að skrifa á diskinn"), // Low power - line2
- _S("Diskvilla - ekki hægt að klára vistun"), // Disk error - line1
- _S("Reyna aftur eða gögn munu tapast"), // Disk error - line2
+ _S("Hætta"), // Button 2
+ _S("Láta diskinn aftur á sinn stað,"), // Put the card back - line1
+ _S("annars er hætta á að tapa gögnum"), // Put the card back - line2
+ _S("Of lÃtil orka à rafhlöðunni"), // Low power - line1
+ _S("Ekki hægt að skrifa á diskinn"), // Low power - line2
+ _S("Diskvilla - ekki hægt að klára vistun"), // Disk error - line1
+ _S("Reyna aftur eða gögn munu tapast"), // Disk error - line2
// SoundDriver
- _S("Bjölluhljóð"), // Chimes
+ _S("Bjölluhljóð"), // Chimes
_S("Hringingar"), // Rings
- _S("Hljóðmerki"), // Signal
+ _S("Hljóðmerki"), // Signal
// MediaDriver diskname (max 16 chars)
_S("Internal"), // Internal
_S("External(01)"), // External(01)
@@ -80,39 +80,39 @@
// The day names
const TText * const LanguageAspect::DayTable[KMaxDays] =
{
- _S("Mánudagur"),
- _S("Þriðjudagur"),
- _S("Miðvikudagur"),
+ _S("Mánudagur"),
+ _S("Þriðjudagur"),
+ _S("Miðvikudagur"),
_S("Fimmtudagur"),
- _S("Föstudagur"),
+ _S("Föstudagur"),
_S("Laugardagur"),
_S("Sunnudagur")
};
// The abbreviated day names
const TText * const LanguageAspect::DayAbbTable[KMaxDays] =
{
- _S("Mán."),
- _S("Þri."),
- _S("Mið."),
+ _S("Mán."),
+ _S("Þri."),
+ _S("Mið."),
_S("Fim."),
- _S("Fös."),
+ _S("Fös."),
_S("Lau"),
_S("Sun.")
};
// The month names
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
{
- _S("Janúar"),
- _S("Febrúar"),
+ _S("Janúar"),
+ _S("Febrúar"),
_S("Mars"),
- _S("Apríl"),
- _S("Maí"),
- _S("Júní"),
- _S("Júlí"),
- _S("Ágúst"),
+ _S("AprÃl"),
+ _S("MaÃ"),
+ _S("JúnÃ"),
+ _S("JúlÃ"),
+ _S("Ãgúst"),
_S("September"),
- _S("Október"),
- _S("Nóvember"),
+ _S("Október"),
+ _S("Nóvember"),
_S("Desember")
};
// The abbreviated month names
@@ -122,13 +122,13 @@
_S("Feb."),
_S("Mar."),
_S("Apr."),
- _S("Maí."),
- _S("Jún."),
- _S("Júl."),
- _S("Ágú."),
+ _S("MaÃ."),
+ _S("Jún."),
+ _S("Júl."),
+ _S("Ãgú."),
_S("Sep."),
_S("Okt."),
- _S("Nóv."),
+ _S("Nóv."),
_S("Des.")
};
// The am/pm strings
--- a/locales/loce32/language/src/language_it.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_it.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -80,11 +80,11 @@
// The day names
const TText * const LanguageAspect::DayTable[KMaxDays] =
{
- _S("lunedì"),
- _S("martedì"),
- _S("mercoledì"),
- _S("giovedì"),
- _S("venerdì"),
+ _S("lunedì"),
+ _S("martedì"),
+ _S("mercoledì"),
+ _S("giovedì"),
+ _S("venerdì"),
_S("sabato"),
_S("domenica")
};
--- a/locales/loce32/language/src/language_lt.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_lt.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -41,9 +41,9 @@
_S("Sustabdykite"), // Button 2
_S("V\x0117l" L" \x012Fd\x0117" L"kite disk\x0105"), // Put the card back - line1
_S("arba duomenys bus prarasti"), // Put the card back - line2
- _S("Baterija baigia išsikrauti"), // Low power - line1
- _S("Ne\x012F" L"manoma \x012F" L"rašyti vis\x0173" L" duomen\x0173" L" \x012F" L" disk\x0105"), // Low power - line2
- _S("Disko klaida - ne\x012F" L"manoma \x012F" L"rašyti vis\x0173" L" duomen\x0173"), // Disk error - line1
+ _S("Baterija baigia išsikrauti"), // Low power - line1
+ _S("Ne\x012F" L"manoma \x012F" L"rašyti vis\x0173" L" duomen\x0173" L" \x012F" L" disk\x0105"), // Low power - line2
+ _S("Disko klaida - ne\x012F" L"manoma \x012F" L"rašyti vis\x0173" L" duomen\x0173"), // Disk error - line1
_S("Pabandykite dar kart\x0105" L", arba duomenys bus prarasti"), // Disk error - line2
// SoundDriver
_S("Varpai"), // Chimes
@@ -85,7 +85,7 @@
_S("tre\x010D" L"iadienis"),
_S("ketvirtadienis"),
_S("penktadienis"),
- _S("šeštadienis"),
+ _S("šeštadienis"),
_S("sekmadienis")
};
// The abbreviated day names
@@ -96,7 +96,7 @@
_S("Tr"),
_S("Kt"),
_S("Pn"),
- _S("Št"),
+ _S("Št"),
_S("Sk")
};
// The month names
@@ -106,8 +106,8 @@
_S("vasaris"),
_S("kovas"),
_S("balandis"),
- _S("geguž\x0117"),
- _S("birželis"),
+ _S("geguž\x0117"),
+ _S("birželis"),
_S("liepa"),
_S("rugpj\x016Bt" L"is"),
_S("rugs\x0117" L"jis"),
--- a/locales/loce32/language/src/language_lv.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_lv.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -42,7 +42,7 @@
_S("Ievietojiet atpaka\x013C" L" disku"), // Put the card back - line1
_S("vai tiks zaud\x0113" L"ti dati"), // Put the card back - line2
_S("P\x0101r\x0101" L"k zems akumulatora l\x012Bmenis"), // Low power - line1
- _S("Nevar pabeigt rakst\x012B" L"šanu disk\x0101"), // Low power - line2
+ _S("Nevar pabeigt rakst\x012B" L"šanu disk\x0101"), // Low power - line2
_S("Diska k\x013C\x016B"L"da - nevar pabeigt rakst\x012B\x0161"L"anu"), // escape sequences cut with "" to prevent next character
// to be interpreted as part of the escape (a,b,c,d,e,f are also hex)
// Compiler gives warning from this therefore pragma used.
@@ -84,7 +84,7 @@
{
_S("pirmdiena"),
_S("otrdiena"),
- _S("trešdiena"),
+ _S("trešdiena"),
_S("ceturtdiena"),
_S("piektdiena"),
_S("sestdiena"),
--- a/locales/loce32/language/src/language_no.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_no.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -37,14 +37,14 @@
const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] =
{
// Fileserver
- _S("Prøv på nytt"), // Button 1
+ _S("Prøv på nytt"), // Button 1
_S("Stopp"), // Button 2
_S("Sett disken tilbake"), // Put the card back - line1
- _S("eller data kan gå tapt"), // Put the card back - line2
- _S("Lavt batterinivå"), // Low power - line1
- _S("Kan ikke fullføre skriving til disk"), // Low power - line2
- _S("Diskfeil - kan ikke fullføre skriving"), // Disk error - line1
- _S("Prøv på nytt, eller data vil gå tapt"), // Disk error - line2
+ _S("eller data kan gå tapt"), // Put the card back - line2
+ _S("Lavt batterinivå"), // Low power - line1
+ _S("Kan ikke fullføre skriving til disk"), // Low power - line2
+ _S("Diskfeil - kan ikke fullføre skriving"), // Disk error - line1
+ _S("Prøv på nytt, eller data vil gå tapt"), // Disk error - line2
// SoundDriver
_S("Klokkespill"), // Chimes
_S("Ringetone"), // Rings
@@ -85,8 +85,8 @@
_S("onsdag"),
_S("torsdag"),
_S("fredag"),
- _S("lørdag"),
- _S("søndag")
+ _S("lørdag"),
+ _S("søndag")
};
// The abbreviated day names
const TText * const LanguageAspect::DayAbbTable[KMaxDays] =
@@ -96,8 +96,8 @@
_S("Ons"),
_S("Tor"),
_S("Fre"),
- _S("Lør"),
- _S("Søn")
+ _S("Lør"),
+ _S("Søn")
};
// The month names
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
--- a/locales/loce32/language/src/language_pl.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_pl.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -37,16 +37,16 @@
const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] =
{
// Fileserver
- _S("Ponów prób\x0119"), // Button 1
+ _S("Ponów prób\x0119"), // Button 1
_S("Stop"), // Button 2
- _S("W\x0142ó\x017C" L" dysk z powrotem"), // Put the card back - line1
+ _S("W\x0142ó\x017C" L" dysk z powrotem"), // Put the card back - line1
_S("lub dane zostan\x0105" L" utracone"), // Put the card back - line2
_S("Bateria jest zbyt s\x0142" L"aba"), // Low power - line1
_S("Nie mo\x017Cna doko\x0144" L"czy\x0107" L" zapisywania na dysku"), // Low power - line2
_S("B\x0142\x0105" L"d dysku - nie mo\x017C" L"na doko\x0144" L"czy\x0107" L" zapisywania"), // escape sequences cut with "" to prevent next character
// to be interpreted as part of the escape (a,b,c,d,e,f are also hex)
// pragma used to surpress compiler warnings for these
- _S("Ponów prób\x0119" L", inaczej utracisz dane"), // Disk error - line2
+ _S("Ponów prób\x0119" L", inaczej utracisz dane"), // Disk error - line2
// SoundDriver
_S("Kuranty"), // Chimes
_S("Dzwonki"), // Rings
--- a/locales/loce32/language/src/language_pt.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_pt.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -40,13 +40,13 @@
_S("Tentar de novo"), // Button 1
_S("Parar"), // Button 2
_S("Voltar a colocar o disco"), // Put the card back - line1
- _S("ou haverá perda de dados"), // Put the card back - line2
+ _S("ou haverá perda de dados"), // Put the card back - line2
_S("Bateria muito fraca"), // Low power - line1
- _S("Impossível concluir a escrita em disco"), // Low power - line2
- _S("Erro no disco - impossível concluir a escrita"), // Disk error - line1
- _S("Tentar de novo ou haverá perda de dados"), // Disk error - line2
+ _S("ImpossÃvel concluir a escrita em disco"), // Low power - line2
+ _S("Erro no disco - impossÃvel concluir a escrita"), // Disk error - line1
+ _S("Tentar de novo ou haverá perda de dados"), // Disk error - line2
// SoundDriver
- _S("Carrilhões"), // Chimes
+ _S("Carrilhões"), // Chimes
_S("Toques"), // Rings
_S("Sinal"), // Signal
// MediaDriver diskname (max 16 chars)
@@ -81,11 +81,11 @@
const TText * const LanguageAspect::DayTable[KMaxDays] =
{
_S("Segunda-feira"),
- _S("Terça-feira"),
+ _S("Terça-feira"),
_S("Quarta-feira"),
_S("Quinta-feira"),
_S("Sexta-feira"),
- _S("Sábado"),
+ _S("Sábado"),
_S("Domingo")
};
// The abbreviated day names
@@ -96,7 +96,7 @@
_S("Qua"),
_S("Qui"),
_S("Sex"),
- _S("Sáb"),
+ _S("Sáb"),
_S("Dom")
};
// The month names
@@ -104,7 +104,7 @@
{
_S("Janeiro"),
_S("Fevereiro"),
- _S("Março"),
+ _S("Março"),
_S("Abril"),
_S("Maio"),
_S("Junho"),
--- a/locales/loce32/language/src/language_pt_br.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_pt_br.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -40,13 +40,13 @@
_S("Tentar de novo"), // Button 1
_S("Parar"), // Button 2
_S("Volte a colocar o disco"), // Put the card back - line1
- _S("ou haverá perda de dados"), // Put the card back - line2
+ _S("ou haverá perda de dados"), // Put the card back - line2
_S("Bateria muito fraca"), // Low power - line1
_S("Incapaz de concluir a escrita em disco"), // Low power - line2
_S("Erro no disco - incapaz de concluir a escrita"), // Disk error - line1
- _S("Tentar de novo ou haverá perda de dados"), // Disk error - line2
+ _S("Tentar de novo ou haverá perda de dados"), // Disk error - line2
// SoundDriver
- _S("Carrilhões"), // Chimes
+ _S("Carrilhões"), // Chimes
_S("Toques"), // Rings
_S("Sinal"), // Signal
// MediaDriver diskname (max 16 chars)
@@ -82,11 +82,11 @@
const TText * const LanguageAspect::DayTable[KMaxDays] =
{
_S("Segunda-feira"),
- _S("Terça-feira"),
+ _S("Terça-feira"),
_S("Quarta-feira"),
_S("Quinta-feira"),
_S("Sexta-feira"),
- _S("Sábado"),
+ _S("Sábado"),
_S("Domingo")
};
// The abbreviated day names
@@ -97,7 +97,7 @@
_S("Qua"),
_S("Qui"),
_S("Sex"),
- _S("Sáb"),
+ _S("Sáb"),
_S("Dom")
};
// The month names
@@ -105,7 +105,7 @@
{
_S("Janeiro"),
_S("Fevereiro"),
- _S("Março"),
+ _S("Março"),
_S("Abril"),
_S("Maio"),
_S("Junho"),
--- a/locales/loce32/language/src/language_ro.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_ro.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -37,14 +37,14 @@
const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] =
{
// Fileserver
- _S("Încerca\x0163" L"i din nou"), // Button 1
+ _S("ÃŽncerca\x0163" L"i din nou"), // Button 1
_S("Stop"), // Button 2
_S("Dac\x0103" L" nu pune\x0163" L"i discul la loc"), // Put the card back - line1
_S("se vor pierde date"), // Put the card back - line2
_S("Bateria este prea desc\x0103rcat\x0103"), // Low power - line1
- _S("Înregistrarea pe disc nu poate fi terminat\x0103"), // Low power - line2
- _S("Eroare de disc - înregistrarea nu poate fi terminat\x0103"), // Disk error - line1
- _S("Dac\x0103" L" nu încerca\x0163" L"i din nou se vor pierde date"), // Disk error - line2
+ _S("ÃŽnregistrarea pe disc nu poate fi terminat\x0103"), // Low power - line2
+ _S("Eroare de disc - înregistrarea nu poate fi terminat\x0103"), // Disk error - line1
+ _S("Dac\x0103" L" nu încerca\x0163" L"i din nou se vor pierde date"), // Disk error - line2
// SoundDriver
_S("Sun\x0103" L" ca ceasul"), // Chimes
_S("Sun\x0103" L" ca telefonul"), // Rings
@@ -85,7 +85,7 @@
_S("Miercuri"),
_S("Joi"),
_S("Vineri"),
- _S("Sâmb\x0103" L"t\x0103"),
+ _S("Sâmb\x0103" L"t\x0103"),
_S("Duminic\x0103")
};
// The abbreviated day names
@@ -96,7 +96,7 @@
_S("Mi"),
_S("Jo"),
_S("Vi"),
- _S("Sâ"),
+ _S("Sâ"),
_S("Du")
};
// The month names
--- a/locales/loce32/language/src/language_sk.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_sk.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -103,16 +103,16 @@
// The month names
const TText * const LanguageAspect::MonthTable[KMaxMonths] =
{
- _S("január"),
- _S("február"),
+ _S("január"),
+ _S("február"),
_S("marec"),
- _S("apríl"),
- _S("máj"),
- _S("jún"),
- _S("júl"),
+ _S("aprÃl"),
+ _S("máj"),
+ _S("jún"),
+ _S("júl"),
_S("august"),
_S("september"),
- _S("október"),
+ _S("október"),
_S("november"),
_S("december")
};
@@ -123,9 +123,9 @@
_S("feb."),
_S("mar."),
_S("apr."),
- _S("máj"),
- _S("jún"),
- _S("júl"),
+ _S("máj"),
+ _S("jún"),
+ _S("júl"),
_S("aug."),
_S("sep."),
_S("okt."),
--- a/locales/loce32/language/src/language_sr.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_sr.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -41,9 +41,9 @@
_S("Stop"), // Button 2
_S("Stavi disk nazad"), // Put the card back - line1
_S("ili \x0107"L"e podaci biti izgubljeni"), // Put the card back - line2
- _S("Baterija je suviše prazna"), // Low power - line1
- _S("Ne mogu završiti upis na disk"), // Low power - line2
- _S("Greška na disku - ne mogu završiti upis"), // Disk error - line1
+ _S("Baterija je suviše prazna"), // Low power - line1
+ _S("Ne mogu završiti upis na disk"), // Low power - line2
+ _S("Greška na disku - ne mogu završiti upis"), // Disk error - line1
_S("Ponovi ili \x0107"L"e podaci biti izgubljeni"), // Disk error - line2
// SoundDriver
_S("Muzika"), // Chimes
--- a/locales/loce32/language/src/language_tr.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/language/src/language_tr.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -41,12 +41,12 @@
_S("Durdur"), // Button 2
_S("Diski yeniden tak\x0131" L"n"), // Put the card back - line1
_S("yoksa veriler kaybolacakt\x0131r."), // Put the card back - line2
- _S("Batarya çok zay\x0131"L"f"), // Low power - line1
+ _S("Batarya çok zay\x0131"L"f"), // Low power - line1
_S("Diske yazma tamamlanam\x0131yor"), // Low power - line2
_S("Disk hatas\x0131 - yazma tamamlanam\x0131" L"yor"), // Disk error - line1
_S("Tekrar deneyin, yoksa veriler kaybolacakt\x0131" L"r"), // Disk error - line2
// SoundDriver
- _S("Ç\x0131" L"ng\x0131" L"rak"), // Chimes
+ _S("Ç\x0131" L"ng\x0131" L"rak"), // Chimes
_S("Zil"), // Rings
_S("Sinyal"), // Signal
// MediaDriver diskname (max 16 chars)
@@ -82,7 +82,7 @@
{
_S("Pazartesi"),
_S("Sal\x0131"),
- _S("Çar\x015F"L"amba"),
+ _S("Çar\x015F"L"amba"),
_S("Per\x015F"L"embe"),
_S("Cuma"),
_S("Cumartesi"),
@@ -93,7 +93,7 @@
{
_S("Pt"),
_S("Sa"),
- _S("Ça"),
+ _S("Ça"),
_S("Pe"),
_S("Cu"),
_S("Ct"),
@@ -110,7 +110,7 @@
_S("Haziran"),
_S("Temmuz"),
_S("A\x011F" L"ustos"),
- _S("Eylül"),
+ _S("Eylül"),
_S("Ekim"),
_S("Kas\x0131" L"m"),
_S("Aral\x0131" L"k")
@@ -132,7 +132,7 @@
_S("Ara")
};
// The am/pm strings
-const TText * const LanguageAspect::AmPmTable[KMaxAmPms] = {_S("ÖÖ"),_S("ÖS")};
+const TText * const LanguageAspect::AmPmTable[KMaxAmPms] = {_S("ÖÖ"),_S("ÖS")};
--- a/locales/loce32/region/src/region_gb.cpp Wed Aug 18 10:48:00 2010 +0300
+++ b/locales/loce32/region/src/region_gb.cpp Thu Sep 02 21:31:27 2010 +0300
@@ -28,11 +28,11 @@
const TDateFormat RegionAspect::DateFormat = EDateEuropean;
const TTimeFormat RegionAspect::TimeFormat = ETime12;
const TLocalePos RegionAspect::CurrencySymbolPosition = ELocaleBefore;
-const TBool RegionAspect::CurrencySpaceBetween = EFalse;
+const TBool RegionAspect::CurrencySpaceBetween = ETrue;
const TInt RegionAspect::CurrencyDecimalPlaces = 2;
const TLocale::TNegativeCurrencyFormat RegionAspect::NegativeCurrencyFormat=TLocale::TNegativeCurrencyFormat(TLocale::ELeadingMinusSign); // replacing CurrencyNegativeInBrackets
const TBool RegionAspect::CurrencyTriadsAllowed = ETrue;
-const TText * const RegionAspect::ThousandsSeparator = _S(",");
+const TText * const RegionAspect::ThousandsSeparator = _S(" ");
const TText * const RegionAspect::DecimalSeparator = _S(".");
const TText * const RegionAspect::DateSeparator[KMaxDateSeparators] = {_S(""),_S("/"),_S("/"),_S("")};
const TText * const RegionAspect::TimeSeparator[KMaxTimeSeparators] = {_S(""),_S(":"),_S(":"),_S("")};
@@ -40,7 +40,7 @@
const TBool RegionAspect::AmPmSpaceBetween = ETrue;
const TDaylightSavingZone RegionAspect::HomeDaylightSavingZone = EDstEuropean;
const TUint RegionAspect::WorkDays = 0x1f;
-const TText * const RegionAspect::CurrencySymbol = _S("£");
+const TText * const RegionAspect::CurrencySymbol = _S("£");
const TText* const RegionAspect::ShortDateFormatSpec = _S("%F%/0%D%/1%M%/2%Y%/3"); // no leading zeros
const TText* const RegionAspect::LongDateFormatSpec = _S("%F%D%X %N %Y"); // leading zeros in day
const TText* const RegionAspect::TimeFormatSpec = _S("%F%:0%*I%:1%*T%:2%*S%:3 %B"); // am/pm -symbol included
--- a/skins/AknSkinContent/group/bld.inf Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkinContent/group/bld.inf Thu Sep 02 21:31:27 2010 +0300
@@ -24,31 +24,9 @@
#undef OLD_PLATFORM_SKINS
PRJ_EXPORTS
-//../srcdata/scalableseries60skin/101f84b9.sel /epoc32/release/winscw/udeb/z/resource/skins/101f84b9/101f84b9.sel
-
-// Using only default skin
-//../srcdata/haze/2000B12D.sel /epoc32/release/winscw/udeb/z/resource/skins/2000B12D/2000B12D.sel
-//../srcdata/jing/2000B12E.sel /epoc32/release/winscw/udeb/z/resource/skins/2000B12E/2000B12E.sel
-#ifdef OLD_PLATFORM_SKINS
-../srcdata/armi/1020711F.sel /epoc32/release/winscw/udeb/z/resource/skins/1020711F/1020711F.sel
-../srcdata/city/10207120.sel /epoc32/release/winscw/udeb/z/resource/skins/10207120/10207120.sel
-#endif
-
-//../srcdata/scalableseries60skin/101f84b9.sel /epoc32/release/winscw/urel/z/resource/skins/101f84b9/101f84b9.sel
-//../srcdata/haze/2000B12D.sel /epoc32/release/winscw/urel/z/resource/skins/2000B12D/2000B12D.sel
-//../srcdata/jing/2000B12E.sel /epoc32/release/winscw/urel/z/resource/skins/2000B12E/2000B12E.sel
-#ifdef OLD_PLATFORM_SKINS
-../srcdata/armi/1020711F.sel /epoc32/release/winscw/urel/z/resource/skins/1020711F/1020711F.sel
-../srcdata/city/10207120.sel /epoc32/release/winscw/urel/z/resource/skins/10207120/10207120.sel
-#endif
-
-//../srcdata/scalableseries60skin/101f84b9.sel /epoc32/data/z/resource/skins/101f84b9/101f84b9.sel
-//../srcdata/haze/2000B12D.sel /epoc32/data/z/resource/skins/2000B12D/2000B12D.sel
-//../srcdata/jing/2000B12E.sel /epoc32/data/z/resource/skins/2000B12E/2000B12E.sel
-#ifdef OLD_PLATFORM_SKINS
-../srcdata/armi/1020711F.sel /epoc32/data/z/resource/skins/1020711F/1020711F.sel
-../srcdata/city/10207120.sel /epoc32/data/z/resource/skins/10207120/10207120.sel
-#endif
+../srcdata/scalableseries60skin/101f84b9.sel /epoc32/release/winscw/udeb/z/resource/skins/101f84b9/101f84b9.sel
+../srcdata/scalableseries60skin/101f84b9.sel /epoc32/release/winscw/urel/z/resource/skins/101f84b9/101f84b9.sel
+../srcdata/scalableseries60skin/101f84b9.sel /epoc32/data/z/resource/skins/101f84b9/101f84b9.sel
#ifdef SBSV2
./skingenerator.flm /epoc32/tools/makefile_templates/skins/skingenerator.flm
@@ -111,13 +89,5 @@
#endif //SBSV2
../srcdata/scalableseries60skin/MifIndexDll/series60skinindexdll.mmp
-
-#ifdef OLD_PLATFORM_SKINS
-// Scalable (ROM) skin "Armi"
-gnumakefile armi.mk
-
-// Scalable (ROM) skin "City"
-gnumakefile city.mk
-#endif
#endif
// End of File
--- a/skins/AknSkins/group/AknSkinRenderLib.mmp Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkins/group/AknSkinRenderLib.mmp Thu Sep 02 21:31:27 2010 +0300
@@ -114,7 +114,7 @@
// Target-specific DEF files
// ============================================================================
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../EABI/
#elif defined(WINSCW)
deffile ../BWINSCW/
--- a/skins/AknSkins/group/AknSkinSrv.mmp Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkins/group/AknSkinSrv.mmp Thu Sep 02 21:31:27 2010 +0300
@@ -108,7 +108,7 @@
// Target-specific DEF files
// ============================================================================
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../EABI/
#elif defined(WINSCW)
deffile ../BWINSCW/
--- a/skins/AknSkins/group/AknSkins.mmp Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkins/group/AknSkins.mmp Thu Sep 02 21:31:27 2010 +0300
@@ -97,7 +97,7 @@
// Target-specific DEF files
// ============================================================================
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../EABI/
#elif defined(WINSCW)
deffile ../BWINSCW/
--- a/skins/AknSkins/group/AknsWallpaperUtils.mmp Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkins/group/AknsWallpaperUtils.mmp Thu Sep 02 21:31:27 2010 +0300
@@ -53,7 +53,7 @@
// Target-specific DEF files
// ============================================================================
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../EABI/
#elif defined(WINSCW)
deffile ../BWINSCW/
--- a/skins/AknSkins/group/aknlocalskinlib.mmp Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkins/group/aknlocalskinlib.mmp Thu Sep 02 21:31:27 2010 +0300
@@ -51,7 +51,7 @@
// Target-specific DEF files
// ============================================================================
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../EABI/
#elif defined(WINSCW)
deffile ../BWINSCW/
--- a/skins/AknSkins/group/bld.inf Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkins/group/bld.inf Thu Sep 02 21:31:27 2010 +0300
@@ -38,10 +38,10 @@
../data/Series60SkinsSupport.SIS /epoc32/release/winscw/udeb/z/system/Install/Series60SkinsSupport.SIS
../data/Series60SkinsSupport.SIS /epoc32/release/winscw/urel/z/system/Install/Series60SkinsSupport.SIS
../data/Series60SkinsSupport.SIS /epoc32/data/z/system/Install/Series60SkinsSupport.SIS
-../data/AknSkinDescCompiler_NR.EXE /epoc32/tools/AknSkinDescCompiler.EXE
-../data/AknSkinDescCompiler_NR.EXE /epoc32/tools/AknSkinDescCompiler_NR.EXE
-../data/AknSkinDescCompiler_NR.EXE /epoc32/release/tools/rel/AknSkinDescCompiler.EXE
-../data/AknSkinDescCompiler_NR.EXE /epoc32/release/tools/rel/AknSkinDescCompiler_NR.EXE
+/* ../data/AknSkinDescCompiler_NR.EXE /epoc32/tools/AknSkinDescCompiler.EXE */
+/* ../data/AknSkinDescCompiler_NR.EXE /epoc32/tools/AknSkinDescCompiler_NR.EXE */
+/* ../data/AknSkinDescCompiler_NR.EXE /epoc32/release/tools/rel/AknSkinDescCompiler.EXE */
+/* ../data/AknSkinDescCompiler_NR.EXE /epoc32/release/tools/rel/AknSkinDescCompiler_NR.EXE */
//
// Scalable skins support stub SIS from AknSkins/data
@@ -96,16 +96,8 @@
PRJ_MMPFILES
#if defined(TOOLS) || defined(CWTOOLS) || defined(TOOLS2)
-// Skin descriptor compiler (TOOLS target only)
-//
-/*
- * NOTE! AknSkinDescCompiler is not compiled any more during usual build.
- * It is just exported from ../data directory.
- * If want to compile AknSkinDescCompiler from sources, you need to
- * uncomment below line, run build tools. New Compiler will be in /epoc32/tools/
- *
- */
+// Skin descriptor compiler
#if defined(TOOLS2)
AknSkinDescCompiler.mmp
AknSkinDescCompiler_NR.mmp
--- a/skins/AknSkins/rlpluginsrc/asm_versions/fx_asm_versions.h Wed Aug 18 10:48:00 2010 +0300
+++ b/skins/AknSkins/rlpluginsrc/asm_versions/fx_asm_versions.h Thu Sep 02 21:31:27 2010 +0300
@@ -23,7 +23,7 @@
#define FX_ASM_VERSIONS_H
-#if defined(__MARM_ARMV4__) || defined(__MARM_ARMI__) || defined(__MARM_ARMV5__)
+#if defined(__ARMCC__)
#define ARM_VERSION
//#define __NAKED__ __declspec( naked )
#endif