Commit e60c8786 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 ca3cbbce
......@@ -3,6 +3,7 @@ Name=Logout
Name[ca]=Sortida
Name[ca@valencia]=Eixida
Name[cs]=Odhlášení
Name[de]=Abmeldung
Name[en_GB]=Logout
Name[es]=Cerrar la sesión
Name[eu]=Saio-ixtea
......
......@@ -9,6 +9,7 @@ Name=Scale
Name[ca]=Escala
Name[ca@valencia]=Escala
Name[cs]=Měřítko
Name[de]=Skalieren
Name[en_GB]=Scale
Name[es]=Escalar
Name[eu]=Eskalatu
......
......@@ -47,6 +47,7 @@ Name[mr]=रंग दर्शवा
Name[nds]=Klöör wiesen
Name[ne]=रङ देखाउनुहोस्
Name[nl]=Intekening tonen
Name[nn]=Vis oppteikning
Name[pa]=ਪੇਂਟ ਵੇਖੋ
Name[pl]=Pokaż rysowane
Name[pt]=Mostrar a Pintura
......
......@@ -2,10 +2,12 @@
Name=KWin Effect
Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte del KWin
Name[de]=KWin-Effekt
Name[es]=Efecto de KWin
Name[id]=KWin Effect
Name[it]=Effetto di KWin
Name[nl]=KWin-effect
Name[nn]=KWin-effekt
Name[pt]=Efeito do KWin
Name[pt_BR]=Efeito do KWin
Name[ru]=Эффект диспетчера окон
......
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