What is a merge format for entering text tokens

Question

I have an excel list (excel 2003) where the user enters translations for tokens. It has 3 columns (key, value, language). It can be something like a key: Login.Header, value: "Login to the site" Language: ru.

This works pretty well. I use this file to create specific images on a website that uses a lot of graphics for texts. It's good that users can enter text without installing new software, editing is enjoyable, and the resulting file can be easily read using my python script.

You might think that I don't like it: if 2 users are editing a file and have a lot of changes than merging, it becomes a nightmare.

Is there an editing solution that is as good as Excel in the areas that I described, but can be easily combined?

EDIT

The answers so far have explained how the source system can help in such a situation. But I already have SVN.

Question about file format. There are file formats that can easily be combined with a client, such as winmerge (for example, source code for Java or C # backend classes), and there are others that are difficult to merge (xml, files generated by code generation). xls - excel 2003 files may be different, but it still does not have a good format for merging.

I think there is another application (something like working with apples, open office, excel 2010 ..) that allows me to edit the table, but can be easily combined.

Answer 1

Is there an editing solution that is as good as Excel in the areas that I described, but can be easily combined?

This may not be the expected answer, but the best way to avoid merge problems and conflicts would obviously be to avoid merging . I would decide to use a collaborative editing solution so as not to deal with different versions of the file:

• If all your users are on the same network (LAN, VPN), then the first solution that comes to mind is to place a unique Excel file in a network resource and activate the General Workbook . This works very well, and in the event of a conflict, users are offered a conflict resolution dialog box.

• If this is not an option, you can place your spreadsheet in Google Docs. Google Docs work very well for collaboration (it’s easy to set up who can access the document, you can see a list of connected users, the joint version just works). Then just export the table for processing when done.

• Use a collaborative text editor such as Gobby (a multi-platform platform) and work on a raw CSV file. This will not be very user-friendly, especially for non-tech and error prone users. I would approve the above solutions.

Answer 2

One approach is to export this Excel file in XML or CSV format. Instead of using Excel to edit a text file instead of the default binary format is xls .

Also consider splitting one large file into multiple files. This reduces the likelihood that two people will want to work in the same file.

Put it under source control and learn about source control. Let use be related to file merging. SVN will be quite reasonable for the task, since it is a centralized, but not very complicated solution. Use the regular GUI for regular users.

With centralized source control, you can enter a lock. This allows you to restrict write access as soon as one user opens a file, so that only one user can edit the file at a time.

Answer 3

Merging is often a pain. Some version control systems can do most of the work for you, combining non-conflicting changes and suggesting to the user when they try to change the same token.

The tortoise (SVN or Hg) has a fusion function that makes it painless. But I act as a developer - I had a lot of problems with implementing version control for non-developers, even for competent ones who do not use their CD-tray as a cup holder. :)

You may consider splitting one large file into several files. This reduces the likelihood that two people will want to work in the same file. There is also the possibility of denial of write access as soon as one user opens a file so that only one user can edit the file at a time.

Answer 4

A little-known / used Excel function is the Collaborative Workbook feature. You can find it in Tools → Share Workbook. Just check the box "Allow changes ..." and you can configure it on the "Advanced" tab.

This bar is not the best option for several users to apply changes to the worksheet and work in two scenarios:

• Each downloads a copy of the XLS and edits them on the side and uploads back to some place. Then you can take it and combine it with the original.
• Each opens the same copy of XLS and makes changes at the same time. Then you can merge all / all changes.

Answer 5

Let users use the Excel file as it is now, but save the data in a text file (csv, possibly) under version control. Then you just need to:

• One small python script to convert a text file to Excel to provide to the user.

• One small python script to convert a completed excel file to text. This is necessary for sequential data sorting (for example, for key and language) to simplify merging.

Answer 6

Any type of flat file will be fairly easy to merge.

If you want to stick with Excel, it's easy to write a macro that will export the contents of cells to a flat file. For ease of use, a macro can also save a worksheet in native Excel format for future editing. If you placed a button on a worksheet and linked it to a macro, the user could export and save the file in one simple step by clicking the button.