marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues 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-12-28 01:34:33 +00:00
parent e33e475c5a
commit fd1f5e2e60
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcms/time/clockconfig_actions.actions
View file

@ -75,7 +75,7 @@ Name[sk]=Uloženie nastavení dátumu a času
Name[sl]=Shrani nastavitve datuma in časa
Name[sv]=Spara datum- och tidsinställningar
Name[ta]=தேதி மற்றும் நேர அமைப்புகளை சேமி
Name[tr]=Tarih ve saat ayarlarını kaydet
Name[tr]=Tarih ve Saat Ayarlarını Kaydet
Name[uk]=Зберегти параметри дати/часу
Name[x-test]=xxSave the date/time settingsxx
Name[zh_CN]=保存日期/时间设置

2
quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
View file

@ -125,7 +125,7 @@ Comment[sk]=Zachytené
Comment[sl]=Zajeto
Comment[sv]=Lagrad
Comment[ta]=பிடிக்கப்பட்டது
Comment[tr]=Yakalanan
Comment[tr]=Yakalandı
Comment[uk]=Захоплено
Comment[x-test]=xxCapturedxx
Comment[zh_CN]=已捕获

2
quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
View file

@ -125,7 +125,7 @@ Comment[sk]=Zachytené
Comment[sl]=Zajeto
Comment[sv]=Lagrad
Comment[ta]=பிடிக்கப்பட்டது
Comment[tr]=Yakalanan
Comment[tr]=Yakalandı
Comment[uk]=Захоплено
Comment[x-test]=xxCapturedxx
Comment[zh_CN]=已捕获