[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: Re: Review Request 7131: Hint conflict resolution strategy in scripty message for .desktop i18n
From: "Albert Astals Cid" <aacid () kde ! org>
Date: 2015-03-11 23:28:06
Message-ID: 20150311232806.9502.21126 () mimi ! kde ! org
[Download RAW message or body]
--===============8090644573810658521==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://svn.reviewboard.kde.org/r/7131/#review11161
-----------------------------------------------------------
Ship it!
Fix the issue below and you can commit
trunk/l10n-kde4/scripts/update_translations
<https://svn.reviewboard.kde.org/r/7131/#comment14076>
This and the one below are svn so should not include a hint mentioning git :D
- Albert Astals Cid
On mar. 11, 2015, 9:57 p.m., Thomas Lübking wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://svn.reviewboard.kde.org/r/7131/
> -----------------------------------------------------------
>
> (Updated mar. 11, 2015, 9:57 p.m.)
>
>
> Review request for Localization and Translation (l10n) and Albert Astals Cid.
>
>
> Repository: kde
>
>
> Description
> -------
>
> summarized
>
>
> Diffs
> -----
>
> trunk/l10n-kde4/scripts/update_translations 1418255
>
> Diff: https://svn.reviewboard.kde.org/r/7131/diff/
>
>
> Testing
> -------
>
> nope (i would no even know, how to)
> but I know that "-m $'foo\nbar' adds a newline in bash or zsh.
>
>
> Thanks,
>
> Thomas Lübking
>
>
--===============8090644573810658521==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://svn.reviewboard.kde.org/r/7131/">https://svn.reviewboard.kde.org/r/7131/</a>
</td>
</tr>
</table>
<br />
<p>Ship it!</p>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Fix \
the issue below and you can commit</p></pre> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://svn.reviewboard.kde.org/r/7131/diff/1/?file=48646#file48646line499" \
style="color: black; font-weight: bold; text-decoration: \
underline;">trunk/l10n-kde4/scripts/update_translations</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">499</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> if ! svn commit \
$SVNQUIETFLAG -m "SVN_SILENT made messages (.desktop file)" > /dev/null; \
then</pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; \
border-right: 1px solid #C0C0C0;" align="right"><font size="2">499</font></th> <td \
bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: \
0; "> if ! svn commit $SVNQUIETFLAG -m $'SVN_SILENT made messages \
(.desktop file) - always resolve ours\n\nIn case of conflict in i18n, keep the \
version of the branch "ours"\nTo resolve a particular conflict, "git \
checkout --ours path/to/file.desktop"' > /dev/null; then</pre></td> \
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This \
and the one below are svn so should not include a hint mentioning git :D</p></pre> \
</div> </div>
<br />
<p>- Albert Astals Cid</p>
<br />
<p>On març 11th, 2015, 9:57 p.m. UTC, Thomas Lübking wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Localization and Translation (l10n) and Albert Astals \
Cid.</div> <div>By Thomas Lübking.</div>
<p style="color: grey;"><i>Updated mar. 11, 2015, 9:57 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kde
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">summarized</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">nope (i would no even know, how to) but I know that "-m \
$'foo\nbar' adds a newline in bash or zsh.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>trunk/l10n-kde4/scripts/update_translations <span style="color: \
grey">(1418255)</span></li>
</ul>
<p><a href="https://svn.reviewboard.kde.org/r/7131/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============8090644573810658521==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic