Commit 626d2beb 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 e87c614e
......@@ -258,6 +258,7 @@ Name[sv]=Globalt tema
Name[uk]=Загальна тема
Name[vi]=Chủ đề toàn cục
Name[x-test]=xxGlobal Themexx
Name[zh_CN]=全局主题
Icon=preferences-desktop-theme-global
Exec=systemsettings5 kcm_lookandfeel
......@@ -289,6 +290,7 @@ Name[sv]=Användare
Name[uk]=Користувачі
Name[vi]=Người dùng
Name[x-test]=xxUsersxx
Name[zh_CN]=用户
Icon=preferences-system-users
Exec=systemsettings5 kcm_users
......@@ -320,6 +322,7 @@ Name[sv]=Skärmlåsning
Name[uk]=Блокування екрана
Name[vi]=Khoá màn hình
Name[x-test]=xxScreen Lockingxx
Name[zh_CN]=锁屏
Icon=preferences-desktop-user-password
Exec=systemsettings5 screenlocker
......@@ -352,6 +355,7 @@ Name[sv]=Energibesparing
Name[uk]=Заощадження енергії
Name[vi]=Tiết kiệm năng lượng
Name[x-test]=xxEnergy Savingxx
Name[zh_CN]=节能
Icon=preferences-system-power-management
Exec=systemsettings5 powerdevilprofilesconfig
......@@ -383,5 +387,6 @@ Name[sv]=Bildskärmsinställning
Name[uk]=Налаштування дисплея
Name[vi]=Cấu hình hiển thị
Name[x-test]=xxDisplay Configurationxx
Name[zh_CN]=显示器配置
Icon=preferences-desktop-display-randr
Exec=systemsettings5 kcm_kscreen
......@@ -20,6 +20,7 @@ Name[ia]=Radice
Name[it]=Radice
Name[nl]=Hoofdmap
Name[nn]=Rot
Name[pa]=ਰੂਟ
Name[pt]=Raiz
Name[pt_BR]=Raiz
Name[ro]=Rădăcină
......@@ -28,3 +29,4 @@ Name[sv]=Rot
Name[uk]=Корінь
Name[vi]=Gốc
Name[x-test]=xxRootxx
Name[zh_CN]=根目录
Supports Markdown
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