wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests 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"
wilder
l10n daemon script 7 years ago
parent ff4e8264f0
commit 2d9d15a91b
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/data/kmail_config_misc.desktop

2
src/data/kmail_config_misc.desktop
Unescape View File

@ -140,7 +140,7 @@ Comment[sr@ijekavianlatin]=Postavke koje ne pripadaju drugdje
Comment[sr@latin]=Postavke koje ne pripadaju drugde Comment[sr@latin]=Postavke koje ne pripadaju drugde
Comment[sv]=Inställningar som inte passar någon annanstans Comment[sv]=Inställningar som inte passar någon annanstans
Comment[ta]=அமைப்புகள் எந்த இடத்திலும் பொருந்தவில்லை Comment[ta]=அமைப்புகள் எந்த இடத்திலும் பொருந்தவில்லை
Comment[tg]=Дигар танзимотҳо Comment[tg]=Дигар танзимот
Comment[tr]=Diğer bölümlere uymayan yapılandırma seçenekleri Comment[tr]=Diğer bölümlere uymayan yapılandırma seçenekleri
Comment[uk]=Інші параметри Comment[uk]=Інші параметри
Comment[wa]=Apontiaedjes k' on n' sait wice mete d' ôte Comment[wa]=Apontiaedjes k' on n' sait wice mete d' ôte

Write Preview
Loading…
Cancel
Save