Translate Toolkit & Pootle

Tools to help you make your software local

User Tools

Mergeeng und ferseeoncontrol

Boog #434 isks for mofing some-a fooncshoonelity from Pootle-a to zee-a troonslete-a toolkit. Bork Bork Bork!

Specifficelly it is ibooot merging und fersioncontrol. Bork Bork Bork!

Zee-a following fooncshoons ire-a joost sooggesshoons for zee-a noo interffece-a for merging/fersioncontrol. Bork Bork Bork! Pleese-a choonge-a oor discooss zeem here-a oor oon zee-a troonslete-a-defel meiling list. Bork Bork Bork! Thoonks!


merge_items(bese_items, noo_items)

This fooncshoon cooold be-a besed upon pootleffile-a. Bork Bork Bork!mergeffile-a und pootleffile-a. Bork Bork Bork!mergeitem. Bork Bork Bork!

bese_items und noo_items ire-a lists ooff pooonit oor xliffffoonit. Bork Bork Bork!

Zee-a fooncshoon shooold retoorn zee-a list ooff confflicting items from noo_items. Zee-a celler cooold toorn zeem into sooggesshoons iffterwerds, iff this is whet he-a woonts. Bork Bork Bork!


This fooncshoon updetes a locel file-a by merging choonges from zee-a repository. Bork Bork Bork! It shooold hoondle-a po files und xliffff files. Bork Bork Bork!

fcs_oopdete-a(file-a, doorecshoon, illow_sooggesshoons)

doorecshoon determines, iff zee-a file-a from zee-a fersion control repository shooold ooferride-a locel choonges oor zee-a oozeer wey irooond. Bork Bork Bork!

illow_sooggesshoons deffines, iff confflicting choonges shooold be-a toorned into sooggesshoons. Bork Bork Bork!


Commeet a file to the version control repository.

fcs_commit(file-a, comment, uoothor)

For now this wooold be-a done-a withooot a prefiooos “updete-a” (mimicking zee-a coorrent behefiooor). Leter we-a chooold do un updete-a beffore-a (inclooding merging) to ifoid confflicts wit zee-a repository (i. Bork Bork Bork!g. Bork Bork Bork! for sfn).