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
3a089d068d
commit
ed92c41245
3 changed files with 5 additions and 1 deletions
|
@ -3,6 +3,7 @@
|
|||
"KPlugin": {
|
||||
"Description": "Connect and sync your devices",
|
||||
"Description[ar]": "اتّصل وزامن أجهزتك",
|
||||
"Description[bg]": "Свържете и синхронизирайте вашите устройства",
|
||||
"Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius",
|
||||
"Description[ca]": "Connecta i sincronitza els vostres dispositius",
|
||||
"Description[cs]": "Připojte a synchronizujte svá zařízení",
|
||||
|
@ -21,6 +22,7 @@
|
|||
"Icon": "preferences-kde-connect",
|
||||
"Name": "KDE Connect",
|
||||
"Name[ar]": "كدي المتّصل",
|
||||
"Name[bg]": "KDE Connect",
|
||||
"Name[ca@valencia]": "KDE Connect",
|
||||
"Name[ca]": "KDE Connect",
|
||||
"Name[cs]": "KDE Connect",
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
"Email": "bhyoram@protonmail.com",
|
||||
"Name": "Yoram Bar-Haim",
|
||||
"Name[ar]": "يورام بار-هايم",
|
||||
"Name[bg]": "Yoram Bar-Haim",
|
||||
"Name[ca@valencia]": "Yoram Bar-Haim",
|
||||
"Name[ca]": "Yoram Bar-Haim",
|
||||
"Name[cs]": "Yoram Bar-Haim",
|
||||
|
@ -69,6 +70,7 @@
|
|||
"License": "GPL",
|
||||
"Name": "ModemManager Telephony integration",
|
||||
"Name[ar]": "تكامل هاتف ModemManager",
|
||||
"Name[bg]": "Интеграция с телефон на ModemManager",
|
||||
"Name[ca@valencia]": "Integració amb la telefonia de ModemManager",
|
||||
"Name[ca]": "Integració amb la telefonia del ModemManager",
|
||||
"Name[cs]": "Integrace telefonu pro ModemManager",
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
"Name": "Host remote commands",
|
||||
"Name[ar]": "استضف الأوامر البعيدة",
|
||||
"Name[az]": "Hostun uzaq əmrləri",
|
||||
"Name[bg]": "за",
|
||||
"Name[bg]": "Команди на отдалечения хост",
|
||||
"Name[ca@valencia]": "Allotja ordres remotes",
|
||||
"Name[ca]": "Allotja ordres remotes",
|
||||
"Name[cs]": "Přijímat vzdálené příkazy",
|
||||
|
|
Loading…
Reference in a new issue