diff -Nru altyo-0.4~rc4/altyo_config.vala altyo-0.4~rc5/altyo_config.vala --- altyo-0.4~rc4/altyo_config.vala 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/altyo_config.vala 2014-05-23 06:21:17.000000000 +0000 @@ -270,7 +270,18 @@ version[VER.rc]=9;//update version } - + /*if was 0.3.9 + * update program_style option, fix background for settings tab + * */ + if(version[VER.major]==0 && version[VER.minor]==3 && version[VER.rc]<10){ + try { + string old=kf.get_string(this.profile,"program_style"); + if(old!=null && old!="" ){ + kf.set_string(this.profile,"program_style",old+" #settings-scrolledwindow{ background-color: @bg_color;} "); + } + }catch (KeyFileError err) {} + version[VER.rc]=10;//update version + } return version; } diff -Nru altyo-0.4~rc4/altyo_hotkey.vala altyo-0.4~rc5/altyo_hotkey.vala --- altyo-0.4~rc4/altyo_hotkey.vala 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/altyo_hotkey.vala 2014-05-23 06:21:17.000000000 +0000 @@ -24,7 +24,7 @@ PanelHotkey.instance().triggered (a); }*/ -public class KeyBinding { +public class KeyBinding : Object { public string combination; public uint key_code; public uint modifiers; @@ -38,7 +38,8 @@ } ~KeyBinding(){ - free(this.combination); + debug("~KeyBinding"); + //free(this.combination); } } @@ -165,6 +166,7 @@ flush(); } bindings.remove(bind); + bind.unref();//destroy } } diff -Nru altyo-0.4~rc4/altyo_quick_connectios.vala altyo-0.4~rc5/altyo_quick_connectios.vala --- altyo-0.4~rc4/altyo_quick_connectios.vala 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/altyo_quick_connectios.vala 2014-05-23 06:21:17.000000000 +0000 @@ -74,7 +74,7 @@ public class QConnections { private MySettings conf; - public List children; + public List children; //constructor public QConnections(MySettings conf) { diff -Nru altyo-0.4~rc4/altyo_settings.vala altyo-0.4~rc5/altyo_settings.vala --- altyo-0.4~rc4/altyo_settings.vala 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/altyo_settings.vala 2014-05-23 06:21:17.000000000 +0000 @@ -47,6 +47,7 @@ this.builder.connect_signals(this); var B = builder.get_object ("settings-scrolledwindow") as Gtk.Widget; + B.name="settings-scrolledwindow"; this.hbox.add(B); var L = builder.get_object ("config_path_linkbutton") as Gtk.LinkButton; L.label=my_conf.conf_file; diff -Nru altyo-0.4~rc4/altyo_terminal.vala altyo-0.4~rc5/altyo_terminal.vala --- altyo-0.4~rc4/altyo_terminal.vala 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/altyo_terminal.vala 2014-05-23 06:21:17.000000000 +0000 @@ -62,8 +62,6 @@ public bool active {get{ return _active;} set{ if(this._active != value){ - unowned Gtk.StyleContext context = this.get_style_context(); - context.invalidate(); this._active=value; this.update_state(); } @@ -274,7 +272,8 @@ } unowned Gtk.StyleContext context = this.get_style_context(); //todo: use this.label instead - + context.invalidate();//fix wrong colors + Gdk.RGBA color_f = context.get_color(StateFlags.NORMAL); Gdk.RGBA color_b = context.get_background_color(StateFlags.NORMAL); this.markup_normal=(this.prevent_close ? "[!] " : "")+"{ + if(this.visible && (this.pull_animation_active || this.pull_active)){ + debug("pixwin.damage_event"); + var w = this.get_window(); + w.invalidate_rect(null,false); + } + }); //this.set_app_paintable(true); //this.set_double_buffered(false); @@ -256,6 +265,7 @@ this.hotkey = new PanelHotkey (); this.hotkey.on_active_window_change.connect(this.check_focusout); this.reconfigure();//window + this.not_configured=false; this.ayobject= new AYObject(this,conf); this.add(this.ayobject.main_vbox); @@ -269,9 +279,12 @@ return false;//default is allow }); - this.destroy.connect (()=>{ + this.destroy.connect (()=>{ this.ayobject.save_configuration(); this.conf.save(); + unowned Gtk.Widget ch=this.pixwin.get_child(); + if(ch is Gtk.Widget) + ch.destroy(); Gtk.main_quit(); }); @@ -557,9 +570,10 @@ //debug("reparent to offscreen window"); //this.get_child().reparent(this.pixwin);//reparent to offscreen window var ch=this.get_child();//.reparent(this);//reparent from offscreen window - this.remove(ch); this.pixwin.set_size_request(pull_w,pull_h); + this.remove(ch); this.pixwin.add(ch); + //set main_vbox size same as original,otherwise draw will be broken this.ayobject.main_vbox.height_request = this.orig_h_main_vbox; this.ayobject.main_vbox.width_request = this.orig_w_main_vbox; @@ -584,6 +598,7 @@ this.pull_step=this.pull_steps;//skip animation this.pull_animation_active=true; this.ayobject.clear_prelight_state(); + this.update_events();//process pixwin.damage_event GLib.Timeout.add(this.animation_speed,this.on_pull_up); } @@ -798,6 +813,7 @@ "HVBox {border-width: 0px 2px 2px 2px; border-color: #3C3B37;border-style: solid; background-color: #000000;}"+ "#OffscreenWindow, VTMainWindow,#HVBox_dnd_window {border-width: 0px; border-style: solid; background-color: alpha(#000000,0.1);}"+ "HVBox,#quick_options_notebook{background-color: alpha(#000000,1.0);}"+ + "#settings-scrolledwindow{ background-color: @bg_color;}"+ ""; if(Gtk.get_major_version()>=3 && Gtk.get_minor_version()>6)//special eyecandy if supported ;) style_str+= "VTToggleButton:active { text-shadow: 1px 1px 2px #005555;}"; @@ -852,7 +868,10 @@ }else{ grave=this.hotkey.bind (new_key);//currently we have no actions, try to bind } - }while(grave==null); + }while(grave==null && !this.allow_close); + + if(this.allow_close) return;//possible on destroying + this.conf.set_accel_string("main_hotkey",new_key); grave.on_trigged.connect(this.toggle_window); } @@ -1005,7 +1024,7 @@ if(this.prev_focus!=null) this.prev_focus.grab_focus(); else - if(this.ayobject.active_tab!=null) + if(this.ayobject!=null && this.ayobject.active_tab!=null)//this.ayobject==null possible at startup this.ayobject.activate_tab(this.ayobject.active_tab); } } @@ -1021,14 +1040,6 @@ var dialog_box = ((Gtk.Box)dialog.get_content_area ()); dialog_box.pack_start(aLabel,false,false,0); aLabel.show(); - dialog.response.connect ((response_id) => { - if(response_id == Gtk.ResponseType.OK){ - dialog.destroy (); - }else{ - this.window_set_active(); - dialog.destroy (); - } - }); var grab_another_key = new Button.with_label(_("Grab another key.")); grab_another_key.clicked.connect(()=>{ @@ -1075,8 +1086,10 @@ else return true; //true == ignore event });//tab_button_press_event - dialog.run(); - this.window_set_active(); + int result = dialog.run(); + dialog.destroy (); + if(result != Gtk.ResponseType.NONE) + this.window_set_active(); return accelerator_name; } @@ -1086,17 +1099,14 @@ var dialog_box = ((Gtk.Box)dialog.get_content_area ()); dialog_box.pack_start(aLabel,false,false,0); aLabel.show(); - dialog.response.connect ((response_id) => { - dialog.destroy (); - }); - - dialog.set_transient_for(this); dialog.show_all(); dialog.grab_focus(); this.hotkey.send_net_active_window(dialog.get_window ()); - dialog.run(); - this.window_set_active(); + int result = dialog.run(); + dialog.destroy (); + if(result != Gtk.ResponseType.NONE) + this.window_set_active(); }//show_message_box @@ -1234,8 +1244,8 @@ public TAB_SORT_ORDER tab_sort_order {get;set; default = TAB_SORT_ORDER.NONE;} - private List children; - private List children_removed; + private GLib.List children; + private GLib.List children_removed; public int terminal_width {get;set; default = 80;} public int terminal_height {get;set; default = 50;} private int hvbox_height_old {get;set; default = 0;} @@ -1287,6 +1297,11 @@ this.hvbox.expand=false; this.hvbox.child_reordered.connect(this.move_tab); + this.hvbox.on_dnd_above_changed.connect((dnd_widget,above_widget)=>{ + VTToggleButton dnd = (VTToggleButton) dnd_widget; + VTToggleButton above = (VTToggleButton) above_widget; + dnd.set_title((int)(this.children.index((AYTab)above.object)+1),null); + }); //~ this.hvbox.size_changed.connect(this.hvbox_size_changed); this.hvbox.can_focus=false;//vte shoud have focus @@ -1509,7 +1524,6 @@ close=true; else close=false; - dialog.destroy (); }); dialog.focus_out_event.connect (() => { @@ -1519,8 +1533,10 @@ dialog.show (); dialog.grab_focus(); this.main_window.hotkey.send_net_active_window(dialog.get_window ()); - dialog.run(); - this.main_window.window_set_active(); + int result = dialog.run(); + dialog.destroy (); + if(result != Gtk.ResponseType.NONE) + this.main_window.window_set_active(); return close; } @@ -1839,8 +1855,6 @@ this.main_window.destroy(); }else this.main_window.allow_close=false; - - dialog.destroy (); }); dialog.focus_out_event.connect (() => { @@ -1850,8 +1864,9 @@ dialog.show (); dialog.grab_focus(); this.main_window.hotkey.send_net_active_window(dialog.get_window ()); - dialog.run(); - if(!this.main_window.allow_close) + int result = dialog.run(); + dialog.destroy (); + if(result != Gtk.ResponseType.NONE) this.main_window.window_set_active(); } @@ -1864,11 +1879,8 @@ dialog.website ="https://github.com/linvinus/AltYo"; dialog.version = (AY_CHANGELOG_TAG!="" ? AY_CHANGELOG_TAG : "0.3") +" "+AY_GIT_HASH; dialog.translator_credits=_("willemw12@gmail.com"); - - dialog.response.connect ((response_id) => { - this.main_window.window_set_active(); - dialog.destroy (); - }); + Image img = new Image.from_resource ("/org/gnome/altyo/altyo.svg"); + dialog.set_logo(img.pixbuf); dialog.focus_out_event.connect (() => { return true; //same bug as discribed in this.focus_out_event @@ -1876,10 +1888,13 @@ dialog.set_transient_for(this.main_window); dialog.show_all(); dialog.grab_focus(); + dialog.set_destroy_with_parent(true); this.main_window.hotkey.send_net_active_window(dialog.get_window ()); - dialog.run(); - this.main_window.window_set_active(); + int result = dialog.run(); + dialog.destroy (); debug("ShowAbout end"); + if(result != Gtk.ResponseType.NONE) + this.main_window.window_set_active(); } public void show_reset_to_defaults_dialog(){ @@ -1889,7 +1904,6 @@ dialog.response.connect ((response_id) => { if(response_id == Gtk.ResponseType.YES){ //this.conf. - dialog.destroy (); this.action_group.set_sensitive(true);//activate this.action_group.get_action("open_settings").activate();//close this.conf.reset_to_defaults();//make empty config @@ -1899,8 +1913,6 @@ } this.conf.reload_config(); this.action_group.get_action("open_settings").activate();//open - }else{ - dialog.destroy (); } }); @@ -1911,8 +1923,10 @@ dialog.show (); dialog.grab_focus(); this.main_window.hotkey.send_net_active_window(dialog.get_window ()); - dialog.run(); - this.main_window.window_set_active(); + int result = dialog.run(); + dialog.destroy (); + if(result != Gtk.ResponseType.NONE) + this.main_window.window_set_active(); } public void set_custom_title_dialog(VTToggleButton tab){ @@ -1920,9 +1934,7 @@ var entry = new Gtk.Entry(); entry.set_text ( ( tab.tab_custom_title==null ? _("new custom title") : tab.tab_custom_title) ); entry.activate.connect(()=>{ - tab.tab_custom_title = entry.get_text(); - this.main_window.window_set_active(); - dialog.destroy (); + dialog.response (Gtk.ResponseType.YES); }); var dialog_box = ((Gtk.Box)dialog.get_content_area ()); @@ -1934,8 +1946,7 @@ }else{ tab.tab_custom_title=null; } - this.main_window.window_set_active(); - dialog.destroy (); + this.hvbox.queue_draw();//redraw border }); dialog.focus_out_event.connect (() => { @@ -1946,8 +1957,10 @@ dialog.show (); dialog.grab_focus(); this.main_window.hotkey.send_net_active_window(dialog.get_window ()); - dialog.run(); - this.main_window.window_set_active(); + int result = dialog.run(); + dialog.destroy (); + if(result != Gtk.ResponseType.NONE) + this.main_window.window_set_active(); } public bool update_action_keybinding(Gtk.Action action, uint accelerator_key,Gdk.ModifierType accelerator_mods, bool force=false){ @@ -2120,8 +2133,11 @@ } this.double_hotkey_last_time=now; + uint index = j+this.double_hotkey_level-1; + if(index >= children.length()) + index = children.length()-1;//switch to last tab - unowned AYTab vt = children.nth_data(j+this.double_hotkey_level-1); + unowned AYTab vt = children.nth_data(index); if(vt != null) this.activate_tab(vt.tbutton); }); @@ -2348,7 +2364,7 @@ } }); - this.add_window_accel("restore_tab", _("Restore tab"), _("Restore last closed tab"), Gtk.Stock.GO_UP,"R",()=>{ + this.add_window_accel("restore_tab", _("Restore closed tab"), _("Restore last closed tab"), Gtk.Stock.GO_UP,"R",()=>{ unowned List? element = this.children_removed.last (); if(element!=null){ this.restore_tab(element.data); @@ -2587,18 +2603,31 @@ menuitem = (Gtk.MenuItem)this.action_group.get_action("restore_tab").create_menu_item(); submenu.append(menuitem); + + menuitem = new Gtk.MenuItem.with_label (_("Restore all closed tabs")); + menuitem.activate.connect(()=>{ + do{ + this.restore_tab(this.children_removed.nth_data(this.children_removed.length()-1)); + }while(this.children_removed.length()>0); + }); + submenu.append(menuitem); + menuitem = new Gtk.SeparatorMenuItem(); submenu.append(menuitem); - - foreach(var tab in this.children_removed){ + int index=1; + unowned List item_it = null; + //reverse order + for (item_it = this.children_removed.last(); item_it != null; item_it = item_it.prev) { + AYTab tab = item_it.data; tab.stop_remove_timer();//disable timer while popup shown string s = ( tab.tbutton.tab_title != null ? tab.tbutton.tab_title : _("index %d").printf(tab.tbutton.tab_index) ); - menuitem = new Gtk.MenuItem.with_label (_("Restore tab: %s").printf(s)); + menuitem = new Gtk.MenuItem.with_label ("%d: %s".printf(index,s)); menuitem.activate.connect(()=>{ debug("trying to restore tab %s",menuitem.label); this.restore_tab(tab); }); submenu.append(menuitem); + index++; } menu.deactivate.connect (()=>{ foreach(var tab in this.children_removed){ diff -Nru altyo-0.4~rc4/debian/changelog altyo-0.4~rc5/debian/changelog --- altyo-0.4~rc4/debian/changelog 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/debian/changelog 2014-05-23 06:21:17.000000000 +0000 @@ -1,3 +1,20 @@ +altyo (0.4~rc5-linvinus1) quantal; urgency=low + + * improvement: set logo in about dialog + * improvement: redraw borders when it's necessary + * Update README.md + * improvement: quick switch to last tab + * improvement: prevent transparent background in settings dialog if theme is broken + * improvement: in dialogs destroying + * fix: styling problems on DnD + * improvement: more predictable DnD behaviour + * new: popup menu option "Restore all closed tabs" + * improvement: use OffscreenWindow damage_event + * improvement: reverse order for closed tabs in popup menu + * update: Russian translation + + -- denis Fri, 23 May 2014 10:20:11 +0400 + altyo (0.4~rc4-linvinus1) quantal; urgency=low * Update README.md diff -Nru altyo-0.4~rc4/hvbox.vala altyo-0.4~rc5/hvbox.vala --- altyo-0.4~rc4/hvbox.vala 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/hvbox.vala 2014-05-23 06:21:17.000000000 +0000 @@ -23,12 +23,15 @@ public unowned Widget widget; public int max_width = -1; public bool ignore = false; + public ulong drag_begin_id = 0; + public ulong drag_data_get_id = 0; + public ulong drag_end_id = 0; public HVBoxItem(Widget W){ this.widget = W; } -//~ ~HVBoxItem(){ -//~ debug("~HVBoxItem"); -//~ } + ~HVBoxItem(){ + debug("~HVBoxItem"); + } // public void destroy(){ //~ base.destroy(); // delete (void*) this; @@ -42,7 +45,7 @@ private Gtk.SizeRequestMode mode = Gtk.SizeRequestMode.HEIGHT_FOR_WIDTH; - private List children; + private GLib.List children;//child will be destroyed as soon as it will be removed from List //private Window HVBParent; private bool drop_data_ready { get; set; default = false; } @@ -55,6 +58,11 @@ public bool background_only_behind_widgets { get; set; default = true; } public bool minimize_size { get; set; default = true; } public signal void child_reordered(Widget child, uint new_index); + public signal void on_dnd_above_changed(Widget dnd_widget,Widget above); + private int last_dnd_x = 0; + private int last_dnd_y = 0; + private unowned HVBoxItem last_dnd_above_item = null; + private unowned HVBoxItem last_dnd_item = null; //~ public static enum DragInfo { //~ TEXT_URI_LIST //~ } @@ -91,7 +99,8 @@ int y, uint time) { //debug("drag_motion drop_data_ready=%s\n",drop_data_ready.to_string()); - + this.last_dnd_x=x; + this.last_dnd_y=y; /* request drop data on demand */ if (!drop_data_ready) { @@ -196,7 +205,7 @@ unowned HVBoxItem** pitem=(HVBoxItem**)data[0]; if(pitem==null || !(*pitem is HVBoxItem) )return; - HVBoxItem dnd_item=*pitem; + unowned HVBoxItem dnd_item=*pitem; debug ("data = %d %s",(int)(pitem),dnd_item.widget.get_type().name()); @@ -206,7 +215,7 @@ var dnd_done = false; var allocation = Gtk.Allocation();//don't use new for struct var width = this.get_allocated_width(); - Gtk.StyleContext style_context = this.get_style_context(); + unowned Gtk.StyleContext style_context = this.get_style_context(); Gtk.Border border=style_context.get_border(StateFlags.NORMAL); allocation.x=0; @@ -233,7 +242,7 @@ unowned Widget widget = item.widget; var ingnore_h = 0; - widget.get_preferred_width (out allocation.width, out ingnore_h); + allocation.width=widget.get_allocated_width(); debug("\torig2 size_allocate position=%d x=%d y=%d w=%d h=%d\n",this.children.position(line_item),allocation.x,allocation.y,allocation.width,allocation.height); @@ -245,7 +254,6 @@ this.children.remove(dnd_item); var new_pos=this.children.position(line_item)+1; this.children.insert( dnd_item , new_pos); - this.child_reordered(dnd_item.widget,new_pos); dnd_done=true; debug("Found at EOL! Xx=%d Yy=%d\n",x,y); break; @@ -258,12 +266,12 @@ break; } var old_pos=this.children.index(dnd_item); - this.children.remove(dnd_item); var new_pos=this.children.position(line_item); + this.children.remove(dnd_item); + if(old_pos==new_pos) new_pos++; this.children.insert( dnd_item , new_pos); - this.child_reordered(dnd_item.widget,new_pos); //this.children.append(item2); dnd_done=true; break; @@ -283,7 +291,6 @@ this.children.remove(dnd_item); //this.children.insert( item2 , this.children.position(item)); this.children.append(dnd_item); - this.child_reordered(dnd_item.widget,this.children.index(dnd_item)); dnd_done=true; //~ } @@ -544,15 +551,17 @@ unowned Widget widget = w; widget.set_parent(this); HVBoxItem item = new HVBoxItem(widget); - unowned HVBoxItem item_ptr = item;//use in closure to avoid unnecessary ref() - drag_source_set (widget, Gdk.ModifierType.BUTTON1_MASK, target_entries, Gdk.DragAction.MOVE); - widget.drag_begin.connect ((context) => { + item.drag_begin_id = widget.drag_begin.connect ((context) => { if(dnd_inprocess)return; dnd_inprocess=true; debug ("drag begin"); + this.last_dnd_x=-1;//reset position + this.last_dnd_y=-1;//reset position + this.last_dnd_item=item; + this.last_dnd_above_item=item; //~ drag_highlight (widget); widget.unparent (); @@ -562,7 +571,7 @@ dnd_window.add (widget); dnd_window.show(); - item_ptr.ignore=true; + item.ignore=true; dnd_window.draw.connect ((cr)=>{widget.draw(cr); return true;}); @@ -572,7 +581,7 @@ //~ base.drag_begin(context) ; }); - widget.drag_data_get.connect ((context, selection_data, info, time) => { + item.drag_data_get_id = widget.drag_data_get.connect ((context, selection_data, info, time) => { debug ("drag data get"); Gdk.Atom target = Gdk.Atom.intern_static_string ("GTK_HVBOX_ITEM"); @@ -580,21 +589,24 @@ //workaround for vala 0.14 selection_data.set uchar[] uchar[] adata = new uchar[sizeof(void *)];//should work on x86_64 too ulong* pdata = (ulong *)(&adata[0]);//should work on x86_64 too - HVBoxItem** pitem=&item_ptr;//should work on x86_64 too + HVBoxItem** pitem=&item;//should work on x86_64 too *pdata=pitem; selection_data.set (target,8,(uchar[])adata); //~ base.drag_data_get(context, selection_data, info, time) ; } }); - widget.drag_end.connect ((context) => { + item.drag_end_id = widget.drag_end.connect ((context) => { debug ("drag end"); + this.last_dnd_item=null; + this.last_dnd_above_item=null; dnd_window.remove (widget); widget.set_parent (this); dnd_window.destroy(); - item_ptr.ignore=false; + item.ignore=false; drag_end(context); dnd_inprocess=false; + this.child_reordered(item.widget,this.children.index(item)); }); children.insert(item,index); @@ -607,14 +619,18 @@ foreach(unowned HVBoxItem item in this.children){ if(item.widget == widget){ item.widget.unparent(); + GLib.SignalHandler.disconnect(item.widget,item.drag_begin_id); + GLib.SignalHandler.disconnect(item.widget,item.drag_data_get_id); + GLib.SignalHandler.disconnect(item.widget,item.drag_end_id); children.remove(item); + if(children.length()>0 && this.visible){ int minimum_height,natural_height; hvbox_get_preferred_height_for_width(this.get_allocated_width(),out minimum_height, out natural_height); this.queue_resize();//and redraw } - item.unref();//destroy - return; + //item.unref();//destroy + break; //possible problem not optimized exit //~ item.destroy(); //~ return; @@ -727,6 +743,7 @@ unowned List item_it=null; unowned List end_of_line=null; + bool found_dnd_above=false; //draw background only behind widgets for (item_it = this.children; item_it != null; item_it = item_it.next) { @@ -744,6 +761,15 @@ unowned HVBoxItem item = line_item.data; unowned Widget widget = item.widget; allocation.width+=item.widget.get_allocated_width(); + //dnd stuff + if( !found_dnd_above && dnd_inprocess && this.last_dnd_x>0 && this.last_dnd_x\n" "Language-Team: LANGUAGE \n" @@ -119,78 +119,78 @@ msgid "Disable terminal menu" msgstr "" -#: altyo_terminal.vala:1240 +#: altyo_terminal.vala:1241 msgid "Terminal menu" msgstr "" -#: altyo_window.vala:1016 +#: altyo_window.vala:1035 msgid "Please select key combination, to show/hide AltYo." msgstr "" -#: altyo_window.vala:1018 +#: altyo_window.vala:1037 #, c-format msgid "Previous key '%s' incorrect or busy" msgstr "" -#: altyo_window.vala:1020 +#: altyo_window.vala:1039 msgid "Press any key" msgstr "" -#: altyo_window.vala:1033 +#: altyo_window.vala:1044 msgid "Grab another key." msgstr "" -#: altyo_window.vala:1465 altyo_window.vala:1643 +#: altyo_window.vala:1480 altyo_window.vala:1659 msgid "Shell terminated." msgstr "" -#: altyo_window.vala:1541 +#: altyo_window.vala:1557 msgid "Tab is locked, are you sure you want to close?" msgstr "" -#: altyo_window.vala:1552 +#: altyo_window.vala:1568 #, c-format msgid "" "terminal_prevent_close_regex wrong value! will be used default value. err:%s" msgstr "" -#: altyo_window.vala:1575 +#: altyo_window.vala:1591 #, c-format msgid "Found important task \"%s\"" msgstr "" -#: altyo_window.vala:1576 +#: altyo_window.vala:1592 msgid "Close tab anyway?" msgstr "" -#: altyo_window.vala:1828 +#: altyo_window.vala:1844 msgid "Really quit?" msgstr "" -#: altyo_window.vala:1829 +#: altyo_window.vala:1845 msgid "Save session" msgstr "" -#: altyo_window.vala:1866 +#: altyo_window.vala:1881 msgid "willemw12@gmail.com" msgstr "" -#: altyo_window.vala:1886 +#: altyo_window.vala:1901 #, c-format msgid "" "Really reset to defaults?\n" "Current settings will be saved in backup file %s.bak" msgstr "" -#: altyo_window.vala:1919 +#: altyo_window.vala:1933 msgid "Setup custom title?" msgstr "" -#: altyo_window.vala:1921 +#: altyo_window.vala:1935 msgid "new custom title" msgstr "" -#: altyo_window.vala:1979 +#: altyo_window.vala:1992 #, c-format msgid "" "You are trying to use key binding \"%s\"\n" @@ -198,223 +198,222 @@ "but, same key binding already binded to the action \"%s\"" msgstr "" -#: altyo_window.vala:1980 +#: altyo_window.vala:1993 msgid "error" msgstr "" -#: altyo_window.vala:2072 +#: altyo_window.vala:2085 msgid "New tab" msgstr "" -#: altyo_window.vala:2072 +#: altyo_window.vala:2085 msgid "Open new tab" msgstr "" -#: altyo_window.vala:2091 +#: altyo_window.vala:2104 msgid "Close tab" msgstr "" -#: altyo_window.vala:2091 +#: altyo_window.vala:2104 msgid "Close current tab" msgstr "" -#: altyo_window.vala:2096 +#: altyo_window.vala:2109 msgid "Next tab" msgstr "" -#: altyo_window.vala:2096 +#: altyo_window.vala:2109 msgid "Switch to next tab" msgstr "" -#: altyo_window.vala:2101 +#: altyo_window.vala:2114 msgid "Previous tab" msgstr "" -#: altyo_window.vala:2101 +#: altyo_window.vala:2114 msgid "Switch to previous tab" msgstr "" -#: altyo_window.vala:2107 +#: altyo_window.vala:2120 #, c-format msgid "Switch to tab %d" msgstr "" -#: altyo_window.vala:2107 +#: altyo_window.vala:2120 #, c-format msgid "Switch to tab %d,double press switch to tab %d" msgstr "" -#: altyo_window.vala:2132 +#: altyo_window.vala:2148 msgid "Copy" msgstr "" -#: altyo_window.vala:2132 +#: altyo_window.vala:2148 msgid "Copy selected text" msgstr "" -#: altyo_window.vala:2137 +#: altyo_window.vala:2153 msgid "Paste" msgstr "" -#: altyo_window.vala:2137 +#: altyo_window.vala:2153 msgid "Paste from primary clipboard" msgstr "" -#: altyo_window.vala:2142 +#: altyo_window.vala:2158 msgid "Search" msgstr "" -#: altyo_window.vala:2148 +#: altyo_window.vala:2164 msgid "Show/Hide Quick list" msgstr "" -#: altyo_window.vala:2156 data/preferences.glade:396 +#: altyo_window.vala:2172 data/preferences.glade:396 msgid "Follow mouse cursor" msgstr "" -#: altyo_window.vala:2159 +#: altyo_window.vala:2175 msgid "Settings..." msgstr "" -#: altyo_window.vala:2159 +#: altyo_window.vala:2175 msgid "Settings" msgstr "" -#: altyo_window.vala:2212 data/preferences.glade:3398 +#: altyo_window.vala:2228 data/preferences.glade:3398 msgid "Quit" msgstr "" -#: altyo_window.vala:2222 +#: altyo_window.vala:2238 msgid "Show/Hide" msgstr "" -#: altyo_window.vala:2227 +#: altyo_window.vala:2243 msgid "About" msgstr "" -#: altyo_window.vala:2231 +#: altyo_window.vala:2247 msgid "Disable sort tab" msgstr "" -#: altyo_window.vala:2239 +#: altyo_window.vala:2255 msgid "Stay on top" msgstr "" -#: altyo_window.vala:2250 +#: altyo_window.vala:2266 msgid "Stick" msgstr "" -#: altyo_window.vala:2250 +#: altyo_window.vala:2266 msgid "Toggle stick" msgstr "" -#: altyo_window.vala:2259 +#: altyo_window.vala:2275 msgid "Autohide" msgstr "" -#: altyo_window.vala:2259 +#: altyo_window.vala:2275 msgid "Toggle autohide" msgstr "" -#: altyo_window.vala:2263 +#: altyo_window.vala:2279 msgid "Maximize - restore" msgstr "" -#: altyo_window.vala:2263 +#: altyo_window.vala:2279 msgid "Maximize window, or restore to normal size" msgstr "" -#: altyo_window.vala:2272 +#: altyo_window.vala:2288 msgid "Sort by hostname" msgstr "" -#: altyo_window.vala:2276 +#: altyo_window.vala:2292 msgid "Open new window" msgstr "" -#: altyo_window.vala:2326 +#: altyo_window.vala:2342 msgid "Search in terminals titles" msgstr "" -#: altyo_window.vala:2337 +#: altyo_window.vala:2353 msgid "Terminal quick settings" msgstr "" -#: altyo_window.vala:2342 +#: altyo_window.vala:2358 msgid "Lock tab" msgstr "" -#: altyo_window.vala:2351 -msgid "Restore tab" +#: altyo_window.vala:2367 +msgid "Restore closed tab" msgstr "" -#: altyo_window.vala:2351 +#: altyo_window.vala:2367 msgid "Restore last closed tab" msgstr "" -#: altyo_window.vala:2359 +#: altyo_window.vala:2375 msgid "Custom title" msgstr "" -#: altyo_window.vala:2447 +#: altyo_window.vala:2463 #, c-format msgid "Tab%d - AltYo" msgstr "" -#: altyo_window.vala:2489 +#: altyo_window.vala:2505 #, c-format msgid "" "terminal_session_exclude_regex wrong value! will be used default value. err:" "%s" msgstr "" -#: altyo_window.vala:2584 +#: altyo_window.vala:2600 msgid "Restore tabs" msgstr "" -#: altyo_window.vala:2595 -#, c-format -msgid "index %d" +#: altyo_window.vala:2607 +msgid "Restore all closed tabs" msgstr "" -#: altyo_window.vala:2596 +#: altyo_window.vala:2623 #, c-format -msgid "Restore tab: %s" +msgid "index %d" msgstr "" -#: altyo_window.vala:2750 +#: altyo_window.vala:2779 msgid "Wrap search" msgstr "" -#: altyo_window.vala:2762 +#: altyo_window.vala:2791 msgid "Match case-sensitive" msgstr "" -#: altyo_window.vala:2778 +#: altyo_window.vala:2807 msgid "terminal text" msgstr "" -#: altyo_window.vala:2793 +#: altyo_window.vala:2822 msgid "terminals titles" msgstr "" -#: altyo_window.vala:2826 +#: altyo_window.vala:2855 msgid "Find previous" msgstr "" -#: altyo_window.vala:2847 +#: altyo_window.vala:2876 msgid "Find next" msgstr "" -#: altyo_window.vala:2858 +#: altyo_window.vala:2887 msgid "Close search dialog" msgstr "" -#: altyo_window.vala:3041 +#: altyo_window.vala:3070 msgid "Press enter to appy" msgstr "" -#: altyo_window.vala:3067 +#: altyo_window.vala:3096 msgid "Close dialog" msgstr "" @@ -422,32 +421,32 @@ msgid "AYsettings" msgstr "" -#: altyo_settings.vala:63 +#: altyo_settings.vala:64 msgid "Config is read only!" msgstr "" -#: altyo_settings.vala:84 data/preferences.glade:688 +#: altyo_settings.vala:85 data/preferences.glade:688 msgid "px" msgstr "" -#: altyo_settings.vala:87 +#: altyo_settings.vala:88 msgid "maximize" msgstr "" -#: altyo_settings.vala:89 +#: altyo_settings.vala:90 msgid "%" msgstr "" -#: altyo_settings.vala:489 +#: altyo_settings.vala:490 #, c-format msgid "in line %d at position %d error:%s" msgstr "" -#: altyo_settings.vala:496 +#: altyo_settings.vala:497 msgid "Looks good" msgstr "" -#: altyo_settings.vala:949 +#: altyo_settings.vala:950 #, c-format msgid "" "New style will not be saved!\n" @@ -455,16 +454,16 @@ "error:%s" msgstr "" -#: altyo_settings.vala:951 +#: altyo_settings.vala:952 msgid "AltYo CSS style error" msgstr "" -#: altyo_settings.vala:997 altyo_settings.vala:1007 altyo_settings.vala:1051 +#: altyo_settings.vala:998 altyo_settings.vala:1008 altyo_settings.vala:1052 #, c-format msgid "AltYo %s error" msgstr "" -#: altyo_settings.vala:998 altyo_settings.vala:1008 altyo_settings.vala:1052 +#: altyo_settings.vala:999 altyo_settings.vala:1009 altyo_settings.vala:1053 #, c-format msgid "" "New value of %s will not be saved!\n" diff -Nru altyo-0.4~rc4/po/ru/LC_MESSAGES/altyo.po altyo-0.4~rc5/po/ru/LC_MESSAGES/altyo.po --- altyo-0.4~rc4/po/ru/LC_MESSAGES/altyo.po 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/po/ru/LC_MESSAGES/altyo.po 2014-05-23 06:21:17.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-16 18:43+0400\n" +"POT-Creation-Date: 2014-05-23 10:18+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgid "\"command arg1 argN...\"" msgstr "\"комманда arg1 argN...\"" -#: altyo_settings.vala:89 +#: altyo_settings.vala:90 msgid "%" msgstr "%" @@ -100,7 +100,7 @@ msgid "AYsettings" msgstr "Настройки" -#: altyo_window.vala:2227 +#: altyo_window.vala:2243 msgid "About" msgstr "О программе" @@ -112,12 +112,12 @@ msgid "Advanced" msgstr "Дополнительные" -#: altyo_settings.vala:997 altyo_settings.vala:1007 altyo_settings.vala:1051 +#: altyo_settings.vala:998 altyo_settings.vala:1008 altyo_settings.vala:1052 #, c-format msgid "AltYo %s error" msgstr "AltYo ошибка %s" -#: altyo_settings.vala:951 +#: altyo_settings.vala:952 msgid "AltYo CSS style error" msgstr "AltYo ошибка CSS стиля" @@ -164,7 +164,7 @@ msgid "Auto start with desktop session" msgstr "Запускать вместе с рабочим столом" -#: altyo_window.vala:2259 +#: altyo_window.vala:2275 msgid "Autohide" msgstr "Скрывать автоматически" @@ -237,23 +237,23 @@ msgid "Chinese Traditional" msgstr "Китайский традиционный" -#: altyo_window.vala:2091 +#: altyo_window.vala:2104 msgid "Close current tab" msgstr "Закрыть текущий терминал" -#: altyo_window.vala:3067 +#: altyo_window.vala:3096 msgid "Close dialog" msgstr "Закрыть диалог" -#: altyo_window.vala:2858 +#: altyo_window.vala:2887 msgid "Close search dialog" msgstr "Закрыть диалог поиска" -#: altyo_window.vala:2091 +#: altyo_window.vala:2104 msgid "Close tab" msgstr "Закрыть терминал" -#: altyo_window.vala:1576 +#: altyo_window.vala:1592 msgid "Close tab anyway?" msgstr "Закрыть терминал в любом случае?" @@ -265,7 +265,7 @@ msgid "Command" msgstr "Команда" -#: altyo_settings.vala:63 +#: altyo_settings.vala:64 msgid "Config is read only!" msgstr "Конфигурационный файл доступен только для чтения!" @@ -285,7 +285,7 @@ "Прокручивать задний фон вместе с текстом если для фонового изображения " "использется картинка из файла" -#: altyo_window.vala:2132 +#: altyo_window.vala:2148 msgid "Copy" msgstr "Копировать" @@ -293,7 +293,7 @@ msgid "Copy link" msgstr "Копировать ссылку" -#: altyo_window.vala:2132 +#: altyo_window.vala:2148 msgid "Copy selected text" msgstr "Копировать выделенный текст" @@ -321,7 +321,7 @@ msgid "Custom shell" msgstr "Запускать эту оболочку" -#: altyo_window.vala:2359 +#: altyo_window.vala:2375 msgid "Custom title" msgstr "Особый заголовок" @@ -375,7 +375,7 @@ msgid "Disable popup menu" msgstr "Отключить всплывающее меню" -#: altyo_window.vala:2231 +#: altyo_window.vala:2247 msgid "Disable sort tab" msgstr "Исключить из сортировки" @@ -403,11 +403,11 @@ msgid "Far right" msgstr "В конце списка" -#: altyo_window.vala:2847 +#: altyo_window.vala:2876 msgid "Find next" msgstr "следующее" -#: altyo_window.vala:2826 +#: altyo_window.vala:2855 msgid "Find previous" msgstr "предыдущее" @@ -415,7 +415,7 @@ msgid "First monitor" msgstr "Первый монтор" -#: altyo_window.vala:2156 data/preferences.glade:396 +#: altyo_window.vala:2172 data/preferences.glade:396 msgid "Follow mouse cursor" msgstr "Следовать за мышью" @@ -423,7 +423,7 @@ msgid "Font" msgstr "Шрифт" -#: altyo_window.vala:1575 +#: altyo_window.vala:1591 #, c-format msgid "Found important task \"%s\"" msgstr "Запущена важная программа \"%s\"" @@ -438,7 +438,7 @@ msgid "Georgian" msgstr "Грузинский" -#: altyo_window.vala:1033 +#: altyo_window.vala:1044 msgid "Grab another key." msgstr "Считать другую комбинацию клавиш" @@ -518,7 +518,7 @@ msgid "Lock any configuration changes" msgstr "Заблокировать любые изменения конфигурации" -#: altyo_window.vala:2342 +#: altyo_window.vala:2358 msgid "Lock tab" msgstr "Защитить закладку" @@ -526,7 +526,7 @@ msgid "Look and feel" msgstr "Внешний вид и поведение" -#: altyo_settings.vala:496 +#: altyo_settings.vala:497 msgid "Looks good" msgstr "Выглядит хорошо" @@ -534,7 +534,7 @@ msgid "Match" msgstr "Регулярное выражение" -#: altyo_window.vala:2762 +#: altyo_window.vala:2791 msgid "Match case-sensitive" msgstr "Учитывать регистр" @@ -546,11 +546,11 @@ msgid "Max tab width" msgstr "Максимальная ширина" -#: altyo_window.vala:2263 +#: altyo_window.vala:2279 msgid "Maximize - restore" msgstr "Развернуть на весь экран" -#: altyo_window.vala:2263 +#: altyo_window.vala:2279 msgid "Maximize window, or restore to normal size" msgstr "Развернуть окно на весь экран, или восстановить прежний размер" @@ -558,7 +558,7 @@ msgid "Never" msgstr "Никогда" -#: altyo_settings.vala:949 +#: altyo_settings.vala:950 #, c-format msgid "" "New style will not be saved!\n" @@ -569,7 +569,7 @@ "в строке %d в позиции %d\n" "ошибка:%s" -#: altyo_window.vala:2072 +#: altyo_window.vala:2085 msgid "New tab" msgstr "Добавить терминал" @@ -585,7 +585,7 @@ "Положение\n" "новой закладки" -#: altyo_settings.vala:998 altyo_settings.vala:1008 altyo_settings.vala:1052 +#: altyo_settings.vala:999 altyo_settings.vala:1009 altyo_settings.vala:1053 #, c-format msgid "" "New value of %s will not be saved!\n" @@ -594,7 +594,7 @@ "Новое значение %s не будет сохранено!\n" "%s" -#: altyo_window.vala:2096 +#: altyo_window.vala:2109 msgid "Next tab" msgstr "Следующий терминал" @@ -628,11 +628,11 @@ "После закрытия\n" "последней закладки" -#: altyo_window.vala:2072 +#: altyo_window.vala:2085 msgid "Open new tab" msgstr "Открыть новый терминал" -#: altyo_window.vala:2276 +#: altyo_window.vala:2292 msgid "Open new window" msgstr "Открыть новое окно" @@ -640,11 +640,11 @@ msgid "Pango Text Attribute Markup Language" msgstr "Синтаксис языка разметки Pango" -#: altyo_window.vala:2137 +#: altyo_window.vala:2153 msgid "Paste" msgstr "Вставить" -#: altyo_window.vala:2137 +#: altyo_window.vala:2153 msgid "Paste from primary clipboard" msgstr "Вставить из основного буфера обмена" @@ -656,16 +656,16 @@ msgid "Persian" msgstr "Персидский" -#: altyo_window.vala:1016 +#: altyo_window.vala:1035 msgid "Please select key combination, to show/hide AltYo." msgstr "" "Пожалуйста укажите комбинацию клавиш для скрития/показа программы АльтЁ" -#: altyo_window.vala:1020 +#: altyo_window.vala:1039 msgid "Press any key" msgstr "Нажмите любую кнопку" -#: altyo_window.vala:3041 +#: altyo_window.vala:3070 msgid "Press enter to appy" msgstr "Нажмите Enter чтобы применить" @@ -673,12 +673,12 @@ msgid "Prevent close" msgstr "Не закрывать если" -#: altyo_window.vala:1018 +#: altyo_window.vala:1037 #, c-format msgid "Previous key '%s' incorrect or busy" msgstr "Предыдущая комбинация '%s' уже занята, или неправильнго формата" -#: altyo_window.vala:2101 +#: altyo_window.vala:2114 msgid "Previous tab" msgstr "Предыдущий терминал" @@ -698,7 +698,7 @@ msgid "Quick settings" msgstr "Быстрые настройки" -#: altyo_window.vala:2212 data/preferences.glade:3398 +#: altyo_window.vala:2228 data/preferences.glade:3398 msgid "Quit" msgstr "Выход" @@ -706,11 +706,11 @@ msgid "Read configuration from file" msgstr "Прочитать конфигурацию из файла" -#: altyo_window.vala:1828 +#: altyo_window.vala:1844 msgid "Really quit?" msgstr "Действительно выйти?" -#: altyo_window.vala:1886 +#: altyo_window.vala:1901 #, c-format msgid "" "Really reset to defaults?\n" @@ -748,20 +748,19 @@ "коммандную оболочку\n" "и скрыть окно" -#: altyo_window.vala:2351 -msgid "Restore last closed tab" -msgstr "Восстановить последнюю закрытую вкладку" +#: altyo_window.vala:2607 +msgid "Restore all closed tabs" +msgstr "Восстановить все закрытые вкладки" -#: altyo_window.vala:2351 -msgid "Restore tab" -msgstr "Восстановить терминал" +#: altyo_window.vala:2367 +msgid "Restore closed tab" +msgstr "Восстановить последнюю закрытую вкладку" -#: altyo_window.vala:2596 -#, c-format -msgid "Restore tab: %s" -msgstr "Восстановить терминал: %s" +#: altyo_window.vala:2367 +msgid "Restore last closed tab" +msgstr "Восстановить последнюю закрытую вкладку" -#: altyo_window.vala:2584 +#: altyo_window.vala:2600 msgid "Restore tabs" msgstr "Восстановить терминалы" @@ -797,7 +796,7 @@ msgid "Run this command instead user shell" msgstr "Запускать эту команду вместо оболочки пользователя" -#: altyo_window.vala:1829 +#: altyo_window.vala:1845 msgid "Save session" msgstr "Сохранить сессию" @@ -821,11 +820,11 @@ msgid "Scroll on output" msgstr "Прокручивать при выводе" -#: altyo_window.vala:2142 +#: altyo_window.vala:2158 msgid "Search" msgstr "Поиск" -#: altyo_window.vala:2326 +#: altyo_window.vala:2342 msgid "Search in terminals titles" msgstr "Поиск в заголовках терминалов" @@ -841,19 +840,19 @@ msgid "Set/update default path" msgstr "Установить/Обновить путь по умолчанию" -#: altyo_window.vala:2159 +#: altyo_window.vala:2175 msgid "Settings" msgstr "Настройки" -#: altyo_window.vala:2159 +#: altyo_window.vala:2175 msgid "Settings..." msgstr "Настройки" -#: altyo_window.vala:1919 +#: altyo_window.vala:1933 msgid "Setup custom title?" msgstr "Утановить особый заголовок?" -#: altyo_window.vala:1465 altyo_window.vala:1643 +#: altyo_window.vala:1480 altyo_window.vala:1659 msgid "Shell terminated." msgstr "Оболочка была закрыта" @@ -861,11 +860,11 @@ msgid "Show scrollbar" msgstr "Показывать прокрутку" -#: altyo_window.vala:2222 +#: altyo_window.vala:2238 msgid "Show/Hide" msgstr "Показать/скрыть окно AltYo" -#: altyo_window.vala:2148 +#: altyo_window.vala:2164 msgid "Show/Hide Quick list" msgstr "Показать/скрыть быстрые команды" @@ -877,7 +876,7 @@ msgid "Sort by" msgstr "Сортировать по" -#: altyo_window.vala:2272 +#: altyo_window.vala:2288 msgid "Sort by hostname" msgstr "Выстроить по названию хоста" @@ -897,7 +896,7 @@ msgid "Start maximized" msgstr "При старте окно во весь экран" -#: altyo_window.vala:2239 +#: altyo_window.vala:2255 msgid "Stay on top" msgstr "Поверх всех окон" @@ -905,24 +904,24 @@ msgid "Stay on top by default" msgstr "Поверх всех окон" -#: altyo_window.vala:2250 +#: altyo_window.vala:2266 msgid "Stick" msgstr "Всегда на видимом рабочем месте" -#: altyo_window.vala:2096 +#: altyo_window.vala:2109 msgid "Switch to next tab" msgstr "Следующий терминал" -#: altyo_window.vala:2101 +#: altyo_window.vala:2114 msgid "Switch to previous tab" msgstr "Предыдущий терминал" -#: altyo_window.vala:2107 +#: altyo_window.vala:2120 #, c-format msgid "Switch to tab %d" msgstr "Переключиться в терминал № %d" -#: altyo_window.vala:2107 +#: altyo_window.vala:2120 #, c-format msgid "Switch to tab %d,double press switch to tab %d" msgstr "" @@ -948,11 +947,11 @@ msgid "Tab close delay" msgstr "Задержка закрытия вкладки" -#: altyo_window.vala:1541 +#: altyo_window.vala:1557 msgid "Tab is locked, are you sure you want to close?" msgstr "Вкладка защищена, вы действительно хотите закрыть?" -#: altyo_window.vala:2447 +#: altyo_window.vala:2463 #, c-format msgid "Tab%d - AltYo" msgstr "Tab%d - AltYo" @@ -969,11 +968,11 @@ msgid "Terminal header" msgstr "Шаблон для заголовка терминала" -#: altyo_terminal.vala:1240 +#: altyo_terminal.vala:1241 msgid "Terminal menu" msgstr "Меню терминала" -#: altyo_window.vala:2337 +#: altyo_window.vala:2353 msgid "Terminal quick settings" msgstr "Быстрые настройки терминала" @@ -1009,11 +1008,11 @@ msgid "Title changed" msgstr "Изменениях заголовка" -#: altyo_window.vala:2259 +#: altyo_window.vala:2275 msgid "Toggle autohide" msgstr "Переключить состояние настройки автоматического скрытия" -#: altyo_window.vala:2250 +#: altyo_window.vala:2266 msgid "Toggle stick" msgstr "Переключить состояние настройки \"всегда на видимом рабочем месте\"" @@ -1065,7 +1064,7 @@ msgid "Window gravity north" msgstr "Окно вверху" -#: altyo_window.vala:2750 +#: altyo_window.vala:2779 msgid "Wrap search" msgstr "Искать циклически" @@ -1081,7 +1080,7 @@ msgid "Y Position" msgstr "Позиция по Y" -#: altyo_window.vala:1979 +#: altyo_window.vala:1992 #, c-format msgid "" "You are trying to use key binding \"%s\"\n" @@ -1101,7 +1100,7 @@ msgid "config.ini" msgstr "config.ini" -#: altyo_window.vala:1980 +#: altyo_window.vala:1993 msgid "error" msgstr "Ошибка" @@ -1119,12 +1118,12 @@ "Если будет найдена ошибка, курсор будет установлен в соответстующее ошибке " "положение" -#: altyo_settings.vala:489 +#: altyo_settings.vala:490 #, c-format msgid "in line %d at position %d error:%s" msgstr "в строке %d в позиции %d ошибка:%s" -#: altyo_window.vala:2595 +#: altyo_window.vala:2623 #, c-format msgid "index %d" msgstr "номер %d" @@ -1141,18 +1140,18 @@ "количество линий\n" "-1 означает \"бесконечная прокрутка\"" -#: altyo_settings.vala:87 +#: altyo_settings.vala:88 msgid "maximize" msgstr "" "развернуть\n" "на весь\n" "экран" -#: altyo_window.vala:1921 +#: altyo_window.vala:1935 msgid "new custom title" msgstr "особый заголовок" -#: altyo_settings.vala:84 data/preferences.glade:688 +#: altyo_settings.vala:85 data/preferences.glade:688 msgid "px" msgstr "px" @@ -1197,11 +1196,11 @@ "Неверное значение параметра tab_title_format_regex, будет использованно " "значение по умолчанию! ошибка:%s" -#: altyo_window.vala:2778 +#: altyo_window.vala:2807 msgid "terminal text" msgstr "в тексте терминала" -#: altyo_window.vala:1552 +#: altyo_window.vala:1568 #, c-format msgid "" "terminal_prevent_close_regex wrong value! will be used default value. err:%s" @@ -1209,7 +1208,7 @@ "Неверное значение параметра terminal_prevent_close_regex, будет " "использованно значение по умолчанию! ошибка:%s" -#: altyo_window.vala:2489 +#: altyo_window.vala:2505 #, c-format msgid "" "terminal_session_exclude_regex wrong value! will be used default value. err:" @@ -1232,11 +1231,11 @@ "Неверное значение параметра terminal_prevent_close_regex, будет " "использованно значение по умолчанию! ошибка:%s" -#: altyo_window.vala:2793 +#: altyo_window.vala:2822 msgid "terminals titles" msgstr "в заголовках терминалов" -#: altyo_window.vala:1866 +#: altyo_window.vala:1881 msgid "willemw12@gmail.com" msgstr "Константинов Денис" @@ -1271,6 +1270,12 @@ #~ msgid "Reset to defaults" #~ msgstr "Восстановить значения по умолчанию" +#~ msgid "Restore tab" +#~ msgstr "Восстановить терминал" + +#~ msgid "Restore tab: %s" +#~ msgstr "Восстановить терминал: %s" + #~ msgid "" #~ "Sorry, your default height is 100%, window size cannot be reduced, please " #~ "change default window height in preferences." diff -Nru altyo-0.4~rc4/README.md altyo-0.4~rc5/README.md --- altyo-0.4~rc4/README.md 2014-05-17 06:24:57.000000000 +0000 +++ altyo-0.4~rc5/README.md 2014-05-23 06:21:17.000000000 +0000 @@ -99,10 +99,11 @@ ``` * Q) when resizing terminal, lines break, if you are running Zsh -* A) bug is described there https://bbs.archlinux.org/viewtopic.php?pid=1246865 - you need to apply patch (https://bbs.archlinux.org/viewtopic.php?pid=1246865#p1246865). +* A) bug is described there https://bugzilla.gnome.org/show_bug.cgi?id=708213 and there https://bbs.archlinux.org/viewtopic.php?pid=1246865 + ~~you need to apply patch (https://bbs.archlinux.org/viewtopic.php?pid=1246865#p1246865). to resolve that. - for ubuntu users, patched vte available in this ppa https://launchpad.net/~linvinus/+archive/vte + for ubuntu users, patched vte available in this ppa https://launchpad.net/~linvinus/+archive/vte~~ + this bug resolved in vte 0.36 * Q) Window gravity south, not working under xfwm4 * A) it is xfwm4 bug https://bugzilla.xfce.org/show_bug.cgi?id=3634 @@ -115,6 +116,13 @@ but, for example, you may use following wrap around `bash -c "EDITOR=vim mc"` in this example mc will runned with special environment variable +* Q) F11 (maximize) not working in lubuntu (with openbox) +* A) you need to remove following lines in ~/.config/openbox/lubuntu-rc.xml + ` + + ` + + Reviews about AltYo ------------------- zenway.ru (Russian) http://zenway.ru/page/altyo