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
805c813537
commit
bf97d8f606
2 changed files with 2 additions and 0 deletions
|
@ -35,6 +35,7 @@
|
|||
"Id": "kdeconnect_remotecommands",
|
||||
"License": "GPL",
|
||||
"Name": "Host remote commands",
|
||||
"Name[ar]": "استضف الأوامر البعيدة",
|
||||
"Name[ca@valencia]": "Allotja ordes remotes",
|
||||
"Name[ca]": "Allotja ordres remotes",
|
||||
"Name[cs]": "Přijímat vzdálené příkazy",
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
}
|
||||
],
|
||||
"Description": "Show notifications for calls and SMS",
|
||||
"Description[ar]": "أظهر إخطارات المكالمات والرّسائل",
|
||||
"Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS",
|
||||
"Description[ca]": "Mostra les notificacions de les trucades i els SMS",
|
||||
"Description[cs]": "Zobrazit upozornění pro telefonáty a SMS",
|
||||
|
|
Loading…
Reference in a new issue