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-11-08 01:25:01 +00:00
parent eba6074161
commit a2d8105d08
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcms/cellularnetwork/kcm_cellular_network.json
View file

@ -20,7 +20,7 @@
"Description[it]": "Gestione delle reti cellulari", "Description[it]": "Gestione delle reti cellulari",
"Description[ka]": "ფიჭური ქსელების მართვა", "Description[ka]": "ფიჭური ქსელების მართვა",
"Description[ko]": "모바일 네트워크 관리", "Description[ko]": "모바일 네트워크 관리",
"Description[lv]": "Mobilo tīklu pārvaldība", "Description[lv]": "Pārvaldīt mobilos tīklus",
"Description[nl]": "Beheer van cellulaire netwerken", "Description[nl]": "Beheer van cellulaire netwerken",
"Description[nn]": "Handsaming av mobilnettverk", "Description[nn]": "Handsaming av mobilnettverk",
"Description[pa]": "ਸੈਲੂਲਰ ਨੈੱਟਵਰਕਾਂ ਦਾ ਇੰਤਜ਼ਾਮ", "Description[pa]": "ਸੈਲੂਲਰ ਨੈੱਟਵਰਕਾਂ ਦਾ ਇੰਤਜ਼ਾਮ",

2
kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json
View file

@ -61,7 +61,7 @@
"Description[it]": "Configurazione della tastiera su schermo", "Description[it]": "Configurazione della tastiera su schermo",
"Description[ka]": "კლავიატურის კრანზე მორგება", "Description[ka]": "კლავიატურის კრანზე მორგება",
"Description[ko]": "가상 키보드 설정", "Description[ko]": "가상 키보드 설정",
"Description[lv]": "Ekrāna tastatūras konfigurēšana", "Description[lv]": "Konfigurēt ekrāna tastatūru",
"Description[nl]": "Configuratie van toetsenbord op het scherm", "Description[nl]": "Configuratie van toetsenbord op het scherm",
"Description[nn]": "Oppsett av skjermtastatur", "Description[nn]": "Oppsett av skjermtastatur",
"Description[pa]": "ਆਨ-ਸਕਰੀਨ ਕੀਬੋਰਡ ਸੰਰਚਨਾ", "Description[pa]": "ਆਨ-ਸਕਰੀਨ ਕੀਬੋਰਡ ਸੰਰਚਨਾ",