From c2dee60f755362b1464155f207ac98b7fc763c09 Mon Sep 17 00:00:00 2001 From: kojima Date: Wed, 2 Jun 1999 20:44:16 +0000 Subject: [PATCH] fixed some minor bugs, updated korean translation --- NEWS | 2 +- WPrefs.app/po/Makefile.am | 2 +- configure.in | 2 +- po/ko.po | 213 ++++++++++++++++++++++---------------- src/rootmenu.c | 6 +- src/superfluous.c | 72 +++++++++++-- 6 files changed, 194 insertions(+), 103 deletions(-) diff --git a/NEWS b/NEWS index d4143589..c47fb593 100644 --- a/NEWS +++ b/NEWS @@ -234,7 +234,7 @@ like presentation programs. KDE Application Menu script --------------------------- -wkdemenu.sh is a converter from KDE application menu structures to wmaker +wkdemenu.pl is a converter from KDE application menu structures to wmaker menu that can be used as a piped menu. Look wkdemenu.sh for how to use it. diff --git a/WPrefs.app/po/Makefile.am b/WPrefs.app/po/Makefile.am index 8a2e7d87..30f4f47a 100644 --- a/WPrefs.app/po/Makefile.am +++ b/WPrefs.app/po/Makefile.am @@ -5,7 +5,7 @@ nlsdir = $(NLSDIR) CLEANFILES = $(CATALOGS) EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po\ - zh_CN.po fi.po it.po + zh_CN.po fi.po it.po ru.po POTFILES = \ $(top_builddir)/WPrefs.app/main.c \ diff --git a/configure.in b/configure.in index a3150310..9089a835 100644 --- a/configure.in +++ b/configure.in @@ -216,7 +216,7 @@ dnl ================== dnl List of supported locales dnl ------------------------- supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN sk" -supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it" +supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru" for lang in $LINGUAS; do ok=0 diff --git a/po/ko.po b/po/ko.po index 120febef..f40971c6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,33 +6,33 @@ msgid "" msgstr "" "Project-Id-Version: 0.53.0\n" -"POT-Creation-Date: 1999-05-30 16:39+0900\n" -"PO-Revision-Date: 1999-05-30 16:39+0900\n" +"POT-Creation-Date: 1999-06-03 01:12+0900\n" +"PO-Revision-Date: 1999-06-03 01:30+0900\n" "Last-Translator: Byeong-Chan Kim \n" "Language-Team: Korean\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/appicon.c:539 ../src/dialog.c:223 ../src/dock.c:3249 -#: ../src/dockedapp.c:211 ../src/dockedapp.c:251 ../src/rootmenu.c:1754 +#: ../src/appicon.c:570 ../src/dialog.c:223 ../src/dock.c:3300 +#: ../src/dockedapp.c:210 ../src/dockedapp.c:251 ../src/rootmenu.c:1754 #: ../src/winspector.c:290 ../src/winspector.c:306 msgid "Error" msgstr "¿À·ù" -#: ../src/appicon.c:540 +#: ../src/appicon.c:571 msgid "Could not open specified icon file" msgstr "ÁöÁ¤ÇÑ ¾ÆÀÌÄÜÀ» ¿­Áö ¸øÇÔ." -#: ../src/appicon.c:541 ../src/dialog.c:122 ../src/dialog.c:223 -#: ../src/dialog.c:460 ../src/dialog.c:1477 ../src/dock.c:497 -#: ../src/dock.c:3250 ../src/dockedapp.c:212 ../src/dockedapp.c:257 -#: ../src/dockedapp.c:380 ../src/rootmenu.c:1758 ../src/winspector.c:291 -#: ../src/winspector.c:307 +#: ../src/appicon.c:572 ../src/dialog.c:122 ../src/dialog.c:223 +#: ../src/dialog.c:460 ../src/dialog.c:1477 ../src/dock.c:514 +#: ../src/dock.c:522 ../src/dock.c:545 ../src/dock.c:3301 +#: ../src/dockedapp.c:211 ../src/dockedapp.c:257 ../src/dockedapp.c:371 +#: ../src/rootmenu.c:1758 ../src/winspector.c:291 ../src/winspector.c:307 msgid "OK" msgstr "È®ÀÎ" -#: ../src/appicon.c:568 ../src/dock.c:278 +#: ../src/appicon.c:599 ../src/dock.c:278 msgid "" " will be forcibly closed.\n" "Any unsaved changes will be lost.\n" @@ -42,38 +42,38 @@ msgstr "" "ÀúÀåÇÏÁö ¾ÊÀº º¯°æ »çÇ×Àº ÀÒ°Ô µË´Ï´Ù.\n" "°è¼Ó ÇϽðڽÀ´Ï±î?" -#: ../src/appicon.c:574 ../src/dock.c:283 ../src/winmenu.c:125 +#: ../src/appicon.c:605 ../src/dock.c:283 ../src/winmenu.c:125 msgid "Kill Application" msgstr "¾ÖÇø®ÄÉÀÌ¼Ç Á¾·á" -#: ../src/appicon.c:575 ../src/dock.c:284 ../src/winmenu.c:127 +#: ../src/appicon.c:606 ../src/dock.c:284 ../src/winmenu.c:127 msgid "Yes" msgstr "¿¹" -#: ../src/appicon.c:575 ../src/dock.c:284 ../src/winmenu.c:127 +#: ../src/appicon.c:606 ../src/dock.c:284 ../src/winmenu.c:127 msgid "No" msgstr "¾Æ´Ï¿À" -#: ../src/appicon.c:593 ../src/dock.c:1144 +#: ../src/appicon.c:624 ../src/dock.c:1195 msgid "Unhide Here" msgstr "¼û±ä °Í À̰÷¿¡ º¸ÀÓ" -#: ../src/appicon.c:594 ../src/appicon.c:619 ../src/dock.c:1146 -#: ../src/dock.c:1148 ../src/dock.c:3398 ../src/dock.c:3400 +#: ../src/appicon.c:625 ../src/appicon.c:650 ../src/dock.c:1197 +#: ../src/dock.c:1199 ../src/dock.c:3473 ../src/dock.c:3475 #: ../src/winmenu.c:465 msgid "Hide" msgstr "¼û±è" -#: ../src/appicon.c:595 +#: ../src/appicon.c:626 msgid "Set Icon..." msgstr "¾ÆÀÌÄÜ ÁöÁ¤..." -#: ../src/appicon.c:596 ../src/dock.c:1152 ../src/rootmenu.c:228 +#: ../src/appicon.c:627 ../src/dock.c:1203 ../src/rootmenu.c:228 #: ../src/rootmenu.c:242 ../src/winmenu.c:512 msgid "Kill" msgstr "°­Á¦ Á¾·á" -#: ../src/appicon.c:617 ../src/dock.c:3396 +#: ../src/appicon.c:648 ../src/dock.c:3471 msgid "Unhide" msgstr "¼û±è ÇØÁ¦" @@ -119,7 +119,7 @@ msgstr "\"%s\" #: ../src/defaults.c:1436 ../src/defaults.c:1451 ../src/defaults.c:1465 #: ../src/defaults.c:1537 ../src/defaults.c:1549 ../src/defaults.c:1955 #: ../src/defaults.c:1972 ../src/defaults.c:1985 ../src/defaults.c:2018 -#: ../src/defaults.c:2034 ../src/defaults.c:2065 ../src/defaults.c:2152 +#: ../src/defaults.c:2034 ../src/defaults.c:2065 ../src/defaults.c:2155 #, c-format msgid "using default \"%s\" instead" msgstr "±âº»°ªÀÎ \"%s\"¸¦ ´ë½Å »ç¿ëÇÔ" @@ -204,46 +204,46 @@ msgstr " msgid "Wrong type for background of workspace %i. Should be a texture." msgstr "ÀÛ¾÷°ø°£ ¹è°æ Á¾·ù°¡ À߸øµÇ¾ú½À´Ï´Ù. ÅØ½ºÃ³¿©¾ß ÇÕ´Ï´Ù." -#: ../src/defaults.c:2119 +#: ../src/defaults.c:2122 msgid "could not load any usable font!!!" msgstr "»ç¿ë °¡´ÉÇÑ ±Û²ÃÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù!!!" -#: ../src/defaults.c:2147 +#: ../src/defaults.c:2150 #, c-format msgid "could not get color for key \"%s\"" msgstr "Ű \"%s\"ÀÇ »öÀ» ¾òÀ» ¼ö ¾øÀ½" -#: ../src/defaults.c:2207 ../src/rootmenu.c:494 +#: ../src/defaults.c:2210 ../src/rootmenu.c:494 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s:À߸øµÈ Ű ¼öÁ¤ÀÚ \"%s\"" -#: ../src/defaults.c:2219 +#: ../src/defaults.c:2222 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s:À߸øµÈ Űº¸µå ´ÜÃàŰ ÁöÁ¤ \"%s\"" -#: ../src/defaults.c:2226 +#: ../src/defaults.c:2229 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s:»¡¸®°¡±â \"%s\"¿¡ À߸øµÈ Ű" -#: ../src/defaults.c:2252 +#: ../src/defaults.c:2255 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s: À߸øµÈ ¼öÁ¤ÀÚ Å° %s" -#: ../src/defaults.c:2286 +#: ../src/defaults.c:2289 #, c-format msgid "could not load image in option %s: %s" msgstr "%s ¿É¼ÇÀÇ À̹ÌÁö¸¦ ÀÐÁö ¸øÇÔ: %s" -#: ../src/defaults.c:2368 +#: ../src/defaults.c:2371 msgid "could not render texture for icon background" msgstr "¾ÆÀÌÄÜ ¹è°æÀÇ ÅØ½ºÃ³¸¦ ±×¸± ¼ö ¾ø½À´Ï´Ù" -#: ../src/dialog.c:122 ../src/dialog.c:467 ../src/dock.c:497 -#: ../src/dockedapp.c:386 ../src/rootmenu.c:190 ../src/rootmenu.c:228 +#: ../src/dialog.c:122 ../src/dialog.c:467 ../src/dock.c:545 +#: ../src/dockedapp.c:377 ../src/rootmenu.c:190 ../src/rootmenu.c:228 #: ../src/rootmenu.c:242 msgid "Cancel" msgstr "Ãë¼Ò" @@ -331,155 +331,195 @@ msgstr " msgid "Type the name for workspace %i:" msgstr "ÀÛ¾÷°ø°£ %iÀÇ À̸§À» ÀÔ·ÂÇϼ¼¿ä:" -#: ../src/dock.c:213 ../src/dock.c:1112 +#: ../src/dock.c:213 ../src/dock.c:1160 ../src/dock.c:1163 ../src/dock.c:3383 msgid "Rename Workspace" msgstr "ÀÛ¾÷°ø°£ À̸§ ¹Ù²Þ" -#: ../src/dock.c:495 +#: ../src/dock.c:508 ../src/dock.c:516 +msgid "Warning" +msgstr "°æ°í" + +#: ../src/dock.c:509 +msgid "" +"Some icons cannot be made omnipresent. Please make sure that no other icon " +"is docked in the same positions on the other workspaces and the Clip is not " +"full in some workspace." +msgstr "" +"¸î¸î ¾ÆÀÌÄÜÀ» Ç×»ó º¸ÀÌ°Ô ÇÒ ¼ö ¾ø½À´Ï´Ù. ´Ù¸¥ ÀÛ¾÷ °ø°£ÀÇ °°Àº À§Ä¡¿¡ " +"¾ÆÀÌÄÜÀÌ µµÅ©µÇÁö ¾Ê¾Ò´ÂÁö ±×¸®°í ´Ù¸¥ ÀÛ¾÷°ø°£ÀÇ Å¬¸³ÀÌ °¡µæÂ÷Áö ¾Ê¾Ò´ÂÁö " +"È®ÀÎ ÇϽñ⠹ٶø´Ï´Ù." + +#: ../src/dock.c:517 +msgid "" +"Icon cannot be made omnipresent. Please make sure that no other icon is " +"docked in the same position on the other workspaces and the Clip is not full " +"in some workspace." +msgstr "" +"¾ÆÀÌÄÜÀ» Ç×»ó º¸ÀÌ°Ô ÇÒ ¼ö ¾ø½À´Ï´Ù. ´Ù¸¥ ÀÛ¾÷ °ø°£ÀÇ °°Àº À§Ä¡¿¡ " +"¾ÆÀÌÄÜÀÌ µµÅ©µÇÁö ¾Ê¾Ò´ÂÁö ±×¸®°í ´Ù¸¥ ÀÛ¾÷°ø°£ÀÇ Å¬¸³ÀÌ °¡µæÂ÷Áö ¾Ê¾Ò´ÂÁö " +"È®ÀÎ ÇϽñ⠹ٶø´Ï´Ù." + +#: ../src/dock.c:543 msgid "Workspace Clip" msgstr "ÀÛ¾÷°ø°£ Ŭ¸³" -#: ../src/dock.c:496 +#: ../src/dock.c:544 msgid "All selected icons will be removed!" msgstr "¼±ÅÃÇÑ ¸ðµç ¾ÆÀÌÄÜÀÌ ¾ø¾îÁú °ÍÀÔ´Ï´Ù!!" -#: ../src/dock.c:543 ../src/dock.c:1123 ../src/dock.c:1125 ../src/dock.c:3353 +#: ../src/dock.c:591 ../src/dock.c:1174 ../src/dock.c:1176 ../src/dock.c:3425 msgid "Keep Icon" msgstr "¾ÆÀÌÄÜ À¯Áö" -#: ../src/dock.c:544 ../src/dock.c:2078 ../src/dock.c:2212 +#: ../src/dock.c:592 ../src/dock.c:2129 ../src/dock.c:2263 msgid "Type the command used to launch the application" msgstr "¾ÖÇø®ÄÉÀ̼ÇÀ» ½ÇÇàÇϴµ¥ ÇÊ¿äÇÑ ¸í·ÉÀ» ÀÔ·ÂÇÕ´Ï´Ù" -#: ../src/dock.c:925 +#: ../src/dock.c:973 #, c-format msgid "could not launch application %s\n" msgstr "¾ÖÇø®ÄÉÀÌ¼Ç %sÀ» ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: ../src/dock.c:980 +#: ../src/dock.c:1028 msgid "could not create workspace submenu for Clip menu" msgstr "Ŭ¸³ ¸Þ´º¸¦ À§ÇÑ ÀÛ¾÷°ø°£ ÇϺθ޴º¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: ../src/dock.c:1043 +#: ../src/dock.c:1091 msgid "could not create options submenu for Clip menu" msgstr "Ŭ¸³ ¸Þ´º¸¦ À§ÇÑ ¿É¼Ç ÇϺθ޴º¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: ../src/dock.c:1047 +#: ../src/dock.c:1095 msgid "Keep on Top" msgstr "Ç×»ó À§·Î" -#: ../src/dock.c:1053 +#: ../src/dock.c:1101 msgid "Collapsed" msgstr "¾ÆÀÌÄÜ ¼û±è" -#: ../src/dock.c:1059 +#: ../src/dock.c:1107 msgid "AutoCollapse" msgstr "ÀÚµ¿ ¼û±è" -#: ../src/dock.c:1065 +#: ../src/dock.c:1113 msgid "AutoRaiseLower" msgstr "ÀÚµ¿ ¿Ã¸²/³»¸²" -#: ../src/dock.c:1071 +#: ../src/dock.c:1119 msgid "AutoAttract Icons" msgstr "¾ÆÀÌÄÜ ÀÚµ¿ ¸ðÀ½" -#: ../src/dock.c:1077 +#: ../src/dock.c:1125 msgid "Keep Attracted Icons" msgstr "¸ðÀº ¾ÆÀÌÄÜ À¯Áö" -#: ../src/dock.c:1101 ../src/winmenu.c:407 +#: ../src/dock.c:1149 ../src/winmenu.c:407 msgid "Keep on top" msgstr "Ç×»ó À§·Î" -#: ../src/dock.c:1107 +#: ../src/dock.c:1155 msgid "Clip Options" msgstr "Ŭ¸³ ¿É¼Ç" -#: ../src/dock.c:1114 ../src/dock.c:1116 ../src/dock.c:3334 +#: ../src/dock.c:1165 ../src/dock.c:1167 ../src/dock.c:3407 msgid "Select Icon" msgstr "¾ÆÀÌÄÜ ¼±ÅÃ" -#: ../src/dock.c:1118 ../src/dock.c:1121 ../src/dock.c:3344 +#: ../src/dock.c:1169 ../src/dock.c:1172 ../src/dock.c:3416 msgid "Select All Icons" msgstr "¸ðµç ¾ÆÀÌÄÜ ¼±ÅÃ" -#: ../src/dock.c:1127 ../src/dock.c:1129 ../src/dock.c:3361 +#: ../src/dock.c:1178 ../src/dock.c:1180 ../src/dock.c:3433 msgid "Move Icon To" msgstr "¾ÆÀÌÄÜ ¿Å±è" -#: ../src/dock.c:1134 ../src/dock.c:1137 ../src/dock.c:3372 +#: ../src/dock.c:1185 ../src/dock.c:1188 ../src/dock.c:3444 msgid "Remove Icon" msgstr "¾ÆÀÌÄÜ ¾ø¾Ú" -#: ../src/dock.c:1139 +#: ../src/dock.c:1190 msgid "Attract Icons" msgstr "¾ÆÀÌÄÜ ¸ðÀ½" -#: ../src/dock.c:1142 +#: ../src/dock.c:1193 msgid "Launch" msgstr "½ÇÇà" -#: ../src/dock.c:1150 +#: ../src/dock.c:1201 msgid "Settings..." msgstr "¼³Á¤..." -#: ../src/dock.c:1543 ../src/dock.c:1557 ../src/dock.c:1571 ../src/dock.c:1581 -#: ../src/dock.c:1606 +#: ../src/dock.c:1594 ../src/dock.c:1608 ../src/dock.c:1622 ../src/dock.c:1632 +#: ../src/dock.c:1657 #, c-format msgid "bad value in docked icon state info %s" msgstr "Dock ¾ÆÀÌÄÜÀÇ »óÅÂÁ¤º¸¿¡ À߸øµÈ °ª %s" -#: ../src/dock.c:1589 +#: ../src/dock.c:1640 #, c-format msgid "bad value in docked icon position %i,%i" msgstr "Dock ¾ÆÀÌÄÜÀÇ À§Ä¡°ª %i,%i ´Â À߸øµÈ °ª" -#: ../src/dock.c:1845 +#: ../src/dock.c:1896 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "Dock¿¡ µé¾î°£ ¾ÆÀÌÄÜÀÌ ³Ê¹« ¸¹À½. ¸ÂÁö ¾Ê´Â °ÍÀº ¹«½ÃÇÕ´Ï´Ù" #. icon->forced_dock = 1; -#: ../src/dock.c:2077 ../src/dock.c:2211 +#: ../src/dock.c:2128 ../src/dock.c:2262 msgid "Dock Icon" msgstr "Dock ¾ÆÀÌÄÜ" -#: ../src/dock.c:3242 ../src/dock.c:3246 +#: ../src/dock.c:3293 ../src/dock.c:3297 #, c-format msgid "Could not execute command \"%s\"" msgstr "\"%s\" ¸í·ÉÀ» ½ÇÇàÇÒ ¼ö ¾øÀ½." -#: ../src/dock.c:3332 +#: ../src/dock.c:3390 ../src/winmenu.c:417 ../src/winspector.c:1197 +msgid "Omnipresent" +msgstr "Ç×»ó º¸ÀÓ" + +#: ../src/dock.c:3392 +msgid "Toggle Omnipresent" +msgstr "Ç×»ó º¸ÀÓ ¼±ÅÃ" + +#: ../src/dock.c:3395 +msgid "Unset Omnipresent" +msgstr "Ç×»ó º¸ÀÓ ÇØÁ¦" + +#: ../src/dock.c:3397 +msgid "Set Omnipresent" +msgstr "Ç×»ó º¸ÀÓ ¼³Á¤" + +#: ../src/dock.c:3405 msgid "Unselect Icon" msgstr "¾ÆÀÌÄÜ ¼±ÅÃ ÇØÁ¦" -#: ../src/dock.c:3342 +#: ../src/dock.c:3414 msgid "Unselect All Icons" msgstr "¸ðµç ¾ÆÀÌÄÜ ¼±ÅÃ ÇØÁ¦" -#: ../src/dock.c:3351 +#: ../src/dock.c:3423 msgid "Keep Icons" msgstr "¾ÆÀÌÄÜ À¯Áö" -#: ../src/dock.c:3359 +#: ../src/dock.c:3431 msgid "Move Icons To" msgstr "¾ÆÀÌÄÜ ¿Å±è" -#: ../src/dock.c:3370 +#: ../src/dock.c:3442 msgid "Remove Icons" msgstr "¾ÆÀÌÄÜ ¾ø¾Ú" -#: ../src/dockedapp.c:131 +#: ../src/dockedapp.c:130 #, c-format msgid "could not find icon %s, used in a docked application" msgstr "µµÅ·µÈ ¾ÖÇø®ÄÉÀ̼ǿ¡ »ç¿ëÇÒ ¾ÆÀÌÄÜ %sÀ» ãÀ» ¼ö ¾øÀ½" -#: ../src/dockedapp.c:210 +#: ../src/dockedapp.c:209 #, c-format msgid "Could not open specified icon file: %s" msgstr "ÁöÁ¤µÈ ¾ÆÀÌÄÜ ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s" -#: ../src/dockedapp.c:212 +#: ../src/dockedapp.c:211 msgid "Ignore" msgstr "¹«½Ã" @@ -489,41 +529,40 @@ msgid "" "is docked in the same position on the other workspaces, and the Clip is not " "full in some workspace, then try again." msgstr "" +"¾ÆÀÌÄÜÀ» Ç×»ó º¸ÀÌ°Ô ÇÒ ¼ö ¾ø½À´Ï´Ù. ´Ù¸¥ ÀÛ¾÷ °ø°£ÀÇ °°Àº À§Ä¡¿¡ " +"¾ÆÀÌÄÜÀÌ µµÅ©µÇÁö ¾Ê¾Ò´ÂÁö ±×¸®°í ´Ù¸¥ ÀÛ¾÷°ø°£ÀÇ Å¬¸³ÀÌ °¡µæÂ÷Áö ¾Ê¾Ò´ÂÁö " +"È®ÀÎ ÇϽŠÈÄ¿¡ ´Ù½Ã ½ÃµµÇϽʽÿÀ." -#: ../src/dockedapp.c:312 +#: ../src/dockedapp.c:313 msgid "Start when WindowMaker is started" msgstr "À©µµ¿ì ¸ÞÀÌÄ¿¸¦ ½ÇÇàÇÒ¶§ ½ÃÀÛÇÔ" #: ../src/dockedapp.c:319 -msgid "Omnipresent application icon" -msgstr "¾ÖÇø®ÄÉÀÌ¼Ç ¾ÆÀÌÄÜ Ç×»ó º¸ÀÓ" - -#: ../src/dockedapp.c:328 msgid "Application path and arguments" msgstr "¾ÖÇø®ÄÉÀÌ¼Ç °æ·Î¿Í Àμö" -#: ../src/dockedapp.c:339 +#: ../src/dockedapp.c:330 msgid "Command for files dropped with DND" msgstr "µå·¢¿£µå·ÓÀ¸·Î ½ÇÇàÇÒ ¸í·É¾î" -#: ../src/dockedapp.c:351 +#: ../src/dockedapp.c:342 #, c-format msgid "%d will be replaced with the file name" msgstr "%d´Â ÆÄÀÏ À̸§À¸·Î ´ëüÇÕ´Ï´Ù" -#: ../src/dockedapp.c:355 +#: ../src/dockedapp.c:346 msgid "DND support was not compiled in" msgstr "ÄÄÆÄÀϽà DND Áö¿øÀÌ Æ÷ÇÔµÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: ../src/dockedapp.c:361 +#: ../src/dockedapp.c:352 msgid "Icon Image" msgstr "¾ÆÀÌÄÜ À̹ÌÁö" -#: ../src/dockedapp.c:373 ../src/winspector.c:1333 +#: ../src/dockedapp.c:364 ../src/winspector.c:1333 msgid "Browse..." msgstr "ã±â..." -#: ../src/dockedapp.c:418 +#: ../src/dockedapp.c:409 msgid "Docked Application Settings" msgstr "Dock ¾ÖÇø®ÄÉÀÌ¼Ç ¼³Á¤" @@ -1034,6 +1073,8 @@ msgid "" "The applications menu could not be loaded.Look at the console output for a " "detaileddescription of the errors" msgstr "" +"¾ÖÇø®ÄÉÀÌ¼Ç ¸Þ´º¸¦ ÀÐÀ» ¼ö ¾øÀ½. ÄַܼΠÃâ·ÂµÇ´Â ÀÚ¼¼ÇÑ ¿À·ù ¸Þ¼¼Áö¸¦ " +"Âü°íÇϽʽÿÀ." #: ../src/screen.c:459 #, c-format @@ -1233,10 +1274,6 @@ msgstr "â msgid "Keep at bottom" msgstr "Ç×»ó ¾Æ·¡·Î/°¡¶ó¾ÉÀ½" -#: ../src/winmenu.c:417 ../src/winspector.c:1197 -msgid "Omnipresent" -msgstr "Ç×»ó º¸ÀÓ" - #. #. * Warning: If you make some change that affects the order of the #. * entries, you must update the command #defines in the top of @@ -1608,24 +1645,24 @@ msgstr "" "ÀÖ´ø ¾ÖÇø®ÄÉÀÌ¼Ç ¾ÆÀÌÄÜÀÌ Á¦´ë·Î ÀÛµ¿Ä¡ ¾ÊÀ»\n" "¼öµµ ÀÖ´Ù´Â Á¡À» À¯ÀÇ ¹Ù¶õ´Ù." -#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:700 +#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:703 #, c-format msgid "Workspace %i" msgstr "ÀÛ¾÷°ø°£ %i" -#: ../src/workspace.c:757 +#: ../src/workspace.c:760 msgid "Workspaces" msgstr "ÀÛ¾÷°ø°£" -#: ../src/workspace.c:759 +#: ../src/workspace.c:762 msgid "could not create Workspace menu" msgstr "ÀÛ¾÷°ø°£ ¸Þ´º¸¦ ¸¸µé¼ö ¾øÀ½" -#: ../src/workspace.c:766 +#: ../src/workspace.c:769 msgid "New" msgstr "»õ ÀÛ¾÷°ø°£ ¸¸µë" -#: ../src/workspace.c:767 +#: ../src/workspace.c:770 msgid "Destroy Last" msgstr "¸¶Áö¸· ÀÛ¾÷°ø°£ ¾ø¾Ú" diff --git a/src/rootmenu.c b/src/rootmenu.c index 106d32b1..0d04d4e7 100644 --- a/src/rootmenu.c +++ b/src/rootmenu.c @@ -1752,9 +1752,9 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard) /* menu hasn't changed or could not be read */ if (!scr->root_menu) { wMessageDialog(scr, _("Error"), - _("The applications menu could not be loaded." - "Look at the console output for a detailed" - "description of the errors"), + _("The applications menu could not be loaded. " + "Look at the console output for a detailed " + "description of the errors."), _("OK"), NULL, NULL); menu = makeDefaultMenu(scr); diff --git a/src/superfluous.c b/src/superfluous.c index c4033e4d..ec5b4100 100644 --- a/src/superfluous.c +++ b/src/superfluous.c @@ -555,19 +555,73 @@ InitXThing(WScreen *scr) #ifdef GHOST_WINDOW_MOVE -RImage* -InitGhostWindowMove(WScreen *scr) + +typedef struct { + WScreen *scr; + + int width, height; + + int iniX, iniY; + int boxX, boxY; + + Window window; + + RXImage *winImage; + + RXImage *backImage; + + /* the combined image */ + RXImage *image; + Pixmap pixmap; + +} _GhostWindowData; + + + +_GhostWindowData* +InitGhostWindowMove(WWindow *wwin) { - RXImage *ximg; - RImage *img; + _GhostWindowData *gdata; + WScreen *scr = wwin->screen_ptr; - ximg = RGetXImage(scr->rcontext, scr->root_win, 0, 0, - scr->scr_width, scr->scr_height); - img = RCreateImageFromXImage(scr->rcontext, ximg->image, NULL); - RDestroyXImage(dpy, ximg); + gdata = wmalloc(sizeof(_GhostWindowData)); - return img; + gdata->width = wwin->frame->core->width; + gdata->height = wwin->frame->core->height; + + gdata->iniX = wwin->frame_x; + gdata->iniY = wwin->frame_y; + + gdata->boxX = wwin->frame_x; + gdata->boxY = wwin->frame_y; + + gdata->window = + XCreateSimpleWindow(dpy, scr->root_win, wwin->frame_x, wwin->frame_y, + gdata->width, gdata->height, 0, 0, 0); + + gdata->winImage = + RGetXImage(scr->rcontext, wwin->frame->core->window, 0, 0, + scr->frame->core->width, scr->frame->core->height); + + gdata->backImage = + RCreateXImage(scr->rcontext, scr->w_depth, + scr->frame->core->width, scr->frame->core->height); + + memcpy(gdata->backImage->image->data, gdata->winImage->image->data, + gdata->winImage->image->bytes_per_line * scr->frame->core->height); + + return gdata; } + +void +UpdateGhostWindowMove(void *data, int x, int y) +{ + _GhostWindowData *gdata = (_GhostWindowData*)data; + + +} + + #endif /* GHOST_WINDOW_MOVE */