marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 09:48:50 +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-07-20 01:17:33 +00:00
parent 766fce50bd
commit 27a3d33b91
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

3
plasma_phone_components.notifyrc
View file

@ -26,6 +26,7 @@ Name[sl]=Plasma
Name[sv]=Plasma Name[sv]=Plasma
Name[uk]=Плазма Name[uk]=Плазма
Name[x-test]=xxPlasmaxx Name[x-test]=xxPlasmaxx
Name[zh_CN]=Plasma
[Event/captured] [Event/captured]
Name=Captured Name=Captured
@ -51,6 +52,7 @@ Name[sl]=Zajeto
Name[sv]=Lagrad Name[sv]=Lagrad
Name[uk]=Захоплено Name[uk]=Захоплено
Name[x-test]=xxCapturedxx Name[x-test]=xxCapturedxx
Name[zh_CN]=已捕获
Comment=Captured Comment=Captured
Comment[ca]=Captura Comment[ca]=Captura
Comment[cs]=Zachyceno Comment[cs]=Zachyceno
@ -74,4 +76,5 @@ Comment[sl]=Zajeto
Comment[sv]=Lagrad Comment[sv]=Lagrad
Comment[uk]=Захоплено Comment[uk]=Захоплено
Comment[x-test]=xxCapturedxx Comment[x-test]=xxCapturedxx
Comment[zh_CN]=已捕获
Action=Popup Action=Popup