From 661d9283b0e77643b720004ad10fc7e070deb8b7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 17 May 2007 01:45:39 +0000 Subject: [PATCH] merge r6585-6593 from trunk --- data/autostart.sh | 11 ++++- data/xsession/openbox-session.in | 6 +-- openbox/client.c | 73 +++++++++++++++++++------------- openbox/client.h | 10 ++--- openbox/event.c | 17 +++++--- po/ca.po | 31 -------------- po/de.po | 45 -------------------- po/es.po | 31 -------------- po/fi.po | 31 -------------- po/fr.po | 31 -------------- po/hr.po | 31 -------------- po/ja.po | 25 ----------- po/no.po | 31 -------------- po/pl.po | 31 -------------- po/pt.po | 31 -------------- po/ru.po | 31 -------------- po/sk.po | 31 -------------- po/sv.po | 7 --- po/zh_TW.po | 31 -------------- 19 files changed, 70 insertions(+), 465 deletions(-) diff --git a/data/autostart.sh b/data/autostart.sh index 962cae07..f8b804c6 100644 --- a/data/autostart.sh +++ b/data/autostart.sh @@ -1,4 +1,5 @@ -#!/bin/sh +# This shell script is run before Openbox launches. +# Environment variables set here are passed to the Openbox session. # Set a background color BG="" @@ -29,3 +30,11 @@ fi if which start_kdeinit >/dev/null; then LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup & fi + +# Support for SCIM +if which scim >/dev/null; then + export XMODIFIERS=@im=SCIM + export GTK_IM_MODULE=scim + export QT_IM_MODULE=scim + scim -d & +fi diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in index c466f17d..b3f1c057 100644 --- a/data/xsession/openbox-session.in +++ b/data/xsession/openbox-session.in @@ -4,12 +4,10 @@ AUTOSTART="$HOME/.config/openbox/autostart.sh" GLOBALAUTOSTART="@configdir@/openbox/autostart.sh" if test -e $AUTOSTART; then - # sleep for 1 second so Openbox is there before anything else - (sleep 1 && . $AUTOSTART) & + . $AUTOSTART else if test -e $GLOBALAUTOSTART; then - # sleep for 1 second so Openbox is there before anything else - (sleep 1 && . $GLOBALAUTOSTART) & + . $GLOBALAUTOSTART fi fi diff --git a/openbox/client.c b/openbox/client.c index 9bf378e1..f1cbdc8d 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -407,9 +407,9 @@ void client_manage(Window window) do this after adjusting the frame. otherwise it gets all weird and clients don't work right */ - client_configure_full(self, self->area.x, self->area.y, - self->area.width, self->area.height, - FALSE, TRUE); + client_configure(self, self->area.x, self->area.y, + self->area.width, self->area.height, + FALSE, TRUE); /* do this after the window is placed, so the premax/prefullscreen numbers won't be all wacko!! @@ -2337,14 +2337,14 @@ static ObStackingLayer calc_layer(ObClient *self) else l = OB_STACKING_LAYER_ABOVE; } else if ((self->fullscreen || - /* no decorations and fills the monitor = oldskool fullscreen */ - (self->frame != NULL && - self->decorations == 0 && - (self->frame->size.right == 0 && self->frame->size.left == 0 && - self->frame->size.bottom == 0 && self->frame->size.top == 0 && - RECT_EQUAL(self->area, - *screen_physical_area_monitor - (client_monitor(self)))))) && + /* No decorations and fills the monitor = oldskool fullscreen. + But not for undecorated windows, because the user can do that + */ + (self->decorations == 0 && + !self->undecorated && + RECT_EQUAL(self->area, + *screen_physical_area_monitor + (client_monitor(self))))) && (client_focused(self) || client_search_focus_tree(self))) l = OB_STACKING_LAYER_FULLSCREEN; else if (self->above) l = OB_STACKING_LAYER_ABOVE; @@ -2704,12 +2704,13 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, } -void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h, - gboolean user, gboolean final) +void client_configure(ObClient *self, gint x, gint y, gint w, gint h, + gboolean user, gboolean final) { gint oldw, oldh; gboolean send_resize_client; gboolean moved = FALSE, resized = FALSE; + gboolean fmoved, fresized; guint fdecor = self->frame->decorations; gboolean fhorz = self->frame->max_horz; gint logicalw, logicalh; @@ -2745,10 +2746,12 @@ void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h, } /* find the frame's dimensions and move/resize it */ + fmoved = moved; + fresized = resized; if (self->decorations != fdecor || self->max_horz != fhorz) - moved = resized = TRUE; - if (moved || resized) - frame_adjust_area(self->frame, moved, resized, FALSE); + fmoved = fresized = TRUE; + if (fmoved || fresized) + frame_adjust_area(self->frame, fmoved, fresized, FALSE); if ((!user || (user && final)) && !resized) { @@ -3268,6 +3271,11 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) } } } + + /* Grab pointer across these, so it is the same as actions. Enter events + won't be generated by the windows moving around */ + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); + if (max_horz != self->max_horz || max_vert != self->max_vert) { if (max_horz != self->max_horz && max_vert != self->max_vert) { /* toggling both */ @@ -3293,24 +3301,38 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) client_shade(self, shaded); if (undecorated != self->undecorated) client_set_undecorated(self, undecorated); + if (above != self->above || below != self->below) { + self->above = above; + self->below = below; + client_calc_layer(self); + } + if (modal != self->modal) { self->modal = modal; /* when a window changes modality, then its stacking order with its transients needs to change */ stacking_raise(CLIENT_AS_WINDOW(self)); + + /* These things below can change focus so we can't grab pointer for + them. Note how we have two ungrab_pointers.. */ + ungrab_pointer(); + + /* it also may get focused. if something is focused that shouldn't + be focused anymore, then move the focus */ + if (focus_client && client_focus_target(focus_client) != focus_client) + client_focus(focus_client); } + else + /* These things below can change focus so we can't grab pointer for + them. Note how we have two ungrab_pointers.. */ + ungrab_pointer(); + if (iconic != self->iconic) client_iconify(self, iconic, FALSE, FALSE); if (demands_attention != self->demands_attention) client_hilite(self, demands_attention); - if (above != self->above || below != self->below) { - self->above = above; - self->below = below; - client_calc_layer(self); - } - client_change_state(self); /* change the hint to reflect these changes */ } @@ -3564,13 +3586,6 @@ void client_set_undecorated(ObClient *self, gboolean undecorated) if (self->undecorated != undecorated) { self->undecorated = undecorated; client_setup_decor_and_functions(self); - /* Make sure the client knows it might have moved. Maybe there is a - * better way of doing this so only one client_configure is sent, but - * since 125 of these are sent per second when moving the window (with - * user = FALSE) i doubt it matters much. - */ - client_configure(self, self->area.x, self->area.y, - self->area.width, self->area.height, TRUE, TRUE); client_change_state(self); /* reflect this in the state hints */ } } diff --git a/openbox/client.h b/openbox/client.h index 0f584a77..2cc64a5c 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -369,16 +369,12 @@ void client_convert_gravity(ObClient *self, gint gravity, gint *x, gint *y, gint w, gint h); #define client_move(self, x, y) \ - client_configure(self, x, y, self->area.width, self->area.height, \ - TRUE, TRUE) + client_configure(self, x, y, self->area.width, self->area.height, TRUE, TRUE) #define client_resize(self, w, h) \ client_configure(self, self->area.x, self->area.y, w, h, TRUE, TRUE) #define client_move_resize(self, x, y, w, h) \ client_configure(self, x, y, w, h, TRUE, TRUE) -#define client_configure(self, x, y, w, h, user, final) \ - client_configure_full(self, x, y, w, h, user, final) - /*! Figure out where a window will end up and what size it will be if you told it to move/resize to these coordinates. @@ -418,8 +414,8 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, @param force_reply Send a ConfigureNotify to the client regardless of if the position changed. */ -void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h, - gboolean user, gboolean final); +void client_configure(ObClient *self, gint x, gint y, gint w, gint h, + gboolean user, gboolean final); void client_reconfigure(ObClient *self); diff --git a/openbox/event.c b/openbox/event.c index b1e61f77..6a5e3540 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -28,6 +28,7 @@ #include "config.h" #include "screen.h" #include "frame.h" +#include "grab.h" #include "menu.h" #include "menuframe.h" #include "keyboard.h" @@ -1081,7 +1082,11 @@ static void event_handle_client(ObClient *client, XEvent *e) if (config) { client_find_onscreen(client, &x, &y, w, h, FALSE); - client_configure_full(client, x, y, w, h, FALSE, TRUE); + + /* don't create enter events from clients moving themselves */ + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); + client_configure(client, x, y, w, h, FALSE, TRUE); + ungrab_pointer(); } break; } @@ -1258,7 +1263,11 @@ static void event_handle_client(ObClient *client, XEvent *e) e->xclient.data.l[0] & 1 << 9, y); client_convert_gravity(client, grav, &x, &y, w, h); client_find_onscreen(client, &x, &y, w, h, FALSE); + + /* don't create enter events from clients moving themselves */ + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); client_configure(client, x, y, w, h, FALSE, TRUE); + ungrab_pointer(); } else if (msgtype == prop_atoms.net_restack_window) { if (e->xclient.data.l[0] != 2) { ob_debug_type(OB_DEBUG_APP_BUGS, @@ -1292,11 +1301,7 @@ static void event_handle_client(ObClient *client, XEvent *e) e->xclient.data.l[2], FALSE); /* send a synthetic ConfigureNotify, cuz this is supposed to be like a ConfigureRequest. */ - client_configure_full(client, client->area.x, - client->area.y, - client->area.width, - client->area.height, - FALSE, TRUE); + client_reconfigure(client); } else ob_debug_type(OB_DEBUG_APP_BUGS, "_NET_RESTACK_WINDOW sent for window %s " diff --git a/po/ca.po b/po/ca.po index b7af0eb7..a5ce9abf 100644 --- a/po/ca.po +++ b/po/ca.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "&Enrotlla" - -#~ msgid "&Roll down" -#~ msgstr "Desen&rotlla" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Posa a so&bre" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Posa a so&ta" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id necessita un argument\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id necessita un argument\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file necessita un argument\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "No s'ha pogut inicialitzar Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "S'està carregant el tipus de lletra de recanvi: %s\n" diff --git a/po/de.po b/po/de.po index 2b4d7f69..91ceccf2 100644 --- a/po/de.po +++ b/po/de.po @@ -360,48 +360,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "A&ufrollen" - -#~ msgid "Roll &down" -#~ msgstr "A&brollen" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "In den &Vordergrund" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "In den &Hintergrund" - -#~ msgid "Couldn't set locale from environment." -#~ msgstr "" -#~ "Die gewählte Lokalisierung konnte für die Umgebung nicht gesetzt werden" - -#~ msgid " --config-file FILE Specify the file to load for the config file\n" -#~ msgstr "" -#~ " --config-file FILE Datei, die als Konfigurationsdatei geladen werden " -#~ "soll\n" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr " --sm-client-id ID ID des Sitzungsmanagers\n" - -#~ msgid " --sm-save-file FILE Specify file to load a saved session from\n" -#~ msgstr "" -#~ " --sm-save-file FILE Datei von der eine gespeicherte Sitzung geladen " -#~ "werden soll\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id benötigt ein Argument\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file benötigt ein Argument\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Xft konnte nicht initialisiert werden" - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Versuche Ersatz-Schriftart %s zu laden\n" diff --git a/po/es.po b/po/es.po index e6c99ad0..5ee3aac6 100644 --- a/po/es.po +++ b/po/es.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "&Enrollar" - -#~ msgid "Roll down" -#~ msgstr "Desenrollar" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Poner en p&rimer plano" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Poner en ú<imo plano" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id necesita un argumento\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id necesita un argumento\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file necesita un argumento\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "No se pudo iniciar Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Intentando recurrir a la fuente: %s\n" diff --git a/po/fi.po b/po/fi.po index cf88dcf5..daffe085 100644 --- a/po/fi.po +++ b/po/fi.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "&Rullaa" - -#~ msgid "Roll &down" -#~ msgstr "&Rullaa auki" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Nosta &päällimmäiseksi" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "&Laske alimmaiseksi" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id tarvitsee parametrin\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id tarvitsee parametrin\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file tarvitsee parametrin\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Xft:n käynnistys epäonnistui." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Kokeillaan varakirjasinlajia: %s\n" diff --git a/po/fr.po b/po/fr.po index 975b7b47..d8ada91e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "Enro&uler" - -#~ msgid "Roll &down" -#~ msgstr "Dérou&ler" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Mettre au &premier plan" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Mettre en &arrière plan" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id requiert un argument\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id requiert un argument\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file requiert un argument\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Impossible d'initialiser Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Tentative de remplacement de la police : %s\n" diff --git a/po/hr.po b/po/hr.po index cfd88e50..17bf20e7 100644 --- a/po/hr.po +++ b/po/hr.po @@ -336,34 +336,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "Povuci &gore" - -#~ msgid "Roll &down" -#~ msgstr "Spusti &dolje" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Podigni na &vrh" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Spusti na &dno" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id zahtjeva argument\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id zahtjeva argument\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file zahtjeva argument\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Nemogu pokrenuti Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Isprobavam osnovni tip slova: %s\n" diff --git a/po/ja.po b/po/ja.po index 1a9a7065..49e888c6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -336,28 +336,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "ロールアップ(&U)" - -#~ msgid "Roll &down" -#~ msgstr "ロールダウン(&R)" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "最上位に上げる(&T)" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "最下位に下げる(&B)" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id には引数が必要です\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id には引数が必要です\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file には引数が必要です\n" diff --git a/po/no.po b/po/no.po index 165958a2..23cce576 100644 --- a/po/no.po +++ b/po/no.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "Rull &opp" - -#~ msgid "Roll &down" -#~ msgstr "Rull &ned" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Legg ø&verst" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Legg &nederst" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id krever et argument\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id krever et argument\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file krever et argument\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Kunde ikke initialisere Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Prøver med reservefonten: %s\n" diff --git a/po/pl.po b/po/pl.po index 13976bf3..de7d7912 100644 --- a/po/pl.po +++ b/po/pl.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "&Zwiń" - -#~ msgid "Roll &down" -#~ msgstr "R&ozwiń" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Wyślij na &wierzch" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Wyślij na &spód" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id wymaga argumentu\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id wymaga argumentu\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file wymaga argumentu\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Błąd przy inicjalizacji Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Próbuję użyć czcionki: %s\n" diff --git a/po/pt.po b/po/pt.po index 14f59602..25558237 100644 --- a/po/pt.po +++ b/po/pt.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "&Enrolar" - -#~ msgid "Roll &down" -#~ msgstr "Desen&rolar" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Elevar ao &topo" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Baixar ao f&undo" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id requer um argumento\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id requer um argumento\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file requer um argumento\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Incapaz de inicializar Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Tentando usar a fonte alternativa: %s\n" diff --git a/po/ru.po b/po/ru.po index 9e9fd86b..f58746ab 100644 --- a/po/ru.po +++ b/po/ru.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "Скрутить(&U)" - -#~ msgid "Roll &down" -#~ msgstr "Раскрутить(&W)" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Поднять на передний план(&T)" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Опустить на задний план(&B)" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id требует параметр\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id требует параметр\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file требует параметр\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Не удалось инициализировать Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Попытка вернуть шрифт: %s\n" diff --git a/po/sk.po b/po/sk.po index 9beeeac0..9ea38ded 100644 --- a/po/sk.po +++ b/po/sk.po @@ -337,34 +337,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "&Zvinúť" - -#~ msgid "Roll &down" -#~ msgstr "&Rozvinúť" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "Presunúť navrch" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "Presunúť naspodok" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id vyžaduje parameter\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id vyžaduje parameter\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file vyžaduje parameter\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "Nepodarilo sa inicializovaÅ¥ Xft." - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "Pokus o návrat k fontu: %s\n" diff --git a/po/sv.po b/po/sv.po index 90a81d2a..816ef407 100644 --- a/po/sv.po +++ b/po/sv.po @@ -331,10 +331,3 @@ msgstr "Efterfr #, c-format msgid "X Error: %s" msgstr "X Fel: %s" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "Rulla &upp" - -#~ msgid "Roll &down" -#~ msgstr "Rull&a ner" diff --git a/po/zh_TW.po b/po/zh_TW.po index cb375e04..e87a6923 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -338,34 +338,3 @@ msgstr "" #, c-format msgid "X Error: %s" msgstr "" - -#, fuzzy -#~ msgid "Roll &up" -#~ msgstr "向上捲動(&U)" - -#~ msgid "Roll &down" -#~ msgstr "向下捲動(&W)" - -#, fuzzy -#~ msgid "Raise to &top" -#~ msgstr "提到最上層(&T)" - -#, fuzzy -#~ msgid "Lower to &bottom" -#~ msgstr "降到最下層(&B)" - -#, fuzzy -#~ msgid " --sm-client-id ID Specify session management ID\n" -#~ msgstr "--sm-client-id 要求引數\n" - -#~ msgid "--sm-client-id requires an argument\n" -#~ msgstr "--sm-client-id 要求引數\n" - -#~ msgid "--sm-save-file requires an argument\n" -#~ msgstr "--sm-save-file 要求引數\n" - -#~ msgid "Couldn't initialize Xft." -#~ msgstr "無法初始化 Xft。" - -#~ msgid "Trying fallback font: %s\n" -#~ msgstr "正在嘗試權宜字型：%s\n" -- 2.34.1