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-10 01:20:43 +00:00
parent 1f799dfbdc
commit c1753b9b27
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,8 +5,10 @@ Name[ca]=Estils del commutador de tasques
Name[en_GB]=Task Switcher Styles Name[en_GB]=Task Switcher Styles
Name[es]=Estilos del selector de tareas Name[es]=Estilos del selector de tareas
Name[eu]=Ataza-aldarazlearen estiloak Name[eu]=Ataza-aldarazlearen estiloak
Name[fr]=Styles du commutateur de tâches
Name[gl]=Estilos de selector de tarefa Name[gl]=Estilos de selector de tarefa
Name[he]=סגנונות מחליף משימות Name[he]=סגנונות מחליף משימות
Name[ia]=Stilos de Commutator de carga
Name[ka]=ამოცანების გადამრთველის სტილები 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
@ -17,6 +19,8 @@ Name[ta]=பணி மாற்றி வகைகள்
Name[tr]=Görev Değiştiricisi Biçemleri Name[tr]=Görev Değiştiricisi Biçemleri
Name[uk]=Стилі перемикання задач Name[uk]=Стилі перемикання задач
Name[x-test]=xxTask Switcher Stylesxx Name[x-test]=xxTask Switcher Stylesxx
Name[zh_CN]=任务切换器样式
Name[zh_TW]=工作切換器風格
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
ContentWarning=Executables ContentWarning=Executables