Commit e965e446 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 c388b124
......@@ -48,6 +48,7 @@ Name[sr@latin]=Velike tačke
Name[sv]=Stora punkter
Name[tr]=Büyük İmler
Name[uk]=Великі кульки
Name[x-test]=xxBig Bulletsxx
Comment="Big Bullets" by Dario Abatianni
......@@ -96,5 +97,6 @@ Comment[sr@latin]=„Veliki tačke“ Darija Abatijanija
Comment[sv]="Stora punkter" av Dario Abatianni
Comment[tr]=Dario Abatianni tarafından "Büyük İmler"
Comment[uk]=«Великі кульки», автор — Dario Abatianni
Comment[x-test]=xx"Big Bullets" by Dario Abatiannixx
Comment[zh_CN]="大子弹" 由 Dario Abatianni 创作
Comment[zh_TW]=「大圓點」,由 Dario Abatianni 提供
......@@ -48,6 +48,7 @@ Name[sr@latin]=Božićna tema
Name[tr]=Noel Teması
Name[uk]=Різдвяна тема
Name[x-test]=xxChristmas Themexx
Comment="Christmas Theme" by Kenichiro Takahashi
......@@ -96,5 +97,6 @@ Comment[sr@latin]=„Božićna tema“ Keničira Takahašija
Comment[sv]="Jultema" av Kenichiro Takahashi
Comment[tr]=Kenichiro Takahashi tarafından "Noel Teması"
Comment[uk]=«Різдвяна тема», автор — Kenichiro Takahashi
Comment[x-test]=xx"Christmas Theme" by Kenichiro Takahashixx
Comment[zh_CN]="圣诞主题" 由 Kenichiro Takahashi 创作
Comment[zh_TW]=「聖誕節」,由 Kenichiro Takahashi 提供
......@@ -50,6 +50,7 @@ Name[sr@latin]=Klasična tema
Name[sv]=Klassiskt tema
Name[tr]=Klasik Tema
Name[uk]=Класична тема
Name[x-test]=xxClassic Themexx
Comment="LED" by Dario Abatianni
......@@ -98,5 +99,6 @@ Comment[sr@latin]=„Lampice“ Darija Abatijanija
Comment[sv]="Lampor" av Dario Abatianni
Comment[tr]=Dario Abatianni tarafından "LED"
Comment[uk]=«LED», автор — Dario Abatianni
Comment[x-test]=xx"LED" by Dario Abatiannixx
Comment[zh_CN]=“LED”由 Dario Abatianni 创作
Comment[zh_TW]=「LED」,由 Dario Abatianni 提供
......@@ -49,6 +49,7 @@ Name[sv]=Standardtema
Name[tr]=Öntanımlı Tema
Name[ug]=كۆڭۈلدىكى ئۆرنەك
Name[uk]=Типова тема
Name[x-test]=xxDefault Themexx
Comment="Breeze" by Uri Herrera
......@@ -84,5 +85,6 @@ Comment[sr@latin]=„Povetarac“ Urija Erere
Comment[sv]="Breeze" av Uri Herrera
Comment[tr]=Uri Herrera tarafından "Breeze"
Comment[uk]=«Breeze», автор — Uri Herrera
Comment[x-test]=xx"Breeze" by Uri Herreraxx
Comment[zh_CN]=“Breeze”由 Uri Herrera 创作
Comment[zh_TW]=「Breeze」,作者 Uri Herrera
......@@ -33,6 +33,7 @@ Name[sr@latin]=Tema Kiseonika
Name[tr]=Oxygen Teması
Name[uk]=Тема «Oxygen»
Name[x-test]=xxOxygen Themexx
Name[zh_CN]=Oxygen 主题
Name[zh_TW]=Oxygen 外觀主題
Comment="Oxygen" by Nuno Pinheiro
......@@ -78,5 +79,6 @@ Comment[sr@latin]=„Kiseonik“ Nuna Pinjeira
Comment[sv]="Oxygen" av Nuno Pinheiro
Comment[tr]=Nuno Pinheiro tarafından oluşturulan "Oxygen"
Comment[uk]=«Oxygen», автор — Nuno Pinheiro
Comment[x-test]=xx"Oxygen" by Nuno Pinheiroxx
Comment[zh_CN]="Oxygen" 由 Nuno Pinheiro 创作
Comment[zh_TW]=「Oxygen」,作者 Nuno Pinheiro
......@@ -45,6 +45,7 @@ Name[sr@latin]=Podrazumevana tema KDE‑a 3
Name[sv]=KDE 3 standardtema
Name[tr]=KDE3 Öntanımlı Teması
Name[uk]=Типова тема KDE 3
Name[x-test]=xxKDE 3 Default Themexx
Name[zh_CN]=KDE 3 默认主题
Name[zh_TW]=KDE 3 預設主題
Comment="Simplistic" by Shintaro Matsuoka
......@@ -93,5 +94,6 @@ Comment[sr@latin]=„Jednostavno“ Šintara Macuoke
Comment[sv]="Förenklat" av Shintaro Matsuoka
Comment[tr]=Shintaro Matsuoka tarafından "Basitlik"
Comment[uk]=«Спрощена», автор — Shintaro Matsuoka
Comment[x-test]=xx"Simplistic" by Shintaro Matsuokaxx
Comment[zh_CN]="极简主题" 由 Shintaro Matsuoka 创作
Comment[zh_TW]=「單純」,由 Shintaro Matsuoka 提供
......@@ -47,6 +47,7 @@ Name[sr@latin]=Nasmejana tema
Name[sv]=Leende tema
Name[tr]=Gülümseyen Tema
Name[uk]=Тема «Посмішки»
Name[x-test]=xxSmiling Themexx
Comment="Smiling" stolen from Kopete by John Tapsell
......@@ -95,5 +96,6 @@ Comment[sr@latin]=„Nasmejano“ ukrao iz Kopetea Džon Tapsel
Comment[sv]="Leende" stulen från Kopete av John Tapsell
Comment[tr]=John Tapsell tarafından Kopete uygulamasının "Gülümseyen" yüzleri
Comment[uk]=«Посмішки» взято з Kopete, автор — John Tapsell
Comment[x-test]=xx"Smiling" stolen from Kopete by John Tapsellxx
Comment[zh_CN]="笑脸主题" 由 John Tapsell 从Kopete 移花接木而来
Comment[zh_TW]=「微笑」,從 Kopete 「偷」來的,由 John Tapsell 提供
......@@ -46,6 +46,7 @@ Name[sr@latin]=Kvadratna tema
Name[sv]=Kvadratiskt tema
Name[tr]=Kare Teması
Name[uk]=Тема «Квадрат»
Name[x-test]=xxSquare Themexx
Comment="SQUARE" by Kenichiro Takahashi
......@@ -93,5 +94,6 @@ Comment[sr@latin]=„Kvadrat“ Keničira Takahašija
Comment[sv]="KVADRATISK" av Kenichiro Takahashi
Comment[tr]=Kenichiro Takahashi tarafından "KARE"
Comment[uk]=«КВАДРАТ» автор — Kenichiro Takahashi
Comment[x-test]=xx"SQUARE" by Kenichiro Takahashixx
Comment[zh_CN]="方块主题" 由 Kenichiro Takahashi 创作
Comment[zh_TW]=「方塊」,由 Kenichiro Takahashi 提供
This diff is collapsed.
......@@ -54,6 +54,7 @@ GenericName[sv]=IRC-klient
GenericName[tr]=IRC İstemcisi
GenericName[ug]=IRC خېرىدارى
GenericName[uk]=Клієнт IRC
GenericName[x-test]=xxIRC Clientxx
GenericName[zh_CN]=IRC 客户端
GenericName[zh_TW]=IRC 用戶端程式
......@@ -110,6 +111,7 @@ Name[sv]=Konversation
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