diff --git a/src/Config.cpp b/src/Config.cpp index 387188293..984fd843c 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -118,7 +118,7 @@ std::string Config::_defaults = "dateformat.annotation= # Preferred display date format for annotations\n" "date.iso=yes # Enable ISO date support\n" "weekstart=" - STRING_DATE_SUNDAY_LONG + STRING_DATE_SUNDAY " # Sunday or Monday only\n" "displayweeknumber=yes # Show week numbers on calendar\n" "due=7 # Task is considered due in 7 days\n" diff --git a/src/Date.cpp b/src/Date.cpp index 256d52653..6f39d6272 100644 --- a/src/Date.cpp +++ b/src/Date.cpp @@ -406,18 +406,18 @@ std::string Date::monthName (int month) { static const char* months[12] = { - STRING_DATE_JANUARY_LONG, - STRING_DATE_FEBRUARY_LONG, - STRING_DATE_MARCH_LONG, - STRING_DATE_APRIL_LONG, - STRING_DATE_MAY_LONG, - STRING_DATE_JUNE_LONG, - STRING_DATE_JULY_LONG, - STRING_DATE_AUGUST_LONG, - STRING_DATE_SEPTEMBER_LONG, - STRING_DATE_OCTOBER_LONG, - STRING_DATE_NOVEMBER_LONG, - STRING_DATE_DECEMBER_LONG, + STRING_DATE_JANUARY, + STRING_DATE_FEBRUARY, + STRING_DATE_MARCH, + STRING_DATE_APRIL, + STRING_DATE_MAY, + STRING_DATE_JUNE, + STRING_DATE_JULY, + STRING_DATE_AUGUST, + STRING_DATE_SEPTEMBER, + STRING_DATE_OCTOBER, + STRING_DATE_NOVEMBER, + STRING_DATE_DECEMBER, }; assert (month > 0); @@ -430,13 +430,13 @@ void Date::dayName (int dow, std::string& name) { static const char* days[7] = { - STRING_DATE_SUNDAY_LONG, - STRING_DATE_MONDAY_LONG, - STRING_DATE_TUESDAY_LONG, - STRING_DATE_WEDNESDAY_LONG, - STRING_DATE_THURSDAY_LONG, - STRING_DATE_FRIDAY_LONG, - STRING_DATE_SATURDAY_LONG, + STRING_DATE_SUNDAY, + STRING_DATE_MONDAY, + STRING_DATE_TUESDAY, + STRING_DATE_WEDNESDAY, + STRING_DATE_THURSDAY, + STRING_DATE_FRIDAY, + STRING_DATE_SATURDAY, }; name = ucFirst (days[dow]); @@ -447,13 +447,13 @@ std::string Date::dayName (int dow) { static const char* days[7] = { - STRING_DATE_SUNDAY_LONG, - STRING_DATE_MONDAY_LONG, - STRING_DATE_TUESDAY_LONG, - STRING_DATE_WEDNESDAY_LONG, - STRING_DATE_THURSDAY_LONG, - STRING_DATE_FRIDAY_LONG, - STRING_DATE_SATURDAY_LONG, + STRING_DATE_SUNDAY, + STRING_DATE_MONDAY, + STRING_DATE_TUESDAY, + STRING_DATE_WEDNESDAY, + STRING_DATE_THURSDAY, + STRING_DATE_FRIDAY, + STRING_DATE_SATURDAY, }; return ucFirst (days[dow]); @@ -490,15 +490,17 @@ int Date::dayOfWeek () const //////////////////////////////////////////////////////////////////////////////// int Date::dayOfWeek (const std::string& input) { - std::string in = lowerCase (input); + int minimum = CLI2::minimumMatchLength; + if (minimum == 0) + minimum = 3; - if (in == STRING_DATE_SUNDAY_LONG || in == STRING_DATE_SUNDAY_SHORT) return 0; - if (in == STRING_DATE_MONDAY_LONG || in == STRING_DATE_MONDAY_SHORT) return 1; - if (in == STRING_DATE_TUESDAY_LONG || in == STRING_DATE_TUESDAY_SHORT) return 2; - if (in == STRING_DATE_WEDNESDAY_LONG || in == STRING_DATE_WEDNESDAY_SHORT) return 3; - if (in == STRING_DATE_THURSDAY_LONG || in == STRING_DATE_THURSDAY_SHORT) return 4; - if (in == STRING_DATE_FRIDAY_LONG || in == STRING_DATE_FRIDAY_SHORT) return 5; - if (in == STRING_DATE_SATURDAY_LONG || in == STRING_DATE_SATURDAY_SHORT) return 6; + if (closeEnough (STRING_DATE_SUNDAY, input, minimum)) return 0; + else if (closeEnough (STRING_DATE_MONDAY, input, minimum)) return 1; + else if (closeEnough (STRING_DATE_TUESDAY, input, minimum)) return 2; + else if (closeEnough (STRING_DATE_WEDNESDAY, input, minimum)) return 3; + else if (closeEnough (STRING_DATE_THURSDAY, input, minimum)) return 4; + else if (closeEnough (STRING_DATE_FRIDAY, input, minimum)) return 5; + else if (closeEnough (STRING_DATE_SATURDAY, input, minimum)) return 6; return -1; } @@ -513,20 +515,22 @@ int Date::dayOfYear () const //////////////////////////////////////////////////////////////////////////////// int Date::monthOfYear (const std::string& input) { - std::string in = lowerCase (input); + int minimum = CLI2::minimumMatchLength; + if (minimum == 0) + minimum = 3; - if (in == STRING_DATE_JANUARY_LONG || in == STRING_DATE_JANUARY_SHORT ) return 1; - if (in == STRING_DATE_FEBRUARY_LONG || in == STRING_DATE_FEBRUARY_SHORT ) return 2; - if (in == STRING_DATE_MARCH_LONG || in == STRING_DATE_MARCH_SHORT ) return 3; - if (in == STRING_DATE_APRIL_LONG || in == STRING_DATE_APRIL_SHORT ) return 4; - if (in == STRING_DATE_MAY_LONG || in == STRING_DATE_MAY_SHORT ) return 5; - if (in == STRING_DATE_JUNE_LONG || in == STRING_DATE_JUNE_SHORT ) return 6; - if (in == STRING_DATE_JULY_LONG || in == STRING_DATE_JULY_SHORT ) return 7; - if (in == STRING_DATE_AUGUST_LONG || in == STRING_DATE_AUGUST_SHORT ) return 8; - if (in == STRING_DATE_SEPTEMBER_LONG || in == STRING_DATE_SEPTEMBER_SHORT) return 9; - if (in == STRING_DATE_OCTOBER_LONG || in == STRING_DATE_OCTOBER_SHORT ) return 10; - if (in == STRING_DATE_NOVEMBER_LONG || in == STRING_DATE_NOVEMBER_SHORT ) return 11; - if (in == STRING_DATE_DECEMBER_LONG || in == STRING_DATE_DECEMBER_SHORT ) return 12; + if (closeEnough (STRING_DATE_JANUARY, input, minimum)) return 1; + else if (closeEnough (STRING_DATE_FEBRUARY, input, minimum)) return 2; + else if (closeEnough (STRING_DATE_MARCH, input, minimum)) return 3; + else if (closeEnough (STRING_DATE_APRIL, input, minimum)) return 4; + else if (closeEnough (STRING_DATE_MAY, input, minimum)) return 5; + else if (closeEnough (STRING_DATE_JUNE, input, minimum)) return 6; + else if (closeEnough (STRING_DATE_JULY, input, minimum)) return 7; + else if (closeEnough (STRING_DATE_AUGUST, input, minimum)) return 8; + else if (closeEnough (STRING_DATE_SEPTEMBER, input, minimum)) return 9; + else if (closeEnough (STRING_DATE_OCTOBER, input, minimum)) return 10; + else if (closeEnough (STRING_DATE_NOVEMBER, input, minimum)) return 11; + else if (closeEnough (STRING_DATE_DECEMBER, input, minimum)) return 12; return -1; } diff --git a/src/Dates.cpp b/src/Dates.cpp index 534322612..f0d9079d3 100644 --- a/src/Dates.cpp +++ b/src/Dates.cpp @@ -136,6 +136,8 @@ bool namedDates (const std::string& name, Variant& value) int i; int minimum = CLI2::minimumMatchLength; + if (minimum == 0) + minimum = 3; // Dynamics. if (closeEnough ("now", name, minimum)) diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index e46ea58a9..6575c2957 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -627,47 +627,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' ist kein gültiges Datum im '{2}'-Format." #define STRING_DATE_BAD_WEEKSTART "Die 'weekstart'-Konfigurationsoption darf nur 'Sunday' oder 'Monday' lauten." -#define STRING_DATE_JANUARY_LONG "Januar" -#define STRING_DATE_FEBRUARY_LONG "Februar" -#define STRING_DATE_MARCH_LONG "März" -#define STRING_DATE_APRIL_LONG "April" -#define STRING_DATE_MAY_LONG "Mai" -#define STRING_DATE_JUNE_LONG "Juni" -#define STRING_DATE_JULY_LONG "Juli" -#define STRING_DATE_AUGUST_LONG "August" -#define STRING_DATE_SEPTEMBER_LONG "September" -#define STRING_DATE_OCTOBER_LONG "Oktober" -#define STRING_DATE_NOVEMBER_LONG "November" -#define STRING_DATE_DECEMBER_LONG "Dezember" +#define STRING_DATE_JANUARY "Januar" +#define STRING_DATE_FEBRUARY "Februar" +#define STRING_DATE_MARCH "März" +#define STRING_DATE_APRIL "April" +#define STRING_DATE_MAY "Mai" +#define STRING_DATE_JUNE "Juni" +#define STRING_DATE_JULY "Juli" +#define STRING_DATE_AUGUST "August" +#define STRING_DATE_SEPTEMBER "September" +#define STRING_DATE_OCTOBER "Oktober" +#define STRING_DATE_NOVEMBER "November" +#define STRING_DATE_DECEMBER "Dezember" -#define STRING_DATE_JANUARY_SHORT "Jan" -#define STRING_DATE_FEBRUARY_SHORT "Feb" -#define STRING_DATE_MARCH_SHORT "Mär" -#define STRING_DATE_APRIL_SHORT "Apr" -#define STRING_DATE_MAY_SHORT "Mai" -#define STRING_DATE_JUNE_SHORT "Jun" -#define STRING_DATE_JULY_SHORT "Jul" -#define STRING_DATE_AUGUST_SHORT "Aug" -#define STRING_DATE_SEPTEMBER_SHORT "Sep" -#define STRING_DATE_OCTOBER_SHORT "Okt" -#define STRING_DATE_NOVEMBER_SHORT "Nov" -#define STRING_DATE_DECEMBER_SHORT "Dez" - -#define STRING_DATE_SUNDAY_LONG "Sonntag" -#define STRING_DATE_MONDAY_LONG "Montag" -#define STRING_DATE_TUESDAY_LONG "Dienstag" -#define STRING_DATE_WEDNESDAY_LONG "Mittwoch" -#define STRING_DATE_THURSDAY_LONG "Donnerstag" -#define STRING_DATE_FRIDAY_LONG "Freitag" -#define STRING_DATE_SATURDAY_LONG "Samstag" - -#define STRING_DATE_SUNDAY_SHORT "So" -#define STRING_DATE_MONDAY_SHORT "Mo" -#define STRING_DATE_TUESDAY_SHORT "Di" -#define STRING_DATE_WEDNESDAY_SHORT "Mi" -#define STRING_DATE_THURSDAY_SHORT "Do" -#define STRING_DATE_FRIDAY_SHORT "Fr" -#define STRING_DATE_SATURDAY_SHORT "Sa" +#define STRING_DATE_SUNDAY "Sonntag" +#define STRING_DATE_MONDAY "Montag" +#define STRING_DATE_TUESDAY "Dienstag" +#define STRING_DATE_WEDNESDAY "Mittwoch" +#define STRING_DATE_THURSDAY "Donnerstag" +#define STRING_DATE_FRIDAY "Freitag" +#define STRING_DATE_SATURDAY "Samstag" // dependency #define STRING_DEPEND_BLOCKED "Aufgabe {1} wird blockiert durch:" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 1521e973f..adbd42eb8 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -627,47 +627,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' is not a valid date in the '{2}' format." #define STRING_DATE_BAD_WEEKSTART "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'." -#define STRING_DATE_JANUARY_LONG "january" -#define STRING_DATE_FEBRUARY_LONG "february" -#define STRING_DATE_MARCH_LONG "march" -#define STRING_DATE_APRIL_LONG "april" -#define STRING_DATE_MAY_LONG "may" -#define STRING_DATE_JUNE_LONG "june" -#define STRING_DATE_JULY_LONG "july" -#define STRING_DATE_AUGUST_LONG "august" -#define STRING_DATE_SEPTEMBER_LONG "september" -#define STRING_DATE_OCTOBER_LONG "october" -#define STRING_DATE_NOVEMBER_LONG "november" -#define STRING_DATE_DECEMBER_LONG "december" +#define STRING_DATE_JANUARY "january" +#define STRING_DATE_FEBRUARY "february" +#define STRING_DATE_MARCH "march" +#define STRING_DATE_APRIL "april" +#define STRING_DATE_MAY "may" +#define STRING_DATE_JUNE "june" +#define STRING_DATE_JULY "july" +#define STRING_DATE_AUGUST "august" +#define STRING_DATE_SEPTEMBER "september" +#define STRING_DATE_OCTOBER "october" +#define STRING_DATE_NOVEMBER "november" +#define STRING_DATE_DECEMBER "december" -#define STRING_DATE_JANUARY_SHORT "jan" -#define STRING_DATE_FEBRUARY_SHORT "feb" -#define STRING_DATE_MARCH_SHORT "mar" -#define STRING_DATE_APRIL_SHORT "apr" -#define STRING_DATE_MAY_SHORT "may" -#define STRING_DATE_JUNE_SHORT "jun" -#define STRING_DATE_JULY_SHORT "jul" -#define STRING_DATE_AUGUST_SHORT "aug" -#define STRING_DATE_SEPTEMBER_SHORT "sep" -#define STRING_DATE_OCTOBER_SHORT "oct" -#define STRING_DATE_NOVEMBER_SHORT "nov" -#define STRING_DATE_DECEMBER_SHORT "dec" - -#define STRING_DATE_SUNDAY_LONG "sunday" -#define STRING_DATE_MONDAY_LONG "monday" -#define STRING_DATE_TUESDAY_LONG "tuesday" -#define STRING_DATE_WEDNESDAY_LONG "wednesday" -#define STRING_DATE_THURSDAY_LONG "thursday" -#define STRING_DATE_FRIDAY_LONG "friday" -#define STRING_DATE_SATURDAY_LONG "saturday" - -#define STRING_DATE_SUNDAY_SHORT "sun" -#define STRING_DATE_MONDAY_SHORT "mon" -#define STRING_DATE_TUESDAY_SHORT "tue" -#define STRING_DATE_WEDNESDAY_SHORT "wed" -#define STRING_DATE_THURSDAY_SHORT "thu" -#define STRING_DATE_FRIDAY_SHORT "fri" -#define STRING_DATE_SATURDAY_SHORT "sat" +#define STRING_DATE_SUNDAY "sunday" +#define STRING_DATE_MONDAY "monday" +#define STRING_DATE_TUESDAY "tuesday" +#define STRING_DATE_WEDNESDAY "wednesday" +#define STRING_DATE_THURSDAY "thursday" +#define STRING_DATE_FRIDAY "friday" +#define STRING_DATE_SATURDAY "saturday" // dependency #define STRING_DEPEND_BLOCKED "Task {1} is blocked by:" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 4cf64e9f1..c2c22553d 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -627,47 +627,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' ne estas valida dato laŭ stilo '{2}'." #define STRING_DATE_BAD_WEEKSTART "Argorda variablo 'weekstart' devas esti 'Sunday' aŭ 'Monday'." -#define STRING_DATE_JANUARY_LONG "januaro" -#define STRING_DATE_FEBRUARY_LONG "febrero" -#define STRING_DATE_MARCH_LONG "marto" -#define STRING_DATE_APRIL_LONG "aprilo" -#define STRING_DATE_MAY_LONG "majo" -#define STRING_DATE_JUNE_LONG "junio" -#define STRING_DATE_JULY_LONG "julio" -#define STRING_DATE_AUGUST_LONG "aŭgusto" -#define STRING_DATE_SEPTEMBER_LONG "septembro" -#define STRING_DATE_OCTOBER_LONG "oktobro" -#define STRING_DATE_NOVEMBER_LONG "novembro" -#define STRING_DATE_DECEMBER_LONG "decembro" +#define STRING_DATE_JANUARY "januaro" +#define STRING_DATE_FEBRUARY "febrero" +#define STRING_DATE_MARCH "marto" +#define STRING_DATE_APRIL "aprilo" +#define STRING_DATE_MAY "majo" +#define STRING_DATE_JUNE "junio" +#define STRING_DATE_JULY "julio" +#define STRING_DATE_AUGUST "aŭgusto" +#define STRING_DATE_SEPTEMBER "septembro" +#define STRING_DATE_OCTOBER "oktobro" +#define STRING_DATE_NOVEMBER "novembro" +#define STRING_DATE_DECEMBER "decembro" -#define STRING_DATE_JANUARY_SHORT "jan" -#define STRING_DATE_FEBRUARY_SHORT "feb" -#define STRING_DATE_MARCH_SHORT "mar" -#define STRING_DATE_APRIL_SHORT "apr" -#define STRING_DATE_MAY_SHORT "maj" -#define STRING_DATE_JUNE_SHORT "jun" -#define STRING_DATE_JULY_SHORT "jul" -#define STRING_DATE_AUGUST_SHORT "aŭg" -#define STRING_DATE_SEPTEMBER_SHORT "sep" -#define STRING_DATE_OCTOBER_SHORT "okt" -#define STRING_DATE_NOVEMBER_SHORT "nov" -#define STRING_DATE_DECEMBER_SHORT "dec" - -#define STRING_DATE_SUNDAY_LONG "dimanĉo" -#define STRING_DATE_MONDAY_LONG "lundo" -#define STRING_DATE_TUESDAY_LONG "mardo" -#define STRING_DATE_WEDNESDAY_LONG "merkredo" -#define STRING_DATE_THURSDAY_LONG "ĵaŭdo" -#define STRING_DATE_FRIDAY_LONG "vendredo" -#define STRING_DATE_SATURDAY_LONG "sabato" - -#define STRING_DATE_SUNDAY_SHORT "di" -#define STRING_DATE_MONDAY_SHORT "lu" -#define STRING_DATE_TUESDAY_SHORT "ma" -#define STRING_DATE_WEDNESDAY_SHORT "me" -#define STRING_DATE_THURSDAY_SHORT "ĵa" -#define STRING_DATE_FRIDAY_SHORT "ve" -#define STRING_DATE_SATURDAY_SHORT "sa" +#define STRING_DATE_SUNDAY "dimanĉo" +#define STRING_DATE_MONDAY "lundo" +#define STRING_DATE_TUESDAY "mardo" +#define STRING_DATE_WEDNESDAY "merkredo" +#define STRING_DATE_THURSDAY "ĵaŭdo" +#define STRING_DATE_FRIDAY "vendredo" +#define STRING_DATE_SATURDAY "sabato" // dependency #define STRING_DEPEND_BLOCKED "Tasko {1} estas blokata per:" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 0227faed5..c1c18b6b9 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -639,47 +639,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' no es una fecha válida según el formato '{2}'." #define STRING_DATE_BAD_WEEKSTART "La variable de configuración 'weekstart' solamente puede contener 'Sunday' (domingo) o 'Monday' (lunes)." -#define STRING_DATE_JANUARY_LONG "enero" -#define STRING_DATE_FEBRUARY_LONG "febrero" -#define STRING_DATE_MARCH_LONG "marzo" -#define STRING_DATE_APRIL_LONG "abril" -#define STRING_DATE_MAY_LONG "mayo" -#define STRING_DATE_JUNE_LONG "junio" -#define STRING_DATE_JULY_LONG "julio" -#define STRING_DATE_AUGUST_LONG "agosto" -#define STRING_DATE_SEPTEMBER_LONG "septiembre" -#define STRING_DATE_OCTOBER_LONG "octubre" -#define STRING_DATE_NOVEMBER_LONG "noviembre" -#define STRING_DATE_DECEMBER_LONG "diciembre" +#define STRING_DATE_JANUARY "enero" +#define STRING_DATE_FEBRUARY "febrero" +#define STRING_DATE_MARCH "marzo" +#define STRING_DATE_APRIL "abril" +#define STRING_DATE_MAY "mayo" +#define STRING_DATE_JUNE "junio" +#define STRING_DATE_JULY "julio" +#define STRING_DATE_AUGUST "agosto" +#define STRING_DATE_SEPTEMBER "septiembre" +#define STRING_DATE_OCTOBER "octubre" +#define STRING_DATE_NOVEMBER "noviembre" +#define STRING_DATE_DECEMBER "diciembre" -#define STRING_DATE_JANUARY_SHORT "ene" -#define STRING_DATE_FEBRUARY_SHORT "feb" // |esp-ESP|==|eng-USA| -#define STRING_DATE_MARCH_SHORT "mar" // |esp-ESP|==|eng-USA| -#define STRING_DATE_APRIL_SHORT "abr" -#define STRING_DATE_MAY_SHORT "may" // |esp-ESP|==|eng-USA| -#define STRING_DATE_JUNE_SHORT "jun" // |esp-ESP|==|eng-USA| -#define STRING_DATE_JULY_SHORT "jul" // |esp-ESP|==|eng-USA| -#define STRING_DATE_AUGUST_SHORT "ago" -#define STRING_DATE_SEPTEMBER_SHORT "sep" // |esp-ESP|==|eng-USA| -#define STRING_DATE_OCTOBER_SHORT "oct" // |esp-ESP|==|eng-USA| -#define STRING_DATE_NOVEMBER_SHORT "nov" // |esp-ESP|==|eng-USA| -#define STRING_DATE_DECEMBER_SHORT "dic" - -#define STRING_DATE_SUNDAY_LONG "domingo" -#define STRING_DATE_MONDAY_LONG "lunes" -#define STRING_DATE_TUESDAY_LONG "martes" -#define STRING_DATE_WEDNESDAY_LONG "miércoles" -#define STRING_DATE_THURSDAY_LONG "jueves" -#define STRING_DATE_FRIDAY_LONG "viernes" -#define STRING_DATE_SATURDAY_LONG "sábado" - -#define STRING_DATE_SUNDAY_SHORT "dom" -#define STRING_DATE_MONDAY_SHORT "lun" -#define STRING_DATE_TUESDAY_SHORT "mar" -#define STRING_DATE_WEDNESDAY_SHORT "mie" -#define STRING_DATE_THURSDAY_SHORT "jue" -#define STRING_DATE_FRIDAY_SHORT "vie" -#define STRING_DATE_SATURDAY_SHORT "sab" +#define STRING_DATE_SUNDAY "domingo" +#define STRING_DATE_MONDAY "lunes" +#define STRING_DATE_TUESDAY "martes" +#define STRING_DATE_WEDNESDAY "miércoles" +#define STRING_DATE_THURSDAY "jueves" +#define STRING_DATE_FRIDAY "viernes" +#define STRING_DATE_SATURDAY "sábado" // dependency #define STRING_DEPEND_BLOCKED "La tarea {1} está bloqueada por:" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 0425763c2..c4cb66cdc 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -627,47 +627,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' n'est pas une date au format '{2}'." #define STRING_DATE_BAD_WEEKSTART "La variable de configuration 'weekstart' ne peut contenir que 'dimanche' ou 'lundi'." -#define STRING_DATE_JANUARY_LONG "janvier" -#define STRING_DATE_FEBRUARY_LONG "février" -#define STRING_DATE_MARCH_LONG "mars" -#define STRING_DATE_APRIL_LONG "avril" -#define STRING_DATE_MAY_LONG "mai" -#define STRING_DATE_JUNE_LONG "juin" -#define STRING_DATE_JULY_LONG "juillet" -#define STRING_DATE_AUGUST_LONG "août" -#define STRING_DATE_SEPTEMBER_LONG "septembre" -#define STRING_DATE_OCTOBER_LONG "octobre" -#define STRING_DATE_NOVEMBER_LONG "novembre" -#define STRING_DATE_DECEMBER_LONG "décembre" +#define STRING_DATE_JANUARY "janvier" +#define STRING_DATE_FEBRUARY "février" +#define STRING_DATE_MARCH "mars" +#define STRING_DATE_APRIL "avril" +#define STRING_DATE_MAY "mai" +#define STRING_DATE_JUNE "juin" +#define STRING_DATE_JULY "juillet" +#define STRING_DATE_AUGUST "août" +#define STRING_DATE_SEPTEMBER "septembre" +#define STRING_DATE_OCTOBER "octobre" +#define STRING_DATE_NOVEMBER "novembre" +#define STRING_DATE_DECEMBER "décembre" -#define STRING_DATE_JANUARY_SHORT "jan" -#define STRING_DATE_FEBRUARY_SHORT "fév" -#define STRING_DATE_MARCH_SHORT "mar" -#define STRING_DATE_APRIL_SHORT "avr" -#define STRING_DATE_MAY_SHORT "mai" -#define STRING_DATE_JUNE_SHORT "jun" -#define STRING_DATE_JULY_SHORT "jul" -#define STRING_DATE_AUGUST_SHORT "aoû" -#define STRING_DATE_SEPTEMBER_SHORT "sep" -#define STRING_DATE_OCTOBER_SHORT "oct" -#define STRING_DATE_NOVEMBER_SHORT "nov" -#define STRING_DATE_DECEMBER_SHORT "déc" - -#define STRING_DATE_SUNDAY_LONG "dimanche" -#define STRING_DATE_MONDAY_LONG "lundi" -#define STRING_DATE_TUESDAY_LONG "mardi" -#define STRING_DATE_WEDNESDAY_LONG "mercredi" -#define STRING_DATE_THURSDAY_LONG "jeudi" -#define STRING_DATE_FRIDAY_LONG "vendredi" -#define STRING_DATE_SATURDAY_LONG "samedi" - -#define STRING_DATE_SUNDAY_SHORT "dim" -#define STRING_DATE_MONDAY_SHORT "lun" -#define STRING_DATE_TUESDAY_SHORT "mar" -#define STRING_DATE_WEDNESDAY_SHORT "mer" -#define STRING_DATE_THURSDAY_SHORT "jeu" -#define STRING_DATE_FRIDAY_SHORT "ven" -#define STRING_DATE_SATURDAY_SHORT "sam" +#define STRING_DATE_SUNDAY "dimanche" +#define STRING_DATE_MONDAY "lundi" +#define STRING_DATE_TUESDAY "mardi" +#define STRING_DATE_WEDNESDAY "mercredi" +#define STRING_DATE_THURSDAY "jeudi" +#define STRING_DATE_FRIDAY "vendredi" +#define STRING_DATE_SATURDAY "samedi" // dependency #define STRING_DEPEND_BLOCKED "Tâche {1} est bloquée par :" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index cec2fee2b..3e3d8250a 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -626,47 +626,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' non è una data valida nel formato '{2}'." #define STRING_DATE_BAD_WEEKSTART "La variabile di configurazione 'weekstart' può solo contenere 'Domenica' o 'Lunedì'." -#define STRING_DATE_JANUARY_LONG "gennaio" -#define STRING_DATE_FEBRUARY_LONG "febbraio" -#define STRING_DATE_MARCH_LONG "marzo" -#define STRING_DATE_APRIL_LONG "aprile" -#define STRING_DATE_MAY_LONG "maggio" -#define STRING_DATE_JUNE_LONG "giugno" -#define STRING_DATE_JULY_LONG "luglio" -#define STRING_DATE_AUGUST_LONG "agosto" -#define STRING_DATE_SEPTEMBER_LONG "settembre" -#define STRING_DATE_OCTOBER_LONG "ottobre" -#define STRING_DATE_NOVEMBER_LONG "novembre" -#define STRING_DATE_DECEMBER_LONG "decembre" +#define STRING_DATE_JANUARY "gennaio" +#define STRING_DATE_FEBRUARY "febbraio" +#define STRING_DATE_MARCH "marzo" +#define STRING_DATE_APRIL "aprile" +#define STRING_DATE_MAY "maggio" +#define STRING_DATE_JUNE "giugno" +#define STRING_DATE_JULY "luglio" +#define STRING_DATE_AUGUST "agosto" +#define STRING_DATE_SEPTEMBER "settembre" +#define STRING_DATE_OCTOBER "ottobre" +#define STRING_DATE_NOVEMBER "novembre" +#define STRING_DATE_DECEMBER "decembre" -#define STRING_DATE_JANUARY_SHORT "gen" -#define STRING_DATE_FEBRUARY_SHORT "feb" -#define STRING_DATE_MARCH_SHORT "mar" -#define STRING_DATE_APRIL_SHORT "apr" -#define STRING_DATE_MAY_SHORT "mag" -#define STRING_DATE_JUNE_SHORT "giu" -#define STRING_DATE_JULY_SHORT "lug" -#define STRING_DATE_AUGUST_SHORT "ago" -#define STRING_DATE_SEPTEMBER_SHORT "set" -#define STRING_DATE_OCTOBER_SHORT "ott" -#define STRING_DATE_NOVEMBER_SHORT "nov" -#define STRING_DATE_DECEMBER_SHORT "dic" - -#define STRING_DATE_SUNDAY_LONG "domenica" -#define STRING_DATE_MONDAY_LONG "lunedì" -#define STRING_DATE_TUESDAY_LONG "martedì" -#define STRING_DATE_WEDNESDAY_LONG "mercoledì" -#define STRING_DATE_THURSDAY_LONG "giovedì" -#define STRING_DATE_FRIDAY_LONG "venerdì" -#define STRING_DATE_SATURDAY_LONG "sabato" - -#define STRING_DATE_SUNDAY_SHORT "dom" -#define STRING_DATE_MONDAY_SHORT "lun" -#define STRING_DATE_TUESDAY_SHORT "mar" -#define STRING_DATE_WEDNESDAY_SHORT "mer" -#define STRING_DATE_THURSDAY_SHORT "gio" -#define STRING_DATE_FRIDAY_SHORT "ven" -#define STRING_DATE_SATURDAY_SHORT "sab" +#define STRING_DATE_SUNDAY "domenica" +#define STRING_DATE_MONDAY "lunedì" +#define STRING_DATE_TUESDAY "martedì" +#define STRING_DATE_WEDNESDAY "mercoledì" +#define STRING_DATE_THURSDAY "giovedì" +#define STRING_DATE_FRIDAY "venerdì" +#define STRING_DATE_SATURDAY "sabato" // dependency #define STRING_DEPEND_BLOCKED "Il task {1} è bloccato da:" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index b7e59fca4..d34b7407f 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -627,47 +627,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' is not a valid date in the '{2}' format." #define STRING_DATE_BAD_WEEKSTART "The 'weekstart' configuration variable may only contain 'Sunday' or 'Monday'." -#define STRING_DATE_JANUARY_LONG "january" -#define STRING_DATE_FEBRUARY_LONG "february" -#define STRING_DATE_MARCH_LONG "march" -#define STRING_DATE_APRIL_LONG "april" -#define STRING_DATE_MAY_LONG "may" -#define STRING_DATE_JUNE_LONG "june" -#define STRING_DATE_JULY_LONG "july" -#define STRING_DATE_AUGUST_LONG "august" -#define STRING_DATE_SEPTEMBER_LONG "september" -#define STRING_DATE_OCTOBER_LONG "october" -#define STRING_DATE_NOVEMBER_LONG "november" -#define STRING_DATE_DECEMBER_LONG "december" +#define STRING_DATE_JANUARY "january" +#define STRING_DATE_FEBRUARY "february" +#define STRING_DATE_MARCH "march" +#define STRING_DATE_APRIL "april" +#define STRING_DATE_MAY "may" +#define STRING_DATE_JUNE "june" +#define STRING_DATE_JULY "july" +#define STRING_DATE_AUGUST "august" +#define STRING_DATE_SEPTEMBER "september" +#define STRING_DATE_OCTOBER "october" +#define STRING_DATE_NOVEMBER "november" +#define STRING_DATE_DECEMBER "december" -#define STRING_DATE_JANUARY_SHORT "jan" -#define STRING_DATE_FEBRUARY_SHORT "feb" -#define STRING_DATE_MARCH_SHORT "mar" -#define STRING_DATE_APRIL_SHORT "apr" -#define STRING_DATE_MAY_SHORT "may" -#define STRING_DATE_JUNE_SHORT "jun" -#define STRING_DATE_JULY_SHORT "jul" -#define STRING_DATE_AUGUST_SHORT "aug" -#define STRING_DATE_SEPTEMBER_SHORT "sep" -#define STRING_DATE_OCTOBER_SHORT "oct" -#define STRING_DATE_NOVEMBER_SHORT "nov" -#define STRING_DATE_DECEMBER_SHORT "dec" - -#define STRING_DATE_SUNDAY_LONG "sunday" -#define STRING_DATE_MONDAY_LONG "monday" -#define STRING_DATE_TUESDAY_LONG "tuesday" -#define STRING_DATE_WEDNESDAY_LONG "wednesday" -#define STRING_DATE_THURSDAY_LONG "thursday" -#define STRING_DATE_FRIDAY_LONG "friday" -#define STRING_DATE_SATURDAY_LONG "saturday" - -#define STRING_DATE_SUNDAY_SHORT "sun" -#define STRING_DATE_MONDAY_SHORT "mon" -#define STRING_DATE_TUESDAY_SHORT "tue" -#define STRING_DATE_WEDNESDAY_SHORT "wed" -#define STRING_DATE_THURSDAY_SHORT "thu" -#define STRING_DATE_FRIDAY_SHORT "fri" -#define STRING_DATE_SATURDAY_SHORT "sat" +#define STRING_DATE_SUNDAY "sunday" +#define STRING_DATE_MONDAY "monday" +#define STRING_DATE_TUESDAY "tuesday" +#define STRING_DATE_WEDNESDAY "wednesday" +#define STRING_DATE_THURSDAY "thursday" +#define STRING_DATE_FRIDAY "friday" +#define STRING_DATE_SATURDAY "saturday" // dependency #define STRING_DEPEND_BLOCKED "Task {1} is blocked by:" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 72c60e7ff..e2f022d7a 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -627,47 +627,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' nie jest poprawną wartością daty w formacie '{2}'." #define STRING_DATE_BAD_WEEKSTART "Zmienna konfiguracji 'weekstart' może przyjmować tylko wartość 'Sunday' lub 'Monday'." -#define STRING_DATE_JANUARY_LONG "styczeń" -#define STRING_DATE_FEBRUARY_LONG "luty" -#define STRING_DATE_MARCH_LONG "marzec" -#define STRING_DATE_APRIL_LONG "kwiecień" -#define STRING_DATE_MAY_LONG "maj" -#define STRING_DATE_JUNE_LONG "czerwiec" -#define STRING_DATE_JULY_LONG "lipiec" -#define STRING_DATE_AUGUST_LONG "sierpień" -#define STRING_DATE_SEPTEMBER_LONG "wrzesień" -#define STRING_DATE_OCTOBER_LONG "październik" -#define STRING_DATE_NOVEMBER_LONG "listopad" -#define STRING_DATE_DECEMBER_LONG "grudzień" +#define STRING_DATE_JANUARY "styczeń" +#define STRING_DATE_FEBRUARY "luty" +#define STRING_DATE_MARCH "marzec" +#define STRING_DATE_APRIL "kwiecień" +#define STRING_DATE_MAY "maj" +#define STRING_DATE_JUNE "czerwiec" +#define STRING_DATE_JULY "lipiec" +#define STRING_DATE_AUGUST "sierpień" +#define STRING_DATE_SEPTEMBER "wrzesień" +#define STRING_DATE_OCTOBER "październik" +#define STRING_DATE_NOVEMBER "listopad" +#define STRING_DATE_DECEMBER "grudzień" -#define STRING_DATE_JANUARY_SHORT "sty" -#define STRING_DATE_FEBRUARY_SHORT "lut" -#define STRING_DATE_MARCH_SHORT "mar" -#define STRING_DATE_APRIL_SHORT "kwi" -#define STRING_DATE_MAY_SHORT "maj" -#define STRING_DATE_JUNE_SHORT "cze" -#define STRING_DATE_JULY_SHORT "lip" -#define STRING_DATE_AUGUST_SHORT "sie" -#define STRING_DATE_SEPTEMBER_SHORT "wrz" -#define STRING_DATE_OCTOBER_SHORT "paź" -#define STRING_DATE_NOVEMBER_SHORT "lis" -#define STRING_DATE_DECEMBER_SHORT "gru" - -#define STRING_DATE_SUNDAY_LONG "niedziela" -#define STRING_DATE_MONDAY_LONG "poniedziałek" -#define STRING_DATE_TUESDAY_LONG "wtorek" -#define STRING_DATE_WEDNESDAY_LONG "środa" -#define STRING_DATE_THURSDAY_LONG "czwartek" -#define STRING_DATE_FRIDAY_LONG "piątek" -#define STRING_DATE_SATURDAY_LONG "sobota" - -#define STRING_DATE_SUNDAY_SHORT "nie" -#define STRING_DATE_MONDAY_SHORT "pon" -#define STRING_DATE_TUESDAY_SHORT "wto" -#define STRING_DATE_WEDNESDAY_SHORT "śro" -#define STRING_DATE_THURSDAY_SHORT "czw" -#define STRING_DATE_FRIDAY_SHORT "pią" -#define STRING_DATE_SATURDAY_SHORT "sob" +#define STRING_DATE_SUNDAY "niedziela" +#define STRING_DATE_MONDAY "poniedziałek" +#define STRING_DATE_TUESDAY "wtorek" +#define STRING_DATE_WEDNESDAY "środa" +#define STRING_DATE_THURSDAY "czwartek" +#define STRING_DATE_FRIDAY "piątek" +#define STRING_DATE_SATURDAY "sobota" // dependency #define STRING_DEPEND_BLOCKED "Zadanie {1} jest blokowane przez:" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index c3e02efe2..0a31fe41d 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -627,47 +627,26 @@ #define STRING_DATE_INVALID_FORMAT "'{1}' não é uma data válida no formato '{2}'." #define STRING_DATE_BAD_WEEKSTART "A variável de configuração 'weekstart' apenas pode conter 'domingo' ou 'segunda-feira'." -#define STRING_DATE_JANUARY_LONG "janeiro" -#define STRING_DATE_FEBRUARY_LONG "fevereiro" -#define STRING_DATE_MARCH_LONG "março" -#define STRING_DATE_APRIL_LONG "abril" -#define STRING_DATE_MAY_LONG "maio" -#define STRING_DATE_JUNE_LONG "junho" -#define STRING_DATE_JULY_LONG "julho" -#define STRING_DATE_AUGUST_LONG "agosto" -#define STRING_DATE_SEPTEMBER_LONG "setembro" -#define STRING_DATE_OCTOBER_LONG "outubro" -#define STRING_DATE_NOVEMBER_LONG "novembro" -#define STRING_DATE_DECEMBER_LONG "dezembro" +#define STRING_DATE_JANUARY "janeiro" +#define STRING_DATE_FEBRUARY "fevereiro" +#define STRING_DATE_MARCH "março" +#define STRING_DATE_APRIL "abril" +#define STRING_DATE_MAY "maio" +#define STRING_DATE_JUNE "junho" +#define STRING_DATE_JULY "julho" +#define STRING_DATE_AUGUST "agosto" +#define STRING_DATE_SEPTEMBER "setembro" +#define STRING_DATE_OCTOBER "outubro" +#define STRING_DATE_NOVEMBER "novembro" +#define STRING_DATE_DECEMBER "dezembro" -#define STRING_DATE_JANUARY_SHORT "jan" // |por-PRT|==|eng-USA| -#define STRING_DATE_FEBRUARY_SHORT "fev" -#define STRING_DATE_MARCH_SHORT "mar" // |por-PRT|==|eng-USA| -#define STRING_DATE_APRIL_SHORT "abr" -#define STRING_DATE_MAY_SHORT "mai" -#define STRING_DATE_JUNE_SHORT "jun" // |por-PRT|==|eng-USA| -#define STRING_DATE_JULY_SHORT "jul" // |por-PRT|==|eng-USA| -#define STRING_DATE_AUGUST_SHORT "ago" -#define STRING_DATE_SEPTEMBER_SHORT "set" -#define STRING_DATE_OCTOBER_SHORT "out" -#define STRING_DATE_NOVEMBER_SHORT "nov" // |por-PRT|==|eng-USA| -#define STRING_DATE_DECEMBER_SHORT "dez" - -#define STRING_DATE_SUNDAY_LONG "domingo" -#define STRING_DATE_MONDAY_LONG "segunda-feira" -#define STRING_DATE_TUESDAY_LONG "terça-feira" -#define STRING_DATE_WEDNESDAY_LONG "quarta-feira" -#define STRING_DATE_THURSDAY_LONG "quinta-feira" -#define STRING_DATE_FRIDAY_LONG "sexta-feira" -#define STRING_DATE_SATURDAY_LONG "sábado" - -#define STRING_DATE_SUNDAY_SHORT "dom" -#define STRING_DATE_MONDAY_SHORT "seg" -#define STRING_DATE_TUESDAY_SHORT "ter" -#define STRING_DATE_WEDNESDAY_SHORT "qua" -#define STRING_DATE_THURSDAY_SHORT "qui" -#define STRING_DATE_FRIDAY_SHORT "sex" -#define STRING_DATE_SATURDAY_SHORT "sáb" +#define STRING_DATE_SUNDAY "domingo" +#define STRING_DATE_MONDAY "segunda-feira" +#define STRING_DATE_TUESDAY "terça-feira" +#define STRING_DATE_WEDNESDAY "quarta-feira" +#define STRING_DATE_THURSDAY "quinta-feira" +#define STRING_DATE_FRIDAY "sexta-feira" +#define STRING_DATE_SATURDAY "sábado" // dependency #define STRING_DEPEND_BLOCKED "Tarefa {1} encontra-se bloqueada por:"