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-14 01:18:16 +00:00
parent c5907e8f36
commit d6f16882ff
7 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcmkwin/kwinrules/kcm_kwinrules.desktop
View file

@ -32,7 +32,7 @@ Name[ga]=Rialacha Fuinneog
Name[gl]=Regras da xanela
Name[gu]=વિન્ડો નિયમો
Name[he]=כללי חלון
Name[hi]=विंडो निय
Name[hi]=विंडो नियम
Name[hr]=Pravila prozora
Name[hu]=Ablakszabályok
Name[ia]=Regulas de fenestra

2
src/kcmkwin/kwinrules/package/metadata.desktop
View file

@ -36,7 +36,7 @@ Name[ga]=Rialacha Fuinneog
Name[gl]=Regras da xanela
Name[gu]=વિન્ડો નિયમો
Name[he]=כללי חלון
Name[hi]=विंडो निय
Name[hi]=विंडो नियम
Name[hr]=Pravila prozora
Name[hu]=Ablakszabályok
Name[ia]=Regulas de fenestra

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

@ -21,7 +21,8 @@
"Name[sv]": "Demitrius Belai",
"Name[uk]": "Demitrius Belai",
"Name[vi]": "Demitrius Belai",
"Name[x-test]": "xxDemitrius Belaixx"
"Name[x-test]": "xxDemitrius Belaixx",
"Name[zh_CN]": "Demitrius Belai"
}
],
"Name": "KWin Aurorae",
@ -42,6 +43,7 @@
"Name[uk]": "KWin Aurorae",
"Name[vi]": "Aurorae của KWin",
"Name[x-test]": "xxKWin Auroraexx",
"Name[zh_CN]": "KWin Aurorae 极光",
"Version": "1"
}
}

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

@ -21,7 +21,8 @@
"Name[sv]": "Demitrius Belai",
"Name[uk]": "Demitrius Belai",
"Name[vi]": "Demitrius Belai",
"Name[x-test]": "xxDemitrius Belaixx"
"Name[x-test]": "xxDemitrius Belaixx",
"Name[zh_CN]": "Demitrius Belai"
}
],
"Name": "KWin Decoration",
@ -42,6 +43,7 @@
"Name[uk]": "Обрамлення вікон KWin",
"Name[vi]": "Trang trí KWin",
"Name[x-test]": "xxKWin Decorationxx",
"Name[zh_CN]": "KWin 装饰元素",
"Version": "1"
}
}

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

@ -21,7 +21,8 @@
"Name[sv]": "Vlad Zahorodnii",
"Name[uk]": "Влад Загородній",
"Name[vi]": "Vlad Zahorodnii",
"Name[x-test]": "xxVlad Zahorodniixx"
"Name[x-test]": "xxVlad Zahorodniixx",
"Name[zh_CN]": "Vlad Zahorodnii"
}
],
"Name": "KWin Effect",
@ -42,6 +43,7 @@
"Name[uk]": "Ефект KWin",
"Name[vi]": "Hiệu ứng KWin",
"Name[x-test]": "xxKWin Effectxx",
"Name[zh_CN]": "KWin 特效",
"Version": "1"
}
}

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

@ -21,7 +21,8 @@
"Name[sv]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[vi]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
}
],
"Name": "KWin Script",
@ -42,6 +43,7 @@
"Name[uk]": "Скрипт KWin",
"Name[vi]": "Kịch bản KWin",
"Name[x-test]": "xxKWin Scriptxx",
"Name[zh_CN]": "KWin 脚本",
"Version": "1"
}
}

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

@ -21,7 +21,8 @@
"Name[sv]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[vi]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
"Name[x-test]": "xxMarco Martinxx",
"Name[zh_CN]": "Marco Martin"
}
],
"Name": "KWin Window Switcher",
@ -42,6 +43,7 @@
"Name[uk]": "Перемикач вікон KWin",
"Name[vi]": "Trình chuyển cửa sổ KWin",
"Name[x-test]": "xxKWin Window Switcherxx",
"Name[zh_CN]": "KWin 窗口切换器",
"Version": "1"
}
}