quine-global-labs/mirror-kde-plasma-desktop
1
0
Fork 0
mirror of https://invent.kde.org/plasma/plasma-desktop.git synced 2026-11-03 22:59:45 -09:00
Code Issues Projects Releases Packages Wiki Activity

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 2025-12-22 01:36:20 +00:00
parent 4ee42c7d66
commit af70df6494
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emojier/app/org.kde.plasma.emojier.desktop
View file

@ -53,6 +53,7 @@ Name[zh_CN]=表情符号选择工具
Name[zh_TW]=表情符號選擇工具
GenericName=Emoji Selector
GenericName[ar]=منتقي إيموجي
GenericName[az]=Emoji seçici
GenericName[bg]=Избиране на емоджи
GenericName[ca]=Selector d'emojis
GenericName[ca@valencia]=Selector d'emoji
@ -87,6 +88,7 @@ GenericName[zh_CN]=表情符号选择工具
GenericName[zh_TW]=表情符號選擇工具
Comment=Copy emojis to the clipboard
Comment[ar]=انسخ الصور التعبيرية إلى الحافظة
Comment[az]=Emojiləri mübadilə yaddaşına kopyalamaq
Comment[bg]=Копиране на емотикони в клипборда
Comment[ca]=Copia els emojis al porta-retalls
Comment[ca@valencia]=Copia els emoji al porta-retalls

3
kcms/touchpad/org.kde.touchpadshortcuts.desktop
View file

@ -64,6 +64,7 @@ X-KDE-GlobalShortcutType=Service
[Desktop Action EnableTouchpad]
Name=Enable Touchpad
Name[ar]=مكّن لوحة اللمس
Name[az]=Toxunma panelini aktiv etmək
Name[bg]=Активиране на тъчпада
Name[ca]=Activa el ratolí tàctil
Name[ca@valencia]=Activa el ratolí tàctil
@ -105,6 +106,7 @@ X-KDE-Migrate-Shortcut=kcm_touchpad,Enable Touchpad
[Desktop Action DisableTouchpad]
Name=Enable Touchpad
Name[ar]=مكّن لوحة اللمس
Name[az]=Toxunma panelini aktiv etmək
Name[bg]=Активиране на тъчпада
Name[ca]=Activa el ratolí tàctil
Name[ca@valencia]=Activa el ratolí tàctil
@ -146,6 +148,7 @@ X-KDE-Migrate-Shortcut=kcm_touchpad,Disable Touchpad
[Desktop Action ToggleTouchpad]
Name=Enable Touchpad
Name[ar]=مكّن لوحة اللمس
Name[az]=Toxunma panelini aktiv etmək
Name[bg]=Активиране на тъчпада
Name[ca]=Activa el ratolí tàctil
Name[ca@valencia]=Activa el ratolí tàctil