mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23: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
7af98dedfb
commit
c387884cca
1 changed files with 1 additions and 0 deletions
|
|
@ -34,6 +34,7 @@
|
|||
"Description[en_GB]": "Screen rotation quick setting",
|
||||
"Description[es]": "Ajuste rápido de rotación de la pantalla",
|
||||
"Description[eu]": "Pantaila biratzearen ezarpen azkarra",
|
||||
"Description[fi]": "Näytön kierron pika-asetus",
|
||||
"Description[fr]": "Configuration rapide pour la rotation d'écran",
|
||||
"Description[is]": "Flýtistilling á snúningi skjás",
|
||||
"Description[it]": "Impostazione rapida della rotazione dello schermo",
|
||||
|
|
|
|||
Loading…
Reference in a new issue