[02:13] If you look at the screenshots/en/03-window-buttons.png image, are those buttons in the correct order? [02:13] (I've lost track of what the final appearance should be!) [02:18] final should be close, minimize, maximize [02:29] bug 561868 [02:29] Launchpad bug 561868 in ubuntu-manual "wrong text" [Medium,Fix committed] https://launchpad.net/bugs/561868 [02:33] Aha! I'm not insane! [02:33] http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/lucid-1e/revision/766 [02:33] (Though I may have my branches all messed up; it's hard to say.) [02:34] Could someone check their lucid-1e branch and see what this text says: http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/lucid-1e/revision/766 [02:37] brb [02:58] I'm back now. [02:58] Hey, humphreybc [02:58] humphreybc: can you check your lucid-1e branch and see what the around-desktop.tex file says: http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/lucid-1e/revision/766 [03:08] sure, in a sec [03:08] I'm snagging a fresh copy of the lucid-e1 branch. [03:09] I think for the second edition and maverick it might almost be best to create totally new branches and actually copy over what we want. [03:09] yeaqh [03:09] that way there isn't this huge history filled with garbage (like the websites and other non-manual stuff) [03:09] that's probably a good idea [03:24] I'm looking at the around-desktop file [03:25] what do you need to know? [03:25] the order of the window control buttons in the text. [03:26] "The close, minimize, and maximize buttons are on the top-left corner of windows." [03:26] that's highlighted in green [03:30] weird. [03:30] what's 'bzr info' say? [03:33] oh wait [03:33] I'm checking what it says in my local branch? [03:33] should I pull? [03:37] yes and yes. [03:37] I'm trying to figure out why my local branch has old text that I fixed eons ago. [03:38] okay, it may take ages to pull [03:38] 'kay. [03:38] i'm just waiting for the rain to die away so i can go grocery shopping and get some food... didn't go yesterday [03:39] ah [03:39] wow, bzr is going fast for a change [03:40] really? mine was super-slow [03:41] 12KB/s [03:44] they're wrong in my branch [03:44] rev 801 [03:44] http://bazaar.launchpad.net/ubuntu-manual/revision/801 | http://bazaar.launchpad.net/ubuntu-manual -r 801 [03:45] right [03:45] [03:45] great. [03:45] rain's stopped, off to the supermarket [03:46] any idea where it disappeared to? [03:46] 'kay. see ya [03:46] shouldn't the branch be lucid-e2? [03:46] I fixed it in e1 a couple weeks ago [03:47] now I'm worried the translators may be translating the wrong string or something. [03:47] weird. So lucid-e1 is the branch for the 2nd edition? [03:47] too many branches and stuff. I'm all confused these days. [03:47] no, no. [03:47] coz ubuntu-manual is the branch for the current release [03:47] oh [03:47] lucid-e1 should be the branch for the first edition. [03:47] ohhhhhh [03:47] lucid-e2 is the second edition [03:47] maverick is 10.10 [03:47] and what's ubuntu-manual? [03:47] frak if I know. [03:47] sandpit? [03:47] lol [03:48] it used to be set to lucid-e1, but I think someone changed it recently, maybe. [03:48] I don't really know. [03:48] bzr frightens and confuses me! [03:48] me too! [03:48] you'll work it out [03:48] I'm hoping someone else works it out for me. :-) [03:48] I don't want to have to figure out what's gone missing. [03:48] I'm tired. [03:48] lol [03:48] whinge whinge :P [03:49] I'm just trying to make it look pretty before it gets shipped off. [03:49] :) [03:49] watch out or thorwil will come in here and accuse you of being an 8 year old [03:52] * godbyk stomps his feet. [03:54] bollocks it's started raining again [03:54] why can no one make decent google chrome themes? [03:55] good question [03:55] DOCKYYYYYYYYYYYYYYYy [03:55] STOP CRASHING [03:56] okay [03:57] * humphreybc continues adding work items [04:02] stop making more work! :) [04:02] :P [04:08] humphreybc: who's our bzr expert? [04:08] um [04:08] you? dutchie? [04:09] what feedback do we want from the 1st edition? [04:09] not me. :) [04:10] I'm trying to track down where the changes I made (about the window controls) went. [04:11] lol [04:11] ask in #bzr [04:11] ;) [04:14] I think it may be more of a launchpad thing. [04:15] ask in #launchpad then :) [04:16] so when I run 'bzr branch lp:lucid-e1' it pulls from ubuntu-manual/main. but that change was made in ubuntu-manual/lucid-1e. [04:16] I don't know what that means. :-/ [04:16] lol [04:18] do you think i've covered all the blueprints? [04:21] karma whore! :) [04:21] hahaha [04:21] nah but seriously, I need to make sure i've got everything so I can assign people and lay down the work items early, then everyone knows what's happening [04:32] im giving thorwil some work, think he'll mind? [04:34] Depends on how busy he is and if it's under his purview. [04:34] lol [04:35] brb.. need snackage [04:35] you're american. what do twinkies taste like? [04:50] I'm back. [04:50] Wow. I haven't had a Twinkie in ages! [04:50] Well the cake bit is quite spongy. Kind of like angel food cake, but a lot more processed. [04:51] I'm not sure how to describe the taste. I haven't had one in years. [04:52] heh [04:59] * humphreybc is finding loads of work to make into blueprints [05:03] this is cool [05:03] https://blueprints.launchpad.net/ubuntu-manual/+assignments [05:03] shows us how much work we have to do :P [05:08] godbyk, where was that pad that I created yesterday, it had the stuff we were going to put on the back cover [05:09] humphreybc: http://pad.ubuntu-uk.org/CCWkwXmebw [05:09] thankee :) [05:13] * humphreybc might get that 50,000 karma in the next few days haha [05:13] godbyk, https://blueprints.launchpad.net/ubuntu-manual/+spec/back-cover-lucid [05:14] blueprints are way overrated, karma-wise. [05:14] i know [05:14] we should be using whiteboards on blueprints more often now, instead of etherpad [05:14] then we won't lose all the pads [05:15] or at least link to an etherpad in the whiteboard [05:16] probably [05:16] but the real-time collaboration is nice on the pads [05:17] oh wtf [05:17] https://launchpad.net/~pitti [05:17] 106,000 karma [05:17] wait [05:18] no, 1 million+ karma [05:18] yeah [05:18] wtf [05:19] zomg! [05:19] * hemanth on fedora as no network on lucid after upgrade :( [05:19] The vast majority of it is earned for Soyuz -- whatever that is. [05:19] lol [05:20] secret Canonical moon base? [05:20] https://launchpad.net/soyuz [05:21] ah ha [05:23] should I assign dutchie to the custom bug reporting form? [05:24] either him or me, I s'pose. [05:24] i stuck him [05:24] he's only got 2 blueprints [05:26] k [05:26] we should have a bug reporting form online by the time we've released the manual. [06:31] back [06:40] godbyk, did you read jono's review quote? [06:43] nope [06:43] where's it at? [06:43] it's on the pad or whiteboard for the back cover [10:27] morning all [10:29] morning. [10:29] though it's closer to bedtime, for me. :) [10:30] hehe === jussi01 is now known as jussi [12:19] 'morning all [12:19] hello semioticrobotic [12:22] how are things, ubuntujenkins? [12:23] good thanks semioticrobotic, you? [12:24] I have to run got to catch a bus bye all. sorry semioticrobotic o/ [12:54] godbyk: is titlepage_letter_en.pdf in use? [16:39] helllo all [17:28] ubuntujenkins, hi :) [17:29] hello hemanth [17:30] was reading the mail in the ml [17:31] sure, any thoughts? [18:47] godbyk: i messed up the generate-title-pages process somehow, while getting rid of a white fill in the pointer CoC cirlce and pointer are one shape, now) [19:13] hemanth, have you got time to go through your gui design thoughts? [19:14] ubuntujenkins,need to look in detail today didn't get much time :( [19:15] ok hemanth, if you don't mind poping it in an e-mail that would be good. [19:15] ubuntujenkins, sure [19:16] thanks [19:18] o/ [19:19] hello dutchie [19:23] \o [19:23] * hemanth left handed hehe good night all [20:50] thorwil: http://dl.dropbox.com/u/1325768/facebook.png http://dl.dropbox.com/u/1325768/twitter.png for the website [20:51] vish: good work [20:51] :) [20:52] hmm , now where is daker .. [20:53] vish: email him, he seems to like graphics for the website as attachments [20:54] heh , i dont know his id ;) [20:58] Hello [20:59] RE: line 482 [20:59] It says that Yohoo is the default search engine [20:59] wasn't it changed back to Google? [21:02] godbyk: ^^ [21:02] oh bloody hell [21:02] ah dutchie's here ;) [21:02] worth a freeze exception imo [21:02] should probably wait for someone else to check though [21:03] It is a pain [21:03] yeah :( [21:14] Anyway, i will log it as a bug [21:19] Ok, it is logged. https://bugs.launchpad.net/ubuntu-manual/+bug/569187 [21:19] Launchpad bug 569187 in ubuntu-manual "yahoo mentioned instead of Google Search" [Critical,New] [21:19] great, thanks [22:29] hey, dutchie.. you still around? [22:29] Or anyone who knows anything about bzr/launchpad? [22:30] the google/yahoo text has been modified, but apparently in the wrong branch. [22:30] I could use some help trying to sort it all out. [22:30] yes [22:30] rrrr/away [22:30] grr [22:31] http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/lucid-1e/revision/766 [22:31] that's one of the fixes I put in eons ago. [22:31] note that it's in ubuntu-manual/lucid-1e instead of ubuntu-manual/main. [22:31] how do we fix all that? [22:32] * godbyk is frightened and confused! [22:32] hmm [22:32] * dutchie investigates [22:33] * godbyk feels better now that dutchie's on the case! [22:33] * dutchie wonders why [22:36] hmm [22:36] something quite odd is going on in the branch and series [22:37] agreed. [22:37] What's that then? [22:37] but I'm fairly clueless about it all. [22:38] Have you checked the flux capacitor or the dilithium crystals ;) [22:38] I reckon we need to merge lucid-1e into main [22:39] Oh [22:40] See, I thought lucid-1e was main (or vice versa). [22:40] when I run 'bzr branch lp:ubuntu-manual/lucid-1e' it pulls /main [22:40] I think I will delete the lucid-1e branch after merging [22:41] to prevent such confusion [22:41] great. [22:41] after (careful) merging, we'll need to update the pot file, too. [22:41] oh bloody hell [22:41] 305 conflicts encountered. [22:41] :( [22:41] * godbyk anticipates much harassment from translators. [22:42] stuff doing that [22:42] the only things we really need to merge are the .tex files. [22:42] the rest of it we don't care about [22:43] So what impact does it have on translations? [22:45] Well, the reason we need to merge is because I've updated some strings in the lucid-1e branch and those need merged into main. [22:45] (Strings like the default search engine (from Yahoo to Google), window control buttons position and order, etc.) [22:46] this would not be a problem if godbyk was working on the right branch [22:46] :P [22:46] lol [22:46] I was! I was using lucid-1e. It's the rest of the works using main that's the problem. ;-) [22:47] I'm not even sure how I got those files into the /lucid-1e area since I can't figure out how to download from there. [22:47] (When I pull lp:ubuntu-manual/lucid-1e, it's pulling /main) [22:47] ITYM lp:ubuntu-manual/lucid-e1 [22:47] this is the source of the confusion [22:48] er, whatever. that was a stupid typo on my part way back when I was forced to set up the branches. :) [22:48] I think the branch was 1e and the series was e1 or vice versa. [22:48] they didn't align, in any case. [22:49] they really should be named lucid-1e and lucid-2e, if there's any simple way to correct that at this point. [22:49] doubt it [22:51] I think godbyk should stick to the latex [22:51] I'm also thinking that for e2 and maverick, it might be good to start with fresh branches (i.e., without bringing in the history and cruft of e1). That way the branches can be a lot smaller. [22:51] * godbyk agrees wholeheartedly! [22:52] (blame humphreybc.. he's the one who forced me to set those things up -- despite much protesting on my part!) :-) [22:52] godbyk: which commits do you want from the doomed lucid-1e branch? [22:52] Oh, boy. Lemme look. [22:54] dutchie: I think it's just r766 and r765 (from http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/lucid-1e/changes/767?start_revid=767) [22:54] right [22:54] doing it [22:54] awesome [22:55] then you can hold my hand and tell me what I should be checking out/branching/pulling. :) [23:00] godbyk: right, pull lp:ubuntu-manual/lucid-e1 (which points to lp:~ubuntu-manual/ubuntu-manual/main) and check that all the fixes you want are there [23:01] okay [23:01] I just discovered 'bzr viz' yesterday and it's awesome. [23:03] pulling. it's taking a while. [23:03] good old lp/bzr up to its usual performance [23:08] dutchie: yeah, I think that looks good now. [23:09] sure? [23:09] So I suppose next we'll need to update the pot file in that branch. [23:10] I'm going to delete the branch first [23:10] (if you're sure we've got all we need from it) [23:10] can I nab a copy of that branch first just in case? [23:10] (Though those are the only commits I saw in there since the branch was created) [23:12] sure [23:12] okay, I'm pulling the branch from ~ubuntu-manual/ubuntu-manual/lucid-1e right now. [23:12] (this could take a while!) [23:13] in the meantime, what do you think about culling all the cruft and establishing brand new branches for lucid-e2 and maverick? [23:13] (so we're not pulling 150+ MB) [23:14] maverick, maybe, lucid-e2, maybe not [23:14] k [23:15] I know there have been some commits to lucid-e2 already. but surely maverick is still untouched, yes? [23:15] dunno [23:15] https://edge.launchpad.net/ubuntu-manual/maverick [23:16] doesn't look to like it [23:17] 'kay. [23:18] because even though I deleted some files, you still have to pull the full history of those files, I think. [23:19] dutchie: okay, you can kill that branch now. [23:19] gone [23:19] I've made a copy of it on my computer called: ~/bzr/lucid-1e-die-die-die. [23:19] now we need to update the translations. [23:20] could you do it? [23:20] if you could do it in such a way that I don't receive hate mail from disgruntled Romanian translators, I'd be much obliged. [23:20] ah, nm [23:20] I could try, if you give me the command again. It didn't work for me last time, though. (It only updated the po files, not the pot file.) [23:21] no worries, I'll do it [23:21] 'kay. [23:21] I'm assuming it requires some magic that I don't possess. :) [23:22] maybe [23:23] godbyk: rofl [23:24] doesn't want to work for me now :( [23:25] \o/ it's not just me! [23:38] godbyk: can you try po4a --no-translations -v -MUTF-8 --package-version=`bzr revno` --copyright-holder="The Ubuntu Manual Team" --package-name=ubuntu-manual po4a.conf? [23:39] sure [23:39] it's currently updating the .po files and complaining about some spurious \r's. [23:39] and that's all it did. [23:40] :( [23:40] it didn't touch the pot file [23:41] * dutchie takes a radical step and deletes the pot file [23:42] that didn't work :( [23:43] should we use po4a-gettextize? [23:43] * godbyk is reading the man pages [23:43] shouldn't have to [23:43] do you want to ask in #po4a on oftc, seeing as I definitely should go to bed? [23:44] I can try. Where's oftc? [23:44] ah, found it. [23:44] xchat had it in its list already [23:46] not sure if anyone's awake in that channel, but we'll see. [23:46] I'll leave it in your hands then [23:46] oh, yeah, brilliant idea. [23:46] just try not to change the po files [23:46] if they don't change, we don't lose anything [23:47] Right. I can always revert the po files before I commit something. [23:47] I think mucking up the pot file is more dangerous, though. :)