alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases 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 2020-05-03 06:05:07 +02:00
parent e16cbe2aa9
commit 8f1034fbe8
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/packagestructure/containmentactions-packagestructure.json
View File

@ -5,6 +5,7 @@
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca@valencia]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
@ -47,6 +48,7 @@
],
"Id": "Plasma/ContainmentActions",
"Name": "Containment Actions",
"Name[az]": "Plasma konteyneri əməlləri",
"Name[ca@valencia]": "Accions del contenidor",
"Name[ca]": "Accions del contenidor",
"Name[da]": "Beholder-handlinger",

2
src/plasma/packagestructure/dataengine-packagestructure.json
View File

@ -5,6 +5,7 @@
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca@valencia]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
@ -48,6 +49,7 @@
"Id": "Plasma/DataEngine",
"Name": "Data Engine",
"Name[ar]": "محرّك بيانات",
"Name[az]": "Plasma verilənlər mənbəyi",
"Name[ca@valencia]": "Motor de dades",
"Name[ca]": "Motor de dades",
"Name[cs]": "Datový nástroj",

2
src/plasma/packagestructure/plasmageneric-packagestructure.json
View File

@ -5,6 +5,7 @@
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca@valencia]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
@ -48,6 +49,7 @@
"Id": "Plasma/Generic",
"Name": "Generic",
"Name[ar]": "عامّة",
"Name[az]": "Ümumi təyinatlı Plasma Paketi",
"Name[ca@valencia]": "Genèric",
"Name[ca]": "Genèric",
"Name[cs]": "Obecné",

2
src/plasma/packagestructure/plasmatheme-packagestructure.json
View File

@ -5,6 +5,7 @@
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca@valencia]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
@ -48,6 +49,7 @@
"Id": "Plasma/Theme",
"Name": "Plasma Theme",
"Name[ar]": "سمة بلازما",
"Name[az]": "Plasma Mövzusu",
"Name[ca@valencia]": "Tema del Plasma",
"Name[ca]": "Tema del Plasma",
"Name[cs]": "Motiv Plasma",

2
src/plasma/packagestructure/plasmoid-packagestructure.json
View File

@ -5,6 +5,7 @@
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[ar]": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca@valencia]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
@ -48,6 +49,7 @@
"Id": "Plasma/Applet",
"Name": "Plasmoid",
"Name[ar]": "بلازمويد",
"Name[az]": "Plasma vidjeti, plasmoid",
"Name[ca@valencia]": "Plasmoide",
"Name[ca]": "Plasmoide",
"Name[cs]": "Plasmoid",