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 2023-05-09 02:28:58 +00:00
parent b6ec1f81f7
commit c8bb30dc0b
7 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
containments/homescreens/folio/package/metadata.json
View file

@ -6,6 +6,7 @@
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[ar]": "ماركو مارتن",
"Name[ast]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",

1
containments/panel/package/metadata.json
View file

@ -6,6 +6,7 @@
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[ar]": "ماركو مارتن",
"Name[ast]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",

1
containments/taskpanel/package/metadata.json
View file

@ -6,6 +6,7 @@
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[ar]": "ماركو مارتن",
"Name[ast]": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",

1
kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json
View file

@ -4,6 +4,7 @@
{
"Name": "Bhushan Shah",
"Name[ar]": "Bhushan Shah",
"Name[ast]": "Bhushan Shah",
"Name[az]": "Bhushan Shah",
"Name[ca@valencia]": "Bhushan Shah",
"Name[ca]": "Bhushan Shah",

1
quicksettings/airplanemode/metadata.json
View file

@ -6,6 +6,7 @@
"Email": "bshah@kde.org",
"Name": "Bhushan Shah",
"Name[ar]": "Bhushan Shah",
"Name[ast]": "Bhushan Shah",
"Name[az]": "Bhushan Shah",
"Name[ca@valencia]": "Bhushan Shah",
"Name[ca]": "Bhushan Shah",

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

@ -6,7 +6,7 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[ar]": "ألكس بول",
"Name[ast]": "Aleix Pol",
"Name[ast]": "Aleix Pol i Gonzàlez",
"Name[az]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",

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

@ -6,6 +6,7 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol i Gonzalez",
"Name[ar]": "ألكس بول غنزالز",
"Name[ast]": "Aleix Pol i Gonzàlez",
"Name[az]": "Aleix Pol i Gonzalez",
"Name[ca@valencia]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez",