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 2021-12-23 01:45:48 +00:00
parent 58133666de
commit 4e56bf2687
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
look-and-feel/metadata.desktop
View file

@ -68,7 +68,7 @@ Comment[sv]=Plasma arbetsyta för smarta telefoner
Comment[tr]=Akıllı telefonlar için Plasma çalışma alanı Comment[tr]=Akıllı telefonlar için Plasma çalışma alanı
Comment[uk]=Робочий простір Плазми для смартфонів Comment[uk]=Робочий простір Плазми для смартфонів
Comment[x-test]=xxPlasma workspace for smartphonesxx Comment[x-test]=xxPlasma workspace for smartphonesxx
Comment[zh_CN]=为手机定制的 Plasma 工作空间 Comment[zh_CN]=专为手机定制的 Plasma 工作空间
Comment[zh_TW]=智慧型手機的 Plasma 工作空間 Comment[zh_TW]=智慧型手機的 Plasma 工作空間
Keywords=Phone, Workspace, Look and Feel Keywords=Phone, Workspace, Look and Feel
Keywords[ast]=Teléfonu, estilu y aspeutu, y estaya de trabayu Keywords[ast]=Teléfonu, estilu y aspeutu, y estaya de trabayu
@ -103,7 +103,7 @@ Keywords[sv]=Telefon, arbetsyta, utseende och känsla
Keywords[tr]=Telefon, Çalışma alanı, Görünüm Keywords[tr]=Telefon, Çalışma alanı, Görünüm
Keywords[uk]=Телефон, Робочий простір, Вигляд і поведінка Keywords[uk]=Телефон, Робочий простір, Вигляд і поведінка
Keywords[x-test]=xxPhone, Workspace, Look and Feelxx Keywords[x-test]=xxPhone, Workspace, Look and Feelxx
Keywords[zh_CN]=Phone, Workspace, Look and Feel, 手机, 工作空间, 视觉效果 Keywords[zh_CN]=Phone, Workspace, Look and Feel, 手机, 工作空间, 界面外观
Keywords[zh_TW]=電話、工作空間、外觀與感覺 Keywords[zh_TW]=電話、工作空間、外觀與感覺
Type=Service Type=Service