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
7e23386d46
commit
e783dc20d6
1 changed files with 7 additions and 1 deletions
|
@ -9,15 +9,18 @@
|
|||
"Description[eu]": "Azaldu konposatzea aktibo dagoen",
|
||||
"Description[gl]": "Indicar se a composición está activada.",
|
||||
"Description[he]": "להציג אם ניהול חלונאי פעיל",
|
||||
"Description[it]": "Visualizza se la composizione è attiva",
|
||||
"Description[ka]": "ჩვენება, თუ კომპოზიცია ჩართულია",
|
||||
"Description[nl]": "Tonen indien samenstellen actief is",
|
||||
"Description[nn]": "Vis viss samansetjing er påslått",
|
||||
"Description[pl]": "Pokaż czy komponowanie jest włączone",
|
||||
"Description[pt_BR]": "Exibir se a composição está ativa",
|
||||
"Description[sl]": "Prikaži, če je upravljalnik skladnje aktiven",
|
||||
"Description[sv]": "Visa om sammansättning är aktiv",
|
||||
"Description[tr]": "Bileşikleştirme etkinse görüntüle",
|
||||
"Description[uk]": "Показувати, чи активною є композиція",
|
||||
"Description[x-test]": "xxDisplay if compositing is activexx",
|
||||
"Description[zh_TW]": "顯示合成器是否已啟用",
|
||||
"EnabledByDefault": false,
|
||||
"License": "GPL",
|
||||
"Name": "Show Compositing",
|
||||
|
@ -28,14 +31,17 @@
|
|||
"Name[eu]": "Erakutsi konposatzea",
|
||||
"Name[gl]": "Amosar a composición",
|
||||
"Name[he]": "הצגת ניהול חלונאי",
|
||||
"Name[it]": "Mostra composizione",
|
||||
"Name[ka]": "კომპოზიციის ჩვენება",
|
||||
"Name[nl]": "Opstellen tonen",
|
||||
"Name[nn]": "Vis samansetjing",
|
||||
"Name[pl]": "Pokaż komponowanie",
|
||||
"Name[pt_BR]": "Mostrar composição",
|
||||
"Name[sl]": "Prikaži Upravljalnik skladnje",
|
||||
"Name[sv]": "Visa sammansättning",
|
||||
"Name[tr]": "Bileşikleştirmeyi Göster",
|
||||
"Name[uk]": "Показувати композицію",
|
||||
"Name[x-test]": "xxShow Compositingxx"
|
||||
"Name[x-test]": "xxShow Compositingxx",
|
||||
"Name[zh_TW]": "顯示合成器狀態"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue