Index: dll/win32/shimgvw/comsup.c =================================================================== --- dll/win32/shimgvw/comsup.c (revision 71513) +++ dll/win32/shimgvw/comsup.c (working copy) @@ -1,7 +1,7 @@ #define INITGUID #include -#include +#include "comsup.h" LONG LockCount; LONG ObjectCount; Index: dll/win32/shimgvw/lang/bg-BG.rc =================================================================== --- dll/win32/shimgvw/lang/bg-BG.rc (revision 71513) +++ dll/win32/shimgvw/lang/bg-BG.rc (working copy) @@ -2,18 +2,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Прегледът за снимки и факсове на РеактОС" - IDS_SETASDESKBG "Слагане като подкраска" - IDS_PREVIEW "Преглед" + IDS_APPTITLE "Прегледът за снимки и факсове на РеактОС" + IDS_SETASDESKBG "Слагане като подкраска" + IDS_PREVIEW "Преглед" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Следващо изображение" - IDS_TOOLTIP_PREV_PIC "Предходно изображение" - IDS_TOOLTIP_ZOOM_IN "Увеличаване (+)" - IDS_TOOLTIP_ZOOM_OUT "Намаляване (-)" - IDS_TOOLTIP_ROT_CLOCKW "Завъртане по часовника (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Завъртане срещу часовника (Ctrl+L)" - IDS_TOOLTIP_PRINT "Разпечатване (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Записване като... (Ctrl+S)" + IDS_TOOLTIP_PREV "Предходно изображение (left arrow)" + IDS_TOOLTIP_NEXT "Следващо изображение (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Увеличаване (+)" + IDS_TOOLTIP_ZOOMM "Намаляване (-)" + IDS_TOOLTIP_ROT1 "Завъртане по часовника (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Завъртане срещу часовника (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Разпечатване (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Записване като... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/cs-CZ.rc =================================================================== --- dll/win32/shimgvw/lang/cs-CZ.rc (revision 71513) +++ dll/win32/shimgvw/lang/cs-CZ.rc (working copy) @@ -7,18 +7,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS prohlížeč obrázků a faxů" - IDS_SETASDESKBG "Nastavit jako pozadí plochy" - IDS_PREVIEW "Náhled" + IDS_APPTITLE "ReactOS prohlížeč obrázků a faxů" + IDS_SETASDESKBG "Nastavit jako pozadí plochy" + IDS_PREVIEW "Náhled" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Další obrázek" - IDS_TOOLTIP_PREV_PIC "Předchozí obrázek" - IDS_TOOLTIP_ZOOM_IN "Přiblížit (+)" - IDS_TOOLTIP_ZOOM_OUT "Oddálit (-)" - IDS_TOOLTIP_ROT_CLOCKW "Otočit po směru hodinových ručiček (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Otočit proti směru hodinových ručiček (Ctrl+L)" - IDS_TOOLTIP_PRINT "Tisk (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Uložit jako... (Ctrl+S)" + IDS_TOOLTIP_PREV "Předchozí obrázek (left arrow)" + IDS_TOOLTIP_NEXT "Další obrázek (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Přiblížit (+)" + IDS_TOOLTIP_ZOOMM "Oddálit (-)" + IDS_TOOLTIP_ROT1 "Otočit po směru hodinových ručiček (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Otočit proti směru hodinových ručiček (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Tisk (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Uložit jako... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/de-DE.rc =================================================================== --- dll/win32/shimgvw/lang/de-DE.rc (revision 71513) +++ dll/win32/shimgvw/lang/de-DE.rc (working copy) @@ -2,18 +2,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS-Bild- und Faxansicht" - IDS_SETASDESKBG "Als Desktophintergrund setzen" - IDS_PREVIEW "Vorschau" + IDS_APPTITLE "ReactOS-Bild- und Faxansicht" + IDS_SETASDESKBG "Als Desktophintergrund setzen" + IDS_PREVIEW "Vorschau" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Nächstes Bild" - IDS_TOOLTIP_PREV_PIC "Vorheriges Bild" - IDS_TOOLTIP_ZOOM_IN "Vergrößern (+)" - IDS_TOOLTIP_ZOOM_OUT "Verkleinern (-)" - IDS_TOOLTIP_ROT_CLOCKW "Drehen im Uhrzeigersinn (Strg+K)" - IDS_TOOLTIP_ROT_COUNCW "Drehen gegen den Uhrzeigersinn (Strg+L)" - IDS_TOOLTIP_PRINT "Drucken (Strg+P)" - IDS_TOOLTIP_SAVEAS "Speichern unter... (Strg+S)" + IDS_TOOLTIP_PREV "Vorheriges Bild (left arrow)" + IDS_TOOLTIP_NEXT "Nächstes Bild (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Vergrößern (+)" + IDS_TOOLTIP_ZOOMM "Verkleinern (-)" + IDS_TOOLTIP_ROT1 "Drehen im Uhrzeigersinn (Strg+K)" + IDS_TOOLTIP_ROT2 "Drehen gegen den Uhrzeigersinn (Strg+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Drucken (Strg+P)" + IDS_TOOLTIP_SAVEAS "Speichern unter... (Strg+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/en-US.rc =================================================================== --- dll/win32/shimgvw/lang/en-US.rc (revision 71513) +++ dll/win32/shimgvw/lang/en-US.rc (working copy) @@ -2,18 +2,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS Picture and Fax Viewer" - IDS_SETASDESKBG "Set as Desktop Background" - IDS_PREVIEW "Preview" + IDS_APPTITLE "ReactOS Picture and Fax Viewer" + IDS_SETASDESKBG "Set as Desktop Background" + IDS_PREVIEW "Preview" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Next Picture" - IDS_TOOLTIP_PREV_PIC "Previous Picture" - IDS_TOOLTIP_ZOOM_IN "Zoom In (+)" - IDS_TOOLTIP_ZOOM_OUT "Zoom Out (-)" - IDS_TOOLTIP_ROT_CLOCKW "Rotate Clockwise (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Rotate Counterclockwise (Ctrl+L)" - IDS_TOOLTIP_PRINT "Print (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Save As... (Ctrl+S)" + IDS_TOOLTIP_PREV "Previous Picture (left arrow)" + IDS_TOOLTIP_NEXT "Next Picture (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Zoom In (+)" + IDS_TOOLTIP_ZOOMM "Zoom Out (-)" + IDS_TOOLTIP_ROT1 "Rotate Clockwise (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Rotate Counterclockwise (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Print (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Save As... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/es-ES.rc =================================================================== --- dll/win32/shimgvw/lang/es-ES.rc (revision 71513) +++ dll/win32/shimgvw/lang/es-ES.rc (working copy) @@ -4,18 +4,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Visor de imágenes y fax de ReactOS" - IDS_SETASDESKBG "Establecer como fondo de escritorio" - IDS_PREVIEW "Vista previa" + IDS_APPTITLE "Visor de imágenes y fax de ReactOS" + IDS_SETASDESKBG "Establecer como fondo de escritorio" + IDS_PREVIEW "Vista previa" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Siguiente imagen" - IDS_TOOLTIP_PREV_PIC "Imagen anterior" - IDS_TOOLTIP_ZOOM_IN "Acercar (+)" - IDS_TOOLTIP_ZOOM_OUT "Alejar (-)" - IDS_TOOLTIP_ROT_CLOCKW "Rotar en el sentido de las agujas del reloj (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Rotar en el sentido opuesto a las agujas del reloj (Ctrl+L)" - IDS_TOOLTIP_PRINT "Imprimir (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Guardar como... (Ctrl+S)" + IDS_TOOLTIP_PREV "Imagen anterior (left arrow)" + IDS_TOOLTIP_NEXT "Siguiente imagen (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Acercar (+)" + IDS_TOOLTIP_ZOOMM "Alejar (-)" + IDS_TOOLTIP_ROT1 "Rotar en el sentido de las agujas del reloj (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Rotar en el sentido opuesto a las agujas del reloj (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Imprimir (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Guardar como... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/fr-FR.rc =================================================================== --- dll/win32/shimgvw/lang/fr-FR.rc (revision 71513) +++ dll/win32/shimgvw/lang/fr-FR.rc (working copy) @@ -2,18 +2,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Visionneuse d'Images et Fax de ReactOS" - IDS_SETASDESKBG "Définir comme Arrière-plan du Bureau" - IDS_PREVIEW "Aperçu" + IDS_APPTITLE "Visionneuse d'Images et Fax de ReactOS" + IDS_SETASDESKBG "Définir comme Arrière-plan du Bureau" + IDS_PREVIEW "Aperçu" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Image Suivante" - IDS_TOOLTIP_PREV_PIC "Image Précédente" - IDS_TOOLTIP_ZOOM_IN "Augmenter (+)" - IDS_TOOLTIP_ZOOM_OUT "Diminuer (-)" - IDS_TOOLTIP_ROT_CLOCKW "Tourner dans le sens des aiguilles d'une montre (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Tourner dans le sens opposé des aiguilles d'une montre (Ctrl+L)" - IDS_TOOLTIP_PRINT "Imprimer (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Enregistrer sous... (Ctrl+S)" + IDS_TOOLTIP_PREV "Image Précédente (left arrow)" + IDS_TOOLTIP_NEXT "Image Suivante (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Augmenter (+)" + IDS_TOOLTIP_ZOOMM "Diminuer (-)" + IDS_TOOLTIP_ROT1 "Tourner dans le sens des aiguilles d'une montre (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Tourner dans le sens opposé des aiguilles d'une montre (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Imprimer (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Enregistrer sous... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/he-IL.rc =================================================================== --- dll/win32/shimgvw/lang/he-IL.rc (revision 71513) +++ dll/win32/shimgvw/lang/he-IL.rc (working copy) @@ -2,18 +2,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "מציג התמונות והפקסים של ReactOS" - IDS_SETASDESKBG "קבע כרקע שולחן עבודה" - IDS_PREVIEW "תצוגה מקדימה" + IDS_APPTITLE "מציג התמונות והפקסים של ReactOS" + IDS_SETASDESKBG "קבע כרקע שולחן עבודה" + IDS_PREVIEW "תצוגה מקדימה" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "התמונה הבאה" - IDS_TOOLTIP_PREV_PIC "התמונה הקודמת" - IDS_TOOLTIP_ZOOM_IN "הגדלה (+)" - IDS_TOOLTIP_ZOOM_OUT "הרחקה (-)" - IDS_TOOLTIP_ROT_CLOCKW "סובב עם כיוון השעון (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "סובב כנגד כיוון השעון (Ctrl+L)" - IDS_TOOLTIP_PRINT "הדפס (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "שמירה בשם... (Ctrl+S)" + IDS_TOOLTIP_PREV "התמונה הקודמת (left arrow)" + IDS_TOOLTIP_NEXT "התמונה הבאה (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "הגדלה (+)" + IDS_TOOLTIP_ZOOMM "הרחקה (-)" + IDS_TOOLTIP_ROT1 "סובב עם כיוון השעון (Ctrl+K)" + IDS_TOOLTIP_ROT2 "סובב כנגד כיוון השעון (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "הדפס (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "שמירה בשם... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/it-IT.rc =================================================================== --- dll/win32/shimgvw/lang/it-IT.rc (revision 71513) +++ dll/win32/shimgvw/lang/it-IT.rc (working copy) @@ -2,27 +2,33 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Visualizzatore immagini e fax di ReactOS" - IDS_SETASDESKBG "Imposta come sfondo del desktop" - IDS_PREVIEW "Anteprima" + IDS_APPTITLE "Visualizzatore immagini e fax di ReactOS" + IDS_SETASDESKBG "Imposta come sfondo del desktop" + IDS_PREVIEW "Anteprima" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Immagine successiva" - IDS_TOOLTIP_PREV_PIC "Immagine precedente" - IDS_TOOLTIP_ZOOM_IN "Zoom avanti (+)" - IDS_TOOLTIP_ZOOM_OUT "Zoom indietro (-)" - IDS_TOOLTIP_ROT_CLOCKW "Ruotare in senso orario (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Ruotare in senso antiorario (Ctrl+L)" - IDS_TOOLTIP_PRINT "Stampare (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Salva in... (Ctrl+S)" + IDS_TOOLTIP_PREV "Immagine precedente (Freccia sinistra)" + IDS_TOOLTIP_NEXT "Immagine successiva (Freccia destra)" + IDS_TOOLTIP_BEST_FIT "Adatta alla finestra (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Dimensione effettiva (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Avvia presentazione (F11)" + IDS_TOOLTIP_ZOOMP "Ingrandisci (+)" + IDS_TOOLTIP_ZOOMM "Riduci (-)" + IDS_TOOLTIP_ROT1 "Ruota in senso orario (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Ruota in senso antiorario (Ctrl+L)" + IDS_TOOLTIP_DELETE "Elimina (CANC)" + IDS_TOOLTIP_PRINT "Stampa (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Salva come... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modifica (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Guida in linea (F1)" END STRINGTABLE BEGIN - IDS_EMF_FILE "EMF Image" - IDS_GIF_FILE "GIF Image" - IDS_JPG_FILE "JPEG Image" - IDS_BMP_FILE "Bitmap Image" - IDS_PNG_FILE "PNG Image" - IDS_TIF_FILE "TIF Image" - IDS_WMF_FILE "WMF Image" + IDS_EMF_FILE "Immagine EMF" + IDS_GIF_FILE "Immagine GIF" + IDS_JPG_FILE "Immagine JPEG" + IDS_BMP_FILE "Immagine Bitmap" + IDS_PNG_FILE "Immagine PNG" + IDS_TIF_FILE "Immagine TIF" + IDS_WMF_FILE "Immagine WMF" END Index: dll/win32/shimgvw/lang/lt-LT.rc =================================================================== --- dll/win32/shimgvw/lang/lt-LT.rc (revision 71513) +++ dll/win32/shimgvw/lang/lt-LT.rc (working copy) @@ -4,18 +4,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS paveikslėlių ir faksogramų peržiūros programa" - IDS_SETASDESKBG "Nustatyti kaip darbalaukio foną" - IDS_PREVIEW "Preview" + IDS_APPTITLE "ReactOS paveikslėlių ir faksogramų peržiūros programa" + IDS_SETASDESKBG "Nustatyti kaip darbalaukio foną" + IDS_PREVIEW "Preview" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Tolesnis paveikslėlis" - IDS_TOOLTIP_PREV_PIC "Ankstesnis paveikslėlis" - IDS_TOOLTIP_ZOOM_IN "Didinti (+)" - IDS_TOOLTIP_ZOOM_OUT "Mažinti (-)" - IDS_TOOLTIP_ROT_CLOCKW "Pasukti pagal laikrodžio rodyklę (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Pasukti prieš laikrodžio rodyklę (Ctrl+L)" - IDS_TOOLTIP_PRINT "Spausdinti (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Įrašyti kaip... (Ctrl+S)" + IDS_TOOLTIP_PREV "Ankstesnis paveikslėlis (left arrow)" + IDS_TOOLTIP_NEXT "Tolesnis paveikslėlis (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Didinti (+)" + IDS_TOOLTIP_ZOOMM "Mažinti (-)" + IDS_TOOLTIP_ROT1 "Pasukti pagal laikrodžio rodyklę (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Pasukti prieš laikrodžio rodyklę (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Spausdinti (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Įrašyti kaip... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/no-NO.rc =================================================================== --- dll/win32/shimgvw/lang/no-NO.rc (revision 71513) +++ dll/win32/shimgvw/lang/no-NO.rc (working copy) @@ -2,18 +2,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS bilde og Faks Viser" - IDS_SETASDESKBG "Sett som skrivebord bakgrunn" - IDS_PREVIEW "Skriv ut" + IDS_APPTITLE "ReactOS bilde og Faks Viser" + IDS_SETASDESKBG "Sett som skrivebord bakgrunn" + IDS_PREVIEW "Skriv ut" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Neste bilde" - IDS_TOOLTIP_PREV_PIC "Forrige bilde" - IDS_TOOLTIP_ZOOM_IN "Forstørre (+)" - IDS_TOOLTIP_ZOOM_OUT "Forminske (-)" - IDS_TOOLTIP_ROT_CLOCKW "Med urviseren (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Dreie mot urviseren (Ctrl+L)" - IDS_TOOLTIP_PRINT "Skriv ut (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Lagre som... (Ctrl+S)" + IDS_TOOLTIP_PREV "Forrige bilde (left arrow)" + IDS_TOOLTIP_NEXT "Neste bilde" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Forstørre (+)" + IDS_TOOLTIP_ZOOMM "Forminske (-)" + IDS_TOOLTIP_ROT1 "Med urviseren (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Dreie mot urviseren (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Skriv ut (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Lagre som... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/pl-PL.rc =================================================================== --- dll/win32/shimgvw/lang/pl-PL.rc (revision 71513) +++ dll/win32/shimgvw/lang/pl-PL.rc (working copy) @@ -7,18 +7,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Przeglądarka obrazów i faksów ReactOS" - IDS_SETASDESKBG "Ustaw jako tło pulpitu" - IDS_PREVIEW "Podgląd" + IDS_APPTITLE "Przeglądarka obrazów i faksów ReactOS" + IDS_SETASDESKBG "Ustaw jako tło pulpitu" + IDS_PREVIEW "Podgląd" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Następny obraz" - IDS_TOOLTIP_PREV_PIC "Poprzedni obraz" - IDS_TOOLTIP_ZOOM_IN "Powiększ (+)" - IDS_TOOLTIP_ZOOM_OUT "Pomniejsz (-)" - IDS_TOOLTIP_ROT_CLOCKW "Obróć zgodnie z ruchem wskazówek zegara (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Obróć przeciwnie do ruchu wskazówek zegara (Ctrl+L)" - IDS_TOOLTIP_PRINT "Drukuj (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Zapisz jako... (Ctrl+S)" + IDS_TOOLTIP_PREV "Poprzedni obraz (left arrow)" + IDS_TOOLTIP_NEXT "Następny obraz" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Powiększ (+)" + IDS_TOOLTIP_ZOOMM "Pomniejsz (-)" + IDS_TOOLTIP_ROT1 "Obróć zgodnie z ruchem wskazówek zegara (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Obróć przeciwnie do ruchu wskazówek zegara (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Drukuj (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Zapisz jako... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/ro-RO.rc =================================================================== --- dll/win32/shimgvw/lang/ro-RO.rc (revision 71513) +++ dll/win32/shimgvw/lang/ro-RO.rc (working copy) @@ -9,18 +9,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Vizualizare fax și imagini" - IDS_SETASDESKBG "Plasează ca decor de fundal" - IDS_PREVIEW "Previzionare" + IDS_APPTITLE "Vizualizare fax și imagini" + IDS_SETASDESKBG "Plasează ca decor de fundal" + IDS_PREVIEW "Previzionare" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Imaginea următare" - IDS_TOOLTIP_PREV_PIC "Imaginea precedentă" - IDS_TOOLTIP_ZOOM_IN "Mărire (+)" - IDS_TOOLTIP_ZOOM_OUT "Micșorare (-)" - IDS_TOOLTIP_ROT_CLOCKW "Rotire în sens orar (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Rotire în sens antiorar (Ctrl+L)" - IDS_TOOLTIP_PRINT "Imprimă (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Păstrare în… (Ctrl+S)" + IDS_TOOLTIP_PREV "Imaginea precedentă (left arrow)" + IDS_TOOLTIP_NEXT "Imaginea următare" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Mărire (+)" + IDS_TOOLTIP_ZOOMM "Micșorare (-)" + IDS_TOOLTIP_ROT1 "Rotire în sens orar (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Rotire în sens antiorar (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Imprimă (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Păstrare în… (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/ru-RU.rc =================================================================== --- dll/win32/shimgvw/lang/ru-RU.rc (revision 71513) +++ dll/win32/shimgvw/lang/ru-RU.rc (working copy) @@ -2,18 +2,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Программа просмотра изображений и факсов" - IDS_SETASDESKBG "Установить как фон рабочего стола" - IDS_PREVIEW "Предпросмотр" + IDS_APPTITLE "Программа просмотра изображений и факсов" + IDS_SETASDESKBG "Установить как фон рабочего стола" + IDS_PREVIEW "Предпросмотр" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Следующее изображение" - IDS_TOOLTIP_PREV_PIC "Предыдущее изображение" - IDS_TOOLTIP_ZOOM_IN "Увеличить (+)" - IDS_TOOLTIP_ZOOM_OUT "Уменьшить (-)" - IDS_TOOLTIP_ROT_CLOCKW "Повернуть по часовой стрелке (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Повернуть против часовой стрелки (Ctrl+L)" - IDS_TOOLTIP_PRINT "Печать (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Сохранить как... (Ctrl+S)" + IDS_TOOLTIP_PREV "Предыдущее изображение (left arrow)" + IDS_TOOLTIP_NEXT "Следующее изображение" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Увеличить (+)" + IDS_TOOLTIP_ZOOMM "Уменьшить (-)" + IDS_TOOLTIP_ROT1 "Повернуть по часовой стрелке (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Повернуть против часовой стрелки (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Печать (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Сохранить как... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/sk-SK.rc =================================================================== --- dll/win32/shimgvw/lang/sk-SK.rc (revision 71513) +++ dll/win32/shimgvw/lang/sk-SK.rc (working copy) @@ -6,18 +6,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Zobrazovač obrázkov a faxov systému ReactOS" - IDS_SETASDESKBG "Nastaviť ako pozadie pracovnej plochy" - IDS_PREVIEW "Preview" // Náhľad, Ukážka, Prezrieť ??? + IDS_APPTITLE "Zobrazovač obrázkov a faxov systému ReactOS" + IDS_SETASDESKBG "Nastaviť ako pozadie pracovnej plochy" + IDS_PREVIEW "Preview" // Náhľad, Ukážka, Prezrieť ??? /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Nasledujúci obrázok" - IDS_TOOLTIP_PREV_PIC "Predchádzajúci obrázok" - IDS_TOOLTIP_ZOOM_IN "Priblížiť (+)" - IDS_TOOLTIP_ZOOM_OUT "Vzdialiť (-)" - IDS_TOOLTIP_ROT_CLOCKW "Otočiť v smere hodinových ručičiek (Ctrl+K)" // Otočiť vpravo - IDS_TOOLTIP_ROT_COUNCW "Otočiť proti smeru hodinových ručičiek (Ctrl+L)" // Otočiť vľavo - IDS_TOOLTIP_PRINT "Vytlačiť (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Uložiť ako... (Ctrl+S)" + IDS_TOOLTIP_PREV "Predchádzajúci obrázok (left arrow)" + IDS_TOOLTIP_NEXT "Nasledujúci obrázok" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Priblížiť (+)" + IDS_TOOLTIP_ZOOMM "Vzdialiť (-)" + IDS_TOOLTIP_ROT1 "Otočiť v smere hodinových ručičiek (Ctrl+K)" // Otočiť vpravo + IDS_TOOLTIP_ROT2 "Otočiť proti smeru hodinových ručičiek (Ctrl+L)" // Otočiť vľavo + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Vytlačiť (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Uložiť ako... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/sq-AL.rc =================================================================== --- dll/win32/shimgvw/lang/sq-AL.rc (revision 71513) +++ dll/win32/shimgvw/lang/sq-AL.rc (working copy) @@ -6,18 +6,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS Vëzhguesi i Fotove dhe Faxit" - IDS_SETASDESKBG "Vendos si Sfond Desktopi" - IDS_PREVIEW "Shikim Paraprak" + IDS_APPTITLE "ReactOS Vëzhguesi i Fotove dhe Faxit" + IDS_SETASDESKBG "Vendos si Sfond Desktopi" + IDS_PREVIEW "Shikim Paraprak" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Fotoja Tjetër" - IDS_TOOLTIP_PREV_PIC "Fotoja Mëparshme" - IDS_TOOLTIP_ZOOM_IN "Zoom Brënda (+)" - IDS_TOOLTIP_ZOOM_OUT "Zoom Jashtë (-)" - IDS_TOOLTIP_ROT_CLOCKW "Rrotullo KrahAkrepave (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Rrotullo kundërKrahAkrepave (Ctrl+L)" - IDS_TOOLTIP_PRINT "Printo (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Ruaj Si... (Ctrl+S)" + IDS_TOOLTIP_PREV "Fotoja Mëparshme (left arrow)" + IDS_TOOLTIP_NEXT "Fotoja Tjetër (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Zoom Brënda (+)" + IDS_TOOLTIP_ZOOMM "Zoom Jashtë (-)" + IDS_TOOLTIP_ROT1 "Rrotullo KrahAkrepave (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Rrotullo kundërKrahAkrepave (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Printo (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Ruaj Si... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/tr-TR.rc =================================================================== --- dll/win32/shimgvw/lang/tr-TR.rc (revision 71513) +++ dll/win32/shimgvw/lang/tr-TR.rc (working copy) @@ -4,18 +4,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS Resim ve Belgegeçer Görüntüleyicisi" - IDS_SETASDESKBG "Masaüstü Arka Planı Olarak Ayarla" - IDS_PREVIEW "Ön İzleme" + IDS_APPTITLE "ReactOS Resim ve Belgegeçer Görüntüleyicisi" + IDS_SETASDESKBG "Masaüstü Arka Planı Olarak Ayarla" + IDS_PREVIEW "Ön İzleme" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Sonraki Resim" - IDS_TOOLTIP_PREV_PIC "Önceki Resim" - IDS_TOOLTIP_ZOOM_IN "Yakınlaştır (+)" - IDS_TOOLTIP_ZOOM_OUT "Uzaklaştır (-)" - IDS_TOOLTIP_ROT_CLOCKW "Saat Yönünde Döndür (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Saat Yönünün Tersi Yönünde Döndür (Ctrl+L)" - IDS_TOOLTIP_PRINT "Yazdır (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Ayrı Sakla... (Ctrl+S)" + IDS_TOOLTIP_PREV "Önceki Resim (left arrow)" + IDS_TOOLTIP_NEXT "Sonraki Resim (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Yakınlaştır (+)" + IDS_TOOLTIP_ZOOMM "Uzaklaştır (-)" + IDS_TOOLTIP_ROT1 "Saat Yönünde Döndür (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Saat Yönünün Tersi Yönünde Döndür (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Yazdır (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Ayrı Sakla... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/uk-UA.rc =================================================================== --- dll/win32/shimgvw/lang/uk-UA.rc (revision 71513) +++ dll/win32/shimgvw/lang/uk-UA.rc (working copy) @@ -10,18 +10,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Програма перегляду зображень і факсів ReactOS" - IDS_SETASDESKBG "Встановити як фон робочого столу" - IDS_PREVIEW "Перегляд" + IDS_APPTITLE "Програма перегляду зображень і факсів ReactOS" + IDS_SETASDESKBG "Встановити як фон робочого столу" + IDS_PREVIEW "Перегляд" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "Наступне зображення" - IDS_TOOLTIP_PREV_PIC "Попереднє зображення" - IDS_TOOLTIP_ZOOM_IN "Збільшити (+)" - IDS_TOOLTIP_ZOOM_OUT "Зменшити (-)" - IDS_TOOLTIP_ROT_CLOCKW "Повернути за годинниковою стрілкою (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Повернути проти годинникової стрілки (Ctrl+L)" - IDS_TOOLTIP_PRINT "Друк (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Зберегти як... (Ctrl+S)" + IDS_TOOLTIP_PREV "Попереднє зображення (left arrow)" + IDS_TOOLTIP_NEXT "Наступне зображення (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "Збільшити (+)" + IDS_TOOLTIP_ZOOMM "Зменшити (-)" + IDS_TOOLTIP_ROT1 "Повернути за годинниковою стрілкою (Ctrl+K)" + IDS_TOOLTIP_ROT2 "Повернути проти годинникової стрілки (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "Друк (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Зберегти як... (Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/zh-CN.rc =================================================================== --- dll/win32/shimgvw/lang/zh-CN.rc (revision 71513) +++ dll/win32/shimgvw/lang/zh-CN.rc (working copy) @@ -4,18 +4,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS 图片和传真查看器" - IDS_SETASDESKBG "设置为桌面背景" - IDS_PREVIEW "预览" + IDS_APPTITLE "ReactOS 图片和传真查看器" + IDS_SETASDESKBG "设置为桌面背景" + IDS_PREVIEW "预览" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "下一张图片" - IDS_TOOLTIP_PREV_PIC "上一张图片" - IDS_TOOLTIP_ZOOM_IN "放大 (+)" - IDS_TOOLTIP_ZOOM_OUT "缩小 (-)" - IDS_TOOLTIP_ROT_CLOCKW "旋转顺时针 (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "旋转逆时针 (Ctrl+L)" - IDS_TOOLTIP_PRINT "打印 (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "另存为...(Ctrl+S)" + IDS_TOOLTIP_PREV "上一张图片 (left arrow)" + IDS_TOOLTIP_NEXT "下一张图片 (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "放大 (+)" + IDS_TOOLTIP_ZOOMM "缩小 (-)" + IDS_TOOLTIP_ROT1 "旋转顺时针 (Ctrl+K)" + IDS_TOOLTIP_ROT2 "旋转逆时针 (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "打印 (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "另存为...(Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/lang/zh-TW.rc =================================================================== --- dll/win32/shimgvw/lang/zh-TW.rc (revision 71513) +++ dll/win32/shimgvw/lang/zh-TW.rc (working copy) @@ -4,18 +4,24 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS 圖片和傳真檢視器" - IDS_SETASDESKBG "設定為桌面背景" - IDS_PREVIEW "預覽" + IDS_APPTITLE "ReactOS 圖片和傳真檢視器" + IDS_SETASDESKBG "設定為桌面背景" + IDS_PREVIEW "預覽" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "下一張圖片" - IDS_TOOLTIP_PREV_PIC "上一張圖片" - IDS_TOOLTIP_ZOOM_IN "放大 (+)" - IDS_TOOLTIP_ZOOM_OUT "縮小 (-)" - IDS_TOOLTIP_ROT_CLOCKW "旋轉順時針 (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "旋轉逆時針 (Ctrl+L)" - IDS_TOOLTIP_PRINT "列印 (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "另存為...(Ctrl+S)" + IDS_TOOLTIP_PREV "上一張圖片 (left arrow)" + IDS_TOOLTIP_NEXT "下一張圖片 (right arrow)" + IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl-B)" + IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl-A)" + IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_ZOOMP "放大 (+)" + IDS_TOOLTIP_ZOOMM "縮小 (-)" + IDS_TOOLTIP_ROT1 "旋轉順時針 (Ctrl+K)" + IDS_TOOLTIP_ROT2 "旋轉逆時針 (Ctrl+L)" + IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_PRINT "列印 (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "另存為...(Ctrl+S)" + IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Help topics (F1)" END STRINGTABLE Index: dll/win32/shimgvw/resource.h =================================================================== --- dll/win32/shimgvw/resource.h (revision 71513) +++ dll/win32/shimgvw/resource.h (working copy) @@ -1,40 +1,60 @@ #pragma once /* Icons */ -#define IDI_APPICON 1 +#define IDI_APP_ICON 1 #define IDI_BMP_ICON 2 #define IDI_GIF_ICON 3 #define IDI_JPG_ICON 4 #define IDI_PNG_ICON 5 -#define IDB_PREVICON 50 -#define IDB_NEXTICON 51 -#define IDB_ZOOMPICON 52 -#define IDB_ZOOMMICON 53 -#define IDB_SAVEICON 54 -#define IDB_PRINTICON 55 -#define IDB_ROT1ICON 56 -#define IDB_ROT2ICON 57 +#define IDB_PREV 50 +#define IDB_NEXT 51 +#define IDB_BEST_FIT 52 +#define IDB_REAL_SIZE 53 +#define IDB_SLIDE_SHOW 54 +#define IDB_ZOOMP 55 +#define IDB_ZOOMM 56 +#define IDB_ROT1 57 +#define IDB_ROT2 58 +#define IDB_DELETE 59 +#define IDB_PRINT 60 +#define IDB_SAVEAS 61 +#define IDB_MODIFY 62 +#define IDB_HELP_TOC 63 /* ToolBar buttons */ -#define IDC_PREV 500 -#define IDC_NEXT 501 -#define IDC_ZOOMP 502 -#define IDC_ZOOMM 503 -#define IDC_SAVE 504 -#define IDC_PRINT 505 -#define IDC_ROT1 506 -#define IDC_ROT2 507 +#define IDC_TOOL_BASE 500 -#define TBICON_PREV 0 -#define TBICON_NEXT 1 -#define TBICON_ZOOMP 2 -#define TBICON_ZOOMM 3 -#define TBICON_SAVE 4 -#define TBICON_PRINT 5 -#define TBICON_ROT1 6 -#define TBICON_ROT2 7 +#define IDC_PREV (IDC_TOOL_BASE + 0) +#define IDC_NEXT (IDC_TOOL_BASE + 1) +#define IDC_BEST_FIT (IDC_TOOL_BASE + 2) +#define IDC_REAL_SIZE (IDC_TOOL_BASE + 3) +#define IDC_SLIDE_SHOW (IDC_TOOL_BASE + 4) +#define IDC_ZOOMP (IDC_TOOL_BASE + 5) +#define IDC_ZOOMM (IDC_TOOL_BASE + 6) +#define IDC_ROT1 (IDC_TOOL_BASE + 7) +#define IDC_ROT2 (IDC_TOOL_BASE + 8) +#define IDC_DELETE (IDC_TOOL_BASE + 9) +#define IDC_PRINT (IDC_TOOL_BASE + 10) +#define IDC_SAVEAS (IDC_TOOL_BASE + 11) +#define IDC_MODIFY (IDC_TOOL_BASE + 12) +#define IDC_HELP_TOC (IDC_TOOL_BASE + 13) +#define TBICON_PREV 0 +#define TBICON_NEXT 1 +#define TBICON_BEST_FIT 2 +#define TBICON_REAL_SIZE 3 +#define TBICON_SLIDE_SHOW 4 +#define TBICON_ZOOMP 5 +#define TBICON_ZOOMM 6 +#define TBICON_ROT1 7 +#define TBICON_ROT2 8 +#define TBICON_DELETE 9 +#define TBICON_PRINT 10 +#define TBICON_SAVEAS 11 +#define TBICON_MODIFY 12 +#define TBICON_HELP_TOC 13 + /* Strings */ #define IDS_APPTITLE 100 #define IDS_SETASDESKBG 101 @@ -50,11 +70,20 @@ #define IDS_WMF_FILE 307 /* Tooltips strings */ -#define IDS_TOOLTIP_NEXT_PIC 400 -#define IDS_TOOLTIP_PREV_PIC 401 -#define IDS_TOOLTIP_ZOOM_IN 402 -#define IDS_TOOLTIP_ZOOM_OUT 404 -#define IDS_TOOLTIP_ROT_CLOCKW 405 -#define IDS_TOOLTIP_ROT_COUNCW 406 -#define IDS_TOOLTIP_PRINT 407 -#define IDS_TOOLTIP_SAVEAS 408 +#define IDS_TOOLTIP_PREV 400 +#define IDS_TOOLTIP_NEXT 401 +#define IDS_TOOLTIP_BEST_FIT 402 +#define IDS_TOOLTIP_REAL_SIZE 403 +#define IDS_TOOLTIP_SLIDE_SHOW 404 +#define IDS_TOOLTIP_ZOOMP 405 +#define IDS_TOOLTIP_ZOOMM 406 +#define IDS_TOOLTIP_ROT1 407 +#define IDS_TOOLTIP_ROT2 408 +#define IDS_TOOLTIP_DELETE 409 +#define IDS_TOOLTIP_PRINT 410 +#define IDS_TOOLTIP_SAVEAS 411 +#define IDS_TOOLTIP_MODIFY 412 +#define IDS_TOOLTIP_HELP_TOC 413 + +/* Keyboard accelerators */ +#define IDR_ACCELERATOR 600 Index: dll/win32/shimgvw/shimgvw.c =================================================================== --- dll/win32/shimgvw/shimgvw.c (revision 71513) +++ dll/win32/shimgvw/shimgvw.c (working copy) @@ -41,22 +41,61 @@ HWND hDispWnd, hToolBar; +typedef struct { + DWORD idb; /* Index to bitmap */ + DWORD ids; /* Index to tooltip */ +} TB_BUTTON_CONFIG; + + /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ \ +#define DECLARE_BTN_INFO(_name) \ + { TBICON_##_name, IDC_##_name, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } + +#define DECLARE_BTN_SEPARATOR \ + { 15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0 } + /* ToolBar Buttons */ static const TBBUTTON Buttons [] = -{ /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {TBICON_PREV, IDC_PREV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {TBICON_NEXT, IDC_NEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, - {TBICON_ZOOMP, IDC_ZOOMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {TBICON_ZOOMM, IDC_ZOOMM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, - {TBICON_ROT1, IDC_ROT1, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {TBICON_ROT2, IDC_ROT2, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, - {TBICON_SAVE, IDC_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {TBICON_PRINT, IDC_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, +{ + DECLARE_BTN_INFO(PREV), + DECLARE_BTN_INFO(NEXT), + DECLARE_BTN_SEPARATOR, + DECLARE_BTN_INFO(BEST_FIT), + DECLARE_BTN_INFO(REAL_SIZE), + DECLARE_BTN_INFO(SLIDE_SHOW), + DECLARE_BTN_SEPARATOR, + DECLARE_BTN_INFO(ZOOMP), + DECLARE_BTN_INFO(ZOOMM), + DECLARE_BTN_SEPARATOR, + DECLARE_BTN_INFO(ROT1), + DECLARE_BTN_INFO(ROT2), + DECLARE_BTN_SEPARATOR, + DECLARE_BTN_INFO(DELETE), + DECLARE_BTN_INFO(PRINT), + DECLARE_BTN_INFO(SAVEAS), + DECLARE_BTN_INFO(MODIFY), + DECLARE_BTN_SEPARATOR, + DECLARE_BTN_INFO(HELP_TOC) }; +#define DECLARE_BTN_CONFIG(_name) { IDB_##_name, IDS_TOOLTIP_##_name } + +static const TB_BUTTON_CONFIG BtnConfig[] = { + DECLARE_BTN_CONFIG(PREV), + DECLARE_BTN_CONFIG(NEXT), + DECLARE_BTN_CONFIG(BEST_FIT), + DECLARE_BTN_CONFIG(REAL_SIZE), + DECLARE_BTN_CONFIG(SLIDE_SHOW), + DECLARE_BTN_CONFIG(ZOOMP), + DECLARE_BTN_CONFIG(ZOOMM), + DECLARE_BTN_CONFIG(ROT1), + DECLARE_BTN_CONFIG(ROT2), + DECLARE_BTN_CONFIG(DELETE), + DECLARE_BTN_CONFIG(PRINT), + DECLARE_BTN_CONFIG(SAVEAS), + DECLARE_BTN_CONFIG(MODIFY), + DECLARE_BTN_CONFIG(HELP_TOC) +}; + static void pLoadImage(LPWSTR szOpenFileName) { if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) @@ -308,6 +347,9 @@ { SHIMGVW_FILENODE *conductor; + if (!root) + return; + root->Prev->Next = NULL; root->Prev = NULL; @@ -435,7 +477,7 @@ static BOOL ImageView_CreateToolBar(HWND hwnd) { - INT numButtons = sizeof(Buttons) / sizeof(Buttons[0]); + int n; hToolBar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, @@ -453,37 +495,18 @@ hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_PREVICON), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + if (hImageList == NULL) return FALSE; - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_NEXTICON), IMAGE_BITMAP, + for (n = 0; n < _countof(BtnConfig); n++) + { + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(BtnConfig[n].idb), IMAGE_BITMAP, TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + } - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ZOOMPICON), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ZOOMMICON), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_SAVEICON), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_PRINTICON), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ROT1ICON), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - - ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ROT2ICON), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - - if (hImageList == NULL) return FALSE; - ImageList_Destroy((HIMAGELIST)SendMessage(hToolBar, TB_SETIMAGELIST, 0, (LPARAM)hImageList)); - SendMessage(hToolBar, TB_ADDBUTTONS, - numButtons, (LPARAM)Buttons); + SendMessage(hToolBar, TB_ADDBUTTONS, _countof(Buttons), (LPARAM)Buttons); return TRUE; } @@ -535,64 +558,57 @@ return 0L; } - case WM_KEYDOWN: - switch (LOWORD(wParam)) - { - case VK_LEFT: - PostMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_PREV, BN_CLICKED), (LPARAM)NULL); - break; - - case VK_RIGHT: - PostMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_NEXT, BN_CLICKED), (LPARAM)NULL); - break; - } - break; - case WM_COMMAND: { - switch (wParam) + switch (LOWORD(wParam)) { case IDC_PREV: - { currentFile = currentFile->Prev; pLoadImageFromNode(currentFile, hwnd); - } + break; - break; case IDC_NEXT: - { currentFile = currentFile->Next; pLoadImageFromNode(currentFile, hwnd); - } + break; - break; + case IDC_BEST_FIT: + break; + + case IDC_REAL_SIZE: + break; + + case IDC_SLIDE_SHOW: + break; + case IDC_ZOOMP: + break; - break; case IDC_ZOOMM: + break; - break; - case IDC_SAVE: + case IDC_SAVEAS: pSaveImageAs(hwnd); + break; - break; case IDC_PRINT: + break; - break; + case IDC_DELETE: + break; + + case IDC_MODIFY: + break; + case IDC_ROT1: - { GdipImageRotateFlip(image, Rotate270FlipNone); ImageView_UpdateWindow(hwnd); - } + break; - break; case IDC_ROT2: - { GdipImageRotateFlip(image, Rotate90FlipNone); ImageView_UpdateWindow(hwnd); - } - - break; + break; } } break; @@ -606,39 +622,10 @@ case TTN_GETDISPINFO: { LPTOOLTIPTEXT lpttt; - UINT idButton; lpttt = (LPTOOLTIPTEXT)lParam; - idButton = (UINT)lpttt->hdr.idFrom; lpttt->hinst = hInstance; - - switch (idButton) - { - case IDC_PREV: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PREV_PIC); - break; - case IDC_NEXT: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEXT_PIC); - break; - case IDC_ZOOMP: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ZOOM_IN); - break; - case IDC_ZOOMM: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ZOOM_OUT); - break; - case IDC_SAVE: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SAVEAS); - break; - case IDC_PRINT: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PRINT); - break; - case IDC_ROT1: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ROT_COUNCW); - break; - case IDC_ROT2: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ROT_CLOCKW); - break; - } + lpttt->lpszText = MAKEINTRESOURCE(BtnConfig[lpttt->hdr.idFrom - IDC_TOOL_BASE].ids); return TRUE; } } @@ -684,7 +671,13 @@ WCHAR szInitialFile[MAX_PATH]; HWND hMainWnd; MSG msg; + HACCEL hKbdAccel; + INITCOMMONCONTROLSEX Icc; + Icc.dwSize = sizeof(INITCOMMONCONTROLSEX); + Icc.dwICC = ICC_WIN95_CLASSES; + InitCommonControlsEx(&Icc); + if (!ImageView_LoadSettings()) { shiSettings.Maximized = FALSE; @@ -708,7 +701,7 @@ WndClass.lpfnWndProc = ImageView_WndProc; WndClass.hInstance = hInstance; WndClass.style = CS_HREDRAW | CS_VREDRAW; - WndClass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APPICON)); + WndClass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); WndClass.hCursor = LoadCursor(hInstance, IDC_ARROW); WndClass.hbrBackground = (HBRUSH)COLOR_WINDOW; @@ -721,7 +714,7 @@ 0, 0, NULL, NULL, hInstance, NULL); // make sure the path has no quotes on it - wcscpy(szInitialFile, szFileName); + StringCbCopyW(szInitialFile, sizeof(szInitialFile), szFileName); PathUnquoteSpacesW(szInitialFile); currentFile = pBuildFileList(szInitialFile); @@ -730,17 +723,29 @@ pLoadImageFromNode(currentFile, hMainWnd); } + /* Create accelerator table for keystrokes */ + hKbdAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDR_ACCELERATOR)); + // Show it ShowWindow(hMainWnd, SW_SHOW); UpdateWindow(hMainWnd); // Message Loop - while(GetMessage(&msg,NULL,0,0)) + for (;;) { - TranslateMessage(&msg); - DispatchMessageW(&msg); + if (GetMessage(&msg,NULL,0,0) <= 0) + break; + + if (!TranslateAccelerator(hMainWnd, hKbdAccel, &msg)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } } + /* Destroy accelerator table */ + DestroyAcceleratorTable(hKbdAccel); + pFreeFileList(currentFile); if (image) Index: dll/win32/shimgvw/shimgvw.rc =================================================================== --- dll/win32/shimgvw/shimgvw.rc (revision 71513) +++ dll/win32/shimgvw/shimgvw.rc (working copy) @@ -1,4 +1,5 @@ #include +#include #include "resource.h" @@ -8,19 +9,43 @@ #define REACTOS_STR_ORIGINAL_FILENAME "shimgvw.dll" #include -IDI_APPICON ICON "res/main.ico" +IDI_APP_ICON ICON "res/main.ico" IDI_BMP_ICON ICON "res/bmp.ico" IDI_PNG_ICON ICON "res/png.ico" -IDB_PREVICON BITMAP "res/prev.bmp" -IDB_NEXTICON BITMAP "res/next.bmp" -IDB_ZOOMPICON BITMAP "res/zoomp.bmp" -IDB_ZOOMMICON BITMAP "res/zoomm.bmp" -IDB_SAVEICON BITMAP "res/save.bmp" -IDB_PRINTICON BITMAP "res/print.bmp" -IDB_ROT1ICON BITMAP "res/rot1.bmp" -IDB_ROT2ICON BITMAP "res/rot2.bmp" +IDB_PREV BITMAP "res/prev.bmp" +IDB_NEXT BITMAP "res/next.bmp" +IDB_BEST_FIT BITMAP "res/best_fit.bmp" +IDB_REAL_SIZE BITMAP "res/real_size.bmp" +IDB_SLIDE_SHOW BITMAP "res/slide_show.bmp" +IDB_ZOOMP BITMAP "res/zoomp.bmp" +IDB_ZOOMM BITMAP "res/zoomm.bmp" +IDB_ROT1 BITMAP "res/rot1.bmp" +IDB_ROT2 BITMAP "res/rot2.bmp" +IDB_DELETE BITMAP "res/delete.bmp" +IDB_PRINT BITMAP "res/print.bmp" +IDB_SAVEAS BITMAP "res/save.bmp" +IDB_MODIFY BITMAP "res/modify.bmp" +IDB_HELP_TOC BITMAP "res/help_toc.bmp" +IDR_ACCELERATOR ACCELERATORS DISCARDABLE +BEGIN + VK_LEFT, IDC_PREV, VIRTKEY + VK_RIGHT, IDC_NEXT, VIRTKEY + "B", IDC_BEST_FIT, VIRTKEY, CONTROL + "A", IDC_REAL_SIZE, VIRTKEY, CONTROL + VK_F11, IDC_SLIDE_SHOW, VIRTKEY + VK_ADD, IDC_ZOOMP, VIRTKEY + VK_SUBTRACT, IDC_ZOOMM, VIRTKEY + "K", IDC_ROT1, VIRTKEY, CONTROL + "L", IDC_ROT2, VIRTKEY, CONTROL + VK_DELETE, IDC_DELETE, VIRTKEY + "P", IDC_PRINT, VIRTKEY, CONTROL + "S", IDC_SAVEAS, VIRTKEY, CONTROL + "E", IDC_MODIFY, VIRTKEY, CONTROL + VK_F1, IDC_HELP_TOC, VIRTKEY +END + /* UTF-8 */ #pragma code_page(65001)