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
21691fe570
commit
884d8ee6eb
1 changed files with 15 additions and 0 deletions
|
@ -1,5 +1,20 @@
|
|||
[KNewStuff3]
|
||||
Name=Task Switcher Styles
|
||||
Name[ar]=أنماط مبدّل المهام
|
||||
Name[ca]=Estils del commutador de tasques
|
||||
Name[en_GB]=Task Switcher Styles
|
||||
Name[es]=Estilos del selector de tareas
|
||||
Name[eu]=Ataza-aldarazlearen estiloak
|
||||
Name[gl]=Estilos de selector de tarefa
|
||||
Name[he]=סגנונות מחליף משימות
|
||||
Name[ka]=ამოცანების გადამრთველის სტილები
|
||||
Name[lt]=Užduočių perjungiklio stiliai
|
||||
Name[nl]=Stijlen van taakschakelaar
|
||||
Name[pl]=Wyglądy przełącznika zadań
|
||||
Name[sv]=Stilar för aktivitetsbyte
|
||||
Name[ta]=பணி மாற்றி வகைகள்
|
||||
Name[tr]=Görev Değiştiricisi Biçemleri
|
||||
Name[x-test]=xxTask Switcher Stylesxx
|
||||
|
||||
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
|
||||
ContentWarning=Executables
|
||||
|
|
Loading…
Reference in a new issue