mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 15:03:09 +00:00
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
f980798000
commit
cbcfa9fd7f
1 changed files with 1 additions and 0 deletions
|
|
@ -37,6 +37,7 @@
|
||||||
"Description[fr]": "Configuration rapide pour la rotation d'écran",
|
"Description[fr]": "Configuration rapide pour la rotation d'écran",
|
||||||
"Description[it]": "Impostazione rapida della rotazione dello schermo",
|
"Description[it]": "Impostazione rapida della rotazione dello schermo",
|
||||||
"Description[ka]": "ეკრანის ტრიალის სწრაფი მორგება",
|
"Description[ka]": "ეკრანის ტრიალის სწრაფი მორგება",
|
||||||
|
"Description[ko]": "화면 회전 빠른 설정",
|
||||||
"Description[nl]": "Snelle instelling van schermrotatie",
|
"Description[nl]": "Snelle instelling van schermrotatie",
|
||||||
"Description[pl]": "Szybkie ustawienie obracania ekranu",
|
"Description[pl]": "Szybkie ustawienie obracania ekranu",
|
||||||
"Description[pt]": "Configuração rápida da rotação do ecrã",
|
"Description[pt]": "Configuração rápida da rotação do ecrã",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue