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"
This commit is contained in:
l10n daemon script 2021-07-30 01:11:30 +00:00
parent ac438d6bb3
commit 141f627413
5 changed files with 85 additions and 5 deletions

View file

@ -3,11 +3,27 @@
"Authors": [
{
"Email": "demitriusbelai@gmail.com",
"Name": "Demitrius Belai"
"Name": "Demitrius Belai",
"Name[az]": "Demitrius Belai",
"Name[ca]": "Demitrius Belai",
"Name[cs]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[sv]": "Demitrius Belai",
"Name[uk]": "Demitrius Belai",
"Name[x-test]": "xxDemitrius Belaixx"
}
],
"Id": "KWin/Aurorae",
"Name": "KWin Aurorae",
"Name[az]": "KWin Aurorae",
"Name[ca]": "Aurorae del KWin",
"Name[cs]": "KWin Aurorae",
"Name[es]": "KWin Aurorae",
"Name[nl]": "KWin Aurorae",
"Name[sv]": "KWin Aurorae",
"Name[uk]": "KWin Aurorae",
"Name[x-test]": "xxKWin Auroraexx",
"ServiceTypes": [
"KPackage/PackageStructure"
],

View file

@ -3,11 +3,27 @@
"Authors": [
{
"Email": "demitriusbelai@gmail.com",
"Name": "Demitrius Belai"
"Name": "Demitrius Belai",
"Name[az]": "Demitrius Belai",
"Name[ca]": "Demitrius Belai",
"Name[cs]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[sv]": "Demitrius Belai",
"Name[uk]": "Demitrius Belai",
"Name[x-test]": "xxDemitrius Belaixx"
}
],
"Id": "KWin/Decoration",
"Name": "KWin Decoration",
"Name[az]": "KWin Dekorasiyası",
"Name[ca]": "Decoració del KWin",
"Name[cs]": "Dekorace KWin",
"Name[es]": "Decoración de KWin",
"Name[nl]": "KWin-decoraties",
"Name[sv]": "Kwin-dekoration",
"Name[uk]": "Обрамлення вікон KWin",
"Name[x-test]": "xxKWin Decorationxx",
"ServiceTypes": [
"KPackage/PackageStructure"
],

View file

@ -3,11 +3,27 @@
"Authors": [
{
"Email": "vlad.zahorodnii@kde.org",
"Name": "Vlad Zahorodnii"
"Name": "Vlad Zahorodnii",
"Name[az]": "Vlad Zahorodnii",
"Name[ca]": "Vlad Zahorodnii",
"Name[cs]": "Vlad Zahorodnii",
"Name[es]": "Vlad Zahorodnii",
"Name[nl]": "Vlad Zahorodnii",
"Name[sv]": "Vlad Zahorodnii",
"Name[uk]": "Влад Загородній",
"Name[x-test]": "xxVlad Zahorodniixx"
}
],
"Id": "KWin/Effect",
"Name": "KWin Effect",
"Name[az]": "KWin effekti",
"Name[ca]": "Efecte del KWin",
"Name[cs]": "Efekt KWinu",
"Name[es]": "Efecto de KWin",
"Name[nl]": "KWin-effect",
"Name[sv]": "Kwin-effekt",
"Name[uk]": "Ефект KWin",
"Name[x-test]": "xxKWin Effectxx",
"ServiceTypes": [
"KPackage/PackageStructure"
],

View file

@ -3,11 +3,27 @@
"Authors": [
{
"Email": "notmart@gmail.com",
"Name": "Marco Martin"
"Name": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
}
],
"Id": "KWin/Script",
"Name": "KWin Script",
"Name[az]": "Kwin skripti",
"Name[ca]": "Script del KWin",
"Name[cs]": "Skript KWinu",
"Name[es]": "Guion de KWin",
"Name[nl]": "KWin-script",
"Name[sv]": "Kwin-skript",
"Name[uk]": "Скрипт KWin",
"Name[x-test]": "xxKWin Scriptxx",
"ServiceTypes": [
"KPackage/PackageStructure"
],

View file

@ -3,11 +3,27 @@
"Authors": [
{
"Email": "notmart@gmail.com",
"Name": "Marco Martin"
"Name": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
}
],
"Id": "KWin/WindowSwitcher",
"Name": "KWin Window Switcher",
"Name[az]": "KWin pəncərə dəyişdiricisi",
"Name[ca]": "Commutador de finestres del KWin",
"Name[cs]": "Přepínač oken KWin",
"Name[es]": "Selector de ventanas de KWin",
"Name[nl]": "KWin-vensterwisselaar",
"Name[sv]": "Kwin-fönsterbyte",
"Name[uk]": "Перемикач вікон KWin",
"Name[x-test]": "xxKWin Window Switcherxx",
"ServiceTypes": [
"KPackage/PackageStructure"
],