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
e0828cb272
commit
911c5c0da5
1 changed files with 4 additions and 0 deletions
|
|
@ -29,8 +29,10 @@
|
|||
}
|
||||
],
|
||||
"Description": "Screen recording quick setting",
|
||||
"Description[ca@valencia]": "Configuració ràpida de la gravació de pantalla",
|
||||
"Description[ca]": "Configuració ràpida de l'enregistrament de pantalla",
|
||||
"Description[eu]": "Pantaila grabatzeko ezarpen azkarra",
|
||||
"Description[fr]": "Configuration rapide de l'enregistrement d'écran",
|
||||
"Description[nl]": "Snelle instelling van scherm opnemen",
|
||||
"Description[pt]": "Configuração rápida da gravação do ecrã",
|
||||
"Description[tr]": "Ekran kaydetme hızlı ayarı",
|
||||
|
|
@ -40,8 +42,10 @@
|
|||
"Id": "org.kde.plasma.quicksetting.record",
|
||||
"License": "GPL-2.0+",
|
||||
"Name": "Record Screen",
|
||||
"Name[ca@valencia]": "Grava la pantalla",
|
||||
"Name[ca]": "Enregistra la pantalla",
|
||||
"Name[eu]": "Grabatu pantaila",
|
||||
"Name[fr]": "Enregistrer l'écran",
|
||||
"Name[nl]": "Scherm opnemen",
|
||||
"Name[pt]": "Gravar o Ecrã",
|
||||
"Name[tr]": "Ekranı Kaydet",
|
||||
|
|
|
|||
Loading…
Reference in a new issue