marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-01 09:18:07 +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 2023-05-05 02:38:44 +00:00
parent f739e5a141
commit 864a773645
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quicksettings/nightcolor/package/metadata.json
View file

@ -5,6 +5,7 @@
{ {
"Email": "aleixpol@kde.org", "Email": "aleixpol@kde.org",
"Name": "Aleix Pol", "Name": "Aleix Pol",
"Name[ast]": "Aleix Pol",
"Name[az]": "Aleix Pol", "Name[az]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol", "Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol", "Name[ca]": "Aleix Pol",

1
quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
View file

@ -4,6 +4,7 @@
[Global] [Global]
IconName=preferences-system-windows-effect-screenshot IconName=preferences-system-windows-effect-screenshot
Name=Plasma Name=Plasma
Name[ast]=Plasma
Name[az]=Plasma Name[az]=Plasma
Name[ca]=Plasma Name[ca]=Plasma
Name[ca@valencia]=Plasma Name[ca@valencia]=Plasma

1
quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
View file

@ -4,6 +4,7 @@
[Global] [Global]
IconName=preferences-system-windows-effect-screenshot IconName=preferences-system-windows-effect-screenshot
Name=Plasma Name=Plasma
Name[ast]=Plasma
Name[az]=Plasma Name[az]=Plasma
Name[ca]=Plasma Name[ca]=Plasma
Name[ca@valencia]=Plasma Name[ca@valencia]=Plasma