SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
parent
16a5831fee
commit
1c6a95bceb
1 changed files with 1 additions and 1 deletions
|
@ -5,7 +5,7 @@
|
|||
"Description[ar]": "اعرض أداء نوافذ.ك في زاوية من زوايا الشاشة",
|
||||
"Description[az]": "Ekranın küncündə qrafikanın effektlərin saniyədəki kadrlarının sayını göstərir",
|
||||
"Description[bg]": "Показване на FPS (кадри в секунда) и производителността на KWin в ъгъла на екрана",
|
||||
"Description[ca@valencia]": "Mostra el rendiment de KWin al cantó de la pantalla",
|
||||
"Description[ca@valencia]": "Mostra el rendiment de KWin en el cantó de la pantalla",
|
||||
"Description[ca]": "Mostra el rendiment del KWin a la cantonada de la pantalla",
|
||||
"Description[cs]": "Zobrazuje výkon KWin v rohu obrazovky",
|
||||
"Description[de]": "Zeigt die Leistung von KWin in der Bildschirmecke an",
|
||||
|
|
Loading…
Reference in a new issue