Commit 9ab9cde5 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 ee79239a
......@@ -15,6 +15,7 @@ Name[fr]=Menu global
Name[he]=תפריט גלובלי
Name[hu]=Globális menü
Name[it]=Menu globale
Name[lt]=Visuotinis meniu
Name[nl]=Globaal menu
Name[nn]=Global meny
Name[pl]=Menu globalne
......
......@@ -15,6 +15,7 @@ Name[he]=יישומוני Plasma
Name[hu]=Plasma widgetek
Name[it]=Oggetti di Plasma
Name[ko]=Plasma 위젯
Name[lt]=„Plasma“ valdikliai
Name[nl]=Plasma widgets
Name[nn]=Plasma-element
Name[pl]=Elementy interfejsu Plazmy
......
......@@ -11,6 +11,7 @@ Name[fi]=Ohjelmakeskus
Name[fr]=Logithèque
Name[he]=מרכז התוכנות
Name[it]=Centro programmi
Name[lt]=Programų centras
Name[nl]=Softwarecentrum
Name[pl]=Ośrodek programów
Name[pt]=Centro de Aplicações
......@@ -39,6 +40,7 @@ Comment[fi]=Antaa sinun etsiä ohjelmia
Comment[fr]=Vous permet de trouver des logiciels
Comment[he]=מאפשר לך למצוא תוכנות
Comment[it]=Ti consente di trovare i programmi
Comment[lt]=Leidžia ieškoti programų
Comment[nl]=Laat u software vinden
Comment[pl]=Umożliwia wyszukiwanie programów
Comment[pt]=Permite-lhe procurar por aplicações
......
......@@ -15,6 +15,7 @@ Name[he]=רקעים
Name[hu]=Háttérképek
Name[it]=Sfondi
Name[ko]=배경 그림
Name[lt]=Darbalaukio paveikslėliai
Name[nl]=Achtergrondafbeeldingen
Name[nn]=Bakgrunnsbilete
Name[pl]=Tapety
......
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