Commit a457bd43 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 d3cca65d
......@@ -26,7 +26,7 @@ Name[nn]=Veksleoppsett for vindaugshandsamar
Name[pa]=ਵਿੰਡੋ ਮੈਨੇਜਰ ਸਵਿੱਚਰ ਲੇਆਉਟ
Name[pl]=Układ przełączania zarządzana oknami
Name[pt]=Disposições da Mudança de Janelas do KWin
Name[pt_BR]=Layouts de mudança do gerenciador de Janelas
Name[pt_BR]=Layouts de mudança do gerenciador de janelas
Name[ru]=Оформления переключателя окон для KWin
Name[sk]=Prepínanie rozložení správcu okien
Name[sl]=Razporedi preklapljanja upravljalnika oken
......@@ -294,6 +294,7 @@ Name[az]=Xwayland Qəzası
Name[ca]=Fallada de l'Xwayland
Name[es]=Fallo de Xwayland
Name[pt]=Estoiro do Xwayland
Name[sv]=Krasch av Xwayland
Name[uk]=Аварія Xwayland
Name[x-test]=xxXwayland Crashxx
......@@ -302,6 +303,7 @@ Comment[az]=Xwayland qəzaya uğradı
Comment[ca]=L'Xwayland ha fallat
Comment[es]=Xwayland ha fallado
Comment[nl]=Xwayland is gecrasht
Comment[pt]=O Xwayland estoirou
Comment[sv]=Xwayland har kraschat
Comment[uk]=Xwayland завершив роботу в аварійному режимі
Comment[x-test]=xxXwayland has crashedxx
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