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
02171495be
commit
e9d1def1ba
2 changed files with 3 additions and 0 deletions
|
@ -15,6 +15,7 @@
|
|||
"Description[nl]": "Effect van hulp voor de takenbeheerder",
|
||||
"Description[pl]": "Efekt pomocniczy dla zarządzania zadaniami",
|
||||
"Description[pt]": "Efeito auxiliar para o gestor de tarefas",
|
||||
"Description[pt_BR]": "Efeito auxiliar para o gerenciador de tarefas",
|
||||
"Description[sl]": "Učinki pomočnika za upravljalnika nalog",
|
||||
"Description[sv]": "Hjälpeffekt för aktivitetshanteraren",
|
||||
"Description[tr]": "Görev yöneticisi için yardımcı etkisi",
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
"Description[it]": "Gestisci gli script di KWin",
|
||||
"Description[nl]": "KWin-scripts beheren",
|
||||
"Description[pl]": "Zarządzanie skryptami KWin",
|
||||
"Description[pt_BR]": "Gerencia os scripts do KWin",
|
||||
"Description[sl]": "Upravljaj KWin Scripte",
|
||||
"Description[sv]": "Hantera Kwin-skript",
|
||||
"Description[tr]": "KWin Betiklerini Yönet",
|
||||
|
@ -29,6 +30,7 @@
|
|||
"Name[it]": "Script di KWin",
|
||||
"Name[nl]": "KWin-scripts",
|
||||
"Name[pl]": "Skrypty KWin",
|
||||
"Name[pt_BR]": "Scripts do KWin",
|
||||
"Name[sl]": "KWin Scripti",
|
||||
"Name[sv]": "Kwin-skript",
|
||||
"Name[tr]": "KWin Betikleri",
|
||||
|
|
Loading…
Reference in a new issue