From ac2739c8507026028b1c3558e10668be79f15db4 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 13 Mar 2013 09:55:45 +0000 Subject: - translation fixes (patch from Basil) git-svn-id: http://svn.miranda-ng.org/main/trunk@3996 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/loadicons.cpp | 36 +++++++++++----------- plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | 2 +- plugins/SendScreenshotPlus/src/mir_icolib.cpp | 44 +++++++++++++-------------- plugins/SendScreenshotPlus/src/mir_icolib.h | 4 +-- 4 files changed, 43 insertions(+), 43 deletions(-) (limited to 'plugins') diff --git a/plugins/SecureIM/src/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp index 1119a63f8e..ba6ca81727 100644 --- a/plugins/SecureIM/src/loadicons.cpp +++ b/plugins/SecureIM/src/loadicons.cpp @@ -12,34 +12,34 @@ struct static icons[] = { // Contact List - {IDI_CL_DIS, TBL_IEC, IEC_CL_DIS, MODULENAME"/Contact List", "sim_cl_dis", "Connection Disabled"}, - {IDI_CL_EST, TBL_IEC, IEC_CL_EST, MODULENAME"/Contact List", "sim_cl_est", "Connection Established"}, + {IDI_CL_DIS, TBL_IEC, IEC_CL_DIS, MODULENAME"/"LPGEN("Contact List"), "sim_cl_dis", LPGEN("Connection Disabled")}, + {IDI_CL_EST, TBL_IEC, IEC_CL_EST, MODULENAME"/"LPGEN("Contact List"), "sim_cl_est", LPGEN("Connection Established")}, // Contact Menu - {IDI_CM_DIS, TBL_ICO, ICO_CM_DIS, MODULENAME"/Contact Menu", "sim_cm_dis", "Disable Secure Connection"}, - {IDI_CM_EST, TBL_ICO, ICO_CM_EST, MODULENAME"/Contact Menu", "sim_cm_est", "Establishe Secure Connection"}, + {IDI_CM_DIS, TBL_ICO, ICO_CM_DIS, MODULENAME"/"LPGEN("Contact Menu"), "sim_cm_dis", LPGEN("Disable Secure Connection")}, + {IDI_CM_EST, TBL_ICO, ICO_CM_EST, MODULENAME"/"LPGEN("Contact Menu"), "sim_cm_est", LPGEN("Establishe Secure Connection")}, // Message Window - {IDI_MW_DIS, TBL_ICO, ICO_MW_DIS, MODULENAME"/Message Window", "sim_mw_dis", "Connection Disabled"}, - {IDI_MW_EST, TBL_ICO, ICO_MW_EST, MODULENAME"/Message Window", "sim_mw_est", "Connection Established"}, + {IDI_MW_DIS, TBL_ICO, ICO_MW_DIS, MODULENAME"/"LPGEN("Message Window"), "sim_mw_dis", LPGEN("Connection Disabled")}, + {IDI_MW_EST, TBL_ICO, ICO_MW_EST, MODULENAME"/"LPGEN("Message Window"), "sim_mw_est", LPGEN("Connection Established")}, // popup's - {IDI_PU_DIS, TBL_POP, POP_PU_DIS, MODULENAME"/Popups", "sim_pu_dis", "Secure Connection Disabled"}, - {IDI_PU_EST, TBL_POP, POP_PU_EST, MODULENAME"/Popups", "sim_pu_est", "Secure Connection Established"}, - {IDI_PU_PRC, TBL_POP, POP_PU_PRC, MODULENAME"/Popups", "sim_pu_prc", "Secure Connection In Process"}, - {IDI_PU_MSG, TBL_POP, POP_PU_MSR, MODULENAME"/Popups", "sim_pu_msr", "Recv Secured Message"}, - {IDI_PU_MSG, TBL_POP, POP_PU_MSS, MODULENAME"/Popups", "sim_pu_mss", "Sent Secured Message"}, + {IDI_PU_DIS, TBL_POP, POP_PU_DIS, MODULENAME"/"LPGEN("Popups"), "sim_pu_dis", LPGEN("Secure Connection Disabled")}, + {IDI_PU_EST, TBL_POP, POP_PU_EST, MODULENAME"/"LPGEN("Popups"), "sim_pu_est", LPGEN("Secure Connection Established")}, + {IDI_PU_PRC, TBL_POP, POP_PU_PRC, MODULENAME"/"LPGEN("Popups"), "sim_pu_prc", LPGEN("Secure Connection In Process")}, + {IDI_PU_MSG, TBL_POP, POP_PU_MSR, MODULENAME"/"LPGEN("Popups"), "sim_pu_msr", LPGEN("Recv Secured Message")}, + {IDI_PU_MSG, TBL_POP, POP_PU_MSS, MODULENAME"/"LPGEN("Popups"), "sim_pu_mss", LPGEN("Sent Secured Message")}, // statuses - {IDI_ST_DIS, TBL_ICO, ICO_ST_DIS, MODULENAME"/Menu State", "sim_st_dis", "Disabled"}, - {IDI_ST_ENA, TBL_ICO, ICO_ST_ENA, MODULENAME"/Menu State", "sim_st_ena", "Enabled"}, - {IDI_ST_TRY, TBL_ICO, ICO_ST_TRY, MODULENAME"/Menu State", "sim_st_try", "Always Try"}, + {IDI_ST_DIS, TBL_ICO, ICO_ST_DIS, MODULENAME"/"LPGEN("Menu State"), "sim_st_dis", LPGEN("Disabled")}, + {IDI_ST_ENA, TBL_ICO, ICO_ST_ENA, MODULENAME"/"LPGEN("Menu State"), "sim_st_ena", LPGEN("Enabled")}, + {IDI_ST_TRY, TBL_ICO, ICO_ST_TRY, MODULENAME"/"LPGEN("Menu State"), "sim_st_try", LPGEN("Always Try")}, // overlay - {IDI_OV_NAT, TBL_ICO, ICO_OV_NAT, MODULENAME"/Overlays", "sim_ov_nat", "Native mode"}, - {IDI_OV_PGP, TBL_ICO, ICO_OV_PGP, MODULENAME"/Overlays", "sim_ov_pgp", "PGP mode"}, - {IDI_OV_GPG, TBL_ICO, ICO_OV_GPG, MODULENAME"/Overlays", "sim_ov_gpg", "GPG mode"}, - {IDI_OV_RSA, TBL_ICO, ICO_OV_RSA, MODULENAME"/Overlays", "sim_ov_rsa", "RSA/AES mode"}, + {IDI_OV_NAT, TBL_ICO, ICO_OV_NAT, MODULENAME"/"LPGEN("Overlays"), "sim_ov_nat", LPGEN("Native mode")}, + {IDI_OV_PGP, TBL_ICO, ICO_OV_PGP, MODULENAME"/"LPGEN("Overlays"), "sim_ov_pgp", LPGEN("PGP mode")}, + {IDI_OV_GPG, TBL_ICO, ICO_OV_GPG, MODULENAME"/"LPGEN("Overlays"), "sim_ov_gpg", LPGEN("GPG mode")}, + {IDI_OV_RSA, TBL_ICO, ICO_OV_RSA, MODULENAME"/"LPGEN("Overlays"), "sim_ov_rsa", LPGEN("RSA/AES mode")}, }; HINSTANCE LoadIconsPack(const char* szIconsPack) diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp index 504d83767b..ddf11830e6 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp @@ -404,7 +404,7 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case MB_ABORTRETRYIGNORE: { retOk = IDABORT; - SetDlgItemText(hDlg, IDOK, LPGENT("Abord")); + SetDlgItemText(hDlg, IDOK, LPGENT("Abort")); retAll = IDABORT; SetDlgItemText(hDlg, IDALL, LPGENT("Retry")); retCancel = IDCANCEL; diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp index 9f23ba5f1a..8ac3c67e8c 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp +++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp @@ -42,32 +42,32 @@ HICON ghDefIcon = NULL; static ICODESC icoDesc[] = { // common - { ICO_PLUG_SSWINDOW1, "Screenshot Icon1", SECT_COMMON, IDI_PLUG_MAIN, -1 }, - { ICO_PLUG_SSWINDOW2, "Screenshot Icon2", SECT_COMMON, IDI_PLUG_ICON1, 0 }, - { ICO_PLUG_SSTARGET, "Target Cursor", SECT_COMMON, IDI_PLUG_ICON2, 1 }, - { ICO_PLUG_SSMONITOR, "Target Desktop", SECT_COMMON, IDI_PLUG_ICON3, 1 }, - { ICO_PLUG_SSDEFAULT, "Default", SECT_COMMON, IDI_PLUG_DEFAULT, 0 }, + { ICO_PLUG_SSWINDOW1, LPGEN("Screenshot Icon1"), SECT_COMMON, IDI_PLUG_MAIN, -1 }, + { ICO_PLUG_SSWINDOW2, LPGEN("Screenshot Icon2"), SECT_COMMON, IDI_PLUG_ICON1, 0 }, + { ICO_PLUG_SSTARGET, LPGEN("Target Cursor"), SECT_COMMON, IDI_PLUG_ICON2, 1 }, + { ICO_PLUG_SSMONITOR, LPGEN("Target Desktop"), SECT_COMMON, IDI_PLUG_ICON3, 1 }, + { ICO_PLUG_SSDEFAULT, LPGEN("Default"), SECT_COMMON, IDI_PLUG_DEFAULT, 0 }, // overlays - { ICO_PLUG_OVERLAYON, "overlay on", SECT_OVERLAY, IDI_PLUG_OVERLAYON, 0 }, - { ICO_PLUG_OVERLAYOFF, "overlay off", SECT_OVERLAY, IDI_PLUG_OVERLAYOFF,0 }, + { ICO_PLUG_OVERLAYON, LPGEN("overlay on"), SECT_OVERLAY, IDI_PLUG_OVERLAYON, 0 }, + { ICO_PLUG_OVERLAYOFF, LPGEN("overlay off"), SECT_OVERLAY, IDI_PLUG_OVERLAYOFF,0 }, // button icons - { ICO_PLUG_SSHELP, "Help", SECT_BUTTONS, IDI_PLUG_HELP, 0 }, - { ICO_PLUG_SSFOLDERO, "Open Folder", SECT_BUTTONS, IDI_PLUG_FOLDERO, 0 }, - { ICO_PLUG_SSDESKOFF, "description off", SECT_BUTTONS, IDI_PLUG_DESKOFF, 0 }, - { ICO_PLUG_SSDESKON, "description on", SECT_BUTTONS, IDI_PLUG_DESKON, 0 }, - { ICO_PLUG_SSDELOFF, "delete off", SECT_BUTTONS, IDI_PLUG_DELOFF, 0 }, - { ICO_PLUG_SSDELON, "delete on", SECT_BUTTONS, IDI_PLUG_DELON, 0 }, - { ICO_PLUG_ARROWL, "Prev", SECT_BUTTONS, IDI_PLUG_ARROWL, 0 }, - { ICO_PLUG_ARROWR, "Next", SECT_BUTTONS, IDI_PLUG_ARROWR, 0 }, - - { ICO_PLUG_UPDATE, "Update", SECT_BUTTONS, IDI_PLUG_UPDATE, 0 }, - { ICO_PLUG_OK, "Ok", SECT_BUTTONS, IDI_PLUG_OK, 0 }, - { ICO_PLUG_CANCEL, "Cancel", SECT_BUTTONS, IDI_PLUG_CLOSE, 0 }, - { ICO_PLUG_APPLY, "Apply", SECT_BUTTONS, IDI_PLUG_APPLY, 0 }, - { ICO_PLUG_EDIT, "Edit", SECT_BUTTONS, IDI_PLUG_EDIT, 0 }, - { ICO_PLUG_DOWNARROW, "Down arrow", SECT_BUTTONS, IDI_PLUG_DOWNARROW, 0 }, + { ICO_PLUG_SSHELP, LPGEN("Help"), SECT_BUTTONS, IDI_PLUG_HELP, 0 }, + { ICO_PLUG_SSFOLDERO, LPGEN("Open Folder"), SECT_BUTTONS, IDI_PLUG_FOLDERO, 0 }, + { ICO_PLUG_SSDESKOFF, LPGEN("description off"), SECT_BUTTONS, IDI_PLUG_DESKOFF, 0 }, + { ICO_PLUG_SSDESKON, LPGEN("description on"), SECT_BUTTONS, IDI_PLUG_DESKON, 0 }, + { ICO_PLUG_SSDELOFF, LPGEN("delete off"), SECT_BUTTONS, IDI_PLUG_DELOFF, 0 }, + { ICO_PLUG_SSDELON, LPGEN("delete on"), SECT_BUTTONS, IDI_PLUG_DELON, 0 }, + { ICO_PLUG_ARROWL, LPGEN("Prev"), SECT_BUTTONS, IDI_PLUG_ARROWL, 0 }, + { ICO_PLUG_ARROWR, LPGEN("Next"), SECT_BUTTONS, IDI_PLUG_ARROWR, 0 }, + + { ICO_PLUG_UPDATE, LPGEN("Update"), SECT_BUTTONS, IDI_PLUG_UPDATE, 0 }, + { ICO_PLUG_OK, LPGEN("Ok"), SECT_BUTTONS, IDI_PLUG_OK, 0 }, + { ICO_PLUG_CANCEL, LPGEN("Cancel"), SECT_BUTTONS, IDI_PLUG_CLOSE, 0 }, + { ICO_PLUG_APPLY, LPGEN("Apply"), SECT_BUTTONS, IDI_PLUG_APPLY, 0 }, + { ICO_PLUG_EDIT, LPGEN("Edit"), SECT_BUTTONS, IDI_PLUG_EDIT, 0 }, + { ICO_PLUG_DOWNARROW, LPGEN("Down arrow"), SECT_BUTTONS, IDI_PLUG_DOWNARROW, 0 }, }; /** diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.h b/plugins/SendScreenshotPlus/src/mir_icolib.h index 73f1f57872..937b67bff0 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.h +++ b/plugins/SendScreenshotPlus/src/mir_icolib.h @@ -26,8 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // sections #define SECT_COMMON MODNAME -#define SECT_BUTTONS MODNAME"/Buttons" -#define SECT_OVERLAY MODNAME"/overlays" +#define SECT_BUTTONS MODNAME"/"LPGEN("Buttons") +#define SECT_OVERLAY MODNAME"/"LPGEN("overlays") // icons #define ICO_PLUG_SSWINDOW1 MODNAME"_plug_SSwindow1" -- cgit v1.2.3