Commit 48002ab7 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 a4fc04b7
......@@ -29,6 +29,7 @@ Comment=Smoothly fade to the logout screen
Comment[ca]=Transició suau a la pantalla de sortida
Comment[ca@valencia]=Transició suau a la pantalla d'eixida
Comment[cs]=Plynule přejít na odhlašovací obrazovku
Comment[de]=Blendet den Abmeldungsdialog langsam ein.
Comment[en_GB]=Smoothly fade to the logout screen
Comment[es]=Desvanecer suavemente hasta la pantalla de cierre de sesión
Comment[eu]=Emeki desagertu saio-ixteko pantailarantz
......@@ -68,3 +68,4 @@ Name[ug]=سىزىش دائىرىسىنى كۆرسەت
Name[uk]=Показ малювання
Name[wa]=Mostrer pondaedje
Name[x-test]=xxShow Paintxx
......@@ -13,7 +13,6 @@ X-KDE-Weight=50
Name=Screen Edges
Name[ar]=حواف الشاشة
Name[ast]=Berbesos de pantalla
Name[bg]=Краища на екрана
Name[bs]=Ivice ekrana
Name[ca]=Vores de la pantalla
......@@ -14,6 +14,7 @@ Name[ru]=Эффект диспетчера окон
Name[uk]=Ефект KWin
Name[x-test]=xxKWin Effectxx
Name[zh_CN]=KWin 效果
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