Commit 1cd32b61 authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent 31d7d62d
...@@ -145,7 +145,7 @@ Description[ja]=Gwenview を起動(&G) ...@@ -145,7 +145,7 @@ Description[ja]=Gwenview を起動(&G)
Description[kk]=&Gwenview-ді жегу Description[kk]=&Gwenview-ді жегу
Description[km]=បើក​ដំណើរការ Gwenview Description[km]=បើក​ដំណើរការ Gwenview
Description[kn]=ಗ್ವೆನ್ ವ್ಯೂ &ವನ್ನು ಪ್ರಕ್ಷೇಪಿಸು Description[kn]=ಗ್ವೆನ್ ವ್ಯೂ &ವನ್ನು ಪ್ರಕ್ಷೇಪಿಸು
Description[ko]=Gwenview 실행(&V) Description[ko]=Gwenview 실행(&G)
Description[ku]=Dest bi &Gwenview bike Description[ku]=Dest bi &Gwenview bike
Description[lt]=Paleisti &Gwenview Description[lt]=Paleisti &Gwenview
Description[lv]=Palaist &Gwenview Description[lv]=Palaist &Gwenview
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment