Commit 5f242794 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 0d3375f5
......@@ -7,6 +7,7 @@ Name[en_GB]=Minimise all Windows
Name[es]=Minimizar todas las ventanas
Name[eu]=Minimizatu leiho guztiak
Name[fr]=Minimiser toutes les fenêtres
Name[id]=Minimalkan Semua Window
Name[it]=Minimizza tutte le finestre
Name[ko]=모든 창 최소화
Name[nl]=Alle vensters minimaliseren
......@@ -27,6 +28,7 @@ Comment[en_GB]=Shows the desktop by minimising all windows
Comment[es]=Muestra el escritorio minimizando todas las ventanas
Comment[eu]=Mahaigaina erakusten du leiho guztiak minimizatuz
Comment[fr]=Afficher le bureau en minimisant toutes les fenêtres
Comment[id]=Menampilkan desktop dengan meminimalkan semua window
Comment[it]=Mostra il desktop minimizzando tutte le finestre
Comment[ko]=모든 창을 최소화하여 바탕 화면 표시
Comment[nl]=Toont het bureaublad door alle vensters te minimaliseren
......
......@@ -7,6 +7,7 @@ Name[en_GB]=Show Desktop
Name[es]=Mostrar el escritorio
Name[eu]=Erakutsi mahaigaina
Name[fr]=Afficher un bureau
Name[id]=Tampilkan Desktop
Name[it]=Mostra il desktop
Name[ko]=바탕 화면 표시
Name[nl]=Bureaublad tonen
......@@ -28,6 +29,7 @@ Comment[en_GB]=Show the Plasma desktop
Comment[es]=Mostrar el escritorio Plasma
Comment[eu]=Erakutsi Plasma mahaigaina
Comment[fr]=Afficher le bureau Plasma
Comment[id]=Tampilkan desktop Plasma
Comment[it]=Mostra il desktop di Plasma
Comment[ko]=Plasma 바탕 화면 표시
Comment[nl]=Toont het Plasma-bureaublad
......
......@@ -31,7 +31,7 @@ Name[pl]=Wygląd Plazmy
Name[pt]=Tema do Plasma
Name[pt_BR]=Tema do Plasma
Name[ru]=Тема оформления Plasma
Name[sk]=Plasma téma
Name[sk]=Vzhľad Plasma
Name[sv]=Plasmatema
Name[uk]=Теми Плазми
Name[x-test]=xxPlasma Themexx
......
......@@ -20,7 +20,7 @@ Name[pl]=Wygląd Plazmy
Name[pt]=Tema do Plasma
Name[pt_BR]=Tema do Plasma
Name[ru]=Тема оформления Plasma
Name[sk]=Plasma téma
Name[sk]=Vzhľad Plasma
Name[sv]=Plasmatema
Name[uk]=Теми Плазми
Name[x-test]=xxPlasma Themexx
......
......@@ -45,7 +45,7 @@ Name[pt]=Notificações
Name[pt_BR]=Notificações
Name[ru]=Уведомления
Name[se]=Dieđáhusat
Name[sk]=Pripomienky
Name[sk]=Upozornenia
Name[sl]=Obvestila
Name[sr]=Обавештења
Name[sr@ijekavian]=Обавјештења
......
......@@ -33,7 +33,7 @@ Name[pt]=Notificações
Name[pt_BR]=Notificações
Name[ru]=Уведомления
Name[se]=Dieđáhusat
Name[sk]=Pripomienky
Name[sk]=Upozornenia
Name[sl]=Obvestila
Name[sr]=Обавештења
Name[sr@ijekavian]=Обавјештења
......
......@@ -16,6 +16,7 @@ Name[fr]=Boîte à outils « Declarative »
Name[gl]=Caixa de ferramentas declarativa
Name[hu]=Deklaratív eszközdoboz
Name[ia]=Instrumentario declarative
Name[id]=Kotak-Alat Deklaratif
Name[is]=Skilgreininga-verkfærasafn
Name[it]=Strumento dichiarativo
Name[kk]=Мәлімдеме құралдары
......
......@@ -18,6 +18,7 @@ Name[gl]=Caixa de ferramentas de panel
Name[he]=ארגז־הכלים של הלוח
Name[hu]=Panel eszköztár
Name[ia]=Instrumentario de pannello
Name[id]=Kotak-Alat Panel
Name[is]=Verkfærasafn fyrir spjöld
Name[it]=Strumento per pannelli
Name[ja]=パネルツールボックス
......
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