From f38c492356c3cf41cb8da51f2a5c4a104861750e Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Fri, 16 May 2003 18:06:14 +0000 Subject: [PATCH] Ignore internal buttons when placing windows (+I don't like duplicated code). SVN revision: 6911 --- po/de.po | 50 +++++----- po/dk.po | 50 +++++----- po/en_US.po | 50 +++++----- po/es.po | 50 +++++----- po/fr.po | 50 +++++----- po/hu.po | 50 +++++----- po/ja.po | 50 +++++----- po/ko.po | 50 +++++----- po/nl.po | 50 +++++----- po/no.po | 50 +++++----- po/pl.po | 50 +++++----- po/pt.po | 50 +++++----- po/pt_BR.po | 50 +++++----- po/ru.po | 50 +++++----- po/sv.po | 50 +++++----- po/tr.po | 50 +++++----- src/E.h | 5 + src/actions.c | 62 +++++++------ src/arrange.c | 252 +++++++++++++++++++++++++------------------------- src/borders.c | 192 +------------------------------------- src/dialog.c | 145 ++--------------------------- src/menus.c | 48 +--------- src/session.c | 108 +--------------------- src/warp.c | 49 +--------- src/x.c | 47 ++++++++++ 25 files changed, 624 insertions(+), 1084 deletions(-) diff --git a/po/de.po b/po/de.po index f43ad9cc..580cdd38 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-03-29 21:12+0200\n" "Last-Translator: Matthias Warkus \n" "Language-Team: Enlightenment l10n \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -124,17 +124,17 @@ msgstr "" "Datei ist.\n" # src/actions.c:3282 -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Über Enlightenment %s" # src/actions.c:3298 -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Willkommen zum " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -148,7 +148,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -164,7 +164,7 @@ msgstr "" # src/settings.c:1460 src/settings.c:1522 src/settings.c:1610 # src/settings.c:2012 src/settings.c:3405 src/settings.c:3750 # src/settings.c:4048 src/settings.c:4186 src/snaps.c:547 src/sound.c:262 -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -175,12 +175,12 @@ msgid "OK" msgstr "OK" # src/actions.c:3474 -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Wählen Sie die Gruppe aus, zu der das Fenster gehören wird: \n" # src/actions.c:3824 -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -201,27 +201,27 @@ msgstr "" "\n" # src/actions.c:3858 -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Wählen Sie die Gruppe, aus der Sie das Fenster entfernen wollen. " # src/actions.c:3883 -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Wählen Sie die aufzulösende Gruppe " # src/actions.c:3911 -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Man hat Sie über die Gefahren des Zoommodus gewarnt\n" # src/actions.c:3914 -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Warnung!" # src/actions.c:3916 -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -271,7 +271,7 @@ msgid "Exit" msgstr "Verlassen" # src/settings.c:2526 src/settings.c:2528 -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "Rahmen-Fehler!" @@ -1366,7 +1366,7 @@ msgstr "" "bearbeitet.\n" # src/handlers.c:235 src/session.c:1178 -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Sind Sie sicher?" @@ -1685,28 +1685,28 @@ msgstr "" "Der Fehler trat auf in %s, Zeile %d.\n" # src/menus.c:1947 -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Zu diesem Desktop gehen" # src/menus.c:1964 -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Desktop %i" # src/menus.c:2027 -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Diese Gruppe zeigen/verbergen" # src/menus.c:2031 -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Diese Gruppe minimieren" # src/menus.c:2044 -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Gruppe %i" @@ -2074,7 +2074,7 @@ msgstr "" "Probleme mit dem Dateisystem.\n" # src/session.c:1039 -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -2100,7 +2100,7 @@ msgstr "" "\n" # src/session.c:1180 -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -2115,12 +2115,12 @@ msgstr "" "\n" # src/session.c:1184 -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Ja, abmelden " # src/session.c:1185 -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Nein " diff --git a/po/dk.po b/po/dk.po index fa55aeaa..c689f660 100644 --- a/po/dk.po +++ b/po/dk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-03-02 16:23+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Dansk/Danish \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -115,16 +115,16 @@ msgstr "" "Dette program kunne ikke køres.\n" "Dette er fordi filen ikke er en normal fil.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Om Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Velkommen til " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -138,7 +138,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -148,7 +148,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -158,11 +158,11 @@ msgstr "" msgid "OK" msgstr "Ok" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Vælg gruppen som vinduet skal tilhøre: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -174,23 +174,23 @@ msgid "" "\n" msgstr "" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Vælg gruppen som vinduet skal fjernes fra. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Vælg gruppen som skal brydes " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Du er blevet advaret om faren ved zoom-modus\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Advarsel !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -222,7 +222,7 @@ msgstr "Genstart" msgid "Exit" msgstr "Afslut" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -1010,7 +1010,7 @@ msgstr "" "\n" "Det kan SKE at dette ikke redigere dine filer korrekt.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Er du sikker?" @@ -1227,24 +1227,24 @@ msgid "" "The error occurred at %s, line %d.\n" msgstr "" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Gå til dette skrivebord" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Skrivebord %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Vis/skjul denne gruppe" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Ikonificér denne gruppe" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Gruppe %i" @@ -1503,7 +1503,7 @@ msgstr "" "Der opstod et problem da jeg ville autogemme dine\n" "indstillinger - gemmer systemproblemer.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1518,7 +1518,7 @@ msgid "" "... I hope.\n" msgstr "" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1531,11 +1531,11 @@ msgstr "" " Er du sikker på at du ønsker at logge ud ? \n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Ja, log ud " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Nej " diff --git a/po/en_US.po b/po/en_US.po index 6a2567c6..1ec3ee4d 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-01-04 23:15+0100\n" "Last-Translator: Peter Kjellerstedt \n" "Language-Team: American English \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -84,16 +84,16 @@ msgid "" "This is because the file is not a regular file.\n" msgstr "" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -107,7 +107,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -117,7 +117,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -127,11 +127,11 @@ msgstr "" msgid "OK" msgstr "" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr "" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -143,23 +143,23 @@ msgid "" "\n" msgstr "" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr "" -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr "" -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -203,7 +203,7 @@ msgstr "" msgid "Exit" msgstr "" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -918,7 +918,7 @@ msgid "" "It is possible that this MAY not properly edit your files.\n" msgstr "" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "" @@ -1133,24 +1133,24 @@ msgid "" "The error occurred at %s, line %d.\n" msgstr "" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "" @@ -1407,7 +1407,7 @@ msgid "" "system problems.\n" msgstr "" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1422,7 +1422,7 @@ msgid "" "... I hope.\n" msgstr "" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1431,11 +1431,11 @@ msgid "" "\n" msgstr "" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr "" -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr "" diff --git a/po/es.po b/po/es.po index 23bdb21e..70f9322d 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-04-09 18:46+0200\n" "Last-Translator: Antonio Ognio Cesti \n" "Language-Team: Spanish \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -119,16 +119,16 @@ msgstr "" "Este programa no ha podido ser ejecutado.\n" "Esto se debe a que el archivo no es un archivo regular.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Acerca de Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Bienvenido a " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -142,7 +142,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -152,7 +152,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -162,11 +162,11 @@ msgstr "" msgid "OK" msgstr "Aceptar" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Seleccione el grupo al que la ventana pertenecerá: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -186,23 +186,23 @@ msgstr "" " Seleccione otro grupo al que la ventana pertenecerá aquí: \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Seleccione el grupo del que la ventana será retirada. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Seleccione el grupo que desea dividir " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Ud. ha sido advertido de los peligros del modo Zoom\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Advertencia !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -246,7 +246,7 @@ msgstr "Reiniciar" msgid "Exit" msgstr "Salir" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -1227,7 +1227,7 @@ msgstr "" "\n" "Es posible que esta opción NO EDITE CORRECTAMENTE sus archivos.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "¿Está seguro?" @@ -1509,24 +1509,24 @@ msgstr "" "El valor del apuntador fue %x.\n" "El error ocurrió en %s, línea %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Ir a este Escritorio" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Escritorio %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Mostrar/Ocultar este grupo" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Iconizar este grupo" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Grupo %i" @@ -1853,7 +1853,7 @@ msgstr "" "Ocurrió un error salvando sus datos autosalvables.\n" "Problemas con su sistema de archivos.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1879,7 +1879,7 @@ msgstr "" "\n" "... eso espero.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1893,11 +1893,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " SI, Salir " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " No " diff --git a/po/fr.po b/po/fr.po index 60def1c8..aedb6c53 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-01-05 00:25+0100\n" "Last-Translator: Sylvain GIL \n" "Language-Team: French \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -111,16 +111,16 @@ msgstr "" "Ce programme ne peut pas être éxécuté.\n" "Le fichier n'est pas un fichier correct.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "A propos d'Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Bienvenue dans le" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -134,7 +134,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -144,7 +144,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -154,11 +154,11 @@ msgstr "" msgid "OK" msgstr "Confirmer" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Choisissez le groupe auquel la fenêtre appartiendra : \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -178,23 +178,23 @@ msgstr "" " Choisissez un autre groupe auquel la fenêtre appartiendra : \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr "Choisissez le groupe duquel la fenêtre sera retirée. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Sélectionnez le groupe à détruire " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Vous avez été averti des risques du mode Zoom\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Avertissement !" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -235,7 +235,7 @@ msgstr "Red msgid "Exit" msgstr "Sortir" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -1164,7 +1164,7 @@ msgstr "" "\n" "AVERTISSEMENT AVERTISSEMENT AVERTISSEMENT !\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Êtes vous sûrs ?" @@ -1446,24 +1446,24 @@ msgstr "" "La valeur du pointeur était %x.\n" "L'erreur a eu lieu dans %s, ligne %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Aller à ce bureau" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Bureau %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Montrer/Cacher ce groupe" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Iconifier ce groupe" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Groupe %i" @@ -1778,7 +1778,7 @@ msgstr "" "Peut-être que vous n'avez plus d'espace disque, oubien pas les\n" "privilèges nécessaires pour écrire dans votre système de fichiers.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1804,7 +1804,7 @@ msgstr "" "\n" "... Enfin j'espère.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1818,11 +1818,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr "Oui, quitter" -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Non " diff --git a/po/hu.po b/po/hu.po index f4f28ccb..041c098a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-01-04 23:15+0100\n" "Last-Translator: Gergely Egerváry \n" "Language-Team: Hungarian \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -110,16 +110,16 @@ msgstr "" "A programot nem lehet futtatni.\n" "A megadott file nem hagyományos file.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Az Enlightenment %s névjegye" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Üdvözli az " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -133,7 +133,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -143,7 +143,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -153,11 +153,11 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Válassza ki a csoportot ahova az ablak tartozni fog: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -177,23 +177,23 @@ msgstr "" " Válassza ki a csoportot ahova az ablak tartozni fog: \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Válassza ki a csoportot ahonnan az ablak el lesz távolítva. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Válassza ki a csoportot a megszakításhoz " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Vigyázat !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -225,7 +225,7 @@ msgstr " msgid "Exit" msgstr "Kilépés" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -904,7 +904,7 @@ msgid "" "It is possible that this MAY not properly edit your files.\n" msgstr "" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Biztos benne?" @@ -1121,24 +1121,24 @@ msgid "" "The error occurred at %s, line %d.\n" msgstr "" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Ugrás erre az asztalra" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "%i. asztal" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Csoport mutatása/elrejtése" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Csoport kicsinyítése" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "%i. csoport" @@ -1383,7 +1383,7 @@ msgid "" "system problems.\n" msgstr "" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1398,7 +1398,7 @@ msgid "" "... I hope.\n" msgstr "" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1412,11 +1412,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Igen, kilépek " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Nem " diff --git a/po/ja.po b/po/ja.po index 25316355..d0e8595f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2001-01-07 14:00+0900\n" "Last-Translator: Enlightenment-jp Mailing List \n" "Language-Team: Japanese \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -117,16 +117,16 @@ msgstr "" "¤³¤Î¥×¥í¥°¥é¥à¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£\n" "¤³¤Î¥Õ¥¡¥¤¥ë¤ÏÄ̾ï¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Enlightenment %s ¤Ë¤Ä¤¤¤Æ" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -140,7 +140,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -150,7 +150,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -160,11 +160,11 @@ msgstr "" msgid "OK" msgstr "λ²ò" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " ¤³¤Î¥¦¥£¥ó¥É¥¦¤¬Â°¤¹¤ë¥°¥ë¡¼¥×¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -184,23 +184,23 @@ msgstr "" " ¤³¤Î¥¦¥£¥ó¥É¥¦¤¬Â°¤¹¤ëÊ̤Υ°¥ë¡¼¥×¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤ :\n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " ¤³¤Î¥°¥ë¡¼¥×¤«¤é¤È¤ê¤Î¤¾¤¯¥¦¥£¥ó¥É¥¦¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " ÇË´þ¤¹¤ë¥°¥ë¡¼¥×¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Zoom ¥â¡¼¥É¤Î´í¸±À­¤Ï°ÊÁ°¤Ë·Ù¹ð¤·¤Æ¤¢¤ê¤Þ¤¹¡£\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -244,7 +244,7 @@ msgstr " msgid "Exit" msgstr "½ªÎ»" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "border ¥¨¥é¡¼" @@ -1208,7 +1208,7 @@ msgstr "" "\n" "¤¿¤Ö¤ó¥¹¥¿¡¼¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤¬Àµ¤·¤¯ÊÔ½¸¤µ¤ì¤Æ¤¤¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "¤¤¤¤¤Ç¤¹¤«?" @@ -1488,24 +1488,24 @@ msgstr "" "¥Ý¥¤¥ó¥¿¤ÎÃÍ¤Ï %x ¤Ç¤¹¡£\n" "¤³¤Î¥¨¥é¡¼¤Ï %s ¤Î %d ¹Ô¤ÇÀ¸¤¸¤Þ¤·¤¿¡£\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "¤³¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ë°ÜÆ°" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "¥Ç¥¹¥¯¥È¥Ã¥× %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "¤³¤Î¥°¥ë¡¼¥×¤ò ɽ¼¨/Èóɽ¼¨ ¤Ë¤¹¤ë" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "¤³¤Î¥°¥ë¡¼¥×¤ò¥¢¥¤¥³¥ó¤Ë" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "¥°¥ë¡¼¥× %i" @@ -1828,7 +1828,7 @@ msgstr "" "¥ª¡¼¥È¥»¡¼¥Ö¥Ç¡¼¥¿¤ò½ñ¤­¹þ¤ß»þÅÀ¤Ç¥¨¥é¡¼¤¬µ¯¤­¤Þ¤·¤¿¡£\n" "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ËÌäÂ꤬¤¢¤ê¤Þ¤¹¡£\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1854,7 +1854,7 @@ msgstr "" "\n" "...¤¿¤Ö¤ó¡£\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1868,11 +1868,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " ¤Ï¤¤¡¢¥í¥°¥¢¥¦¥È¤·¤Þ¤¹" -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " ¤¤¤¤¤¨¡¢¥í¥°¥¢¥¦¥È¤·¤Þ¤»¤ó " diff --git a/po/ko.po b/po/ko.po index 02bb34bb..66ad1025 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-04-10 16:10:30+0900\n" "Last-Translator: Sung-Hyun Nam \n" "Language-Team: Korean \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=euc-kr\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -114,16 +114,16 @@ msgstr "" "ÀÌ ÇÁ·Î±×·¥Àº ½ÇÇàµÉ ¼ö ¾ø½À´Ï´Ù.\n" "ÀÌ°ÍÀº ÀϹÝÀûÀÎ ÆÄÀÏÀÌ ¾Æ´Ï±â ¶§¹®ÀÔ´Ï´Ù.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "ÀζóÀÌÆ°¸ÕÆ® %s¿¡ ´ëÇÏ¿©" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Welcome to the " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -137,7 +137,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -147,7 +147,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -157,11 +157,11 @@ msgstr "" msgid "OK" msgstr "È®ÀÎ" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " âÀÌ ¼ÓÇÒ ±×·ì ¼±ÅÃ: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -181,23 +181,23 @@ msgstr "" " âÀÌ ¼ÓÇÒ ´Ù¸¥ ±×·ìÀ» ¿©±â¿¡¼­ ¼±ÅÃÇϽʽÿÀ: \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " âÀ» »èÁ¦ÇÒ ±×·ìÀ» ¼±ÅÃÇϽʽÿÀ. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " ¾ø¾Ù ±×·ìÀ» ¼±ÅÃÇϽʽÿÀ " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "È®´ë ¸ðµå°¡ ¾ó¸¶³ª À§ÇèÇÑ °ÇÁö °æ°íÇß½À´Ï´Ù\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "°æ°í !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -241,7 +241,7 @@ msgstr " msgid "Exit" msgstr "Á¾·á" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "º¸´õ ¿¡·¯!" @@ -1184,7 +1184,7 @@ msgstr "" "±×·¯¸é ´ç½ÅÀÌ ÇöÀçÀÇ Ã¢ °ü¸®ÀÚ¸¦ Á¾·áÇÑ ÈÄ ´Ù½Ã\n" "·Î±×ÀÎÇϸé ÀζóÀÌÆ°¸ÕÆ®°¡ ½ÇÇàµÉ °Í ÀÔ´Ï´Ù.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "È®½ÇÇÑ°¡¿ä?" @@ -1462,24 +1462,24 @@ msgstr "" "Æ÷ÀÎÅÍ °ªÀº %x À̾ú½À´Ï´Ù.\n" "ÀÌ ¿¡·¯´Â %s, %d ¶óÀο¡¼­ ¹ß»ýÇß½À´Ï´Ù.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "ÀÌ µ¥½ºÅ©Å¾À¸·Î °¡±â" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "µ¥½ºÅ©Å¾ %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "ÀÌ ±×·ì º¸¿©ÁÖ±â/¼û±â±â" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "ÀÌ ±×·ì ¾ÆÀÌÄÜÈ­" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "±×·ì %i" @@ -1802,7 +1802,7 @@ msgstr "" "ÀÚµ¿ÀúÀå µ¥ÀÌŸ¸¦ ÀúÀåÇÏ´ø Áß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù.\n" "ÆÄÀÏ ½Ã½ºÅÛ ¹®Á¦ÀÔ´Ï´Ù.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1828,7 +1828,7 @@ msgstr "" "\n" "... ±×·¯±æ ¹Ù¶ø´Ï´Ù.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1842,11 +1842,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " ¿¹, ·Î±×¾Æ¿ô " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " ¾Æ´Ï¿À " diff --git a/po/nl.po b/po/nl.po index 0e6ce9ff..aa6b827f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-01-04 23:15+0100\n" "Last-Translator: Dènis Riedijk \n" "Language-Team: Dutch \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -110,16 +110,16 @@ msgid "" "This is because the file is not a regular file.\n" msgstr "" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Over Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Welkom bij de " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -133,7 +133,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -143,7 +143,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -153,11 +153,11 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr "Kies de groep waar het venster bij moet behoren : \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -177,23 +177,23 @@ msgstr "" " Kies hier een andere groep waar het venster toe zal behoren:\n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Kies de groep waar het venster van verwijderd moet worden" -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Kies de groep om te breken" -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Je bent gewaarschuwd over Zoom mode\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Let Op !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -237,7 +237,7 @@ msgstr "Herstarten" msgid "Exit" msgstr "Afsluiten" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -1040,7 +1040,7 @@ msgid "" "It is possible that this MAY not properly edit your files.\n" msgstr "" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Weet U het zeker?" @@ -1254,24 +1254,24 @@ msgid "" "The error occurred at %s, line %d.\n" msgstr "" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Ga naar deze desktop" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Desktop %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Toon/Verberg deze groep" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Minimaliseer deze groep" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Groep %i" @@ -1516,7 +1516,7 @@ msgid "" "system problems.\n" msgstr "" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1531,7 +1531,7 @@ msgid "" "... I hope.\n" msgstr "" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1545,11 +1545,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Ja, log uit " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Nee " diff --git a/po/no.po b/po/no.po index e3a8ffd1..0cda20b9 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-03-07 12:08+0100\n" "Last-Translator: Terje Røsten \n" "Language-Team: Norwegian \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -114,16 +114,16 @@ msgstr "" "Dette programmet kunne ikke bli kjørt.\n" "Årsaken er at fila ikke er en normal fil.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Om Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Velkommen til " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -137,7 +137,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -147,7 +147,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -157,11 +157,11 @@ msgstr "" msgid "OK" msgstr "Ok" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Velg den gruppa som vinduet skal tilhøre: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -180,23 +180,23 @@ msgstr "" " Velg en annen gruppe som dette vinduet skal tilhøre: \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Velg gruppa som vinduet skal fjernes fra. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Velg gruppa som skal brytes opp " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Du har nå blitt anvart om farene ved bruk av Zoom modus\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Advarsel!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -238,7 +238,7 @@ msgstr "Start p msgid "Exit" msgstr "Avslutt" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "Feil med ramme!" @@ -1202,7 +1202,7 @@ msgstr "" "\n" "Det er mulig oppstartsfila ikke blir konfigurt korrekt.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Er du sikker du vil gjøre dette?" @@ -1481,24 +1481,24 @@ msgstr "" "Verdien til pekeren var: %x.\n" "Feilen oppstod ved %s, linje %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Skift fokus til dette skrivebordet" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Skriverbord nr. %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Vis/Skjul denne gruppa" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Ikonifiser denne gruppa" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Gruppe %i" @@ -1816,7 +1816,7 @@ msgstr "" "Det var en feil ved lagring av informasjon som lagres automatisk\n" "- kunne ikke skrive til disk på dette systemet.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1838,7 +1838,7 @@ msgstr "" "\n" "... håper jeg.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1852,11 +1852,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Ja, avslutt " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Nei, fortsett" diff --git a/po/pl.po b/po/pl.po index dbab8054..a2c64f07 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-01-04 23:15+0100\n" "Last-Translator: Adam Kisiel \n" "Language-Team: Polshi \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -113,16 +113,16 @@ msgstr "" "Nie mo¿na uruchomiæ programu.\n" "Ten plik nie jest plikiem zwyk³ym.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "O Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Witamy w " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -136,7 +136,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -146,7 +146,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -156,11 +156,11 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Wybierz grupê, do której bêdzie nale¿eæ okno:\n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -180,23 +180,23 @@ msgstr "" " Wybierz inn± grupê, do której bêdzie nale¿eæ okno: \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Wybierz grupê, z której mam usun±æ okno. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Wybierz grupê, któr± mam rozbiæ " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Ostrze¿ono Ciê przed niebezpieczeñstwami trybu Powiêkszenia \n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Ostrze¿enie !" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -241,7 +241,7 @@ msgstr "Uruchom ponownie" msgid "Exit" msgstr "Wyj¶cie" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "B³±d sekcji Border" @@ -1203,7 +1203,7 @@ msgstr "" "\n" "Istnieje mo¿liwo¶æ b³êdnej modyfikacji plików.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Na pewno?" @@ -1483,24 +1483,24 @@ msgstr "" "Warto¶æ wska¼nika wynosi³a %x.\n" "B³±d wyst±pi³ w %s, linia %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Przejd¼ do tego Pulpitu" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Pulpit %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Poka¿/Ukryj t± grupê" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Zwiñ t± grupê do ikony" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Grupa %i" @@ -1823,7 +1823,7 @@ msgstr "" "skoñczy³a Ci siê przestrzeñ dyskowa, nie masz praw zapisu,\n" "lub wyst±pi³ inny, podobny problem\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1849,7 +1849,7 @@ msgstr "" "\n" "... Tak± mam nadziejê.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1863,11 +1863,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Tak, Wyloguj siê " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Nie " diff --git a/po/pt.po b/po/pt.po index 6ba0f15e..0f00db9f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-03-07 16:35+0100\n" "Last-Translator: Daniel Vieira Pereira \n" "Language-Team: Portuguese \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -115,16 +115,16 @@ msgstr "" "Este programa não pode ser executado.\n" "Isto aconteceu porque o ficheiro não é um ficheiro regular.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Sobre o Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Benvindo ao " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -138,7 +138,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -148,7 +148,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -158,11 +158,11 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Escolha o grupo ao qual a janela irá pertencer: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -180,23 +180,23 @@ msgstr "" "\n" " Escolha outro grupo ao qual a janela pertencerá aqui: \n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Escolha o grupo ao qual quer remover a janela. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Escolha o grupo que quer remover " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Foi avisado sobre os perigos do modo Zoom\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Atenção !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -241,7 +241,7 @@ msgstr "Reiniciar" msgid "Exit" msgstr "Sair" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -1214,7 +1214,7 @@ msgstr "" "\n" "É possivel que isto não consiga editar correctamente os ficheiros\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Tem a certeza?" @@ -1494,24 +1494,24 @@ msgstr "" "value: %x\n" "Este erro ocorreu em %s, linha %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Ir para este Desktop" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Desktop %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Mostar/esconder este grupo" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Minimizar este grupo" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Grupo %i" @@ -1833,7 +1833,7 @@ msgstr "" "Ocorreu um erro guardando a informação no ficheiro de\n" "salvaguarda - problemas no sistema de ficheiros.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1859,7 +1859,7 @@ msgstr "" "\n" " ... espero.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1873,11 +1873,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Sim, Terminar " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Não " diff --git a/po/pt_BR.po b/po/pt_BR.po index 819f5d56..1d34643a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-02-24 16:22+0100\n" "Last-Translator: Roberto S. Teixeira \n" "Language-Team: Portuguese \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -113,16 +113,16 @@ msgstr "" "Esse programa não pôde ser executado.\n" "Isso se deve ao arquivo não ser um arquivo regular.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Sobre o Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Bem-vindo ao " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -136,7 +136,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -146,7 +146,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -156,11 +156,11 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Selecione o grupo ao qual essa janela pertencerá: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -181,23 +181,23 @@ msgstr "" " pertencerá.\n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Selecione o grupo do qual esta janela será removida. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Selecione o grupo a dividir " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Você foi avisado sobre os perigos do modo Zoom\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Aviso !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -242,7 +242,7 @@ msgstr "Reiniciar" msgid "Exit" msgstr "Sair" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -1227,7 +1227,7 @@ msgstr "" "\n" "É possível que seus arquivos POSSAM ser incorretamente editados.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Tem certeza?" @@ -1511,24 +1511,24 @@ msgstr "" "O valor do ponteiro era %x.\n" "Esse erro ocorreu em %s, linha %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Ir para essa Área de Trabalho" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Área de Trabalho %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Exibir/Esconder esse grupo" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Iconificar esse grupo" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Grupo %i" @@ -1853,7 +1853,7 @@ msgstr "" "Ocorreu um erro gravando dados - problemas com o sistema\n" "de arquivos.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1879,7 +1879,7 @@ msgstr "" "\n" "... espero.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1893,11 +1893,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Sim, sair " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Não " diff --git a/po/ru.po b/po/ru.po index bb1c9c6c..a1efc2b1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-01-14 20:43-0300\n" "Last-Translator: Vladimir STEPANOV \n" "Language-Team: Russian \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -116,16 +116,16 @@ msgstr "" "ðÒÏÇÒÁÍÍÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ,\n" "ÔÁË ËÁË ÆÁÊÌ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÙÞÎÙÍ ÆÁÊÌÏÍ.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -139,7 +139,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -149,7 +149,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -159,11 +159,11 @@ msgstr "" msgid "OK" msgstr "" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " ÷ÙÂÅÒÉÔÅ ÇÒÕÐÐÕ, Ë ËÏÔÏÒÏÊ ÂÕÄÅÔ ÐÒÉÎÁÄÌÅÖÁÔØ ÏËÎÏ: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -183,23 +183,23 @@ msgstr "" " ÷ÙÂÅÒÉÔÅ ÄÒÕÇÕÀ ÇÒÕÐÐÕ, Ë ËÏÔÏÒÏÊ ÂÕÄÅÔ ÐÒÉÎÁÄÌÅÖÁÔØ ÏËÎÏ, ÚÄÅÓØ: \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " ÷ÙÂÅÒÉÔÅ ÇÒÕÐÐÕ, ÉÚ ËÏÔÏÒÏÊ ÎÕÖÎÏ ÕÂÒÁÔØ ÜÔÏ ÏËÎÏ. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " ÷ÙÂÅÒÉÔÅ ÇÒÕÐÐÕ, ËÏÔÏÒÕÀ ÈÏÔÉÔÅ ÒÁÚÏÒ×ÁÔØ " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "÷ÁÓ ÐÒÅÄÕÐÒÅÖÄÁÌÉ Ï ÏÐÁÓÎÏÓÔÑÈ ÒÅÖÉÍÁ ÉÚÍÅÎÅÎÉÑ ÒÁÚÒÅÛÅÎÉÑ\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -245,7 +245,7 @@ msgstr " msgid "Exit" msgstr "÷ÙÈÏÄ" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "" @@ -1224,7 +1224,7 @@ msgstr "" "\n" "÷ïúíïöîï, ÷ÁÛÉ ÆÁÊÌÙ ÂÕÄÕÔ ÏÔÒÅÄÁËÔÉÒÏ×ÁÎÙ ÎÅ×ÅÒÎÏ.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "÷Ù Õ×ÅÒÅÎÙ?" @@ -1507,24 +1507,24 @@ msgstr "" "pointer = %x.\n" "ïÛÉÂËÁ ×ÏÚÎÉËÌÁ × %s, ÓÔÒÏËÁ %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "ðÅÒÅÊÔÉ ÎÁ ÜÔÏÔ ÒÁÂÏÞÉÊ ÓÔÏÌ" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "òÁÂÏÞÉÊ ÓÔÏÌ %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "ðÏËÁÚÁÔØ/ÓÐÒÑÔÁÔØ ÜÔÕ ÇÒÕÐÐÕ" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "ó×ÅÒÎÕÔØ ÜÔÕ ÇÒÕÐÐÕ" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "çÒÕÐÐÁ %i" @@ -1849,7 +1849,7 @@ msgstr "" "÷ÏÚÍÏÖÎÙÅ ÐÒÉÞÉÎÙ: ÚÁËÏÎÞÉÌÏÓØ ÍÅÓÔÏ ÎÁ ÄÉÓËÅ, ÏÔÓÕÔÓÔ×ÉÅ ÐÒÁ×\n" "ÎÁ ÚÁÐÉÓØ, Á ÔÁËÖÅ ÄÒÕÇÉÅ ÐÒÏÂÌÅÍÙ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1875,7 +1875,7 @@ msgstr "" "\n" "... ÎÁÄÅÀÓØ.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1889,11 +1889,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " äÁ, ÈÏÞÕ " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " îÅÔ " diff --git a/po/sv.po b/po/sv.po index b7df0081..09da677e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-04-10 17:30+0200\n" "Last-Translator: Bernt Holmberg \n" "Language-Team: Swedish \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -114,16 +114,16 @@ msgstr "" "Programmet kunde inte exekveras.\n" "Orsaken är att filen inte är en vanlig fil.\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Om Enlightenment %s" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Välkommen till " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -137,7 +137,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -147,7 +147,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -157,11 +157,11 @@ msgstr "" msgid "OK" msgstr "Ok" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Välj den grupp som fönstret skall tillhöra: \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -181,23 +181,23 @@ msgstr "" " Välj en annan grupp som fönstret skall tillhöra här: \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Välj den grupp som fönstret skall tas bort ifrån. " -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Välj den grupp som skall brytas upp " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Du har blivit varnad om farorna med Zoom mode\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "Varning !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -241,7 +241,7 @@ msgstr "Starta om" msgid "Exit" msgstr "Avsluta" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "Kant fel!" @@ -1202,7 +1202,7 @@ msgstr "" "Det är möjligt att detta inte kommer att redigera dina\n" "filer korreket.\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Är du säker?" @@ -1486,24 +1486,24 @@ msgstr "" "Pekarens värde var %x.\n" "Felet uppstod vid %s, rad %d.\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Gå till detta skrivbord" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Skrivbord %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Visa/gömma denna grupp" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Ikonifiera denna grupp" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Grupp %i" @@ -1830,7 +1830,7 @@ msgstr "" "Fel vid sparande av dina automat sparade data-filer\n" "system problem.\n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1856,7 +1856,7 @@ msgstr "" "\n" "... hoppas jag.\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1870,11 +1870,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Ja, logga ut " -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Nej " diff --git a/po/tr.po b/po/tr.po index 29288bf4..09e84243 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.16.5\n" -"POT-Creation-Date: 2003-05-14 19:54+0200\n" +"POT-Creation-Date: 2003-05-16 18:52+0200\n" "PO-Revision-Date: 2000-07-30 22:39+0200\n" "Last-Translator: Fatih Demir \n" "Language-Team: Turkish \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-9\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions.c:273 src/borders.c:2577 src/buttons.c:127 src/cmclass.c:97 +#: src/actions.c:273 src/borders.c:2389 src/buttons.c:127 src/cmclass.c:97 #: src/cursors.c:120 src/desktops.c:379 src/iclass.c:111 src/tclass.c:86 #: src/tooltips.c:1026 #, c-format @@ -115,16 +115,16 @@ msgstr "" "Bu uygulama çalýþtýrýlamadý .\n" "Zira bu normal bir dosya deðil .\n" -#: src/actions.c:3308 +#: src/actions.c:3310 #, c-format msgid "About Enlightenment %s" msgstr "Enlightenment %s hakkýnda bilgi " -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "Welcome to the " msgstr "Hoþgeldin" -#: src/actions.c:3324 +#: src/actions.c:3326 msgid "" " version\n" "of the Enlightenment window manager.\n" @@ -138,7 +138,7 @@ msgid "" "This code last updated on:\n" msgstr "" -#: src/actions.c:3334 +#: src/actions.c:3336 msgid "" "\n" "\n" @@ -148,7 +148,7 @@ msgid "" "Mandrake - mandrake@mandrake.net\n" msgstr "" -#: src/actions.c:3339 src/dialog.c:304 src/groups.c:693 src/settings.c:329 +#: src/actions.c:3341 src/dialog.c:304 src/groups.c:693 src/settings.c:329 #: src/settings.c:599 src/settings.c:971 src/settings.c:1179 #: src/settings.c:1416 src/settings.c:1560 src/settings.c:1663 #: src/settings.c:1771 src/settings.c:1855 src/settings.c:1936 @@ -158,11 +158,11 @@ msgstr "" msgid "OK" msgstr "Oldu" -#: src/actions.c:3495 +#: src/actions.c:3497 msgid " Pick the group the window will belong to: \n" msgstr " Pencerenin eklencek olduðu kitleyi seç : \n" -#: src/actions.c:3849 +#: src/actions.c:3851 msgid "" "\n" " There's no current group at the moment. \n" @@ -182,23 +182,23 @@ msgstr "" " Pencerenin eklenecek olduðu baþka bir kitle seç : \n" "\n" -#: src/actions.c:3882 +#: src/actions.c:3884 msgid " Select the group to remove the window from. " msgstr " Pencerenin silnecek olduðu kitleyi seç ." -#: src/actions.c:3906 +#: src/actions.c:3908 msgid " Select the group to break " msgstr " Kýrýlacak kitleyi seç " -#: src/actions.c:3934 +#: src/actions.c:3936 msgid "You have been warned about the dangers of Zoom mode\n" msgstr "Büyütme teþkilinin tehlikesine sana anlattýk gibi geliyor bana ...\n" -#: src/actions.c:3937 +#: src/actions.c:3939 msgid "Warning !!!" msgstr "IKAZ !!!" -#: src/actions.c:3938 +#: src/actions.c:3940 msgid "" "This feature is heavily reliant on a feature of your\n" "X Server called the Vid Mode Extension. This feature exists\n" @@ -243,7 +243,7 @@ msgstr "Yeniden ba msgid "Exit" msgstr "Çýk" -#: src/borders.c:2579 +#: src/borders.c:2391 msgid "Border Error!" msgstr "Kenar hatasý!" @@ -1194,7 +1194,7 @@ msgstr "" "\n" "Bir ihtimal , bu eylem dosyalarýný düzgün bir þekilde deðiþtirmeyebilir .\n" -#: src/handlers.c:231 src/session.c:1226 +#: src/handlers.c:231 src/session.c:1174 msgid "Are you sure?" msgstr "Emin misin ?" @@ -1472,24 +1472,24 @@ msgstr "" "Gösterge deðeri %x idi .\n" "Hata'nýn oluþtuðu yer : %s , satýr %d .\n" -#: src/menus.c:1974 +#: src/menus.c:1932 msgid "Go to this Desktop" msgstr "Bu masaüstüne geç" -#: src/menus.c:1990 +#: src/menus.c:1948 #, c-format msgid "Desktop %i" msgstr "Masaüstü %i" -#: src/menus.c:2053 +#: src/menus.c:2011 msgid "Show/Hide this group" msgstr "Bu kitleyi göster/gizle" -#: src/menus.c:2056 +#: src/menus.c:2014 msgid "Iconify this group" msgstr "Bu kitleyi simgeleþtir" -#: src/menus.c:2068 +#: src/menus.c:2026 #, c-format msgid "Group %i" msgstr "Kitle %i" @@ -1813,7 +1813,7 @@ msgstr "" "Otomatikman kaydedilecek bilgileri kaydedemedim - sistem\n" "dosyalama hatasýndan dolayý \n" -#: src/session.c:1087 +#: src/session.c:1035 msgid "" "ERROR!\n" "\n" @@ -1839,7 +1839,7 @@ msgstr "" "\n" "... inþallah !\n" -#: src/session.c:1228 +#: src/session.c:1176 msgid "" "\n" "\n" @@ -1853,11 +1853,11 @@ msgstr "" "\n" "\n" -#: src/session.c:1231 +#: src/session.c:1179 msgid " Yes, Log Out " msgstr " Evet, çýk" -#: src/session.c:1232 +#: src/session.c:1180 msgid " No " msgstr " Hayýr" diff --git a/src/E.h b/src/E.h index 25b660b5..8494b228 100644 --- a/src/E.h +++ b/src/E.h @@ -1805,6 +1805,8 @@ void PastePixmap(Display * d, Drawable w, Pixmap p, Mask m, int x, int y); void PasteMask(Display * d, Drawable w, Pixmap p, int x, int y, int wd, int ht); +int GetPointerScreenGeometry(int *px, int *py, int *pw, + int *ph); char *NukeBoringevents(XEvent * ev, int num); void DebugEvent(XEvent * ev); @@ -2582,6 +2584,9 @@ int Emkstemp(char *template); void SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy); void ArrangeEwin(EWin * ewin); +void ArrangeEwinCentered(EWin * ewin, int focus); +void ArrangeEwinXY(EWin * ewin, int *px, int *py); +void ArrangeEwinCenteredXY(EWin * ewin, int *px, int *py); void SessionInit(void); void SessionSave(int shutdown); diff --git a/src/actions.c b/src/actions.c index 5f0c6795..5a49b794 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1431,38 +1431,40 @@ doCleanup(void *params) ret = Erealloc(ret, sizeof(RectBox) * ((num + j) + 1 + k)); for (i = 0; i < num; i++) { - if (((blst[i]->desktop == desks.current) - || ((blst[i]->desktop == 0) && (blst[i]->sticky))) - && (blst[i]->visible)) + Button *b = blst[i]; + + if (!b->visible || b->internal) + continue; + if (!b->sticky && (b->desktop != desks.current)) + continue; + + fixed[k].data = NULL; + fixed[k].x = blst[i]->x; + fixed[k].y = blst[i]->y; + fixed[k].w = blst[i]->w; + fixed[k].h = blst[i]->h; + if (fixed[k].x < 0) { - fixed[k].data = NULL; - fixed[k].x = blst[i]->x; - fixed[k].y = blst[i]->y; - fixed[k].w = blst[i]->w; - fixed[k].h = blst[i]->h; - if (fixed[k].x < 0) - { - fixed[k].x += fixed[k].w; - fixed[k].x = 0; - } - if ((fixed[k].x + fixed[k].w) > root.w) - fixed[k].w = root.w - fixed[k].x; - if (fixed[k].y < 0) - { - fixed[k].y += fixed[k].h; - fixed[k].y = 0; - } - if ((fixed[k].y + fixed[k].h) > root.h) - fixed[k].h = root.h - fixed[k].y; - if ((fixed[k].w > 0) && (fixed[k].h > 0)) - { - if (blst[i]->sticky) - fixed[k].p = 50; - else - fixed[k].p = 0; - k++; - } + fixed[k].x += fixed[k].w; + fixed[k].x = 0; } + if ((fixed[k].x + fixed[k].w) > root.w) + fixed[k].w = root.w - fixed[k].x; + if (fixed[k].y < 0) + { + fixed[k].y += fixed[k].h; + fixed[k].y = 0; + } + if ((fixed[k].y + fixed[k].h) > root.h) + fixed[k].h = root.h - fixed[k].y; + if ((fixed[k].w <= 0) || (fixed[k].h <= 0)) + continue; + + if (blst[i]->sticky) + fixed[k].p = 50; + else + fixed[k].p = 0; + k++; } Efree(blst); } diff --git a/src/arrange.c b/src/arrange.c index c2fa3505..25d2fdd3 100644 --- a/src/arrange.c +++ b/src/arrange.c @@ -910,6 +910,46 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) void ArrangeEwin(EWin * ewin) +{ + EDBUG(8, "ArrangeEwin"); + + ewin->client.already_placed = 1; + ArrangeEwinXY(ewin, &ewin->x, &ewin->y); + MoveEwin(ewin, ewin->x, ewin->y); + + EDBUG_RETURN_; +} + +void +ArrangeEwinCentered(EWin * ewin, int focus) +{ + EDBUG(8, "ArrangeEwinCentered"); + + ewin->client.already_placed = 1; + ArrangeEwinCenteredXY(ewin, &ewin->x, &ewin->y); + MoveEwin(ewin, ewin->x, ewin->y); + if (focus) + FocusToEWin(ewin); + + EDBUG_RETURN_; +} + +static int +EWinIsOnViewport(EWin * ewin, int desktop) +{ + if (ewin->sticky) + return 1; + + if (ewin->desktop == desktop && + ewin->area_x == desks.desk[desktop].current_area_x && + ewin->area_y == desks.desk[desktop].current_area_y) + return 1; + + return 0; +} + +void +ArrangeEwinXY(EWin * ewin, int *px, int *py) { EWin **lst; Button **blst; @@ -918,29 +958,67 @@ ArrangeEwin(EWin * ewin) fixed = NULL; ret = NULL; - ewin->client.already_placed = 1; + lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN); if ((lst) && (num > 0)) { fixed = Emalloc(sizeof(RectBox) * num); - ret = Emalloc(sizeof(RectBox) * (num + 1)); j = 0; for (i = 0; i < num; i++) { - if ((lst[i] != ewin) && (!lst[i]->iconified) - && (!lst[i]->ignorearrange) && (lst[i]->layer != 0) - && - (((lst - [i]->area_x == desks.desk[ewin->desktop].current_area_x) - && (lst[i]->area_y == - desks.desk[ewin->desktop].current_area_y) - && (lst[i]->desktop == ewin->desktop)) || (lst[i]->sticky))) + EWin *e = lst[i]; + + if (e == ewin || + e->iconified || e->ignorearrange || e->layer == 0 || + !EWinIsOnViewport(e, ewin->desktop)) + continue; + + fixed[j].data = e; + fixed[j].x = e->x; + fixed[j].y = e->y; + fixed[j].w = e->w; + fixed[j].h = e->h; + if (fixed[j].x < 0) { - fixed[j].data = lst[i]; - fixed[j].x = (lst[i])->x; - fixed[j].y = (lst[i])->y; - fixed[j].w = (lst[i])->w; - fixed[j].h = (lst[i])->h; + fixed[j].w += fixed[j].x; + fixed[j].x = 0; + } + if ((fixed[j].x + fixed[j].w) > root.w) + fixed[j].w = root.w - fixed[j].x; + if (fixed[j].y < 0) + { + fixed[j].h += fixed[j].y; + fixed[j].y = 0; + } + if ((fixed[j].y + fixed[j].h) > root.h) + fixed[j].h = root.h - fixed[j].y; + if ((fixed[j].w <= 0) || (fixed[j].h <= 0)) + continue; + + if (e->never_use_area) + fixed[j].p = 50; + else + fixed[j].p = e->layer; + j++; + } + blst = (Button **) ListItemType(&num, LIST_TYPE_BUTTON); + if (blst) + { + fixed = Erealloc(fixed, sizeof(RectBox) * (num + j)); + for (i = 0; i < num; i++) + { + Button *b = blst[i]; + + if (!b->visible || b->internal) + continue; + if (!b->sticky && (b->desktop != ewin->desktop)) + continue; + + fixed[j].data = NULL; + fixed[j].x = b->x; + fixed[j].y = b->y; + fixed[j].w = b->w; + fixed[j].h = b->h; if (fixed[j].x < 0) { fixed[j].w += fixed[j].x; @@ -955,66 +1033,18 @@ ArrangeEwin(EWin * ewin) } if ((fixed[j].y + fixed[j].h) > root.h) fixed[j].h = root.h - fixed[j].y; - if ((fixed[j].w > 0) && (fixed[j].h > 0)) - { - if (!(lst[i])->never_use_area) - { - fixed[j].p = (lst[i])->layer; - } - else - { - fixed[j].p = 50; - } - j++; - } - } - } - blst = (Button **) ListItemType(&num, LIST_TYPE_BUTTON); - if (blst) - { - fixed = Erealloc(fixed, sizeof(RectBox) * (num + j)); - ret = Erealloc(ret, sizeof(RectBox) * ((num + j) + 1)); - for (i = 0; i < num; i++) - { - if (((blst[i]->desktop == ewin->desktop) - || ((blst[i]->desktop == 0) && (blst[i]->sticky))) - && (blst[i]->visible)) - { - fixed[j].data = NULL; - fixed[j].x = blst[i]->x; - fixed[j].y = blst[i]->y; - fixed[j].w = blst[i]->w; - fixed[j].h = blst[i]->h; - if (fixed[j].x < 0) - { - fixed[j].w += fixed[j].x; - fixed[j].x = 0; - } - if ((fixed[j].x + fixed[j].w) > root.w) - fixed[j].w = root.w - fixed[j].x; - if (fixed[j].y < 0) - { - fixed[j].h += fixed[j].y; - fixed[j].y = 0; - } - if ((fixed[j].y + fixed[j].h) > root.h) - fixed[j].h = root.h - fixed[j].y; - if ((fixed[j].w > 0) && (fixed[j].h > 0)) - { - if (blst[i]->sticky) - { - fixed[j].p = 50; - } - else - { - fixed[j].p = 0; - } - j++; - } - } + if ((fixed[j].w <= 0) || (fixed[j].h <= 0)) + continue; + + if (b->sticky) + fixed[j].p = 50; + else + fixed[j].p = 0; + j++; } Efree(blst); } + ret = Emalloc(sizeof(RectBox) * (j + 1)); newrect.data = ewin; newrect.x = 0; newrect.y = 0; @@ -1024,24 +1054,25 @@ ArrangeEwin(EWin * ewin) #if ENABLE_KDE if (mode.kde_support) { - ArrangeRects(fixed, j, &newrect, 1, ret, mode.kde_x1, mode.kde_y1, - mode.kde_x2, mode.kde_y2, ARRANGE_BY_SIZE, 1); + ArrangeRects(fixed, j, &newrect, 1, ret, + mode.kde_x1, mode.kde_y1, mode.kde_x2, mode.kde_y2, + ARRANGE_BY_SIZE, 1); + } else +#endif { -#endif - ArrangeRects(fixed, j, &newrect, 1, ret, 0, 0, root.w, root.h, - ARRANGE_BY_SIZE, 1); -#if ENABLE_KDE + ArrangeRects(fixed, j, &newrect, 1, ret, + 0, 0, root.w, root.h, ARRANGE_BY_SIZE, 1); } -#endif + for (i = 0; i < j + 1; i++) { if (ret[i].data == ewin) { - ewin->x = ret[i].x; - ewin->y = ret[i].y; - i = j + 1; + *px = ret[i].x; + *py = ret[i].y; + break; } } Efree(lst); @@ -1052,51 +1083,16 @@ ArrangeEwin(EWin * ewin) } else { -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - XineramaScreenInfo *screens; - int pointer_x, pointer_y; - int num; - int d; - unsigned int ud; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, &pointer_y, &d, - &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= (screens[i].width + screens[i].x_org)) - { - if (pointer_y >= screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + screens[i].y_org)) - { - ewin->x = - ((screens[i].width - ewin->w) / 2) + - screens[i].x_org; - ewin->y = - ((screens[i].height - ewin->h) / 2) + - screens[i].y_org; - } - } - } - } - } - XFree(screens); - } - else - { -#endif - ewin->x = (root.w - ewin->w) >> 1; - ewin->y = (root.h - ewin->h) >> 1; -#ifdef HAS_XINERAMA - } -#endif + ArrangeEwinCenteredXY(ewin, px, py); } - MoveEwin(ewin, ewin->x, ewin->y); +} + +void +ArrangeEwinCenteredXY(EWin * ewin, int *px, int *py) +{ + int x, y, w, h; + + GetPointerScreenGeometry(&x, &y, &w, &h); + *px = (w - ewin->w) / 2 + x; + *py = (h - ewin->h) / 2 + y; } diff --git a/src/borders.c b/src/borders.c index e4c59c98..f5c44632 100644 --- a/src/borders.c +++ b/src/borders.c @@ -372,11 +372,9 @@ AddToFamily(Window win) { EWin *ewin, *ewin2; EWin **lst; - Button **blst; - int i, j, k, num, speed, fx, fy, x, y; + int i, k, num, speed, fx, fy, x, y; char doslide, manplace; char pq; - RectBox *fixed, *ret, newrect; Window winid; char cangrab = 0; @@ -568,194 +566,8 @@ AddToFamily(Window win) } else { - ewin->client.already_placed = 1; - lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN); - if ((lst) && (num > 0)) - { - fixed = Emalloc(sizeof(RectBox) * num); - ret = Emalloc(sizeof(RectBox) * (num + 1)); - j = 0; - for (i = 0; i < num; i++) - { - if ((lst[i] != ewin) && (!lst[i]->iconified) - && (!lst[i]->ignorearrange) && (lst[i]->layer != 0) - && - (((lst - [i]->area_x == - desks.desk[ewin->desktop].current_area_x) - && (lst[i]->area_y == - desks.desk[ewin->desktop].current_area_y) - && (lst[i]->desktop == ewin->desktop)) - || (lst[i]->sticky))) - { - fixed[j].data = lst[i]; - fixed[j].x = (lst[i])->x; - fixed[j].y = (lst[i])->y; - fixed[j].w = (lst[i])->w; - fixed[j].h = (lst[i])->h; - if (fixed[j].x < 0) - { - fixed[j].w += fixed[j].x; - fixed[j].x = 0; - } - if ((fixed[j].x + fixed[j].w) > root.w) - fixed[j].w = root.w - fixed[j].x; - if (fixed[j].y < 0) - { - fixed[j].h += fixed[j].y; - fixed[j].y = 0; - } - if ((fixed[j].y + fixed[j].h) > root.h) - fixed[j].h = root.h - fixed[j].y; - if ((fixed[j].w > 0) && (fixed[j].h > 0)) - { - if (!(lst[i])->never_use_area) - fixed[j].p = (lst[i])->layer; - else - fixed[j].p = 50; - j++; - } - } - } - blst = (Button **) ListItemType(&num, LIST_TYPE_BUTTON); - if (blst) - { - fixed = Erealloc(fixed, sizeof(RectBox) * (num + j)); - ret = Erealloc(ret, sizeof(RectBox) * ((num + j) + 1)); - for (i = 0; i < num; i++) - { - if (((blst[i]->desktop == ewin->desktop) - || ((blst[i]->desktop == 0) - && (blst[i]->sticky))) - && (blst[i]->visible)) - { - fixed[j].data = NULL; - fixed[j].x = blst[i]->x; - fixed[j].y = blst[i]->y; - fixed[j].w = blst[i]->w; - fixed[j].h = blst[i]->h; - if (fixed[j].x < 0) - { - fixed[j].w += fixed[j].x; - fixed[j].x = 0; - } - if ((fixed[j].x + fixed[j].w) > root.w) - fixed[j].w = root.w - fixed[j].x; - if (fixed[j].y < 0) - { - fixed[j].h += fixed[j].y; - fixed[j].y = 0; - } - if ((fixed[j].y + fixed[j].h) > root.h) - fixed[j].h = root.h - fixed[j].y; - if ((fixed[j].w > 0) && (fixed[j].h > 0)) - { - if (blst[i]->sticky) - fixed[j].p = 50; - else - fixed[j].p = 0; - j++; - } - } - } - Efree(blst); - } - newrect.data = ewin; - newrect.x = 0; - newrect.y = 0; - newrect.w = ewin->w; - newrect.h = ewin->h; - newrect.p = ewin->layer; -#if ENABLE_KDE - if (mode.kde_support) - { - ArrangeRects(fixed, j, &newrect, 1, ret, mode.kde_x1, - mode.kde_y1, mode.kde_x2, mode.kde_y2, - ARRANGE_BY_SIZE, 1); - - } - else - { -#endif - ArrangeRects(fixed, j, &newrect, 1, ret, 0, 0, root.w, - root.h, ARRANGE_BY_SIZE, 1); -#if ENABLE_KDE - } -#endif - for (i = 0; i < j + 1; i++) - { - if (ret[i].data == ewin) - { - x = ret[i].x; - y = ret[i].y; - i = j + 1; - } - } - Efree(lst); - if (ret) - Efree(ret); - if (fixed) - Efree(fixed); - } - else - { -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - XineramaScreenInfo *screens; - int pointer_x, pointer_y; - int num; - int d; - unsigned int ud; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, - &pointer_y, &d, &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= - (screens[i].width + screens[i].x_org)) - { - if (pointer_y >= screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + - screens[i].y_org)) - { - ewin->x = - ((screens - [i].width - - ewin->w) / 2) + - screens[i].x_org; - ewin->y = - ((screens - [i].height - - ewin->h) / 2) + - screens[i].y_org; - } - } - } - } - } - } - XFree(screens); - } - else - { -#endif - ewin->x = (root.w - ewin->w) >> 1; - ewin->y = (root.h - ewin->h) >> 1; -#ifdef HAS_XINERAMA - } -#endif - - } + ArrangeEwinXY(ewin, &x, &y); } /* (mode.manual_placement_mouse_pointer) */ } /* ((!ewin->client.already_placed) && (!manplace)) */ else diff --git a/src/dialog.c b/src/dialog.c index daee67e4..b681807c 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -597,151 +597,18 @@ ShowDialog(Dialog * d) DesktopAddEwinToTop(ewin); sn = FindSnapshot(ewin); /* get the size right damnit! */ - if (sn) + if (sn && sn->use_wh) + ResizeEwin(ewin, sn->w, sn->h); + if (sn && sn->use_xy) { - if (sn->use_wh) - ResizeEwin(ewin, sn->w, sn->h); - if (sn->use_xy) - { - MoveEwin(ewin, sn->x, sn->y); - } - else - { - if (FindADialog()) - { - ArrangeEwin(ewin); - } - else - { -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - int d; - unsigned int ud; - int pointer_x, pointer_y; - int num; - XineramaScreenInfo *screens; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, - &pointer_y, &d, &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= - (screens[i].width + - screens[i].x_org)) - { - if (pointer_y >= - screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + - screens[i].y_org)) - { - ewin->x = - ((screens - [i].width - - ewin->w) / 2) + - screens[i].x_org; - ewin->y = - ((screens - [i].height - - ewin->h) / 2) + - screens[i].y_org; - MoveEwin(ewin, - ewin->x, - ewin->y); - } - } - } - } - } - } - XFree(screens); - - } - else - { -#endif - MoveEwin(ewin, ((root.w - (ewin->w)) / 2), - ((root.h - (ewin->h)) / 2)); -#ifdef HAS_XINERAMA - } -#endif - } - } + MoveEwin(ewin, sn->x, sn->y); } else { if (FindADialog()) - { - ArrangeEwin(ewin); - } + ArrangeEwin(ewin); else - { -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - int d; - unsigned int ud; - int pointer_x, pointer_y; - int num; - XineramaScreenInfo *screens; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, - &pointer_y, &d, &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= - (screens[i].width + screens[i].x_org)) - { - if (pointer_y >= screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + - screens[i].y_org)) - { - ewin->x = - ((screens - [i].width - - ewin->w) / 2) + - screens[i].x_org; - ewin->y = - ((screens - [i].height - - ewin->h) / 2) + - screens[i].y_org; - MoveEwin(ewin, ewin->x, - ewin->y); - } - } - } - } - } - } - XFree(screens); - - } - else - { -#endif - MoveEwin(ewin, ((root.w - (ewin->w)) / 2), - ((root.h - (ewin->h)) / 2)); -#ifdef HAS_XINERAMA - } -#endif - } + ArrangeEwinCentered(ewin, 0); } RestackEwin(ewin); ShowEwin(ewin); diff --git a/src/menus.c b/src/menus.c index bc1ad28d..c7b25fa4 100644 --- a/src/menus.c +++ b/src/menus.c @@ -349,51 +349,9 @@ ShowMenu(Menu * m, char noshow) int x_origin; int y_origin; - width = root.w; - height = root.h; - x_origin = 0; - y_origin = 0; - -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - XineramaScreenInfo *screens; - int pointer_x, pointer_y; - int num; - int d; - unsigned int ud; - int i; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, - &pointer_y, &d, &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= - (screens[i].width + screens[i].x_org)) - { - if (pointer_y >= screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + - screens[i].y_org)) - { - x_origin = screens[i].x_org; - y_origin = screens[i].y_org; - width = screens[i].width; - height = screens[i].height; - head_num = i; - } - } - } - } - } - XFree(screens); - } -#endif + head_num = + GetPointerScreenGeometry(&x_origin, &y_origin, &width, + &height); if (mode.x - x - ((int)mw / 2) > (x_origin + width)) wx = x_origin + (int)b->border.left; diff --git a/src/session.c b/src/session.c index 9d95157e..eab62e7c 100644 --- a/src/session.c +++ b/src/session.c @@ -632,59 +632,7 @@ doSMExit(void *params) ewin = FindEwinByDialog(d); if (ewin) { -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - XineramaScreenInfo *screens; - int pointer_x, pointer_y; - int num; - int d; - unsigned int ud; - int i; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, - &pointer_y, &d, &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= - (screens[i].width + screens[i].x_org)) - { - if (pointer_y >= screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + - screens[i].y_org)) - { - ewin->x = - ((screens[i].width - - ewin->w) / 2) + - screens[i].x_org; - ewin->y = - ((screens[i].height - - ewin->h) / 2) + - screens[i].y_org; - } - } - } - } - } - XFree(screens); - MoveEwin(ewin, ewin->x, ewin->y); - FocusToEWin(ewin); - } - else - { -#endif - MoveEwin(ewin, ((root.w - (ewin->w)) / 2), - ((root.h - (ewin->h)) / 2)); - FocusToEWin(ewin); -#ifdef HAS_XINERAMA - } -#endif + ArrangeEwinCentered(ewin, 1); } return; } @@ -1237,59 +1185,7 @@ doSMExit(void *params) ewin = FindEwinByDialog(d); if (ewin) { -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - XineramaScreenInfo *screens; - int pointer_x, pointer_y; - int num; - int d; - int i; - unsigned int ud; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, - &pointer_y, &d, &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= - (screens[i].width + screens[i].x_org)) - { - if (pointer_y >= screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + - screens[i].y_org)) - { - ewin->x = - ((screens[i].width - ewin->w) / - 2) + screens[i].x_org; - ewin->y = - ((screens[i].height - ewin->h) / - 2) + screens[i].y_org; - } - } - } - } - } - XFree(screens); - MoveEwin(ewin, ewin->x, ewin->y); - FocusToEWin(ewin); - } - else - { -#endif - - MoveEwin(ewin, ((root.w - (ewin->w)) / 2), - ((root.h - (ewin->h)) / 2)); - FocusToEWin(ewin); -#ifdef HAS_XINERAMA - } -#endif - + ArrangeEwinCentered(ewin, 1); } return; } diff --git a/src/warp.c b/src/warp.c index 85715e62..0e8c3a67 100644 --- a/src/warp.c +++ b/src/warp.c @@ -271,52 +271,9 @@ WarpFocusShowTitle(EWin * ewin) } w += (ic->padding.left + ic->padding.right); h += (ic->padding.top + ic->padding.bottom); - x = (root.w - w) / 2; - y = (root.h - (h * warptitles_num)) / 2; -#ifdef HAS_XINERAMA - if (xinerama_active) - { - Window rt, ch; - XineramaScreenInfo *screens; - int pointer_x, pointer_y; - int num; - int d; - unsigned int ud; - - XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, - &pointer_y, &d, &d, &ud); - screens = XineramaQueryScreens(disp, &num); - for (i = 0; i < num; i++) - { - for (i = 0; i < num; i++) - { - if (pointer_x >= screens[i].x_org) - { - if (pointer_x <= - (screens[i].width + screens[i].x_org)) - { - if (pointer_y >= screens[i].y_org) - { - if (pointer_y <= - (screens[i].height + - screens[i].y_org)) - { - x = ((screens - [i].width - - w) / 2) + screens[i].x_org; - y = ((screens - [i].height - - h * warptitles_num) / 2) + - screens[i].y_org; - } - } - } - } - } - } - XFree(screens); - } -#endif + GetPointerScreenGeometry(&x, &y, &ww, &hh); + x += (ww - w) / 2; + y += (hh - h * warptitles_num) / 2; mw = w; mh = h; EMoveResizeWindow(disp, warpFocusTitleWindow, x, y, w, diff --git a/src/x.c b/src/x.c index 7c21bc85..9c452926 100644 --- a/src/x.c +++ b/src/x.c @@ -874,3 +874,50 @@ PasteMask(Display * d, Drawable w, Pixmap p, int x, int y, int wd, int ht) XFillRectangle(disp, w, gc, x, y, wd, ht); } } + +int +GetPointerScreenGeometry(int *px, int *py, int *pw, int *ph) +{ + int head = 0; + +#ifdef HAS_XINERAMA + if (xinerama_active) + { + int i; + Window rt, ch; + XineramaScreenInfo *screens; + int pointer_x, pointer_y; + int num; + int d; + unsigned int ud; + + XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, &pointer_y, &d, + &d, &ud); + screens = XineramaQueryScreens(disp, &num); + for (i = 0; i < num; i++) + { + if (pointer_x >= screens[i].x_org && + pointer_x <= (screens[i].width + screens[i].x_org) && + pointer_y >= screens[i].y_org && + pointer_y <= (screens[i].height + screens[i].y_org)) + { + *px = screens[i].x_org; + *py = screens[i].y_org; + *pw = screens[i].width; + *ph = screens[i].height; + head = i; + } + } + XFree(screens); + } + else +#endif + { + *px = 0; + *py = 0; + *pw = root.w; + *ph = root.h; + } + + return head; +}