yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests 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 2021-08-05 01:15:06 +00:00
parent e34d8bbed6
commit d47b27f9cd
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
View file

@ -1,4 +1,5 @@
{ {
"KPackageStructure": "KWin/Aurorae",
"KPlugin": { "KPlugin": {
"Authors": [ "Authors": [
{ {
@ -36,6 +37,5 @@
"Name[vi]": "Aurorae của KWin", "Name[vi]": "Aurorae của KWin",
"Name[x-test]": "xxKWin Auroraexx", "Name[x-test]": "xxKWin Auroraexx",
"Version": "1" "Version": "1"
}, }
"KPackageStructure": "KWin/Aurorae"
} }

4
src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
View file

@ -1,4 +1,5 @@
{ {
"KPackageStructure": "KWin/Decoration",
"KPlugin": { "KPlugin": {
"Authors": [ "Authors": [
{ {
@ -36,6 +37,5 @@
"Name[vi]": "Trang trí KWin", "Name[vi]": "Trang trí KWin",
"Name[x-test]": "xxKWin Decorationxx", "Name[x-test]": "xxKWin Decorationxx",
"Version": "1" "Version": "1"
}, }
"KPackageStructure": "KWin/Decoration"
} }

4
src/plugins/kpackage/effect/kwin-packagestructure-effect.json
View file

@ -1,4 +1,5 @@
{ {
"KPackageStructure": "KWin/Effect",
"KPlugin": { "KPlugin": {
"Authors": [ "Authors": [
{ {
@ -36,6 +37,5 @@
"Name[vi]": "Hiệu ứng KWin", "Name[vi]": "Hiệu ứng KWin",
"Name[x-test]": "xxKWin Effectxx", "Name[x-test]": "xxKWin Effectxx",
"Version": "1" "Version": "1"
}, }
"KPackageStructure": "KWin/Effect"
} }

4
src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
View file

@ -1,4 +1,5 @@
{ {
"KPackageStructure": "KWin/Script",
"KPlugin": { "KPlugin": {
"Authors": [ "Authors": [
{ {
@ -36,6 +37,5 @@
"Name[vi]": "Kịch bản KWin", "Name[vi]": "Kịch bản KWin",
"Name[x-test]": "xxKWin Scriptxx", "Name[x-test]": "xxKWin Scriptxx",
"Version": "1" "Version": "1"
}, }
"KPackageStructure": "KWin/Script"
} }

4
src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
View file

@ -1,4 +1,5 @@
{ {
"KPackageStructure": "KWin/WindowSwitcher",
"KPlugin": { "KPlugin": {
"Authors": [ "Authors": [
{ {
@ -36,6 +37,5 @@
"Name[vi]": "Trình chuyển cửa sổ KWin", "Name[vi]": "Trình chuyển cửa sổ KWin",
"Name[x-test]": "xxKWin Window Switcherxx", "Name[x-test]": "xxKWin Window Switcherxx",
"Version": "1" "Version": "1"
}, }
"KPackageStructure": "KWin/WindowSwitcher"
} }