Commit 00661fb2 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 6ab837e8
[Desktop Entry]
Name=Memory Usage
Name[ast]=Usu de la memoria
Name[az]=Yaddaş İstifadəsi
Name[ca]=Ús de memòria
Name[cs]=Spotřeba paměti
......
......@@ -82,7 +82,7 @@ Name[zh_TW]=字典
Comment=Look up word meanings
Comment[af]=Slaan woordbetekenisse na
Comment[ar]=ابحث عن معاني الكلمات
Comment[ast]=Gueta significaos de pallabres
Comment[ast]=Busca significaos de pallabres
Comment[az]=Söz və tərcümələrin mənalarını göstərmək
Comment[be@latin]=Pošuk značeńniaŭ słovaŭ
Comment[bg]=Търсене значението на думи
......
......@@ -31,6 +31,7 @@ GenericName[vi]=Trình biên tập quy hoạch màu
GenericName[x-test]=xxColor scheme editorxx
GenericName[zh_CN]=配色编辑器
Name=KColorSchemeEditor
Name[ast]=KColorSchemeEditor
Name[az]=KColorSchemeEditor
Name[ca]=KColorSchemeEditor
Name[cs]=KColorSchemeEditor
......
......@@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance
X-KDE-Weight=40
Name=Colors
Name[ast]=Colores
Name[az]=Rənglər
Name[ca]=Colors
Name[cs]=Barvy
......
[Desktop Entry]
Name=Colors
Name[ast]=Colores
Name[az]=Rənglər
Name[ca]=Colors
Name[cs]=Barvy
......
......@@ -10,6 +10,7 @@ X-DocPath=kcontrol/cursortheme/index.html
X-KDE-Weight=70
Name=Cursors
Name[ast]=Cursores
Name[az]=Kursorlar
Name[ca]=Cursors
Name[cs]=Kurzory
......
[Desktop Entry]
Name=Cursors
Name[ast]=Cursores
Name[az]=Kursorlar
Name[ca]=Cursors
Name[cs]=Kurzory
......
[KNewStuff3]
Name=Cursors
Name[ast]=Cursores
Name[az]=Kursorlar
Name[ca]=Cursors
Name[cs]=Kurzory
......
......@@ -10,6 +10,7 @@ X-KDE-Weight=20
X-DocPath=kcontrol/desktopthemedetails/index.html
Name=Plasma Style
Name[ast]=Estilu de Plasma
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[cs]=Styl Plasma
......
[Desktop Entry]
Name=Plasma Style
Name[ast]=Estilu de Plasma
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[cs]=Styl Plasma
......
[KNewStuff3]
Name=Plasma Styles
Name[ast]=Estilos de Plasma
Name[az]=Plasma Üslubu
Name[ca]=Estils del Plasma
Name[cs]=Styly Plasma
......
......@@ -43,7 +43,7 @@ Name[sl]=Uporabnikov odziv
Name[sv]=Användaråterkoppling
Name[tg]=Изҳори назари корбар
Name[uk]=Відгуки користувача
Name[vi]=Phản hồi của Người dùng
Name[vi]=Phản hồi của người dùng
Name[x-test]=xxUser Feedbackxx
Name[zh_CN]=用户反馈
Name[zh_TW]=使用者意見回應
......
[KNewStuff3]
Name=Icons
Name[ast]=Iconos
Name[az]=Nişanlar
Name[ca]=Icones
Name[cs]=Ikony
......
......@@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance
X-KDE-Weight=60
Name=Icons
Name[ast]=Iconos
Name[az]=Nişanlar
Name[ca]=Icones
Name[cs]=Ikony
......
[Desktop Entry]
Name=Icons
Name[ast]=Iconos
Name[az]=Nişanlar
Name[ca]=Icones
Name[cs]=Ikony
......
[Desktop Entry]
Name=KFontView
Name[ast]=KFontView
Name[az]=KFontView
Name[ca]=KFontView
Name[cs]=Prohlížeč písem
......
......@@ -11,6 +11,7 @@ Categories=Qt;KDE;X-KDE-settings-system;
X-KDE-System-Settings-Parent-Category=font
Name=Font Management
Name[ast]=Xestión de fontes
Name[az]=Şrift İdarəeetməsi
Name[ca]=Gestió dels tipus de lletra
Name[cs]=Správa písem
......
......@@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance
X-KDE-Weight=1
Name=Global Theme
Name[ast]=Estilu global
Name[az]=Qlobal Plasma Görünüşü
Name[ca]=Tema global
Name[cs]=Celkový motiv
......
[KNewStuff3]
Name=Global Themes
Name[ast]=Estilos globales
Name[az]=Qlobal Plasma Mövzuları
Name[ca]=Temes globals
Name[cs]=Celkové motivy
......
[Desktop Entry]
Name=Global Theme
Name[ast]=Estilu global
Name[az]=Qlobal Plasma Görünüşü
Name[ca]=Tema global
Name[cs]=Celkový motiv
......
......@@ -51,7 +51,7 @@ Name[x-test]=xxDesktop Searchxx
Name[zh_CN]=桌面搜索
Name[zh_TW]=桌面搜尋
Comment=Searches through files, emails and contacts
Comment[ast]=Gueta pente ficheros, correos y contautos
Comment[ast]=Busca pente ficheros, correos y contautos
Comment[az]=Fayllar, e-poçtlar və tərkiblər arası axtarış edir
Comment[ca]=Cerca pels fitxers, correus electrònics i contactes
Comment[ca@valencia]=Busca pels fitxers, correus electrònics i contactes
......
[Desktop Entry]
Name=Recent Files
Name[ast]=Ficheros d'apocayá
Name[az]=Sonuncu fayllar
Name[ca]=Fitxers recents
Name[cs]=Nedávné soubory
......
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