mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2025-12-23 23:38:08 -05: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
2015-07-30 10:27:00 +00:00
parent f02e731a05
commit d9d24d6df1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/profiles/Shell.profile
View File

@@ -162,7 +162,7 @@ Comment[ta]=முனையத்தின் இயல்பிருப்ப
Comment[te]=Konsole అప్రమేయ ప్రొఫైల్
Comment[tg]=Профили консоли стандартӣ
Comment[th]=โพรไฟล์ปริยายของคอนโซล-K
Comment[tr]=Konsole öntanımlı profili
Comment[tr]=Konsole varsayılan profili
Comment[ug]=Konsole كۆڭۈلدىكى سەپلىمە ھۆججەت
Comment[uk]=Типовий профіль Konsole
Comment[wa]=Prémetou profil pol Konsole