From c8bb30dc0bf4f1f591621e6b23d3562352a97b2a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 May 2023 02:28:58 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- containments/homescreens/folio/package/metadata.json | 1 + containments/panel/package/metadata.json | 1 + containments/taskpanel/package/metadata.json | 1 + kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json | 1 + quicksettings/airplanemode/metadata.json | 1 + quicksettings/nightcolor/package/metadata.json | 2 +- quicksettings/record/package/metadata.json | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/package/metadata.json index 68c68509..5e1effb5 100644 --- a/containments/homescreens/folio/package/metadata.json +++ b/containments/homescreens/folio/package/metadata.json @@ -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", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index 30412074..263167ae 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -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", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index 271570fe..feaf1dcc 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -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", diff --git a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json index 1348dd7e..88016704 100644 --- a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json +++ b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json @@ -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", diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index 781fe83c..006a411b 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -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", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index 529a7a76..98664d89 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -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", diff --git a/quicksettings/record/package/metadata.json b/quicksettings/record/package/metadata.json index b2feed93..ae47add8 100644 --- a/quicksettings/record/package/metadata.json +++ b/quicksettings/record/package/metadata.json @@ -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",