Commit a8d2bf25 authored by Script Kiddy's avatar Script Kiddy

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 5d455405
......@@ -115,6 +115,10 @@ Comment[es]=KSudoku, juego Sudoku y más creado por KDE
Comment[it]=KSudoku, gioco del Sudoku ed altri da KDE
Comment[nl]=KSudoku, sudoku-spel en meer door KDE
Comment[pt]=KSudoku, um jogo de Sudoku & mais do KDE
Comment[sr]=К‑судоку, судоку и још штошта из КДЕ‑а
Comment[sr@ijekavian]=К‑судоку, судоку и још штошта из КДЕ‑а
Comment[sr@ijekavianlatin]=K‑sudoku, sudoku i još štošta iz KDE‑a
Comment[sr@latin]=K‑sudoku, sudoku i još štošta iz KDE‑a
Comment[sv]=Ksudoku, Sudoku-spel med mera av KDE
Comment[uk]=KSudoku, гра у судоку і інше від KDE
Comment[x-test]=xxKSudoku, Sudoku game & more by KDExx
......@@ -2,6 +2,7 @@
Name=Tiny Killer
Name[ca]=Addoku/Tiny Killer
Name[ca@valencia]=Addoku/Tiny Killer
Name[de]=Kleines Killer-Sudoku
Name[en_GB]=Tiny Killer
Name[es]=Killer pequeño
Name[et]=Tiny Killer
Markdown is supported
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