translations fixes (name clashes)

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@685 416bcca6-2ee7-4201-b75f-2eb2f807beb1

graph.c

@@ -2381,7 +2381,7 @@ byte Effet_Shade(word X,word Y,__attribute__((unused)) byte Couleur)
 
 byte Effet_Quick_shade(word X,word Y,byte Couleur)
 {
-  int color=Couleur=Lit_pixel_dans_ecran_feedback(X,Y);
+  int c=Couleur=Lit_pixel_dans_ecran_feedback(X,Y);
   int Sens=(Fore_color<=Back_color);
   byte start,end;
   int Largeur;
@@ -2397,33 +2397,33 @@ byte Effet_Quick_shade(word X,word Y,byte Couleur)
     end  =Fore_color;
   }
 
-  if ((color>=start) && (color<=end) && (start!=end))
+  if ((c>=start) && (c<=end) && (start!=end))
   {
     Largeur=1+end-start;
 
     if ( ((Shade_Table==Shade_Table_gauche) && Sens) || ((Shade_Table==Shade_Table_droite) && (!Sens)) )
-      color-=Quick_shade_Step%Largeur;
+      c-=Quick_shade_Step%Largeur;
     else
-      color+=Quick_shade_Step%Largeur;
+      c+=Quick_shade_Step%Largeur;
 
-    if (color<start)
+    if (c<start)
       switch (Quick_shade_Loop)
       {
         case MODE_SHADE_NORMAL : return start;
-        case MODE_SHADE_BOUCLE : return (Largeur+color);
+        case MODE_SHADE_BOUCLE : return (Largeur+c);
         default : return Couleur;
       }
 
-    if (color>end)
+    if (c>end)
       switch (Quick_shade_Loop)
       {
         case MODE_SHADE_NORMAL : return end;
-        case MODE_SHADE_BOUCLE : return (color-Largeur);
+        case MODE_SHADE_BOUCLE : return (c-Largeur);
         default : return Couleur;
       }
   }
 
-  return color;
+  return c;
 }
 
   // -- Effet de Tiling --
@@ -2439,88 +2439,88 @@ byte Effet_Tiling(word X,word Y,__attribute__((unused)) byte Couleur)
 byte Effet_Smooth(word X,word Y,__attribute__((unused)) byte Couleur)
 {
   int r,g,b;
-  byte color;
+  byte c;
   int Poids,Poids_total;
   byte X2=((X+1)<Principal_Largeur_image);
   byte Y2=((Y+1)<Principal_Hauteur_image);
 
   // On commence par le pixel central
-  color=Lit_pixel_dans_ecran_feedback(X,Y);
+  c=Lit_pixel_dans_ecran_feedback(X,Y);
   Poids_total=Smooth_Matrice[1][1];
-  r=Poids_total*Principal_Palette[color].R;
-  g=Poids_total*Principal_Palette[color].V;
-  b=Poids_total*Principal_Palette[color].B;
+  r=Poids_total*Principal_Palette[c].R;
+  g=Poids_total*Principal_Palette[c].V;
+  b=Poids_total*Principal_Palette[c].B;
 
   if (X)
   {
-    color=Lit_pixel_dans_ecran_feedback(X-1,Y);
+    c=Lit_pixel_dans_ecran_feedback(X-1,Y);
     Poids_total+=(Poids=Smooth_Matrice[0][1]);
-    r+=Poids*Principal_Palette[color].R;
-    g+=Poids*Principal_Palette[color].V;
-    b+=Poids*Principal_Palette[color].B;
+    r+=Poids*Principal_Palette[c].R;
+    g+=Poids*Principal_Palette[c].V;
+    b+=Poids*Principal_Palette[c].B;
 
     if (Y)
     {
-      color=Lit_pixel_dans_ecran_feedback(X-1,Y-1);
+      c=Lit_pixel_dans_ecran_feedback(X-1,Y-1);
       Poids_total+=(Poids=Smooth_Matrice[0][0]);
-      r+=Poids*Principal_Palette[color].R;
-      g+=Poids*Principal_Palette[color].V;
-      b+=Poids*Principal_Palette[color].B;
+      r+=Poids*Principal_Palette[c].R;
+      g+=Poids*Principal_Palette[c].V;
+      b+=Poids*Principal_Palette[c].B;
 
       if (Y2)
       {
-        color=Lit_pixel_dans_ecran_feedback(X-1,Y+1);
+        c=Lit_pixel_dans_ecran_feedback(X-1,Y+1);
         Poids_total+=(Poids=Smooth_Matrice[0][2]);
-        r+=Poids*Principal_Palette[color].R;
-        g+=Poids*Principal_Palette[color].V;
-        b+=Poids*Principal_Palette[color].B;
+        r+=Poids*Principal_Palette[c].R;
+        g+=Poids*Principal_Palette[c].V;
+        b+=Poids*Principal_Palette[c].B;
       }
     }
   }
 
   if (X2)
   {
-    color=Lit_pixel_dans_ecran_feedback(X+1,Y);
+    c=Lit_pixel_dans_ecran_feedback(X+1,Y);
     Poids_total+=(Poids=Smooth_Matrice[2][1]);
-    r+=Poids*Principal_Palette[color].R;
-    g+=Poids*Principal_Palette[color].V;
-    b+=Poids*Principal_Palette[color].B;
+    r+=Poids*Principal_Palette[c].R;
+    g+=Poids*Principal_Palette[c].V;
+    b+=Poids*Principal_Palette[c].B;
 
     if (Y)
     {
-      color=Lit_pixel_dans_ecran_feedback(X+1,Y-1);
+      c=Lit_pixel_dans_ecran_feedback(X+1,Y-1);
       Poids_total+=(Poids=Smooth_Matrice[2][0]);
-      r+=Poids*Principal_Palette[color].R;
-      g+=Poids*Principal_Palette[color].V;
-      b+=Poids*Principal_Palette[color].B;
+      r+=Poids*Principal_Palette[c].R;
+      g+=Poids*Principal_Palette[c].V;
+      b+=Poids*Principal_Palette[c].B;
 
       if (Y2)
       {
-        color=Lit_pixel_dans_ecran_feedback(X+1,Y+1);
+        c=Lit_pixel_dans_ecran_feedback(X+1,Y+1);
         Poids_total+=(Poids=Smooth_Matrice[2][2]);
-        r+=Poids*Principal_Palette[color].R;
-        g+=Poids*Principal_Palette[color].V;
-        b+=Poids*Principal_Palette[color].B;
+        r+=Poids*Principal_Palette[c].R;
+        g+=Poids*Principal_Palette[c].V;
+        b+=Poids*Principal_Palette[c].B;
       }
     }
   }
 
   if (Y)
   {
-    color=Lit_pixel_dans_ecran_feedback(X,Y-1);
+    c=Lit_pixel_dans_ecran_feedback(X,Y-1);
     Poids_total+=(Poids=Smooth_Matrice[1][0]);
-    r+=Poids*Principal_Palette[color].R;
-    g+=Poids*Principal_Palette[color].V;
-    b+=Poids*Principal_Palette[color].B;
+    r+=Poids*Principal_Palette[c].R;
+    g+=Poids*Principal_Palette[c].V;
+    b+=Poids*Principal_Palette[c].B;
   }
 
   if (Y2)
   {
-    color=Lit_pixel_dans_ecran_feedback(X,Y+1);
+    c=Lit_pixel_dans_ecran_feedback(X,Y+1);
     Poids_total+=(Poids=Smooth_Matrice[1][2]);
-    r+=Poids*Principal_Palette[color].R;
-    g+=Poids*Principal_Palette[color].V;
-    b+=Poids*Principal_Palette[color].B;
+    r+=Poids*Principal_Palette[c].R;
+    g+=Poids*Principal_Palette[c].V;
+    b+=Poids*Principal_Palette[c].B;
   }
 
   return (Poids_total)? // On regarde s'il faut éviter le 0/0.

sdlscreen.c

@@ -143,7 +143,7 @@ void UpdateRect(short X, short Y, unsigned short Largeur, unsigned short Hauteur
 byte * Surface_en_bytefield(SDL_Surface *Source, byte * dest)
 {
   byte *Src;
-  byte *Dst;
+  byte *dest_ptr;
   int Y;
   int Reste;
 
@@ -159,12 +159,12 @@ byte * Surface_en_bytefield(SDL_Surface *Source, byte * dest)
   if (dest==NULL)
     dest=(byte *)malloc(Source->w*Source->h);
 
-  Dst=dest;
+  dest_ptr=dest;
   Src=(byte *)(Source->pixels);
   for(Y=0; Y < Source->h; Y++)
   {
-    memcpy(Dst, Src,Source->w);
-    Dst += Source->w;
+    memcpy(dest_ptr, Src,Source->w);
+    dest_ptr += Source->w;
     Src += Source->w + Reste;
   }
   return dest;

translat/english.txt

@@ -6,7 +6,7 @@ Display_brush_double
 Display_brush_simple
 Display_brush_tall
 Display_brush_wide
-Display_aide
+Display_help
 Display_separator
 Display_bookmark
 Display_selected_cell_color
@@ -1336,324 +1336,322 @@ Write_dword_le
 Write_word_be
 Write_word_le
 A
-AX
-AY
-Preview_is_needed
-Redraw_is_needed
+ax
+ay
+preview_is_needed
+redraw_is_needed
 Adjust_brush_pick
 Display_centered
 Display_choice
 Display_arrow
 Display_image_limits
-Alphabet_daughter
-Alphabet_free
-Alphabet_max
-Alphabet_pile
-Alphabet_pile_pos
-Alphabet_prefix
-Alphabet_sister
-Alphabet_suffix
-Old
-Old_hide_cursor
-Old_offset_X
-Old_offset_Y
-Old_current_gradient
-Old_selected_index
-Old_main_magnifier_mode
-Old_mouse_K
-Old_mouse_X
-Old_mouse_Y
-Old_paintbrush_X
-Old_paintbrush_Y
-Old_main_separator_position
-Old_X
-Old_X_zoom
-Old_Y
-Old_filename
-Old_shade
-Old_zoom_limit
-Old_color
-Old_cursor_shape
-Old_height
-Old_width
+alphabet_daughter
+alphabet_free
+alphabet_max
+alphabet_stack
+alphabet_stack_pos
+alphabet_prefix
+alphabet_sister
+alphabet_suffix
+old
+old_hide_cursor
+old_offset_x
+old_offset_y
+old_current_gradient
+old_selected_index
+old_main_magnifier_mode
+old_mouse_k
+old_mouse_x
+old_mouse_y
+old_paintbrush_x
+old_paintbrush_y
+old_main_separator_position
+old_x
+old_x_zoom
+old_y
+old_filename
+old_shade
+old_zoom_limit
+old_color
+old_cursor_shape
+old_height
+old_width
 Angle
-Anti_alias
-Argument
-Stop_seek
+AntiAlias
+argument
+stop_seek
 Aspect
 Auto_discontinuous
 Auto_nb_used
 Auto_save
 Auto_set_res
-Other_cursor
-Next_to_last_color
+other_cursor
+second_last_color
 B
-B256
-BX
-Back_color_initiale
+b256
+bx
+old_back_color
 Backcol
-Backup_Degrade_Tableau
-Backup_de_l_image_effectue
+backup_gradients
+image_is_backed_up
 Backup_done
-Backup_table
-Bas_visible
-Best
-Best_color
-Best_dist
+backup_table
+bottom_is_visible
+best
+best_color
+best_dist
 Beta1
 Beta2
-Bidon
+dummy
 Bit
 BitPlanes
-Bitmap24B
-Bitmap256
-Blanc
-Bleu
-Bleu_dessous
-Blink
-Bloc_selectionne
-Block_indicateur
+white
+blue
+blue_under
+blink
+block_is_selected
+block_indentifier
 Bmin
 Bold
 Bookmark_directory
 Bookmark_label
-BoutonPas
-Bouton_Cote
-Bouton_Octet_insere
-Bouton_Touche
-Bouton_Used
-Bouton_actif
-Bouton_clicke
-Bouton_preview
-Input_button
-Input_button_Offset_X
-Input_button_Offset_Y
-Input_button_width
-Input_button_X
-Input_button_Y
-Input_button_dX
-Input_button_dY
-Bouton_taille_texte
-Bouton_texte
-BrosseRetour
-Buffer
-Buffer_Undo
-Buffer_resultat
-Buffer_taille
-Buffer_upper
+step_button
+clicked_button
+button_bg_color
+shortcut_button
+button_used
+Active_button
+clicked_button
+preview_button
+input_button
+input_offset_x_button
+input_offset_y_button
+input_width_button
+input_x_button
+input_y_button
+input_dx_button
+input_dy_button
+input_size_button
+input_text_button
+new_brush
+buffer
+undo_buffer
+result_buffer
+size_buffer
+upper_buffer
 Byte
 Bytes_per_plane_line
 C
 C1
 C2
-CFG_Header
-CFG_Infos_touche
-CFG_Mode_video
-CM_Neutre
-CX
-CY
-C_est_X2
-Cacher_curseur_avant_recuperation
-Calcul_X
-Calcul_Y
+cfg_header
+cfg_shortcut_info
+cfg_video_mode
+neutral_color
+cx
+cy
+it_is_x2
+cursor_was_hidden
+computed_x
+computed_y
 Cancel
-Car_1
-Car_2
-Car_3
-Car_4
+char_1
+char_2
+char_3
+char_4
 Carac
 Caractere
-CaracteresInterdits
-Caracteres_a_garder
-Cas_special
-Case_choisie
-Case_temporaire
-Cells_X
-Cells_Y
-Centre_X
-Centre_Y
-Chaine
-Chaine_affichee
-Chaine_en_cours
-Chaine_initiale
-Chaine_preview
-Chaine_temporaire
-Changement_angle
-Changement_de_taille
-Char
+forbidden_char
+nb_char_to_keep
+special_case
+selected_cell
+temp_cell
+cells_X
+cells_y
+center_x
+center_y
+str
+display_string
+current_string
+initial_string
+preview_string
+temp_string
+angle_change
+size_change
+c
 CharPos
-Char_tempo
-Charger_ou_sauver_l_image
+temp_char
+save_or_load_image
 Chemin
-CheminLecteur
-Chemin_courant
-Chemin_icone
-Choix
-Choix_suivant
+drive_path
+current_path
+icon_path
+item
+next_choice
 Clear_palette
 Clear_with_stencil
-Clic
+click
 Click
 Clickable
 Code
-CodeTouche
-Code_Fonction
-Code_ancien
-Coin_X
-Coin_Y
-Col
+key_code
+function_code
+old_code
+corner_x
+corner_y
+color
 Color
 Color_map_entry_size
 Color_map_length
 Color_map_origin
 Color_map_type
 Commentaire
-Commentaire_initial
+initial_comment
 Comp
-Compare
+compare
 Compression
 Compteur
-Compteur_X
-Compteur_Y
-Compteur_de_repetitions
-Config_Dir
-Config_ParentDir
-Confirme
+counter_x
+counter_y
+repetitions
+config_dir
+config_parent_dir
+confirmation
 Contenu
-Conversion_touches
+key_conversion
 Coords_rel
-Coul
-Couleur
-Couleur_1
-Couleur_2
-Couleur_BD
-Couleur_Bas_droite
-Couleur_CBD
-Couleur_CHG
-Couleur_Diagonale
-Couleur_HG
-Couleur_Haut_gauche
-Couleur_S
-Couleur_choisie
-Couleur_de_remplissage
-Couleur_de_taggage
-Couleur_de_transparence
-Couleur_fond
-Couleur_neutre
-Couleur_selectionnee
-Couleur_taggee
-Couleur_temporaire
-Couleur_texte
-Couleur_titre
-Couleur_transparence
+col
+color
+color_1
+color_2
+color_br
+color_bottom_right
+color_brc
+color_tlc
+color_diagonal
+color_tl
+color_top_left
+color_s
+selected_color
+fill_color
+tag_color
+transp_color
+background_color
+neutral_color
+selected_color
+tagged_color
+temp_color
+text_color
+title_color
+transp_color
 Couleurs_separees
-Count
-Curseur
-Curseur_X
+count
+Cursor
+cursor_x
 DX
-D_Pos_X
-D_Pos_Y
-Data_Dir
+dest_x
+dest_y
+data_dir
 Deb_X
 Deb_Y
-Debut
-Debut_Bleu
-Debut_Bloc_1
-Debut_Bloc_2
-Debut_Compteur_X
-Debut_Compteur_Y
-Debut_Rouge
-Debut_Vert
-Debut_X
-Debut_Y
-Debut_block
-Debut_liste
-Debut_menu_X
-Debut_shade
-Decalage
-Decalage_X
-Decalage_Y
-Decalage_calcule
-Decalage_en_X
-Decalage_en_Y
-Decalage_premier
-Decalage_select
-Decalage_temporaire_X
-Decalage_temporaire_Y
-Delai
+Start
+start_blue
+block_1_start
+block_2_start
+start_x_counter
+start_y_counter
+start_red
+start_green
+start_x
+start_y
+block_start
+list_start
+menu_start_x
+start_shade
+Offset
+X_offset
+Y_offset
+computed_offset
+delta_x
+delta_y
+offset_first
+selector_offset
+temp_x_offset
+temp_y_offset
+delay
 Delta
-Delta_R
-Delta_X
-Delta_X2
-Delta_X_dans_brosse
-Delta_Xt
-Delta_Y
-Delta_Y2
-Delta_Y_dans_brosse
-Delta_Yt
-Depart
+delta_r
+delta_x
+delta_x2
+delta_x_in_brush
+delta_xt
+delta_y
+delta_y2
+delta_y_in_brush
+delta_yt
+start
 Depth
 Dernier
-Dernier_X
-Dernier_Y
-Dernier_octet
-Derniere_couleur
-Descente
+last_x
+last_y
+last_byte
+last_color
+descend
 Descriptor
-Dest
+dest
 Destination
-Diff
-Difference
-Difference_H
-Difference_L
-Difference_S
-Dimensions_modifiees
+diff
+difference
+diff_h
+diff_l
+diff_s
+size_is_modified
 Direction
-Dist
-Distance_X
-Distance_Y
-Diviseur
-DriveBits
-Droite_visible
+dist
+distance_x
+distance_y
+divisor
+drive_bits
+right_is_visible
 Dropdown
-Dropdown_bookmark
-Dropdown_des_formats
-Dst
-Dst0
-Dst1
-Dst2
-Dst3
-Dummy
-Dx
-Dy
+bookmark_dropdown
+formats_dropdown
+dest
+dst0
+dst1
+dst2
+dst3
+dummy
+dx
+dy
 EDX
-E_red
-Eclairage_X
-Eclairage_Y
+e_red
+spot_x
+spot_y
 Effacement
-Egal_trouve
-Element_courant
-Element_precedent
-Element_suivant
-Element_suivant_le_suivant
-Element_temporaire
-Ellipse_Limite_High
-Ellipse_Limite_Low
-En_tete
-Enfonce
+equal_found
+current_item
+prev_item
+next_item
+next_to_next_item
+temp_item
+Ellipse_Limit_High
+Ellipse_Limit_Low
+window_title
+Pressed
 Enreg
 Enregistrer
-Entier_temporaire
-EstImage
-EstTrueType
-Etat
-Etat_prec
+temp_int
+Is_bitmap
+Is_truetype
+State
+prev_state
 Explic1
 Explic2
 Explic3
 Extension
 FX_Feedback
-FX_Feedback_Ecran_avant_remplissage
+old_fx_feedback_screen
 Facteur
 Facteur_A
 Facteur_B
@@ -2019,13 +2017,13 @@ Pos_Reel_X
 Pos_Reel_Y
 Pos_X
 Pos_X_dans_brosse
-Pos_X_dest
-Pos_X_dest_final
-Pos_X_dest_initial
+pos_X_dest
+pos_X_dest_final
+pos_X_dest_initial
 Pos_X_initial
 Pos_X_reelle
-Pos_X_src
-Pos_X_src_initial
+pos_X_src
+pos_X_src_initial
 Pos_Y
 Pos_Y_Fin
 Pos_Y_dans_brosse
@@ -2034,7 +2032,7 @@ Pos_fenetre_X
 Pos_fenetre_Y
 Pos_menu_X
 Pos_menu_Y
-Text_X_pos
+text_X_pos
 Position
 Position_X
 Position_curseur_jauge
@@ -2117,8 +2115,8 @@ Round_max
 S
 SCx_Palette
 SVN_revision
-S_Pos_X
-S_Pos_Y
+source_x
+source_y
 Safety_colors
 Saisie_Delay
 Saisie_Init
@@ -2304,7 +2302,7 @@ Vert
 Vert_dessous
 Vertices
 Vitesse
-Vmin
+Gmin
 Vraie_largeur
 Vraie_taille_ligne
 Width
@@ -2382,26 +2380,26 @@ charoffset
 cl
 color
 const
-cosA
+cos_a
 couleur
 cs
 cumul
-cumulR
+cumul_r
 current_dir_path
 cx
 d
 dX
-dX_choisi
-dY_choisi
+dx_selected
+dy_selected
 dans
 dec_b
 dec_r
 dec_g
 decalage
-Offset_left
-Offset_top
-Offset_height
-Offset_width
+offset_left
+offset_top
+offset_height
+offset_width
 decalages
 degrades
 diff
@@ -2456,8 +2454,8 @@ main
 masque
 max
 maxmem
-Best_gradient
-Best_diff
+best_gradient
+best_diff
 me_devname
 me_dummy
 me_mountdir
@@ -2519,7 +2517,7 @@ scancode
 selon
 sep
 sig
-sinA
+sin_a
 sort_by_x
 sr
 stats
@@ -2938,60 +2936,59 @@ SPECIAL_TOP_RIGHT_ATTACHMENT
 SPECIAL_ZOOM_IN
 SPECIAL_ZOOM_OUT
 ICON_TYPES
-Old_Mouse_K2
-Old_Mouse_X2
-Old_Mouse_Y2
-Shade_processed_old
-BY
-Bmp
-Input_button_height
+old_mouse_k2
+old_mouse_x2
+old_mouse_y2
+shade_processed_old
+by
+bmp
+input_button_height
 Choix_debut
-Colonne
-Cumul
-Curseur_Y
+column
+cumul
+cursor_y
 D
-Delta_B
-Delta_G
-E_blue
-E_green
+delta_b
+delta_g
+e_blue
+e_green
 File
 Font
 G
 GUI
-Effective_H
-Dest_height
-Incr_Y
+effective_h
+dest_height
+incr_y
 J
 K
-Limit
-Best_height
-Current_mode
-New_file
-Number
-Offs_Y
-Old_Y
-Old_file
-Total_weight
-Pos_Y_dest
-Pos_Y_dest_final
-Pos_Y_dest_initial
-Pos_Y_src
-Pos_Y_src_initial
-Text_Y_pos
-S_List_of_pages
+limit
+best_height
+current_mode
+new_file
+Nombre
+offs_y
+old_y
+old_file
+total_weight
+pos_y_dest
+pos_y_dest_final
+pos_y_dest_initial
+pos_y_src
+pos_y_src_initial
+text_y_pos
 T
 T2
 T3
-Temp_Y
-Third_Y
-Color_usage
-Real_color
-Real_size
-Xmax
-Ymax
-Ymin
-Ymin_
-Yt
+temp_y
+third_y
+color_usage
+real_color
+real_size
+x_max
+y_max
+y_min
+y_min_
+yt
 b1
 b2
 b3
@@ -3002,8 +2999,8 @@ bmax
 c1
 c2
 counter
-cumulB
-cumulG
+cumul_b
+cumul_g
 dY
 dest
 dev_pattern
@@ -3101,3 +3098,4 @@ T_Help_table
 T_Conversion_table
 T_Occurrence_table
 word
+T_Config

translat/french.txt

@@ -1405,8 +1405,6 @@ Beta2
 Bidon
 Bit
 BitPlanes
-Bitmap24B
-Bitmap256
 Blanc
 Bleu
 Bleu_dessous
@@ -2978,7 +2976,6 @@ Pos_Y_dest_Initiale
 Pos_Y_src
 Pos_Y_src_Initiale
 Pos_texte_Y
-S_Liste_de_pages
 T
 T2
 T3
@@ -3101,3 +3098,4 @@ T_TABLEAIDE
 Table_conversion
 Table_occurence
 word
+T_Config