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
2fb52274d0
commit
e227e93792
6 changed files with 9 additions and 0 deletions
|
@ -18,7 +18,9 @@ Name[fr]=aperçu
|
|||
Name[it]=panoramica
|
||||
Name[lt]=apžvalga
|
||||
Name[nl]=overzicht
|
||||
Name[pt]=introdução
|
||||
Name[sl]=pregled
|
||||
Name[sv]=översikt
|
||||
Name[uk]=огляд
|
||||
Name[vi]=tổng quan
|
||||
Name[x-test]=xxoverviewxx
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
"Name[lt]": "Demitrius Belai",
|
||||
"Name[nl]": "Demitrius Belai",
|
||||
"Name[pl]": "Demitrius Belai",
|
||||
"Name[pt]": "Demitrius Belai",
|
||||
"Name[sk]": "Demitrius Belai",
|
||||
"Name[sl]": "Demitrius Belai",
|
||||
"Name[sv]": "Demitrius Belai",
|
||||
|
@ -39,6 +40,7 @@
|
|||
"Name[lt]": "KWin Aurorae",
|
||||
"Name[nl]": "KWin Aurorae",
|
||||
"Name[pl]": "KWin Aurorae",
|
||||
"Name[pt]": "KWin Aurora",
|
||||
"Name[sk]": "KWin Aurorae",
|
||||
"Name[sl]": "KWin Aurorae",
|
||||
"Name[sv]": "KWin Aurorae",
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
"Name[lt]": "Demitrius Belai",
|
||||
"Name[nl]": "Demitrius Belai",
|
||||
"Name[pl]": "Demitrius Belai",
|
||||
"Name[pt]": "Demitrius Belai",
|
||||
"Name[sk]": "Demitrius Belai",
|
||||
"Name[sl]": "Demitrius Belai",
|
||||
"Name[sv]": "Demitrius Belai",
|
||||
|
@ -39,6 +40,7 @@
|
|||
"Name[lt]": "KWin dekoracijos",
|
||||
"Name[nl]": "KWin-decoraties",
|
||||
"Name[pl]": "Wygląd KWin",
|
||||
"Name[pt]": "Decoração do KWin",
|
||||
"Name[sk]": "KWin Dekorácia",
|
||||
"Name[sl]": "KWin Decoration",
|
||||
"Name[sv]": "Kwin-dekoration",
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
"Name[lt]": "KWin efektas",
|
||||
"Name[nl]": "KWin-effect",
|
||||
"Name[pl]": "Efekt KWin",
|
||||
"Name[pt]": "Efeito do KWin",
|
||||
"Name[sk]": "KWin Efekt",
|
||||
"Name[sl]": "KWin Effect",
|
||||
"Name[sv]": "Kwin-effekt",
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
"Name[lt]": "KWin scenarijus",
|
||||
"Name[nl]": "KWin-script",
|
||||
"Name[pl]": "Skrypt KWin",
|
||||
"Name[pt]": "Programa do KWin",
|
||||
"Name[sk]": "KWin Skript",
|
||||
"Name[sl]": "KWin Script",
|
||||
"Name[sv]": "Kwin-skript",
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
"Name[lt]": "KWin langų perjungiklis",
|
||||
"Name[nl]": "KWin-vensterwisselaar",
|
||||
"Name[pl]": "Przełącznik okien KWin",
|
||||
"Name[pt]": "Selector de Janelas do KWin",
|
||||
"Name[sk]": "KWin Prepínač okien",
|
||||
"Name[sl]": "KWin Window Switcher",
|
||||
"Name[sv]": "Kwin-fönsterbyte",
|
||||
|
|
Loading…
Reference in a new issue