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 2023-04-21 02:32:52 +00:00
parent 60b3f492d9
commit 6f16d9b273
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/effects/login/package/metadata.json
View file

@ -30,7 +30,7 @@
"Name[ru]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[sl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[ta]": "லூபோசு லுனாக்கு, காய் ஊவே புரோலிக்கு, மார்ட்டின் கிராஸ்லின்",
"Name[tr]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[tr]": "Luboš Luňák, Kai Uwe Broulik, Martin Gräßlin",
"Name[uk]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[vi]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[x-test]": "xxLubos Lunak, Kai Uwe Broulik, Martin Gräßlinxx",

2
src/effects/logout/package/metadata.json
View file

@ -30,7 +30,7 @@
"Name[ru]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[sl]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[ta]": "லூபோசு லுனாக்கு, காய் ஊவே புரோலிக்கு, மார்ட்டின் கிராஸ்லின், மார்க்கோ மார்ட்டின்",
"Name[tr]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[tr]": "Luboš Luňák, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[uk]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[vi]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[x-test]": "xxLubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martinxx",

2
src/kwin.notifyrc
View file

@ -130,7 +130,7 @@ Name[sr@latin]=Slaganje je suspendovano
Name[sv]=Sammansättning har stoppats
Name[ta]=Compositing முடக்கப்பட்டுள்ளது
Name[th]=การทำคอมโพสิตถูกหยุดชั่วคราว
Name[tr]=Bileşiklik askıya alındı
Name[tr]=Bileşikleştirme askıya alındı
Name[ug]=ئارىلاش مەشغۇلاتى توختىتىلدى
Name[uk]=Композитний показ було тимчасово вимкнено
Name[vi]=Việc kết hợp đã bị ngưng