yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2024-09-09 01:21:21 +00:00
parent cea9f55999
commit ecebbc9094
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcms/tabbox/kwinswitcher.knsrc
View file

@ -11,9 +11,11 @@ Name[ka]=ამოცანების გადამრთველის ს
Name[lt]=Užduočių perjungiklio stiliai Name[lt]=Užduočių perjungiklio stiliai
Name[nl]=Stijlen van taakschakelaar Name[nl]=Stijlen van taakschakelaar
Name[pl]=Wyglądy przełącznika zadań Name[pl]=Wyglądy przełącznika zadań
Name[sl]=Slogi preklopa med opravili
Name[sv]=Stilar för aktivitetsbyte Name[sv]=Stilar för aktivitetsbyte
Name[ta]=பணி மாற்றி வகைகள் Name[ta]=பணி மாற்றி வகைகள்
Name[tr]=Görev Değiştiricisi Biçemleri Name[tr]=Görev Değiştiricisi Biçemleri
Name[uk]=Стилі перемикання задач
Name[x-test]=xxTask Switcher Stylesxx Name[x-test]=xxTask Switcher Stylesxx
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml