Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages 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
2022-06-22 01:43:36 +00:00
parent 44336093da
commit 4d65b52b47
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
krfb/krfb.notifyrc
View File

@@ -1080,7 +1080,7 @@ Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার কর
Comment[br]=Dalc'het, kevreadenn disteuleret
Comment[bs]=Zauzeto, veza je odbijena
Comment[ca]=Ocupat, connexió rebutjada
Comment[ca@valencia]=Ocupat, connexió rebujada
Comment[ca@valencia]=Ocupat, connexió rebutjada
Comment[cs]=Zaneprázdněn, spojení odmítnuto
Comment[cy]=Prysur, gwrthodwyd y cysylltiad
Comment[da]=Optaget, forbindelse afslået