Changeset - r14169:810f55b8f97a
[Not reviewed]
master
0 7 0
rubidium - 14 years ago 2010-01-04 21:58:47
rubidium@openttd.org
(svn r18727) -Fix [FS#3480]: some invalid gender/plural indices in strings, which could eventually cause crashes.
7 files changed with 20 insertions and 16 deletions:
0 comments (0 inline, 0 general)
src/lang/croatian.txt
Show inline comments
 
@@ -1826,14 +1826,14 @@ STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH
 
STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nije ovlašten
 
STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :primljen je nepoznat paket
 
STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :pogrešna revizija
 
STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :ime se već koristi
 
STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :pogrešna zaporka
 
STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :krivi id tvrtke u DoCommand
 
STR_NETWORK_ERROR_CLIENT_KICKED                                 :izbačen{G "" a o} od strane poslužitelja
 
STR_NETWORK_ERROR_CLIENT_CHEATER                                :je pokuša{G o la lo} varati
 
STR_NETWORK_ERROR_CLIENT_KICKED                                 :izbačen od strane poslužitelja
 
STR_NETWORK_ERROR_CLIENT_CHEATER                                :je pokušao varati
 
STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :poslužitelj je pun
 
############ End of leave-in-this-order
 

	
 
# Network related errors
 
STR_NETWORK_SERVER_MESSAGE                                      :*** {1:STRING}
 
############ Leave those lines in this order!!
src/lang/french.txt
Show inline comments
 
@@ -2468,13 +2468,13 @@ STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Subventions déjà accordées{NBSP}:
 
STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} de {STRING} à {STRING}{YELLOW} ({COMPANY}{YELLOW}, jusqu'à {DATE_SHORT})
 
STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Cliquer sur le service pour centrer la vue sur l'industrie ou la ville. Ctrl-clic pour ouvrir une nouvelle vue sur l'industrie ou la ville
 

	
 
# Station list window
 
STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nom des stations - Cliquer sur un nom pour centrer la vue sur la station. Ctrl-clic pour ouvrir une nouvelle vue sur la station
 
STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Cliquer avec Ctrl pour sélectionner plus d'un élément
 
STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Station{P 2 "" s}
 
STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Station{P 1 "" s}
 
STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 
STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 
STR_STATION_LIST_NONE                                           :{YELLOW}- Aucun -
 
STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Tous les types de station
 
STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Tous les types de marchandise (y compris pas en attente)
 
STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Pas de marchandises en attente
src/lang/greek.txt
Show inline comments
 
@@ -1110,13 +1110,13 @@ STR_DIFFICULTY_LEVEL_SETTING_CITY_APPROVAL                      :{LTBLUE}Θέση δημοτικού συμβουλίου σχετικά με την αναδόμηση της περιοχής: {ORANGE}{STRING}
 

	
 
STR_NONE                                                        :Κανένα
 
STR_NUM_VERY_LOW                                                :Πολύ χαμηλό
 
STR_NUM_LOW                                                     :Χαμηλό
 
STR_NUM_NORMAL                                                  :Κανονικό
 
STR_NUM_HIGH                                                    :Υψηλό
 
STR_NUM_CUSTOM                                                  :Προσαρμοσμέν{G ος η ο}
 
STR_NUM_CUSTOM                                                  :Προσαρμοσμένος
 

	
 
STR_VARIETY_NONE                                                :Καθόλου
 
STR_VARIETY_VERY_LOW                                            :Πολύ Χαμηλό
 
STR_VARIETY_LOW                                                 :Χαμηλό
 
STR_VARIETY_MEDIUM                                              :Μέτριο
 
STR_VARIETY_HIGH                                                :Υψηλό
 
@@ -2528,13 +2528,13 @@ STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :Μετονομασία Πόλης
 
STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}Τοπική αρχή της πόλης {TOWN}
 
STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Ποσοστά εταιρίας μεταφορών:
 
STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 
STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Διαθέσιμες πράξεις:
 
STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Λίστα πραγμάτων που πρέπει να γίνουν σε αυτή την πόλη - κάντε κλικ στο αντικείμενο για πληροφορίες
 
STR_LOCAL_AUTHORITY_DO_IT_BUTTON                                :{BLACK}Κάνε το
 
STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Διενέργεια της επιλεγμένης πράξης στην παραπάνω λίστα
 
STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Διενέργεια της επιλεγμέ�ης πράξης στην παραπάνω λίστα
 

	
 
STR_LOCAL_AUTHORITY_ACTION_SMALL_ADVERTISING_CAMPAIGN           :Μικρή διαφημιστική καμπάνια
 
STR_LOCAL_AUTHORITY_ACTION_MEDIUM_ADVERTISING_CAMPAIGN          :Μεσαία διαφημιστική καμπάνια
 
STR_LOCAL_AUTHORITY_ACTION_LARGE_ADVERTISING_CAMPAIGN           :Μεγάλη διαφημιστική καμπάνια
 
STR_LOCAL_AUTHORITY_ACTION_ROAD_RECONSTRUCTION                  :Επιχορήγηση ανακατασκευής τοπικού οδικού δικτύου
 
STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY                    :Χτίσιμο αγάλματος ιδιοκτήτη εταιρίας
src/lang/italian.txt
Show inline comments
 
@@ -2469,13 +2469,13 @@ STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Servizi già sovvenzionati:
 
STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} da {STRING} a {STRING}{YELLOW} ({COMPANY}{YELLOW}, fino al {DATE_SHORT})
 
STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Fare clic su un servizio per centrare la visuale sull'industria o città. CTRL+clic mostra l'industria/città in una mini visuale.
 

	
 
# Station list window
 
STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nomi delle stazioni - fare clic su un nome per centrare la visuale sulla stazione. CTRL+clic la mostra in una mini visuale.
 
STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Tenere premuto CTRL per selezionare più di un elemento
 
STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} stazion{P 2 e i}
 
STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} stazion{P 1 e i}
 
STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 
STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 
STR_STATION_LIST_NONE                                           :{YELLOW}- Nessuna -
 
STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleziona tuti i fabbricati
 
STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Seleziona tutti i tipi di merce (comprese le merci non in attesa)
 
STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Non c'è nessun tipo di merce in attesa
 
@@ -2622,16 +2622,16 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO        
 
STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Produce: {YELLOW}{STRING}{STRING}, {STRING}{STRING}
 
############ range for produces ends
 

	
 
STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambia produzione (multiplo di 8, fino a 2040)
 

	
 
# Vehicle lists
 
STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} tren{P 2 o i}
 
STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} automezz{P 2 o i}
 
STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} nav{P 2 e i}
 
STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} aeromobil{P 2 e i}
 
STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} tren{P 1 o i}
 
STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} automezz{P 1 o i}
 
STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} nav{P 1 e i}
 
STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} aeromobil{P 1 e i}
 

	
 
STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Treni - fare clic su un treno per informazioni
 
STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automezzi - fare clic su un veicolo per informazioni
 
STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Navi - fare clic su una nave per informazioni
 
STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeromobili - fare clic su un aeromobile per informazioni
 

	
src/lang/korean.txt
Show inline comments
 
@@ -2352,17 +2352,17 @@ STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}사용 가능한 NewGRF 파일 목록을 업데이트합니다
 
STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
 
STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}경고: {SILVER}{STRING}
 
STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}오류: {SILVER}{STRING}
 
STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}치명적 오류: {SILVER}{STRING}
 
STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}치명적인 NewGRF 오류가 발생했습니다: {}{STRING}
 
STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING}은 OpenTTD에서 보고된 TTD패치 버전에서 작동하지 않을 것입니다.
 
STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING}{G 0 "은" "는"} {STRING} 버전의 TTD를 위한 것입니다.
 
STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING}{G 0 "은" "는"} {STRING}{G 1 "와" "과"} 같이 사용해야 합니다
 
STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING}{G 1 "은" "는"} {STRING} 버전의 TTD를 위한 것입니다.
 
STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING}{G 1 "은" "는"} {STRING}{G 1 "와" "과"} 같이 사용해야 합니다
 
STR_NEWGRF_ERROR_INVALID_PARAMETER                              :{1:STRING}의 부적절한 파라미터: 파라미터 {STRING} ({NUM})
 
STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING}{G 0 "은" "는"} 반드시 {STRING} 앞에 불러와야 합니다.
 
STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING}{G 0 "은" "는"} 반드시 {STRING} 뒤에 불러와야 합니다.
 
STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING}{G 1 "은" "는"} 반드시 {STRING} 앞에 불러와야 합니다.
 
STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING}{G 1 "은" "는"} 반드시 {STRING} 뒤에 불러와야 합니다.
 
STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING}는 OpenTTD {STRING} 버전이나 그 이상이 필요합니다.
 
STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF 파일 자체는 번역용으로 디자인됨
 
STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :NewGRF이 너무 많습니다.
 
STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{1:STRING}{G 1 "을" "를"} 포함한 정적 NewGRF {0:STRING}{G 0 "을" "를"} 불러오는 것은 비동기화를 일으킬 수 있습니다.
 
STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :예기치 않은 스프라이트
 
STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :알수없는 액션 0 속성
src/lang/russian.txt
Show inline comments
 
@@ -1393,13 +1393,13 @@ STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :{LTBLUE}Использовать ограничение скорости у вагонов (если есть): {ORANGE}{STRING}
 
STR_CONFIG_SETTING_DISABLE_ELRAILS                              :{LTBLUE}Выключить электрифицированную железную дорогу: {ORANGE}{STRING}
 

	
 
STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :{LTBLUE}Цветные газеты появляются {ORANGE}в {STRING} году
 
STR_CONFIG_SETTING_STARTING_YEAR                                :{LTBLUE}Год начала игры: {ORANGE}{STRING}
 
STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}Включить плавную экономику (частые, небольшие изменения): {ORANGE}{STRING}
 
STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}Разрешить торговлю акциями других компаний: {ORANGE}{STRING}
 
STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}При установке светофоров линией, ставить кажд{P 1 ую ые ые}: {ORANGE}{STRING} клет{P 1 ку ки ок}
 
STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}При установке светофоров линией, ставить кажд{P 0 ую ые ые}: {ORANGE}{STRING} клет{P ку ки ок}
 
STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Строить семафоры старого стиля: {ORANGE}до {STRING} года
 
STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Включить меню выбора сигналов: {ORANGE}{STRING}
 
STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Тип сигналов по умолчанию: {ORANGE}{STRING}
 
STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :обычные
 
STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :маршрутные
 
STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :одностор. маршрутные
src/strgen/strgen.cpp
Show inline comments
 
@@ -962,13 +962,17 @@ static int TranslateArgumentIdx(int argi
 

	
 
	if (argidx < 0 || (uint)argidx >= lengthof(_cur_pcs.cmd)) {
 
		error("invalid argidx %d", argidx);
 
	}
 
	const CmdStruct *cs = _cur_pcs.cmd[argidx];
 
	if (cs != NULL && cs->consumes <= offset) {
 
		error("invalid argidx offset %d:%d\n", argidx, offset);
 
		error("invalid argidx offset %d:%d", argidx, offset);
 
	}
 

	
 
	if (_cur_pcs.cmd[argidx] == NULL) {
 
		error("no command for this argidx %d", argidx);
 
	}
 

	
 
	for (int i = sum = 0; i < argidx; i++) {
 
		const CmdStruct *cs = _cur_pcs.cmd[i];
 

	
 
		sum += (cs != NULL) ? cs->consumes : 1;
0 comments (0 inline, 0 general)