Commit a59e39ef 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 2dd40cfb
......@@ -71,7 +71,7 @@ Comment[gl]=Un trebello que vixía o rendemento e a entrada e saída
Comment[he]=ישומון למעקב אחר מהירות הכתיבה והקריאה בכונן
Comment[hu]=Egy kisalkalmazás, amely figyeli a merevlemez átvitelét és a bemenetet/kimenetet
Comment[ia]=Un applet que que monitora le prestation (throughput) e ingresso/egresso de disco dur
Comment[id]=Sebuah applet yang memantau lalu-lalang dan intput/output hard disk
Comment[id]=Sebuah applet yang memantau lalu-lalang dan input/output hard disk
Comment[is]=Smáforrit sem fylgist með afköstum harðra diska og ílagi/frálagi
Comment[it]=Un'applet che controlla le prestazioni e l'uso del disco fisso
Comment[ja]=ハードディスクのスループットと入力/出力を監視するアプレット
......
......@@ -24,6 +24,7 @@ Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários dos usuários
Name[ru]=Обратная связь
Name[sk]=Používateľská odozva
Name[sv]=Användaråterkoppling
Name[tg]=Изҳори назари корбар
Name[uk]=Відгуки користувача
......@@ -44,6 +45,7 @@ Comment[nl]=Instellingen voor terugkoppeling van gebruikers configureren
Comment[pt]=Configurar as opções das reacções do utilizador
Comment[pt_BR]=Configure as definições dos comentários dos usuários
Comment[ru]=Настройка параметров обратной связи
Comment[sk]=Nastaviť používateľskú odozvu
Comment[sv]=Anpassa inställningar av användaråterkoppling
Comment[uk]=Налаштовування системи відгуків користувача
Comment[x-test]=xxConfigure user feedback settingsxx
......
......@@ -13,6 +13,7 @@ Name[nl]=Terugkoppeling
Name[pt]=Reacções
Name[pt_BR]=Comentários
Name[ru]=Обратная связь
Name[sk]=Odozva
Name[sv]=Återkoppling
Name[tg]=Изҳори назар
Name[uk]=Відгуки
......
......@@ -12,6 +12,7 @@ Name[lt]=Plasma (Plėtojimas, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt_BR]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[sk]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})xx
Name[zh_TW]=Plasma (開發版本,Wayland ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -14,6 +14,7 @@ Name[lt]=Plasma (Wayland)
Name[nl]=Plasma (Wayland)
Name[pt]=Plasma (Wayland)
Name[pt_BR]=Plasma (Wayland)
Name[sk]=Plasma (Wayland)
Name[uk]=Плазма (Wayland)
Name[x-test]=xxPlasma (Wayland)xx
Name[zh_TW]=Plasma (Wayland)
......
......@@ -13,6 +13,7 @@ Name[lt]=Plasma (Plėtojimas, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt_BR]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[sk]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка, X11 ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})xx
Name[zh_TW]=Plasma (開發版本,X11 ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -12,6 +12,7 @@ Name[lt]=Tinklas
Name[nl]=Netwerk
Name[pt]=Rede
Name[pt_BR]=Rede
Name[sk]=Sieť
Name[uk]=Мережа
Name[x-test]=xxNetworkxx
Name[zh_TW]=網路
......
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