Re: svn commit: r34329 - in branches/tc_url_rev/subversion: include libsvn_wc svn

Arfrever Frehtes Taifersar Arahesis wrote:
> 2008-11-23 17:09:24 Stefan Sperling napisał(a):
>> On Sun, Nov 23, 2008 at 04:20:39PM +0100, Arfrever Frehtes Taifersar Arahesis wrote:
>>> 2008-11-23 13:16:24 Stefan Sperling napisa??(a):
>>>> On Sun, Nov 23, 2008 at 02:58:06AM +0100, Neels J Hofmeyr wrote:
>>>>> Stefan Sperling wrote:
>>>>>> On Fri, Nov 21, 2008 at 07:37:54PM -0800, neels_at_tigris.org wrote:
>>>>>>> Author: neels
>>>>>>> Date: Fri Nov 21 19:37:54 2008
>>>>>>> New Revision: 34329
>>>>>>>
>>>>>>> +const char *
>>>>>>> +svn_wc_operation_str(svn_wc_operation_t operation, apr_pool_t *pool)
>>>>>>> +{
>>>>>>> + switch(operation){
>>>>>>> + case svn_wc_operation_update:
>>>>>>> + return SVN_WC__OPERATION_UPDATE;
>>>>>>> + case svn_wc_operation_switch:
>>>>>>> + return SVN_WC__OPERATION_SWITCH;
>>>>>>> + case svn_wc_operation_merge:
>>>>>>> + return SVN_WC__OPERATION_MERGE;
>>>>>> You haven't marked the above strings for translation.
>>>>> Say, do the svn commands "update", "switch", etc. get *translated*??
>>>> oops :)
>>>>
>>>> Well, I suppose not, sorry.
>>> If they are used without "svn " prefix, then they can be translated.
>> They are used like this:
>>
>> $ svn status svn-files-move1-moved/branch
>> M svn-files-move1-moved/branch
>> A + svn-files-move1-moved/branch/alpha.moved1
>> A + svn-files-move1-moved/branch/alpha.moved2
>> D C svn-files-move1-moved/branch/alpha
>> > local delete, incoming delete upon merge <-- here
>> $ svn info svn-files-move1-moved/branch/alpha
>> [...]
>> Tree conflict: local delete, incoming delete upon merge <-- and here
>> Merge left: (file) file:///home/stsp/fu/thesis/scripts/svn/svn-files-move1-moved/repos/trunk_at_1
>> Merge right: (file) file:///home/stsp/fu/thesis/scripts/svn/svn-files-move1-moved/repos/trunk_at_3
>>
>> So I suppose they should be marked for translation after all?
>
> Yes.
>

-1 on translating these.

Here, we don't mean the general term "merge", we mean explicitly the
Subversion operation Merge. Whenever we talk in German about Subversion, we
say "merge", not "verschmelzen". That would sound ridiculous IMHO. Anyone
out there should know that the conflict occured when issuing the "merge"
command, not that it happend while melting stuff together. It's the main
problem I have with most translations around, that's why I always take great
care at using original English versions. It's just much clearer. Let's not
jeopardise this output like that.

~Neels