--- Log opened Thu May 14 00:00:55 2015
00:05 #navit: <@KaZeR> i can have a look. my car is running this code : https://github.com/pgrandin/navit in "production" :)
00:05 #navit: <@KaZeR> did you try to merge against github or svn ?
00:08 #navit: < mvglasow> I tried to add https://github.com/navit-gps/navit/ as a remote to my local git repo (which is in sync with my github repo) and pull the highfive branch
00:08 #navit: < mvglasow> I got merge conflicts for two files that I'm sure we never touched in highfive
00:09 #navit: < mvglasow> and resolving them by just accepting the version from navit-gps gave me build errors
00:10 #navit: <@KaZeR> ha, the possible reason is /navit vs /navit/navit
00:10 #navit: <@KaZeR> i had the same in my own repo :)
00:12 #navit: < mvglasow> dang, you're right – the folder structure's different
00:12 #navit: < mvglasow> how did you resolve it?
00:13 #navit: <@KaZeR> i cheated :) i pulled trunk from navit-gps/navit, and applied my own branch as a patch on top of it
00:15 #navit: < mvglasow> which means you're losing the entire commit history – well, that answers my next question: whether you'd like me to squash all of h5 into a single commit
00:16 #navit: < mvglasow> so patch and squash it's gonna be, I guess
00:21 #navit: <@KaZeR> well to put it in the svn trunk you don't have much choice anyway
00:23 #navit: < mvglasow> never tried merging from trunk and back with git-svn... maybe it'd give us lots of commits, bumping the release number by quite a few :-) but I'm fine with squash & merge
00:24 #navit: < mvglasow> another question – I see that there is no translation for English, meaning Navit uses the strings from the C source
00:24 #navit: < mvglasow> resulting in speech output such as "Turn right into Hauptstraße in one hundred meters vertical bar feminine form"
00:25 #navit: <@KaZeR> the issue is that the dev in github started before the workflow was setup. if we want to do something similar today it would be easier to not loose the history
00:25 #navit: <@KaZeR> ha yes i still need to address that. i put a label on your emails and i'll have to take care of it
00:25 #navit: < mvglasow> can I just create en.po.in and add it? or does English require special magic?
00:26 #navit: <@KaZeR> no magic should be required, the .po should be quite straightforward
00:27 #navit: < mvglasow> ok, then I'll go that way – should be my easiest translation so far :-)
00:27 #navit: <@KaZeR> indeed :)
00:27 #navit: <@KaZeR> i have to go afk i'll be back in a few
00:27 -!- KaZeR [~KaZeR@64.201.252.132] has quit [Remote host closed the connection]
00:27 #navit: < mvglasow> I'll be afk myself for a few hours :-) but you've answered my questions already
00:27 #navit: < mvglasow> see you
00:28 -!- mvglasow [4d0dafe2@gateway/web/freenode/ip.77.13.175.226] has quit [Quit: Page closed]
01:09 -!- KaZeR [~KaZeR@75.144.20.73] has joined #navit
01:09 -!- mode/#navit [+o KaZeR] by ChanServ
03:16 -!- KaZeR_ [~KaZeR@75.144.20.73] has joined #navit
03:19 -!- KaZeR [~KaZeR@75.144.20.73] has quit [Ping timeout: 246 seconds]
05:32 -!- jjelen [jjelen@nat/redhat/x-aqvmlcufbahlldye] has joined #navit
05:40 -!- xenos1984 [~xenos1984@127-166-191-90.dyn.estpak.ee] has joined #navit
07:17 -!- KaZeR_ [~KaZeR@75.144.20.73] has quit [Remote host closed the connection]
07:18 -!- KaZeR [~KaZeR@75.144.20.73] has joined #navit
07:18 -!- mode/#navit [+o KaZeR] by ChanServ
07:22 -!- KaZeR [~KaZeR@75.144.20.73] has quit [Ping timeout: 256 seconds]
07:40 -!- KaZeR [~KaZeR@c-67-161-64-186.hsd1.ca.comcast.net] has joined #navit
07:40 -!- mode/#navit [+o KaZeR] by ChanServ
07:41 -!- KaZeR [~KaZeR@c-67-161-64-186.hsd1.ca.comcast.net] has quit [Remote host closed the connection]
07:41 -!- KaZeR [~KaZeR@c-67-161-64-186.hsd1.ca.comcast.net] has joined #navit
07:41 -!- mode/#navit [+o KaZeR] by ChanServ
07:47 -!- KaZeR [~KaZeR@c-67-161-64-186.hsd1.ca.comcast.net] has quit [Ping timeout: 272 seconds]
09:04 -!- _rd [~rd@p4FD1FAAA.dip0.t-ipconnect.de] has joined #navit
09:14 -!- zoff99 [~chatzilla@unaffiliated/zoff99] has joined #navit
11:08 -!- _rd [~rd@p4FD1FAAA.dip0.t-ipconnect.de] has quit [Ping timeout: 276 seconds]
11:29 -!- _rd [~rd@p4FD1FAAA.dip0.t-ipconnect.de] has joined #navit
11:41 -!- KaZeR [~KaZeR@c-67-161-64-186.hsd1.ca.comcast.net] has joined #navit
11:42 -!- mode/#navit [+o KaZeR] by ChanServ
11:47 -!- KaZeR [~KaZeR@c-67-161-64-186.hsd1.ca.comcast.net] has quit [Ping timeout: 272 seconds]
12:29 -!- _rd [~rd@p4FD1FAAA.dip0.t-ipconnect.de] has quit []
13:32 -!- zoff99 [~chatzilla@unaffiliated/zoff99] has quit [Quit: ChatZilla 0.9.86-rdmsoft [XULRunner 1.9.1/20090707221522]]
13:58 -!- jjelen [jjelen@nat/redhat/x-aqvmlcufbahlldye] has quit [Ping timeout: 255 seconds]
14:03 -!- circleci-bot [~circleci-@ec2-54-226-60-84.compute-1.amazonaws.com] has joined #navit
14:03 #navit: < circleci-bot> Success: mvglasow's build (#287; push) in navit-gps/navit (highfive) -- https://circleci.com/gh/navit-gps/navit/287
14:03 -!- circleci-bot [~circleci-@ec2-54-226-60-84.compute-1.amazonaws.com] has quit [Client Quit]
14:19 -!- jjelen [jjelen@nat/redhat/x-sxrozetznmplqirc] has joined #navit
15:04 -!- jjelen [jjelen@nat/redhat/x-sxrozetznmplqirc] has quit [Ping timeout: 256 seconds]
15:26 -!- KaZeR [~KaZeR@64.201.252.132] has joined #navit
15:27 -!- mode/#navit [+o KaZeR] by ChanServ
15:40 -!- jandegr [57417276@gateway/web/freenode/ip.87.65.114.118] has joined #navit
15:57 #navit: <@KaZeR> hi there
16:15 -!- zoff99 [~chatzilla@unaffiliated/zoff99] has joined #navit
16:18 -!- KaZeR [~KaZeR@64.201.252.132] has quit [Remote host closed the connection]
16:20 -!- KaZeR [~KaZeR@64.201.252.132] has joined #navit
16:20 -!- mode/#navit [+o KaZeR] by ChanServ
16:32 -!- Ayelis [~SM@38.104.105.146] has joined #navit
18:33 -!- pini [~pini@bou-fi.pustule.org] has joined #navit
18:42 -!- zoff99 [~chatzilla@unaffiliated/zoff99] has quit [Quit: ChatZilla 0.9.86-rdmsoft [XULRunner 1.9.1/20090707221522]]
19:16 -!- tryagain [~quassel@178.216.76.78] has joined #navit
20:09 -!- jandegr [57417276@gateway/web/freenode/ip.87.65.114.118] has quit [Quit: Page closed]
22:46 -!- xenos1984 [~xenos1984@127-166-191-90.dyn.estpak.ee] has quit [Quit: Leaving.]
23:03 -!- tryagain [~quassel@178.216.76.78] has quit [Remote host closed the connection]
--- Log closed Fri May 15 00:00:56 2015